summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/context/third/chat/t-chat.mkiv220
-rw-r--r--Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex4
-rw-r--r--Master/texmf-dist/tex/context/third/markdown/t-markdown.tex2
-rw-r--r--Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex2
-rw-r--r--Master/texmf-dist/tex/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/markdown/markdown.tex99
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex2
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex23
-rw-r--r--Master/texmf-dist/tex/generic/pst-node/pst-node.tex56
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/esvect.4ht25
-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/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty199
-rw-r--r--Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty107
-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.cls132
-rw-r--r--Master/texmf-dist/tex/latex/customenvs/customenvs.sty177
-rw-r--r--Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/delimset/delimset.sty262
-rw-r--r--Master/texmf-dist/tex/latex/doibanner/doibanner.sty98
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-url.sty6
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls4
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty413
-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/fontscale/fontscale.sty998
-rw-r--r--Master/texmf-dist/tex/latex/heria/heria.cls39
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-methodology.tex2
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-workplan.tex21
-rw-r--r--Master/texmf-dist/tex/latex/heria/hi-wp-description.tex6
-rw-r--r--Master/texmf-dist/tex/latex/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/jigsaw/jigsaw-doc-settings.sty196
-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.sty1035
-rw-r--r--Master/texmf-dist/tex/latex/mailing/mailing.sty14
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty3
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty2
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty2
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty2
-rw-r--r--Master/texmf-dist/tex/latex/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.tex35
-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/moremath/moremath.sty1224
-rw-r--r--Master/texmf-dist/tex/latex/overarrows/overarrows.sty456
-rw-r--r--Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls10
-rw-r--r--Master/texmf-dist/tex/latex/passopt/passopt.sty56
-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/pgfplotsthemebeamer/pgfplotsthemebeamer.sty37
-rw-r--r--Master/texmf-dist/tex/latex/photobook/photobook.cls92
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty23
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/cal-util.def2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf (renamed from Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf)4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf21
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf320
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf70
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf99
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf44
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf10
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf93
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf54
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf28
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf6
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf74
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf6
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf85
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf324
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf37
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf45
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf184
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf144
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf69
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf40
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf358
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf22
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf420
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf160
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf23
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf237
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf85
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf32
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf9
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf65
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf38
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf49
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf96
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf28
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf57
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf35
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf120
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf59
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf128
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf10
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf80
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf84
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf97
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf26
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf77
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf116
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf423
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf31
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/hijrical.sty2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua (renamed from Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua)196
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua18
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua31
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua13
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty1889
-rw-r--r--Master/texmf-dist/tex/latex/polyomino/polyomino.sty286
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty3
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex144
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex63
-rw-r--r--Master/texmf-dist/tex/latex/pst-node/pst-node.sty11
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty38
-rw-r--r--Master/texmf-dist/tex/latex/responsive/responsive.sty12
-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.cls2
-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.tex4154
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex4154
-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/spbmark/spbmark.sty2
-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/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/tikzbricks/tikzbricks-doc-settings.sty199
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty29
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua13
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua20
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua49
-rw-r--r--Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty179
-rw-r--r--Master/texmf-dist/tex/latex/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.lua129
-rw-r--r--Master/texmf-dist/tex/lualatex/piton/piton.sty83
-rw-r--r--Master/texmf-dist/tex/lualatex/tango/tango.cls (renamed from Master/texmf-dist/tex/latex/tango/tango.cls)262
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua924
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty66
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/lltjext.sty8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty103
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua7
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty51
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty319
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty11
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty24
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty113
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua14
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua95
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua88
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua221
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua4167
-rw-r--r--Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua13
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua19
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex2
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebmac.tex25
628 files changed, 34166 insertions, 24736 deletions
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..75a8acaa269
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/chat/t-chat.mkiv
@@ -0,0 +1,220 @@
+%D \module
+%D [ file=t-chat,
+%D version=2024.07.20,
+%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
+
+% TODO: color palet
+\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]
+
+\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 := "ChatColorI";
+ ; else :
+ side := 1;
+ bgcol := "ChatColorII";
+ ; 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 "ChatFrameColor";
+
+ 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},
+]
+
+% Receive text (left-facing).
+\defineoverlay[ChatGetOverlay][\uniqueMPgraphic{ChatBubble}]
+\defineframedtext[ChatGetFrame][ChatBubbleFrame][
+ background=ChatGetOverlay,
+ location=left,
+]
+
+% Send text (right-facing).
+\defineoverlay[ChatSendOverlay][\uniqueMPgraphic{ChatBubble}]
+\defineframedtext[ChatSendFrame][ChatBubbleFrame][
+ background=ChatSendOverlay,
+ location=right,
+]
+
+% This should become an avatar
+% 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=ChatFrameColor,
+]
+
+% 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/context/third/markdown/t-markdown.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
index 642d0bcd2da..790807abc7c 100644
--- a/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
+++ b/Master/texmf-dist/tex/context/third/markdown/t-markdown.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `context')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
index 35fd80f89cd..36cde2cc897 100644
--- a/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
+++ b/Master/texmf-dist/tex/context/third/markdown/t-markdownthemewitiko_markdown_defaults.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-context')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/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/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 9c71c07afd1..14950fd64fa 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `tex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -580,8 +580,8 @@
{ boolean }
{ true }
\ExplSyntaxOff
-\def\markdownLastModified{2024-06-20}%
-\def\markdownVersion{3.6.1-0-g5a45a922}%
+\def\markdownLastModified{2024-07-14}%
+\def\markdownVersion{3.6.2-0-g6c30af7e}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markinline\relax
@@ -664,38 +664,10 @@
{ inputTempFileName }
{ path }
{ \jobname.markdown.in }
-\cs_generate_variant:Nn
- \__markdown_add_plain_tex_option:nnn
- { nnV }
-\ExplSyntaxOff
-\input lt3luabridge.tex
-\ExplSyntaxOn
-\bool_if:nTF
- {
- \cs_if_exist_p:N
- \luabridge_tl_set:Nn &&
- (
- \int_compare_p:nNn
- { \g_luabridge_method_int }
- =
- { \c_luabridge_method_directlua_int } ||
- \sys_if_shell_unrestricted_p:
- )
- }
- {
- \luabridge_tl_set:Nn
- \l_tmpa_tl
- { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
- }
- {
- \tl_set:Nn
- \l_tmpa_tl
- { . }
- }
-\__markdown_add_plain_tex_option:nnV
+\__markdown_add_plain_tex_option:nnn
{ outputDir }
{ path }
- \l_tmpa_tl
+ { . }
\__markdown_add_plain_tex_option:nnn
{ plain }
{ boolean }
@@ -740,18 +712,60 @@
\cs_new:Nn
\__markdown_define_option_command:n
{
- \__markdown_option_tl_to_csname:nN
+ \str_if_eq:nnTF
{ #1 }
- \l_tmpa_tl
- \cs_if_exist:cF
- { \l_tmpa_tl }
+ { outputDir }
+ { \__markdown_define_option_command_output_dir: }
{
- \__markdown_get_default_option_value:nN
- { #1 }
- \l_tmpa_tl
- \__markdown_set_option_value:nV
+ \__markdown_option_tl_to_csname:nN
{ #1 }
\l_tmpa_tl
+ \cs_if_exist:cF
+ { \l_tmpa_tl }
+ {
+ \__markdown_get_default_option_value:nN
+ { #1 }
+ \l_tmpa_tl
+ \__markdown_set_option_value:nV
+ { #1 }
+ \l_tmpa_tl
+ }
+ }
+ }
+\ExplSyntaxOff
+\input lt3luabridge.tex
+\ExplSyntaxOn
+\cs_new:Nn
+ \__markdown_define_option_command_output_dir:
+ {
+ \cs_if_free:NT
+ \markdownOptionOutputDir
+ {
+ \bool_if:nTF
+ {
+ \cs_if_exist_p:N
+ \luabridge_tl_set:Nn &&
+ (
+ \int_compare_p:nNn
+ { \g_luabridge_method_int }
+ =
+ { \c_luabridge_method_directlua_int } ||
+ \sys_if_shell_unrestricted_p:
+ )
+ }
+ {
+ \luabridge_tl_set:Nn
+ \l_tmpa_tl
+ { print(os.getenv("TEXMF_OUTPUT_DIRECTORY") or ".") }
+ \tl_gset:NV
+ \markdownOptionOutputDir
+ \l_tmpa_tl
+ }
+ {
+ \tl_gset:Nn
+ \markdownOptionOutputDir
+ { . }
+ }
}
}
\cs_new:Nn
@@ -3319,6 +3333,9 @@
}
}
}
+ \str_gset:NV
+ \g_luabridge_output_dirname_str
+ \markdownOptionOutputDir
\luabridge_now:e
{ #1 }
}
diff --git a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
index dc8a90917f6..43f342936e8 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-tex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
index 90d34446f00..dd00c00f7f4 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdownthemewitiko_tilde.tex
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-tilde')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex b/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
index 345fba99c4f..2ff137b0a8c 100644
--- a/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
+++ b/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
@@ -25,8 +25,8 @@
\ifx\PSTThreeDplotLoaded\endinput\else\input pst-3dplot.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
%
-\def\fileversion{2.04a}
-\def\filedate{2024/06/29}
+\def\fileversion{2.06a}
+\def\filedate{2024/07/15}
\message{`PST-diffraction v\fileversion, \filedate\space (ML,hv)}%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-diff}
@@ -40,7 +40,7 @@
\define@key[psset]{pst-diff}{s}{\def\psk@Diffraction@Slit@s{#1 }} % distance entre les fentes
\define@key[psset]{pst-diff}{lambda}{\pst@checknum{#1}\psk@Diffraction@Slit@Lambda }% en nm
\define@key[psset]{pst-diff}{f}{\pst@checknum{#1}\psk@Diffraction@Slit@F }% focus en m
-\define@key[psset]{pst-diff}{gamma}{\pst@checknum{#1}\psk@Diffraction@gamma@G }
+%\define@key[psset]{pst-diff}{gamma}{\pst@checknum{#1}\psk@Diffraction@gamma@G }
\define@key[psset]{pst-diff}{pixel}{\pst@checknum{#1}\psk@Diffraction@Slit@pixel }
\define@key[psset]{pst-diff}{colorMode}{\pst@getint{#1}\psk@Diffraction@colorMode }
% 0 black and white inverse
@@ -65,7 +65,8 @@
\psset[pst-diff]{a=0.2e-3,f=5,k=1,r=1e-3,
d=6e-3,s=12e-3,h=0.5e-3,
lambda=650,pixel=0.5,
- contrast=38,gamma=0.8,twoHole=false,twoSlit=false,colorMode=3, scale=1,
+ contrast=38,%gamma=0.8,
+ twoHole=false,twoSlit=false,colorMode=3, scale=1,
IIID=false, showFunc=false}
%
% load the pstricks-add.pro only, if not already done
@@ -82,7 +83,7 @@
/focus \psk@Diffraction@Slit@F def
/widthSlit \psk@Diffraction@Slit@A def
/heightSlit \psk@Diffraction@Slit@k widthSlit mul def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/pixel \psk@Diffraction@Slit@pixel def
/SlitSeparation \psk@Diffraction@Slit@s def
\psk@Diffraction@Slit@Lambda tx@addDict begin wavelengthToRGB Red Green Blue end
@@ -162,7 +163,7 @@
\addto@pscode{%
% les dimensions sont en mètres
/focus \psk@Diffraction@Slit@F def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/pixel \psk@Diffraction@Slit@pixel def
/contrast 1e\psk@Diffraction@Slit@contrast def
/r \psk@Diffraction@Circular@r def
@@ -253,7 +254,8 @@
/y { yPts 2845 div } bind def
/R { x dup mul y dup mul add sqrt } bind def % R en m
/m Coeff R mul def
- 1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+ % 1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+ 1 contrast m J1Card Facteur x mul cos dup mul mul neg exp sub % fix by Keno Wehr
dup /intensity ED
dup dup
Red mul 3 -1 roll
@@ -283,7 +285,7 @@
\ifPst@Diffraction@IIID \else
newpath
R_limite neg %1.5 mul
- cm dup moveto
+ cm dup moveto
R_limite 2 mul cm 0 rlineto
0 R_limite 2 mul cm rlineto
R_limite neg 2 mul cm 0 rlineto
@@ -294,7 +296,8 @@
R_limite -0.001 0 {
/Radius exch def
/m Coeff Radius 0.01 mul mul def
- 1 1e38 m J1Card neg exp sub
+% 1 1e38 m J1Card neg exp sub
+ 1 contrast m J1Card neg exp sub % fix by keno wehr
dup /intensity ED
dup dup
Red mul 3 -1 roll % R
@@ -396,7 +399,7 @@
% les dimensions sont en mètres
/f \psk@Diffraction@Slit@F def
/h \psk@Diffraction@Triangle@h def
- /Gamma \psk@Diffraction@gamma@G def
+ %/Gamma \psk@Diffraction@gamma@G def
/L { \psk@Diffraction@Slit@Lambda 1e-9 mul} bind def % longueur d'onde en m
/pixel \psk@Diffraction@Slit@pixel def
/k { TwoPi f L mul div } bind def
diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
index 8e618ef2208..a653d76eeac 100644
--- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
+++ b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex
@@ -1,4 +1,4 @@
-% $Id: pst-node.tex 654 2022-11-21 06:19:14Z herbert $
+% $Id: pst-node.tex 918 2024-07-10 17:41:55Z herbert $
%%
%% BEGIN pst-node.tex
%%
@@ -18,8 +18,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.44}
-\def\filedate{2024/07/04}
+\def\fileversion{1.45}
+\def\filedate{2024/07/10}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1386,8 +1386,8 @@ tx@NodeDict \pst@tempg known
/dy YB YA sub def
/angle dy dx Atan def
/linelength \pst@number\pst@dimb \pst@number\psunit div def
- XA linelength angle cos mul add YA linelength angle sin mul add ){#4}%
-}
+ XA linelength angle cos mul add YA linelength angle sin mul add ){#4}}
+%
\def\psRelNode{\pst@object{psRelNode}}
\def\psRelNode@i(#1)(#2)#3#4{{% A - B - factor - node name
\use@par
@@ -1537,8 +1537,7 @@ tx@NodeDict \pst@tempg known
\def\trim@ #1{\trim@@ @#1 @ #1 @ @@}%
\def\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}%
\def\unbrace#1{#1}%
-\unbrace{\def\trim@@@ #1 } #2@#3{\expandafter\def%
- \expandafter #3\expandafter {#1}}%
+\unbrace{\def\trim@@@ #1 } #2@#3{\expandafter\def\expandafter #3\expandafter {#1}}%
%
\def\hasparen#1(#2\@nil{%check if expression contains a (--call with \hasparen#1(\@nil
\ifx\relax#2\relax \@parenfalse \else \@parentrue\fi}%
@@ -1577,24 +1576,28 @@ tx@NodeDict \pst@tempg known
\expandafter\testAlg\my@tempA|\@nil\my@next {#1}{#2}{#3}}
%
\def\psparnode#1#2#3{%
-% #1=t value, #2=x(t) y(t) in PS form,#3=node name,
- \pnode(! /t #1 def #2){#3}%
- \pnode(! /t #1 dup abs 1 lt {0.001 sub}{dup 0 gt {0.999} {1.001} ifelse mul} ifelse def
- #2
- /t #1 dup abs 1 lt {0.001 add}{dup 0 lt {0.999} {1.001} ifelse mul} ifelse def
- #2 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
- dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
-}%
-
+ % #1=t value, #2=x(t) y(t) in PS form, #3=node name,
+ % also returns unit tangent vector at t with node #3tang
+ \pnode(! /t #1 def #2){#3}%
+ \pnode(! /t #1 dup abs 1 lt {0.001 sub} {dup 0 gt {0.999} {1.001} ifelse mul} ifelse def
+ #2
+ /t #1 dup abs 1 lt {0.001 add} {dup 0 lt {0.999} {1.001} ifelse mul} ifelse def
+ #2
+ 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
+ dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
+}%
+%
\def\algparnode#1#2#3{%
-% #1=t value, #2=x(t) | y(t) in alg form,#3=node name,
- \pstVerb{tx@Dict begin /Func (#2) AlgParser cvx def end }
- \pnode(!/t #1 def Func){#3}
- \pnode(!/t #1 .001 sub def
- Func
- /t #1 dup abs 1 lt {0.001 add}{dup 0 lt {0.999} {1.001} ifelse mul } ifelse def
- Func 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
- dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
+% #1=t value, #2=x(t) | y(t) in alg form, #3=node name,
+% also returns unit tangent vector at t with node #3tang
+ \pstVerb{tx@Dict begin /Func (#2) AlgParser cvx def end }%
+ \pnode(! /t #1 def Func){#3}%
+ \pnode(! /t #1 dup abs 1 lt {0.001 sub} {dup 0 gt {0.999} {1.001} ifelse mul} ifelse def
+ Func
+ /t #1 dup abs 1 lt {0.001 add}{dup 0 lt {0.999} {1.001} ifelse mul } ifelse def
+ Func
+ 3 -1 roll sub 3 1 roll exch sub 2 copy exch dup mul exch dup mul add sqrt
+ dup 3 1 roll div 3 1 roll div){#3tang}% unit tangent vector at t
}%
%
\def\nodex#1{%
@@ -1635,8 +1638,7 @@ tx@NodeDict \pst@tempg known
\nodexn{#3}{@TMP@a}%
\AplusB(#1)(@TMP@a){@TMP@B}%
\psline(@TMP@A)(@TMP@B)%
-}%
-\ignorespaces}%
+}\ignorespaces}%
%
\def\curvepnodes{\pst@object{curvepnodes}}
\def\curvepnodes@i#1#2#3#4{{%optional [plotpoints=xx]
@@ -1686,7 +1688,7 @@ tx@NodeDict \pst@tempg known
\else
\multido{\i=0+1}{\pst@cntc}{\pnode(!/x \pst@number\pst@dima\space def x #3){#4\i}%
\advance\pst@dima \pst@dimb}%
-\fi%
+\fi
\expandafter\xdef \csname \PST@root nodecount\endcsname {\the\pst@cnta}%
\ifnum\Pst@Debug>0 \typeout{Created nodes #40 .. #4\the\pst@cnta}\fi%
}\ignorespaces}%
diff --git a/Master/texmf-dist/tex/generic/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/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/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty b/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty
deleted file mode 100644
index 777cedba6ef..00000000000
--- a/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty
+++ /dev/null
@@ -1,199 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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}
-\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}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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]{./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}{##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/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-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 7a2093a2d49..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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2023 Statistical Society of Canada | Société
+%% Copyright (C) 2023-2024 Statistical Society of Canada | Société
%% canadienne de statistique
%%
%% This file may be distributed and/or modified under the conditions
@@ -30,9 +30,9 @@
%% files cjs-rcs-article.cls, cjs-rcs-article-fr.tex, cjs-template.tex
%% and rcs-gabarit.tex.
%%
-\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\NeedsTeXFormat{LaTeX2e}[2021/06/01]
\ProvidesClass{cjs-rcs-article}%
- [2023/11/29 v1.0 Article class for The Canadian Journal of
+[2024/07/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?
@@ -40,6 +40,7 @@
\newif\ifCJS@final \CJS@finalfalse % final version?
\newif\ifCJS@titlingfooter \CJS@titlingfooterfalse % footer on title page?
\newif\ifCJS@journalinfo \CJS@journalinfotrue % display journal info?
+\newif\ifCJS@specialack \CJS@specialackfalse % special acknowledgement?
\newif\ifCJS@fancybreak \CJS@fancybreaktrue % display fancy break?
\newif\ifCJS@history \CJS@historyfalse % history present?
\newif\ifCJS@corrauth \CJS@corrauthfalse % corresponding author?
@@ -60,7 +61,6 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
\ProcessOptions\relax
\LoadClass[letterpaper,10pt,article,twoside]{memoir}
-\RequirePackage{iflang}
\RequirePackage[round,semicolon,authoryear,sectionbib]{natbib}
\RequirePackage{babel}
\RequirePackage[autolanguage]{numprint}
@@ -142,7 +142,7 @@
[
Extension = .otf,
Scale = 1,
- Ligatures = TeX
+ bold-style = TeX
]
\setmathfont{FiraMath-Regular}
[
@@ -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{%
@@ -193,12 +193,12 @@
No.~\CJS@issue, %
\CJS@year, %
\CJS@firstpage--\thelastpage}}}}
-\newcommand*\CJS@setheadfootfont{%
+\def\CJS@setheadfootfont{%
\firalining\fontsize{9}{13}\selectfont}
\newlength\CJS@headdivheight
\settoheight\CJS@headdivheight{\CJS@setheadfootfont 1}
\setlength\CJS@headdivheight{0.9\CJS@headdivheight}
-\newcommand*\CJS@headdivrule{%
+\def\CJS@headdivrule{%
\rule[0.05\CJS@headdivheight]{0.75\normalrulethickness}{\CJS@headdivheight}}
\newlength\CJS@pagenumwidth
\settowidth\CJS@pagenumwidth{9\qquad}
@@ -480,15 +480,38 @@
\iflanguage{french}{Futur emplacement de la déclaration de licence.}%
{Licence statement to appear here.}}
\begin{figure}[!b]
- \raisebox{0pt}[0pt][\footskip]{%
+ \raisebox{0pt}[0pt][\dimexpr\CJS@licenceht-\footskip\relax]{%
\vbox{%
\CJS@setlicencefont
\rule{\textwidth}{\normalrulethickness}
\parbox[t][\CJS@licenceht][t]{\textwidth}{%
+ \ifCJS@specialack\CJS@specialackstatement\fi
\ifCJS@final\CJS@licence \else\textit\CJS@notice \fi}}}
\end{figure}
\fi
}}
+\newcommand*\CJS@adnibyline{for the Alzheimer’s Disease Neuroimaging Initiative}
+\newcommand*\CJS@adnistatement{%
+ Data used in preparation of this article were obtained
+ from the \href{https://adni.loni.usc.edu}{Alzheimer’s Disease Neuroimaging Initiative}
+ (ADNI) database. As such, the investigators within the ADNI
+ contributed to the design and implementation of ADNI and/or provided
+ data but did not participate in the analysis or writing of this
+ report. A complete listing of ADNI investigators can be found at:
+ \url{https://adni.loni.usc.edu/wp-content/uploads/how_to_apply/ADNI_Acknowledgement_List.pdf}.}
+\newcommand*\CJS@admcbyline{for the Alzheimer’s Disease Metabolomics Consortium}
+\newcommand*\CJS@admcstatement{%
+ Data used in preparation of this article were generated by the
+ Alzheimer’s Disease Metabolomics Consortium (ADMC). As such, the
+ investigators within the ADMC provided data but did not participate
+ in analysis or writing of this report. A complete listing of ADMC
+ investigators can be found at:
+ \url{https://sites.duke.edu/adnimetab/team/}.}
+\newcommand*\ADNIacknowledgement{%
+ \specialack{\CJS@adnibyline}{\CJS@adnistatement}}
+\newcommand*\ADMCacknowledgement{%
+ \renewcommand*\CJS@specialackmark{\textsuperscript{\ensuremath{**}}}
+ \specialack{\CJS@admcbyline}{\CJS@admcstatement}}
\def\CJS@supplement{}
\def\CJS@supplementname@en{Supplementary material}
\def\CJS@supplementname@fr{Matériel additionnel}
@@ -535,10 +558,10 @@
\endgroup}
\fi
\fi}
-\newcommand*\CJS@setlicencefont{%
+\def\CJS@setlicencefont{%
\firalining\fontsize{8pt}{9pt}\selectfont}
\newlength\CJS@licenceht
-\newcommand\CJS@licencesample{%
+\def\CJS@licencesample{%
{\ccbyncnd*} 2023 The Authors. The Canadian Journal of
Statistics~{\textbar}~La revue canadienne de statistique published
by Wiley Periodicals LLC on behalf of Statistical Society of
@@ -552,41 +575,43 @@
\newcommand\CJS@measurelicence{%
\setbox\CJS@licencebox=\vbox{%
\CJS@setlicencefont
- \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}
+ \ifCJS@specialack\CJS@specialackstatement\fi
+ \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}%
\setlength\CJS@licenceht{\dimexpr\ht\CJS@licencebox+\dp\CJS@licencebox}}
\def\CJS@licence{}
\newcommand\licence[1]{\renewcommand*\CJS@licence{#1}}
\let\license\licence
\newcommand*\ccby{\ccby@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccby@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em}}
+\def\CJS@fakern{\kern0.1em}
+\def\ccby@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern}}
\newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbysa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+\def\ccbysa@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsSa}}
\newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbync@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+\def\ccbync@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNc}}
\newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncsa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+\def\ccbyncsa@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsSa}}
\newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbynd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+\def\ccbynd@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNd}}
\newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax}
-\newcommand*\ccbyncnd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+\def\ccbyncnd@{\mbox{%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsNd}}
\let\Pr\relax
\DeclareMathOperator{\Pr}{P}
@@ -600,10 +625,12 @@
\let\prdist\mathcal
\fi
\iftutex
- \newcommand*\mat[1]{\symbf{#1}}
+ \let\mat\symbf
+ \let\matit\symbfit
\newcommand*\trsp{^{\mkern-1.5mu\symsfup{T}}}
\else
- \newcommand*\mat[1]{\mathbf{#1}}
+ \let\mat\mathbf
+ \let\matit\mathbfit
\newcommand*\trsp{^{\mkern-1.5mu\mathsf{T}}}
\fi
\DeclareMathOperator{\tr}{tr}
@@ -646,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}}
@@ -654,20 +681,23 @@
\newcommand*\Pylang{\proglang{Python}}
\newcommand*\Julialang{\proglang{Julia}}
\newcommand*\Clang{\proglang{C}}
-\newcommand*\CJS@plus{%
+\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
+\def\CJS@plus{%
\ifx\f@family\sfdefault%
\protect\hspace{-.04em}\protect\raisebox{-.125ex}{\larger+}%
\else%
\protect\hspace{-.03em}\protect\raisebox{.25ex}{\smaller+}%
\fi}
-\newcommand*\Cpplang{\proglang{C\CJS@plus\CJS@plus}}
\let\pkg\textbf
\newcommand\code{\bgroup\@makeother\_\@makeother\~\@makeother\$\code@}
\def\code@#1{{\normalfont\ttfamily\hyphenchar\font=-1 #1}\egroup}
\renewcommand*\appendix{\par
\setcounter{section}{0}
\gdef\thesection{\@Alph\c@section}}
-\renewcommand{\@memb@bsec}{\section*{\bibname}\prebibhook}
+\renewcommand{\@memb@bsec}{%
+ \section*{\bibname}%
+ \addcontentsline{toc}{section}{\bibname}%
+ \prebibhook}
\setlocalecaption{english}{bib}{References}
\setlocalecaption{french}{bib}{Références}
\bibliographystyle{\iflanguage{french}{cjs-rcs-fr}{cjs-rcs-en}}
@@ -741,15 +771,25 @@
\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}}
-\newcommand*\CJS@historybox{
+ \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%
\vspace*{40pt}}
\AtEndDocument{\ifCJS@journalinfo\ifCJS@history\CJS@historybox\fi\fi}
+\def\CJS@specialackstatement{}
+\newcommand*\specialack[2]{%
+ \ifstrempty{#1}{}{%
+ \author{#1\CJS@specialackmark}}
+ \ifstrempty{#2}{}{%
+ \CJS@specialacktrue
+ \renewcommand*\CJS@specialackstatement{\CJS@specialackmark\,#2\medskip\newline}}}
+\def\CJS@specialackmark{\textsuperscript{\ensuremath{*}}}
+\newcommand*\specialackmark[1]{%
+ \renewcommand*\CJS@specialackmark{#1}}
diff --git a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
index e63ea57f846..af81d0b88dd 100644
--- a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
+++ b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
@@ -3,9 +3,10 @@
% source pencil...: CC-BY-SA 4.0 https://tex.stackexchange.com/questions/504092/replicating-a-fancy-bordered-text-style-in-latex/504145#504145
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{customenvs}[2024/06/03 0.1.7 Custom classic environments]
+\ProvidesPackage{customenvs}[2024/07/13 0.1.8 Custom classic environments]
%====HISTORIQUE
+% v 0.1.8 Nutriscore
% v 0.1.7 Style perso pour les vignettes
% v 0.1.6 DisplaySkip patch + Patchs pas-tableur
% v 0.1.5 Boxes for exam title + circled numbers + Vignettes + Small simple boxes creation
@@ -1095,6 +1096,93 @@
title={\@ifpackageloaded{babel}{\NoAutoSpacing#2}{#2}\IfBooleanTF{#1}{}{$\cdot$\scalebox{0.6}[0.6]{\faCheckCircle[regular]\!\faCheckCircle[regular]}~}},left=1mm,right=1mm,boxsep=0mm]{#3}%
}
+%====Nutriscore
+\definecolor{couleurNS1}{RGB}{45,126,67}
+\definecolor{couleurNS2}{RGB}{151,186,56}
+\definecolor{couleurNS3}{RGB}{240,202,13}
+\definecolor{couleurNS4}{RGB}{213,123,26}
+\definecolor{couleurNS5}{RGB}{197,52,25}
+\tikzset{noeudNS/.style={pos=0.5,xscale=\echellexNS*\hauteurNS,yscale=\echelleyNS*\hauteurNS}}
+
+\defKV[NUTRISCORE]{%
+ Hauteur=\pgfmathsetmacro{\hauteurNS}{#1},%
+ Ratio=\pgfmathsetmacro{\ratiolargeurbandeNS}{#1},%
+ Symboles=\def\lettresNS{#1},%
+ Legende=\def\legendeNS{#1},%
+ Police=\def\fonteNS{#1},%
+ Couleurs=\def\couleursNS{#1},%
+ EchelleSymboles=\def\echellesymbNS{#1},%
+ CouleurFond=\def\coulbgNS{#1}
+}
+\setKVdefault[NUTRISCORE]{%
+ Hauteur=1,%
+ Ratio={0.6},%
+ Symboles={A,B,C,D,E},%
+ Legende={score},%
+ Police=\sffamily\bfseries,%
+ AffLegende=true,%
+ Couleurs={couleurNS1,couleurNS2,couleurNS3,couleurNS4,couleurNS5},%
+ EchelleSymboles={1.25,1.65},%
+ CouleurFond=white
+}
+
+\NewDocumentCommand\BandeauScore{ O{} D<>{} m }{%
+ \restoreKV[NUTRISCORE]%
+ \setKV[NUTRISCORE]{#1}%
+ \IfEq{#3}{}%
+ {%
+ \xdef\numcasNS{0}%
+ }%
+ {%
+ \xdef\numcasNS{#3}%
+ }%
+ \readlist\letterListNS{\lettresNS}%
+ \xdef\nbcasesNS{\letterListNSlen}%
+ \readlist\colorListNS{\couleursNS}%
+ \xdef\nbcouleursNS{\colorListNSlen}%
+ \pgfmathsetmacro{\largeurcaseNS}{\hauteurNS*\ratiolargeurbandeNS}%
+ \pgfmathsetmacro{\largeurbandeNS}{\largeurcaseNS*\nbcasesNS}%
+ \pgfmathsetmacro{\margeNS}{0.225*\largeurcaseNS/2.4}%
+ \IfSubStr{\echellesymbNS}{,}%
+ {%
+ \StrCut{\echellesymbNS}{,}{\echellexNS}{\echelleyNS}%
+ }%
+ {%
+ \xdef\echellexNS{\echellesymbNS}\xdef\echelleyNS{\echellesymbNS}%
+ }%
+ \begin{tikzpicture}[font=\fonteNS,#2]
+ %---test
+ \filldraw[white,rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,opacity=0] ({-\margeNS},{-\margeNS}) rectangle++ (\nbcasesNS*\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) ;
+ %---testfin
+ \begin{scope}
+ \clip[rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm] (0,0) rectangle (\largeurbandeNS,\hauteurNS);
+ \foreach \tmpiii in {1,...,\letterListNSlen}{%
+ \ifnum\tmpiii=\numcasNS
+ \else
+ \ifnum\tmpiii>\nbcouleursNS
+ \fill[draw=none,lightgray] ({(\tmpiii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\tmpiii]};
+ \else
+ \fill[draw=none,{\colorListNS[\tmpiii]}] ({(\tmpiii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\tmpiii]};
+ \fi
+ \fi
+ }%
+ \end{scope}
+ \xintifboolexpr{\numcasNS >=1 'and' \numcasNS <= \nbcasesNS }%
+ {%
+ \begin{scope}
+ %\clip (-\margeNS,-\margeNS) rectangle++ (\largeurbandeNS+2*\margeNS,\hauteurNS+2*\margeNS);
+ \draw[draw=\coulbgNS,rounded corners=\fpeval{7.25*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,fill={\colorListNS[#3]}] ({(\numcasNS-1)*\largeurcaseNS-\margeNS},{-\margeNS}) rectangle++ (\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) node[noeudNS,white]{\letterListNS[\numcasNS]};
+ \end{scope}
+ }%
+ {%
+ }%
+ %légende
+ \ifboolKV[NUTRISCORE]{AffLegende}%
+ {%
+ \node[above right=1pt,gray,scale=\fpeval{0.5*\hauteurNS},inner sep=1pt] at ({0.125*\margeNS},1.02*\hauteurNS) {\vphantom{QÉ}\MakeUppercase{\legendeNS}};
+ }{}%
+ \end{tikzpicture}%
+}
%%----COMMANDES EN
@@ -1932,4 +2020,91 @@
\fi
+%====BannerScore
+\definecolor{colorNS1}{RGB}{45,126,67}
+\definecolor{colorNS2}{RGB}{151,186,56}
+\definecolor{colorNS3}{RGB}{240,202,13}
+\definecolor{colorNS4}{RGB}{213,123,26}
+\definecolor{colorNS5}{RGB}{197,52,25}
+\tikzset{nodeNS/.style={pos=0.5,xscale=\echellexNS*\hauteurNS,yscale=\echelleyNS*\hauteurNS}}
+
+\defKV[NUTRISCOREEN]{%
+ Height=\pgfmathsetmacro{\hauteurNS}{#1},%
+ Ratio=\pgfmathsetmacro{\ratiolargeurbandeNS}{#1},%
+ Symbols=\def\lettresNS{#1},%
+ Legend=\def\legendeNS{#1},%
+ Font=\def\fonteNS{#1},%
+ Colors=\def\couleursNS{#1},%
+ ScaleSymbols=\def\echellesymbNS{#1},%
+ Colbg=\def\coulbgNS{#1}
+}
+\setKVdefault[NUTRISCOREEN]{%
+ Height=1,%
+ Ratio={0.6},%
+ Symbols={A,B,C,D,E},%
+ Legend={score},%
+ Font=\sffamily\bfseries,%
+ ShowLegend=true,%
+ Colors={colorNS1,colorNS2,colorNS3,colorNS4,colorNS5},%
+ ScaleSymbols={1.25,1.65},%
+ Colbg=white
+}
+
+\NewDocumentCommand\ScoreBanner{ O{} D<>{} m }{%
+ \restoreKV[NUTRISCOREEN]%
+ \setKV[NUTRISCOREEN]{#1}%
+ \IfEq{#3}{}%
+ {%
+ \xdef\numcasNS{0}%
+ }%
+ {%
+ \xdef\numcasNS{#3}%
+ }%
+ \readlist\letterListNS{\lettresNS}%
+ \xdef\nbcasesNS{\letterListNSlen}%
+ \readlist\colorListNS{\couleursNS}%
+ \xdef\nbcouleursNS{\colorListNSlen}%
+ \pgfmathsetmacro{\largeurcaseNS}{\hauteurNS*\ratiolargeurbandeNS}%
+ \pgfmathsetmacro{\largeurbandeNS}{\largeurcaseNS*\nbcasesNS}%
+ \pgfmathsetmacro{\margeNS}{0.225*\largeurcaseNS/2.4}%
+ \IfSubStr{\echellesymbNS}{,}%
+ {%
+ \StrCut{\echellesymbNS}{,}{\echellexNS}{\echelleyNS}%
+ }%
+ {%
+ \xdef\echellexNS{\echellesymbNS}\xdef\echelleyNS{\echellesymbNS}%
+ }%
+ \begin{tikzpicture}[font=\fonteNS,#2]
+ %---test
+ \filldraw[white,rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,opacity=0] ({-\margeNS},{-\margeNS}) rectangle++ (\nbcasesNS*\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) ;
+ %---testfin
+ \begin{scope}
+ \clip[rounded corners=\fpeval{5*\largeurcaseNS*\ratiolargeurbandeNS}mm] (0,0) rectangle (\largeurbandeNS,\hauteurNS);
+ \foreach \iii in {1,...,\letterListNSlen}{%
+ \ifnum\iii=\numcasNS
+ \else
+ \ifnum\iii>\nbcouleursNS
+ \fill[draw=none,lightgray] ({(\iii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\iii]};
+ \else
+ \fill[draw=none,{\colorListNS[\iii]}] ({(\iii-1)*\largeurcaseNS},0) rectangle ++(\largeurcaseNS,\hauteurNS) node[noeudNS,white,opacity=0.66]{\letterListNS[\iii]};
+ \fi
+ \fi
+ }%
+ \end{scope}
+ \xintifboolexpr{\numcasNS >=1 'and' \numcasNS <= \nbcasesNS }%
+ {%
+ \begin{scope}
+ %\clip (-\margeNS,-\margeNS) rectangle++ (\largeurbandeNS+2*\margeNS,\hauteurNS+2*\margeNS);
+ \draw[draw=\coulbgNS,rounded corners=\fpeval{7.25*\largeurcaseNS*\ratiolargeurbandeNS}mm,line width=\fpeval{1.5*\largeurcaseNS*\ratiolargeurbandeNS}mm,fill={\colorListNS[#3]}] ({(\numcasNS-1)*\largeurcaseNS-\margeNS},{-\margeNS}) rectangle++ (\largeurcaseNS+2*\margeNS,\hauteurNS+2*\margeNS) node[noeudNS,white]{\letterListNS[#3]};
+ \end{scope}
+ }%
+ {}%
+ %légende
+ \ifboolKV[NUTRISCOREEN]{ShowLegend}%
+ {%
+ \node[above right=1pt,gray,scale=\fpeval{0.5*\hauteurNS},inner sep=1pt] at ({0.125*\margeNS},1.02*\hauteurNS) {\MakeUppercase{\legendeNS}};
+ }{}%
+ \end{tikzpicture}%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty b/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty
index 915d61a0d1e..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/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
index dbae3ce9b8c..3387c280797 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-2023
+%% Copyright (C) 2015-2024
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2024/02/12 v1.8 Urls (qrcode) for DTK (HO,hv,rn)]
+\ProvidesPackage{dtk-url}[2024/06/26 v1.9 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
\RequirePackage{xcolor}
@@ -40,6 +40,8 @@
\let\URL\url
\let\CTANurl\ctanurl
+\DeclareUrlCommand\File{\urlstyle{tt}}
+
\DeclareUrlCommand\DTK@Url{%
\DTK@UrlSetup
\def\UrlLeft{}%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index cc314c4a1ad..15507b11044 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -23,8 +23,8 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\def\DTKversion{2.10e}
-\def\DTKversiondate{2024/02/22}
+\def\DTKversion{2.10f}
+\def\DTKversiondate{2024/06/27}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
\RequirePackage{iftex}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 24c225b1d39..57d6da29850 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/09}{2024cp}
+\ProvidesExplPackage{easybase}{2024/08/06}{2024dh}
{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
{
@@ -91,7 +91,11 @@
\IfNoValueTF{#1}
{\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}}
{\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}}
+ \IfFileExists{#2.sty}{}
+ {\msg_warning:nnn { easybase } { package-not-found } {#2}}
}
+\msg_new:nnn { easybase } { package-not-found }
+ { The~macro~package~'#1'~can't~be~found. }
\cs_new_protected:Npn \ebloadpackage #1
{
\int_compare:nTF { \clist_count:n {#1} <= 1 }
@@ -167,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
{
@@ -224,7 +228,6 @@
\ebloadpackage
{
[text]{spbmark},
- [normalem]{ulem},
[{shortlabels,inline}]{enumitem},
chemformula,siunitx,pifont,
geometry,marginnote,
@@ -521,7 +524,7 @@
\UseFntSymbsList{empty}
\cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList
\cs_set_eq:NN \setfntsymbol \UseFntSymbsList
-\cs_new:Npn \eb_int_format_trans:NN #1
+\cs_new:Npn \eb_int_type_trans:NN #1
{
\str_case:nn {#1}
{
@@ -556,29 +559,44 @@
}
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\cs_generate_variant:Nn \msg_warning:nnnn { nnnV }
\cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2
{
\tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2}
\clist_map_inline:nn
{ A,a,1,I,i,c,s }
{
- \regex_match:nnT {##1} {#2}
+ \regex_match:nnTF {##1} {#2}
{
\regex_replace_once:nnN {##1}
- { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} }
+ { \c{eb_int_type_trans:NN} ##1 \c{c@footnote} }
\l__eb_fnmarktext_short_tokens_tl
- \seq_map_break:
+ \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
+ \clist_map_break:
+ }
+ {
+ \str_if_eq:nnT {##1} { s }
+ {
+ \str_if_eq:nnTF {#1} { \thefootnote }
+ { \str_set:Nn \l_tmpa_str { \thedownfootnote } }
+ { \str_set:Nn \l_tmpa_str { \theupfootnote } }
+ \msg_warning:nnnV { easybase } { unknown-fnt-type } {#2} \l_tmpa_str
+ }
}
}
- \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl
\cs_set_eq:NN \thedownfootnote \thefootnote
}
+\msg_new:nnn { easybase } { unknown-fnt-type }
+ {
+ The~'#1'~includes~unknown~footnote~numbering~type \\
+ in~#2.
+ }
\cs_new_protected:Npn \eb_footnote_value_handle:n #1
{
\str_case:nnF {#1}
{
{ bottom }
- { \bool_set_true:N \l__eb_fnpara_bottom_bool }
+ { \PushFntBottom }
{ flush }
{
\tl_set:Nn \l__eb_footnote_value_tl { plain }
@@ -611,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
@@ -659,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} }
@@ -669,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
+ {
+ \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
{
- \bool_if:NT \l__eb_fnpara_bottom_bool
+ \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:
{
@@ -776,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
@@ -791,9 +842,9 @@
\ctex_at_end_package:nn { footmisc }
{
\eb_package_date_check:nn { footmisc } { 2022/02/10 }
- \boolfalse{FN@setspace}
\ifbool{FN@para}{}
{
+ \boolfalse{FN@setspace}
\cs_set_eq:NN \@makefntext \eb@@makefntext
\cs_set_eq:NN \@footnotetext \eb@@footnotetext
}
@@ -1057,22 +1108,22 @@
\skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
-\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
- {
- \tl_set_eq:cc { CTEX@#2@beforeskip } { CTEX@#1@beforeskip }
- \tl_set_eq:cc { CTEX@#2@afterskip } { CTEX@#1@afterskip }
- \bool_set_eq:cc { CTEX@#2@numbering } { CTEX@#1@numbering }
- \bool_set_eq:cc { CTEX@#2@fixskip } { CTEX@#1@fixskip }
- \bool_set_eq:cc { CTEX@#2@hang } { CTEX@#1@hang }
- \bool_set_eq:cc { CTEX@#2@runin } { CTEX@#1@runin }
- \cs_set_eq:cc { CTEX@#2@tocline } { CTEX@#1@tocline }
- \tl_set_eq:cc { CTEX@#2@break } { CTEX@#1@break }
- \tl_set_eq:cc { CTEX@#2@format } { CTEX@#1@format }
- \tl_set_eq:cc { CTEX@#2@nameformat } { CTEX@#1@nameformat }
- \tl_set_eq:cc { CTEX@#2@numberformat } { CTEX@#1@numberformat }
- \tl_set_eq:cc { CTEX@#2@titleformat } { CTEX@#1@titleformat }
- \tl_set_eq:cc { CTEX@#2@aftername } { CTEX@#1@aftername }
- \tl_set_eq:cc { CTEX@#2@aftertitle } { CTEX@#1@aftertitle }
+\cs_new_protected:Npn \CopyTitleFormat #1#2
+ {
+ \tl_set_eq:cc { CTEX@#1@beforeskip } { CTEX@#2@beforeskip }
+ \tl_set_eq:cc { CTEX@#1@afterskip } { CTEX@#2@afterskip }
+ \bool_set_eq:cc { CTEX@#1@numbering } { CTEX@#2@numbering }
+ \bool_set_eq:cc { CTEX@#1@fixskip } { CTEX@#2@fixskip }
+ \bool_set_eq:cc { CTEX@#1@hang } { CTEX@#2@hang }
+ \bool_set_eq:cc { CTEX@#1@runin } { CTEX@#2@runin }
+ \cs_set_eq:cc { CTEX@#1@tocline } { CTEX@#2@tocline }
+ \tl_set_eq:cc { CTEX@#1@break } { CTEX@#2@break }
+ \tl_set_eq:cc { CTEX@#1@format } { CTEX@#2@format }
+ \tl_set_eq:cc { CTEX@#1@nameformat } { CTEX@#2@nameformat }
+ \tl_set_eq:cc { CTEX@#1@numberformat } { CTEX@#2@numberformat }
+ \tl_set_eq:cc { CTEX@#1@titleformat } { CTEX@#2@titleformat }
+ \tl_set_eq:cc { CTEX@#1@aftername } { CTEX@#2@aftername }
+ \tl_set_eq:cc { CTEX@#1@aftertitle } { CTEX@#2@aftertitle }
}
\NewDocumentCommand{\NewTitleCommand}{omm}
{
@@ -1094,7 +1145,7 @@
{ \CTEXnumberline{##1}##2 }
\exp_args:Nc \providecommand { ttll@#2 }{#3}
\exp_args:Nc \providecommand { toclevel@#2 }{#3}
- \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
+ \IfValueT{#1}{\CopyTitleFormat{#2}{#1}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -1110,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 }
}
}
@@ -1171,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* }
@@ -1314,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,
@@ -1513,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 }
}
@@ -1541,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} }
@@ -1554,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
{
@@ -1625,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
@@ -1688,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
{
@@ -1710,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} }
@@ -1745,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},
@@ -1785,8 +1847,31 @@
}
\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}
{
@@ -1804,7 +1889,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}
@@ -1978,6 +2063,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 }
{
@@ -1998,7 +2086,7 @@
\theoremstyle{default}
\cs_undefine:N \proof
\DeclareFloatList{theorem}{loe}
- \AllotPartialExt{loe}{ple}
+ \AssignPartialExt{loe}{ple}
\eb_preto_cmd:nn { listoftheorems }
{
\group_begin:
@@ -2109,7 +2197,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
@@ -2157,7 +2245,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
@@ -2382,6 +2470,91 @@
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 =
+ {
+ \LARGE\@title\par\vskip 3em
+ \large
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par\vskip 1.5em
+ \@date
+ },
+ beforecode =
+ {
+ \ifbool{@titlepage}
+ {
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let\footnote\thanks
+ \null\vfil
+ }
+ {\null}
+ \vskip 60\p@
+ },
+ aftercode =
+ {
+ \@thanks
+ \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 7b5a6e44559..22321115682 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/09}{2024cp}
+\ProvidesExplClass{easybook}{2024/08/06}{2024dh}
{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 332ebebd3f9..495a48cdc21 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/09}{2024cp}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/06}{2024dh}
{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/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
index d032e49860a..314c337e3e0 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-02}
+ {2.0.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,219 @@
\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
+\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_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 +332,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 +456,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 +531,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:
+
+% SET AND PROCESS KEYS
-% 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:
+\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 +556,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 +629,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 +688,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 +747,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 +795,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 +917,41 @@
{ \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 }
\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 +971,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 +1021,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,7 +1193,15 @@
{ \tiny #1 \par }
}
-\NewDocumentCommand \PrintFontSizeCommand { } { \__fontscale_print_name: }
+\NewDocumentCommand \PrintFontSizeCommand { }
+ {
+ \mode_if_math:TF
+ {
+ \msg_error:nne { fontscale } { math-mode-error }
+ { \token_to_str:N \PrintFontSizeCommand }
+ }
+ { \__fontscale_print_name: }
+ }
\cs_new_protected:Npn \__fontscale_print_name:
{
\dim_case:nn { \f@size pt }
@@ -1235,14 +1267,14 @@
{ \token_to_str:N \Huge \prg_break: }
}
}
- UNDEFINED \@
+ \token_to_str:N \undefined
\prg_break:
\prg_break_point:
}
% 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 +1284,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/heria/heria.cls b/Master/texmf-dist/tex/latex/heria/heria.cls
index ed545f9b84e..9c581bbe329 100644
--- a/Master/texmf-dist/tex/latex/heria/heria.cls
+++ b/Master/texmf-dist/tex/latex/heria/heria.cls
@@ -8,11 +8,11 @@
%%
%% This is a generated file.
%%
-%% Copyright 2023 Tristan Miller
+%% Copyright 2023, 2024 Tristan Miller
%% Copyright 2016 John Kormylo
%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{heria}
-[2023-12-04 v3.2.1.0 Class for Horizon Europe (R)IA proposals]
+[2024-07-14 v3.4.1.0 Class for Horizon Europe (R)IA proposals]
\LoadClass[11pt,a4paper]{article}
\RequirePackage[T1]{fontenc} % T1 font encoding
\RequirePackage[left=15mm,
@@ -60,6 +60,18 @@
\definecolor{footergrey}{HTML}{D8D8D8}
\definecolor{tablegrey}{HTML}{F2F2F2}
\definecolor{summaryblue}{HTML}{00B0F0}
+\gdef\@templateversion{3.4} % Default version
+\def\@supportedtemplateversions{3.2,3.3,3.4} % Supported versions
+\ExplSyntaxOn
+\NewDocumentCommand{\templateversion}{m}{%
+ \clist_if_in:NnTF {\@supportedtemplateversions} {#1}
+ {\gdef\@templateversion{#1}}
+ {\PackageError{heria}%
+ {unsupported~template~version}%
+ {Use~one~of~\@supportedtemplateversions}
+ }%
+}
+\ExplSyntaxOff
\newcommand{\callname}[1]{\gdef\@callname{#1}}%
\newcommand{\callidentifier}[1]{\gdef\@callidentifier{#1}}%
\newcommand{\calltopic}[1]{\gdef\@calltopic{#1}}%
@@ -718,7 +730,6 @@
}{%
\end{tcolorbox}%
}
-\RequirePackage{everypage}
\RequirePackage{environ}
\newcounter{abspage}% \thepage not reliab
\newcommand{\newSFPage}[1]% #1 = \theabspage
@@ -733,15 +744,17 @@
\rotatebox{90}{\parbox[c][\textwidth][c]{\textheight}{\BODY}}%
\fi
\end{figure}}
-\AddEverypageHook{% check if sideways figure on this page
- \ifdim\textwidth=\textheight
- \stepcounter{abspage}% already in landscape
- \else
- \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
- \stepcounter{abspage}%
- \@ifundefined{SFPage@\theabspage}{}%
- {\global\pdfpageattr{/Rotate 90}}%
- \fi}
+\AddToHook{shipout/background}{% check if sideways figure on this page
+ \put(1in,-1in){%
+ \ifdim\textwidth=\textheight
+ \stepcounter{abspage}% already in landscape
+ \else
+ \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
+ \stepcounter{abspage}%
+ \@ifundefined{SFPage@\theabspage}{}%
+ {\global\pdfpageattr{/Rotate 90}}%
+ \fi}%
+ }
\RequirePackage{newtxtext} % Use Times for main text
\RequirePackage{newtxmath} % Use Times for math
\renewcommand*\ttdefault{lmvtt} % Latin Modern Typewriter Proportional
diff --git a/Master/texmf-dist/tex/latex/heria/hi-methodology.tex b/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
index 0ba1b503aab..b672aa0a834 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-methodology.tex
@@ -31,7 +31,7 @@
environmental objectives of the EU Taxonomy Regulation.}
\item
\emph{If you plan to use, develop and/or deploy artificial
- intellingence (AI) based systems and/or techniques you must
+ intelligence (AI) based systems and/or techniques you must
demonstrate their technical robustness. AI-based systems or techniques
should be, or be developed to become:~}
diff --git a/Master/texmf-dist/tex/latex/heria/hi-workplan.tex b/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
index 20070b17c37..db64e7da4eb 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-workplan.tex
@@ -40,12 +40,33 @@ Please provide the following:
\item
\emph{Give full details. Base your account on the logical structure of
the project and the stages in which it is to be carried out.}
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
\emph{The number of work packages should be proportionate to the scale
and complexity of the project.}
\item
\emph{You should give enough detail in each work package to justify
the proposed resources to be allocated and also quantified information
so that progress can be monitored, including by the Commission}
+\else
+ \emph{Each work package should be a substantial part of the work
+ plan, and the number of work packages should be proportionate to
+ the scale and complexity of the project.}
+\item \emph{Structure each work package by breaking it down into
+ tasks. If tasks are not appropriate, work packages can be
+ organised according to other criteria (e.g., according to the type
+ of work or thematically). For each task or element of the work
+ package, describe all activities to be carried out and quantify
+ them (e.g., number of protocols, tests, measurements,
+ combinations, study subjects, conferences, publications,
+ etc.). Provide enough detail to clarify who will do this work and
+ why it is needed for the project, (e.g., the level of
+ qualification and number of person-months for personnel, as well
+ as the requested equipment, consumables, meetings, etc.), to
+ justify the proposed resources and so that progress can be
+ monitored, including by the Commission.}
+\fi
+\makeatother
\item
\emph{Resources assigned to work packages should be in line with their
objectives and deliverables. You are advised to include a distinct
diff --git a/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex b/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
index 4697c862162..1146119f66e 100644
--- a/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
+++ b/Master/texmf-dist/tex/latex/heria/hi-wp-description.tex
@@ -8,9 +8,15 @@
%%
%% This is a generated file.
%%
+\makeatletter
+\ifdim\@templateversion pt<3.4pt
(where appropriate, broken down into tasks), lead partner and role of
participants. Deliverables linked to each WP are listed in table 3.1c
(no need to repeat the information here).
+\else
+(where appropriate, broken down into tasks), lead partner and role of participants. For each task, quantify the amount of work. Provide enough detail to justify the resources requested and clarify why the work is needed and who will do it. Deliverables linked to each WP are listed in table 3.1c (no need to repeat the information here).
+\fi
+\makeatother
\endinput
%%
%% End of file `hi-wp-description.tex'.
diff --git a/Master/texmf-dist/tex/latex/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/jigsaw/jigsaw-doc-settings.sty b/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty
deleted file mode 100644
index 13a1498c38e..00000000000
--- a/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty
+++ /dev/null
@@ -1,196 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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}
-\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}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Listings
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage[
- cachedir=./build/
-]{minted}
-
-% smuggling custom pygmentize style in cache folder
-% (a real pygmentise style would need installtion in some python folder)
-\begin{filecontents*}[noheader]{./build/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}{##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*}
-
-\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/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
new file mode 100644
index 00000000000..ea33fb4fb59
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
@@ -0,0 +1,1035 @@
+%% Copyright 2024 Jonathan Walls
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl/lppl-1-3c.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Jonathan Walls.
+%
+% This work consists of the files luwiantype.sty, luwiantype-doc.tex
+% and the derived file luwiantype-doc.pdf.
+%
+%
+% Version history:
+% 1.2 - updated to resolve some minor typos and command formatting
+% 1.1 - updated to comply with CTAN formatting requirements, adjustments to licensing
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{luwiantype}[2024/07/15 Luwian Hieroglyph Typing Package]
+
+%Required packages and declarations
+\usepackage{fontspec}
+\usepackage{graphicx}
+\usepackage{stackengine}
+\usepackage{moresize}
+
+%Commands for font selection and import
+\newcommand{\Luwian}{\setmainfont[ExternalLocation=Fonts/]{LuwianFont.ttf}\Large}
+\newcommand{\Lat}{\setmainfont{Charis SIL}\normalsize}
+
+%Formatting commands
+\newcommand{\badeq}{\char"2E17}
+\newcommand{\hl}{\char"2308}
+\newcommand{\hr}{\char"2309}
+\newcommand{\tsup}[1]{\textsuperscript{#1}}
+\newcommand{\tsub}[1]{\textsubscript{#1}}
+\newcommand{\boust}[1]{\reflectbox{#1}}
+\newcommand{\gstack}{\Shortunderstack}
+
+
+
+%Main sign commands
+\newcommand{\EGO}[1][]{
+ \ifx\relax#1\relax
+ {\char"14400}
+ \else \ifnum #1=2
+ {\char"14401}
+ \fi\fi
+}
+\newcommand{\LIII}{\char"14402}
+\newcommand{\MONS}[1][]{
+ \ifx\relax#1\relax
+ {\char"144EC}
+ \else \ifnum #1=2
+ {\char"14403}
+ \fi\fi
+}
+\newcommand{\LV}{\char"14404}
+\newcommand{\ADORARE}{\char"14405}
+\newcommand{\EDERE}{\char"14406}
+\newcommand{\BIBERE}{\char"14407}
+\newcommand{\AMPLECTI}{\char"14408}
+\newcommand{\CAPUT}{\char"14409}
+\newcommand{\CAPUTSCALPRUM}{\char"1440A}
+\newcommand{\LXI}{\char"1440B}
+\newcommand{\STATUA}{\char"1440C}
+\newcommand{\LXIII}{\char"1440D}
+\newcommand{\PRAE}{\char"1440E}
+\newcommand{\PARI}{\char"1440E}
+\newcommand{\DOMINA}{\char"1440F}
+\newcommand{\MAGNUSDOMINA}{\char"14410}
+\newcommand{\REX}{\char"14411}
+\newcommand{\MAGNUSREX}{\char"14412}
+\newcommand{\A}[1][]{
+ \ifx\relax#1\relax
+ {\char"145F7}
+ \else \ifnum #1=2
+ {\char"14413}
+ \fi\fi
+}
+\newcommand{\LXX}{\char"14414}
+\newcommand{\HEROS}{\char"14415}
+\newcommand{\LOQUI}{\char"14416}
+\newcommand{\LXXIII}{\char"14417}
+\newcommand{\LIS}{\char"14418}
+\newcommand{\OCULUS}{\char"14419}
+\newcommand{\FRONS}{\char"1441A}
+\newcommand{\VERSUS}{\char"1441B}
+\newcommand{\LIBARE}{\char"1441C}
+\newcommand{\FORTIS}{\char"1441D}
+\newcommand{\TA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14470}
+ \else \ifnum #1=2
+ {\char"1441E}
+ \else \ifnum #1=3
+ {\char"1442C}
+ \else \ifnum #1=6
+ {\char"1445B}
+ \fi\fi\fi\fi
+}
+\newcommand{\LXXX}{\char"1441F}
+\newcommand{\LIGARE}{\char"14420}
+\newcommand{\PUGNUSPUGNUS}{\char"14420}
+\newcommand{\BRACCHIUM}{\char"14421}
+\newcommand{\LXXXIII}{\char"14422}
+\newcommand{\POST}{\char"14423}
+\newcommand{\NA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14424}
+ \else \ifnum #1=2
+ {\char"1445D}
+ \fi\fi
+}
+\newcommand{\LITUUSNA}{\char"14425}
+\newcommand{\LXXXVII}{\char"14426}
+\newcommand{\LXXXVIII}{\char"14427}
+\newcommand{\PUGNUS}{\char"14428}
+\newcommand{\PUGNUSX}{\char"14429}
+\newcommand{\LXL}{\char"1442A}
+\newcommand{\CAPERE}[1][]{
+ \ifx\relax#1\relax
+ {\char"1442B}
+ \else \ifnum #1=2
+ {\char"1442E}
+ \fi\fi
+}
+\newcommand{\CAPEREIICAPEREII}{\char"1442D}
+\newcommand{\LXLIV}{\char"1442F}
+\newcommand{\INFANS}{\char"14430}
+\newcommand{\FILIUS}{\char"14430}
+\newcommand{\FILIA}{\char"14431}
+\newcommand{\REXINFANS}{\char"14432}
+\newcommand{\REXFILIUS}{\char"14432}
+\newcommand{\REXFILIA}{\char"14433}
+\newcommand{\MAGNUSFILIA}{\char"14434}
+\newcommand{\LXLVII}{\char"14435}
+\newcommand{\LXLVIII}{\char"14436}
+\newcommand{\ATAII}{\char"14437}
+\newcommand{\LL}{\char"14438}
+\newcommand{\LLI}{\char"14439}
+\newcommand{\MANUSCULTER}{\char"1443A}
+\newcommand{\ENSIS}{\char"1443B}
+\newcommand{\LLIV}{\char"1443C}
+\newcommand{\NI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D0}
+ \else \ifnum #1=2
+ {\char"144F5}
+ \else \ifnum #1=3
+ {\char"1443D}
+ \fi\fi\fi
+}
+\newcommand{\KA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145E7}
+ \else \ifnum #1=2
+ {\char"1443E}
+ \fi\fi
+}
+\newcommand{\INFRA}{\char"1443F}
+\newcommand{\SUB}{\char"1443F}
+\newcommand{\CUM}{\char"14440}
+\newcommand{\MANUS}{\char"14441}
+\newcommand{\LLX}{\char"14442}
+\newcommand{\LLXI}{\char"14443}
+\newcommand{\LONGUS}{\char"14444}
+\newcommand{\LLXIII}{\char"14445}
+\newcommand{\LLXIV}{\char"14446}
+\newcommand{\PONERE}{\char"14447}
+\newcommand{\DARE}{\char"14448}
+\newcommand{\PI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14449}
+ \fi
+}
+\newcommand{\MANDARE}[1][]{
+ \ifx\relax#1\relax
+ {\char"1444A}
+ \else \ifnum #1=2
+ {\char"1444B}
+ \fi\fi
+}
+\newcommand{\DAREDARE}{\char"1444A}
+\newcommand{\LLXVII}{\char"1444C}
+\newcommand{\LLXVIII}{\char"1444D}
+\newcommand{\LLXIX}{\char"1444E}
+\newcommand{\SUPER}{\char"1444F}
+\newcommand{\SARAI}{\char"14555}
+\newcommand{\LLXXI}{\char"14450}
+\newcommand{\LLXXII}{\char"14451}
+\newcommand{\AUDIRE}{\char"14452}
+\newcommand{\LLXXIV}{\char"14453}
+\newcommand{\LLXXV}{\char"14454}
+\newcommand{\LLXXVI}{\char"14455}
+\newcommand{\LLXXVII}{\char"14456}
+\newcommand{\ALA}{\char"14457}
+\newcommand{\FEMINA}{\char"14458}
+\newcommand{\MATER}{\char"14458}
+\newcommand{\SARMA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14459}
+ \else \ifnum #1=2
+ {\char"1445A}
+ \fi\fi
+}
+\newcommand{\CRUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1445B}
+ \else \ifnum #1=2
+ {\char"1445D}
+ \fi\fi
+}
+\newcommand{\CRUSFLUMEN}{\char"1445C}
+\newcommand{\GENUFLECTERE}{\char"1445E}
+\newcommand{\CRUSCRUS}{\char"1445F}
+\newcommand{\LLXXXVII}{\char"14460}
+\newcommand{\LLXXXVIII}{\char"14461}
+\newcommand{\TU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14462}
+ \else \ifnum #1=2
+ {\char"1456C}
+ \else \ifnum #1=3
+ {\char"1456D}
+ \else \ifnum #1=4
+ {\char"14506}
+ \fi\fi\fi\fi
+}
+\newcommand{\PES}[1][]{
+ \ifx\relax#1\relax
+ {\char"14463}
+ \else \ifnum #1=2
+ {\char"14466}
+ \fi\fi
+}
+\newcommand{\TI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14463}
+ \else \ifnum #1=2
+ {\char"1461F}
+ \else \ifnum #1=3
+ {\char"14644}
+ \fi\fi\fi
+}
+\newcommand{\PESSCALAROTAE}{\char"14464}
+\newcommand{\LXCII}{\char"14465}
+\newcommand{\LXCIV}{\char"14467}
+\newcommand{\PESIIPESII}{\char"14468}
+\newcommand{\PESIIPES}{\char"14469}
+\newcommand{\LEO}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446A}
+ \else \ifnum #1=2
+ {\char"1446B}
+ \fi\fi
+}
+\newcommand{\BESTIA}{\char"1446A}
+\newcommand{\CANIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446C}
+ \else \ifnum #1=2
+ {\char"1446D}
+ \fi\fi
+}
+\newcommand{\EQUUS}{\char"1446E}
+\newcommand{\ASINUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1446F}
+ \else \ifnum #1=2
+ {\char"14471}
+ \fi\fi
+}
+\newcommand{\ASINUSIIA}{\char"14472}
+\newcommand{\CERVUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14473}
+ \else \ifnum #1=2
+ {\char"14474}
+ \else \ifnum #1=3
+ {\char"14475}
+ \fi\fi\fi
+}
+\newcommand{\RU}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D1}
+ \else \ifnum #1=2
+ {\char"14473}
+ \fi\fi
+}
+\newcommand{\CAPRA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14476}
+ \else \ifnum #1=2
+ {\char"14478}
+ \fi\fi
+}
+\newcommand{\SA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D4}
+ \else \ifnum #1=2
+ {\char"145E6}
+ \else \ifnum #1=3
+ {\char"14477}
+ \else \ifnum #1=4
+ {\char"145C6}
+ \else \ifnum #1=5
+ {\char"1456E}
+ \else \ifnum #1=6
+ {\char"14500}
+ \else \ifnum #1=7
+ {\char"14563}
+ \else \ifnum #1=8
+ {\char"145AD}
+ \fi\fi\fi\fi\fi\fi\fi\fi
+}
+\newcommand{\CAPRAIIA}{\char"14479}
+\newcommand{\BOS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1447A}
+ \else \ifnum #1=2
+ {\char"1447C}
+ \fi\fi
+}
+\newcommand{\U}{\char"1447B}
+\newcommand{\LCVI}{\char"1447D}
+\newcommand{\BOSMI}{\char"1447E}
+\newcommand{\MU}{\char"1447F}
+\newcommand{\MUWA}{\char"14480}
+\newcommand{\BOSIIMI}{\char"14481}
+\newcommand{\CORNU}{\char"14482}
+\newcommand{\SU}[1][]{
+ \ifx\relax#1\relax
+ {\char"145A2}
+ \else \ifnum #1=2
+ {\char"14482}
+ \else \ifnum #1=3
+ {\char"145F5}
+ \fi\fi\fi
+}
+\newcommand{\VITELLUS}{\char"14483}
+\newcommand{\OVIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14484}
+ \else \ifnum #1=2
+ {\char"14486}
+ \else \ifnum #1=3
+ {\char"14487}
+ \fi\fi\fi
+}
+\newcommand{\MA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14485}
+ \else \ifnum #1=2
+ {\char"14598}
+ \else \ifnum #1=3
+ {\char"14556}
+ \fi\fi\fi
+}
+\newcommand{\LINGERE}{\char"14488}
+\newcommand{\ZA}[1][]{
+ \ifx\relax#1\relax
+ {\char"145AA}
+ \else \ifnum #1=2
+ {\char"14579}
+ \else \ifnum #1=3
+ {\char"1457C}
+ \else \ifnum #1=4
+ {\char"14488}
+ \fi\fi\fi\fi
+}
+\newcommand{\LCXIII}{\char"14489}
+\newcommand{\LITUUSU}{\char"1448A}
+\newcommand{\LEPUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1448B}
+ \else \ifnum #1=2
+ {\char"1448C}
+ \fi\fi
+}
+\newcommand{\TAPA}{\char"1448C}
+\newcommand{\LCXVI}{\char"1448D}
+\newcommand{\LCXVII}{\char"1448E}
+\newcommand{\LCXVIII}{\char"1448F}
+\newcommand{\LCXIX}{\char"14490}
+\newcommand{\GRYLLUS}{\char"14491}
+\newcommand{\SPHINX}{\char"14492}
+\newcommand{\LCXXII}{\char"14493}
+\newcommand{\LCXXIII}{\char"14494}
+\newcommand{\LCXXIV}{\char"14495}
+\newcommand{\LI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14539}
+ \else \ifnum #1=2
+ {\char"14496}
+ \else \ifnum #1=3
+ {\char"14547}
+ \fi\fi\fi
+}
+\newcommand{\UNGULA}{\char"14497}
+\newcommand{\LCXXVI}{\char"14498}
+\newcommand{\LCXXVII}{\char"14499}
+\newcommand{\AVIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1449A}
+ \else \ifnum #1=2
+ {\char"1449E}
+ \else \ifnum #1=3
+ {\char"1449C}
+ \else \ifnum #1=4
+ {\char"1449F}
+ \else \ifnum #1=5
+ {\char"1449D}
+ \fi\fi\fi\fi\fi
+}
+\newcommand{\ZI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145A9}
+ \else \ifnum #1=2
+ {\char"14560}
+ \else \ifnum #1=3
+ {\char"1457B}
+ \else \ifnum #1=4
+ {\char"1449A}
+ \fi\fi\fi\fi
+}
+\newcommand{\LCXXIX}{\char"1449B}
+\newcommand{\AQUILA}{\char"1449F}
+\newcommand{\ARAI}{\char"144A0}
+\newcommand{\AVISX}{\char"144A1}
+\newcommand{\LCXXXVA}{\char"144A2}
+\newcommand{\LCXXXVI}{\char"144A3}
+\newcommand{\LIBATIO}{\char"144A4}
+\newcommand{\PISCIS}{\char"144A5}
+\newcommand{\LCXXXIX}{\char"144A6}
+\newcommand{\LCXL}{\char"144A7}
+\newcommand{\LCXLI}{\char"144A8}
+\newcommand{\LXCLII}{\char"144A9}
+\newcommand{\LCXLIII}{\char"144AA}
+\newcommand{\LCXLIV}{\char"144AB}
+\newcommand{\LCXLV}{\char"144AC}
+\newcommand{\LCXLVI}{\char"144AD}
+\newcommand{\LCXLVII}{\char"144AE}
+\newcommand{\JANUS}{\char"144AF}
+\newcommand{\LCXLIX}{\char"144B0}
+\newcommand{\LCL}{\char"144B1}
+\newcommand{\TELIPINU}{\char"144B2}
+\newcommand{\LCLII}{\char"144B3}
+\newcommand{\NU}[1][]{
+ \ifx\relax#1\relax
+ {\char"144B4}
+ \else \ifnum #1=2
+ {\char"145BF}
+ \fi\fi
+}
+\newcommand{\LCLIV}{\char"144B5}
+\newcommand{\LCLV}{\char"144B6}
+\newcommand{\LCLVI}{\char"144B7}
+\newcommand{\LCLVII}{\char"144B8}
+\newcommand{\LCLVIII}{\char"144B9}
+\newcommand{\LCLIX}{\char"144BA}
+\newcommand{\VITIS}{\char"144BB}
+\newcommand{\WIYA}{\char"144BB}
+\newcommand{\LCLXI}{\char"144BC}
+\newcommand{\LCLXII}{\char"144BD}
+\newcommand{\LCLXIII}{\char"144BE}
+\newcommand{\LCLXIV}{\char"144BF}
+\newcommand{\BONUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"144C0}
+ \else \ifnum #1=2
+ {\char"145A2}
+ \fi\fi
+}
+\newcommand{\WAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145EC}
+ \else \ifnum #1=2
+ {\char"144C1}
+ \else \ifnum #1=3
+ {\char"144C0}
+ \else \ifnum #1=4
+ {\char"144EC}
+ \else \ifnum #1=5
+ {\char"144E9}
+ \else \ifnum #1=6
+ {\char"144E4}
+ \else \ifnum #1=7
+ {\char"14541}
+ \else \ifnum #1=9
+ {\char"1453B}
+ \fi\fi\fi\fi\fi\fi\fi\fi
+}
+\newcommand{\LCLXVII}{\char"144C2}
+\newcommand{\LCLXVIII}{\char"144C3}
+\newcommand{\LCLXIX}{\char"144C4}
+\newcommand{\LCLXX}{\char"144C5}
+\newcommand{\LCLXXI}{\char"144C6}
+\newcommand{\TAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"}
+ \else \ifnum #1=4
+ {\char"14566}
+ \else \ifnum #1=5
+ {\char"144C7}
+ \fi\fi\fi
+}
+\newcommand{\LAI}[1][]{
+ \ifx\relax#1\relax
+ {\char"14566}
+ \else \ifnum #1=2
+ {\char"144C7}
+ \fi\fi
+}
+\newcommand{\HASTARIUS}{\char"144C8}
+\newcommand{\SI}[1][]{
+ \ifx\relax#1\relax
+ {\char"144C9}
+ \else \ifnum #1=2
+ {\char"145FE}
+ \fi\fi
+}
+\newcommand{\LINGUA}{\char"144CA}
+\newcommand{\LA}{\char"144CA}
+\newcommand{\LALA}{\char"144CB}
+\newcommand{\LINGUACLAVUS}{\char"144CC}
+\newcommand{\LARAA}{\char"144CD}
+\newcommand{\HORDEUM}{\char"144CE}
+\newcommand{\HWIX}{\char"144CE}
+\newcommand{\LCLXXX}{\char"144CF}
+\newcommand{\PANIS}{\char"144D0}
+\newcommand{\PAX}{\char"144D0}
+\newcommand{\CAELUM}{\char"144D1}
+\newcommand{\LCLXXXIII}{\char"144D2}
+\newcommand{\LCLXXXIV}{\char"144D3}
+\newcommand{\LCLXXXV}{\char"144D4}
+\newcommand{\LCLXXXVI}{\char"144D5}
+\newcommand{\LCLXXXVII}{\char"144D6}
+\newcommand{\LCLXXXVIII}{\char"144D7}
+\newcommand{\LCLXXXIX}{\char"144D8}
+\newcommand{\SOL}[1][]{
+ \ifx\relax#1\relax
+ {\char"144DA}
+ \else \ifnum #1=2
+ {\char"144D9}
+ \fi\fi
+}
+\newcommand{\ORIENS}{\char"144DB}
+\newcommand{\LUNA}{\char"144DC}
+\newcommand{\LCXCIV}{\char"144DD}
+\newcommand{\LCXCV}{\char"144DE}
+\newcommand{\HATTI}{\char"144DF}
+\newcommand{\HA}[1][]{
+ \ifx\relax#1\relax
+ {\char"144F7}
+ \else \ifnum #1=2
+ {\char"144DF}
+ \fi\fi
+}
+\newcommand{\HATTILI}{\char"144E0}
+\newcommand{\HATTUSILI}{\char"144E0}
+\newcommand{\HAIILI}{\char"144E0}
+\newcommand{\LCXCVIII}{\char"144E1}
+\newcommand{\TONITRUS}{\char"144E2}
+\newcommand{\FULGUR}{\char"144E3}
+\newcommand{\TERRA}{\char"144E4}
+\newcommand{\LOCUS}{\char"144E4}
+\newcommand{\VIATERRASCALPRUM}{\char"144E5}
+\newcommand{\VIATERRAPLUSSCALPRUM}{\char"144E6}
+\newcommand{\DEUSVIATERRA}{\char"144E7}
+\newcommand{\LCCIII}{\char"144E8}
+\newcommand{\LCCV}{\char"144EA}
+\newcommand{\LCCVI}{\char"144EB}
+\newcommand{\LEOMONSTULEO}{\char"144ED}
+\newcommand{\LCCVIII}{\char"144EE}
+\newcommand{\I}[1][]{
+ \ifx\relax#1\relax
+ {\char"144EF}
+ \else \ifnum #1=2
+ {\char"14550}
+ \fi\fi
+}
+\newcommand{\IRAI}{\char"144F0}
+\newcommand{\RII}{\char"144F0}
+\newcommand{\IA}[1][]{
+ \ifx\relax#1\relax
+ {\char"144F1}
+ \else \ifnum #1=2
+ {\char"14551}
+ \else \ifnum #1=3
+ {\char"145AC}
+ \fi\fi\fi
+}
+\newcommand{\LCCXI}{\char"144F2}
+\newcommand{\FLUMEN}{\char"144F3}
+\newcommand{\LCCXIII}{\char"144F4}
+\newcommand{\FONS}{\char"144F6}
+\newcommand{\FINES}{\char"144F8}
+\newcommand{\FINESHA}{\char"144F9}
+\newcommand{\ARHA}{\char"144F9}
+\newcommand{\LCCXVII}{\char"144FA}
+\newcommand{\LCCXVIII}{\char"144FB}
+\newcommand{\LCCXIX}{\char"144FC}
+\newcommand{\LCCXX}{\char"144FD}
+\newcommand{\VIA}{\char"144FE}
+\newcommand{\LCCXXII}{\char"144FF}
+\newcommand{\LCCXXIV}{\char"14501}
+\newcommand{\URBS}{\char"14502}
+\newcommand{\ISHUWA}{\char"14503}
+\newcommand{\URBSRAILI}{\char"14504}
+\newcommand{\URBSLI}{\char"14505}
+\newcommand{\MURSILI}{\char"14505}
+\newcommand{\REGIO}{\char"14506}
+\newcommand{\MIIIREGIO}{\char"14507}
+\newcommand{\LCCXXX}{\char"14508}
+\newcommand{\CASTRUM}{\char"14509}
+\newcommand{\LCCXXXII}{\char"1450A}
+\newcommand{\LCCXXXIII}{\char"1450B}
+\newcommand{\LCCXXXIV}{\char"1450C}
+\newcommand{\TURRIS}{\char"1450D}
+\newcommand{\LCCXXXV}{\char"1450D}
+\newcommand{\MURUS}{\char"1450E}
+\newcommand{\LCCXXXVI}{\char"1450E}
+\newcommand{\PORTA}[1][]{
+ \ifx\relax#1\relax
+ {\char"1450F}
+ \else \ifnum #1=2
+ {\char"14511}
+ \fi\fi
+}
+\newcommand{\LCCXXXVIII}{\char"14510}
+\newcommand{\LCCXL}{\char"14512}
+\newcommand{\KIX}{\char"14513}
+\newcommand{\LCCXLII}{\char"14514}
+\newcommand{\CUBITUM}{\char"14515}
+\newcommand{\AEDIFICIUM}{\char"14516}
+\newcommand{\VACUUS}{\char"14517}
+\newcommand{\AEDIFICIUMMINUS}{\char"14517}
+\newcommand{\AEDIFICARE}{\char"14518}
+\newcommand{\AEDIFICIUMPONERE}{\char"14518}
+\newcommand{\DOMUS}{\char"14519}
+\newcommand{\DELERE}{\char"1451A}
+\newcommand{\DOMUSMINUS}{\char"1451A}
+\newcommand{\DEUSDOMUS}{\char"1451B}
+\newcommand{\MAGNUSDOMUS}{\char"1451C}
+\newcommand{\DOMUSX}{\char"1451D}
+\newcommand{\DOMUSSCALA}{\char"1451E}
+\newcommand{\LCCLII}{\char"1451F}
+\newcommand{\EUNUCHUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14611}
+ \else \ifnum #1=2
+ {\char"14520}
+ \fi\fi
+}
+\newcommand{\HORREUM}{\char"14521}
+\newcommand{\LCCLVI}{\char"14522}
+\newcommand{\ARGENTUM}{\char"14523}
+\newcommand{\LCCLVIII}{\char"14524}
+\newcommand{\LCCLIX}{\char"14525}
+\newcommand{\LCCLX}{\char"14526}
+\newcommand{\LCCLXI}{\char"14527}
+\newcommand{\LCCLXII}{\char"14528}
+\newcommand{\LCCLXIII}{\char"14529}
+\newcommand{\PODIUM}{\char"1452A}
+\newcommand{\LCCLXV}{\char"1452B}
+\newcommand{\PESREGIO}{\char"1452C}
+\newcommand{\STELE}{\char"1452D}
+\newcommand{\LAPISSCALPRUM}{\char"1452D}
+\newcommand{\LAPIS}{\char"1452E}
+\newcommand{\SCALPRUM}{\char"1452F}
+\newcommand{\EXERCITUS}{\char"14530}
+\newcommand{\LCCLXX}{\char"14531}
+\newcommand{\LCCLXXI}{\char"14532}
+\newcommand{\SCUTUM}{\char"14533}
+\newcommand{\LCCLXXIII}{\char"14534}
+\newcommand{\LCCLXXIV}{\char"14535}
+\newcommand{\FRATER}[1][]{
+ \ifx\relax#1\relax
+ {\char"14430}
+ \else \ifnum #1=2
+ {\char"14537}
+ \fi\fi
+}
+\newcommand{\IUDEXLA}{\char"14538}
+\newcommand{\LCCLXXIX}{\char"1453A}
+\newcommand{\MALLEUS}{\char"1453B}
+\newcommand{\ASCIA}{\char"1453C}
+\newcommand{\LCCLXXXII}{\char"1453D}
+\newcommand{\TUZZI}{\char"1453E}
+\newcommand{\LCCLXXXIV}{\char"1453F}
+\newcommand{\IACULUM}{\char"14540}
+\newcommand{\ZU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14540}
+ \else \ifnum #1=2
+ {\char"145F5}
+ \fi\fi
+}
+\newcommand{\ZUWA}{\char"14540}
+\newcommand{\LCCLXXXVII}{\char"14542}
+\newcommand{\CURRUS}{\char"14543}
+\newcommand{\AURIGA}[1][]{
+ \ifx\relax#1\relax
+ {\char"14544}
+ \else \ifnum #1=2
+ {\char"14545}
+ \fi\fi
+}
+\newcommand{\HARAI}{\char"14546}
+\newcommand{\ROTA}{\char"14548}
+\newcommand{\HALAI}{\char"14548}
+\newcommand{\LCCXCIII}{\char"14549}
+\newcommand{\THRONUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1454A}
+ \else \ifnum #1=2
+ {\char"1454F}
+ \fi\fi
+}
+\newcommand{\MENSA}[1][]{
+ \ifx\relax#1\relax
+ {\char"1454A}
+ \else \ifnum #1=2
+ {\char"1454B}
+ \fi\fi
+}
+\newcommand{\SARPA}{\char"1454B}
+\newcommand{\SOLIITHRONUS}{\char"1454C}
+\newcommand{\SOLIIMENSA}{\char"1454C}
+\newcommand{\DEUSMONSSARPA}{\char"1454D}
+\newcommand{\DEUSMONSMENSA}{\char"1454D}
+\newcommand{\LCCXCVII}{\char"1454E}
+\newcommand{\SOLIUM}{\char"14550}
+\newcommand{\NEPOS}{\char"14552}
+\newcommand{\LECTUS}{\char"14553}
+\newcommand{\LCCCII}{\char"14554}
+\newcommand{\FUSUS}{\char"14557}
+\newcommand{\HI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145D2}
+ \else \ifnum #1=2
+ {\char"14558}
+ \fi\fi
+}
+\newcommand{\HU}[1][]{
+ \ifx\relax#1\relax
+ {\char"14559}
+ \else \ifnum #1=2
+ {\char"14588}
+ \fi\fi
+}
+\newcommand{\LCCCVIII}{\char"1455A}
+\newcommand{\CRUX}[1][]{
+ \ifx\relax#1\relax
+ {\char"1455B}
+ \else \ifnum #1=2
+ {\char"1455C}
+ \fi\fi
+}
+\newcommand{\LCCCX}{\char"1455D}
+\newcommand{\LCCCXI}{\char"1455E}
+\newcommand{\LCCCXII}{\char"1455F}
+\newcommand{\VIR}[1][]{
+ \ifx\relax#1\relax
+ {\char"14560}
+ \else \ifnum #1=2
+ {\char"145B5}
+ \fi\fi
+}
+\newcommand{\HAX}{\char"14561}
+\newcommand{\KAR}{\char"14562}
+\newcommand{\LCCCXVII}{\char"14564}
+\newcommand{\TESHUB}{\char"14565}
+\newcommand{\LCCCXX}{\char"14567}
+\newcommand{\LCCCXXI}{\char"14568}
+\newcommand{\PURUS}{\char"14569}
+\newcommand{\LCCCXXIII}{\char"1456A}
+\newcommand{\LCCCXXIV}{\char"1456B}
+\newcommand{\SCRIBA}{\char"1456D}
+\newcommand{\SIGILLUM}{\char"1456E}
+\newcommand{\PU}[1][]{
+ \ifx\relax#1\relax
+ {\char"1456F}
+ \else \ifnum #1=2
+ {\char"145E3}
+ \fi\fi
+}
+\newcommand{\REL}{\char"14570}
+\newcommand{\KWIA}{\char"14570}
+\newcommand{\LCCCXXIXA}{\char"14571}
+\newcommand{\CAPERESCALPRUM}{\char"14572}
+\newcommand{\AVUS}{\char"14573}
+\newcommand{\NEG}[1][]{
+ \ifx\relax#1\relax
+ {\char"14574}
+ \else \ifnum #1=2
+ {\char"14575}
+ \else \ifnum #1=3
+ {\char"14576}
+ \fi\fi\fi
+}
+\newcommand{\LCCCXXXIII}{\char"14577}
+\newcommand{\PA}{\char"14578}
+\newcommand{\ANNUS}{\char"1457A}
+\newcommand{\PITHOSSCUTELLA}{\char"1457A}
+\newcommand{\PITHOS}{\char"1457E}
+\newcommand{\ZAX}{\char"1457D}
+\newcommand{\CULTER}{\char"1457F}
+\newcommand{\LCCCXXXIX}{\char"14580}
+\newcommand{\ANNUSANNUS}{\char"14581}
+\newcommand{\VAS}{\char"14582}
+\newcommand{\LCCCXLII}{\char"14583}
+\newcommand{\PITHOSA}{\char"14584}
+\newcommand{\CONTRACTUS}{\char"14585}
+\newcommand{\URCEUS}{\char"14586}
+\newcommand{\POCULUM}{\char"14587}
+\newcommand{\LCCCXLVIII}{\char"14589}
+\newcommand{\LCCCXLIX}{\char"1458A}
+\newcommand{\LCCCL}{\char"1458B}
+\newcommand{\LCCCLI}{\char"1458C}
+\newcommand{\LCCCLII}{\char"1458D}
+\newcommand{\LCCCLIII}{\char"1458E}
+\newcommand{\LCCCLIV}{\char"1458F}
+\newcommand{\LCCCLVI}{\char"14591}
+\newcommand{\LCCCLVII}{\char"14592}
+\newcommand{\DIES}{\char"14593}
+\newcommand{\LCCCLIX}{\char"14594}
+\newcommand{\LCCCLIXA}{\char"14595}
+\newcommand{\DEUS}{\char"14596}
+\newcommand{\LCCCLXI}{\char"14597}
+\newcommand{\MAGNUS}{\char"14599}
+\newcommand{\UR}{\char"14599}
+\newcommand{\UA}{\char"1459A}
+\newcommand{\MUA}{\char"1459B}
+\newcommand{\LCCCLXV}{\char"1459C}
+\newcommand{\OMNIS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1459D}
+ \else \ifnum #1=2
+ {\char"145E3}
+ \fi\fi
+}
+\newcommand{\OMNISMI}{\char"1459D}
+\newcommand{\TALA}{\char"1459E}
+\newcommand{\MALUS}[1][]{
+ \ifx\relax#1\relax
+ {\char"1459F}
+ \else \ifnum #1=2
+ {\char"145A0}
+ \fi\fi
+}
+\newcommand{\VITA}{\char"145A1}
+\newcommand{\IUSTITIA}{\char"145A3}
+\newcommand{\IUDEX}{\char"145A3}
+\newcommand{\IUDEXRAI}{\char"145A4}
+\newcommand{\TARAIX}{\char"145A4}
+\newcommand{\SACERDOS}[1][]{
+ \ifx\relax#1\relax
+ {\char"14590}
+ \else \ifnum #1=2
+ {\char"145A5}
+ \fi\fi
+}
+\newcommand{\LCCCLXXIII}{\char"145A6}
+\newcommand{\LCCCLXXIV}{\char"145A7}
+\newcommand{\LCCCLXXV}{\char"145A8}
+\newcommand{\ZIA}{\char"145A9}
+\newcommand{\LITUUS}{\char"145AB}
+\newcommand{\OCCIDENS}{\char"145AC}
+\newcommand{\ONE}{\char"145AD}
+\newcommand{\UNUS}{\char"145AD}
+\newcommand{\MINUS}{\char"145AE}
+\newcommand{\MORI}{\char"145AF}
+\newcommand{\VIRIIMINUS}{\char"145AF}
+\newcommand{\LIGNUM}{\char"145B0}
+\newcommand{\RAI}{\char"145B1}
+\newcommand{\PERS}{\char"145B2}
+\newcommand{\TWO}{\char"145B3}
+\newcommand{\WORD}{\char"145B5}
+\newcommand{\VIRIIA}{\char"145B6}
+\newcommand{\SERVUS}{\char"145B7}
+\newcommand{\MI}[1][]{
+ \ifx\relax#1\relax
+ {\char"145BB}
+ \else \ifnum #1=2
+ {\char"145D8}
+ \else \ifnum #1=3
+ {\char"145B7}
+ \fi\fi\fi
+}
+\newcommand{\THREE}{\char"145B8}
+\newcommand{\TARAI}{\char"145B9}
+\newcommand{\DOMINUS}{\char"145BA}
+\newcommand{\FOUR}{\char"145BB}
+\newcommand{\FIVE}{\char"145BC}
+\newcommand{\EIGHT}{\char"145BD}
+\newcommand{\LCCCXCIV}{\char"145BE}
+\newcommand{\NINE}{\char"145BF}
+\newcommand{\LCCCXCVI}{\char"145C0}
+\newcommand{\TEN}{\char"145C1}
+\newcommand{\DECEM}{\char"145C1}
+\newcommand{\LCCCXCVIII}{\char"145C2}
+\newcommand{\HUNDRED}{\char"145C3}
+\newcommand{\CENTUM}{\char"145C3}
+\newcommand{\THOUSAND}{\char"145C4}
+\newcommand{\MILLE}{\char"145C4}
+\newcommand{\LCDI}{\char"145C5}
+\newcommand{\SCUTELLA}{\char"145C6}
+\newcommand{\LCDIII}{\char"145C7}
+\newcommand{\ANIMAL}{\char"145C8}
+\newcommand{\LCDV}{\char"145C9}
+\newcommand{\LCDVI}{\char"145CA}
+\newcommand{\LCDVII}{\char"145CB}
+\newcommand{\LCDVIII}{\char"145CC}
+\newcommand{\LCDIX}{\char"145CD}
+\newcommand{\LCDX}{\char"145CE}
+\newcommand{\LOGS}{\char"145CE}
+\newcommand{\LCDXA}{\char"145CF}
+\newcommand{\LOGE}{\char"145CF}
+\newcommand{\LCDXIV}{\char"145D3}
+\newcommand{\LCDXVI}{\char"145D5}
+\newcommand{\SAX}{\char"145D6}
+\newcommand{\LCDXVIII}{\char"145D7}
+\newcommand{\URHI}{\char"145D8}
+\newcommand{\LCDXX}{\char"145D9}
+\newcommand{\US}{\char"145DA}
+\newcommand{\PANISSCUTELLA}{\char"145DB}
+\newcommand{\KU}{\char"145DC}
+\newcommand{\LCDXXIV}{\char"145DD}
+\newcommand{\LCDXXV}{\char"145DE}
+\newcommand{\LCDXXVI}{\char"145DF}
+\newcommand{\LCDXXVII}{\char"145E0}
+\newcommand{\LCDXXVIII}{\char"145E1}
+\newcommand{\TANA}{\char"145E2}
+\newcommand{\LCDXXXI}{\char"145E4}
+\newcommand{\LCDXXXII}{\char"145E5}
+\newcommand{\AX}{\char"145E8}
+\newcommand{\LCDXXXVI}{\char"145E9}
+\newcommand{\LCDXXXVII}{\char"145EA}
+\newcommand{\PASTOR}{\char"145EB}
+\newcommand{\LCDXL}{\char"145ED}
+\newcommand{\LCDXLI}{\char"145EE}
+\newcommand{\LCDXLII}{\char"145EF}
+\newcommand{\LCDXLIII}{\char"145F0}
+\newcommand{\LCDXLIV}{\char"145F1}
+\newcommand{\LAIU}{\char"145F2}
+\newcommand{\KI}{\char"145F3}
+\newcommand{\NIX}{\char"145F4}
+\newcommand{\LCDXLIX}{\char"145F7}
+\newcommand{\RAA}{\char"145F8}
+\newcommand{\HURU}{\char"145F9}
+\newcommand{\LCDLII}{\char"145FA}
+\newcommand{\LCDLIII}{\char"145FB}
+\newcommand{\LCDLIV}{\char"145FC}
+\newcommand{\LAX}{\char"145FD}
+\newcommand{\LCDLVII}{\char"145FF}
+\newcommand{\LCDLVIIA}{\char"14600}
+\newcommand{\LCDLVIII}{\char"14601}
+\newcommand{\LCDLIX}{\char"14602}
+\newcommand{\LCDLX}{\char"14603}
+\newcommand{\LCDLXI}{\char"14604}
+\newcommand{\MAX}{\char"14605}
+\newcommand{\LCDLXIII}{\char"14606}
+\newcommand{\LCDLXIV}{\char"14607}
+\newcommand{\LCDLXV}{\char"14608}
+\newcommand{\LCDLXVI}{\char"14609}
+\newcommand{\LCDLXVII}{\char"1460A}
+\newcommand{\LCDLXVIII}{\char"1460B}
+\newcommand{\LCDLXIX}{\char"1460C}
+\newcommand{\TWELVE}{\char"1460D}
+\newcommand{\LCDLXXI}{\char"1460E}
+\newcommand{\LCDLXXII}{\char"1460F}
+\newcommand{\LCDLXXIII}{\char"14610}
+\newcommand{\LCDLXXV}{\char"14612}
+\newcommand{\LCDLXXVI}{\char"14613}
+\newcommand{\FLAMMAE}{\char"14614}
+\newcommand{\LCDLXXVIII}{\char"14615}
+\newcommand{\LCDLXXIX}{\char"14616}
+\newcommand{\LCDLXXX}{\char"14617}
+\newcommand{\LCDLXXXI}{\char"14618}
+\newcommand{\LCDLXXXII}{\char"14619}
+\newcommand{\LCDXXXIII}{\char"1461A}
+\newcommand{\LCDLXXXIV}{\char"1461B}
+\newcommand{\LCDLXXXV}{\char"1461C}
+\newcommand{\FALX}{\char"1461D}
+\newcommand{\LCDLXXXVII}{\char"1461E}
+\newcommand{\LCDLXXXIX}{\char"14620}
+\newcommand{\LCDXC}{\char"14621}
+\newcommand{\LCDXCI}{\char"14622}
+\newcommand{\LCDXCII}{\char"14623}
+\newcommand{\LCDXCIII}{\char"14624}
+\newcommand{\LCDXCIV}{\char"14625}
+\newcommand{\LCDXCV}{\char"14626}
+\newcommand{\LCDXCVI}{\char"14627}
+\newcommand{\LCDXCVII}{\char"14628}
+\newcommand{\LDI}{\char"14629}
+\newcommand{\LDII}{\char"1462A}
+\newcommand{\LDIII}{\char"1462B}
+\newcommand{\LDIV}{\char"1462C}
+\newcommand{\LDV}{\char"1462D}
+\newcommand{\HANA}{\char"1462E}
+\newcommand{\LDVII}{\char"1462F}
+\newcommand{\CURRERE}{\char"14630}
+\newcommand{\HWIA}{\char"14630}
+\newcommand{\LDIX}{\char"14631}
+\newcommand{\LDXI}{\char"14633}
+\newcommand{\LDXII}{\char"14634}
+\newcommand{\LDXIII}{\char"14635}
+\newcommand{\LDXIV}{\char"14636}
+\newcommand{\LDXV}{\char"14637}
+\newcommand{\LDXVI}{\char"14638}
+\newcommand{\LDXVII}{\char"14639}
+\newcommand{\LDXVIII}{\char"1463A}
+\newcommand{\LDXIX}{\char"1463B}
+\newcommand{\LDXX}{\char"1463C}
+\newcommand{\LDXXI}{\char"1463D}
+\newcommand{\LDXXII}{\char"1463E}
+\newcommand{\LDXXIII}{\char"1463F}
+\newcommand{\CORNUCAPUT}{\char"14640}
+\newcommand{\PROPHETA}{\char"14640}
+\newcommand{\PRINCEPS}{\char"14641}
+\newcommand{\GCXCV}{\char"14642}
+\newcommand{\APER}{\char"14643}
+\newcommand{\LINGUAX}{\char"14645}
+\newcommand{\LDXXX}{\char"14646}
+
+
+
+
diff --git a/Master/texmf-dist/tex/latex/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/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index e0e1f2f3748..799e1ec279c 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `latex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -42,7 +42,6 @@
%%
%% The names of the source files used are shown above.
%%
-\RequirePackage{expl3}
\ExplSyntaxOn
\tl_const:Nn \c__markdown_option_layer_latex_tl { latex }
\cs_generate_variant:Nn
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
index a6ebbd6f1d9..fbe93b2844b 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-dot')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
index a962d1d8cd0..d6c2a7566a0 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-graphicx-http')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
index fca6079c579..f90017e073b 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
@@ -6,7 +6,7 @@
%%
%% markdown.dtx (with options: `themes-witiko-markdown-defaults-latex')
%%
-%% Copyright (C) 2016-2024 Vít Starý Novotný
+%% Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/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/tex/latex/moderncv/moderncvcolors.tex b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
new file mode 100644
index 00000000000..7f840ff059c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
@@ -0,0 +1,35 @@
+%-------------------------------------------------------------------------------
+% built-in colors
+%-------------------------------------------------------------------------------
+
+\definecolor{black}{RGB}{0, 0, 0}
+\definecolor{red}{rgb}{0.95, 0.20, 0.20}
+\definecolor{darkgrey}{rgb}{0.45, 0.45, 0.45}
+\definecolor{orange}{rgb}{0.95, 0.55, 0.15}
+\definecolor{burgundy}{rgb}{0.596078, 0, 0}% 139/255 (0.545098) or 152/255 (0.596078)
+\definecolor{purple}{rgb}{0.50, 0.33, 0.80}
+\definecolor{lightblue}{rgb}{0.22, 0.45, 0.70}
+\definecolor{green}{rgb}{0.35, 0.70, 0.30}
+
+%-------------------------------------------------------------------------------
+% default colors
+%-------------------------------------------------------------------------------
+
+\@ifundefined{\string\color@default-socialicon-color}{\colorlet{default-socialicon-color}{darkgrey}}{}
+
+%-------------------------------------------------------------------------------
+% colors for social icons
+%-------------------------------------------------------------------------------
+
+% \definecolor{weixin}{rgb}{.184, .533, .098}
+% \definecolor{linkedin}{HTML}{0a66c2}
+% \definecolor{orcid}{HTML}{a6ce39}
+% \definecolor{twitter}{RGB}{29, 155, 240}
+% \definecolor{facebook}{HTML}{1b74e4}
+% TODO: add more colors
+
+%-------------------------------------------------------------------------------
+% custom colors
+%-------------------------------------------------------------------------------
+
+% \definecolor{tsinghua}{HTML}{791CB5}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index 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/moremath/moremath.sty b/Master/texmf-dist/tex/latex/moremath/moremath.sty
new file mode 100644
index 00000000000..43c704f51d5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moremath/moremath.sty
@@ -0,0 +1,1224 @@
+%%
+%% This is file `moremath.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% moremath.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%%
+%% Copyright (C) 2024 Marcel Ilg
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%
+%% https://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status ‘maintained’.
+%%
+%% The Current Maintainer of this work is Marcel Ilg.
+%%
+%% This work consists of the files listed in MANIFEST.md.
+%%
+
+\NeedsTeXFormat{LaTeX2e}[2022-11-01]
+\ProvidesExplPackage{moremath}
+ {2024-07-15}{v0.4.0}{More Math Macros}
+\msg_new:nnn { moremath } {load / bm}
+{
+ Option~'bm'~given.\\
+ Loading~the~bm~package~\msg_line_context:.
+}
+\msg_new:nnn {moremath} { load / disabling }
+{
+ Option~'#1'~given.\\
+ Disabling~#2~\msg_line_context:.
+}
+\bool_new:N \l__moremath_predef_vector_op_bool
+\bool_new:N \l__moremath_predef_operators_bool
+\bool_new:N \l__moremath_predef_crvector_bool
+\bool_new:N \l__moremath_predef_matrix_bool
+\bool_new:N \l__moremath_predef_abs_bool
+\keys_define:nn { moremath / load }
+{
+ bm .code:n = {
+ \msg_info:nn {moremath} {load / bm}
+ \RequirePackage{bm}
+ },
+ bm .value_forbidden:n = true,
+ bm. usage:n = load,
+ no-vector .bool_set_inverse:N = \l__moremath_predef_vector_op_bool,
+ no-vector .default:n = true,
+ no-vector .initial:n = false,
+ no-vector .usage:n = load,
+ no-operators .bool_set_inverse:N = \l__moremath_predef_operators_bool,
+ no-operators .default:n = true,
+ no-operators .initial:n = false,
+ no-operators .usage:n = load,
+ no-abs-shorthands .bool_set_inverse:N = \l__moremath_predef_abs_bool,
+ no-abs-shorthands .default:n = true,
+ no-abs-shorthands .initial:n = false,
+ no-abs-shorthands .usage:n = load,
+ no-matrix .bool_set_inverse:N = \l__moremath_predef_matrix_bool,
+ no-matrix .initial:n = false,
+ no-matrix .default:n = true,
+ no-matrix .usage:n =load,
+ no-crvector .bool_set_inverse:N = \l__moremath_predef_crvector_bool,
+ no-crvector .default:n = true,
+ no-crvector .initial:n = false,
+ no-crvector .usage:n = load,
+ nopredef .multichoice:,
+ nopredef / operators .meta:nn = { moremath / load }
+ {
+ no-operators = true
+ },
+ nopredef / vector .meta:nn = { moremath / load }
+ {
+ no-vector = true
+ },
+ nopredef / abs .meta:nn = { moremath / load }
+ {
+ no-abs-shorthands = true,
+ },
+ noperdef / matrix .meta:nn = { moremath / load }
+ {
+ no-matrix = true,
+ },
+ nopredef / crvector .meta:nn = {moremath / load}
+ {
+ no-crvector = true,
+ },
+ nopredef / all .meta:nn = { moremath / load }
+ {
+ no-operators = true,
+ no-vector = true,
+ no-abs-shorthands = true
+ },
+ nopredef .usage:n = load,
+ unknown .code:n = {\PassOptionsToPackage{\CurrentOption}{mathtools}},
+ unknown .usage:n = load,
+}
+\tl_new:N \l__moremath_nabla_tl
+\bool_new:N \l__moremath_nabla_arrow_bool
+\bool_new:N \l__moremath_nabla_arrow_bold_bool
+\tl_new:N \l__moremath_grad_op_tl
+\tl_new:N \l__moremath_laplacian_symb_tl
+\bool_new:N \l__moremath_laplacian_delta_bool
+\bool_new:N \l__moremath_laplacian_arrow_bool
+\tl_new:N \l__moremath_laplacian_tl
+\tl_new:N \l__moremath_dalembert_symb_tl
+\bool_new:N \l__moremath_vcenter_bool
+\keys_define:nn { moremath }
+{
+ % Symbol to use for the nabla
+ nabla .tl_set:N = \l__moremath_nabla_tl,
+ nabla .initial:n = {\nabla},
+ nabla .value_required:n = true,
+ % shall the nabla have an arrow over it
+ arrownabla .bool_set:N = \l__moremath_nabla_arrow_bool,
+ arrownabla .default:n = {true},
+ arrownabla .initial:n = {false},
+ % shall the nabla be bold
+ boldnabla .bool_set:N = \l__moremath_nabla_bold_bool,
+ boldnabla .default:n = {true},
+ boldnabla .initial:n = {false},
+ % Symbol to use for the gradient operator
+ grad-op .tl_set:N = \l__moremath_grad_op_tl,
+ grad-op .value_required:n = true,
+ % Symbol to use for the laplacian
+ laplacian-symb .tl_set:N = \l__moremath_laplacian_symb_tl,
+ laplacian-symb .initial:n = {\l__moremath_nabla_tl},
+ % shall the Laplace operator be a delta
+ delta-laplace .bool_set:N = \l__moremath_laplacian_delta_bool,
+ delta-laplace .initial:n = {false},
+ % shall the laplace operator have an arrow over itself
+ arrowlaplace .bool_set:N = \l__moremath_laplacian_arrow_bool,
+ arrowlaplace .default:n = {true},
+ arrowlaplace .initial:n = {false},
+ % overwrite the laplace operator
+ laplacian .tl_set:N = \l__moremath_laplacian_tl,
+ laplacian .value_required:n = true,
+ dalembert-symb .tl_set:N = \l__moremath_dalembert_symb_tl,
+ dalembert-symb .initial:n = {\square},
+ vcenter .bool_set:N = \l__moremath_vcenter_bool,
+ vcenter .initial:n = true,
+ vcenter .value_required:n = true,
+}% \keys_define:nn
+\keys_define:nn { moremath / matrix }
+{
+ delimiter .tl_set:N = \l__moremath_matrix_delim_tl,
+ delimiter .initial:n = {},
+ fill .tl_set:N = \l__moremath_matrix_fill_tl,
+ fill .initial:n = {},
+ align .tl_set:N = \l__moremath_matrix_align_tl,
+ align .initial:n = {c},
+ align .value_required:n = true,
+}
+\cs_new_protected:Nn \moremath_setup:n
+{
+ \keys_set:nn {moremath} {#1}
+}
+\NewDocumentCommand \moremathsetup {m}
+{
+ \moremath_setup:n {#1}
+}
+\cs_new_protected:Nn \__moremath_load_time_setup:
+{
+ \ProcessKeyOptions[ moremath / load ]
+}
+\__moremath_load_time_setup:
+\msg_new:nnn { moremath } { load / loading-amssymb }
+{
+ Vector~calculus~commands~enabled.\\
+ Loading~amssymb~package~\msg_line_context:.
+}
+\bool_if:NT \l__moremath_predef_vector_op_bool
+{
+ \msg_info:nn { moremath } { load / loading-amssymb }
+ \RequirePackage{amssymb}
+}
+\RequirePackage{mathtools}[2004/06/05]
+\cs_new_protected_nopar:Nn \moremath_vcenter:n
+{
+ \mathpalette \__moremath_vcenter:Nn {#1}
+}
+\cs_new_protected_nopar:Nn \__moremath_vcenter:Nn
+{
+ \vcenter
+ {
+ \hbox:n
+ {
+ $
+ \mathsurround=0pt
+ #1 {#2}
+ $
+ }
+ }
+}
+\msg_new:nnn { moremath } { csname-already-defined }
+{
+ Control~sequence~' #1 '~is~already~ defined.\\
+ Skipping~definition~\msg_line_context:
+}
+\msg_new:nnnn { moremath } { vcenter / only-in-math-mode }
+{
+ Command~#1~used~outside~math~mode~\msg_line_context:.
+}
+{
+ The~command~#1~may~only~be~used~inside~math~mode.
+}
+\cs_if_free:NTF \VCenterMath
+{
+ \NewDocumentCommand \VCenterMath { m }
+ {
+ \mode_if_math:TF
+ {
+ \moremath_vcenter:n {#1}
+ }{% \mode_if_math:TF FALSE BRANCH
+ \msg_error:nnn { moremath } { vcenter / only-in-math-mode } {\VCenterMath}
+ }
+ }
+}{% \cs_if_free:NTF \VCenterMath FALSE BRANCH
+ \msg_warning:nnn { moremath } { csname-already-defined } {\VCenterMath}
+}
+\DeclarePairedDelimiter{\__moremath_inparent:w}{\lparen}{\rparen}
+\DeclarePairedDelimiter{\__moremath_inbrack:w}{\lbrack}{\rbrack}
+\DeclarePairedDelimiter{\__moremath_inbrace:w}{\lbrace}{\rbrace}
+\DeclarePairedDelimiter{\__moremath_in_vert:w}{\lvert}{\rvert}
+\DeclarePairedDelimiter{\__moremath_in_Vert:w}{\lVert}{\rVert}
+\cs_new_protected:Nn \__moremath_operator:Nnn
+{
+ #1
+ % add superscript if present
+ \tl_if_empty:nF {#2} {^{#2}}
+ % add subscript if present
+ \tl_if_empty:nF {#3} { \c_math_subscript_token {#3} }
+}
+\cs_new_protected_nopar:Nn \moremath_delim_op_noscale:NNnnn
+{
+ \__moremath_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 {#5}
+}
+
+\cs_new_protected_nopar:Nn \moremath_delim_op_autoscale:NNnnn
+{
+ \__moremath_operator:Nnn #1 {#3} {#4}
+ % #2 is the paired delimiter
+ #2 * {#5}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_op_manuscale:NNnnnn
+{
+ \__moremath_operator:Nnn #1 {#4} {#5}
+ % #2 is the paired delimiter
+ #2 [ #3 ] {#6}
+}
+\cs_generate_variant:Nn \moremath_delim_op_manuscale:NNnnnn {NNVnnn}
+\msg_new:nnn { moremath } { delimop / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~of~delimited~operator~'#1'~\msg_line_context:.
+}
+\msg_new:nnn { moremath } { delimop / auto-manu-scale-conflict }
+{
+ Both~star~and~scale~cmd~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~will~be~
+ ignored~\msg_line_context:.
+}
+\cs_new_protected:Nn \moremath_new_delim_op_command:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ { s o E{ ^ \char_generate:nn {`_} {8} }{{}{}} m }
+ {
+ \tl_if_novalue:nTF {##2}
+ {
+ % second argument empty
+ \bool_if:nTF {##1}
+ {
+ % star given
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{
+ % star not given
+ \moremath_delim_op_noscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }
+ }{
+ % second argument present
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % Warn if both star and scaling factor are present
+ \msg_warning:nnn { moremath } { delimop / auto-manu-scale-conflict }
+ {#1}
+ \moremath_delim_op_autoscale:NNnnn #2 #3 {##3} {##4} {##5}
+ }{ % FALSE BRANCH
+ \moremath_delim_op_manuscale:NNnnnn #2 #3 {##2} {##3} {##4} {##5}
+ }
+ }
+ }
+ }{ % \cs_if_free:nTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { delimop / already-defined-skip }
+ {#1}
+ }
+}
+
+\cs_generate_variant:Nn \moremath_new_delim_op_command:NNN {cNN}
+\NewDocumentCommand\DeclareDelimitedOperator { m m m }
+{
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } { error }
+ \moremath_new_delim_op_command:NNN #1 #2 #3
+ \msg_redirect_name:nnn { moremath } { delimop / already-defined-skip } {}
+}
+\cs_new_protected:Nn \__moremath_new_delim_op_cmds:nN
+{
+ \moremath_new_delim_op_command:cNN {p #1} #2 \__moremath_inparent:w
+ \moremath_new_delim_op_command:cNN {b #1} #2 \__moremath_inbrack:w
+ \moremath_new_delim_op_command:cNN {B #1} #2 \__moremath_inbrace:w
+ \moremath_new_delim_op_command:cNN {v #1} #2 \__moremath_in_vert:w
+ \moremath_new_delim_op_command:cNN {V #1} #2 \__moremath_in_Vert:w
+}
+\bool_if:NTF \l__moremath_predef_operators_bool
+{
+\__moremath_new_delim_op_cmds:nN {arccos} \arccos
+\__moremath_new_delim_op_cmds:nN {arcsin} \arcsin
+\__moremath_new_delim_op_cmds:nN {arctan} \arctan
+\__moremath_new_delim_op_cmds:nN {arg} \arg
+\__moremath_new_delim_op_cmds:nN {cos} \cos
+\__moremath_new_delim_op_cmds:nN {cosh} \cosh
+\__moremath_new_delim_op_cmds:nN {cot} \cot
+\__moremath_new_delim_op_cmds:nN {coth} \coth
+\__moremath_new_delim_op_cmds:nN {csc} \csc
+\__moremath_new_delim_op_cmds:nN {deg} \deg
+\__moremath_new_delim_op_cmds:nN {det} \det
+\__moremath_new_delim_op_cmds:nN {dim} \dim
+\__moremath_new_delim_op_cmds:nN {exp} \exp
+\__moremath_new_delim_op_cmds:nN {gcd} \gcd
+\__moremath_new_delim_op_cmds:nN {hom} \hom
+\__moremath_new_delim_op_cmds:nN {inf} \inf
+\__moremath_new_delim_op_cmds:nN {injlim} \injlim
+\__moremath_new_delim_op_cmds:nN {ker} \ker
+\__moremath_new_delim_op_cmds:nN {lg} \lg
+\__moremath_new_delim_op_cmds:nN {lim} \lim
+\__moremath_new_delim_op_cmds:nN {liminf} \liminf
+\__moremath_new_delim_op_cmds:nN {limsup} \limsup
+\__moremath_new_delim_op_cmds:nN {ln} \ln
+\__moremath_new_delim_op_cmds:nN {log} \log
+\__moremath_new_delim_op_cmds:nN {max} \max
+\__moremath_new_delim_op_cmds:nN {min} \min
+\__moremath_new_delim_op_cmds:nN {Pr} \Pr
+\__moremath_new_delim_op_cmds:nN {projlim} \projlim
+\__moremath_new_delim_op_cmds:nN {sec} \sec
+\__moremath_new_delim_op_cmds:nN {sin} \sin
+\__moremath_new_delim_op_cmds:nN {sinh} \sinh
+\__moremath_new_delim_op_cmds:nN {sup} \sup
+\__moremath_new_delim_op_cmds:nN {tan} \tan
+\__moremath_new_delim_op_cmds:nN {tanh} \tanh
+\__moremath_new_delim_op_cmds:nN {varinjlim} \varinjlim
+\__moremath_new_delim_op_cmds:nN {varprojlim} \varprojlim
+\__moremath_new_delim_op_cmds:nN {varliminf} \varliminf
+\__moremath_new_delim_op_cmds:nN {varlimsup} \varlimsup
+}{
+ \msg_info:nnnn {moremath} {load /disabling} {no-operators}
+ {
+ predefined~delimited~operator~macros
+ }
+} % End of the conditional
+\cs_new_protected_nopar:Nn \__moremath_maybe_vcenter:n
+{
+ \bool_if:NTF \l__moremath_vcenter_bool
+ {
+ \moremath_vcenter:n {#1}
+ }{
+ #1
+ }
+}
+\cs_new_protected:Nn \__moremath_gradient_operator_get:
+{
+ \tl_if_empty:NTF \l__moremath_grad_op_tl
+ {
+ \mathop
+ {
+ \bool_if:NTF \l__moremath_nabla_arrow_bool
+ {
+ \vec
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \bool_if:NT \l__moremath_nabla_bold_bool
+ {
+ \boldsymbol
+ }
+ \l__moremath_nabla_tl
+ }
+ }
+ }{
+ \bool_if:NTF \l__moremath_nabla_bold_bool
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l__moremath_nabla_tl
+ }
+ }{
+ \l__moremath_nabla_tl
+ }
+ }
+ }% \mathop
+ \nolimits
+ }{
+ \l__moremath_grad_op_tl
+ }
+}
+\cs_new_protected:Nn \__moremath_laplace_operator_get:
+{
+ \tl_if_empty:NTF \l__moremath_laplacian_tl
+ {
+ \mathop
+ {
+ \bool_if:NTF \l__moremath_laplacian_delta_bool
+ {
+ \Delta
+ }{
+ \bool_if:NTF \l__moremath_laplacian_arrow_bool
+ {
+ \vec{
+ \__moremath_maybe_vcenter:n
+ {
+ \bool_if:NT \l__moremath_nabla_bold_bool {\boldsymbol}
+ \l__moremath_laplacian_symb_tl
+ }
+ }
+ }{
+ \bool_if:NTF \l__moremath_nabla_bold_bool
+ {
+ \__moremath_maybe_vcenter:n
+ {
+ \boldsymbol
+ \l__moremath_laplacian_symb_tl
+ }
+ }{
+ \l__moremath_laplacian_symb_tl
+ }
+ }
+ }
+ }\nolimits
+ \bool_if:NF \l__moremath_laplacian_delta_bool
+ {
+ \c_math_superscript_token
+ {
+ 2
+ }
+ }
+ }{
+ \l__moremath_laplacian_tl
+ }
+}
+\cs_new_protected:Nn \__moremath_dalembert_operator_get:
+{
+ \mathop
+ {
+ \l__moremath_dalembert_symb_tl
+ }% \mathop
+ \nolimits
+}
+\cs_new_protected_nopar:Nn \moremath_gradient_operator:n
+{
+ \__moremath_gradient_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+\cs_new_protected_nopar:Nn \moremath_laplace_operator:n
+{
+ \__moremath_laplace_operator_get:
+ \tl_if_empty:nF {#1} {\c_math_subscript_token {#1}}
+}
+\cs_new_protected_nopar:Nn \moremath_divergence_operator:n
+{
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \cdot
+}
+
+\cs_new_protected_nopar:Nn \moremath_curl_operator:n
+{
+ {
+ \moremath_gradient_operator:n {#1}
+ }
+ \times
+}
+\cs_new_protected:Nn \moremath_dalembert_operator:n
+{
+ \__moremath_dalembert_operator_get:
+ \tl_if_empty:nF {#1}
+ {
+ \c_math_subscript_token {#1}
+ }
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_noscale:NNnn
+{
+ #1 {#3} #2{#4}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_autoscale:NNnn
+{
+ #1 {#3} #2 * {#4}
+}
+\cs_new_protected_nopar:Nn \moremath_delim_nabla_op_manuscale:NNnnn
+{
+ #1 {#4} #2 [#3] {#5}
+}
+\cs_generate_variant:Nn \moremath_delim_nabla_op_manuscale:NNnnn {NNVnn}
+\cs_new_protected:Nn \__moremath_parse_kv_args:nN
+{
+ \prop_set_from_keyval:Nn \l_tmpa_prop {#1}
+
+ \prop_pop:NnNT \l_tmpa_prop {scale} #2 {}
+
+ \keys_set:ne {moremath} {\prop_to_keyval:N \l_tmpa_prop}
+}
+\msg_new:nnn { moremath } { vector-calc / scale-star-conflict }
+{
+ Both~star~and~scaling~factor~given~to~'#1'.\\
+ Automatic~scaling~will~be~preferred,~the~size~command~'#2'~will~be~
+ ignored~\msg_line_context:.
+}
+\cs_new_protected:Nn \__moremath_new_delim_nabla_doc_cmd:NNN
+{
+ \cs_if_free:NTF #1
+ {
+ \exp_args:NNe \NewDocumentCommand #1
+ {
+ s ={scale} o E{ \char_generate:nn {`_}{8} }{ {} } m
+ }
+ { % command code
+ \group_begin:
+ % optional arguments given?
+ \tl_if_novalue:nF {##2}
+ {
+ \__moremath_parse_kv_args:nN {##2} \l_tmpa_tl
+ }
+ % star given?
+ \bool_if:nTF {##1}
+ {
+ % scale factor given?
+ \tl_if_empty:NF \l_tmpa_tl
+ {
+ \msg_warning:nnnV { moremath } { vector-calc / scale-star-conflict }
+ {#1} \l_tmpa_tl
+ }
+ \moremath_delim_nabla_op_autoscale:NNnn #2 #3 {##3} {##4}
+ }{ % \bool_if:nTF {##1} FALSE BRANCH
+ % scale factor given?
+ \tl_if_empty:NTF \l_tmpa_tl
+ {
+ \moremath_delim_nabla_op_noscale:NNnn #2 #3 {##3} {##4}
+ }{ % FALSE BRANCH
+ \moremath_delim_nabla_op_manuscale:NNVnn #2 #3 \l_tmpa_tl {##3} {##4}
+ }
+ } % \bool_if:nTF {##1}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip } {#1}
+ } % \cs_if_free:NTF #1
+}
+\cs_generate_variant:Nn \__moremath_new_delim_nabla_doc_cmd:NNN {cNN}
+\cs_new_protected:Nn \__moremath_new_nabla_doc_cmds:nN
+{
+ \__moremath_new_delim_nabla_doc_cmd:cNN { p #1 } #2 \__moremath_inparent:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { b #1 } #2 \__moremath_inbrack:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { B #1 } #2 \__moremath_inbrace:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { v #1 } #2 \__moremath_in_vert:w
+ \__moremath_new_delim_nabla_doc_cmd:cNN { V #1 } #2 \__moremath_in_Vert:w
+}
+\bool_if:NTF \l__moremath_predef_vector_op_bool
+{
+\msg_new:nnn { moremath } { vector-calc / already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+\cs_if_free:NTF \grad
+{
+ \exp_args:NNe \NewDocumentCommand \grad { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_gradient_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\grad}
+}
+
+\cs_if_free:NTF \divergence
+{
+ \exp_args:NNe \NewDocumentCommand \divergence
+ { !o E{ \char_generate:nn {`_} {8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_divergence_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip } {\divergence}
+}
+
+\cs_if_free:NTF \curl
+{
+ \exp_args:NNe \NewDocumentCommand \curl
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_curl_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {vector-calc / already-defined-skip} {\curl}
+}
+
+\cs_if_free:NTF \laplacian
+{
+ \exp_args:NNe \NewDocumentCommand \laplacian
+ { !o E{ \char_generate:nn {`_}{8} }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath} {#1}
+ }
+ \moremath_laplace_operator:n {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} { vector-calc / already-defined-skip }
+ {\laplacian}
+}
+\cs_if_free:NTF \quabla
+{
+ \exp_args:NNe \NewDocumentCommand \quabla
+ { !o E{ \char_generate:nn {`_} { 8 } }{{}} }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath } {#1}
+ }
+ \moremath_dalembert_operator:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \quabla FALSE BRANCH
+ \msg_warning:nnn { moremath } { vector-calc / already-defined-skip }
+ {\quabla}
+}
+\__moremath_new_nabla_doc_cmds:nN {grad} \moremath_gradient_operator:n
+\__moremath_new_nabla_doc_cmds:nN {div} \moremath_divergence_operator:n
+\__moremath_new_nabla_doc_cmds:nN {curl} \moremath_curl_operator:n
+\__moremath_new_nabla_doc_cmds:nN {laplacian} \moremath_laplace_operator:n
+\__moremath_new_nabla_doc_cmds:nN {quabla} \moremath_dalembert_operator:n
+}{ % IF NOT \l__moremath_predef_vector_op_bool
+ \msg_info:nnnn {moremath} { load /disabling } {no-vector}
+ {
+ predefined~vector~calculus~macros
+ }
+} % END \l__moremath_predef_vector_op_bool
+\seq_new:N \l__moremath_vector_entries_seq
+\cs_new_protected_nopar:Nn \__moremath_seq_to_column_vector:N
+{
+ \seq_use:Nn #1 {\\}
+}
+\cs_new_protected_nopar:Nn \__moremath_seq_to_row_vector:N
+{
+ \seq_use:Nn #1 {&}
+}
+\cs_new_protected_nopar:Nn \moremath_column_vector:nn
+{
+ \seq_clear:N \l__moremath_vector_entries_seq
+ \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ]
+ \__moremath_seq_to_column_vector:N \l__moremath_vector_entries_seq
+ \end{#1 matrix*}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_vector:nn
+{
+ \seq_clear:N \l__moremath_vector_entries_seq
+ \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2}
+
+ \exp_args:NnNV \begin{#1matrix*} [ \l__moremath_matrix_align_tl ]
+ \__moremath_seq_to_row_vector:N \l__moremath_vector_entries_seq
+ \end{#1matrix*}
+}
+\cs_new_protected_nopar:Nn \moremath_column_smallvector:nn
+{
+ \moremath_column_vector:nn {#1 small} {#2}
+}
+
+\cs_new_protected_nopar:Nn \moremath_row_smallvector:nn
+{
+ \moremath_row_vector:nn {#1 small} {#2}
+}
+\seq_clear_new:N \l__moremath_mat_diag_entries_seq
+\seq_clear_new:N \l__moremath_mat_row_entries_seq
+\cs_new_protected:Nn \__moremath_constr_diagmat_row:n
+{
+ \seq_clear:N \l__moremath_mat_row_entries_seq
+ \int_step_inline:nn {\seq_count:N \l__moremath_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ \seq_put_right:Nx \l__moremath_mat_row_entries_seq
+ {
+ \seq_item:Nn \l__moremath_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_right:NV \l__moremath_mat_row_entries_seq \l__moremath_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l__moremath_mat_row_entries_seq { & } \\
+}
+
+\cs_new_protected:Nn \__moremath_constr_antidiagmat_row:n
+{
+ \seq_clear:N \l__moremath_mat_row_entries_seq
+ \int_step_inline:nn {\seq_count:N \l__moremath_mat_diag_entries_seq}
+ {
+ \int_compare:nTF { #1 == ##1 }
+ {
+ % as this is a anti diagonal matrix we put in the elements from the
+ % left so that the first entry is the right most entry
+ \seq_put_left:Nx \l__moremath_mat_row_entries_seq
+ {
+ \seq_item:Nn \l__moremath_mat_diag_entries_seq { #1 }
+ }
+ }{ % false branch
+ \seq_put_left:NV \l__moremath_mat_row_entries_seq \l__moremath_matrix_fill_tl
+ } % \int_compare:nTF { #1 == ##1 }
+ }
+ \seq_use:Nn \l__moremath_mat_row_entries_seq { & } \\
+}
+\cs_new_protected:Nn \moremath_diagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq }
+ \__moremath_constr_diagmat_row:n
+ \end{#1 matrix*}
+}
+
+\cs_new_protected:Nn \moremath_antidiagonal_matrix:nn
+{
+ \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 }
+ \exp_args:NnNV \begin{ #1 matrix* } [ \l__moremath_matrix_align_tl ]
+ \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq }
+ \__moremath_constr_antidiagmat_row:n
+ \end{ #1 matrix* }
+}
+
+\cs_new_protected:Nn \moremath_diagonal_smallmatrix:nn
+{
+ \moremath_diagonal_matrix:nn {#1 small} {#2}
+}
+
+\cs_new_protected:Nn \moremath_antidiagonal_smallmatrix:nn
+{
+ \moremath_antidiagonal_matrix:nn {#1 small} {#2}
+}
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { n V }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V n }
+\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V V }
+\cs_new_protected_nopar:Nn \__moremath_generate_one_filled_clist:Nn
+{
+ \seq_clear:N \l_tmpa_seq
+ \int_step_inline:nn {#2}
+ {
+ \seq_put_right:NV \l_tmpa_seq \c_one_int
+ }
+ \clist_set_from_seq:NN #1 \l_tmpa_seq
+}
+\cs_generate_variant:Nn \__moremath_generate_one_filled_clist:Nn { N V }
+\clist_new:N \l__moremath_id_entries_clist
+\cs_new_protected_nopar:Nn \moremath_id_matrix:n
+{
+ \clist_clear:N \l__moremath_id_entries_clist
+ \__moremath_generate_one_filled_clist:Nn \l__moremath_id_entries_clist {#1}
+ \moremath_diagonal_matrix:VV \l__moremath_matrix_delim_tl \l__moremath_id_entries_clist
+}
+\cs_new_protected_nopar:Nn \moremath_id_smallmatrix:n
+{
+ \clist_clear:N \l__moremath_id_entries_clist
+ \__moremath_generate_one_filled_clist:Nn \l__moremath_id_entries_clist {#1}
+ \moremath_diagonal_smallmatrix:VV \l__moremath_matrix_delim_tl \l__moremath_id_entries_clist
+}
+\cs_generate_variant:Nn \moremath_id_matrix:n { V }
+\cs_generate_variant:Nn \moremath_id_smallmatrix:n { V }
+\msg_new:nnnn { moremath } { matrix / already-defined-doc-cmd-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~definition~\msg_line_context:.
+}
+{
+ The~control~sequence~'#1'~has~already\\
+ been~defined~by~some~other~package.\\
+ And~I~am~refusing~to~overwrite~the~existing~definition,\\
+ therefore~I~am~skipping~the~definition~of~this~command.
+}
+\bool_if:nTF \l__moremath_predef_crvector_bool
+{
+\cs_if_free:NTF \cvector
+{
+ \NewDocumentCommand \cvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_column_vector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % issue a warning message if the csname is already taken.
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \cvector
+ }
+} % \cs_if_free:NTF \cvector
+\cs_if_free:NTF \rvector
+{
+ \NewDocumentCommand \rvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_vector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip}
+ {
+ \rvector
+ }
+} % \cs_if_free:NTF \rvector
+\cs_if_free:NTF \smallcvector
+{
+ \NewDocumentCommand \smallcvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn {moremath / matrix} {#1}
+ }
+ \moremath_column_smallvector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % Issue a warning message if the csname is already taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallcvector
+ }
+} % \cs_if_free:NTF \smallcvector
+
+\cs_if_free:NTF \smallrvector
+{
+ \NewDocumentCommand \smallrvector { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_row_smallvector:nn {\l__moremath_matrix_delim_tl} {#2}
+ \group_end:
+ }
+}{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallrvector
+ }
+}
+\cs_new_protected:Nn \__moremath_new_vector_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ % set the delimiter key pre-set for this function
+ \keys_set:nn {moremath / matrix } {delimiter = #3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn {moremath / matrix } {##1}
+ }
+ #2 {\l__moremath_matrix_delim_tl} {##2}
+ \group_end:
+ }
+ }{
+ % warn if csname is taken
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+\__moremath_new_vector_shorth_doc_cmd:NNn \pcvector \moremath_column_vector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bcvector \moremath_column_vector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bcvector \moremath_column_vector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vcvector \moremath_column_vector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vcvector \moremath_column_vector:nn {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \prvector \moremath_row_vector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \brvector \moremath_row_vector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Brvector \moremath_row_vector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vrvector \moremath_row_vector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vrvector \moremath_row_vector:nn {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \psmallcvector \moremath_column_smallvector:nn
+ {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallcvector \moremath_column_smallvector:nn
+ {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallcvector \moremath_column_smallvector:nn
+ {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallcvector \moremath_column_smallvector:nn
+ {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallcvector \moremath_column_smallvector:nn
+ {V}
+\__moremath_new_vector_shorth_doc_cmd:NNn \psmallrvector \moremath_row_smallvector:nn {p}
+\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallrvector \moremath_row_smallvector:nn {b}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallrvector \moremath_row_smallvector:nn {B}
+\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallrvector \moremath_row_smallvector:nn {v}
+\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallrvector \moremath_row_smallvector:nn {V}
+
+}{ % \bool_if:nTF \l__moremath_predef_crvector_bool FALSE PATH
+ \msg_info:nnnn {moremath} {load / disabling} {no-crvector}
+ {
+ commands~producing~row~and~column~vectors
+ }
+} % \bool_if:nTF \l__moremath_predef_crvector_bool
+\bool_if:nTF \l__moremath_predef_matrix_bool
+{
+\cs_if_free:NTF \diagmat
+{
+ \NewDocumentCommand \diagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_matrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn {moremath} {matrix / already-defined-doc-cmd-skip}
+ {
+ \diagmat
+ }
+} % \cs_if_free:nTF \diagmat
+
+\cs_if_free:NTF \antidiagmat
+{
+ \NewDocumentCommand \antidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_matrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \antidiagmat
+ }
+} % \cs_if_free:nTF \antidiagmat
+
+\cs_if_free:NTF \smalldiagmat
+{
+ \NewDocumentCommand \smalldiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_diagonal_smallmatrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smalldiagmat
+ }
+}
+
+\cs_if_free:NTF \smallantidiagmat
+{
+ \NewDocumentCommand \smallantidiagmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_antidiagonal_smallmatrix:Vn \l__moremath_matrix_delim_tl {#2}
+ \group_end:
+ }
+}{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ \smallantidiagmat
+ }
+}
+\cs_new_protected:Nn \__moremath_new_matrix_shorth_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix }
+ {
+ delimiter = #3
+ }
+ } % \tl_if_empty:nF {#3}
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 \l__moremath_matrix_delim_tl {##2}
+ \group_end:
+ }
+ }{
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {
+ #1
+ }
+ }
+}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \pdiagmat \moremath_diagonal_matrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bdiagmat \moremath_diagonal_matrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bdiagmat \moremath_diagonal_matrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vdiagmat \moremath_diagonal_matrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vdiagmat \moremath_diagonal_matrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \pantidiagmat
+ \moremath_antidiagonal_matrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bantidiagmat
+ \moremath_antidiagonal_matrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vantidiagmat
+ \moremath_antidiagonal_matrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \psmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vsmalldiagmat
+ \moremath_diagonal_smallmatrix:Vn {V}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \psmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {p}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {b}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Bsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {B}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {v}
+\__moremath_new_matrix_shorth_doc_cmd:NNn \Vsmallantidiagmat
+ \moremath_antidiagonal_smallmatrix:Vn {V}
+\cs_if_free:NTF \idmat
+{
+ \NewDocumentCommand \idmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_matrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \idmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\idmat}
+}
+\cs_if_free:NTF \smallidmat
+{
+ \NewDocumentCommand \smallidmat { o m }
+ {
+ \group_begin:
+ \tl_if_novalue:nF {#1}
+ {
+ \keys_set:nn { moremath / matrix } {#1}
+ }
+ \moremath_id_smallmatrix:n {#2}
+ \group_end:
+ }
+}{ % \cs_if_free:NTF \smallidmat FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {\smallidmat}
+}
+\cs_new_protected:Nn \__moremath_new_id_matrix_doc_cmd:NNn
+{
+ \cs_if_free:NTF #1
+ {
+ \NewDocumentCommand #1 { o m }
+ {
+ \group_begin:
+ \tl_if_empty:nF {#3}
+ {
+ \keys_set:nn { moremath / matrix } {#3}
+ }
+ \tl_if_novalue:nF {##1}
+ {
+ \keys_set:nn { moremath / matrix } {##1}
+ }
+ #2 {##2}
+ \group_end:
+ }
+ }{ % \cs_if_free:NTF #1 FALSE BRANCH
+ \msg_warning:nnn { moremath } { matrix / already-defined-doc-cmd-skip }
+ {#1}
+ }
+}
+\__moremath_new_id_matrix_doc_cmd:NNn \pidmat \moremath_id_matrix:n { delimiter = p }
+\__moremath_new_id_matrix_doc_cmd:NNn \bidmat \moremath_id_matrix:n { delimiter = b }
+\__moremath_new_id_matrix_doc_cmd:NNn \Bidmat \moremath_id_matrix:n { delimiter = B }
+\__moremath_new_id_matrix_doc_cmd:NNn \vidmat \moremath_id_matrix:n { delimiter = v }
+\__moremath_new_id_matrix_doc_cmd:NNn \Vidmat \moremath_id_matrix:n { delimiter = V }
+\__moremath_new_id_matrix_doc_cmd:NNn \psmallidmat \moremath_id_smallmatrix:n
+ { delimiter = p }
+\__moremath_new_id_matrix_doc_cmd:NNn \bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = b }
+\__moremath_new_id_matrix_doc_cmd:NNn \Bsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = B }
+\__moremath_new_id_matrix_doc_cmd:NNn \vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = v }
+\__moremath_new_id_matrix_doc_cmd:NNn \Vsmallidmat \moremath_id_smallmatrix:n
+ { delimiter = V }
+}{ % \bool_if:nTF \l__moremath_predef_matrix_bool FALSE BRANCH
+ \msg_info:nnnn {moremath} { load / disabling } { no-matrix }
+ {
+ (anti-)diagonal~matrix~commands
+ }
+} % \bool_if:nTF \l__moremath_predef_matrix_bool
+\msg_new:nnnn { moremath } { abs-shorth / csname-already-defined-skip }
+{
+ Control~sequence~'#1'~is~already~defined.\\
+ Skipping~declaration~of~paired~delimiter~\msg_line_context:.\\
+ Use~package~option~'no-abs-shorthands'~to~disable~the~paired\\
+ delimiter~shorthands.
+}{
+ The~control~sequence~'#1'~has~already~been\\
+ defined~by~something~else.\\
+ I~am~refusing~to~overwrite~its~existing~definition~and~instead~avoid\\
+ declaring~a~paired~delimiter.\\
+}
+\bool_if:NTF \l__moremath_predef_abs_bool
+{
+\cs_if_free:NTF \abs
+{
+ \DeclarePairedDelimiter \abs {\lvert} {\rvert}
+}{
+ % warn if the csname is taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\abs}
+} % \cs_if_free:NTF \abs
+
+\cs_if_free:NTF \norm
+{
+ \DeclarePairedDelimiter \norm {\lVert} {\rVert}
+}{
+ % warn if csname is already taken
+ \msg_warning:nnn { moremath } { abs-shorth / csname-already-defined-skip }
+ {\norm}
+} % \cs_if_free:NTF
+}{
+ \msg_info:nnnn {moremath} {load / disabling} {no-abs-shorthands}
+ {
+ '\abs'~and~'\norm'~macros
+ }
+} % End of the conditional
+\endinput
+%%
+%% End of file `moremath.sty'.
diff --git a/Master/texmf-dist/tex/latex/overarrows/overarrows.sty b/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
index f954f12b55b..db0b1b04322 100644
--- a/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
+++ b/Master/texmf-dist/tex/latex/overarrows/overarrows.sty
@@ -17,10 +17,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{overarrows}
-[2023/02/15 v1.1 Custom extensible arrows over math expressions]
+[2024/07/11 v1.2 Custom extensible arrows over math expressions]
\newif\ifovar@option@oldarrows@
\newif\ifovar@option@esvect@ \ovar@option@esvect@true \PassOptionsToPackage{f}{esvect}
\newif\ifovar@option@tikz@
+\newif\ifovar@option@pstricks@
\newif\ifovar@option@pstarrows@
\newif\ifovar@detectsubscripts@
\newif\ifovar@option@subother@
@@ -54,6 +55,7 @@
\DeclareOption{esvecth}{\ovar@option@esvect@true\PassOptionsToPackage{h}{esvect}}
\DeclareOption{old-arrows}{\ovar@option@oldarrows@true}
\DeclareOption{tikz}{\ovar@option@tikz@true}
+\DeclareOption{pstricks}{\ovar@option@pstricks@true}
\DeclareOption{pstarrows}{\ovar@option@pstarrows@true}
\DeclareOption{subscripts}{\ovar@detectsubscripts@true}
\DeclareOption{subother}{\ovar@option@subother@true}
@@ -117,35 +119,70 @@
\ProcessOptions\relax
\RequirePackage{amsmath}
\RequirePackage{etoolbox}
-\let\ovar@rightarrow\rightarrow
-\let\ovar@leftarrow\leftarrow
+\def\ovar@rightarrow{\rightarrow}
+\def\ovar@leftarrow{\leftarrow}
\ifovar@option@oldarrows@
\RequirePackage[old]{old-arrows}
- \let\ovar@rightarrow\varrightarrow
- \let\ovar@leftarrow\varleftarrow
+ \def\ovar@rightarrow{\varrightarrow}
+ \def\ovar@leftarrow{\varleftarrow}
\fi
\ifovar@option@esvect@
\RequirePackage{esvect}
+ \DeclareFontFamily{U}{esvect}{}
+ \DeclareFontShape{U}{esvect}{m}{n}{
+ <-5.5> vect5
+ <5.5-6.5> vect6
+ <6.5-7.5> vect7
+ <7.5-8.5> vect8
+ <8.5-9.5> vect9
+ <9.5-> vect10
+ }{}
\fi
\ifovar@option@tikz@
\RequirePackage{tikz}
\usetikzlibrary{arrows.meta}
\fi
+\ifovar@option@pstricks@
+ \RequirePackage{pstricks-add}
+\fi
\ifovar@option@pstarrows@
\RequirePackage[pstarrows]{pict2e}
\fi
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-luatex}
+\DeclareHookRule{begindocument}{overarrows}{after}{unicode-math-xetex}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \ifdef{\relbareda}
+ {%
+ \gdef\ovar@auto@middle{\relbareda}
+ \gdef\ovar@auto@trim@middle{1}
+ }
+ {%
+ \gdef\ovar@auto@middle{\relbar}
+ \gdef\ovar@auto@trim@middle{2.5}
+ }%
+ \@ifpackageloaded{unicode-math}
+ {%
+ \check@mathfonts
+ \iffontchar\textfont\tw@\string"23AF
+ \gdef\ovar@auto@middle{\mathrel\harrowextender}
+ \gdef\ovar@auto@trim@middle{0}
+ \fi
+ }
+ {}%
+ }
\newcommand{\SetOverArrowsSubscriptCommand}[1]{\global\let\ovar@subcmd=#1}
\SetOverArrowsSubscriptCommand{_}
\ifovar@option@subother@
\begingroup
\catcode `_=12
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
\ifovar@option@subactive@
\begingroup
\catcode `_=13
- \AddToHook{begindocument/end}{\SetOverArrowsSubscriptCommand{_}}
+ \SetOverArrowsSubscriptCommand{_}%
\endgroup
\fi
\RequirePackage{pgfkeys}
@@ -286,12 +323,17 @@
}
}
},
+ middle config/harrowextender/.code={%
+ \pgfkeysalso{%
+ middle={\harrowextender},
+ trim middle={0},
+ }
+ },
middle config/auto/.code={%
- \ifovar@option@esvect@
- \pgfkeysalso{middle config=relbareda}
- \else
- \pgfkeysalso{middle config=relbar}
- \fi
+ \pgfkeysalso{%
+ middle={\ovar@auto@middle},
+ trim middle={\ovar@auto@trim@middle},
+ }
},
amsmath/.is choice,%
amsmath/mimic/.code=\pgfkeysalso{%
@@ -369,6 +411,39 @@
shift right=-2,
min length=12,
}
+\SetOverArrowsMethod[lens]{pstricks}{%
+ no arrow macro hook/.code={%
+ \ovar@set{%
+ arrow macro/.expanded={%
+ $\noexpand\mkern \expandonce{\ovar@shift@left} mu\noexpand\relax$%
+ \noexpand\begin{pspicture}\expandonce{\ovar@pstricks@geometry}%
+ \noexpand\psset{linewidth=\expandonce{\ovar@pstricks@linethickness}}%
+ \noexpand\psset{\expandonce{\ovar@pstricks@psset}}%
+ \expandonce{\ovar@pstricks@command}%
+ \noexpand\end{pspicture}%
+ $\noexpand\mkern \expandonce{\ovar@shift@right} mu\noexpand\relax$%
+ }
+ }
+ },
+ pstricks command/.store in=\ovar@pstricks@command,
+ psset/.store in=\ovar@pstricks@psset,
+ geometry/.store in=\ovar@pstricks@geometry,
+ line thickness/.store in=\ovar@pstricks@linethickness,
+ pstricks command/.value required,
+ psset/.value required,
+ geometry/.value required,
+ line thickness/.value required,
+ arrow/.style={pstricks command={\psline{##1}(0,0)(\overarrowlength,0)}},%
+ arrow/.value required,%
+ thinner/.style={line thickness={\overarrowsmallerthickness}},%
+ thinner/.value forbidden,%
+ shift right=-2,
+ min length=12,
+ geometry={(0,-0.5ex)(\overarrowlength,0.5ex)},%
+ line thickness={\overarrowthickness},%
+ arrow={->},%
+ psset={},%
+}
\SetOverArrowsMethod[lens]{picture}{%
no arrow macro hook/.code={%
\ovar@set{%
@@ -413,28 +488,61 @@
\newlength{\overarrowlength}
\newlength{\overarrowthickness}
\newlength{\overarrowsmallerthickness}
-\newlength{\ovar@extralength}
\newlength{\ovar@tempdim}
\def\ovar@set@arrowlength#1#2#3{%
\settowidth{\ovar@tempdim}{$\m@th#2\mskip #1 mu\relax$}%
\settowidth{\overarrowlength}{$\m@th#2#3$}%
\ifdim \overarrowlength < \ovar@tempdim \overarrowlength=\ovar@tempdim\fi%
}
-\def\ovar@set@arrowthickness#1{% use rule thickness=\fontdimen 8 font family 3
+\def\ovar@rulethickness@fontdimen{8}
+\def\ovar@rulethickness@family{3}
+\def\ovar@set@arrowthickness#1{%
\ifx#1\displaystyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\textstyle%
- \overarrowthickness = \fontdimen 8 \textfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \textfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
\else\ifx#1\scriptstyle%
- \overarrowthickness = \fontdimen 8 \scriptfont 3%
- \overarrowsmallerthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptfont \ovar@rulethickness@family%
+ \overarrowsmallerthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\else%
- \overarrowthickness = \fontdimen 8 \scriptscriptfont 3%
+ \overarrowthickness =
+ \fontdimen \ovar@rulethickness@fontdimen \scriptscriptfont \ovar@rulethickness@family%
\overarrowsmallerthickness = \overarrowthickness%
\fi\fi\fi%
}
+\def\ovar@set@arrowthickness@UM@lua#1{%
+ \overarrowthickness = \Umathoverbarrule #1
+ \ifx#1\displaystyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \textstyle%
+ \else\ifx#1\textstyle%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptstyle%
+ \else%
+ \overarrowsmallerthickness = \Umathoverbarrule \scriptscriptstyle%
+ \fi\fi%
+}
+\AddToHook{begindocument}[overarrows]
+ {%
+ \@ifpackageloaded{unicode-math-luatex}
+ {%
+ \global\let\ovar@set@arrowthickness\ovar@set@arrowthickness@UM@lua
+ }
+ {%
+ \@ifpackageloaded{unicode-math-xetex}
+ {%
+ \gdef\ovar@rulethickness@fontdimen{54}
+ \gdef\ovar@rulethickness@family{2}
+ }
+ {}
+ }
+ }
\def\ovar@stackover@@#1#2#3#4#5#6{\vbox{\ialign{##\crcr%
$#5\mskip #1 mu\relax$\crcr%
\noalign{#2\nointerlineskip}#4\crcr%
@@ -467,16 +575,27 @@
\ovar@stackunder@{#2}{#3}{#4}{#5}{#6}%
}
\def\ovar@stack@lens{\ovar@stackover@lens}
-\NewDocumentCommand{\DeclareOverArrowCommand}{ O{symb} m m }{%
+\ExplSyntaxOn
+\cs_new_protected:Npn \__overarrows_processor_strip_escape_char:n #1
+ {
+ \regex_match:nnTF { ^\cC. } { #1 }
+ { \tl_set:Nx \ProcessedArgument { \cs_to_str:N #1 } }
+ { \tl_set:Nx \ProcessedArgument { #1 } }
+ }
+\cs_new_eq:NN \ovar@cmdname@processor \__overarrows_processor_strip_escape_char:n
+\ExplSyntaxOff
+\NewDocumentCommand{\DeclareOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\begingroup
\ovar@set@common
\ifcsdef{ovar@set@#1}{%
\csuse{ovar@set@#1}
}{%
\PackageError{overarrows}{Unknown method #1}
- {Try with 'symb', 'tikz' or 'picture'}
+ {Try with 'symb', 'tikz', 'pstriks' or 'picture'}
}
- \ovar@set{#3 }
+ \ovar@set{#3}
\ifdef{\ovar@macro@arrow}{}{%
\ovar@set{no arrow macro hook}
}
@@ -519,12 +638,16 @@
\fi
\endgroup
}
-\NewDocumentCommand{\ProvideOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\ProvideOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{}{
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
-\NewDocumentCommand{\NewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\NewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsdef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname already defined}%
{You have used \protect\NewOverArrowCommand\space with a command that
@@ -534,7 +657,9 @@
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
-\NewDocumentCommand{\RenewOverArrowCommand}{ O{symb} m m }{%
+\NewDocumentCommand{\RenewOverArrowCommand}{
+ O{symb} >{\ovar@cmdname@processor} m m
+}{%
\ifcsundef{#2}{%
\PackageError{overarrows}{Command \csname #2\endcsname undefined}%
{You have used \protect\RenewOverArrowCommand\space with a command that was
@@ -544,148 +669,151 @@
\DeclareOverArrowCommand[#1]{#2}{#3}
}
}
+\newsavebox\ovar@tempbox
\def\ovar@starversion#1#2#3{%
- #1#2{#3}%
- \settowidth{\ovar@extralength}{$\m@th#1#2{#3}$}
- \settowidth{\ovar@tempdim}{$\m@th#2{#3}$}
- \deflength{\ovar@extralength}{0.5\ovar@extralength-0.5\ovar@tempdim}%
- \kern-\ovar@extralength%
+ \sbox{\ovar@tempbox}{$\m@th #1#2{#3}$}%
+ \usebox{\ovar@tempbox}%
+ \settowidth{\ovar@tempdim}{$\m@th #2{#3}$}%
+ \kern\dimeval{0.5\ovar@tempdim - 0.5\wd\ovar@tempbox}%
}
\ifovar@option@esvect@
\let\esvectvv\vv
\undef\vv
- \NewOverArrowCommand{vv}{esvect, middle config=auto}
-\fi
-\ifovar@option@overrightarrow@
- \DeclareOverArrowCommand{overrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- }
-\fi
-\ifovar@option@underrightarrow@
- \DeclareOverArrowCommand{underrightarrow}{%
- amsmath, middle config=relbar,
- end=\ovar@rightarrow,
- right arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftarrow@
- \DeclareOverArrowCommand{overleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftarrow@
- \DeclareOverArrowCommand{underleftarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftrightarrow@
- \DeclareOverArrowCommand{overleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- }
-\fi
-\ifovar@option@underleftrightarrow@
- \DeclareOverArrowCommand{underleftrightarrow}{%
- amsmath, middle config=relbar,
- start=\ovar@leftarrow,
- end=\ovar@rightarrow,
- center arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overrightharpoonup@
- \DeclareOverArrowCommand{overrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- }
-\fi
-\ifovar@option@underrightharpoonup@
- \DeclareOverArrowCommand{underrightharpoonup}{%
- amsmath, middle config=relbar,
- end=\rightharpoonup,
- right arrow,
- arrow under,
- }
+ \NewOverArrowCommand{\vv}{esvect, middle config = relbareda}
\fi
-\ifovar@option@overrightharpoondown@
- \DeclareOverArrowCommand{overrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- }
-\fi
-\ifovar@option@underrightharpoondown@
- \DeclareOverArrowCommand{underrightharpoondown}{%
- amsmath, middle config=relbar,
- end=\rightharpoondown,
- right arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftharpoonup@
- \DeclareOverArrowCommand{overleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftharpoonup@
- \DeclareOverArrowCommand{underleftharpoonup}{%
- amsmath, middle config=relbar,
- start=\leftharpoonup,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overleftharpoondown@
- \DeclareOverArrowCommand{overleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- }
-\fi
-\ifovar@option@underleftharpoondown@
- \DeclareOverArrowCommand{underleftharpoondown}{%
- amsmath, middle config=relbar,
- start=\leftharpoondown,
- end=\relbar,
- left arrow,
- arrow under,
- }
-\fi
-\ifovar@option@overbar@
- \DeclareOverArrowCommand{overbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- space after arrow=-0.3ex,
- }
-\fi
-\ifovar@option@underbar@
- \DeclareOverArrowCommand{underbar}{%
- amsmath, middle config=relbar,
- start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
- shift leftright=0,
- arrow under,
- space before arrow=-0.3ex,
+\AddToHook{begindocument}[overarrows]
+ {
+ \ifovar@option@overrightarrow@
+ \DeclareOverArrowCommand{\overrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightarrow@
+ \DeclareOverArrowCommand{\underrightarrow}{%
+ amsmath, middle config=relbar,
+ end=\ovar@rightarrow,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftarrow@
+ \DeclareOverArrowCommand{\overleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftarrow@
+ \DeclareOverArrowCommand{\underleftarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftrightarrow@
+ \DeclareOverArrowCommand{\overleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ }
+ \fi
+ \ifovar@option@underleftrightarrow@
+ \DeclareOverArrowCommand{\underleftrightarrow}{%
+ amsmath, middle config=relbar,
+ start=\ovar@leftarrow,
+ end=\ovar@rightarrow,
+ center arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overrightharpoonup@
+ \DeclareOverArrowCommand{\overrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightharpoonup@
+ \DeclareOverArrowCommand{\underrightharpoonup}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoonup,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overrightharpoondown@
+ \DeclareOverArrowCommand{\overrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ }
+ \fi
+ \ifovar@option@underrightharpoondown@
+ \DeclareOverArrowCommand{\underrightharpoondown}{%
+ amsmath, middle config=relbar,
+ end=\rightharpoondown,
+ right arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftharpoonup@
+ \DeclareOverArrowCommand{\overleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftharpoonup@
+ \DeclareOverArrowCommand{\underleftharpoonup}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoonup,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overleftharpoondown@
+ \DeclareOverArrowCommand{\overleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ }
+ \fi
+ \ifovar@option@underleftharpoondown@
+ \DeclareOverArrowCommand{\underleftharpoondown}{%
+ amsmath, middle config=relbar,
+ start=\leftharpoondown,
+ end=\relbar,
+ left arrow,
+ arrow under,
+ }
+ \fi
+ \ifovar@option@overbar@
+ \DeclareOverArrowCommand{\overbar}{%
+ amsmath, middle config=relbar,
+ start={\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ space after arrow=-0.3ex,
+ }
+ \fi
+ \ifovar@option@underbar@
+ \DeclareOverArrowCommand{\underbar}{%
+ amsmath, middle config=relbar,
+ start={\vphantom{+}\std@minus}, end={\std@minus},% \relbar is defined with \mathsm@sh
+ shift leftright=0,
+ arrow under,
+ space before arrow=-0.3ex,
+ }
+ \fi
}
-\fi
\newcommand{\ovar@testmathstyles}[2][]{
\begingroup
\newcommand*{\ovar@row@teststyle}[1]{%
@@ -728,7 +856,9 @@
\end{displaymath}
}
\endgroup
-\NewDocumentCommand{\TestOverArrow}{ s o m }{
+\NewDocumentCommand{\TestOverArrow}{
+ s o >{\ovar@cmdname@processor} m
+}{%
\ifcsdef{#3}{}{%
\PackageWarning{overarrows}{Unknown name '#3' passed to
\protect\TestOverArrow}
diff --git a/Master/texmf-dist/tex/latex/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
new file mode 100644
index 00000000000..d74c698d27a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/passopt/passopt.sty
@@ -0,0 +1,56 @@
+%
+% ***************** THE PASSOPT PACKAGE *****************
+%
+% Copyright (C) 2024 by Qu Yi <toquyi@163.com>
+%
+% This work may be distributed and/or modified under the
+% conditions of the CC-BY 4.0 License.
+% The latest version of this license is in
+% https://creativecommons.org/licenses/by/4.0/legalcode
+\NeedsTeXFormat{LaTeX2e}[2021/11/15]
+\ProvidesExplPackage{passopt}{2024/07/17}{1.01a}
+ {Passing options to packages or classes}
+
+\cs_generate_variant:Nn \tl_if_blank:nTF { v }
+\cs_new_protected:Npn \po_add_before_hook:nnn #1#2
+ { \hook_gput_code:nnn { #1/#2/before } { passopt } }
+\cs_new_protected:Npn \po_set_options_list:nnnnn #1#2#3#4#5
+ {
+ \po_add_before_hook:nnn {#1} {#5}
+ {
+ \cs_set:cpx { @raw@opt@#5.#2 }
+ {
+ \IfBooleanTF{#3}
+ {\exp_not:o {#4}}
+ {
+ \tl_if_blank:vTF { @raw@opt@#5.#2 }
+ { \exp_not:o {#4} }
+ { \exp_not:v { @raw@opt@#5.#2 },\exp_not:o {#4} }
+ }
+ }
+ \exp_args:Nc \protected@edef { opt@#5.#2 }
+ {
+ \exp_last_unbraced:Nv
+ \zap@space { @raw@opt@#5.#2 }~\@empty
+ }
+ }
+ }
+\cs_new_protected:Npn \po_clear_options_list:nnn #1#2#3
+ {
+ \po_add_before_hook:nnn {#1} {#3}
+ {
+ \tl_clear:c { @raw@opt@#3.#2 }
+ \tl_clear:c { opt@#3.#2 }
+ }
+ }
+\NewDocumentCommand{\SetOptionsToPackage}{smm}
+ {\po_set_options_list:nnnnn { package } { sty } {#1} {#2} {#3}}
+\NewDocumentCommand{\SetOptionsToClass}{smm}
+ {\po_set_options_list:nnnnn { class } { cls } {#1} {#2} {#3}}
+\cs_new_protected:Npn \ClearPackageOptions #1
+ { \po_clear_options_list:nnn { package } { sty } {#1} }
+\cs_new_protected:Npn \ClearClassOptions #1
+ { \po_clear_options_list:nnn { class } { cls } {#1} }
+\endinput
+%
+% End of file `passopt.sty'. \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/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/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/polyglossia/arabicnumbers.sty b/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
index c45aa22a654..b5c37d61db3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/arabicnumbers.sty
@@ -43,24 +43,23 @@
\fi
}
\def\abjad@zero{}
-\def\abjad@three{ج\ifabjad@jim@notail\char"200D\fi}
+\def\abjad@one{ا}
+\def\abjad@three{ج\ifabjad@jim@notail\Uchar"200D\fi}
\def\abj@num@i@iso#1{%
- \ifcase#1\or ا\or ب\or\abjad@three\or د%
- \or ه\char"200D\or و\or ز\or ح\or ط\fi%
- \ifnum#1=\z@\abjad@zero\fi}
+ \ifcase#1\abjad@zero\or \abjad@one\or ب\or\abjad@three\or د%
+ \or ه\Uchar"200D\or و\or ز\or ح\or ط\fi}
\def\abj@num@i#1{%
- \ifcase#1\or ا\or ب\or\abjad@three\or د%
- \or ه\or و\or ز\or ح\or ط\fi%
- \ifnum#1=\z@\abjad@zero\fi}
+ \ifcase#1\abjad@zero\or\abjad@one\or ب\or\abjad@three\or د%
+ \or ه\or و\or ز\or ح\or ط\fi}
\def\abj@num@ii#1{%
\ifcase#1\or ÙŠ\or Ùƒ\or Ù„\or Ù…\or Ù†%
- \or س\or ع\or Ù\or ص\fi%
- \ifnum#1=\z@\fi\abj@num@i}
+ \or س\or ع\or Ù\or ص\fi
+ \abj@num@i}
\def\abj@num@iii#1{%
\ifcase#1\or ق\or ر\or ش\or ت\or ث%
- \or خ\or ذ\or ض\or ظ\fi%
- \ifnum#1=\z@\fi\abj@num@ii}
+ \or خ\or ذ\or ض\or ظ\fi
+ \abj@num@ii}
\def\abj@num@iv#1{%
\ifcase#1\or غ\fi
- \ifnum#1=\z@\fi\abj@num@iii}
+ \abj@num@iii}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/cal-util.def b/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
index 85576f39f71..fa6e325029e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
+++ b/Master/texmf-dist/tex/latex/polyglossia/cal-util.def
@@ -45,7 +45,7 @@
%% This is an algorithm from Reingold & Dershowitz,
-%% Calendrical Calculations, The Millenium Edition
+%% Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromGregorian#1#2#3#4{%
\setcounter{tmpA}{(#1-1)*365}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
index 36d3136d29b..c231e80f342 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadien.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for Canadian (Acadian) French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
index 2e1a3a0719a..7029af6bf65 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
index f47e9adcbda..baa1c8c0282 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (Afrikaans)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{afrikaans}
+\InheritGlossFile{afrikaans}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
index 7eb4a47a7dd..41b672984bb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
index 33d1f12831c..653d10b5dda 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for Afrikaans]
@@ -16,22 +16,21 @@
% BCP-47 compliant aliases
\setlanguagealias*{afrikaans}{af}
-\define@boolkey{afrikaans}[afrikaans@]{babelshorthands}[true]{}
-
+\DeclareKeys[polyglossia/gloss/afrikaans]
+ {
+ babelshorthands.if = afrikaans@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{afrikaans}{babelshorthands=false}
+\InitializeGlossOptions{afrikaans}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{afrikaans}{babelshorthands=true}
+ \SetGlossOptions{afrikaans}{babelshorthands=true}
\else
- \setkeys{afrikaans}{babelshorthands=false}
+ \SetGlossOptions{afrikaans}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\afrikaans@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
index 06a4cd6c681..bbfbb2e7576 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-albanian.ldf}[polyglossia: module for Albanian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
index 649198b3789..e5a358a17e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (Amharic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{amharic}
+\InheritGlossFile{amharic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
index f456ab17a0e..2531eb7c587 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-american.ldf}[polyglossia: module for American English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
index 38c225672ac..aebbd10989a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-amharic.ldf}[polyglossia: module for Amharic]
\PolyglossiaSetup{amharic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
index b52bfa6942c..54cb4d4b6eb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
index 22340aeff1c..3583fd12ccb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar,bcp47-region=IQ}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
index 83fd1b49ad9..bd140fb026c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-JO,bcp47-language=ar,bcp47-region=JO}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
index 69a13896196..538e6a5a90a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-LB,bcp47-language=ar,bcp47-region=LB}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
index 6176cfabdcb..471dad5d12b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
index 821d107bbc9..8158dca6e94 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-PS,bcp47-language=ar,bcp47-region=PS}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
index f736606934f..b437f61e191 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-SY,bcp47-language=ar,bcp47-region=SY}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
index 06759e39b51..4eef25a7166 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar,bcp47-region=YE}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
index f35c8e67727..84a751f2fc0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
index 3d478f02757..885fe3d02e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for Arabic]
\RequireBidi
@@ -38,104 +38,112 @@
\setlanguagealias*[locale=default]{arabic}{apd}
\setlanguagealias*[locale=mashriq]{arabic}{ar-PS}
-\define@boolkey{arabic}[arabic@]{abjadalph}[true]{}
-
\newif\ifeastern@numerals
-\define@choicekey*+{arabic}{numerals}[\xpg@val\xpg@nr]{mashriq,maghrib,eastern,western}[mashriq]{%
- \ifcase\xpg@nr\relax
- % mashriq:
- \eastern@numeralstrue%
- \or
- % maghrib:
- \eastern@numeralsfalse
- \or
- % eastern:
- \eastern@numeralstrue%
- \or
- % western:
- \eastern@numeralsfalse
- \fi
- \xpg@info{Option: Arabic, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Arabic numerals option `#1'}}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{arabic}[arabic@]{abjadjimnotail}[true]{%
- \ifarabic@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-\define@choicekey*+{arabic}{locale}[\xpg@val\xpg@nr]{default,mashriq,libya,algeria,tunisia,morocco,mauritania}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=default}%
- \or
- % mashriq:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
- \xpg@info{Option: arabic, locale=mashriq}%
- \or
- % libya:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
- \xpg@info{Option: arabic, locale=libya}%
- \or
- % algeria:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=algeria}%
- \or
- % tunisia:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=tunisia}%
- \or
- % morocco:
- \eastern@numeralsfalse%
- \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
- \xpg@info{Option: arabic, locale=morocco}%
- \or
- % mauritania:
- \eastern@numeralstrue%
- \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
- \xpg@info{Option: arabic, locale=mauritania}%
- \fi
- \gdef\@@arabic@month{\@arabic@month{#1}}
- }{\xpg@warning{Unknown Arabic locale `#1'}}
-
\newif\if@hijrical
-\define@choicekey*+{arabic}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri,islamic}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \or
- % islamic:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Arabic, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Arabic calendar option `#1'}}
-
-
-\define@key{arabic}{hijricorrection}[0]{%
- \gdef\arabic@hijri@correction{#1}}%
-
\newif\ifarabic@customsep\arabic@customsepfalse
-\def\xpg@sepmark{}
-\define@key{arabic}{sectionsep}[.]{%
- \arabic@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/arabic]
+ {
+ hijricorrection.code = \gdef\arabic@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\arabic@customseptrue,
+ sectionsep.default:n = .,
+ abjadalph.if = arabic@abjadalph,
+ abjadalph.default:n = true,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ numerals.choice:,
+ numerals / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / maghrib.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals / eastern.code =
+ {%
+ \eastern@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \eastern@numeralsfalse
+ },
+ numerals.default:n = mashriq,
+ numerals/unknown.code = \xpg@warning{Unknown Arabic numerals option `#1'},
+ locale.choice:,
+ locale / default.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-YE,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mashriq.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-IQ,bcp47-language=ar}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / libya.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ayl,bcp47-language=ar,bcp47-region=LY}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / algeria.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{Ø£}%
+ \SetLanguageKeys{arabic}{bcp47=arq,bcp47-language=ar,bcp47-region=DZ,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / tunisia.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{Ø£}%
+ \SetLanguageKeys{arabic}{bcp47=aeb,bcp47-language=ar,bcp47-region=TN,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / morocco.code =
+ {%
+ \eastern@numeralsfalse
+ \def\abjad@one{Ø£}%
+ \SetLanguageKeys{arabic}{bcp47=ary,bcp47-language=ar,bcp47-region=MA,bcp47-extension-u=nu-latn}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale / mauritania.code =
+ {%
+ \eastern@numeralstrue
+ \def\abjad@one{ا}%
+ \SetLanguageKeys{arabic}{bcp47=ar-MR,bcp47-language=ar,bcp47-region=MR}%
+ \gdef\@@arabic@month{\@arabic@month{#1}}%
+ },
+ locale.default:n = default,
+ locale/unknown.code = \xpg@warning{Unknown Arabic locale `#1'},
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar / islamic.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Arabic calendar option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
+\InitializeGlossOptions{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
% Register alias options
-\xpg@set@alias@values{arabic}{calendar}{islamic}{hijri}
+\SetLanguageAliasValues{arabic}{calendar}{islamic,hijri}
\def\arabicgregmonth@default#1{\ifcase#1%
% Egypt, Sudan, Yemen and Golf states
@@ -155,9 +163,12 @@
\def\arabicgregmonth@mauritania#1{\ifcase#1%
\or يناير\or Ùبراير\or مارس\or إبريل\or مايو\or يونيو\or يوليو\or أغشت\or شتمبر\or أكتوبر\or نوÙمبر\or دجمبر\fi}
-\def\@arabic@month#1{\ifcsdef{arabicgregmonth@#1}{\expandafter\csname arabicgregmonth@#1\endcsname}%
-{\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
-\arabicgregmonth@default}}
+\def\@arabic@month#1{%
+ \@ifundefined{arabicgregmonth@#1}%
+ {\xpg@warning{Option `locale=#1' is not defined for Arabic: using `default' instead}%
+ \arabicgregmonth@default}%
+ {\expandafter\csname arabicgregmonth@#1\endcsname}%
+}
%\Hijritoday is now locale-aware and will format the date with this macro:
\DefineFormatHijriDate{arabic}{\@ensure@RTL{\arabicnumber{\value{Hijriday}}%
@@ -189,18 +200,18 @@
}
\def\datearabic{%
\def\today{%
- \if@hijrical%
+ \if@hijrical
\Hijritoday[\arabic@hijri@correction]%
\else%
- \if@RTL%
+ \if@RTL
\arabicnumber\day\space\@@arabic@month{\month}%
\space\arabicnumber\year%
\else% in LR environment we format the gregorian date within \textenglish
- \ifcsdef{english@loaded}{\textenglish{\today}}%else US format
- {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or%
- July\or August\or September\or October\or November\or December\fi%
+ \iflanguageloaded{english}{\textenglish{\today}}%else US format
+ {\normalfontlatin\ifcase\month\or January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
\space\number\day,\space\number\year}%
- \fi%
+ \fi
\fi}}
% Use \providecommand here as the ldf file might
@@ -226,10 +237,9 @@
\or Ø­\or Ø·\or ÙŠ\or Ùƒ\or Ù„\or Ù…\or Ù†%
\or س\or ع\or Ù\or ص\or Ù‚\or ر\or Ø´%
\or ت\or ث\or خ\or ذ\or ض\or ظ\or غ%
- \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi%
+ \else\xpg@ill@value{#1}{arabic@abjad@alph}\fi
}
-
\def\abjadmaghribi#1{%
\ifnum#1>1999\xpg@ill@value{#1}{abjad}%
\else
@@ -252,111 +262,111 @@
%maghribi س -> ص ص -> ض ش -> س ض -> ظ ظ -> غ غ -> ش
\def\abj@maghribi@num@ii#1{%
- \ifcase#1\or ÙŠ\or Ùƒ\or Ù„\or Ù…\or Ù†%
+ \ifcase#1\abjad@zero\or ÙŠ\or Ùƒ\or Ù„\or Ù…\or Ù†%
\or ص\or ع\or Ù\or ض\fi
- \ifnum#1=\z@\abjad@zero\fi\abj@num@i}
+ \abj@num@i}
\def\abj@maghribi@num@iii#1{%
\ifcase#1\or ق\or ر\or س\or ت\or ث%
\or خ\or ذ\or ظ\or غ\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@ii}
+ \abj@maghribi@num@ii}
\def\abj@maghribi@num@iv#1{%
\ifcase#1\or Ø´\fi
- \ifnum#1=\z@\fi\abj@maghribi@num@iii}
+ \abj@maghribi@num@iii}
\def\arabic@numbers{%
\ifarabic@abjadalph
- \let\@alph\abjadalph%
- \let\@Alph\abjadalph%
+ \let\@alph\abjadalph
+ \let\@Alph\abjadalph
\else
- \let\@alph\abjad%
- \let\@Alph\abjad%
+ \let\@alph\abjad
+ \let\@Alph\abjad
\fi
}
\def\noarabic@numbers{%
- \let\@alph\latin@alph%
- \let\@Alph\latin@Alph%
+ \let\@alph\latin@alph
+ \let\@Alph\latin@Alph
}
% Store original definition
\let\xpg@save@arabic\@arabic
\def\arabic@globalnumbers{%
- \let\@arabic\arabicnumber%
+ \let\@arabic\arabicnumber
\renewcommand\thefootnote{\localnumeral*{footnote}}%
\renewcommand\theequation{\localnumeral*{equation}}%
}
\def\noarabic@globalnumbers{%
- \let\@arabic\xpg@save@arabic%
+ \let\@arabic\xpg@save@arabic
}
\def\arabic@xetex@capsformat{%
- \let\xpg@save@sepmark\@SepMark%
+ \let\xpg@save@sepmark\@SepMark
\SepMark{\xpg@sepmark}
}
\def\noarabic@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi
}
\def\arabic@luatex@capsformat{%
%
% change chapter and part headings
\ifarabic@customsep
- \ifcsdef{chapter}{%
- \let\xpg@save@thesection\thesection%
+ \ifcsname chapter\endcsname
+ \let\xpg@save@thesection\thesection
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
- \let\xpg@save@theequation\theequation%
+ \let\xpg@save@theequation\theequation
\renewcommand*\theequation{%
\ifnum \c@chapter>\z@ \thechapter\xpg@sepmark\fi\@arabic\c@equation}
- \let\xpg@save@thefigure\thefigure%
+ \let\xpg@save@thefigure\thefigure
\renewcommand*\thefigure{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@figure}
- \let\xpg@save@thetable\thetable%
+ \let\xpg@save@thetable\thetable
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
- \let\xpg@save@thesubsection\thesubsection%
+ \fi
+ \let\xpg@save@thesubsection\thesubsection
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
- \let\xpg@save@thesubsubsection\thesubsubsection%
+ \let\xpg@save@thesubsubsection\thesubsubsection
\renewcommand\thesubsubsection{\thesubsection\xpg@sepmark\@arabic\c@subsubsection}
- \let\xpg@save@theparagraph\theparagraph%
+ \let\xpg@save@theparagraph\theparagraph
\renewcommand\theparagraph
{\thesubsubsection\xpg@sepmark\@arabic\c@paragraph}
- \let\xpg@save@thesubparagraph\thesubparagraph%
+ \let\xpg@save@thesubparagraph\thesubparagraph
\renewcommand\thesubparagraph{\theparagraph\xpg@sepmark\@arabic\c@subparagraph}
- \fi% (end \ifarabic@customsep)
+ \fi % (end \ifarabic@customsep)
}
\def\noarabic@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
- \let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
- \let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
- \let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
- \let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
- \let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
- \let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
- \let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
- \let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \ifcsname xpg@save@thesection\endcsname
+ \let\thesection\xpg@save@thesection
+ \fi
+ \ifcsname xpg@save@theequation\endcsname
+ \let\theequation\xpg@save@theequation
+ \fi
+ \ifcsname xpg@save@thefigure\endcsname
+ \let\thefigure\xpg@save@thefigure
+ \fi
+ \ifcsname xpg@save@thetable\endcsname
+ \let\thetable\xpg@save@thetable
+ \fi
+ \ifcsname xpg@save@thesubsection\endcsname
+ \let\thesubsection\xpg@save@thesubsection
+ \ifcsname xpg@save@thesubsubsection\endcsname
+ \let\thesubsubsection\xpg@save@thesubsubsection
+ \fi
+ \fi
+ \ifcsname xpg@save@theparagraph\endcsname
+ \let\theparagraph\xpg@save@theparagraph
+ \fi
+ \ifcsname xpg@save@thesubparagraph\endcsname
+ \let\thesubparagraph\xpg@save@thesubparagraph
+ \fi
}
\def\blockextras@arabic{%
@@ -368,7 +378,7 @@
\fi
\fi
}
-%
+
\def\noextras@arabic{%
\ifarabic@customsep
\ifxetex
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
index ea904ad5e3a..0770300480f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for Armenian]
@@ -21,43 +21,49 @@
\newif\if@eastern@armenian
\@eastern@armenianfalse
-\define@choicekey*+{armenian}{variant}[\xpg@val\xpg@nr]{western,eastern}[western]{%
- \ifcase\xpg@nr\relax
- % western:
- \@eastern@armenianfalse%
- \or
- % eastern:
- \@eastern@armeniantrue%
- \fi
- \xpg@info{Option: Armenian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Armenian variant `#1'}}
\newif\if@armenian@numerals
\@armenian@numeralsfalse
-\define@key{armenian}{numerals}[armenian]{%
- \ifstrequal{#1}{arabic}{%
- \@armenian@numeralsfalse%
- \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
- }{%
- \@armenian@numeralstrue%
- \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
- }%
-}
-\define@boolkey{armenian}[armenian@]{capitalyiwn}[true]{%
- \ifarmenian@capitalyiwn
- % MakeUppercase capitalizes the ligature of letters ech and yiwn (U+0587)
- % to capital ech and yiwn (also the output if Armenian is not selected at all)
- \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}
- \else
- % Capitalize ech and yiwn ligature to capital ech and vew,
- % following Armenian spelling reform
- \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}
- \fi
-}
+\DeclareKeys[polyglossia/gloss/armenian]
+ {
+ variant.choice:,
+ variant / western.code =
+ {%
+ \@eastern@armenianfalse
+ },
+ variant / eastern.code =
+ {%
+ \@eastern@armeniantrue
+ },
+ variant.default:n = western,
+ variant/unknown.code = \xpg@warning{Unknown Armenian variant `#1'},
+ numerals.choice:,
+ numerals / armenian.code =
+ {%
+ \@armenian@numeralstrue
+ \SetLanguageKeys{armenian}{bcp47-extension-u={}}%
+ },
+ numerals / arabic.code =
+ {%
+ \@armenian@numeralsfalse
+ \SetLanguageKeys{armenian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = armenian,
+ capitalyiwn.choice:,
+ capitalyiwn / true.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy-x-yiwn,bcp47-extension-x=yiwn}%
+ },
+ capitalyiwn / false.code =
+ {%
+ \SetLanguageKeys{armenian}{bcp47-casing=hy,bcp47-extension-x={}}%
+ },
+ capitalyiwn.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{armenian}{numerals=armenian,variant=western}
+\InitializeGlossOptions{armenian}{numerals=armenian,variant=western}
% Taken from ArmTeX. Audit!
\def\captionsarmenian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
index e2ef5273c56..d71e48bd945 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
index ad64804b5ee..c0b5debd39d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
index 0dd998cbe5a..41e1cfd5702 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
index e9f5095fccf..f073cdc632f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (Asturian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{asturian}
+\InheritGlossFile{asturian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
index 44babd93ef5..109a560111f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Xuacu <xuacusk8 at gmail dot com>
% Contributed by Kevin Godby <godbyk at gmail dot com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
index c624020f9ac..d3c85168511 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-australian.ldf}[polyglossia: module for Australian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
index b7ef2e504b6..b1397542781 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for Austrian German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
index 815db99c2ec..a24eb19c922 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (Arabic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{arabic}
+\InheritGlossFile{arabic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
index b8a13680aa1..4395a83d2e8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for Bahasa Indonesia]
% We provide this as a babel alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
index 37a604e050f..e710b619997 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for Bahasa Indonesia]
% We only provide this gloss for babel compatibility. Since bahasai is
% a malay variety, we use 'malay' with variant 'indonesian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
index f879535507c..d4c2ea9ec0c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for Bahasa Melayu]
% We only provide this gloss for babel compatibility. Since bahasam is
% a malay variety, we use 'malay' with variant 'malaysian' now.
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
index b4ab3525f5a..dbff903d788 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-basque.ldf}[polyglossia: module for Basque]
\PolyglossiaSetup{basque}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
index 02d49ffff15..975f48c0acc 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
index efa0abbd949..666620a671c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (Belarusian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{belarusian}
+\InheritGlossFile{belarusian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
index b5eb8753728..816e5900378 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for Belarusian]
@@ -26,63 +26,68 @@
\setlanguagealias*{belarusian}{be}
\def\belarusian@spelling{modern}
-\define@choicekey*+{belarusian}{spelling}[\xpg@val\xpg@nr]{modern,classic,tarask}[modern]{%
- \ifcase\xpg@nr\relax
- % modern:
- \def\belarusian@spelling{modern}%
- \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
- \or
- % classic:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \or
- % tarask:
- \def\belarusian@spelling{tarask}%
- \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
- \fi
-}{\xpg@warning{Unknown Belarusian spelling `#1'}}
-
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{belarusian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Belarusian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Belarusian numerals value `#1'}}
-\define@boolkey{belarusian}[belarusian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/belarusian]
+ {
+ babelshorthands.if = belarusian@babelshorthands,
+ babelshorthands.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \def\belarusian@spelling{modern}%
+ \SetLanguageKeys{belarusian}{bcp47=be,bcp47-variant=1959acad}%
+ },
+ spelling / classic.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling / tarask.code =
+ {%
+ \def\belarusian@spelling{tarask}%
+ \SetLanguageKeys{belarusian}{bcp47=be-tarask,bcp47-variant=tarask}%
+ },
+ spelling.default:n = modern,
+ spelling/unknown.code = \xpg@warning{Unknown Belarusian spelling `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Belarusian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
+\InitializeGlossOptions{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
% Register alias options
-\xpg@set@alias@values{belarusian}{spelling}{classic}{tarask}
+\SetLanguageAliasValues{belarusian}{spelling}{classic,tarask}
\ifsystem@babelshorthands
- \setkeys{belarusian}{babelshorthands=true}
+ \SetGlossOptions{belarusian}{babelshorthands=true}
\else
- \setkeys{belarusian}{babelshorthands=false}
+ \SetGlossOptions{belarusian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\belarusian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
index bbddce0fe8f..1831fbdf032 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by সাজেদà§à¦° রহিম জোয়ারদার <toshazed@gmail.com>
% TODO implement Bengali calendar
@@ -27,30 +27,36 @@
\newif\ifbengali@devanagari@numerals
\newif\ifbengali@bengali@numerals
-\define@choicekey*+{bengali}{numerals}[\xpg@val\xpg@nr]{Devanagari,Bengali,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralstrue%
- \or
- % Bengali:
- \bengali@bengali@numeralstrue%
- \bengali@devanagari@numeralsfalse%
- \or
- % Western:
- \bengali@bengali@numeralsfalse%
- \bengali@devanagari@numeralsfalse%
- \fi
- \xpg@info{Option: Bengali, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Bengali numeral `#1'}}
\def\extras@bengali{}
\def\noextras@bengali{}
-\define@boolkey{bengali}[bengali@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/bengali]
+ {
+ changecounternumbering.if = bengali@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralstrue
+ },
+ numerals / bengali.code =
+ {%
+ \bengali@bengali@numeralstrue
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \bengali@bengali@numeralsfalse
+ \bengali@devanagari@numeralsfalse
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Bengali numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{bengali}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{bengali}{changecounternumbering=false,numerals=Devanagari}
\def\captionsbengali{%
\def\refname{তথà§à¦¯à¦¸à§‚তà§à¦°à¦¸à¦®à§‚হ}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
index d75aff3a6e9..fe47cb79588 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (Bulgarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bulgarian}
+\InheritGlossFile{bulgarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
index 2c868f96eec..c85acb7dcac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (Bengali)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bengali}
+\InheritGlossFile{bengali}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
index 0f590f9da3a..f569a743133 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (Tibetan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{tibetan}
+\InheritGlossFile{tibetan}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
index e94edab0a53..24b7756ae52 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for Bosnian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
index 5ad3f56ef00..62436958f59 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (Breton)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{breton}
+\InheritGlossFile{breton}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
index f5c681c9f32..85e541ab0c3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for Brazilian Portuguese]
@@ -6,6 +6,6 @@
% 'brazil' was selected in accordance with babel.
% Since brazil is a variety of portuguese, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
index 3d0b34a99f9..51f048c909f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-breton.ldf}[polyglossia: module for Breton]
\PolyglossiaSetup{breton}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
index ccf3a39ccfd..2a9870c6370 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-british.ldf}[polyglossia: module for British English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
index 335992a52e5..fa0243300c8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (Bosnian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{bosnian}
+\InheritGlossFile{bosnian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
index c7976480e5b..22cb9194716 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for Bulgarian]
\PolyglossiaSetup{bulgarian}{
@@ -61,15 +61,15 @@
\def\figurename{Фигура}%
\def\tablename{Таблица}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{ЧаÑÑ‚}%
\def\pagename{Стр.}%
\def\seename{вж.}%
\def\alsoname{вж.\ Ñъщо и}%
\def\enclname{ПриложениÑ}%
\def\ccname{копиÑ}%
- %\def\headtoname{}%
- \def\proofname{Proof}%
- \def\glossaryname{Glossary}%
+ \def\headtoname{За}%
+ \def\proofname{ДоказателÑтво}%
+ \def\glossaryname{Притурка}%
}
\def\datebulgarian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
index b8d173e11f1..9c8d87d3226 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (Catalan)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{catalan}
+\InheritGlossFile{catalan}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
index 249bd57c9f1..119f086eeac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for Canadian English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
index 8cfed1e4da2..e62a04726aa 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for Canadian French]
% We provide this as a babel alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
index 37566fd974d..1e855fabb64 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for Catalan]
\PolyglossiaSetup{catalan}{
@@ -16,21 +16,21 @@
% BCP-47 compliant aliases
\setlanguagealias*{catalan}{ca}
-\define@boolkey{catalan}[catalan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/catalan]
+ {
+ babelshorthands.if = catalan@babelshorthands,
+ babelshorthands.default:n = true,
+ }
\ifsystem@babelshorthands
- \setkeys{catalan}{babelshorthands=true}
+ \SetGlossOptions{catalan}{babelshorthands=true}
\else
- \setkeys{catalan}{babelshorthands=false}
+ \SetGlossOptions{catalan}{babelshorthands=false}
\fi
% Register default options
-\xpg@initialize@gloss@options{catalan}{babelshorthands=false}
+\InitializeGlossOptions{catalan}{babelshorthands=false}
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
%%% adapted from Babel's catalan.ldf
\newdimen\leftllkern \newdimen\rightllkern \newdimen\raiselldim
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
index 05621e02298..004a8e8903c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-chinese.ldf}[polyglossia: module for Chinese]
@@ -22,51 +22,60 @@
\setlanguagealias*[variant=simplified]{chinese}{zh-CN}
\setlanguagealias*[variant=traditional]{chinese}{zh-TW}
-\providebool{chinese@traditional}
+\@ifundefined{ifchinese@traditional}%
+ {\newif\ifchinese@traditional}{}
-\def\chinese@variant{chinese}
-
-\newif\ifchinese@numerals
-\define@key{chinese}{numerals}[arabic]{%
- \ifstrequal{#1}{chinese}%
- {\chinese@numeralstrue%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
- }{\chinese@numeralsfalse%
- \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
- }%
-}
+\@ifundefined{ifchinese@numerals}%
+ {\newif\ifchinese@numerals}{}
+\def\chinese@variant{chinese}
-\define@choicekey*+{chinese}{variant}[\xpg@val\xpg@nr]{cn,simplified,tw,traditional}[cn]{%
- \ifcase\xpg@nr\relax
- % cn:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % simplified:
- \chinese@traditionalfalse
- \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
- \xpg@info{Option: Chinese, variant=simplified}%
- \or
- % tw:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \or
- % traditional:
- \chinese@traditionaltrue
- \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
- \xpg@info{Option: Chinese, variant=traditional}%
- \fi
-}{\xpg@warning{Unknown Chinese variant `#1'}}
+\DeclareKeys[polyglossia/gloss/chinese]
+ {
+ variant.choice:,
+ variant / cn.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / simplified.code =
+ {%
+ \chinese@traditionalfalse
+ \SetLanguageKeys{chinese}{language={Chinese Simplified},langtag=ZHS,bcp47=zh-CN,bcp47-language=zh,bcp47-region=CN,bcp47-script=Hans}%
+ },
+ variant / tw.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant / traditional.code =
+ {%
+ \chinese@traditionaltrue
+ \SetLanguageKeys{chinese}{language={Chinese Traditional},langtag=ZHT,bcp47=zh-TW,bcp47-language=zh,bcp47-region=TW,bcp47-script=Hant}%
+ },
+ variant.default:n = cn,
+ variant/unknown.code = \xpg@warning{Unknown Chinese variant `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \chinese@numeralsfalse
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / chinese.code =
+ {%
+ \chinese@numeralstrue
+ \SetLanguageKeys{chinese}{bcp47-extension-u=nu-hant}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Chinese numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{chinese}{variant=cn,numerals=arabic}
-%\xpg@initialize@gloss@options{chinese}{variant=tw,numerals=arabic}
+\InitializeGlossOptions{chinese}{variant=cn,numerals=arabic}
+%\InitializeGlossOptions{chinese}{variant=tw,numerals=arabic}
% Register alias options
-\xpg@set@alias@values{chinese}{variant}{cn}{simplified}
-\xpg@set@alias@values{chinese}{variant}{tw}{traditional}
+\SetLanguageAliasValues{chinese}{variant}{cn,simplified}
+\SetLanguageAliasValues{chinese}{variant}{tw,traditional}
\def\chinese@capsformat{%
@@ -118,7 +127,7 @@
\def\enclname{附件}%
\def\ccname{抄é€}%
\def\headtoname{收件人}%
- \def\\glossaryname{詞彙表}%
+ \def\glossaryname{詞彙表}%
}
\def\captions@chinese@simplified{%
\def\contentsname{目录}%
@@ -141,7 +150,7 @@
\def\enclname{附件}%
\def\ccname{抄é€}%
\def\headtoname{收件人}%
- \def\\glossaryname{è¯æ±‡è¡¨}%
+ \def\glossaryname{è¯æ±‡è¡¨}%
}
\newcount\c@TempJNum%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
index f216864f4c6..f3fb645422d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
index 73db9067eff..93bd7dcdcf8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
index 360d484e8c2..73d86d55a01 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
new file mode 100644
index 00000000000..b20a680f5bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-classiclatin.ldf}[polyglossia: module for classic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
index 2f7e8653738..3aea4d6ff28 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (Coptic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{coptic}
+\InheritGlossFile{coptic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
index 0cff5d46d13..4368557e1c7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-coptic.ldf}[polyglossia: module for Coptic]
\PolyglossiaSetup{coptic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
index 15b7bc02a01..8c7d64ae5e1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for Croatian]
\PolyglossiaSetup{croatian}{
@@ -20,40 +20,40 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{croatian}[croatian@]{babelshorthands}[true]{}
-
-\define@boolkey{croatian}[croatian@]{disabledigraphs}[true]{}
-
-% Alias kept for backwards compatibility. Please do not remove
-\define@boolkey{croatian}[croatian@]{disableligatures}[true]{%
- \xpg@warning{The option disableligatures is deprected.\MessageBreak
- Please use disabledigraphs instead}%
- \ifcroatian@disableligatures
- \croatian@disabledigraphstrue
- \else
- \croatian@disabledigraphsfalse
- \fi
-}
-
-\define@boolkey{croatian}[croatian@]{splithyphens}[true]{}
-
-\define@boolkey{croatian}[croatian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/croatian]
+ {
+ babelshorthands.if = croatian@babelshorthands,
+ babelshorthands.default:n = true,
+ disabledigraphs.if = croatian@disabledigraphs,
+ disabledigraphs.default:n = true,
+ splithyphens.if = croatian@splithyphens,
+ splithyphens.default:n = true,
+ localalph.if = croatian@localalph,
+ localalph.default:n = true,
+ disableligatures.choices:nn = { true, false }
+ {%
+ \xpg@warning{The option disableligatures is deprecated.\MessageBreak
+ Please use disabledigraphs instead}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ \croatian@disabledigraphstrue
+ \or
+ \croatian@disabledigraphsfalse
+ \fi
+ },
+ disableligatures.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{croatian}{babelshorthands=false,disabledigraphs=false,
+\InitializeGlossOptions{croatian}{babelshorthands=false,disabledigraphs=false,
splithyphens=true,localalph=true}
\ifsystem@babelshorthands
- \setkeys{croatian}{babelshorthands=true}
+ \SetGlossOptions{croatian}{babelshorthands=true}
\else
- \setkeys{croatian}{babelshorthands=false}
+ \SetGlossOptions{croatian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\croatian@@splhyphen#1{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
index bcf199e0747..107496bca65 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (Welsh)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{welsh}
+\InheritGlossFile{welsh}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
index d3775620eed..81cf42534e9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (Czech)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{czech}
+\InheritGlossFile{czech}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
index 858f3d4ae6c..85aaf6fca69 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-czech.ldf}[polyglossia: module for Czech]
@@ -21,26 +21,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{czech}[czech@]{babelshorthands}[true]{}
-
-\define@boolkey{czech}[czech@]{splithyphens}[true]{}
-
-\define@boolkey{czech}[czech@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/czech]
+ {
+ babelshorthands.if = czech@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = czech@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = czech@vlna,
+ vlna.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{czech}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{czech}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{czech}{babelshorthands=true}
+ \SetGlossOptions{czech}{babelshorthands=true}
\else
- \setkeys{czech}{babelshorthands=false}
+ \SetGlossOptions{czech}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\czech@@splithyphen#1{%
\def\czech@sh@tmp{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
index ff3dda30d0a..7a6f2e8abd1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (Danish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{danish}
+\InheritGlossFile{danish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
index 6126beaeb8b..0e779b8677a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-danish.ldf}[polyglossia: module for Danish]
\PolyglossiaSetup{danish}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
index 6ec76bdff99..ab66673e7c4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
index 0354d8b16fc..38021f39d44 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
index 5e016be933d..2c74672a940 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
index 1df826fee1d..0c68393bc3e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
index 7ccf3664967..d115b45dd71 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
index d99f0594d75..5ca22d3cf8f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
index 1f4a987a1b4..f1b57ec2d43 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
index 9114631dcf1..a51fb8fca22 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
index 174cfc6ea0a..f88846d4d5d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
index 97852bb8e02..07e96769bf4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
index a87e11a509c..02124310792 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
index 41eb5a93b9b..a71b3cac654 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
index 05d331c364b..2545c40ce48 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
index 3e256710167..08f3d5b3da0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
index db4d3494874..e9022148d23 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
index 4b7f9f97bad..a5637e4fb1a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
index a4324450320..cb6c2261296 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
index 19649f6f98b..161729c7fd1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
index 2eddf761c4d..c399b378c46 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
index 5f15ee4e843..05d3f990eea 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (German)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
index 10debfabfa6..a8859eac5fb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-divehi.ldf}[polyglossia: module for Divehi]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
index 03e4a24986b..c3f45032b9b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
index f679e7f039c..f2ebd6f9168 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for Dutch]
\PolyglossiaSetup{dutch}{
@@ -15,24 +15,24 @@
% BCP-47 compliant aliases
\setlanguagealias*{dutch}{nl}
-\define@boolkey{dutch}[dutch@]{babelshorthands}[true]{}
-
-\define@boolkey{dutch}[dutch@]{tremahyphenation}[true]{}
+\DeclareKeys[polyglossia/gloss/dutch]
+ {
+ babelshorthands.if = dutch@babelshorthands,
+ babelshorthands.default:n = true,
+ tremahyphenation.if = dutch@tremahyphenation,
+ tremahyphenation.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{dutch}{babelshorthands=false,tremahyphenation=true}
+\InitializeGlossOptions{dutch}{babelshorthands=false,tremahyphenation=true}
\ifsystem@babelshorthands
- \setkeys{dutch}{babelshorthands=true}
+ \SetGlossOptions{dutch}{babelshorthands=true}
\else
- \setkeys{dutch}{babelshorthands=false}
+ \SetGlossOptions{dutch}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\xpg@trema#1{\allowhyphens\discretionary{-}{#1}{\"{#1}}\allowhyphens}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
index 95ba8b33b3c..e157ca05322 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (Divehi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{divehi}
+\InheritGlossFile{divehi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
new file mode 100644
index 00000000000..51659c46528
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-ecclesiasticlatin.ldf}[polyglossia: module for ecclesiastic Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
index 3b2763da549..32cfa796b91 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
index f36384c04de..0a57420ca3f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
index 23acc8b54cf..b9a45d3501f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
index a75c84a3a61..362795a36b2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (Australian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
index 3253e418ab7..4c61b1afdd0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
-\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadan English)]
+\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadian English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
index fb958322bf4..bf8d7eb4726 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (British English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
index 15db1b4a330..b9956311def 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (Newzealand English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
index 55e3c76b979..943933b5836 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (American English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
index 2fc32374054..65818e7fd70 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (English)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
index 87da24e5e21..c434e00c40d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-english.ldf}[polyglossia: module for English]
@@ -30,9 +30,12 @@
\setlanguagealias[variant=canadian]{english}{canadian}
\setlanguagealias[variant=newzealand]{english}{newzealand}
-\providebool{british@hyphen}
-\providebool{english@ordinalmonthday}
-\providebool{british@dateformat}
+\@ifundefined{ifbritish@hyphen}%
+ {\newif\ifbritish@hyphen}{}
+\@ifundefined{ifenglish@ordinalmonthday}%
+ {\newif\ifenglish@ordinalmonthday}{}
+\@ifundefined{ifbritish@dateformat}%
+ {\newif\ifbritish@dateformat}{}
% US English (\l@english) is default
% Initialize its settings
@@ -41,49 +44,46 @@
\english@ordinalmonthdayfalse
\british@dateformatfalse
-% Option ordinalmonthday
-\define@boolkey{english}[english@]{ordinalmonthday}[true]{}
-
-\define@choicekey*+{english}{variant}[\xpg@val\xpg@nr]{uk,british,us,american,usmax,australian,newzealand,canadian}[us]{%
- \ifcase\xpg@nr\relax
+\DeclareKeys[polyglossia/gloss/english]
+ {
+ ordinalmonthday.if = english@ordinalmonthday,
+ ordinalmonthday.default:n = true,
+ variant.choices:nn = { uk, british, us, american, usmax, australian, newzealand, canadian }
+ {%
+ \ifcase\UseName{l_keys_choice_int}\or
% uk:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: English, variant=british}%
\or
% british:
\british@hyphentrue
\british@dateformattrue
\english@ordinalmonthdaytrue
\SetLanguageKeys{english}{babelname=british,bcp47=en-GB,bcp47-language=en,bcp47-region=GB}%
- \xpg@info{Option: english variant=british}%
\or
% us:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% american:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: English, variant=american}%
\or
% usmax:
\british@hyphenfalse
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=american,bcp47=en-US,bcp47-language=en,bcp47-region=US}%
- \xpg@info{Option: english variant=american (with additional patterns)}%
- \xpg@ifdefined{usenglishmax}{}%
+ \IfLanguageDefinedF{usenglishmax}%
{\xpg@warning{No hyphenation patterns were loaded for "US English Max"\MessageBreak
I will use the standard patterns for US English instead}%
- \adddialect\l@usenglishmax\l@english\relax%
+ \adddialect\l@usenglishmax\l@english
}%
\def\english@variant{usenglishmax}%
\or
@@ -94,8 +94,7 @@
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=australian,bcp47=en-AU,bcp47-language=en,bcp47-region=AU}%
- \xpg@info{Option: English, variant=australian}%
- \adddialect\l@australian\l@english%
+ \adddialect\l@australian\l@english
\or
% newzealand:
% These use the british hyphenation patterns
@@ -104,8 +103,7 @@
\british@dateformattrue
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=newzealand,bcp47=en-NZ,bcp47-language=en,bcp47-region=NZ}%
- \xpg@info{Option: English, variant=newzealand}%
- \adddialect\l@newzealand\l@english%
+ \adddialect\l@newzealand\l@english
\or
% canadian:
% This is currently equivalent to usenglish (as in babel)
@@ -113,45 +111,35 @@
\british@dateformatfalse
\english@ordinalmonthdayfalse
\SetLanguageKeys{english}{babelname=canadian,bcp47=en-CA,bcp47-language=en,bcp47-region=CA}%
- \xpg@info{Option: English, variant=american}%
- \adddialect\l@canadian\l@english%
+ \adddialect\l@canadian\l@english
\fi
\ifbritish@hyphen
- \xpg@ifdefined{ukenglish}{}%
+ \IfLanguageDefinedF{ukenglish}%
{\xpg@warning{No hyphenation patterns were loaded for British English\MessageBreak
I will use the patterns for US English instead}%
- \adddialect\l@ukenglish\l@english\relax%
+ \adddialect\l@ukenglish\l@english
}%
\def\english@variant{ukenglish}%
\fi
-}{\xpg@warning{Unknown English variant `#1'}}
+ },
+ variant.default:n = us,
+ variant/unknown.code = \xpg@warning{Unknown English variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{english}{variant=us,ordinalmonthday=false}
+\InitializeGlossOptions{english}{variant=us,ordinalmonthday=false}
% Register alias options
-\xpg@set@alias@values{english}{variant}{us}{american}
-\xpg@set@alias@values{english}{variant}{uk}{british}
+\SetLanguageAliasValues{english}{variant}{us,american}
+\SetLanguageAliasValues{english}{variant}{uk,british}
\ifxetex
% Check if \l@english is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{english}{}{%
- \def\do##1{%
- \xpg@ifdefined{#1}%
- {\csletcs{l@english}{l@#1}\listbreak}%
- {%
- \xpg@warning{No hyphenation patterns for English found"\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@english0
- }%
- }%
- \docsvlist{british, american, usenglishmax, australian, newzealand}
- \xpg@ifdefined{english}{}{}
- }%
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{english}{british, american, usenglishmax, australian, newzealand}
\fi
\def\english@language{%
- \polyglossia@setup@language@patterns{\english@variant}%
+ \SetupPolyglossiaLangPatterns{\english@variant}%
}%
\def\captionsenglish{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
index 6c0cb13ecdc..ee888a9a3df 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (Esperanto)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{esperanto}
+\InheritGlossFile{esperanto}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
index 0b0555e3727..2d4927f3c40 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (Spain's Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
index 9e459726429..656834e9f4a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (Mexican Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
index fb470d36c9c..8d6968fea50 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (Spanish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
index bd4e63a4a40..cb6c35e5329 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for Esperanto]
\PolyglossiaSetup{esperanto}{
@@ -29,10 +29,10 @@
\def\figurename{Figuro}%
\def\tablename{Tabelo}%
%\def\thepart{}%
- %\def\partname{}%
+ \def\partname{Parto}%
\def\pagename{PaÄo}%
\def\seename{vidu}%
- \def\alsoname{Parto}%
+ \def\alsoname{vidu ankaÅ­}%
\def\enclname{Aldono(j)}%
\def\ccname{Kopie al}%
\def\headtoname{Al}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
index 5dfb90ea569..7d179e433d7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for Estonian]
\PolyglossiaSetup{estonian}{
@@ -38,7 +38,7 @@
\def\ccname{Koopia(d)}%
%\def\headtoname{}%
\def\proofname{Korrektuur}%
- \def\glossaryname{Glossary}% <-- need translation
+ \def\glossaryname{Sõnastik}%
}
\def\dateestonian{%
\def\today{\number\day.\space\ifcase\month\or
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
index 5ab0c3f3bae..0151ac000df 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (Estonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{estonian}
+\InheritGlossFile{estonian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
index 98448839b1f..39c5bdfef1c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (Basque)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{basque}
+\InheritGlossFile{basque}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
index 08c337bdfb0..abe7241e059 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (Persian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
index 09ae993ea43..21af458e2cf 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for Farsi]
% We only provide this gloss for babel compatibility.
% The proper English language name is Persian.
-\xpg@load@master@language{persian}
+\InheritGlossFile{persian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
index 3b03ab4b433..a6b932ff10b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (Finnish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{finnish}
+\InheritGlossFile{finnish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
index 3bd83a947d3..1d9b03c1974 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for Finnish]
\PolyglossiaSetup{finnish}{
@@ -16,51 +16,54 @@
% BCP-47 compliant aliases
\setlanguagealias*{finnish}{fi}
-\define@boolkey{finnish}[finnish@]{babelshorthands}[true]{}
-
\newif\if@finnish@schoolhyphens
\newif\if@finnish@babelhyphens
-\define@choicekey*+{finnish}{hyphens}[\xpg@val\xpg@nr]{default,school,babel}[default]{%
- \ifcase\xpg@nr\relax
- % default:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphensfalse
- \or
- % school:
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \or
- % babel:
- \@finnish@schoolhyphensfalse
- \@finnish@babelhyphenstrue
- \fi
- \xpg@info{Option: Finnish, hyphens=\xpg@val}%
-}{\xpg@warning{Unknown Finnish hyphens `#1'}}
-
-% backwards compatibility
-\define@boolkey{finnish}[finnish@]{schoolhyphens}[true]{%
- \iffinnish@schoolhyphens
- \@finnish@schoolhyphenstrue
- \@finnish@babelhyphensfalse
- \else
- \@finnish@schoolhyphensfalse
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/finnish]
+ {
+ babelshorthands.if = finnish@babelshorthands,
+ babelshorthands.default:n = true,
+ hyphens.choice:,
+ hyphens / default.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / school.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ hyphens / babel.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ \@finnish@babelhyphenstrue
+ },
+ hyphens.default:n = default,
+ hyphens/unknown.code = \xpg@warning{Unknown Finnish hyphens `#1'},
+ schoolhyphens.choice:,
+ schoolhyphens / true.code =
+ {%
+ \@finnish@schoolhyphenstrue
+ \@finnish@babelhyphensfalse
+ },
+ schoolhyphens / false.code =
+ {%
+ \@finnish@schoolhyphensfalse
+ },
+ schoolhyphens.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{finnish}{babelshorthands=false,hyphens=default}
+\InitializeGlossOptions{finnish}{babelshorthands=false,hyphens=default}
\ifsystem@babelshorthands
- \setkeys{finnish}{babelshorthands=true}
+ \SetGlossOptions{finnish}{babelshorthands=true}
\else
- \setkeys{finnish}{babelshorthands=false}
+ \SetGlossOptions{finnish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\finnish@shorthands{%
\xpg@activate@shorthands%
@@ -105,15 +108,15 @@
\def\finnish@language{%
\if@finnish@schoolhyphens
- \xpg@ifdefined{schoolfinnish}{%
- \polyglossia@setup@language@patterns{schoolfinnish}%
+ \IfLanguageDefinedTF{schoolfinnish}{%
+ \SetupPolyglossiaLangPatterns{schoolfinnish}%
}{%
\xpg@warning{Finnish 'School' hyphenation patterns (schoolfinnish) not available.\MessageBreak
I will use the standard patterns for Finnish instead}%
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
}%
\else
- \polyglossia@setup@language@patterns{finnish}%
+ \SetupPolyglossiaLangPatterns{finnish}%
\fi
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
index 49e1c088687..173d01f3c57 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA-u-sd-canb.ldf}[polyglossia: module for fr-CA-u-sd-canb (Canadian French, Acadian subvariety)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
index 8c8058a00e9..c1404f6862e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (Canadian French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
index b8c2126df7c..c31c4f57f8c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (Swiss French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
index 41f1eb0ad50..b66ad30ec8c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (France's French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
index 672c6de8939..46267775b17 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (French)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{french}
+\InheritGlossFile{french}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
index 2b0c795cdeb..8beace22bbd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-french.ldf}[polyglossia: module for French]
@@ -28,43 +28,9 @@
\setlanguagealias[variant=canadian]{french}{canadien}
\def\french@variant{french}
-\define@choicekey*+{french}{variant}[\xpg@val\xpg@nr]{french,canadian,acadian,swiss}[french]{%
- \ifcase\xpg@nr\relax
- % french:
- \def\french@variant{french}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
- \french@thincolonspacefalse
- \or
- % canadian:
- \def\french@variant{canadien}%
- \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
- \xpg@ifdefined{canadien}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@canadien\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % acadian:
- \def\french@variant{acadian}%
- \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
- \xpg@ifdefined{acadian}{}%
- {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
- I will use the standard patterns for French instead}%
- \adddialect\l@acadian\l@french\relax}%
- \french@thincolonspacefalse
- \or
- % swiss:
- \def\french@variant{swissfrench}%
- \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
- \adddialect\l@swissfrench\l@french\relax%
- \french@thincolonspacetrue
- \fi
- \xpg@info{Option: French, variant=\xpg@val}%
-}{\xpg@warning{Unknown French variant `#1'}}
-
\def\french@language{%
- \polyglossia@setup@language@patterns{\french@variant}%
+ \SetupPolyglossiaLangPatterns{\french@variant}%
}%
\ifluatex
@@ -84,91 +50,103 @@
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\let\xpg@orig@makefntext\@makefntext
}
-\define@boolkey{french}[french@]{frenchfootnote}[true]{}
-
-\define@boolkey{french}[french@]{autospacing}[true]{}
-\french@autospacingtrue
-
-\define@boolkey{french}[french@]{frenchpart}[true]{}
-\french@frenchparttrue
-
-\newif\iffrench@autospaceguillemets
-\define@boolkey{french}[french@]{autospaceguillemets}[true]{}
-\french@autospaceguillemetstrue
-
-\newif\iffrench@thincolonspace
-\define@boolkey{french}[french@]{thincolonspace}[true]{}
-\french@thincolonspacefalse
-
-% Backwards compatibility
-\define@boolkey{french}[french@]{automaticspacesaroundguillemets}[true]{%
- \iffrench@automaticspacesaroundguillemets
- \setkeys{french}{autospaceguillemets=true}%
- \else
- \setkeys{french}{autospaceguillemets=false}%
- \fi
-}
-
% name is for compatibility with babel
\let\french@ttfamilyORI\ttfamily
\DeclareRobustCommand\french@ttfamilyFB{\nofrench@punctuation\french@ttfamilyORI}
-% Allow to switch on autospacing in ttfamily context
-\define@boolkey{french}[french@]{autospacetypewriter}[true]{}
-\french@autospacetypewriterfalse
-
-% This is how babel-french has it
-\define@boolkey{french}[french@]{OriginalTypewriter}[true]{%
- \iffrench@OriginalTypewriter
- \setkeys{french}{autospacetypewriter=false}%
- \else
- \setkeys{french}{autospacetypewriter=true}%
- \fi
-}
-
% Configuration of item labels
\def\french@itemi{\textemdash}
\def\french@itemii{\textemdash}
\def\french@itemiii{\textemdash}
\def\french@itemiv{\textemdash}
-\define@key{french}{itemlabels}[\textemdash]{%
- \def\french@itemi{#1}
- \def\french@itemii{#1}
- \def\french@itemiii{#1}
- \def\french@itemiv{#1}
-}
-
-\define@key{french}{itemlabeli}[\textemdash]{%
- \def\french@itemi{#1}
-}
-
-\define@key{french}{itemlabelii}[\textemdash]{%
- \def\french@itemii{#1}
-}
-
-\define@key{french}{itemlabeliii}[\textemdash]{%
- \def\french@itemiii{#1}
-}
-
-\define@key{french}{itemlabeliv}[\textemdash]{%
- \def\french@itemiv{#1}
-}
+\newif\iffrench@autospacetypewriter
+\french@autospacetypewriterfalse
+\newif\iffrench@autospacing
+\french@autospacingtrue
+\newif\iffrench@frenchpart
+\french@frenchparttrue
+\newif\iffrench@autospaceguillemets
+\french@autospaceguillemetstrue
-\define@boolkey{french}[french@]{frenchitemlabels}[true]{}
+\DeclareKeys[polyglossia/gloss/french]
+ {
+ variant.choice:,
+ variant / french.code =
+ {%
+ \def\french@variant{french}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-FR,bcp47-language=fr,bcp47-region=FR}%
+ \french@thincolonspacefalse
+ },
+ variant / canadian.code =
+ {%
+ \def\french@variant{canadien}%
+ \SetLanguageKeys{french}{babelname=canadien,bcp47=fr-CA,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-caqc}%
+ \IfLanguageDefinedF{canadien}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@canadien\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / acadian.code =
+ {%
+ \def\french@variant{acadian}%
+ \SetLanguageKeys{french}{babelname=acadian,bcp47=fr-CA-u-sd-canb,bcp47-language=fr,bcp47-region=CA,bcp47-extension-u=sd-canb}%
+ \IfLanguageDefinedF{acadian}%
+ {\xpg@warning{No hyphenation patterns were loaded for "French (Canada, Acadian)"\MessageBreak
+ I will use the standard patterns for French instead}%
+ \adddialect\l@acadian\l@french\relax}%
+ \french@thincolonspacefalse
+ },
+ variant / swiss.code =
+ {%
+ \def\french@variant{swissfrench}%
+ \SetLanguageKeys{french}{babelname=french,bcp47=fr-CH,bcp47-language=fr,bcp47-region=CH}%
+ \adddialect\l@swissfrench\l@french\relax%
+ \french@thincolonspacetrue
+ },
+ variant.default:n = french,
+ variant/unknown.code = \xpg@warning{Unknown French variant `#1'},
+ frenchfootnote.if = french@frenchfootnote,
+ frenchfootnote.default:n = true,
+ autospacing.if = french@autospacing,
+ autospacing.default:n = true,
+ frenchpart.if = french@frenchpart,
+ frenchpart.default:n = true,
+ autospaceguillemets.if = french@autospaceguillemets,
+ autospaceguillemets.default:n = true,
+ thincolonspace.if = french@thincolonspace,
+ thincolonspace.default:n = true,
+ automaticspacesaroundguillemets.meta:n = {autospaceguillemets=#1},
+ autospacetypewriter.if = french@autospacetypewriter,
+ autospacetypewriter.default:n = true,
+ originaltypewriter.meta:n = {autospacetypewriter=#1},
+ itemlabeli.store = \french@itemi,
+ itemlabelii.store = \french@itemii,
+ itemlabeliii.store = \french@itemiii,
+ itemlabeliv.store = \french@itemiv,
+ frenchitemlabels.if = french@frenchitemlabels,
+ frenchitemlabels.default:n = true,
+ itemlabels.code =
+ \def\french@itemi{#1}%
+ \def\french@itemii{#1}%
+ \def\french@itemiii{#1}%
+ \def\french@itemiv{#1},
+ itemlabels.default:n = \textemdash
+ }
% Register default options
-\xpg@initialize@gloss@options{french}{variant=french,autospacing=true,thincolonspace=false,
+\InitializeGlossOptions{french}{variant=french,autospacing=true,thincolonspace=false,
autospaceguillemets=true,autospacetypewriter=false,
frenchfootnote=false,frenchitemlabels=false,
itemlabels=\textemdash,itemlabeli=\textemdash,itemlabelii=\textemdash,
itemlabeliii=\textemdash,itemlabeliv=\textemdash}
% Register alias options
-\xpg@set@alias@values{french}{variant}{canadian}{acadian}
+\SetLanguageAliasValues{french}{variant}{canadian,acadian}
\def\french@fontsetup{%
@@ -339,100 +317,100 @@
\def\french@capsformat{%
% Change part heading
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{% (not \ifdefined\@memptsize)
+ % With standard classes
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for French}}}%
+ }% (end \ifdefined \@part)
+ }{% Hyperref
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\xpg@french@part~\partname}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\partnamefont\xpg@french@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
+ }% (end \ifdefined\NR@part)
+ }{%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part%
\patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
{\partnamefont\xpg@french@part\partnamenum\printpartname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{NR@part}{% Hyperref
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\partnamefont\xpg@french@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\xpg@french@part~\partname}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
{\partname\nobreakspace\thepart}%
{\xpg@french@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for French}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\xpg@french@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for French}}{}}%
- }{}% (end \ifdefined \NR@part)
- }% (end \ifdefined\@part)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\xpg@french@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for French}}%
+ }%
}% (end \ifdefined\titleformat)
}
\def\nofrench@capsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
- % With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- }{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ % With titlesec
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
}% (end \ifdefined\titleformat)
}
@@ -443,7 +421,7 @@
\if@xpg@french@footnote@set%
\else%
\iffrench@frenchfootnote%
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\ifx\@makefntext\undefined\else%
\long\def\french@makefntext##1{%
\parindent1em \noindent\quad%
@@ -467,7 +445,7 @@
\if@xpg@french@itemlabels@set%
\else%
\iffrench@frenchitemlabels
- \ifdefstring{\xpg@main@language}{french}{%
+ \IfMainLanguageTF{french}{%
\renewcommand{\labelitemi}{\french@itemi}%
\renewcommand{\labelitemii}{\french@itemii}%
\renewcommand{\labelitemiii}{\french@itemiii}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
index 2db31a34152..7713ef99fe5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for Friulian]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
index 49b69eaf9dd..ed1f24ae428 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for Friulian]
@@ -52,7 +52,7 @@
Lui\or Avost\or Setembar\or Otobar\or Novembar\or Dicembar%
\fi\space dal\space\number\year}}
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgfu@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
index ca0671bbe9a..2005e4d484a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (Friulian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{friulian}
+\InheritGlossFile{friulian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
index 02fd9e40091..364fa8e773e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
index 2cbf5adbc5e..8b91897888a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for Gaelic]
@@ -22,23 +22,28 @@
\setlanguagealias[variant=scottish]{gaelic}{scottish}
\def\gaelic@variant{irish}
-\define@choicekey*+{gaelic}{variant}[\xpg@val\xpg@nr]{irish,scottish}[irish]{%
- \ifcase\xpg@nr\relax
- % irish:
- \gdef\gaelic@variant{irish}%
- \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
- \xpg@fontsetup@latin{gaelic}%
- \or
- % scottish:
- \gdef\gaelic@variant{scottish}%
- \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
- \xpg@fontsetup@latin{gaelic}%
- \fi
- \xpg@info{Option: gaelic, variant=\xpg@val}%
-}{\xpg@warning{Unknown gaelic variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/gaelic]
+ {
+ variant.choice:,
+ variant / irish.code =
+ {%
+ \gdef\gaelic@variant{irish}%
+ \SetLanguageKeys{gaelic}{language=Irish,langtag=IRI,babelname=irish,bcp47=ga,bcp47-language=ga}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant / scottish.code =
+ {%
+ \gdef\gaelic@variant{scottish}%
+ \SetLanguageKeys{gaelic}{language=Gaelic,langtag=GAE,babelname=scottish,bcp47=gd,bcp47-language=gd}%
+ \SetupLatinPolyglossiaFont{gaelic}%
+ },
+ variant.default:n = irish,
+ variant/unknown.code = \xpg@warning{Unknown gaelic variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{gaelic}{variant=irish}
+\InitializeGlossOptions{gaelic}{variant=irish}
\def\captionsgaelic@irish{%
\def\refname{Tagairtí}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
index 469af7e8cde..ab10957c8ea 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-galician.ldf}[polyglossia: module for Galician]
\PolyglossiaSetup{galician}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
index 94842fd4d52..bd0a4572e90 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (Gaelic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
index e58cede44b3..be0db60a34b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for Georgian]
@@ -18,34 +18,37 @@
\setlanguagealias*{georgian}{ka}
\newif\ifgeorgian@numerals
-\define@key{georgian}{numerals}[arabic]{%
- \ifstrequal{#1}{georgian}%
- {\georgian@numeralstrue%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
- }%
- {\georgian@numeralsfalse%
- \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
- }%
-}
-
-\define@boolkey{georgian}[georgian@]{babelshorthands}[true]{}
-\define@boolkey{georgian}[georgian@]{oldmonthnames}[true]{}
+\DeclareKeys[polyglossia/gloss/georgian]
+ {
+ babelshorthands.if = georgian@babelshorthands,
+ babelshorthands.default:n = true,
+ oldmonthnames.if = georgian@oldmonthnames,
+ oldmonthnames.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \georgian@numeralsfalse
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / georgian.code =
+ {%
+ \georgian@numeralstrue
+ \SetLanguageKeys{georgian}{bcp47-extension-u=nu-geor}%
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
+\InitializeGlossOptions{georgian}{babelshorthands=false,oldmonthnames=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{georgian}{babelshorthands=true}
+ \SetGlossOptions{georgian}{babelshorthands=true}
\else
- \setkeys{georgian}{babelshorthands=false}
+ \SetGlossOptions{georgian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\georgian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index 918b759eb80..f4f918f50cb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-german.ldf}[polyglossia: module for German]
@@ -47,51 +47,11 @@
\newif\if@german@oldspelling
\@german@oldspellingfalse
-\define@choicekey*+{german}{spelling}[\xpg@val\xpg@nr]{new,old,1901,1996}[new]{%
- \ifcase\xpg@nr\relax
- % new:
- \@german@oldspellingfalse
- \or
- % old:
- \@german@oldspellingtrue
- \or
- % 1901:
- \@german@oldspellingtrue
- \or
- % 1996:
- \@german@oldspellingfalse
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, spelling=\xpg@val}%
-}{\xpg@warning{Unknown German spelling `#1'}}
\newif\if@austrian@locale
\@austrian@localefalse
\newif\if@swiss@locale
\@swiss@localefalse
-\define@choicekey*+{german}{variant}[\xpg@val\xpg@nr]{german,austrian,swiss}[german]{%
- \ifcase\xpg@nr\relax
- % german:
- \@swiss@localefalse%
- \@austrian@localefalse%
- \or
- % austrian:
- \@austrian@localetrue%
- \@swiss@localefalse%
- \or
- % swiss:
- \@swiss@localetrue%
- \@austrian@localefalse%
- \xpg@ifdefined{swissgerman}{}%
- {%
- \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
- I will use the standard patterns for German (old spelling) instead}%
- \adddialect\l@swissgerman\l@german\relax%
- }%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, variant=\xpg@val}%
-}{\xpg@warning{Unknown German variant `#1'}}
\def\german@set@babelname{%
\if@german@oldspelling
@@ -140,58 +100,110 @@
}
\newif\if@german@blackletter
-\define@choicekey*+{german}{script}[\xpg@val\xpg@nr]{latin,blackletter,fraktur}[latin]{%
- \ifcase\xpg@nr\relax
- % latin:
- \@german@blackletterfalse%
- \or
- % blackletter:
- \@german@blacklettertrue%
- \or
- % fraktur:
- \@german@blacklettertrue%
- \fi
- \german@set@babelname%
- \xpg@info{Option: German, script=\xpg@val}%
-}{\xpg@warning{Unknown German script `#1'}}
-\define@boolkey{german}[german@]{capitaleszett}[true]{%
- \ifgerman@capitaleszett
- % MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
- \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}
- \else
- % Capitalize eszett as <SS>
- \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}
- \fi
-}
-
-
-% Option defunc'ed, as both XeTeX and LuaTeX meanwhile
-% use the experimental German hyphenation patterns by default.
-\define@boolkey{german}[german@]{latesthyphen}[true]{}
-
-\define@boolkey{german}[german@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/german]
+ {
+ babelshorthands.if = german@babelshorthands,
+ babelshorthands.default:n = true,
+ latesthyphen.if = german@latesthyphen,
+ latesthyphen.default:n = true,
+ capitaleszett.choice:,
+ capitaleszett / true.code =
+ {% MakeUppercase capitalizes the eszett (U+00DF) with U+1E9E
+ \SetLanguageKeys{german}{bcp47-casing=de-x-eszett,bcp47-extension-x=eszett}%
+ },
+ capitaleszett / false.code =
+ {% Capitalize eszett as <SS>
+ \SetLanguageKeys{german}{bcp47-casing=de,bcp47-extension-x={}}%
+ },
+ capitaleszett.default:n = true,
+ script.choice:,
+ script / latin.code =
+ {%
+ \@german@blackletterfalse
+ \german@set@babelname
+ },
+ script / blackletter.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script / fraktur.code =
+ {%
+ \@german@blacklettertrue
+ \german@set@babelname
+ },
+ script.default:n = latin,
+ script/unknown.code = \xpg@warning{Unknown German script `#1'},
+ spelling.choice:,
+ spelling / new.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling / old.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1901.code =
+ {%
+ \@german@oldspellingtrue
+ \german@set@babelname
+ },
+ spelling / 1996.code =
+ {%
+ \@german@oldspellingfalse
+ \german@set@babelname
+ },
+ spelling.default:n = new,
+ spelling/unknown.code = \xpg@warning{Unknown German spelling `#1'},
+ variant.choice:,
+ variant / german.code =
+ {%
+ \@swiss@localefalse
+ \@austrian@localefalse
+ \german@set@babelname
+ },
+ variant / austrian.code =
+ {%
+ \@austrian@localetrue
+ \@swiss@localefalse
+ \german@set@babelname
+ },
+ variant / swiss.code =
+ {%
+ \@swiss@localetrue
+ \@austrian@localefalse
+ \IfLanguageDefinedF{swissgerman}
+ {%
+ \xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
+ I will use the standard patterns for German (old spelling) instead}%
+ \adddialect\l@swissgerman\l@german\relax
+ }%
+ \german@set@babelname
+ },
+ variant.default:n = german,
+ variant/unknown.code = \xpg@warning{Unknown German variant `#1'}
+ }
+
-\setkeys{german}{spelling,script,variant}
+\SetGlossOptions{german}{spelling,script,variant}
% Register default options
-\xpg@initialize@gloss@options{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
+\InitializeGlossOptions{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
% Register alias options
-\xpg@set@alias@values{german}{spelling}{new}{1996}
-\xpg@set@alias@values{german}{spelling}{old}{1901}
-\xpg@set@alias@values{german}{script}{blackletter}{fraktur}
+\SetLanguageAliasValues{german}{spelling}{new,1996}
+\SetLanguageAliasValues{german}{spelling}{old,1901}
+\SetLanguageAliasValues{german}{script}{blackletter,fraktur}
\ifsystem@babelshorthands
- \setkeys{german}{babelshorthands=true}
+ \SetGlossOptions{german}{babelshorthands=true}
\else
- \setkeys{german}{babelshorthands=false}
+ \SetGlossOptions{german}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\german@shorthands{%
\xpg@activate@shorthands%
@@ -313,15 +325,15 @@
\def\german@language{%
\if@german@oldspelling
\if@swiss@locale
- \polyglossia@setup@language@patterns{swissgerman}%
+ \SetupPolyglossiaLangPatterns{swissgerman}%
\else
- \polyglossia@setup@language@patterns{german}%
+ \SetupPolyglossiaLangPatterns{german}%
\fi
\if@austrian@locale
\adddialect\l@austrian\l@german%
\fi
\else
- \polyglossia@setup@language@patterns{ngerman}%
+ \SetupPolyglossiaLangPatterns{ngerman}%
\if@austrian@locale
\adddialect\l@naustrian\l@ngerman%
\fi
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
index d5b6a8768b2..da48264a9c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
index 11c6fdff929..c5be58f01c4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (Galician)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{galician}
+\InheritGlossFile{galician}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
index 82184ffaaa4..820df8e3198 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (Greek)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
index 537379cb7f4..b48684d1b58 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-greek.ldf}[polyglossia: module for Greek]
@@ -22,7 +22,7 @@
% BCP-47 compliant aliases
\setlanguagealias*[variant=ancient]{greek}{grc}
-\setlanguagealias*[varant=polytonic]{greek}{el-polyton}
+\setlanguagealias*[variant=polytonic]{greek}{el-polyton}
\setlanguagealias*[variant=monotonic]{greek}{el-monoton}
\setlanguagealias*{greek}{el}
@@ -42,44 +42,9 @@
\newif\if@greek@ancient\@greek@ancientfalse
\newif\if@greek@poly\@greek@polyfalse
-\define@choicekey*+{greek}{variant}[\xpg@val\xpg@nr]{monotonic,mono,polytonic,poly,ancient,ancientgreek}[monotonic]{%
- \xpg@ifdefined{greek}{}{%
- \xpg@nopatterns{greek}%
- \adddialect\l@greek\l@nohyphenation
- }%
- \ifcase\xpg@nr\relax
- % monotonic:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % mono:
- \@greek@polyfalse
- \@greek@ancientfalse
- \or
- % polytonic:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % poly:
- \@greek@polytrue
- \@greek@ancientfalse
- \or
- % ancient:
- \@greek@polyfalse
- \@greek@ancienttrue
- \or
- % ancientgreek:
- \@greek@polyfalse
- \@greek@ancienttrue
- \fi
- \greek@set@langdata
- \xpg@info{Option: Greek, variant=\xpg@val}%
-}{\xpg@warning{Unknown Greek variant `#1'}}
-
-
\def\greek@set@langdata{%
\if@greek@ancient
- \xpg@ifdefined{ancientgreek}{}%
+ \IfLanguageDefinedF{ancientgreek}%
{\xpg@warning{No hyphenation patterns were loaded for Ancient Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@ancientgreek\l@greek\relax}%
@@ -89,7 +54,7 @@
\SetLanguageKeys{greek}{babelname=greek,bcp47=grc,bcp47-language=grc,bcp47-variant={}}%
\else
\if@greek@poly
- \xpg@ifdefined{polygreek}{}%
+ \IfLanguageDefinedF{polygreek}%
{\xpg@warning{No hyphenation patterns were loaded for Polytonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@polygreek\l@greek\relax}%
@@ -98,7 +63,7 @@
\def\dategreek{\datepolygreek}%
\SetLanguageKeys{greek}{babelname=polutonikogreek,bcp47=el-polyton,bcp47-language=el,bcp47-variant=polyton}%
\else% monotonic greek
- \xpg@ifdefined{monogreek}{}%
+ \IfLanguageDefinedF{monogreek}%
{\xpg@warning{No hyphenation patterns were loaded for Monotonic Greek\MessageBreak
I will use the patterns loaded for \string\l@greek\space instead}%
\adddialect\l@monogreek\l@greek\relax}%
@@ -112,42 +77,85 @@
\def\greek@language{%
- \polyglossia@setup@language@patterns{\greek@variant}%
+ \SetupPolyglossiaLangPatterns{\greek@variant}%
}
\newif\if@greek@numerals
-\define@choicekey*+{greek}{numerals}[\xpg@val\xpg@nr]{greek,arabic}[greek]{%
- \ifcase\xpg@nr\relax
- % greek:
- \@greek@numeralstrue%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
- \or
- % arabic:
- \@greek@numeralsfalse%
- \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Greek, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Greek numerals value `#1'}}
-
-\define@boolkey{greek}[greek@]{capitaliota}[true]{%
- \ifgreek@capitaliota
- % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
- \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}
- \else
- % \MakeUppercase retains the subscript versions (default)
- \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}
- \fi
-}
-
-\define@boolkey{greek}{attic}[true]{\xpg@warning{Greek option `attic' is no longer required.}}
+\DeclareKeys[polyglossia/gloss/greek]
+ {
+ variant.choices:nn = { monotonic, mono,polytonic, poly,ancient, ancientgreek }
+ {%
+ \CheckHyphenationPatterns{greek}%
+ \ifcase\UseName{l_keys_choice_int}\or
+ % monotonic:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % mono:
+ \@greek@polyfalse
+ \@greek@ancientfalse
+ \or
+ % polytonic:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % poly:
+ \@greek@polytrue
+ \@greek@ancientfalse
+ \or
+ % ancient:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \or
+ % ancientgreek:
+ \@greek@polyfalse
+ \@greek@ancienttrue
+ \fi
+ \greek@set@langdata
+ },
+ variant.default:n = monotonic,
+ variant/unknown.code = \xpg@warning{Unknown Greek variant `#1'},
+ numerals.choice:,
+ numerals / greek.code =
+ {%
+ \@greek@numeralstrue
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-grek}%
+ },
+ numerals / arabic.code =
+ {%
+ \@greek@numeralsfalse
+ \SetLanguageKeys{greek}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = greek,
+ numerals/unknown.code = \xpg@warning{Unknown Greek numerals value `#1'},
+ capitaliota.choice:,
+ capitaliota / true.code =
+ {%
+ \@greek@capitaliotatrue
+ % \MakeUppercase converts the ypogegrammeni (subscript muted iota) to capital iota
+ \SetLanguageKeys{greek}{bcp47-casing=el-x-iota,bcp47-extension-x=iota}%
+ },
+ capitaliota / false.code =
+ {%
+ \@greek@capitaliotafalse
+ % \MakeUppercase retains the subscript versions (default)
+ \SetLanguageKeys{greek}{bcp47-casing=el,bcp47-extension-x={}}%
+ },
+ capitaliota.default:n = true,
+ attic.choices:nn = { true, false }
+ {%
+ \xpg@warning{Greek option `attic' is no longer required.}
+ },
+ capitaliota.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{greek}{variant=monotonic,numerals=greek}
+\InitializeGlossOptions{greek}{variant=monotonic,numerals=greek}
% Register alias options
-\xpg@set@alias@values{greek}{variant}{monotonic}{mono}
-\xpg@set@alias@values{greek}{variant}{polytonic}{poly}
+\SetLanguageAliasValues{greek}{variant}{monotonic,mono}
+\SetLanguageAliasValues{greek}{variant}{polytonic,poly}
\def\monogreekcaptions{%
\def\refname{ΑναφοÏές}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
index 80a60baa797..05e2aa40bb5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (Hebrew)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hebrew}
+\InheritGlossFile{hebrew}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
index 7ee62033e1d..3b3491ce9ad 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for Hebrew]
@@ -24,41 +24,48 @@
% BCP-47 compliant aliases
\setlanguagealias*{hebrew}{he}
-% hebrewcal options
-\define@key{hebrew}{marcheshvan}[true]{\setkeys{hebrewcal}{marcheshvan=#1}}
-\define@key{hebrew}{transliteration}[alt]{\setkeys{hebrewcal}{transliteration=#1}}
-\define@key{hebrew}{fullyear}[true]{\setkeys{hebrewcal}{fullyear=#1}}
-
\newif\if@calendar@hebrew
-\define@choicekey*+{hebrew}{calendar}[\xpg@val\xpg@nr]{hebrew,gregorian}[gregorian]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@calendar@hebrewtrue
- \or
- % gregorian:
- \@calendar@hebrewfalse
- \fi
- \xpg@info{Option: Hebrew, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew calendar `#1'}}
-
\newif\if@hebrew@numerals
-\define@choicekey*+{hebrew}{numerals}[\xpg@val\xpg@nr]{hebrew,arabic}[arabic]{%
- \ifcase\xpg@nr\relax
- % hebrew:
- \@hebrew@numeralstrue
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
- \or
- % arabic:
- \@hebrew@numeralsfalse
- \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hebrew, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hebrew numerals value `#1'}}
-\setkeys{hebrew}{numerals}
+\DeclareKeys[polyglossia/gloss/hebrew]
+ {
+ marcheshvan.code = \setkeys{hebrewcal}{marcheshvan=#1},
+ marcheshvan.default:n = true,
+ transliteration.code = \setkeys{hebrewcal}{transliteration=#1},
+ transliteration.default:n = alt,
+ fullyear.code = \setkeys{hebrewcal}{fullyear=#1},
+ fullyear.default:n = true,
+ calendar.choice:,
+ calendar / hebrew.code =
+ {%
+ \@calendar@hebrewtrue
+ },
+ calendar / gregorian.code =
+ {%
+ \@calendar@hebrewfalse
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Hebrew calendar `#1'},
+ numerals.choice:,
+ numerals / hebrew.code =
+ {%
+ \@hebrew@numeralstrue
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-hebr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@hebrew@numeralsfalse
+ \SetLanguageKeys{hebrew}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Hebrew numerals value `#1'}
+ }
+
+
+\SetGlossOptions{hebrew}{numerals}
% Register default options
-\xpg@initialize@gloss@options{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
+\InitializeGlossOptions{hebrew}{numerals=arabic,calendar=gregorian,marcheshvan=false,fullyear=false}
\def\captionshebrew{%
\def\prefacename{מבו×}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
index 24ac6a0ea58..1e9f1240502 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (Hindi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hindi}
+\InheritGlossFile{hindi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
index 7803b17ef44..a3a6360fe04 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by Zdenĕk Wagner, 10-03-2008
% with corrections and additional contributions by Anshuman Pandey
@@ -25,8 +25,7 @@
\ifx\l@hindi\@undefined%
\ifx\l@sanskrit\@undefined%
- \xpg@nopatterns{Hindi}%
- \adddialect\l@hindi\l@nohyphenation%
+ \XPGNoPatternsFallback{hindi}%
\else
\xpg@warning{No hyphenation patterns were loaded for Hindi\MessageBreak
I will use the patterns for Sanskrit instead}
@@ -35,26 +34,31 @@
\fi
\def\hindi@language{%
- \polyglossia@setup@language@patterns{hindi}%
+ \SetupPolyglossiaLangPatterns{hindi}%
}
\newif\ifhindi@devanagari@numerals
\hindi@devanagari@numeralstrue
-\define@choicekey*+{hindi}{numerals}[\xpg@val\xpg@nr]{Devanagari,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \hindi@devanagari@numeralstrue%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
- \or
- % Western:
- \hindi@devanagari@numeralsfalse%
- \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Hindi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Hindi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/hindi]
+ {
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \hindi@devanagari@numeralstrue
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \hindi@devanagari@numeralsfalse
+ \SetLanguageKeys{hindi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Hindi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{hindi}{numerals=devanagari}
+\InitializeGlossOptions{hindi}{numerals=devanagari}
\newcommand{\hindinumerals}[2]{\hindinumber{#2}}
@@ -74,6 +78,7 @@
\def\contentsname{विषय सूची}%
\def\enclname{}%
\def\figurename{चितà¥à¤°}% रेखाचितà¥à¤°
+ \def\glossaryname{शबà¥à¤¦à¤¾à¤°à¥à¤¥ सूची}%
\def\headpagename{पृषà¥à¤ }%
\def\headtoname{}%
\def\indexname{सूची}%
@@ -85,6 +90,7 @@
\def\pagename{पृषà¥à¤ }%
\def\partname{खणà¥à¤¡}%
\def\prefacename{पà¥à¤°à¤¸à¥à¤¤à¤¾à¤µà¤¨à¤¾}% पà¥à¤°à¤¾à¤•à¥à¤•à¤¥à¤¨
+ \def\proofname{पà¥à¤°à¤®à¤¾à¤£}%
\def\refname{हवाले}%
\def\tablename{तालिका}%
\def\seename{देखिà¤}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
index 9354b06cadc..1bcc48ff4c6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (Croatian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{croatian}
+\InheritGlossFile{croatian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
index f2c872c2c41..51d2499b0ac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (Higher Sorbian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
index 9700f33025b..8f86fc248e4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (Hungarian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
index a846c750bb8..0ed88f1aca6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for Hungarian]
@@ -25,53 +25,61 @@
\newif\if@hungarian@swapcaptions
\newif\if@hungarian@swapheadings
\newif\if@hungarian@swapheaders
-\define@choicekey*+{hungarian}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % captions:
- \@hungarian@swapcaptionstrue%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \or
- % headings:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheadersfalse%
- \or
- % headers:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheaderstrue%
- \or
- % hheaders:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingstrue%
- \@hungarian@swapheaderstrue%
- \or
- % none:
- \@hungarian@swapcaptionsfalse%
- \@hungarian@swapheadingsfalse%
- \@hungarian@swapheadersfalse%
- \fi
- \xpg@info{Option: Hungarian, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Hungarian swapstrings value `#1'}}
-% Force punctuation: 1) after section type counters; 2) after @chapapp in the running head
-\define@boolkey{hungarian}[hungarian@]{forceheadingpunctuation}[true]{}
+\DeclareKeys[polyglossia/gloss/hungarian]
+ {
+ forceheadingpunctuation.if = hungarian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@hungarian@swapcaptionstrue
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingstrue
+ \@hungarian@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@hungarian@swapcaptionsfalse
+ \@hungarian@swapheadingsfalse
+ \@hungarian@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Hungarian swapstrings value `#1'}
+ }
% Register default options
% forceheadinpunctuatin is recommended, but the default value is false for compatibility reasons
-\xpg@initialize@gloss@options{hungarian}{swapstrings=all,
+\InitializeGlossOptions{hungarian}{swapstrings=all,
forceheadingpunctuation=false}
\def\hungarian@language{%
- \polyglossia@setup@language@patterns{hungarian}%
- \xpg@ifdefined{hungarian}{\adddialect\l@magyar\l@hungarian}{}%
+ \SetupPolyglossiaLangPatterns{hungarian}%
+ \IfLanguageDefinedT{hungarian}{\adddialect\l@magyar\l@hungarian}%
}%
\def\captionshungarian{%
@@ -143,120 +151,104 @@
% change chapter and part headings
\if@hungarian@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\thepart.~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\printchapternum.\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part%
- \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\printpartnum.\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{sectionformat}{%
+ % Memoir?
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\thechapter.\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Hungarian}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Hungarian}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part%
\patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\thepart.\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Hungarian}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\thepart.\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Hungarian}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% with memoir (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\printchapternum.\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Hungarian}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
+ {\printpartnum.\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\thepart.~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\thepart.\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@hungarian@swapheadings)
%
% Change running headers
\if@hungarian@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -266,8 +258,24 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Hungarian}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
}% (end \ifdefined\chapterformat)
\fi% (end \if@hungarian@swapheaders)
}
@@ -279,58 +287,58 @@
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\NR@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- }% (end \ifdefined\chapterformat)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
+ }% (end \ifdefined\chaptermarkformat)
}
% Hungarian needs 1) trailing dots in chapter headings; 2) trailing dot in section, subsection, etc, counters
\def\@hungarian@forced@dot{}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
index ee335e8b4dd..16b61a8776b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (Armenian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{armenian}
+\InheritGlossFile{armenian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
index 1652403941d..1e843ef5df8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (Interlingua)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{interlingua}
+\InheritGlossFile{interlingua}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
index 4415bbab088..43a9efe3f8a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-icelandic.ldf}[polyglossia: module for Icelandic]
\PolyglossiaSetup{icelandic}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
index e72a43d5f51..adf9c602827 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (Malay)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malay}
+\InheritGlossFile{malay}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
index d105dae74c7..ec3b1844e9a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-interlingua.ldf}[polyglossia: module for Interlingua]
\PolyglossiaSetup{interlingua}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
index ed1fc5af650..0e5b9c888b3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-irish.ldf}[polyglossia: module for Irish]
% We only provide this gloss for babel compatibility. Since irish is
% a gaelic variety, we use 'gaelic' with variant 'irish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
index aed4195b8d1..6724333f2bc 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (Icelandic)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{icelandic}
+\InheritGlossFile{icelandic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
index e3bf7d00df8..42ae275e327 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (Italian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{italian}
+\InheritGlossFile{italian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
index edf9d4f79e9..da005e54c76 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
@@ -1,5 +1,5 @@
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-italian.ldf}[polyglossia: module for Italian]
\PolyglossiaSetup{italian}{
@@ -18,24 +18,22 @@
% BCP-47 compliant aliases
\setlanguagealias*{italian}{it}
-
-%%% CHANGES START %%% by Enrico Gregorio
-\define@boolkey{italian}[italian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/italian]
+ {
+ babelshorthands.if = italian@babelshorthands,
+ babelshorthands.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{italian}{babelshorthands=false}
+\InitializeGlossOptions{italian}{babelshorthands=false}
\ifsystem@babelshorthands
- \setkeys{italian}{babelshorthands=true}
+ \SetGlossOptions{italian}{babelshorthands=true}
\else
- \setkeys{italian}{babelshorthands=false}
+ \SetGlossOptions{italian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\italian@shorthands{%
\xpg@activate@shorthands%
@@ -115,7 +113,7 @@
%%% CHANGES START %%% by Enrico Gregorio
\let\xpgit@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgit@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
index 7329e61bdc9..6abed7ecc51 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (Japanese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{japanese}
+\InheritGlossFile{japanese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
index 5d90a303747..43015d36cec 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for Japanese]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
index dc0fb85531e..c48b7287989 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (Georgian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{georgian}
+\InheritGlossFile{georgian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
index 1ea7dfce332..97941ff1902 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
@@ -1,5 +1,5 @@
%% gloss-kannada.ldf
-%% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+%% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%%
%% Copyright 2011 Aravinda VK <hallimanearavind AT gmail.com>,
%% Shankar Prasad <prasad.mvs AT gmail.com>,
@@ -53,12 +53,20 @@
\def\tmp@western{Western}
\newif\ifkannada@numerals
\kannada@numeralstrue
-
-\define@key{kannada}{numerals}[Kannada]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@western
- \kannada@numeralsfalse
- \fi}
+
+\DeclareKeys[polyglossia/gloss/kannada]
+ {
+ numerals.choice:,
+ numerals / kannada.code =
+ {%
+ \kannada@numeralstrue
+ },
+ numerals / western.code =
+ {%
+ \kannada@numeralsfalse
+ },
+ numerals.default:n = kannada
+ }
\def\captionskannada{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
index 9c9ec53f328..0a8656b4c50 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-khmer.ldf}[polyglossia: module for Khmer]
\PolyglossiaSetup{khmer}{
@@ -19,18 +19,24 @@
\newif\if@khmer@numerals
\def\tmp@khmer{khmer}
-\define@key{khmer}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@khmer%
- \@khmer@numeralstrue%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
- \else%
- \@khmer@numeralsfalse%
- \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
- \fi%
-}
-\setkeys{khmer}{numerals}
+\DeclareKeys[polyglossia/gloss/khmer]
+ {
+ numerals.choice:,
+ numerals / khmer.code =
+ {%
+ \@khmer@numeralstrue
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-khmr}%
+ },
+ numerals / arabic.code =
+ {%
+ \@khmer@numeralsfalse
+ \SetLanguageKeys{khmer}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = arabic
+ }
+
+\SetGlossOptions{khmer}{numerals}
\def\captionskhmer{%
\def\prefacename{អារម្ភកážáž¶}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
index b37d1706ab6..f2af014aef5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (Khmer)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{khmer}
+\InheritGlossFile{khmer}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
index 523a68916e4..63807f6320b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
index dfc34ce7ee9..64bb99df246 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
index a908ee2d815..254d0d846ca 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
index 66c45035a90..3c311112a86 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (Kannada)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kannada}
+\InheritGlossFile{kannada}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
index bf767b7cda9..c4b68924c06 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (Korean)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{korean}
+\InheritGlossFile{korean}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
index 48464c50d25..fd464294356 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-korean.ldf}[polyglossia: module for Korean]
@@ -18,40 +18,48 @@
% BCP-47 compliant aliases
\setlanguagealias*{korean}{ko}
-% variant : plain (0), classic (1), or modern (2)
-\define@choicekey{korean}{variant}[\xpg@val\xpg@nr]{plain,classic,modern}[plain]{%
- \let\xpg@korean@variant\xpg@nr
-}
-% captions : hangul (0) or hanja (1)
-\define@choicekey{korean}{captions}[\xpg@val\xpg@nr]{hangul,hanja}[hangul]{%
- \let\xpg@korean@captions\xpg@nr
-}
-% swapstrings: all (0), headings (1), headers (2), or none (3)
\newif\if@korean@swapheadings
\newif\if@korean@swapheaders
-\define@choicekey*+{korean}{swapstrings}[\xpg@val\xpg@nr]{all,headings,headers,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@korean@swapheadingstrue%
- \@korean@swapheaderstrue%
- \or
- % headings:
- \@korean@swapheadingstrue%
- \@korean@swapheadersfalse%
- \or
- % headers:
- \@korean@swapheadingsfalse%
- \@korean@swapheaderstrue%
- \or
- % none:
- \@korean@swapheadingsfalse%
- \@korean@swapheadersfalse%
- \fi
- \xpg@info{Option: Korean, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Korean swapstrings value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/korean]
+ {
+ variant.choices:nn = { plain, classic, modern }
+ {%
+ \edef\xpg@korean@variant{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ variant.default:n = plain,
+ captions.choices:nn = { hangul, hanja }
+ {%
+ \edef\xpg@korean@captions{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ },
+ captions.default:n = hangul,
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheaderstrue
+ },
+ swapstrings / headings.code =
+ {%
+ \@korean@swapheadingstrue
+ \@korean@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@korean@swapheadingsfalse
+ \@korean@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Korean swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{korean}{variant=plain,swapstrings=all,captions=hangul}
+\InitializeGlossOptions{korean}{variant=plain,swapstrings=all,captions=hangul}
\def\captionskorean{%
\ifcase\xpg@korean@captions\relax
@@ -113,60 +121,48 @@
% change chapter and part headings
\if@korean@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part
- \patchcmd{\@part}%
+ \@ifundefined{titleformat}{%
+ % With KOMA
+ \@ifundefined{sectionformat}{%
+ % With memoir
+ \@ifundefined{@memptsize}{%
+ % With standard classes
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead
+ \patchcmd{\@makechapterhead}%
+ {\@chapapp\space \thechapter}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Korean}}%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \ifpatchable{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Korean}}}}%
+ {}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- % With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat
- \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat
- \renewcommand*{\chapterformat}{\mbox{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\nobreakspace \thechapter\autodot
- \else
- \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot\enskip}%
- }}%
- }{}%
- }{% (not \ifdefined\sectionformat)
- % With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
+ }% (end not hyperref)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead
\patchcmd{\@makechapterhead}%
{\printchaptername \chapternamenum \printchapternum}%
@@ -184,19 +180,9 @@
\ifpatchable\printchaptername\@chapapp
{\chapnamefont\koreanTHEname\chapternamenum}{}}%
\fi
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
- \let\xpg@save@part@format\NR@part
- \patchcmd{\NR@part}%
- {\printpartname \partnamenum \printpartnum}%
- {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Korean}}%
- \ifdefined\printkoreanpartthe\else
- \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
- \fi
- }{% not hyperref
- \ifcsdef{@part}{%
+ }%
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
\let\xpg@save@part@format\@part
\patchcmd{\@part}%
{\printpartname \partnamenum \printpartnum}%
@@ -206,84 +192,77 @@
\ifdefined\printkoreanpartthe\else
\def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
\fi
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
- % With standard classes
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead
- \patchcmd{\@makechapterhead}%
- {\@chapapp\space \thechapter}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\space \thechapter
- \else
- \koreanTHEname\space \thechapter\space \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chapter for Korean}}%
- }{}%
- \ifcsdef{NR@part}{% Hyperref (nameref)
+ }%
+ }{% Hyperref (nameref)
\let\xpg@save@part@format\NR@part
\patchcmd{\NR@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {\printpartname \partnamenum \printpartnum}%
+ {\printkoreanpartthe \printpartnum\partnamenum \printpartname}%
{}%
{\xpg@warning{Failed to patch part for Korean}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \ifpatchable{\@part}%
- {\partname\nobreakspace\thepart}%
- {\let\xpg@save@part@format\@part
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Korean}}{}}}%
- {}%
- }{}% (end \ifdefined\@part)
- }% (end not hyperref)
+ \ifdefined\printkoreanpartthe\else
+ \def\printkoreanpartthe{\partnamefont\koreanTHEname\partnamenum}%
+ \fi
+ }%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat
+ \renewcommand*{\partformat}{\koreanTHEname~\thepart~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat
+ \renewcommand*{\chapterformat}{\mbox{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\nobreakspace \thechapter\autodot
+ \else
+ \koreanTHEname\nobreakspace \thechapter\nobreakspace \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot\enskip}%
+ }}%
+ }%
}% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{NR@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ }{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part
+ \patchcmd{\NR@part}%
+ {\partname\nobreakspace\thepart}%
+ {\koreanTHEname\nobreakspace \thepart\nobreakspace \partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Korean}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\space \thechapter
+ \else
+ \koreanTHEname\space \thechapter\space \@chapapp
+ \fi
+ }{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
+ }%
}% (end \ifdefined\titleformat)
\fi % (end \if@korean@swapheadings)
%
% Change running headers
\if@korean@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat
- \renewcommand*\chaptermarkformat{%
- \IfChapterUsesPrefixLine
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \chapapp\ \thechapter\autodot
- \else
- \koreanTHEname\ \thechapter\ \chapapp\autodot
- \fi
- }%
- {\thechapter\autodot}%
- \enskip
- }%
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark
- \patchcmd{\chaptermark}%
- {\@chapapp\ \@nameuse{thechapter}}%
- {%
- \ifx\@chapapp\korean@appendix@chapapp
- \appendixname\ \@nameuse{thechapter}%
- \else
- \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
- \fi
- }%
- {}%
- {\xpg@warning{Failed to patch chaptermark for Korean}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter}%
{\let\xpg@save@chaptermark@format\chaptermark
@@ -299,65 +278,94 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Korean}}}%
{}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark
+ \patchcmd{\chaptermark}%
+ {\@chapapp\ \@nameuse{thechapter}}%
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \appendixname\ \@nameuse{thechapter}%
+ \else
+ \koreanTHEname\ \@nameuse{thechapter}\ \@chapapp
+ \fi
+ }%
+ {}%
+ {\xpg@warning{Failed to patch chaptermark for Korean}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat
+ \renewcommand*\chaptermarkformat{%
+ \IfChapterUsesPrefixLine
+ {%
+ \ifx\@chapapp\korean@appendix@chapapp
+ \chapapp\ \thechapter\autodot
+ \else
+ \koreanTHEname\ \thechapter\ \chapapp\autodot
+ \fi
+ }%
+ {\thechapter\autodot}%
+ \enskip
+ }%
}% (end \ifdefined\chapterformat)
\fi % (end \if@korean@swapheaders)
}
\def\nokorean@headingsformat{%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
+ \let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{NR@part}{%
\let\@part\xpg@save@part@format
+ }{%
+ \let\NR@part\xpg@save@part@format
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}%
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}%
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{NR@part}{%
- \let\NR@part\xpg@save@part@format
- }{%
- \let\@part\xpg@save@part@format
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format
- }{}%
- }{}% (end \ifdefined\chaptermark)
+ }%
+ }% (end \ifdefined\chaptermark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -421,13 +429,13 @@
\XeTeXinterchartokenstate\z@
\XeTeXlinebreakpenalty\z@
\XeTeXlinebreakskip\z@skip
- \XeTeXlinebreaklocale "en"
+ \XeTeXlinebreaklocale ""
\noextras@korean@common
}
\else % luatex
- \def\inlineextras@korean{\xpg@attr@korean\xpg@korean@variant\relax}
+ \def\inlineextras@korean{\xpg@attr@cjkspacing\xpg@korean@variant\relax}
\def\noextras@korean{%
- \unsetattribute\xpg@attr@korean
+ \unsetattribute\xpg@attr@cjkspacing
\noextras@korean@common
}
\fi
@@ -447,7 +455,7 @@
\let\newattribute\newluatexattribute
\let\unsetattribute\unsetluatexattribute
\fi
-\newattribute\xpg@attr@korean
+\newattribute\xpg@attr@cjkspacing
\newattribute\xpg@attr@autojosa
% user commands for Josa
% Josa : particles in Korean grammar that immediately follow a noun or pronoun.
@@ -468,7 +476,7 @@
\protected\def\로{\으 로}
\def\xpg@reset@josa {\global\let\xpg@josa@zwang\z@}\xpg@reset@josa
% load lua file for korean
-\directlua{ require "polyglossia-korean" }
+\directlua{ require "polyglossia-cjk-spacing" }
\endinput\fi
% XeTeX
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
index 339368062c8..f25b8d53397 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
index 31f0b817406..ba7b6a32954 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
index 59805fb6261..b261cbc0df6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (Kurdish)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
index e114fd118aa..3b69d39e010 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Created on September 1, 2019
% Last updated on May 17, 2020
@@ -41,36 +41,9 @@
\newif\if@kurdish@kurmanji
\def\kurdish@variant{sorani}
-\define@choicekey*+{kurdish}{variant}[\xpg@val\xpg@nr]{sorani,kurmanji}[sorani]{%
- \ifcase\xpg@nr\relax
- % sorani:
- \def\kurdish@variant{sorani}%
- \@kurdish@kurmanjifalse%
- \or
- % kurmanji:
- \def\kurdish@variant{kurmanji}%
- \@kurdish@kurmanjitrue%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, variant=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish variant `#1'}}
\newif\if@kurdish@latin
\newif\if@kurdish@arabic
-\define@choicekey*+{kurdish}{script}[\xpg@val\xpg@nr]{arabic,latin}{%
- \ifcase\xpg@nr\relax
- % arabic:
- \@kurdish@latinfalse%
- \@kurdish@arabictrue%
- \or
- % latin:
- \@kurdish@latintrue%
- \@kurdish@arabicfalse%
- \fi
- \kurdish@set@variety%
- \xpg@info{Option: kurdish, script=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish script `#1'}}
-
\newif\if@western@numerals
\newif\if@force@western@numerals
@@ -87,7 +60,7 @@
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
\def\kurdish@script{latin}
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\else
\if@kurdish@arabic% arabic explicitly set
\if@kurdish@kurmanji
@@ -97,61 +70,84 @@
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
\fi
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\else% sorani=arabic, kurmanji=latin
\if@kurdish@kurmanji
\@western@numeralstrue%
\SetLanguageKeys{kurdish}{script=Latin,direction=LR,scripttag=latn,babelname=kurmanji,bcp47=kmr-Latn,bcp47-language=kmr,bcp47-script=Latn,bcp47-casing=kmr-Latn}%
- \xpg@fontsetup@latin{kurdish}%
+ \SetupLatinPolyglossiaFont{kurdish}%
\def\kurdish@script{latin}
\else
\SetLanguageKeys{kurdish}{script=Arabic,direction=RL,scripttag=arab,babelname=kurdish,bcp47=ckb-Arab,bcp47-language=ckb,bcp47-script=Arab,bcp47-casing=ckb-Arab}%
- \xpg@fontsetup@nonlatin{kurdish}%
+ \SetupNonLatinPolyglossiaFont{kurdish}%
\fi
\fi
\fi
}
\newif\if@western@numerals
-\define@choicekey*+{kurdish}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \or
- % western:
- \@western@numeralstrue%
- \@force@western@numeralstrue%
- \fi
- \xpg@info{Option: Kurdish, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Kurdish numerals option `#1'}}
\newif\ifkurdish@customsep\kurdish@customsepfalse
\def\xpg@sepmark{}
-\define@key{kurdish}{sectionsep}[.]{%
- \kurdish@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{kurdish}[kurdish@]{abjadjimnotail}[true]{%
- \ifkurdish@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
-% NOT YET USED
-\define@key{kurdish}{locale}[default]{%
- \def\@kurdish@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/kurdish]
+ {
+ variant.choice:,
+ variant / sorani.code =
+ {%
+ \def\kurdish@variant{sorani}%
+ \@kurdish@kurmanjifalse
+ \kurdish@set@variety
+ },
+ variant / kurmanji.code =
+ {%
+ \def\kurdish@variant{kurmanji}%
+ \@kurdish@kurmanjitrue
+ \kurdish@set@variety
+ },
+ variant.default:n = sorani,
+ variant/unknown.code = \xpg@warning{Unknown Kurdish variant `#1'},
+ script.choice:,
+ script / arabic.code =
+ {%
+ \@kurdish@latinfalse
+ \@kurdish@arabictrue
+ \kurdish@set@variety
+ },
+ script / latin.code =
+ {%
+ \@kurdish@latintrue
+ \@kurdish@arabicfalse
+ \kurdish@set@variety
+ },
+ script.default:n = sorani,
+ script/unknown.code = \xpg@warning{Unknown Kurdish script `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \@force@western@numeralstrue
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Kurdish numerals value `#1'},
+ sectionsep.code = \gdef\xpg@sepmark{#1}\kurdish@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@kurdish@locale
+ }
+
% Register default options
-\xpg@initialize@gloss@options{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
+\InitializeGlossOptions{kurdish}{variant=sorani,locale=default,script=arabic,abjadjimnotail=false,numerals=eastern}
\def\kurdish@language{%
- \polyglossia@setup@language@patterns{\kurdish@pattern}%
+ \SetupPolyglossiaLangPatterns{\kurdish@pattern}%
}%
\def\kurdishNativemonth#1{\ifcase#1%
@@ -404,16 +400,16 @@
}
\def\nokurdish@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\kurdish@luatex@capsformat{%
%
% change chapter and part headings
\ifkurdish@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -425,7 +421,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -440,30 +436,30 @@
}
\def\nokurdish@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@kurdish{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
index db4eabba41d..79deb39afc7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for Kurmanji Kurdish]
% We provide this gloss for babel compatibility.
-\xpg@load@master@language{kurdish}
+\InheritGlossFile{kurdish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
index abb9bc4bf2f..b4091d70014 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
index b00755c8ace..8eec40dbd49 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
index 0d75aaf005a..029ad4a9168 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
index c1e3e26ece0..99e36c42bf0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (Latin)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latin}
+\InheritGlossFile{latin}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
index 4d979bb93c1..41a6817e115 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lao.ldf}[polyglossia: module for Lao]
@@ -22,14 +22,23 @@
\newif\if@lao@numerals
\def\tmp@lao{lao}
-\define@key{lao}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@lao\@lao@numeralstrue\else
- \@lao@numeralsfalse\fi
-}
+
+\DeclareKeys[polyglossia/gloss/lao]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@lao@numeralsfalse
+ },
+ numerals / lao.code =
+ {%
+ \@lao@numeralstrue
+ },
+ numerals.default:n = arabic
+ }
% Register default options
-\xpg@initialize@gloss@options{lao}{numerals=arabic}
+\InitializeGlossOptions{lao}{numerals=arabic}
% Translations provided by Brian Wilson <bountonw at gmail.com>
\def\captionslao{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
index 18d83e92114..8479fbaa42a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latex.ldf}[polyglossia: module for default language]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
index 2fc092c0638..d1211a83cb2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin]
@@ -33,6 +33,9 @@
\bool_new:N \l_polyglossia_latin_use_v_bool
\bool_new:N \l_polyglossia_latin_use_ligatures_bool
\bool_new:N \l_polyglossia_latin_capitalize_month_bool
+\bool_new:N \l_polyglossia_latin_babelshorthands_bool
+\bool_new:N \l_polyglossia_latin_prosodic_shorthands_bool
+\bool_new:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
\cs_new:Npn \polyglossia_latin_classical_character_codes:
{
@@ -68,11 +71,11 @@
\cs_new:Npn \polyglossia_latin_use_modern_patterns:
{
- \xpg@ifdefined {latin}
+ \IfLanguageDefinedTF {latin}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {latin}
+ \SetupPolyglossiaLangPatterns {latin}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} { \adddialect \l@classiclatin \l@latin }
@@ -96,11 +99,11 @@
\cs_new:Npn \polyglossia_latin_set_patterns:n #1
% #1 may be "classiclatin" or "liturgicallatin"
{
- \xpg@ifdefined {#1}
+ \IfLanguageDefinedTF {#1}
{
\def \latin@language
{
- \polyglossia@setup@language@patterns {#1}
+ \SetupPolyglossiaLangPatterns {#1}
\str_case:Vn \l_polyglossia_latin_variant_str
{
{classic} {
@@ -316,7 +319,8 @@
% Save original footnote definition
% Do this at the end of the preamble to catch other
% packages' footnote changes (#391)
-\AtEndPreamble{%
+\hook_gput_code:nnn { begindocument / before } {.}
+{
\cs_if_exist:NT \@makefntext
{
\cs_set_eq:NN \polyglossia_latin_original_footnote:n \@makefntext
@@ -340,40 +344,27 @@
\cs_new:Npn \polyglossia_latin_apply_footnote_option:
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
\cs_if_exist:NT \@makefntext
{
- \iflatin@ecclesiasticfootnotes
+ \bool_if:NTF \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
\let \@makefntext \polyglossia_latin_variant_footnote:n
- \else
+ }
+ {
\let \@makefntext \polyglossia_latin_original_footnote:n
- \fi
+ }
}
}
{
- \iflatin@ecclesiasticfootnotes
- \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
- \fi
- }
- }
-
-\define@boolkey {latin} [latin@] {ecclesiasticfootnotes} [true]
- {
- \token_if_eq_meaning:NNTF \@onlypreamble \@notprerr
- {
- % within the document
- \polyglossia_latin_apply_footnote_option:
- }
- {
- % within the preamble
- % The application of the option has to be postponed as the main
- % language may be undefined when the option is called.
- \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ \bool_if:NT \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ {
+ \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
+ }
}
}
-
%%%%% Language variants: classic, medieval, modern, and ecclesiastic
\str_new:N \l_polyglossia_latin_variant_str
@@ -436,58 +427,6 @@
\polyglossia_latin_use_modern_patterns:
}
-\define@key{latin}{variant}
- {
- \str_case:nnF {#1}
- {
- {classic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {classic}
- \polyglossia_latin_classic_settings:
- }
- {medieval}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
- \polyglossia_latin_medieval_settings:
- }
- {modern}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {modern}
- \polyglossia_latin_modern_settings:
- }
- {ecclesiastic}
- {
- \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
- \polyglossia_latin_ecclesiastic_settings:
- }
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
- }
- }
-
-
-%%%%% Boolean options concerning spelling
-
-\define@boolkey{latin}[latin@]{usej}[true]
- {
- \iflatin@usej
- \bool_set_true:N \l_polyglossia_latin_use_j_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_use_j_bool
- \fi
- }
-
-\define@boolkey{latin}[latin@]{capitalizemonth}[true]
- {
- \iflatin@capitalizemonth
- \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
- \else
- \bool_set_false:N \l_polyglossia_latin_capitalize_month_bool
- \fi
- }
-
-
%%%%% Hyphenation variants: classic, liturgical, and modern
\msg_new:nnn {polyglossia} {latin / hyphenation variant}
@@ -500,23 +439,6 @@
The~Latin~hyphenation~variant~"#1"~is~undefined~\msg_line_context:.
}
-\define@key {latin} {hyphenation}
- {
- \str_case:nnTF {#1}
- {
- {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
- {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
- {modern} { \polyglossia_latin_use_modern_patterns: }
- }
- {
- \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
- }
- {
- \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
- }
- }
-
-
%%%%% Latin captions and date
\def \captionslatin
@@ -588,30 +510,89 @@
}
}
-
-%%%%% Latin shorthands
-
-\define@boolkey{latin}[latin@]{babelshorthands}[true]
- {
- }
-
-\define@boolkey{latin}[latin@]{prosodicshorthands}[true]
+\DeclareKeys[polyglossia/gloss/latin]
{
+ babelshorthands.bool_set:N = \l_polyglossia_latin_babelshorthands_bool,
+ babelshorthands.default:n = true,
+ prosodicshorthands.bool_set:N = \l_polyglossia_latin_prosodic_shorthands_bool,
+ prosodicshorthands.default:n = true,
+ usej.bool_set:N = \l_polyglossia_latin_use_j_bool,
+ capitalizemonth.bool_set:N = \l_polyglossia_latin_capitalize_month_bool,
+ hyphenation.code =
+ \str_case:nnTF {#1}
+ {
+ {classic} { \polyglossia_latin_set_patterns:n {classiclatin} }
+ {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
+ {modern} { \polyglossia_latin_use_modern_patterns: }
+ }
+ {
+ \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
+ },
+ variant.code =
+ \str_case:nnF {#1}
+ {
+ {classic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {classic}
+ \polyglossia_latin_classic_settings:
+ }
+ {medieval}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
+ \polyglossia_latin_medieval_settings:
+ }
+ {modern}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {modern}
+ \polyglossia_latin_modern_settings:
+ }
+ {ecclesiastic}
+ {
+ \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
+ \polyglossia_latin_ecclesiastic_settings:
+ }
+ }
+ {
+ \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
+ },
+ ecclesiasticfootnotes.choices:nn = { true, false }
+ {
+ \ifcase\UseName{l_keys_choice_int}\or
+ \bool_set_true:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \else
+ \bool_set_false:N \l_polyglossia_latin_ecclesiastic_footnotes_bool
+ \fi
+ \xpg_if_in_preamble:TF
+ {
+ % within the preamble
+ % The application of the option has to be postponed as the main
+ % language may be undefined when the option is called.
+ \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+ }
+ {
+ % within the document
+ \polyglossia_latin_apply_footnote_option:
+ }
+ },
+ ecclesiasticfootnotes.default:n = true
}
% Register default options
-\xpg@initialize@gloss@options{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
+\InitializeGlossOptions{latin}{variant=modern,hyphenation=modern,babelshorthands=false,
prosodicshorthands=false,ecclesiasticfootnotes=false,
usej=false,capitalizemonth=true}
\ifsystem@babelshorthands
- \setkeys{latin}{babelshorthands=true}
+ \SetGlossOptions{latin}{babelshorthands=true}
\else
- \setkeys{latin}{babelshorthands=false}
+ \SetGlossOptions{latin}{babelshorthands=false}
\fi
\ExplSyntaxOff % babelsh.def does not support expl3 syntax
-\ifcsundef{initiate@active@char}{\input{babelsh.def}}{}
+\@ifundefined{initiate@active@char}{\input{babelsh.def}}{}
\ExplSyntaxOn
\initiate@active@char {"}
@@ -643,13 +624,13 @@
\AtBeginDocument
{
- \str_if_eq:VnTF \xpg@main@language {latin}
+ \IfMainLanguageTF {latin}
{
- \iflatin@prosodicshorthands
- \else
+ \bool_if:NF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\shorthandoff {=}
\shorthandoff* {^}
- \fi
+ }
}
{
% The following command should not be called if the main language
@@ -1011,7 +992,7 @@
\let \xpgla@savedvalues \empty
-\AtEndPreamble
+\hook_gput_code:nnn { begindocument / before } {.}
{
\edef \xpgla@savedvalues
{
@@ -1024,12 +1005,14 @@
\def \noextras@latin
{
- \iflatin@babelshorthands
+ \bool_if:NT \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NT \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
\xpgla@savedvalues
\polyglossia_latin_no_punctuation_spacing:
\polyglossia_latin_modern_character_codes:
@@ -1045,16 +1028,20 @@
{
\polyglossia_latin_punctuation_spacing:
}
- \iflatin@babelshorthands
+ \bool_if:NTF \l_polyglossia_latin_babelshorthands_bool
+ {
\polyglossia_latin_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_shorthands:
- \fi
- \iflatin@prosodicshorthands
+ }
+ \bool_if:NTF \l_polyglossia_latin_prosodic_shorthands_bool
+ {
\polyglossia_latin_prosodic_shorthands:
- \else
+ }
+ {
\polyglossia_latin_no_prosodic_shorthands:
- \fi
+ }
}
\def \blockextras@latin
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf
deleted file mode 100644
index 496d8356dde..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinclassic.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf
deleted file mode 100644
index aab9c456d44..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinecclesiastic.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf
deleted file mode 100644
index 1f76e51ba2b..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latinmedieval.ldf
+++ /dev/null
@@ -1,9 +0,0 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
-%
-\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval Latin]
-
-% We provide this as a babel alias
-
-\xpg@load@master@language{latin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
index 495a2384b07..a0e938f3c5a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for Latvian]
\PolyglossiaSetup{latvian}{
@@ -25,12 +25,12 @@
\def\contentsname{Saturs}%
\def\listfigurename{Attēlu saraksts}%
\def\listtablename{Tabulu saraksts}%
- \def\indexname{Index}%
+ \def\indexname{PriekÅ¡metu rÄdÄ«tÄjs}%
\def\figurename{Att.}%
\def\tablename{Tabula}%
\def\partname{Daļa}%
- \def\enclname{encl}%
- \def\ccname{cc}%
+ \def\enclname{PielikumÄ}%
+ \def\ccname{Kopija(s)}%
\def\headtoname{To}%
\def\pagename{lpp.}%
\def\seename{sk.}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
index c3f389702bb..c120f8394f7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translated by Paulius SladkeviÄius <komsas@gmail.com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
index dbb6a3406a2..d74145d09a8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (Lao)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lao}
+\InheritGlossFile{lao}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
index a754a11e9e2..a4927b4f86a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for Lower Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
index 4f054727f6e..96cd05cede4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for Lower Sorbian]
% We only provide this gloss for babel compatibility. Since lsorbian is
% a sorbian variety, we use 'sorbian' with variant 'lower' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
index a229c22f599..c01d7f9cae3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (Lithuanian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{lithuanian}
+\InheritGlossFile{lithuanian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
index 872db3d41eb..88932fe434d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (Latvian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{latvian}
+\InheritGlossFile{latvian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
index 7d1465ee3d5..e1c8534b2a3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-macedonian.ldf}[polyglossia: module for Macedonian]
\PolyglossiaSetup{macedonian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
index 034802242c0..9533a325b4a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for Hungarian (Magyar)]
% We only provide this gloss for babel compatibility.
-\xpg@load@master@language{hungarian}
+\InheritGlossFile{hungarian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
index c890ffcd2b9..451ed329b8f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malay.ldf}[polyglossia: module for Malay]
@@ -26,65 +26,44 @@
% Backwards compat. alias
\setlanguagealias[variant=malaysian]{malay}{bahasam}
-\providebool{malay@melayu}
+\@ifundefined{ifmalay@melayu}%
+ {\newif\ifmalay@melayu}{}
\malay@melayufalse
\def\malay@variant{malay}
-\define@choicekey*+{malay}{variant}[\xpg@val\xpg@nr]{indonesian,malaysian}[malaysian]{%
- \ifcase\xpg@nr\relax
- % indonesian:
- \def\malay@variant{indonesian}%
- \malay@melayufalse
- \or
- % malaysian:
- \def\malay@variant{malay}%
- \malay@melayutrue
- \fi
- \ifmalay@melayu
- \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@malay is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{malay}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@malay}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{melayu,bahasam,bahasai,indonesian,indon,bahasa}
- \xpg@ifdefined{malay}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Malaysian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@malay0%
- }%
- }%
- \else
- \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
- \xpg@fontsetup@latin{malay}%
- % Check if \l@indonesian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{indonesian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@indonesian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{indon,bahasai,bahasam,malay,melayu,bahasa}
- \xpg@ifdefined{indonesian}{}{%
- \xpg@warning{No hyphenation patterns for Malay (Indonesian) found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@indonesian0
- }%
- }%
- \fi
- \xpg@info{Option: malay, variant=\xpg@val}%
-}{\xpg@warning{Unknown malay variant `#1'}}
+
+\DeclareKeys[polyglossia/gloss/malay]
+ {
+ variant.choice:,
+ variant / indonesian.code =
+ {%
+ \def\malay@variant{indonesian}%
+ \malay@melayufalse
+ \SetLanguageKeys{malay}{language=Indonesian,langtag=IND,babelname=bahasa,bcp47=id,bcp47-language=id}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@indonesian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{indonesian}{indon,bahasai,bahasam,malay,melayu,bahasa}%
+ },
+ variant / malaysian.code =
+ {%
+ \def\malay@variant{malay}%
+ \malay@melayutrue
+ \SetLanguageKeys{malay}{language=Malay,langtag=MLY,babelname=bahasam,bcp47=zsm,bcp47-language=zsm}%
+ \SetupLatinPolyglossiaFont{malay}%
+ % Check if \l@malay is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{malay}{melayu,bahasam,bahasai,indonesian,indon,bahasa}%
+ },
+ variant.default:n = malaysian,
+ variant/unknown.code = \xpg@warning{Unknown malay variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{malay}{variant=malaysian}
+\InitializeGlossOptions{malay}{variant=malaysian}
\def\malay@language{%
- \polyglossia@setup@language@patterns{\malay@variant}%
+ \SetupPolyglossiaLangPatterns{\malay@variant}%
}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
index 44def596e77..84524dac5ce 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-malayalam.ldf}[polyglossia: module for Malayalam]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
index 79b48a24c5a..cbb0dce0cbb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by Abhijit Navale <abhi_navale@live.in>
% Ordinals (1-100) added by Niranjan Tambe <niranjanvikastambe@gmail.com> on 14th December, 2019
@@ -28,21 +28,25 @@
\newif\ifmarathi@devanagari@numerals
\marathi@devanagari@numeralstrue
-\define@choicekey*+{marathi}{numerals}[\xpg@val\xpg@nr]{Western,Devanagari}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Western:
- \marathi@devanagari@numeralsfalse%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
- \or
- % Devanagari:
- \marathi@devanagari@numeralstrue%
- \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
- \fi
- \xpg@info{Option: Marathi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Marathi numerals value `#1'}}
+\DeclareKeys[polyglossia/gloss/marathi]
+ {
+ numerals.choice:,
+ numerals / western.code =
+ {%
+ \marathi@devanagari@numeralsfalse
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / devanagari.code =
+ {%
+ \marathi@devanagari@numeralstrue
+ \SetLanguageKeys{marathi}{bcp47-extension-u=nu-deva}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Marathi numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{marathi}{numerals=Devanagari}
+\InitializeGlossOptions{marathi}{numerals=Devanagari}
\newcommand{\marathinumerals}[2]{\marathinumber{#2}}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
new file mode 100644
index 00000000000..f718bde8fa3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
@@ -0,0 +1,9 @@
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+%
+\ProvidesFile{gloss-medievallatin.ldf}[polyglossia: module for medieval Latin]
+
+% We provide this as a babel alias
+
+\InheritGlossFile{latin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
index d5795bc39d3..dd2fbe301bd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (Macedonian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{macedonian}
+\InheritGlossFile{macedonian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
index 74ebd5902fa..175a75bee7f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (Malayalam)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{malayalam}
+\InheritGlossFile{malayalam}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
index f19bfb63f24..985d73b69d8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (Mongolian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{mongolian}
+\InheritGlossFile{mongolian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
index 04d4fe1e4da..d8eca6721d5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for Mongolian]
@@ -30,43 +30,46 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{mongolian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \fi
- \xpg@info{Option: Mongolian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Mongolian numerals value `#1'}}
-\define@boolkey{mongolian}[mongolian@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/mongolian]
+ {
+ babelshorthands.if = mongolian@babelshorthands,
+ babelshorthands.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Mongolian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{mongolian}{babelshorthands=false,numerals=arabic}
+\InitializeGlossOptions{mongolian}{babelshorthands=false,numerals=arabic}
\ifsystem@babelshorthands
- \setkeys{mongolian}{babelshorthands=true}
+ \SetGlossOptions{mongolian}{babelshorthands=true}
\else
- \setkeys{mongolian}{babelshorthands=false}
+ \SetGlossOptions{mongolian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\mongolian@shorthands{%
\xpg@activate@shorthands%
@@ -119,7 +122,7 @@
\def\bibname{Ðомзүй}%
\def\chaptername{БүлÑг}%
\def\appendixname{ХавÑралт}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Ðгуулга}}%
{\def\contentsname{Гарчиг}}%
\def\listfigurename{Зургийн жагÑаалт}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
index fa37ee180c0..7a56186cb25 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (Marathi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{marathi}
+\InheritGlossFile{marathi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
index 01cb9a28833..32524dab4fe 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for Austrian German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
index 715d6a22841..34bfbbce49a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (Norwegian)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
index 298913ccb8d..baf56a91398 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for Newzealand English]
% We provide this as a babel alias
-\xpg@load@master@language{english}
+\InheritGlossFile{english}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
index cb77aa6be8d..7bacbf2b423 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
index a7b7712520d..196b55d48ee 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nko.ldf}[Polyglossia: module for N’Ko]
\PolyglossiaSetup{nko}{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
index d000c9c1e38..95121a64502 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
@@ -1,11 +1,11 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for Norwegian (Bokmal)]
% We only provide this gloss for babel compatibility. Since norsk is
% actually norwegian bokmal, we use 'norwegian' with variant 'bokmal' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
index 544c8b7df79..ba7b7aca46d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for Norwegian]
\PolyglossiaSetup{norwegian}{
@@ -20,28 +20,32 @@
\setlanguagealias[variant=nynorsk]{norwegian}{nynorsk}
\def\norwegian@variant{nynorsk}
-\define@choicekey*+{norwegian}{variant}[\xpg@val\xpg@nr]{nynorsk,bokmal}[nynorsk]{%
- \ifcase\xpg@nr\relax
- % nynorsk:
- \def\norwegian@variant{nynorsk}%
- \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
- \xpg@fontsetup@latin{norwegian}%
- \or
- % bokmal:
- \def\norwegian@variant{norsk}%
- \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
- \xpg@fontsetup@latin{norwegian}%
- \fi
- \xpg@info{Option: norwegian, variant=\xpg@val}%
-}{\xpg@warning{Unknown norwegian variant `#1'}}
+\DeclareKeys[polyglossia/gloss/norwegian]
+ {
+ variant.choice:,
+ variant / nynorsk.code =
+ {%
+ \def\norwegian@variant{nynorsk}%
+ \SetLanguageKeys{norwegian}{langtag=NYN,babelname=nynorsk,bcp47=nn,bcp47-language=nn}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant / bokmal.code =
+ {%
+ \def\norwegian@variant{norsk}%
+ \SetLanguageKeys{norwegian}{langtag=NOR,babelname=norsk,bcp47=nb,bcp47-language=nb}%
+ \SetupLatinPolyglossiaFont{norwegian}%
+ },
+ variant.default:n = nynorsk,
+ variant/unknown.code = \xpg@warning{Unknown norwegian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{norwegian}{variant=nynorsk}
+\InitializeGlossOptions{norwegian}{variant=nynorsk}
\def\norwegian@language{%
- \polyglossia@setup@language@patterns{\norwegian@variant}%
+ \SetupPolyglossiaLangPatterns{\norwegian@variant}%
}%
\def\captionsnorwegian@nynorsk{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
index 5fa656d2a50..19d45a3143c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for Swiss German (current spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
index 648d2b346d4..5a44bced302 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
@@ -1,11 +1,11 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for Norwegian (Nynorsk)]
% We only provide this gloss for babel compatibility. Since nynorsk is
% a norwegian variety, we use 'norwegian' with variant 'nynorsk' now.
-\xpg@load@master@language{norwegian}
+\InheritGlossFile{norwegian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
index a383b92b28f..163fd7dc576 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%
%% This is file `gloss-occitan.ldf',
@@ -34,19 +34,19 @@
% BCP-47 compliant aliases
\setlanguagealias*{occitan}{oc}
-\define@boolkey{occitan}[occitan@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/occitan]
+ {
+ babelshorthands.if = occitan@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{occitan}{babelshorthands=true}
+ \SetGlossOptions{occitan}{babelshorthands=true}
\else
- \setkeys{occitan}{babelshorthands=false}
+ \SetGlossOptions{occitan}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\occitan@shorthands{%
\xpg@activate@shorthands%
@@ -138,7 +138,7 @@
\def\today{\occitanday\space \occitanmonth\space de~\number\year}%
}
\let\xpgoc@savedvalues\empty
-\AtEndPreamble{% the user or the class might define different values
+\AddToHook{begindocument/before}{% the user or the class might define different values
\edef\xpgoc@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
index 7efbd533912..7101033d02e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% Translations provided by ଅଶୋକ ଦାସୠ<das@pas.rochester.edu> and ଅଭିଷେକ ଜେନା <avisekjena@gmail.com>
% TODO implement Odia calendar
@@ -30,32 +30,37 @@
\newif\ifodia@devanagari@numerals
\newif\ifodia@odia@numerals
-\define@choicekey*+{odia}{numerals}[\xpg@val\xpg@nr]{Devanagari,Odia,Western}[Devanagari]{%
- \ifcase\xpg@nr\relax
- % Devanagari:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralstrue%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
- \or
- % Odia:
- \odia@odia@numeralstrue%
- \odia@devanagari@numeralsfalse%
- \or
- % Western:
- \odia@odia@numeralsfalse%
- \odia@devanagari@numeralsfalse%
- \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Odia, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Odia numeral `#1'}}
-
\def\extras@odia{}
\def\noextras@odia{}
-\define@boolkey{odia}[odia@]{changecounternumbering}[true]{}
+\DeclareKeys[polyglossia/gloss/odia]
+ {
+ changecounternumbering.if = odia@changecounternumbering,
+ changecounternumbering.default:n = true,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralstrue
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-deva}%
+ },
+ numerals / odia.code =
+ {%
+ \odia@odia@numeralstrue
+ \odia@devanagari@numeralsfalse
+ },
+ numerals / western.code =
+ {%
+ \odia@odia@numeralsfalse
+ \odia@devanagari@numeralsfalse
+ \SetLanguageKeys{odia}{bcp47=or,bcp47-language=or,bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Odia numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{odia}{changecounternumbering=false,numerals=Devanagari}
+\InitializeGlossOptions{odia}{changecounternumbering=false,numerals=Devanagari}
\def\captionsodia{%
\def\refname{ସନà­à¬¦à¬°à­à¬­}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
index a864d2040e0..7f9cee9b542 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-odia.ldf}[polyglossia: module for or (Odia)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{odia}
+\InheritGlossFile{odia}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
index c54ec572b9c..9f56ed05039 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-pa.ldf}[polyglossia: module for pa (Punjabi)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{punjabi}
+\InheritGlossFile{punjabi}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
index ae1a9b0d288..6018964b451 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-persian.ldf}[polyglossia: module for Persian]
@@ -27,42 +27,36 @@
\setlanguagealias{persian}{farsi}
\newif\if@western@numerals
-\define@choicekey*+{persian}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Persian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Persian numerals option `#1'}}
-
\newif\ifpersian@customsep\persian@customsepfalse
\def\xpg@sepmark{}
-\define@key{persian}{sectionsep}[.]{%
- \persian@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{persian}[persian@]{abjadjimnotail}[true]{%
- \ifpersian@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi}
-
-% NOT YET USED
-\define@key{persian}{locale}[default]{%
- \def\@persian@locale{#1}}
%TODO add option for CALENDAR
+\DeclareKeys[polyglossia/gloss/persian]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\persian@customseptrue,
+ sectionsep.default:n = .,
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ locale.store = \@persian@locale,
+ locale.default:n = default,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{persian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Persian numerals option `#1'}
+ }
+
% Register default options
-\xpg@initialize@gloss@options{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
+\InitializeGlossOptions{persian}{locale=default,numerals=eastern,abjadjimnotail=false}
\def\farsigregmonth#1{\ifcase#1%
\or ژانویه\or Ùوریه\or مارس\or آوریل\or مه\or ژوئن\or ژوئیه\or اوت\or سپتامبر\or اکتبر\or نوامبر\or دسامبر\fi}
@@ -147,16 +141,16 @@
}
\def\nopersian@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\persian@luatex@capsformat{%
%
% change chapter and part headings
\ifpersian@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -168,7 +162,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -183,30 +177,30 @@
}
\def\nopersian@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@persian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
index 1b6b9b537d1..214182ba500 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
@@ -1,5 +1,5 @@
% !TEX encoding = UTF-8 Unicode
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for Piedmontese]
\makeatletter
@@ -17,19 +17,19 @@
% BCP-47 compliant aliases
\setlanguagealias*{piedmontese}{pms}
-\define@boolkey{piedmontese}[piedmontese@]{babelshorthands}[true]{}
+\DeclareKeys[polyglossia/gloss/piedmontese]
+ {
+ babelshorthands.if = piedmontese@babelshorthands,
+ babelshorthands.default:n = true
+ }
\ifsystem@babelshorthands
- \setkeys{piedmontese}{babelshorthands=true}
+ \SetGlossOptions{piedmontese}{babelshorthands=true}
\else
- \setkeys{piedmontese}{babelshorthands=false}
+ \SetGlossOptions{piedmontese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\piedmontese@shorthands{%
\xpg@activate@shorthands%
@@ -93,7 +93,7 @@
ëd luj\or d'agost\or dë stèmber\or d'otóber\or ëd novèmber\or dë dzèmber%
\fi\space dal\space\number\year}}
-\AtEndPreamble{%
+\AddToHook{begindocument/before}{%
\edef\xpgpms@savedvalues{%
\clubpenalty=\the\clubpenalty\space
\@clubpenalty=\the\@clubpenalty\space
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
index 48ceed5bbb6..bc48e3e4b1e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polish.ldf}[polyglossia: module for Polish]
@@ -20,26 +20,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{polish}[polish@]{babelshorthands}[true]{}
-
-\define@boolkey{polish}[polish@]{splithyphens}[true]{}
-
-\define@boolkey{polish}[polish@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/polish]
+ {
+ babelshorthands.if = polish@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = polish@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = polish@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{polish}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{polish}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{polish}{babelshorthands=true}
+ \SetGlossOptions{polish}{babelshorthands=true}
\else
- \setkeys{polish}{babelshorthands=false}
+ \SetGlossOptions{polish}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\polish@@splhyphen#1{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
index 68f53eb1f22..e8f541e486c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic Greek]
% We provide this as a babel alias
-\xpg@load@master@language{greek}
+\InheritGlossFile{greek}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
index 6111b581193..d635007377a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for Portuguese]
@@ -7,6 +7,6 @@
% introduced it in 8.3 filename times). Since polyglossia uses full
% English language names, we use 'portuguese' now.
-\xpg@load@master@language{portuguese}
+\InheritGlossFile{portuguese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
index bb03525be7e..e58233056a1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for Portuguese]
@@ -28,41 +28,42 @@
\fi
\def\portuguese@variant{portuges}
-\define@choicekey*+{portuguese}{variant}[\xpg@val\xpg@nr]{portuguese,brazilian}[portuguese]{%
- \ifcase\xpg@nr\relax
- % portuguese:
- \def\portuguese@variant{portuges}%
- \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
- \or
- % brazilian:
- \def\portuguese@variant{brazil}%
- \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
- % There are no specific brazil patterns
- \adddialect\l@brazil\l@portuges\relax%
- \fi
- \xpg@info{Option: portuguese, variant=\xpg@val}%
-}{\xpg@warning{Unknown portuguese variant `#1'}}
-
-\define@boolkey{portuguese}[portuguese@]{babelshorthands}[true]{}
-
-\define@boolkey{portuguese}[portuguese@]{splithyphens}[true]{}
+
+\DeclareKeys[polyglossia/gloss/portuguese]
+ {
+ babelshorthands.if = portuguese@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = portuguese@splithyphens,
+ splithyphens.default:n = true,
+ variant.choice:,
+ variant / portuguese.code =
+ {%
+ \def\portuguese@variant{portuges}%
+ \SetLanguageKeys{portuguese}{babelname=portuges,bcp47=pt-PT,bcp47-language=pt,bcp47-region=PT}%
+ },
+ variant / brazilian.code =
+ {%
+ \def\portuguese@variant{brazil}%
+ \SetLanguageKeys{portuguese}{babelname=brazil,bcp47=pt-BR,bcp47-language=pt,bcp47-region=BR}%
+ % There are no specific brazil patterns
+ \adddialect\l@brazil\l@portuges\relax
+ },
+ variant.default:n = portuguese,
+ variant/unknown.code = \xpg@warning{Unknown portuguese variant `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{portuguese}{variant=portuguese,
+\InitializeGlossOptions{portuguese}{variant=portuguese,
babelshorthands=false,
splithyphens=true}
\ifsystem@babelshorthands
- \setkeys{portuguese}{babelshorthands=true}
+ \SetGlossOptions{portuguese}{babelshorthands=true}
\else
- \setkeys{portuguese}{babelshorthands=false}
+ \SetGlossOptions{portuguese}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\portuguese@@splhyphen#1{%
@@ -131,7 +132,7 @@
}
\def\portuguese@language{%
- \polyglossia@setup@language@patterns{\portuguese@variant}%
+ \SetupPolyglossiaLangPatterns{\portuguese@variant}%
}%
\def\captionsportuguese@portuges{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
index 48eacd30e7f..e150176c02d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
% UTF-8 strings kindly provided by
% Arvinder Singh Kang, <17-11-2022>
@@ -25,26 +25,31 @@
\def\punjabi@language{%
% patterns are spelled panjabi
- \polyglossia@setup@language@patterns{panjabi}%
+ \SetupPolyglossiaLangPatterns{panjabi}%
}
\newif\ifpunjabi@gurmukhi@numerals
\punjabi@gurmukhi@numeralstrue
-\define@choicekey*+{punjabi}{numerals}[\xpg@val\xpg@nr]{Gurmukhi,Western}[Gurmukhi]{%
- \ifcase\xpg@nr\relax
- % Gurmukhi:
- \punjabi@gurmukhi@numeralstrue%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
- \or
- % Western:
- \punjabi@gurmukhi@numeralsfalse%
- \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Punjabi, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Punjabi numeral `#1'}}
+
+\DeclareKeys[polyglossia/gloss/punjabi]
+ {
+ numerals.choice:,
+ numerals / gurmukhi.code =
+ {%
+ \punjabi@gurmukhi@numeralstrue
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-guru}%
+ },
+ numerals / western.code =
+ {%
+ \punjabi@gurmukhi@numeralsfalse
+ \SetLanguageKeys{punjabi}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = gurmukhi,
+ numerals/unknown.code = \xpg@warning{Unknown Punjabi numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{punjabi}{numerals=gurmukhi}
+\InitializeGlossOptions{punjabi}{numerals=gurmukhi}
\newcommand{\punjabinumerals}[2]{\punjabinumber{#2}}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
index 290dad9c71b..0051613ac77 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romanian.ldf}[polyglossia: module for Romanian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
index aa50a200003..b8c9d628e01 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-romansh.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-romansh.ldf}[polyglossia: module for Romansh]
\makeatletter
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
index 8dcf535ebf5..34b2abd2445 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-russian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-russian.ldf}[polyglossia: module for Russian]
@@ -27,11 +27,6 @@
\setlanguagealias*[spelling=old]{russian}{ru-petr1708}
\newif\if@russian@modern
-\define@key{russian}{spelling}[modern]{%
- \ifstrequal{#1}{old}%
- {\@russian@modernfalse\SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}}%
- {\@russian@moderntrue\SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}}%
-}
\def\captionsrussian{%
\if@russian@modern\captionsrussian@modern\else\captionsrussian@old\fi%
@@ -43,49 +38,68 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{russian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Russian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Russian numerals value `#1'}}
-
-\define@boolkey{russian}[russian@]{indentfirst}[true]{%
- \ifrussian@indentfirst
- \SetLanguageKeys{russian}{indentfirst=true}%
- \else
- \SetLanguageKeys{russian}{indentfirst=false}%
- \fi%
-}
-
-\define@boolkey{russian}[russian@]{babelshorthands}[true]{}
-
-% Force punctuation after heading number
-\define@boolkey{russian}[russian@]{forceheadingpunctuation}[true]{}
-% Define some math functions
-\define@boolkey{russian}[russian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/russian]
+ {
+ babelshorthands.if = russian@babelshorthands,
+ babelshorthands.default:n = true,
+ forceheadingpunctuation.if = russian@forceheadingpunctuation,
+ forceheadingpunctuation.default:n = true,
+ mathfunctions.if = russian@mathfunctions,
+ mathfunctions.default:n = true,
+ spelling.choice:,
+ spelling / modern.code =
+ {%
+ \@russian@moderntrue
+ \SetLanguageKeys{russian}{bcp47=ru,bcp47-variant=luna1918}%
+ },
+ spelling / old.code =
+ {%
+ \@russian@modernfalse
+ \SetLanguageKeys{russian}{bcp47=ru-petr1708,bcp47-variant=petr1708}%
+ },
+ spelling.default:n = modern,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{russian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Russian numerals value `#1'},
+ indentfirst.choice:,
+ indentfirst / true.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=true}%
+ },
+ indentfirst / false.code =
+ {%
+ \SetLanguageKeys{russian}{indentfirst=false}%
+ },
+ indentfirst.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{russian}{babelshorthands=false,
+\InitializeGlossOptions{russian}{babelshorthands=false,
spelling=modern,
numerals=arabic,
indentfirst=true,
@@ -94,16 +108,12 @@
\ifsystem@babelshorthands
- \setkeys{russian}{babelshorthands=true}
+ \SetGlossOptions{russian}{babelshorthands=true}
\else
- \setkeys{russian}{babelshorthands=false}
+ \SetGlossOptions{russian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\russian@shorthands{%
\xpg@activate@shorthands%
@@ -155,7 +165,7 @@
\def\bibname{Литература}%
\def\chaptername{Глава}%
\def\appendixname{Приложение}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержание}}%
{\def\contentsname{Оглавление}}%
\def\listfigurename{СпиÑок иллюÑтраций}%
@@ -198,7 +208,7 @@
\def\bibname{БибліографіÑ}%
\def\chaptername{Глава}%
\def\appendixname{Приложеніе}%
- \ifcsundef{thechapter}%
+ \@ifundefined{thechapter}%
{\def\contentsname{Содержаніе}}%
{\def\contentsname{Оглавленіе}}%
\def\listfigurename{СпиÑокъ иллюÑтрацій}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
index 9efe055865f..802718dbc47 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sami.ldf}[polyglossia: module for Sami]
@@ -28,19 +28,19 @@
% % northern:
% \def\sami@variant{samin}%
% \SetLanguageKeys{sami}{language=Northern Sami,langtag=NSM}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \or
% % other:
% \def\sami@variant{}%
% \SetLanguageKeys{sami}{language= Sami,langtag=}%
-% \xpg@fontsetup@latin{sami}%
+% \SetupLatinPolyglossiaFont{sami}%
% \fi
% \xpg@info{Option: sami, variant=\xpg@val}%
%}{\xpg@warning{Unknown sami variant `#1'}}
%\def\sami@language{%
-% \polyglossia@setup@language@patterns{\sami@variant}%
+% \SetupPolyglossiaLangPatterns{\sami@variant}%
%}%
\def\captionssami@northern{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
index 0801e7423ab..e15a05b2430 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-samin.ldf}[polyglossia: module for Northern Sami]
% We only provide this gloss for babel compatibility. Since samin is
% a sami variety, we use 'sami' with variant 'northern' now.
-\xpg@load@master@language{sami}
+\InheritGlossFile{sami}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
index 094c6f6691d..1c9901082c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for Sanskrit]
@@ -27,56 +27,55 @@
\setlanguagealias*[script=gujarati]{sanskrit}{sa-Gujr}
\setlanguagealias*[script=latin]{sanskrit}{sa-Latn}
-\define@key{sanskrit}{Script}[devanagari]{%
- \ifcsdef{fontsetup@sanskrit@#1}%
- {\csname fontsetup@sanskrit@#1\endcsname}%
- {\xpg@error{`#1' is not a valid script for Sanskrit}%
- }%
-}
-
-\define@key{sanskrit}{script}[devanagari]{\setkeys{sanskrit}{Script=#1}}
-
\def\fontsetup@sanskrit@devanagari{%
\SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari,bcp47=sa-Deva,bcp47-language=sa,bcp47-script=Deva,bcp47-casing=sa-Deva}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@gujarati{%
\SetLanguageKeys{sanskrit}{scripttag=gujr,script=Gujarati,bcp47=sa-Gujr,bcp47-language=sa,bcp47-script=Gujr,bcp47-casing=sa-Gujr}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@malayalam{%
\SetLanguageKeys{sanskrit}{scripttag=mlym,script=Malayalam,bcp47=sa-Mlym,bcp47-language=sa,bcp47-script=Mlym,bcp47-casing=sa-Mlym}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@bengali{%
\SetLanguageKeys{sanskrit}{scripttag=beng,script=Bengali,bcp47=sa-Beng,bcp47-language=sa,bcp47-script=Beng,bcp47-casing=sa-Beng}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@kannada{%
\SetLanguageKeys{sanskrit}{scripttag=knda,script=Kannada,bcp47=sa-Knda,bcp47-language=sa,bcp47-script=Knda,bcp47-casing=sa-Knda}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@telugu{%
\SetLanguageKeys{sanskrit}{scripttag=telu,script=Telugu,bcp47=sa-Relu,bcp47-language=sa,bcp47-script=Relu,bcp47-casing=sa-Relu}
- \xpg@fontsetup@nonlatin{sanskrit}}
+ \SetupNonLatinPolyglossiaFont{sanskrit}}
\def\fontsetup@sanskrit@latin{%
\SetLanguageKeys{sanskrit}{scripttag=latn,script=Latin,bcp47=sa-Latn,bcp47-language=sa,bcp47-script=Latn,bcp47-casing=sa-Latn}
- \xpg@fontsetup@latin{sanskrit}}
+ \SetupLatinPolyglossiaFont{sanskrit}}
\newif\ifsanskrit@devanagari@numerals
\sanskrit@devanagari@numeralstrue
-\define@choicekey*+{sanskrit}{numerals}[\xpg@val\xpg@nr]{devanagari,western}[devanagari]{%
- \ifcase\xpg@nr\relax
- % devanagari:
- \sanskrit@devanagari@numeralstrue%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
- \or
- % western:
- \sanskrit@devanagari@numeralsfalse%
- \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Sanskrit, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Sanskrit numeral `#1'}}
+\DeclareKeys[polyglossia/gloss/sanskrit]
+ {
+ script.code = \@ifundefined{fontsetup@sanskrit@#1}%
+ {\xpg@error{`#1' is not a valid script for Sanskrit}}%
+ {\csname fontsetup@sanskrit@#1\endcsname},
+ script.default:n = devanagari,
+ numerals.choice:,
+ numerals / devanagari.code =
+ {%
+ \sanskrit@devanagari@numeralstrue
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-deva}%
+ },
+ numerals / western.code =
+ {%
+ \sanskrit@devanagari@numeralsfalse
+ \SetLanguageKeys{sanskrit}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = devanagari,
+ numerals/unknown.code = \xpg@warning{Unknown Sanskrit numeral `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sanskrit}{script=devanagari,numerals=devanagari}
+\InitializeGlossOptions{sanskrit}{script=devanagari,numerals=devanagari}
% Use \providecommand here as the ldf file might
% be reloaded via BCP.
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
index a53cd0c6d3f..562e7358a5e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for Scottish Gaelic]
% We only provide this gloss for babel compatibility. Since scottish is
% a gaelic variety, we use 'gaelic' with variant 'scottish' now.
-\xpg@load@master@language{gaelic}
+\InheritGlossFile{gaelic}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
index 3a80bdd1370..3bc4740ebb4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for Serbian]
%TODO split into gloss-serbiancyr.ldf and gloss-serbianlat.ldf
@@ -39,67 +39,10 @@
\fi
\newif\if@serbian@cyr
-\define@choicekey*+{serbian}{Script}[\xpg@val\xpg@nr]{cyrillic,latin}[cyrillic]{%
- \ifcase\xpg@nr\relax
- % cyrillic:
- \@serbian@cyrtrue
- \xpg@fontsetup@nonlatin{serbian}%
- \or
- % latin:
- \@serbian@cyrfalse
- \xpg@fontsetup@latin{serbian}%
- %TODO \def\serbian@language{\language=\l@serbianlat}%
- % or should we use Croatian patterns as a fallback for the time being???
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, script=\xpg@val}%
-}{\xpg@warning{Unknown Serbian script `#1'}}
-
-\define@key{serbian}{script}[cyrillic]{\setkeys{serbian}{Script=#1}}
-
\newif\if@serbian@ijekavian
-\define@choicekey*+{serbian}{variant}[\xpg@val\xpg@nr]{ekavian,ijekavian}[ekavian]{%
- \ifcase\xpg@nr\relax
- % ekavian:
- \@serbian@ijekavianfalse%
- \or
- % ijekavian:
- \@serbian@ijekaviantrue%
- \fi
- \serbian@set@languagekeys%
- \xpg@info{Option: Serbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown Serbian variant `#1'}}
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{serbian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Serbian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Serbian numerals value `#1'}}
-
-\define@boolkey{serbian}[serbian@]{splithyphens}[true]{}
-
-\define@boolkey{serbian}[serbian@]{datei}[true]{}
\def\serbian@set@languagekeys{%
\if@serbian@cyr
@@ -117,10 +60,75 @@
\fi%
}
-\setkeys{serbian}{Script,numerals}
+\DeclareKeys[polyglossia/gloss/serbian]
+ {
+ splithyphens.if = serbian@splithyphens,
+ splithyphens.default:n = true,
+ datei.if = serbian@datei,
+ datei.default:n = true,
+ variant.choice:,
+ variant / ekavian.code =
+ {%
+ \@serbian@ijekavianfalse
+ \serbian@set@languagekeys
+ },
+ variant / ijekavian.code =
+ {%
+ \@serbian@ijekaviantrue
+ \serbian@set@languagekeys
+ },
+ variant.default:n = ekavian,
+ variant/unknown.code = \xpg@warning{Unknown Serbian variant `#1'},
+ script.choice:,
+ script / cyrillic.code =
+ {%
+ \@serbian@cyrtrue
+ \SetupNonLatinPolyglossiaFont{serbian}%
+ \serbian@set@languagekeys
+ },
+ script / latin.code =
+ {%
+ \@serbian@cyrfalse
+ \SetupLatinPolyglossiaFont{serbian}%
+ %TODO \def\serbian@language{\language=\l@serbianlat}%
+ % or should we use Croatian patterns as a fallback for the time being???
+ \serbian@set@languagekeys
+ },
+ script.default:n = cyrillic,
+ script/unknown.code = \xpg@warning{Unknown Serbian script `#1'},
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{serbian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Serbian numerals value `#1'}
+ }
+
+\SetGlossOptions{serbian}{script,numerals}
% Register default options
-\xpg@initialize@gloss@options{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
+\InitializeGlossOptions{serbian}{script=cyrillic,numerals=arabic,splithyphens=true}
\def\captionsserbian{%
\if@serbian@cyr\captionsserbian@cyr\else\captionsserbian@lat\fi
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
index 7e395fbb602..5493765d9b6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for Serbian (cyrillic)]
% We provide this as a babel alias
-\xpg@load@master@language{serbian}
+\InheritGlossFile{serbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
index 863b9babde3..b08d84335ed 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for Slovak]
@@ -19,26 +19,26 @@
\RequirePackage{luavlna}
\fi
-\define@boolkey{slovak}[slovak@]{babelshorthands}[true]{}
-
-\define@boolkey{slovak}[slovak@]{splithyphens}[true]{}
-
-\define@boolkey{slovak}[slovak@]{vlna}[true]{}
+\DeclareKeys[polyglossia/gloss/slovak]
+ {
+ babelshorthands.if = slovak@babelshorthands,
+ babelshorthands.default:n = true,
+ splithyphens.if = slovak@splithyphens,
+ splithyphens.default:n = true,
+ vlna.if = slovak@vlna,
+ vlna.default:n = true,
+ }
% Register default options
-\xpg@initialize@gloss@options{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
+\InitializeGlossOptions{slovak}{babelshorthands=false,splithyphens=true,vlna=true}
\ifsystem@babelshorthands
- \setkeys{slovak}{babelshorthands=true}
+ \SetGlossOptions{slovak}{babelshorthands=true}
\else
- \setkeys{slovak}{babelshorthands=false}
+ \SetGlossOptions{slovak}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\let\xpg@hyphen@char-
\def\slovak@@splhyphen#1{%
@@ -214,7 +214,7 @@
\def\contentsname{Obsah}%
\def\listfigurename{Zoznam obrázkov}%
\def\listtablename{Zoznam tabuliek}%
- \def\indexname{Index}%
+ \def\indexname{Register}%
\def\figurename{Obrázok}%
\def\tablename{Tabuľka}%
%\def\thepart{}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
index 4b932a45446..ce2de8083c9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for Slovenian]
% We provide this as a babel alias
-\xpg@load@master@language{slovenian}
+\InheritGlossFile{slovenian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
index 2b574559ead..5a08442e3f0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for Slovenian]
@@ -19,10 +19,14 @@
% Babel aliases
\setlanguagealias{slovenian}{slovene}
-\define@boolkey{slovenian}[slovenian@]{localalph}[true]{}
+\DeclareKeys[polyglossia/gloss/slovenian]
+ {
+ localalph.if = slovenian@localalph,
+ localalph.default:n = true
+ }
% Register default options
-\xpg@initialize@gloss@options{slovenian}{localalph=false}
+\InitializeGlossOptions{slovenian}{localalph=false}
\def\captionsslovenian{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
index 27b0274d218..c7b0a1c0ce8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for Sorbian]
@@ -26,60 +26,40 @@
\setlanguagealias[variant=upper]{sorbian}{uppersorbian}
\def\sorbian@variant{usorbian}
-\define@choicekey*+{sorbian}{variant}[\xpg@val\xpg@nr]{upper,lower}[upper]{%
- \ifcase\xpg@nr\relax
- % upper:
- \def\sorbian@variant{usorbian}%
- \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@usorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{usorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@usorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{uppersorbian}
- \xpg@ifdefined{usorbian}{}{%
- \xpg@warning{No hyphenation patterns for Upper Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@usorbian0%
- }
- }%
- \or
- % lower:
- \def\sorbian@variant{lsorbian}%
- \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
- \xpg@fontsetup@latin{sorbian}%
- % Check if \l@lsorbian is defined. If not, try to set it to some variety
- % (specific order as in the csv list below), or null language if everything fails
- \xpg@ifdefined{lsorbian}{}{%
- \def\do##1{%
- \xpg@ifdefined{##1}%
- {\csletcs{l@lsorbian}{l@##1}\listbreak}%
- {}%
- }%
- \docsvlist{lowersorbian,Lsorbian,usorbian,uppersorbian}
- \xpg@ifdefined{lsorbian}{}{%
- \xpg@warning{No hyphenation patterns for Lower Sorbian found\MessageBreak
- I will use the 'null' language instead}%
- \adddialect\l@lsorbian0%
- }
- }%
- \fi
- \xpg@info{Option: sorbian, variant=\xpg@val}%
-}{\xpg@warning{Unknown sorbian variant `#1'}}
-
-
-\define@boolkey{sorbian}[sorbian@]{olddate}[true]{}
+
+\DeclareKeys[polyglossia/gloss/sorbian]
+ {
+ olddate.if = sorbian@olddate,
+ olddate.default:n = true,
+ variant.choice:,
+ variant / upper.code =
+ {%
+ \def\sorbian@variant{usorbian}%
+ \SetLanguageKeys{sorbian}{language=Upper Sorbian,langtag=USB,babelname=uppersorbian,bcp47=hsb,bcp47-language=hsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@usorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{usorbian}{uppersorbian}%
+ },
+ variant / lower.code =
+ {%
+ \def\sorbian@variant{lsorbian}%
+ \SetLanguageKeys{sorbian}{language=Lower Sorbian,langtag=LSB,babelname=lowersorbian,bcp47=dsb,bcp47-language=dsb}%
+ \SetupLatinPolyglossiaFont{sorbian}%
+ % Check if \l@lsorbian is defined. If not, try to set it to some variety
+ % (specific order as in the csv list), or null language if everything fails
+ \TryPatternWithFallback{lsorbian}{lowersorbian,Lsorbian,usorbian,uppersorbian}%
+ },
+ variant.default:n = upper,
+ variant/unknown.code = \xpg@warning{Unknown sorbian variant `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{sorbian}{variant=upper,olddate=false}
+\InitializeGlossOptions{sorbian}{variant=upper,olddate=false}
\def\sorbian@language{%
- \polyglossia@setup@language@patterns{\sorbian@variant}%
+ \SetupPolyglossiaLangPatterns{\sorbian@variant}%
}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
index c7f6358f047..0b5b128ae2a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for Spanish]
@@ -27,52 +27,58 @@
\newif\if@spanish@mexico
\@spanish@mexicofalse
-\define@choicekey*+{spanish}{variant}[\xpg@val\xpg@nr]{spanish,mexican}[spanish]{%
- \ifcase\xpg@nr\relax
- % spanish:
- \@spanish@mexicofalse%
- \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
- \or
- % mexican:
- \@spanish@mexicotrue%
- \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
- \fi
- \xpg@info{Option: spanish, variant=\xpg@val}%
-}{\xpg@warning{Unknown spanish variant `#1'}}
% Localized math operators à la babel
\newif\ifspanish@accentedoperators
\newif\ifspanish@spacedoperators
\newif\ifspanish@locoperators
-\define@choicekey*+{spanish}{spanishoperators}[\xpg@val\xpg@nr]{all,accented,spaced,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \spanish@locoperatorstrue%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorstrue%
- \or
- % accented:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorstrue%
- \spanish@spacedoperatorsfalse%
- \or
- % spaced:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorstrue%
- \or
- % none:
- \spanish@locoperatorsfalse%
- \spanish@accentedoperatorsfalse%
- \spanish@spacedoperatorsfalse%
- \fi
- \xpg@info{Option: Spanish, spanishoperators=\xpg@val}%
-}{\xpg@warning{Unknown spanishoperators value `#1'}}
-
+\DeclareKeys[polyglossia/gloss/spanish]
+ {
+ variant.choice:,
+ variant / spanish.code =
+ {%
+ \@spanish@mexicofalse
+ \SetLanguageKeys{spanish}{babelname=spanish,bcp47=es-ES,bcp47-region=ES}%
+ },
+ variant / mexican.code =
+ {%
+ \@spanish@mexicotrue
+ \SetLanguageKeys{spanish}{babelname=spanishmx,bcp47=es-MX,bcp47-region=MX}%
+ },
+ variant.default:n = spanish,
+ variant/unknown.code = \xpg@warning{Unknown spanish variant `#1'},
+ spanishoperators.choice:,
+ spanishoperators / all.code =
+ {%
+ \spanish@locoperatorstrue
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / accented.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorstrue
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators / spaced.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorstrue
+ },
+ spanishoperators / none.code =
+ {%
+ \spanish@locoperatorsfalse
+ \spanish@accentedoperatorsfalse
+ \spanish@spacedoperatorsfalse
+ },
+ spanishoperators.default:n = all,
+ spanishoperators/unknown.code = \xpg@warning{Unknown spanishoperators value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{spanish}{variant=spanish,spanishoperators=none}
+\InitializeGlossOptions{spanish}{variant=spanish,spanishoperators=none}
\let\xpg@save@lim\lim
\let\xpg@save@limsup\limsup
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
index 850f5564ec5..4c0e71b0235 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for Mexican Spanish]
% We provide this as a babel alias
-\xpg@load@master@language{spanish}
+\InheritGlossFile{spanish}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
index a47304f1291..142a4b2d795 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swedish.ldf}[polyglossia: module for Swedish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
index fe679140556..9ab9f7e8d57 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for Swiss German (old spelling)]
% We provide this as a babel alias
-\xpg@load@master@language{german}
+\InheritGlossFile{german}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
index 7bd32c3ddcd..e93148da005 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for Syriac]
@@ -22,34 +22,37 @@
% BCP-47 compliant aliases
\setlanguagealias*{syriac}{syr}
-\def\syriacnumber#1{\@syriacnumber{#1}}%
+\def\syriacnumber#1{\@syriacnumber{#1}}
\newif\if@eastern@numerals
-\define@choicekey*+{syriac}{numerals}[\xpg@val\xpg@nr]{eastern,western,abjad}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@eastern@numeralstrue
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
- \or
- % western:
- \@eastern@numeralsfalse
- \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
- \or
- % abjad:
- \let\syriacnumber\abjadsyriac%
- \fi
- \xpg@info{Option: Syriac, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Syriac numerals option `#1'}}
-
\newif\ifsyriac@customsep\syriac@customsepfalse
\def\xpg@sepmark{}
-\define@key{syriac}{sectionsep}[.]{%
- \syriac@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
+
+\DeclareKeys[polyglossia/gloss/syriac]
+ {
+ sectionsep.code = \gdef\xpg@sepmark{#1}\syriac@customseptrue,
+ sectionsep.default:n = .,
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@eastern@numeralstrue
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-syrc}%
+ },
+ numerals / western.code =
+ {%
+ \@eastern@numeralsfalse
+ \SetLanguageKeys{syriac}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / abjad.code =
+ {%
+ \let\syriacnumber\abjadsyriac
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Syriac numerals option `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{syriac}{numerals=western}
+\InitializeGlossOptions{syriac}{numerals=western}
%\define@key{polyglossia}{syriaclocale}[default]{%
% \def\@syriac@locale{#1}}
@@ -136,13 +139,13 @@
\IfCharIsAvailableTF{0661}%
{\@ensure@LTR{\protect\arabicdigits{\number#1}}}%
{\@ensure@LTR{\arabicdigits{\number#1}}
- \ifcsdef{arabicfont}%
- {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
- \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
- I am using \string\arabicfont instead}}%
+ \@ifundefined{arabicfont}%
{\number#1%%% <---changed from \RL{\protect\reset@font\protect\number#1}%
\xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
since \string\arabicfont is not defined, we'll use Western numerals instead}}%
+ {\@ensure@LTR{\protect\arabicdigits{\number#1}}%
+ \xpg@warning{You have specified the option numerals=eastern for Syriac, but the Syriac font does not contain the appropriate glyphs:
+ I am using \string\arabicfont instead}}%
}%
\else
%%\RL{\protect\reset@font\number#1}%
@@ -180,16 +183,16 @@
}
\def\nosyriac@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\syriac@luatex@capsformat{%
%
% change chapter and part headings
\ifsyriac@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -201,7 +204,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -216,30 +219,30 @@
}
\def\nosyriac@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@syriac{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
index 3d737cfe785..38b4a1e7ba9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tamil.ldf}[polyglossia: module for Tamil]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
index 25f4b29971f..dfe53caabd4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-telugu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-telugu.ldf}[polyglossia: module for Telugu]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
index ed530fbac5c..bfaa96cb1ed 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-thai.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-thai.ldf}[polyglossia: module for Thai]
%% This is partly based on thai-latex for Babel:
@@ -29,19 +29,25 @@
\newif\if@thai@numerals
\def\tmp@thai{thai}
-\define@key{thai}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@thai
- \@thai@numeralstrue%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
- \else
- \@thai@numeralsfalse%
- \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
- \fi
-}
+
+\DeclareKeys[polyglossia/gloss/thai]
+ {
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \@thai@numeralsfalse
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / thai.code =
+ {%
+ \@thai@numeralstrue
+ \SetLanguageKeys{thai}{bcp47-extension-u=nu-thai}%
+ },
+ numerals.default:n = arabic,
+ }
% Register default options
-\xpg@initialize@gloss@options{thai}{numerals=arabic}
+\InitializeGlossOptions{thai}{numerals=arabic}
\def\captionsthai{%
\def\refname{หนังสืออ้างอิง}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
index 70de9a9ac24..b8223fe8458 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for Tibetan]
%% Copyright 2013 Elie Roux
@@ -24,20 +24,18 @@
\setlanguagealias*{tibetan}{bo}
\newif\if@tibetan@numerals
-\def\tmp@tibetan{tibetan}
-\define@key{tibetan}{numerals}[tibetan]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@tibetan
- \@tibetan@numeralstrue%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt}%
- \else
- \@tibetan@numeralsfalse%
- \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn}%
- \fi%
-}
+\DeclareKeys[polyglossia/gloss/tibetan]
+ {
+ numerals.choice:,
+ numerals/tibetan.code = \@tibetan@numeralstrue
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-tibt},
+ numerals/arabic.code = \@tibetan@numeralsfalse
+ \SetLanguageKeys{tibetan}{bcp47-extension-u=nu-latn},
+ numerals.default:n = tibetan
+ }
\ifluatex
- \newluatexattribute\xpg@tibteol %
+ \newattribute\xpg@tibteol %
\directlua{polyglossia.load_tibt_eol()}%
\fi
@@ -62,7 +60,7 @@
}
% Register default options
-\xpg@initialize@gloss@options{tibetan}{numerals=tibetan}
+\InitializeGlossOptions{tibetan}{numerals=tibetan}
% some are known, but very few
% a few come from "Standardizing Tibetan Terms of Information Technology"
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
index a6784ae276b..da46f8a6dda 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkish.ldf}[polyglossia: module for Turkish]
\RequirePackage{hijrical}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
index 9ec398470e3..af159166235 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkmen.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-turkmen.ldf}[polyglossia: module for Turkmen]
%% Translations provided by Nazar Annagurban <nazartm at gmail dot com>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
index 8093324dd00..65faa3e0795 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
@@ -1,8 +1,8 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ug.ldf}[polyglossia: module for ug (Uyghur)]
% BCP 47 tag for Uyghur
-\xpg@load@master@language{uyghur}
+\InheritGlossFile{uyghur}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
index bf09149725d..4a9674f2feb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for Ukrainian]
% Strings taken from Babel
@@ -26,51 +26,52 @@
\newif\ifcyrillic@numerals
\newif\ifcyrillic@asbuk@numerals
-\define@choicekey*+{ukrainian}{numerals}[\xpg@val\xpg@nr]{arabic,cyrillic,cyrillic-trad,cyrillic-alph}[arabic]{%
- \ifcase\xpg@nr\relax
- % arabic:
- \cyrillic@numeralsfalse%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
- \or
- % cyrillic:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-trad:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralsfalse%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \or
- % cyrillic-alph:
- \cyrillic@numeralstrue%
- \cyrillic@asbuk@numeralstrue%
- \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
- \fi
- \xpg@info{Option: Ukrainian, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Ukrainian numerals value `#1'}}
-
-% Define some math functions
-\define@boolkey{ukrainian}[ukrainian@]{mathfunctions}[true]{}
+\DeclareKeys[polyglossia/gloss/ukrainian]
+ {
+ babelshorthands.if = ukrainian@babelshorthands,
+ babelshorthands.default:n = true,
+ mathfunctions.if = ukrainian@mathfunctions,
+ mathfunctions.default:n = true,
+ numerals.choice:,
+ numerals / arabic.code =
+ {%
+ \cyrillic@numeralsfalse
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-latn}%
+ },
+ numerals / cyrillic.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-trad.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralsfalse
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals / cyrillic-alph.code =
+ {%
+ \cyrillic@numeralstrue
+ \cyrillic@asbuk@numeralstrue
+ \SetLanguageKeys{ukrainian}{bcp47-extension-u=nu-cyrl}%
+ },
+ numerals.default:n = arabic,
+ numerals/unknown.code = \xpg@warning{Unknown Ukrainian numerals value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{ukrainian}{numerals=arabic,mathfunctions=true}
-
-\define@boolkey{ukrainian}[ukrainian@]{babelshorthands}[true]{}
+\InitializeGlossOptions{ukrainian}{numerals=arabic,mathfunctions=true}
\ifsystem@babelshorthands
- \setkeys{ukrainian}{babelshorthands=true}
+ \SetGlossOptions{ukrainian}{babelshorthands=true}
\else
- \setkeys{ukrainian}{babelshorthands=false}
+ \SetGlossOptions{ukrainian}{babelshorthands=false}
\fi
-\ifcsundef{initiate@active@char}{%
- \input{babelsh.def}%
- \initiate@active@char{"}%
- \shorthandoff{"}%
-}{}
+\InitializeBabelShorthands
\def\ukrainian@shorthands{%
\xpg@activate@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
index 9ca440a885c..418551d25f3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for Upper Sorbian]
% We provide this as a babel alias
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
index f95459e7d5b..47af125a2b7 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
%%% Adapted from a file contributed by Kamal Abdali
\ProvidesFile{gloss-urdu.ldf}[polyglossia: module for Urdu]
@@ -25,52 +25,46 @@
\setlanguagealias*{urdu}{ur}
\newif\if@western@numerals
-\define@choicekey*+{urdu}{numerals}[\xpg@val\xpg@nr]{eastern,western}[eastern]{%
- \ifcase\xpg@nr\relax
- % eastern:
- \@western@numeralsfalse%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
- \or
- % western:
- \@western@numeralstrue%
- \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
- \fi
- \xpg@info{Option: Urdu, numerals=\xpg@val}%
-}{\xpg@warning{Unknown Urdu numerals option `#1'}}
-
\newif\ifurdu@customsep\urdu@customsepfalse
\def\xpg@sepmark{}
-\define@key{urdu}{sectionsep}[.]{%
- \urdu@customseptrue%
- \gdef\xpg@sepmark{#1}%
-}
-
-%this is needed for \abjad in arabicnumbers.sty
-\define@boolkey{urdu}[urdu@]{abjadjimnotail}[true]{%
- \ifurdu@abjadjimnotail
- \abjad@jim@notailtrue%
- \else
- \abjad@jim@notailfalse
- \fi%
-}
-
\newif\if@hijrical
-\define@choicekey*+{urdu}{calendar}[\xpg@val\xpg@nr]{gregorian,hijri}[gregorian]{%
- \ifcase\xpg@nr\relax
- % gregorian:
- \@hijricalfalse
- \or
- % hijri:
- \@hijricaltrue
- \fi
- \xpg@info{Option: Urdu, calendar=\xpg@val}%
-}{\xpg@warning{Unknown Urdu calendar option `#1'}}
-\define@key{urdu}{hijricorrection}[0]{%
- \gdef\urdu@hijri@correction{#1}}%
+\DeclareKeys[polyglossia/gloss/urdu]
+ {
+ abjadjimnotail.if = abjad@jim@notail,
+ abjadjimnotail.default:n = true,
+ sectionsep.code = \gdef\xpg@sepmark{#1}\urdu@customseptrue,
+ sectionsep.default:n = .,
+ hijricorrection.code = \gdef\urdu@hijri@correction{#1},
+ hijricorrection.default:n = 0,
+ calendar.choice:,
+ calendar / gregorian.code =
+ {%
+ \@hijricalfalse
+ },
+ calendar / hijri.code =
+ {%
+ \@hijricaltrue
+ },
+ calendar.default:n = gregorian,
+ calendar/unknown.code = \xpg@warning{Unknown Urdu calendar option `#1'},
+ numerals.choice:,
+ numerals / eastern.code =
+ {%
+ \@western@numeralsfalse
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-arab}%
+ },
+ numerals / western.code =
+ {%
+ \@western@numeralstrue
+ \SetLanguageKeys{urdu}{bcp47-extension-u=nu-latn}%
+ },
+ numerals.default:n = eastern,
+ numerals/unknown.code = \xpg@warning{Unknown Urdu numerals option `#1'}
+ }
% This should set the defaults
-\setkeys{urdu}{calendar,numerals,hijricorrection}
+\SetGlossOptions{urdu}{calendar,numerals,hijricorrection}
\def\urdugregmonth#1{\ifcase#1%
\or جنوری\or Ùروری\or مارچ\or اپریل\or مئی\or جون\or جولائی\or اگست\or ستمبر\or اکتوبر\or نومبر\or دسمبر\fi}
@@ -157,16 +151,16 @@
}
\def\nourdu@xetex@capsformat{%
- \ifcsdef{xpg@save@sepmark}{%
+ \ifcsname xpg@save@sepmark\endcsname%
\SepMark{\xpg@save@sepmark}
- }{}%
+ \fi%
}
\def\urdu@luatex@capsformat{%
%
% change chapter and part headings
\ifurdu@customsep
- \ifcsdef{chapter}{%
+ \ifcsname chapter\endcsname%
\let\xpg@save@thesection\thesection%
\renewcommand*\thesection{\thechapter\xpg@sepmark\@arabic\c@section}
\let\xpg@save@theequation\theequation%
@@ -178,7 +172,7 @@
\let\xpg@save@thetable\thetable%
\renewcommand*\thetable{%
\ifnum\c@chapter>\z@\thechapter\xpg@sepmark\fi\@arabic\c@table}
- }{}
+ \fi%
\let\xpg@save@thesubsection\thesubsection%
\renewcommand\thesubsection
{\thesection\xpg@sepmark\@arabic\c@subsection}
@@ -193,30 +187,30 @@
}
\def\nourdu@luatex@capsformat{%
- \ifcsdef{xpg@save@thesection}{%
+ \ifcsname xpg@save@thesection\endcsname%
\let\thesection\xpg@save@thesection%
- }{}%
- \ifcsdef{xpg@save@theequation}{%
+ \fi%
+ \ifcsname xpg@save@theequation\endcsname%
\let\theequation\xpg@save@theequation%
- }{}%
- \ifcsdef{xpg@save@thefigure}{%
+ \fi%
+ \ifcsname xpg@save@thefigure\endcsname%
\let\thefigure\xpg@save@thefigure%
- }{}%
- \ifcsdef{xpg@save@thetable}{%
+ \fi%
+ \ifcsname xpg@save@thetable\endcsname%
\let\thetable\xpg@save@thetable%
- }{}%
- \ifcsdef{xpg@save@thesubsection}{%
+ \fi%
+ \ifcsname xpg@save@thesubsection\endcsname%
\let\thesubsection\xpg@save@thesubsection%
- \ifcsdef{xpg@save@thesubsubsection}{%
+ \ifcsname xpg@save@thesubsubsection\endcsname%
\let\thesubsubsection\xpg@save@thesubsubsection%
- }{}%
- }{}%
- \ifcsdef{xpg@save@theparagraph}{%
+ \fi%
+ \fi%
+ \ifcsname xpg@save@theparagraph\endcsname%
\let\theparagraph\xpg@save@theparagraph%
- }{}%
- \ifcsdef{xpg@save@thesubparagraph}{%
+ \fi%
+ \ifcsname xpg@save@thesubparagraph\endcsname%
\let\thesubparagraph\xpg@save@thesubparagraph%
- }{}%
+ \fi%
}
\def\blockextras@urdu{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
index 028f7987e0d..9c33a8be580 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
@@ -1,10 +1,10 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for Upper Sorbian]
% We only provide this gloss for babel compatibility. Since usorbian is
% a sorbian variety, we use 'sorbian' with variant 'upper' now.
-\xpg@load@master@language{sorbian}
+\InheritGlossFile{sorbian}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
index 4d2c0bde96b..b96e21cda77 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-uyghur.ldf}[polyglossia: module for Uyghur]
%% Translations provided by Osman Tursun (Github Account: neouyghur)
@@ -22,62 +22,72 @@
\newif\if@uyghur@swapcaptions
\newif\if@uyghur@swapheadings
\newif\if@uyghur@swapheaders
-\define@choicekey*+{uyghur}{swapstrings}[\xpg@val\xpg@nr]{all,captions,headings,headers,hheaders,none}[all]{%
- \ifcase\xpg@nr\relax
- % all:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % captions:
- \@uyghur@swapcaptionstrue%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \or
- % headings:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheadersfalse%
- \or
- % headers:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheaderstrue%
- \or
- % hheaders:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingstrue%
- \@uyghur@swapheaderstrue%
- \or
- % none:
- \@uyghur@swapcaptionsfalse%
- \@uyghur@swapheadingsfalse%
- \@uyghur@swapheadersfalse%
- \fi
- \xpg@info{Option: Uyghur, swapstrings=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur swapstrings value `#1'}}
-
\newif\if@uyghur@ordchapter
\newif\if@uyghur@romchapter
-\define@choicekey*+{uyghur}{chapterformat}[\xpg@val\xpg@nr]{ordinal,roman,arabic}[ordinal]{%
- \ifcase\xpg@nr\relax
- % ordinal:
- \@uyghur@ordchaptertrue%
- \@uyghur@romchapterfalse%
- \or
- % roman:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchaptertrue%
- \or
- % arabic:
- \@uyghur@ordchapterfalse%
- \@uyghur@romchapterfalse%
- \fi
- \xpg@info{Option: Uyghur, chapterformat=\xpg@val}%
-}{\xpg@warning{Unknown Uyghur chapterformat value `#1'}}
+
+\DeclareKeys[polyglossia/gloss/uyghur]
+ {
+ chapterformat.choice:,
+ chapterformat / ordinal.code =
+ {%
+ \@uyghur@ordchaptertrue
+ \@uyghur@romchapterfalse
+ },
+ chapterformat / roman.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchaptertrue
+ },
+ chapterformat / arabic.code =
+ {%
+ \@uyghur@ordchapterfalse
+ \@uyghur@romchapterfalse
+ },
+ chapterformat.default:n = ordinal,
+ chapterformat/unknown.code = \xpg@warning{Unknown Uyghur chapterformat value `#1'},
+ swapstrings.choice:,
+ swapstrings / all.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / captions.code =
+ {%
+ \@uyghur@swapcaptionstrue
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headings.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings / headers.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / hheaders.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingstrue
+ \@uyghur@swapheaderstrue
+ },
+ swapstrings / none.code =
+ {%
+ \@uyghur@swapcaptionsfalse
+ \@uyghur@swapheadingsfalse
+ \@uyghur@swapheadersfalse
+ },
+ swapstrings.default:n = all,
+ swapstrings/unknown.code = \xpg@warning{Unknown Uyghur swapstrings value `#1'}
+ }
% Register default options
-\xpg@initialize@gloss@options{uyghur}{swapstrings=all,chapterformat=ordinal}
+\InitializeGlossOptions{uyghur}{swapstrings=all,chapterformat=ordinal}
\def\captionsuyghur{%
@@ -125,120 +135,104 @@
% change chapter and part headings
\if@uyghur@swapheadings
% With titlesec
- \ifcsdef{titleformat}{%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }
- \ifcsdef{chapter}{%
- \titleformat\chapter[display]%
- {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
- {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
+ \@ifundefined{titleformat}{%
% With KOMA
- \ifcsdef{sectionformat}{%
- \ifcsdef{partformat}{%
- \let\xpg@save@part@format\partformat%
- \renewcommand{\partformat}{\the@uyghur@part~\partname}%
- }{}%
- \ifcsdef{chapterformat}{%
- \let\xpg@save@chap@format\chapterformat%
- \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
- \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
- }{}%
- }{% (not \ifdefined\sectionformat)
+ \@ifundefined{sectionformat}{%
% With memoir
- \ifcsdef{@memptsize}{%
- \ifcsdef{@makechapterhead}{%
- \let\xpg@save@chap@format\@makechapterhead%
- \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
- {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
- {}%
- {\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
- {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
- {}%
- {\xpg@warning{Failed to patch part for Uyghur}}%
- }{}%
- }%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{@makechapterhead}{%
+ \@ifundefined{@makechapterhead}{}{%
\let\xpg@save@chap@format\@makechapterhead%
\patchcmd{\@makechapterhead}%
{\@chapapp\space \thechapter}%
{\the@uyghur@chapter\space \@chapapp}%
{}%
{\xpg@warning{Failed to patch chapter for Uyghur}}%
- }{}%
- \ifcsdef{H@old@part}{% Hyperref
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\@ifundefined{part}{}{\xpg@warning{Failed to patch part for Uyghur}}}%
+ }% (end \ifdefined\@part)
+ }{% Hyperref
\let\xpg@save@part@format\H@old@part%
\patchcmd{\H@old@part}%
{\partname\nobreakspace\thepart}%
{\the@uyghur@part\nobreakspace\partname}%
{}%
{\xpg@warning{Failed to patch part for Uyghur}}%
- }{% not hyperref
- \ifcsdef{@part}{%
- \let\xpg@save@part@format\@part%
- \patchcmd{\@part}%
- {\partname\nobreakspace\thepart}%
- {\the@uyghur@part\nobreakspace\partname}%
- {}%
- {\ifcsdef{part}{\xpg@warning{Failed to patch part for Uyghur}}{}}%
- }{}% (end \ifdefined\@part)
}% (end not hyperref)
- }% (end \ifdefined\@memptsize)
- }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\@memptsize)
+ \@ifundefined{@makechapterhead}{}{%
+ \let\xpg@save@chap@format\@makechapterhead%
+ \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+ {\chapnumfont\the@uyghur@chapter\chapternamenum\printchaptername}%
+ {}%
+ {\xpg@warning{Failed to patch chapter for Uyghur}}%
+ }%
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
+ {\chapnumfont\the@uyghur@part\partnamenum\printpartname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\sectionformat)
+ \@ifundefined{partformat}{}{%
+ \let\xpg@save@part@format\partformat%
+ \renewcommand{\partformat}{\the@uyghur@part~\partname}%
+ }%
+ \@ifundefined{chapterformat}{}{%
+ \let\xpg@save@chap@format\chapterformat%
+ \renewcommand{\chapterformat}{\mbox{\the@uyghur@chapter%
+ \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
+ \@ifundefined{H@old@part}{% not hyperref
+ \@ifundefined{@part}{}{%
+ \let\xpg@save@part@format\@part%
+ \patchcmd{\@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ }{% Hyperref
+ \let\xpg@save@part@format\H@old@part%
+ \patchcmd{\H@old@part}%
+ {\partname\nobreakspace\thepart}%
+ {\the@uyghur@part\nobreakspace\partname}%
+ {}%
+ {\xpg@warning{Failed to patch part for Uyghur}}%
+ }%
+ \@ifundefined{chapter}{}{%
+ \titleformat\chapter[display]%
+ {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+ {\the@uyghur@chapter\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+ }%
}% (end \ifdefined\titleformat)
\fi% (end \if@uyghur@swapheadings)
%
% Change running headers
\if@uyghur@swapheaders
- \ifcsdef{chapterformat}{%
- % With KOMA
- \let\xpg@save@chaptermark@format\chaptermarkformat%
- \renewcommand*\chaptermarkformat{%
- \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
- }{% (not \ifdefined\chapterformat)
- \ifcsdef{@memptsize}{%
- % With memoir
- \let\xpg@save@chaptermark@format\chaptermark%
- \renewcommand*\chaptermark[1]{%
- \markboth{\memUChead{%
- \ifnum \c@secnumdepth >\m@ne
- \ifbool{@mainmatter}{%
- \the@uyghur@chapter\ \@chapapp\ %
- }{}%
- \fi
- ##1}}{}}%
- }{% (not \ifdefined\@memptsize)
+ \@ifundefined{chapterformat}{%
+ \@ifundefined{@memptsize}{%
% With standard classes
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermark}{}{%
\ifpatchable{\chaptermark}%
{\@chapapp\ \thechapter.}%
{\let\xpg@save@chaptermark@format\chaptermark%
@@ -248,21 +242,38 @@
{}%
{\xpg@warning{Failed to patch chaptermark for Uyghur}}}%
{}%
- }{}% (end \ifdefined\sectionmark)
- \ifcsdef{sectionmark}{%
- \ifpatchable{\sectionmark}%
- {\thesection.}%
- {\let\xpg@save@sectionmark@format\sectionmark%
- \patchcmd{\sectionmark}%
- {\thesection.}%
- {\thesection}%
- {}%
- {\xpg@warning{Failed to patch sectionmark for Uyghur}}}%
- {}%
- }{}% (end \ifdefined\chaptermark)
+ }% (end \ifdefined\sectionmark)
+ \@ifundefined{sectionmark}{}{%
+ \ifpatchable{\sectionmark}%
+ {\thesection.}%
+ {\let\xpg@save@sectionmark@format\sectionmark%
+ \patchcmd{\sectionmark}%
+ {\thesection.}%
+ {\thesection}%
+ {}%
+ {\xpg@warning{Failed to patch sectionmark for Uyghur}}%
+ }%
+ {}%
+ }% (end \ifdefined\chaptermark)
+ }{% (\ifdefined\@memptsize)
+ % With memoir
+ \let\xpg@save@chaptermark@format\chaptermark%
+ \renewcommand*\chaptermark[1]{%
+ \markboth{\memUChead{%
+ \ifnum \c@secnumdepth >\m@ne
+ \ifbool{@mainmatter}{%
+ \the@uyghur@chapter\ \@chapapp\ %
+ }{}%
+ \fi
+ ##1}}{}}%
}% (end \ifdefined\@memptsize)
+ }{% (\ifdefined\chapterformat)
+ % With KOMA
+ \let\xpg@save@chaptermark@format\chaptermarkformat%
+ \renewcommand*\chaptermarkformat{%
+ \the@uyghur@chapter\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
}% (end \ifdefined\chapterformat)
- \fi% (end \if@uyghur@swapheaders)
+ \fi% (end \if@uyghur@swapheaders)
}
\def\nouyghur@capsformat{%
@@ -272,62 +283,62 @@
\let\fnum@figure\xpg@save@fnum@figure%
%
% Reset chapter and part heading
- \ifcsdef{titleformat}{%
+ \@ifundefined{titleformat}{%
+ \@ifundefined{sectionformat}{%
+ % With memoir and standard classes
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
+ \let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
+ }%
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\@makechapterhead\xpg@save@chap@format
+ }%
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@part@format}{}{%
+ \let\partformat\xpg@save@part@format
+ }%
+ \@ifundefined{xpg@save@chap@format}{}{%
+ \let\chapterformat\xpg@save@chap@format
+ }%
+ }% (end \ifdefined\sectionformat)
+ }{% (\ifdefined\titleformat)
% With titlesec
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
+ \@ifundefined{xpg@save@part@format}{}{%
+ \@ifundefined{H@old@part}{%
\let\@part\xpg@save@part@format%
+ }{%
+ \let\H@old@part\xpg@save@part@format%
}%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\titleformat\chapter[display]%
{\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
{\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
- }{}%
- }{% (not \ifdefined\titleformat)
- \ifcsdef{sectionformat}{%
- % With KOMA
- \ifcsdef{xpg@save@part@format}{%
- \let\partformat\xpg@save@part@format
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\chapterformat\xpg@save@chap@format
- }{}%
- }{%
- % With memoir and standard classes
- \ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
- }{%
- \let\@part\xpg@save@part@format%
- }%
- }{}%
- \ifcsdef{xpg@save@chap@format}{%
- \let\@makechapterhead\xpg@save@chap@format
- }{}%
- }% (end \ifdefined\sectionformat)
+ }%
}% (end \ifdefined\titleformat)
%
% Reset headers
- \ifcsdef{chaptermarkformat}{%
- % With KOMA
- \ifcsdef{xpg@save@chaptermark@format}{%
- \let\chaptermarkformat\xpg@save@chaptermark@format%
- }{}%
- }{%
- \ifcsdef{chaptermark}{%
+ \@ifundefined{chaptermarkformat}{%
+ \@ifundefined{chaptermark}{}{%
% With memoir and standard classes
- \ifcsdef{xpg@save@chaptermark@format}{%
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
\let\chaptermark\xpg@save@chaptermark@format%
- }{}%
- }{}% (end \ifdefined\chaptermark)
- \ifcsdef{sectionmark}{%
- \ifcsdef{xpg@save@sectionmark@format}{%
+ }%
+ }% (end \ifdefined\chaptermark)
+ \@ifundefined{sectionmark}{}{%
+ \@ifundefined{xpg@save@sectionmark@format}{}{%
\let\sectionmark\xpg@save@sectionmark@format%
- }{}%
- }{}% (end \ifdefined\sectionmark)
+ }%
+ }% (end \ifdefined\sectionmark)
+ }{%
+ % With KOMA
+ \@ifundefined{xpg@save@chaptermark@format}{}{%
+ \let\chaptermarkformat\xpg@save@chaptermark@format%
+ }%
}% (end \ifdefined\chapterformat)
}
@@ -363,22 +374,22 @@
\let\the@uyghur@chapter\thechapter
\def\uyghur@chapterformat{%
- \ifcsdef{part}{%
+ \@ifundefined{part}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@part}{\uyghurord{part}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@part}{\Roman{part}}%
\fi%
- }{}%
- \ifcsdef{chapter}{%
+ }%
+ \@ifundefined{chapter}{}{%
\if@uyghur@ordchapter%
\renewcommand{\the@uyghur@chapter}{\uyghurord{chapter}}%
\fi%
\if@uyghur@romchapter%
\renewcommand{\the@uyghur@chapter}{\Roman{chapter}}%
\fi%
- }{}%
+ }%
}
\def\uyghur@numbers{%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
index d223d38d3a2..3689b48112f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for Vietnamese]
%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
index 5b68cfa9d9c..81174769141 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for Welsh]
@@ -15,21 +15,26 @@
% BCP-47 compliant aliases
\setlanguagealias*{welsh}{cy}
-\providebool{welsh@formaldate}
+\@ifundefined{ifwelsh@formaldate}%
+ {\newif\ifwelsh@formaldate}{}
-\define@choicekey*+{welsh}{date}[\xpg@val\xpg@nr]{long,short}[short]{%
- \ifcase\xpg@nr\relax
- % long:
- \welsh@formaldatetrue
- \or
- % accented:
- \welsh@formaldatefalse
- \fi
- \xpg@info{Option: Welsh, date=\xpg@val}%
-}{\xpg@warning{Unknown date value `#1'}}
+\DeclareKeys[polyglossia/gloss/welsh]
+ {
+ date.choice:,
+ date / long.code =
+ {%
+ \welsh@formaldatetrue
+ },
+ date / short.code =
+ {%
+ \welsh@formaldatefalse
+ },
+ date.default:n = short,
+ date/unknown.code = \xpg@warning{Unknown date value `#1'},
+ }
% Register default options
-\xpg@initialize@gloss@options{welsh}{date=short}
+\InitializeGlossOptions{welsh}{date=short}
\def\captionswelsh{%
\def\refname{Cyfeiriadau}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
index 13a85e1f67e..2e99abca24d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-CN.ldf}[polyglossia: module for zh-CN (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
index 10792a0d386..0b907e2a4e1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
@@ -1,9 +1,9 @@
-% Language definition file (part of polyglossia v2.1 -- 2024/03/07)
+% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
%
\ProvidesFile{gloss-zh-TW.ldf}[polyglossia: module for zh-TW (Chinese)]
% We provide this as a bcp47-compliant alias
-\xpg@load@master@language{chinese}
+\InheritGlossFile{chinese}
\endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
index c949624724e..679d2bfe6dd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
@@ -73,7 +73,7 @@
\ifnum#1<5000
\Hebrewnumeral{#1}%
\else
- \ifnum#1<6000 % current millenium, print without thousands
+ \ifnum#1<6000 % current millennium, print without thousands
\@tempcnta=#1\relax
\if@xpg@hebrew@fullyear\else\advance\@tempcnta by -5000\fi
\Hebrewnumeral{\@tempcnta}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty b/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
index 79da8d0020b..2d396f5f71c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/hijrical.sty
@@ -16,7 +16,7 @@ l3calc. Please update expl3!
\@ifundefined{@Remainder}{\input{cal-util.def}}{}
%% The following functions are straightforward implementation
-%% of Reingold & Dershowitz, Calendrical Calculations, The Millenium Edition
+%% of Reingold & Dershowitz, Calendrical Calculations, The Millennium Edition
%%
\def\@FixedFromHijri#1#2#3#4{% year,month,day,counter
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
index 59ec736b49d..7102dc0cf37 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-korean.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
@@ -1,6 +1,6 @@
--
--- polyglossia-korean.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- polyglossia-cjk-spacing.lua
+-- part of polyglossia v2.2 -- 2024/07/15
--
local glyph_id = node.id"glyph"
@@ -8,13 +8,17 @@ local hbox_id = node.id"hlist"
local vbox_id = node.id"vlist"
local glue_id = node.id"glue"
local penalty_id = node.id"penalty"
-local disc_id = node.id"disc"
+local whatsit_id = node.id"whatsit"
+local math_id = node.id"math"
--
--- attr_korean: variant = plain (0), classic (1), modern (2)
+-- attr_cjk: variant = plain: 0, JP/classic: 1, KR/modern: 2, SC: 3, TC: 4
--
-local attr_korean = luatexbase.attributes["xpg@attr@korean"]
-local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
+local attr_cjk = luatexbase.attributes["xpg@attr@cjkspacing"]
+--
+-- attr_josa: ONLY For Korean. DO NOT declare \newattribute for other langs
+--
+local attr_josa = luatexbase.attributes["xpg@attr@autojosa"]
--
-- characters after which linebreak is not allowed
@@ -63,9 +67,9 @@ local nobr_after = {
-- characters before which linebreak is not allowed
-- (currently, not much differences among the followings)
-- 1: normal chars
--- 2: hangul jamo vowels and trailing consonants
+-- 2: hangul jamo vowels and trailing consonants plus combinings
-- 3: kana small letters
--- 0: dashes (supress visible spacing)
+-- 0: dashes (suppress visible spacing after this char)
--
local nobr_before = setmetatable({
[0x21] = 1, -- ! EXCLAMATION MARK
@@ -76,7 +80,7 @@ local nobr_before = setmetatable({
[0x2D] = 0, -- - HYPHEN-MINUS
[0x2E] = 1, -- . FULL STOP
[0x2F] = 0, -- / SOLIDUS
- [0x3A] = 0, -- : COLON
+ [0x3A] = 1, -- : COLON
[0x3B] = 1, -- ; SEMICOLON
[0x3E] = 1, -- > GREATER-THAN SIGN
[0x3F] = 1, -- ? QUESTION MARK
@@ -88,11 +92,11 @@ local nobr_before = setmetatable({
[0xBB] = 1, -- » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
[0x2013] = 0, -- – EN DASH
[0x2014] = 0, -- — EM DASH
- [0x2015] = 1, -- ― HORIZONTAL BAR
+ [0x2015] = 0, -- ― HORIZONTAL BAR
[0x2019] = 1, -- ’ RIGHT SINGLE QUOTATION MARK
[0x201D] = 1, -- †RIGHT DOUBLE QUOTATION MARK
- [0x2025] = 1, -- ‥ TWO DOT LEADER
- [0x2026] = 1, -- … HORIZONTAL ELLIPSIS
+ [0x2025] = 0, -- ‥ TWO DOT LEADER
+ [0x2026] = 0, -- … HORIZONTAL ELLIPSIS
[0x232A] = 1, -- 〉 RIGHT-POINTING ANGLE BRACKET
[0x3001] = 1, -- 〠IDEOGRAPHIC COMMA
[0x3002] = 1, -- 。 IDEOGRAPHIC FULL STOP
@@ -124,10 +128,10 @@ local nobr_before = setmetatable({
[0x308E] = 3, -- ã‚Ž HIRAGANA LETTER SMALL WA
[0x3095] = 3, -- ã‚• HIRAGANA LETTER SMALL KA
[0x3096] = 3, -- ã‚– HIRAGANA LETTER SMALL KE
- [0x3099] = 1, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309A] = 1, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
- [0x309B] = 1, -- ã‚› KATAKANA-HIRAGANA VOICED SOUND MARK
- [0x309C] = 1, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x3099] = 2, -- COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309A] = 2, -- COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+ [0x309B] = 2, -- ã‚› KATAKANA-HIRAGANA VOICED SOUND MARK
+ [0x309C] = 2, -- ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
[0x309D] = 1, -- ã‚ HIRAGANA ITERATION MARK
[0x309E] = 1, -- ã‚ž HIRAGANA VOICED ITERATION MARK
[0x30A0] = 1, -- ã‚  KATAKANA-HIRAGANA DOUBLE HYPHEN
@@ -147,9 +151,9 @@ local nobr_before = setmetatable({
[0x30FC] = 1, -- ー KATAKANA-HIRAGANA PROLONGED SOUND MARK
[0x30FD] = 1, -- ヽ KATAKANA ITERATION MARK
[0x30FE] = 1, -- ヾ KATAKANA VOICED ITERATION MARK
- [0xFE30] = 1, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
- [0xFE31] = 1, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
- [0xFE32] = 1, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
+ [0xFE30] = 0, -- ︰ PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+ [0xFE31] = 0, -- ︱ PRESENTATION FORM FOR VERTICAL EM DASH
+ [0xFE32] = 0, -- ︲ PRESENTATION FORM FOR VERTICAL EN DASH
[0xFE36] = 1, -- ︶ PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
[0xFE38] = 1, -- ︸ PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
[0xFE3A] = 1, -- ︺ PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
@@ -176,18 +180,18 @@ local nobr_before = setmetatable({
[0xFF63] = 1, -- ï½£ HALFWIDTH RIGHT CORNER BRACKET
[0xFF64] = 1, -- 、 HALFWIDTH IDEOGRAPHIC COMMA
[0xFF65] = 1, -- ï½¥ HALFWIDTH KATAKANA MIDDLE DOT
- [0xFF9E] = 1, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
- [0xFF9F] = 1, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+ [0xFF9E] = 2, -- ゙ HALFWIDTH KATAKANA VOICED SOUND MARK
+ [0xFF9F] = 2, -- ゚ HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
}, { __index = function(_,c)
if c >= 0x1160 and c <= 0x11FF then return 2 end
if c >= 0xD7B0 and c <= 0xD7FF then return 2 end
- if c >= 0x302A and c <= 0x302F then return 1 end
+ if c >= 0x302A and c <= 0x302F then return 2 end -- tone marks
if c >= 0x31F0 and c <= 0x31FF then return 3 end
if c >= 0xFF67 and c <= 0xFF70 then return 3 end
- if c >= 0xFE00 and c <= 0xFE0F then return 1 end
+ if c >= 0xFE00 and c <= 0xFE0F then return 2 end -- variation selectors
if c >= 0xFE10 and c <= 0xFE19 and not (c == 0xFE17) then return 1 end
if c >= 0xFE50 and c <= 0xFE58 then return 1 end
- if c >= 0xE0100 and c <= 0xE01EF then return 1 end
+ if c >= 0xE0100 and c <= 0xE01EF then return 2 end -- variation selecters
end
})
@@ -205,6 +209,7 @@ local function is_cjk (c)
or c >= 0xFF00 and c <= 0xFFEF
or c >= 0x1F100 and c <= 0x1F2FF
or c >= 0x20000 and c <= 0x2FA1F
+ or c >= 0x30000 and c <= 0x323AF
or nobr_after[c] and c > 0x2014
or nobr_before[c] and c > 0x2014
end
@@ -244,8 +249,28 @@ local charclass = setmetatable({
}, { __index = function() return 0 end })
--
+-- get character class
+-- var : variant = plain, JP/classic, KR/modern, SC, TC
+-- c : codepoint
+--
+local function get_charclass (var, c)
+ if var < 3 then
+ return charclass[c]
+ elseif var == 3 then
+ -- SC : these are left aligned
+ return (c == 0xFF01 or c == 0xFF1F) and 4 -- FULLWIDTH EXCLAMATION/QUESTION MARK
+ or (c == 0xFF1A or c == 0xFF1B) and 2 -- FULLWIDTH COLON/SEMICOLON
+ or charclass[c]
+ end
+ -- TC : these are center aligned
+ return (c == 0x3001 or c == 0xFF0C) and 3 -- IDEOGRAPHIC/FULLWIDTH COMMA
+ or (c == 0x3002 or c == 0xFF0E) and 3 -- IDEOGRAPHIC/FULLWIDTH FULL STOP -- 5 ?
+ or charclass[c]
+end
+
+--
-- table for spacing between char classes
--- 1 stands for 0.5*fontsize when variant=classic
+-- 1 stands for 0.5*fontsize when variant = JP/classic or SC or TC
--
local intercharclass = { [0] =
{ [0] = nil, {1,1}, nil, {.5,.5} },
@@ -277,7 +302,7 @@ end
--
-- return 0.5*fontsize of given fontid
--- space: true if variant=modern; then 0.5*interword_space
+-- space: true if variant=KR/modern; then 0.5*interword_space
--
local function get_font_size (fid, space)
local size = font.getparameters(fid)
@@ -291,7 +316,7 @@ end
--
-- charclass 1 thru 4 will be packed in \hbox to 0.5em{\hss? curr \hss?}
--- when variant=classic/modern
+-- when variant ~= plain
--
local function glyph_to_box (head, curr, class)
local g, h = curr
@@ -320,7 +345,7 @@ end
--
-- insert spacing defined as charclass[a][b] between a and b
-- f: fontid
--- var: variant = plain, classic, modern
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
-- cc: charclass of current char
-- nc: charclass of next char
-- nobr: linebreak is not allowed
@@ -339,12 +364,16 @@ end
--
-- insert inter-character spacing in other normal cases
--- f: fontid
--- var: variant = plain, classic, modern
--- x: true between cjk and non-cjk (a little more spacing)
+-- f: fontid
+-- var: variant = plain, JP/classic, KR/modern, SC, TC
+-- nobr: no linebreak
+-- x: true between cjk and non-cjk (a little more spacing)
--
-local function insert_penalty_glue (head, curr, f, var, x)
- if var ~= 1 then
+local function insert_penalty_glue (head, curr, f, var, nobr, x)
+ if nobr then
+ local penalty = get_new_penalty(10000)
+ head, curr = node.insert_after(head, curr, penalty)
+ elseif var == 0 or var == 2 then
local penalty = get_new_penalty(50)
head, curr = node.insert_after(head, curr, penalty)
end
@@ -360,53 +389,64 @@ end
--
-- main process for linebreak and inter-character spacing
--- lb: true if pre_linebreak_filter
--
-local function korean_break (head, lb)
+local function cjk_break (head)
local curr = head
while curr do
- if curr.id == glyph_id then
- local var = node.has_attribute(curr, attr_korean)
+ if attr_cjk and (curr.id == glyph_id or curr.id == math_id and curr.subtype == 1) then
+ local var = node.has_attribute(curr, attr_cjk)
if var then
- local c, f = curr.char or 0, curr.font or 0
- local cc, cjkc = charclass[c], is_cjk(c)
+ local c, f = curr.char or 0, curr.font
+ local cc, cjkc = get_charclass(var, c), is_cjk(c)
-- compress cjk punctuations when charclass is 1 thru 4
if var > 0 and cc > 0 and cc < 5 then
head, curr = glyph_to_box(head, curr, cc)
end
- local next = curr.next
- if next and next.id == glyph_id then
+ local next = node.getnext(curr)
+ while next and next.id == whatsit_id do -- skip whatsit nodes
+ curr, next = next, node.getnext(next)
+ end
+
+ if next and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
local n = next.char or 0
- local nc = charclass[n]
+ f = f or next.font or 0 -- in case of curr == math_off
+
+ -- skip combining. or dash+dash case to suppress stretching
+ if nobr_before[n] == 2 or (nobr_before[c] == 0 and nobr_before[n] == 0) then
+ goto skip_combining
+ end
+
+ local nc = get_charclass(var, n)
local nobr = nobr_before[n] or nobr_after[c]
-- insert spacing as of intercharclass
if var > 0 and intercharclass[cc][nc] then
head, curr = insert_cjk_penalty_glue(head, curr, f, var, cc, nc, nobr)
- -- or insert spacing when linebreak is allowed
- elseif not nobr then
+ else
local cjkn = is_cjk(n)
-- if curr or next is cjk char
if cjkc or cjkn then
- -- if between cjk and non-cjk
- if var > 0 and not (cjkc and cjkn) and nobr_before[c] ~= 0 then
- head, curr = insert_penalty_glue(head, curr, f, var, true)
+ -- plain variant / cjk+cjk / nobr cjk+noncjk / after dash
+ -- : insert a 0pt glue
+ if var == 0 or (cjkc and cjkn) or nobr or nobr_before[c] == 0 then
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr)
- -- or under pre_linebreak_filter
- elseif lb then
- head, curr = insert_penalty_glue(head, curr, f, var)
+ -- other cases: insert a small glue
+ else
+ head, curr = insert_penalty_glue(head, curr, f, var, nobr, true)
end
end
end
end
end
end
- curr = curr.next
+ ::skip_combining::
+ curr = node.getnext(curr)
end
return head
end
@@ -420,7 +460,7 @@ end
local function reorder_tm (head)
local curr, tone = node.slide(head)
while curr do
- if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
+ if curr.id == glyph_id and node.has_attribute(curr, attr_cjk) then
local f = font.getfont(curr.font) or font.fonts[curr.font]
if f and f.hb then -- harfbuzz do the right thing
tone = nil
@@ -436,7 +476,7 @@ local function reorder_tm (head)
end
end
end
- curr = curr.prev
+ curr = node.getprev(curr)
end
return head
end
@@ -523,7 +563,7 @@ local function get_prev_char (p)
local pc = get_prev_char(node.slide(p.head))
if pc then return pc end
end
- p = p.prev
+ p = node.getprev(p)
end
end
@@ -538,10 +578,10 @@ local function auto_josa (head)
if josa then
local cc = curr.char or 0
if josa == 0 then
- josa = josa_code[get_prev_char(curr.prev) or 0x30]
+ josa = josa_code[get_prev_char(node.getprev(curr)) or 0x30]
end
if cc == 0xC774 then
- local n = curr.next
+ local n = node.getnext(curr)
if n and n.char and n.char >= 0xAC00 and n.char <= 0xD7A3 then
else
cc = 0xAC00
@@ -560,7 +600,7 @@ local function auto_josa (head)
node.unset_attribute(curr, attr_josa)
end
end
- curr = curr.next
+ curr = node.getnext(curr)
end
for _,v in ipairs(tofree) do node.free(v) end
return head
@@ -571,39 +611,13 @@ end
-- As char value of glyphs can be changed by opentype GSUB process,
-- we have to occupy the first position among callback functions.
--
-local prepend_to_callback
-if luatexbase.base_add_to_callback then
- prepend_to_callback = function(name, func, desc)
- luatexbase.add_to_callback(name, func, desc, 1)
- end
-else
- prepend_to_callback = function(name, func, desc)
- local t = { {func, desc} }
- for _,v in ipairs(luatexbase.callback_descriptions(name)) do
- table.insert(t, {luatexbase.remove_from_callback(name, v)})
- end
- for _,v in ipairs(t) do
- luatexbase.add_to_callback(name, v[1], v[2])
- end
- end
-end
-
-prepend_to_callback ("pre_linebreak_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head, true)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
-
-prepend_to_callback ("hpack_filter",
- function(head)
- head = auto_josa(head)
- head = korean_break(head)
- head = reorder_tm(head)
- return head
- end,
- "polyglossia.lang_korean")
+luatexbase.add_to_callback( "pre_shaping_filter",
+function(head)
+ if attr_josa then head = auto_josa(head) end
+ head = cjk_break(head)
+ if attr_josa then head = reorder_tm(head) end
+ return head
+end,
+"polyglossia.lang_cjk_spacing")
-- vim:ft=lua:tw=0:sw=4:ts=4:expandtab
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
index c2a1a27bebe..d0257e93720 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
index 982f6ba8d4f..844d11cb5ac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-latin.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-latin.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
index 99e538b1613..d8cfa89e5fa 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
@@ -1,13 +1,12 @@
--
-- polyglossia-punct.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
-local remove_from_callback = luatexbase.remove_from_callback
-local priority_in_callback = luatexbase.priority_in_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local new_attribute = luatexbase.new_attribute
local node = node
@@ -331,13 +330,16 @@ local function activate(lang)
-- important to be able to intermix languages with different spacings
-- in one paragraph.
tex.setattribute(punct_attr, id)
- for _, callback_name in ipairs{ "pre_linebreak_filter", "hpack_filter" } do
- if not priority_in_callback(callback_name, "polyglossia-punct.process") then
- add_to_callback(callback_name, process, "polyglossia-punct.process", 1)
- end
- end
end
+add_to_callback("pre_linebreak_filter",process,"polyglossia-punct.process")
+add_to_callback("hpack_filter",process,"polyglossia-punct.process")
+declare_callback_rule("pre_linebreak_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+declare_callback_rule("hpack_filter",
+ "polyglossia-punct.process", "before", "luaotfload.node_processor")
+
+
local function deactivate()
tex.setattribute(punct_attr, -0x7FFFFFFF) -- this value means "unset"
-- Though it would make compilation slightly faster, it is not possible to
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
index 61b891ac283..7a2b84270db 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-sanskrit.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia-punct')
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
index 8247e2deb33..d51a594de3f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
@@ -1,30 +1,28 @@
--
-- polyglossia-tibt.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
local remove_from_callback = luatexbase.remove_from_callback
+local declare_callback_rule = luatexbase.declare_callback_rule
local priority_in_callback = luatexbase.priority_in_callback
local next, type = next, type
-
-local nodes, fonts, node = nodes, fonts, node
-
-local nodecodes = nodes.nodecodes --- <= preloaded node.types()
+local node = node
local insert_node_before = node.insert_before
local insert_node_after = node.insert_after
-local remove_node = nodes.remove
+local remove_node = node.remove
local copy_node = node.copy
local has_attribute = node.has_attribute
local end_of_math = node.end_of_math
if not end_of_math then -- luatex < .76
local traverse_nodes = node.traverse_id
- local math_code = nodecodes.math
+ local math_code = node.id('math_char')
local end_of_math = function (n)
for n in traverse_nodes(math_code, n.next) do
return n
@@ -32,10 +30,10 @@ if not end_of_math then -- luatex < .76
end
end
--- node types as of April 2013
-local glyph_code = nodecodes.glyph
-local penalty_code = nodecodes.penalty
-local kern_code = nodecodes.kern
+-- node types as of April 2024
+local glyph_code = node.id('glyph')
+local penalty_code = node.id('penalty')
+local kern_code = node.id('kern')
-- we make a new node, so that we can copy it later on
local penalty_node = node.new(penalty_code)
@@ -66,7 +64,6 @@ local function process(head)
end
end
elseif id == math_code then
- -- warning: this is a feature of luatex > 0.76
start = end_of_math(start) -- weird, can return nil .. no math end?
end
if start then
@@ -79,15 +76,13 @@ end
local callback_name = "pre_linebreak_filter"
local function activate()
- if not priority_in_callback (callback_name, "polyglossia-tibt.process") then
- add_to_callback(callback_name, process, "polyglossia-tibt.process", 1)
- end
+ add_to_callback(callback_name, process, "polyglossia-tibt.process")
+ declare_callback_rule(callback_name,
+ "polyglossia-tibt.process", "before", "luaotfload.node_processor")
end
local function desactivate()
- if priority_in_callback (callback_name, "polyglossia-tibt.process") then
- remove_from_callback(callback_name, "polyglossia-tibt.process")
- end
+ remove_from_callback(callback_name, "polyglossia-tibt.process")
end
polyglossia.activate_tibt_eol = activate
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
index c07d8d9ac49..5f346bef767 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
@@ -1,6 +1,6 @@
--
-- polyglossia.lua
--- part of polyglossia v2.1 -- 2024/03/07
+-- part of polyglossia v2.2 -- 2024/07/15
--
local module_name = "polyglossia"
@@ -76,7 +76,7 @@ local function newloader(langentry)
end
-- language info will be written into the .log file
- local s = { "Language data for " .. langentry }
+ local s = { }
for k, v in pairs(langdata) do
if type(v) == 'table' then -- for 'synonyms'
s[#s+1] = k .. "\t" .. table.concat(v,',')
@@ -84,7 +84,10 @@ local function newloader(langentry)
s[#s+1] = k .. "\t" .. tostring(v)
end
end
- log_info(table.concat(s,"\n"))
+ local a = {}
+ for _,n in pairs(s) do table.insert(a, n) end
+ table.sort(a)
+ log_info("Language data for " .. langentry .. "\n" .. table.concat(a,"\n"))
--
-- LaTeX's \newlanguage increases language register (count19),
@@ -94,7 +97,7 @@ local function newloader(langentry)
-- this possible situation, our newloader() function will
-- unfortunately overwrite the language \lang@xyz.
--
- -- Threfore here we will compare LaTeX's \newlanguage number with
+ -- Therefore here we will compare LaTeX's \newlanguage number with
-- LuaTeX's lang.new() id and select the bigger one for our new
-- language object. Also we will update LaTeX's language register
-- by this new id, so that another possible \newlanguage should not
@@ -109,7 +112,7 @@ local function newloader(langentry)
local newlangid = math.max(langcnt, langid)
-- set language register for possible \newlanguage
tex.setcount('global', lang_register, newlangid)
- -- get new lang object if needeed
+ -- get new lang object if needed
if langid ~= newlangid then
langobject = lang.new(newlangid)
end
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index 20f6538d448..a8d0c57b540 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
@@ -1,32 +1,27 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage
- {polyglossia} {2024/03/07} {v2.1}
+ {polyglossia} {2024/07/15} {v2.2}
{Modern multilingual typesetting with XeLaTeX and LuaLaTeX}
+% TODO Handle remaining uses in the gloss files (\patchcmd)
+% and remove package call afterwards
\RequirePackage{etoolbox}
-\RequirePackage{xkeyval}[2008/08/13]
% Will raise error if used with anything else than XeTeX or LuaTeX
\RequirePackage{fontspec}[2010/06/08]% v2.0
\RequirePackage{iftex}
\prg_generate_conditional_variant:Nnn \clist_if_in:Nn {Ne} {TF, T, F} % check if needed
-% correct a bug in tracklang
-\AddToHook{package/tracklang/after}{%
- \IfPackageAtLeastTF{tracklang}{2019/08/30}
- {}
- {\cs_gset_eq:NN \AddTrackedLangage \AddTrackedLanguage}
-}
-
%% The following is for compatibility with Babel-aware package:
% \languageshorthands is provided by babelsh.def, which is
% only loaded by some glosses, but some classes presuppose
% it is there generally. So let's provide a stub:
\ProvideDocumentCommand \languageshorthands { m } {}
% These have to be provided at the end of the preamble
-\AddToHook{begindocument/before}{
- \cs_gset_eq:NN \bbl@set@language \xpg@set@language@aux % for biblatex
- \cs_gset_eq:NN \bbl@main@language \xpg@main@language % for biblatex
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \cs_gset_eq:NN \bbl@set@language \xpg_set_language_aux:nn % for biblatex
+ \cs_gset_eq:NN \bbl@main@language \xpg_main_language_tl % for biblatex
\ProvideDocumentCommand \texorpdfstring { m m } { #1 } % dummy command if hyperref is not loaded
}
@@ -35,16 +30,15 @@
%% \l@nohyphenation is defined in polyglossia.lua
\sys_if_engine_luatex:TF
{
- \RequirePackage{luatexbase} % already included by fontspec, but needed here
- \RequireLuaModule{polyglossia}
+ \lua_load_module:n{polyglossia}
}{
\cs_if_free:cT { l@nohyphenation }
{ \chardef\l@nohyphenation=255 }
}
-% Which version of XeTeX do we use? What is the boudary class? 4095 or 255
+% Which version of XeTeX do we use? What is the boundary class? 4095 or 255
\cs_if_exist:cTF { e@alloc@intercharclass@top }
- { \let\xpg@boundaryclass=\e@alloc@intercharclass@top }
+ { \cs_gset_eq:NN \xpg@boundaryclass \e@alloc@intercharclass@top }
{ \chardef\xpg@boundaryclass=\@cclv }
% Useful for getting list of loaded languages and variants. Like babel's bbl@loaded
@@ -80,18 +74,18 @@
\cs_new_nopar:Nn \__xpg_at_begin_document:
{
% save various command
- \let\latin@alph\@alph % TODO rename when we have the C locale
- \let\latin@Alph\@Alph % TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@alph}{@alph}% TODO rename when we have the C locale
+ \cs_gset_eq:cc{latin@Alph}{@Alph}% TODO rename when we have the C locale
% push to C language gloss
- \let\polyglossia@Clang@@arabic\@arabic
- \let\polyglossia@Clang@arabic\arabic
+ \cs_gset_eq:cc{xpg_Clang_arabic}{@arabic}
\xpg_initial_setup:
% apply \familydefault changes
- \xpg@set@familydefault
+ \xpg_set_familydefault:
}
-\AddToHook{begindocument}{
+\hook_gput_code:nnn {begindocument} {.}
+{
\__xpg_at_begin_document:
}
@@ -99,7 +93,8 @@
% loaded after \set[main|other]language
% Track whether the main language has been set
\bool_new:N \g_xpg_main_lang_set_bool
-\AddToHook{begindocument/end}{
+\hook_gput_code:nnn {begindocument/end} {.}
+{
% now we have the C locale definition: select the language
\__xpg_at_begin_document_selectlanguage:
\bool_gset_true:N \g_xpg_main_lang_set_bool
@@ -107,99 +102,177 @@
\__xpg_at_begin_document_hyphenation:
}
-%% custom message macros
-\providecommand*{\xpg@error}[1]{
- \PackageError{polyglossia}{#1}{}
+%
+% MESSAGES
+%
+
+% message templates
+\msg_new:nnn { polyglossia } { general } { #1 }
+
+\msg_new:nnn { polyglossia } { languagenotloaded }
+{
+ The~ language~ #1~ is~ not~ loaded.~ You~ must~ load~ it~ in~ order~ to~ use~ it.
}
+\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\providecommand*{\xpg@warning}[1]{
- \PackageWarning{polyglossia}{#1}
+\msg_new:nnn { polyglossia } { languagenolongerloaded }
+{
+ The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
}
+\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\providecommand*{\xpg@info}[1]{
- \PackageInfo{polyglossia}
- {#1\@gobble}
-} %% the \@gobble is to prevent displaying the line nr
+\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+{
+ Unknown~ key~ "#1"~ in~ \string\localnumeral.
+}
-%TODO change all instances of \xpg@nopatterns in gloss-*.ldf files
-\providecommand*{\xpg@nopatterns@fallback}[2][nohyphenation]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#2'\MessageBreak
- I~ will~ use~ \string\language=\string\l@ #1\space instead}
- \expandafter\adddialect\csname l@#2\expandafter\endcsname\csname l@#1\endcsname\relax}
+\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+{
+ Keys~ of~ \string\localnumeral~ must~ have~ a~ value.
+}
-\providecommand*{\xpg@nopatterns}[1]{
- \xpg@warning{No~ hyphenation~ patterns~ were~ loaded~ for~ `#1'\MessageBreak
- I~ will~ use~ \string\language=\string\l@nohyphenation\space instead}
- %%TODO? \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+\msg_new:nnn { polyglossia } { illvalue }
+{
+ Illegal~ value~ (#1)~ for~ #2!
+}
-\def\xpg@ill@value#1#2{
- \xpg@warning{Illegal~ value~ (#1)~ for~ #2}}
+\msg_new:nnn { polyglossia } { illarg }
+{
+ Invalid~ argument~ (#1)~ for~ #2!
+}
-% error out if lang is not loaded
-\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+\msg_new:nnn { polyglossia } { nopatterns }
{
- \seq_if_in:NeF \__xpg_langs_loaded {#1}
- {
- \xpg@error{language~ #1~ is~ not~ loaded.~ Please~ load~ it~ before~ using~ it.}
- }
+ No~ hyphenation~ patterns~ were~ loaded~ for~ `#2' \iow_newline:
+ I~ will~ use~ \string\language=\string\l@ #1\space instead.
}
-\msg_new:nnn { polyglossia } { languagenotloaded }
+\msg_new:nnn { polyglossia } { undefcmd }
{
- The~ language~ #1~ is~ not~ loaded.~ You~ should~ load~ it.
+ \tl_to_str:N {#1} ~ is~ not~ defined!
}
-\msg_redirect_name:nnn { polyglossia } { languagenotloaded } { critical }
-\msg_new:nnn { polyglossia } { languagenolongerloaded }
+%% custom message macros
+\cs_new_nopar:Nn \xpg_error_msg:n
{
- The~ language~ #1~ is~ no~ longer~ loaded.~ Please~ rerun~ LaTeX.
+ \exp_args:Nnne \msg_error:nnn { polyglossia } { general } { #1 }
}
-\msg_redirect_name:nnn { polyglossia } { languagenolongerloaded } { warning }
-\msg_new:nnn { polyglossia } { unknownlocalnumeral }
+\cs_new_nopar:Nn \xpg_warning_msg:n
{
- Unknown~ key~ "#1"~ in~ \string\localnumeral.
+ \exp_args:Nnne \msg_warning:nnn { polyglossia } { general } { #1 }
}
-\msg_new:nnn { polyglossia } { localnumeralemptyvalue }
+\cs_new_nopar:Nn \xpg_info_msg:n
{
- Keys~ of~ \string\localnumeral~ must~ have~ value.
+ \exp_args:Nnne \msg_info:nnn { polyglossia } { general } { #1 }
}
+\cs_new_nopar:Nn \xpg_no_patterns_msg:n
+{
+ \msg_warning:nnnn { polyglossia } { nopatterns } { nohyphenation } { #1 }
+}
+
+\cs_new_nopar:Nn \xpg_ill_value_msg:nn
+{
+ \msg_warning:nnnn { polyglossia } { illvalue } { #1 } { #2 }
+}
+
+\cs_new_nopar:Nn \xpg_ill_arg_msg:nn
+{
+ \msg_error:nnnn { polyglossia } { illarg } { #1 } { #2 }
+}
+
+% error out if lang is not loaded
+\cs_new_nopar:Nn \xpg_error_if_lang_not_loaded:n
+{
+ \seq_if_in:NeF \__xpg_langs_loaded {#1}
+ {
+ \msg_error:nnn { polyglossia } { languagenotloaded } { #1 }
+ }
+}
%% use macro if defined, else warn that it is not
\cs_new_nopar:Nn \__xpg_use_or_warn:N
{
\cs_if_exist_use:NF {#1}
{
- \xpg@warning { \tl_to_str:N {#1} ~ is~ not~ defined }
+ \msg_error:nnn { polyglossia } { undefcmd } { #1 }
}
}
\cs_generate_variant:Nn \__xpg_use_or_warn:N {c}
+% gloss message interface
+\cs_set_eq:cc { xpg@error } { xpg_error_msg:n }
+\cs_set_eq:cc { xpg@warning } { xpg_warning_msg:n }
+\cs_set_eq:cc { xpg@info } { xpg_info_msg:n }
+\cs_set_eq:cc { xpg@ill@value } { xpg_ill_value_msg:nn }
+
+
+\NewDocumentCommand \XPGNoPatternsFallback { O{ nohyphenation } m }
+{
+ \msg_warning:nnnn { polyglossia } { nopatterns } { #1 } { #2 }
+ \exp_args:Ncc \adddialect {l@#2} {l@#1}
+}
+
+\NewDocumentCommand \CheckHyphenationPatterns { m }
+{
+ \xpg_if_language_defined:nF {#1}
+ {
+ \XPGNoPatternsFallback{#1}
+ }
+}
+
+%
+% END MESSAGES
+
%% ensure directionality if bidi is loaded, else ignore
-\def\@@ensure@dir#1{\ifcsundef{@ensure@dir}{#1}{\@ensure@dir{#1}}}
-\def\@@ensure@maindir#1{\ifcsundef{@ensure@maindir}{#1}{\@ensure@maindir{#1}}}
+%%% FIXME still used?
+\cs_new_nopar:Npn \@@ensure@dir #1
+{
+ \cs_if_exist_use:c{@ensure@dir}{#1}
+}
-%% Used by the language definitions files for right-to-left languages
-\NewDocumentCommand \RequireBidi {}
+\cs_new_nopar:Npn \@@ensure@maindir #1
+{
+ \cs_if_exist_use:c{@ensure@maindir}{#1}
+}
+
+% if we are in the document preamble run T else F
+\prg_set_conditional:Nnn \xpg_if_in_preamble: {T, F, TF}
{
- \sys_if_engine_luatex:TF
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{luabidi}\fi}
- {\ifx\@onlypreamble\@notprerr\else\RequirePackage{bidi}\fi}
+ \cs_if_eq:NNTF { \@onlypreamble } { \@notprerr }
+ {
+ \prg_return_false:
+ }
+ {
+ \prg_return_true:
+ }
}
-% if #1 is LR run #2 else #3
+%% Used by the language definitions files for right-to-left languages
+\DeclareDocumentCommand \RequireBidi {}
+ {
+ \xpg_if_in_preamble:T
+ {
+ \sys_if_engine_luatex:TF
+ { \RequirePackage{luabidi} }
+ { \RequirePackage{bidi} }
+ }
+ \DeclareDocumentCommand \RequireBidi {} {}
+ }
+
+% if #1 is LR run T else F
\prg_set_conditional:Nnn \__xpg_if_LR_str:n {p, T, F, TF}
{
- \str_case_e:nnF{#1}{
+ \str_case_e:nnF{#1}
+ {
{LR}{\prg_return_true:}
{RL}{\prg_return_false:}
}
{
- \xpg@error{Unknown~ direction~#1}
+ \xpg_error_msg:n {Unknown~ direction~#1}
\prg_return_false:
}
}
@@ -212,17 +285,18 @@
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
\cs_new_nopar:Nn \__xpg_set_text_direction:n
{
\__xpg_if_LR_str:nF {#1}
{
- \xpg@error{right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
+ \xpg_error_msg:n {right-to-left,~ but~ (lua)bidi~ package~ was~ not~ loaded!}
}
}
-\AddToHook{package/bidi/after}{
+\hook_gput_code:nnn {package/bidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -244,7 +318,8 @@
}
}
}
-\AddToHook{package/luabidi/after}{
+\hook_gput_code:nnn {package/luabidi/after} {.}
+{
\cs_gset_nopar:Nn \__xpg_set_par_direction:n
{
\__xpg_if_LR_str:nTF{#1}
@@ -273,13 +348,21 @@
{ \cs_new_nopar:Nn \__xpg_setRTLmain: { \@RTLmaintrue\setnonlatin } }
%% compatibility with babel
-\let\addto\gappto % gappto is defined in etoolbox
+\cs_set:Npn \addto #1 #2
+{
+ \cs_if_exist:NF { #1 }
+ { \cs_new:Npn { #1 } {} }
+ \tl_gput_right:Nn { #1 } { #2 }
+}
-%% NEW EXPERIMENTAL SETUP INTERFACE FOR GLOSS FILES
+%% SETUP INTERFACE FOR GLOSS FILES
%% options currently available:
%% language : the name of the language (as understood by fontspec)
%% hyphennames : the different hyphenation patterns to try (comma separated list)
-%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback, with \xpg@nopatterns@fallback - i.e. with a warning: e.g. sanskrit for hindi, or catalan for asturian. – Also for languages with variants! (English and German, etc.)
+%%% TODO: if pattern is prefixed by !, then it should be loaded as a fallback,
+%%%% with \CheckHyphenationPatterns - i.e. with a warning: e.g. sanskrit for hindi,
+%%%% or catalan for asturian. – Also for languages with variants!
+%%%% (English and German, etc.)
%% script : the name of the script (as understood by fontspec) – default is Latin
%% scripttag : the OpenType tag for the script
%% langtag : the OpenType tag for the language
@@ -287,19 +370,20 @@
%% frenchspacing : boolean
%% indentfirst : boolean
%% fontsetup : boolean
-%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have no concept of uppercase/lowercase)
+%% TODO: nouppercase : boolean (for scripts like Arabic, Devanagari, etc which have
+%% no concept of uppercase/lowercase)
%% TODO: localalph = {<alph_csname>,<Alph_csname>}
%% TODO: localnumeral = <csname>
%% or even better localdigits = {0123456789} for fully automatic setup
-\newcommand*\PolyglossiaSetup[2]{
+\NewDocumentCommand \PolyglossiaSetup { m m }
+{
\__xpg_keys_define_lang:n{#1}
\keys_set:nn { polyglossia / #1 } { #2 }
\__xpg_setup_hyphen:n {#1}
%define booleans etoolbox style and set defaults
%% TODO ? \providetoggle{#1@setup@done}%
- % we initialize these so that we can use \gappto below
- \csgdef{init@extras@#1}{}
- \csgdef{init@noextras@#1}{} % we don't use this yet: remove?
+ % we initialize this so that we can append below
+ \cs_gset:cpn {init@extras@#1} {}
% here we do the fontsetup:
\__xpg_auto_setupfont:n { #1 }
%% TODO? \toggletrue{#1@setup@done}
@@ -318,35 +402,41 @@
\clist_map_inline:nn { #1 } { \keys_set:nn { polyglossia / ##1 } { #2 } }
}
-
+\bool_new:N \l__xpg_have_hyphen_bool
% setup hyphennames from a str list of hyphen
\cs_new:Nn \__xpg_setup_hyphen:n
{
- \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphennames}}
- \providebool{havehyphen}
- \boolfalse{havehyphen}
+ \clist_set:Ne{\l_tmpa_clist}{\prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphennames}}
+ \bool_set_false:N \l__xpg_have_hyphen_bool
% for each hyphen in the set until we find one that works
- \clist_map_inline:Nn \l_tmpa_clist {
- \ifbool{havehyphen}{}{
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
% check if language hyphenname is defined
- \__xpg_check_if_exist_l@:nF{#1}{
+ \__xpg_pattern_check_if_exists:nF{#1}
+ {
% if not, first consider nohyphenation
\str_if_eq:nnTF{##1}{nohyphenation}
{
\cs_gset_eq:cc{l@#1}{l@##1}
- \global\booltrue{havehyphen}
- }{
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ {
% then test if hyphenation is defined
- \xpg@ifdefined{##1}{
+ \xpg_if_language_defined:nT {##1}
+ {
% test if language hyphenation is nohyphenation
- \cs_if_eq:cNF{l@#1}{\l@nohyphenation}{\global\booltrue{havehyphen}}{%
+ \cs_if_eq:cNTF{l@#1}{\l@nohyphenation}
+ { \bool_gset_true:N \l__xpg_have_hyphen_bool }
+ {
% if false define language to hyphenation if it is not equal...
\str_if_eq:nnF{#1}{##1}{\cs_gset_eq:cc{l@#1}{l@##1}}
% ...and load
- \xpg@set@hyphenation@patterns{##1}
- \global\booltrue{havehyphen}
- }
- }{}
+ \xpg_set_hyphenation_patterns:n {##1}
+ \bool_gset_true:N \l__xpg_have_hyphen_bool
+ }
+ }
}
}
}
@@ -354,19 +444,17 @@
% if l@#1 does not yet exist,
% we assign it to nohyphenation
% we do this here in case and if the hyphennames key was omitted
- \ifbool{havehyphen}{}{
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax
- }
+ \bool_if:NF \l__xpg_have_hyphen_bool
+ {
+ \CheckHyphenationPatterns{#1}
}
- \csdef{#1@language}{
- \polyglossia@setup@language@patterns{#1}
+ \cs_gset:cpn {#1@language}
+ {
+ \SetupPolyglossiaLangPatterns{#1}
}
% setup hyphenmins
\clist_set:Ne \l_tmpa_clist
- { \prop_item:Nn \g_xpg_langsetup_prop {#1 / hyphenmins} }
+ { \prop_item:Nn \l_xpg_langsetup_prop {#1 / hyphenmins} }
\cs_if_eq:cNF {l@#1} \l@nohyphenation
{
\use:x
@@ -378,7 +466,8 @@
}
}
-\newcommand*\polyglossia@setup@language@patterns[1]{
+\NewDocumentCommand \SetupPolyglossiaLangPatterns { m }
+{
\bool_if:NTF \g__xpg_hyphenation_disabled_bool
{
\tl_gset:Ne \g__xpg_lastlanguage_tl {\the\csname l@#1\endcsname}
@@ -392,32 +481,29 @@
\language=\l@nohyphenation
}
{
- \xpg@set@hyphenation@patterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
{
% Since this function is sometimes called from the gloss files
% directly, we need to check whether the requested hyphenname exists.
- \xpg@ifdefined{#1}{}
- {
- \xpg@nopatterns{#1}
- \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax%
- }
- \xpg@set@hyphenation@patterns{#1}
+ \CheckHyphenationPatterns{#1}
+ \xpg_set_hyphenation_patterns:n {#1}
}
}
}
-\prop_new:N \g_xpg_langsetup_prop
+\prop_new_linked:N \l_xpg_langsetup_prop
\cs_new_protected:Npn \__xpg_keys_define_lang:n #1
{
- \keys_define:nn {polyglossia}{
+ \keys_define:nn {polyglossia}
+ {
% the script font
#1 / script
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/script}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/lcscript}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lcscript}
{\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
},
#1 / script
@@ -426,84 +512,89 @@
.initial:n = latin,
% the opentype script tag
#1 / scripttag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/scripttag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/scripttag}{##1}},
#1 / scripttag
.default:n = {},
#1 / scripttag
.initial:n = {},
% the language full name
#1 / language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/language}{##1}},
#1 / language
.value_required:n = true,
#1 / language
.initial:x = {\str_uppercase:n#1},
% the language tag
#1 / langtag
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/langtag}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/langtag}{##1}},
#1 / langtag
.value_required:n = true,
#1 / langtag
.initial:n = {},
% the BCP-47 tag
#1 / bcp47
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47}{##1}},
#1 / bcp47
.value_required:n = true,
#1 / bcp47
.initial:n = {},
% the BCP-47 language tag
#1 / bcp47-language
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-language}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-language}{##1}},
#1 / bcp47-language
.value_required:n = true,
#1 / bcp47-language
.initial:n = {},
% the BCP-47 region tag
#1 / bcp47-region
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-region}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-region}{##1}},
#1 / bcp47-region
.value_required:n = false,
#1 / bcp47-region
.initial:n = {},
% the BCP-47 script tag
#1 / bcp47-script
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-script}{##1}},
+ .code:n =
+ {
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-script}{##1}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/lc-bcp47-script}
+ {\tl_if_empty:nF{##1}{\str_lowercase:n{##1}}}
+ },
#1 / bcp47-script
.value_required:n = true,
#1 / bcp47-script
- .initial:n = {},
+ .initial:n = {Latn},
% the BCP-47 variant tag
#1 / bcp47-variant
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-variant}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-variant}{##1}},
#1 / bcp47-variant
.value_required:n = false,
#1 / bcp47-variant
.initial:n = {},
% the BCP-47 extension-t tag
#1 / bcp47-extension-t
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-t}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-t}{##1}},
#1 / bcp47-extension-t
.value_required:n = false,
#1 / bcp47-extension-t
.initial:n = {},
% the BCP-47 extension-u tag
#1 / bcp47-extension-u
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-u}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-u}{##1}},
#1 / bcp47-extension-u
.value_required:n = false,
#1 / bcp47-extension-u
.initial:n = {},
% the BCP-47 extension-x tag
#1 / bcp47-extension-x
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-extension-x}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-extension-x}{##1}},
#1 / bcp47-extension-x
.value_required:n = false,
#1 / bcp47-extension-x
.initial:n = {},
% the BCP-47 casing alias
#1 / bcp47-casing
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/bcp47-casing}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/bcp47-casing}{##1}},
#1 / bcp47-casing
.value_required:n = false,
#1 / bcp47-casing
@@ -512,7 +603,7 @@
#1 / hyphennames
.code:n = {
\clist_set:Nn{\l_tmpa_clist}{##1}
- \prop_gput:Nne{\g_xpg_langsetup_prop}{#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
+ \prop_put:Nne \l_xpg_langsetup_prop {#1/hyphennames}{\clist_use:Nn \l_tmpa_clist {,}}
},
#1 / hyphennames
.value_required:n = true,
@@ -525,8 +616,8 @@
{LR}{}
{RL}{\RequireBidi}
}
- {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/direction}{##1}}
- {\xpg@error{Unknown~ direction~ "##1"~ for~ language~ "#1"}}
+ { \prop_put:Nnn \l_xpg_langsetup_prop {#1/direction}{##1} }
+ { \xpg_error_msg:n {Unknown~ direction~ "##1"~ for~ language~ "#1"} }
},
#1 / direction
.value_required:n = true,
@@ -537,9 +628,9 @@
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {2}
- {\xpg@error{hypenmins~should~be~a~list~of~two~entries,~got~"##1"}}
+ { \xpg_error_msg:n {hypenmins~should~be~a~list~of~two~entries,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/hyphenmins} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/hyphenmins} {##1}
},
#1 / hyphenmins
.value_required:n = true,
@@ -550,9 +641,9 @@
.code:n = {
% check syntax
\int_compare:nNnF { \clist_count:n {##1} } = {1}
- {\xpg@error{totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"}}
+ { \xpg_error_msg:n {totalhyphenhypenmin~should~be~a~single~entry,~got~"##1"} }
% set prop
- \prop_gput:Nnn \g_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/totalhyphenmin} {##1}
},
#1 / totalhyphenmin
.value_required:n = false,
@@ -571,35 +662,35 @@
% environment name
#1 / envname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/envname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/envname}{##1}
},
#1/ envname.value_required:n = true,
#1/ envname.initial:n = {#1},
% babel name
#1 / babelname
.code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/babelname}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/babelname}{##1}
},
#1/ babelname.value_required:n = true,
#1/ babelname.initial:n = {#1},
% default numerals
#1 / localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/localnumeral}{##1}
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / localnumeral.value_required:n = true,
- #1 / localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / localnumeral.initial:n = {xpg_C_localnumeral:nn},
% uppercased
#1 / Localnumeral
. code:n = {
- \prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/Localnumeral}{##1}
+ \prop_put:Nnn \l_xpg_langsetup_prop {#1/Localnumeral}{##1}
},
#1 / Localnumeral.value_required:n = true,
- #1 / Localnumeral.initial:n = {polyglossia@C@localnumeral},
+ #1 / Localnumeral.initial:n = {xpg_C_localnumeral:nn},
% environment define command (by default create the environment)
#1 / DefineCommandsCmd
- .code:n = {\prop_gput:Nnn{\g_xpg_langsetup_prop}{#1/DefineCommandsCmd}{##1}},
+ .code:n = {\prop_put:Nnn \l_xpg_langsetup_prop {#1/DefineCommandsCmd}{##1}},
#1 / DefineCommandsCmd
.value_required:n = true,
#1 / DefineCommandsCmd
@@ -607,9 +698,20 @@
}
}
+\DeclareExpandableDocumentCommand \babelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / babelname }
+ }
+
+\DeclareExpandableDocumentCommand \mainbabelname { }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / babelname }
+ }
+
% TODO move to C module
-\newcommand*{\polyglossia@C@localnumeral}[2]{
- \polyglossia@Clang@@arabic{#2}
+\cs_new:Nn \xpg_C_localnumeral:nn
+{
+ \xpg_Clang_arabic{#2}
}
\cs_new:Npn \__xpg_localnumeral_parse:nn #1 #2
@@ -633,7 +735,7 @@
\__xpg_localnumeral_parse:nn
} { #2 }
}
- { \use:c { \prop_item:Ne \g_xpg_langsetup_prop
+ { \use:c { \prop_item:Ne \l_xpg_langsetup_prop
{ \languagename / #3 } } { } { #1 } }
}
@@ -668,31 +770,31 @@
\cs_new_nopar:Npn \__xpg_indent_first:n #1
{
\bool_if:cTF { g__xpg_#1_if_bool }
- { \french@indent } { \nofrench@indent }
+ { \__xpg_french_indent: } { \__xpg_no_french_indent: }
}
\cs_new:Nn \__xpg_lang_set_par_direction:n
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_par_direction:n{\l_tmpa_tl}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
\cs_new:Nn \__xpg_lang_set_text_direction:nn
{
- \prop_get:NeNTF \g_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
+ \prop_get:NeNTF \l_xpg_langsetup_prop {#1/direction} \l_tmpa_tl
{
\__xpg_set_text_direction:n{\l_tmpa_tl}{#2}
}
{
- \xpg@error{Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
- \prop_show:N{\g_xpg_langsetup_prop}
+ \xpg_error_msg:n {Could~ not~ retrieve~ key~ direction~ for~ language~ "#1"}
+ \prop_show:N{\l_xpg_langsetup_prop}
}
}
@@ -723,7 +825,7 @@
{
\bool_gset_true:N \g__xpg_hyphenation_disabled_bool
\tl_gset:Ne \g__xpg_lastlanguage_tl { \the\language }
- % We do not call \xpg@set@hyphenation@patterns here to avoid a warning message.
+ % We do not call \xpg_set_hyphenation_patterns:n here to avoid a warning message.
% "nohyphenation" is not listed in language.dat.lua.
\language=\l@nohyphenation
}
@@ -735,19 +837,19 @@
{
\bool_gset_false:N \g__xpg_hyphenation_disabled_bool
\language=\tl_use:N{\g__xpg_lastlanguage_tl}
- }%
+ }
}
\cs_new:Npn \__xpg_auto_setupfont:n #1
{
\bool_if:cTF { g__xpg_#1_fontsetup_bool }
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
- {\xpg@fontsetup@latin{#1}}
- {\xpg@fontsetup@nonlatin{#1}}
+ \str_if_eq:eeTF{\prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ {\SetupLatinPolyglossiaFont{#1}}
+ {\SetupNonLatinPolyglossiaFont{#1}}
}
{
- \xpg@info{Skipping~ automatic~ font~ setup~ for~ language~ #1}
+ \xpg_info_msg:n{Skipping~ automatic~ font~ setup~ for~ language~ #1}
}
}
@@ -759,40 +861,40 @@
\bool_if:nTF{\tl_if_empty_p:n{#1} || \tl_if_empty_p:n{#2}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font~
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font~
(Language="#2"~ to~ langtag~ "#1")}
}
{
- \str_if_eq:nnTF{#2}{Turkish}{
+ \str_if_eq:nnTF{#2}{Turkish}
+ {
\fontspec_if_language:nTF {TRK}
{
\addfontfeature{Language=Turkish}
}
{
- \fontspec_if_language:nTF {TUR}
+ \fontspec_if_language:nT {TUR}
{
\addfontfeature{Language=Turkish}
- }{}
+ }
}
}{
- \fontspec_if_language:nTF{#1}
+ \fontspec_if_language:nT{#1}
{
\addfontfeature{Language=#2}
}
- {}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { on , no, oo , Vn, nV, VV , xn, nx, xx}
+\cs_generate_variant:Nn \__xpg_add_font_feature_language:nn { ee }
-% add fontfeature Script=#2 to scripttag #1
-% do nothing if #1 or #2 is empty
+% add fontfeature Script=#3 to scripttag #2 for family #1
+% do nothing if #2 or #3 is empty
\cs_new:Nn \__xpg_add_font_feature_script:nnn
{
\bool_if:nTF{\tl_if_empty_p:n{#2} || \tl_if_empty_p:n{#3}}
{
% maybe an error ?
- \xpg@warning{Asking~ to~ add~ empty~ feature~to~ main~ font
+ \xpg_warning_msg:n{Asking~ to~ add~ empty~ feature~to~ main~ font
(Script="#3"~ to~ scripttag~ "#2")}
}
{
@@ -828,118 +930,58 @@
\regex_replace_once:nnN { \.[^\.]* \Z } { } \xpg_fname_str
% ... and, finally, quotation marks
\regex_replace_once:nnN { " } { } \xpg_fname_str
- \xpg@error{
- The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script!\MessageBreak
- Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
- with~ \string\newfontfamily\space command
+ \xpg_error_msg:n
+ {
+ The~ current~ main ~ \xpg_ffamily_tl\space font,~ \xpg_fname_str,~ does~ not~ contain~ the~"#3"~ script! \iow_newline:
+ Please~ define~\csname\tl_if_empty:nF{#3}{\str_lowercase:n{#3}}font\xpg_ffamilysh_tl\endcsname~
+ with~ \string\newfontfamily\space command
}
}
}
}
-\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { non , nno, noo , nVn, nnV, nVV , nxn, nnx, nxx}
+\cs_generate_variant:Nn \__xpg_add_font_feature_script:nnn { nee }
-\def\xpg@fontsetup@latin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}{
- \rmfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}{
- \sffamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}{
- \ttfamilylatin
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }
- }
- \endgroup
-}
-
-\def\xpg@fontsetup@nonlatin#1{
- \begingroup
- \csgdef{#1@font@rm}{
- \cs_if_exist_use:cF{#1font}
- {
- \providetoggle{#1@use@script@font}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\rmfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} font}
- {
- \toggletrue{#1@use@script@font}
- }
- {
- \rmfamilylatin
- }
- }
- \iftoggle{#1@use@script@font}{}{
- \__xpg_add_font_feature_script:nxx{rm}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{rm}
- }%
- \csgdef{#1@font@sf}{
- \cs_if_exist_use:cF{#1fontsf}
+%% TODO: probably can be cleaned a little more
+\cs_new_protected:Npn \__xpg_setup_font:nnnnn #1 #2 #3 #4 #5 % #1 = lang, #2 = family, #3 = family, #4 = gobble, #5 gobble
+ {
+ \cs_set_protected_nopar:cpn { #1@font@#2 }
{
- \providetoggle{#1@use@script@fontsf}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\sffamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fontsf}
+ \cs_if_exist_use:cF{ #1font#3 }
{
- \toggletrue{#1@use@script@fontsf}
- }
- {
- \sffamilylatin
- }
- }
- \iftoggle{#1@use@script@fontsf}{}{
- \__xpg_add_font_feature_script:nxx{sf}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }%
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- }%
- \def\familytype{sf}
- }%
- \csgdef{#1@font@tt}{
- \cs_if_exist_use:cF{#1fonttt}
- {
- \providetoggle{#1@use@script@fonttt}
- \str_if_eq:nnTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
- {\ttfamilylatin}
- {\cs_if_exist_use:cTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript} fonttt}
- {
- \toggletrue{#1@use@script@fonttt}
- }
- {
- \ttfamilylatin
- }
- }
- \iftoggle{#1@use@script@fonttt}{}{
- \__xpg_add_font_feature_script:nxx{tt}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/scripttag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/script}}
- }
- \__xpg_add_font_feature_language:xx{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/langtag}}
- {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/language}}
+ \cs_if_exist_use:cF { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lc-bcp47-script } font#3 }
+ {
+ #4 { \prop_item:Nn \l_xpg_langsetup_prop { #1 / lcscript } font#3 }
+ {
+ \use:c { #2familylatin }
+ #5
+ {
+ \__xpg_add_font_feature_script:nee { #2 }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / scripttag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / script } }
+ }
+ }
+ }
+ \__xpg_add_font_feature_language:ee
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / langtag } }
+ { \prop_item:Nn \l_xpg_langsetup_prop { #1 / language } }
+ }
+ \tl_set:Nn \familytype { #2 }
}
- \def\familytype{tt}
}
- \endgroup
-}
+
+\NewDocumentCommand \SetupLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \use_ii:nn } { \use_none:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \use_ii:nn } { \use_none:n }
+ }
+
+\NewDocumentCommand \SetupNonLatinPolyglossiaFont { m }
+ {
+ \__xpg_setup_font:nnnnn { #1 } { rm } { } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { sf } { sf } { \cs_if_exist_use:cF } { \use:n }
+ \__xpg_setup_font:nnnnn { #1 } { tt } { tt } { \cs_if_exist_use:cF } { \use:n }
+ }
%%% END OF PolyglossiaSetup
@@ -948,40 +990,53 @@
\cs_new_nopar:Nn \__xpg_local_marks:n { }
\cs_new_nopar:Nn \__xpg_enable_local_marks:
{
- \xpg@info{Option:~ localmarks}
+ \xpg_info_msg:n{Option:~ localmarks}
\cs_gset_nopar:Nn \__xpg_local_marks:n
{
- \def\xpg@tmp@lang{##1}
- \DeclareRobustCommand\markboth[2]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \unrestored@protected@xdef\@themark
- {
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####2}}}
- }
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
- \DeclareRobustCommand\markright[1]{
- \begingroup
- \let\label\relax \let\index\relax \let\glossary\relax
- \expandafter\@markright\@themark
- {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}
- \@temptokena \expandafter{\@themark}
- \mark{\the\@temptokena}
- \endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
- }
+ \DeclareDocumentCommand \markboth { m m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \unrestored@protected@xdef\@themark
+ {
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####2}}}
+ }
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-left}{####1}
+ \mark_insert:nn{2e-right}{####2}
+ \tl_if_empty:nF{####2}{ \mark_insert:nn{2e-right-nonempty}{####2} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
+ \DeclareDocumentCommand \markright { m }
+ {
+ \group_begin:
+ \cs_set_eq:cc { label } { relax }
+ \cs_set_eq:cc { index } { relax }
+ \cs_set_eq:cc { glossary } { relax }
+ \expandafter\@markright\@themark
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}
+ \@temptokena \expandafter{\@themark}
+ \mark_insert:nn{2e-right}{####1}
+ \tl_if_empty:nF{####1}{ \mark_insert:nn{2e-right-nonempty}{####1} }
+ \mark{\the\@temptokena}
+ \group_end:
+ \if@nobreak\ifvmode\nobreak\fi\fi
+ }
}
}
%we call this macro when a gloss file is not found for a given language
-\def\xpg@nogloss#1{
- \xpg@warning{File~ gloss-#1.ldf~ do~ not~ exists!\MessageBreak
- I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+\cs_new_nopar:Nn \__xpg_no_gloss:n
+{
+ \xpg_warning_msg:n
+ {File~ gloss-#1.ldf~ do~ not~ exists! \iow_newline:
+ I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}
+
\PolyglossiaSetup{#1}{hyphenmins={2,3},hyphennames={#1},fontsetup=true}
% the above amounts to:
%\ifcsundef{l@#1}%
@@ -990,59 +1045,64 @@
%\csdef{#1@language}{\language=\csname l@#1\endcsname}%
}
-\newcommand{\xpg@input}[1]{
+\cs_new_nopar:Nn \xpg_input:n
+{
% Store catcode of @ before making at letter
- \chardef\xpg@saved@at@catcode\catcode`\@
- \makeatletter
- \input{#1}
+ \cs_set_protected_nopar:Npx \__xpg_restore_at_catcode:
+ { \char_set_catcode:nn { `@ } { \char_value_catcode:n {`\@ } } }
+ \char_set_catcode_letter:N @
+ \file_input:n { #1 }
% restore former @ catcode
- \catcode`\@=\xpg@saved@at@catcode
+ \__xpg_restore_at_catcode:
}
% try to load a language file
-\cs_new:Nn \__xpg_load_lang_definition:nn {
- \file_if_exist:nTF{gloss-#2.ldf}
+\cs_new:Nn \__xpg_load_lang_definition:nn
+{
+ \file_if_exist:nTF{gloss-#2.ldf}
{
- % Temporarily force catcode of ~ to 13 since babelsh.def
+ \tl_set:Nn \xpg__tmp_default_options_tl { #1 }
+ % Temporarily force catcode of ~ to 13 (active) since babelsh.def
% requires it. This is needed particularly with LaTeX3
% packages which force \ExplSyntaxOn (#425)
- \protected\edef\xpg@restore@tilde@catcode{\catcode 126 = \the\catcode 126\relax}
- \catcode 126 = 13
- \xpg@input{gloss-#2.ldf}
- \setkeys{#2}{#1}
+ \cs_gset_protected:Npx \__xpg_restore_tilde_catcode:
+ { \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } } }
+ \char_set_catcode_active:n { 126 }
+ \xpg_input:n {gloss-#2.ldf}
% restore former ~ catcode
- \xpg@restore@tilde@catcode
+ \__xpg_restore_tilde_catcode:
}
{
- \xpg@nogloss{#2}
+ \__xpg_no_gloss:n {#2}
}
}
\cs_generate_variant:Nn \__xpg_load_lang_definition:nn { ee }
% load a master language from an alias file
-\newcommand*\xpg@load@master@language[1] {
- \xpg@input{gloss-#1.ldf}
+\NewDocumentCommand \InheritGlossFile { m }
+{
\seq_if_in:NeF \__xpg_langs_loaded {#1}
{
+ \xpg_input:n {gloss-#1.ldf}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1} {
- \use:c{\prop_item:Nn{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Nn{\l_xpg_langsetup_prop}
{#1/DefineCommandsCmd}}
{#1}
}
+ \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
\__xpg_register_language:nn{}{#1}
- \seq_gput_right:Nn \__xpg_langs_loaded {#1}
}
-\prop_new:N \__xpg_alias
+\prop_new_linked:N \__xpg_alias
% define environment and command if not alias
\cs_new:Nn \xpg_define_language_commands:n {
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#1/target}} {#1}
{
\exp_args:Ne
- \NewDocumentEnvironment {\prop_item:Nn{\g_xpg_langsetup_prop}{#1/envname}} { O{} }
+ \NewDocumentEnvironment {\prop_item:Nn{\l_xpg_langsetup_prop}{#1/envname}} { O{} }
{
\otherlanguage [ ##1 ] { #1 }
}
@@ -1070,7 +1130,7 @@
% target to self fall back to language table
\str_if_eq:eeTF { \prop_item:Ne \__xpg_alias {#1/target} } { #1 }
{
- \prop_item:Nn{\g_xpg_langsetup_prop} {#1/#2}
+ \prop_item:Nn{\l_xpg_langsetup_prop} {#1/#2}
}
% load alias by recursion
{
@@ -1193,20 +1253,29 @@
\clist_if_in:NeF \xpg@loaded {#2}{
\clist_gput_right:Ne \xpg@loaded {#2}
}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
+ \group_begin:
+ % set language options
+ \__xpg_set_language_options:nn {#2} {#1}
% register babelname
- \prop_get:NeN \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
\clist_if_in:NeF \xpg@bloaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bloaded {\l_tmpa_tl}
}
% register BCP-47 ID
- \prop_get:NeN \g_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
+ \prop_get:NeN \l_xpg_langsetup_prop {#2/bcp47} \l_tmpa_tl
\clist_if_in:NeF \xpg@bcp@loaded {\l_tmpa_tl}{
\clist_gput_right:Ne \xpg@bcp@loaded {\l_tmpa_tl}
}
+ % register variant
+ \prop_get:NnNT \l_xpg_curropt_prop {#2/variant} \l_tmpa_tl {
+ \clist_if_in:NeF \xpg@vloaded {\l_tmpa_tl}{
+ \clist_gput_right:Ne \xpg@vloaded {\l_tmpa_tl}
+ }}
+ \group_end:
}
+\prop_new_linked:N \l_xpg_curropt_prop
+
\DeclareDocumentCommand \setdefaultlanguage { O{} m }
{
% latex is an internal language, so do not record
@@ -1221,12 +1290,13 @@
\__xpg_load_lang_definition:nn{#1}{#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
\seq_gput_right:Ne \__xpg_langs_loaded {#2}
}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
\exp_args:Nee \__xpg_set_default_language:nn {\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
@@ -1234,70 +1304,22 @@
\cs_new:Nn \__xpg_set_default_language:nn
{
- \gdef\xpg@main@language{#2}
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
+ \tl_gset:Nn \xpg_main_language_tl {#2}
%% The following settings are for the default language and script
% this tells bidi.sty or luabidi.sty that the document is RTL
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{
\__xpg_setRTLmain:
}
\cs_gset_nopar:Nn \__xpg_at_begin_document_selectlanguage: {
\selectbackgroundlanguage{#2}
- \selectlanguage[#1]{#2}%
+ \selectlanguage[#1]{#2}
}
- \xpg@info{Default~ language~ is~ #2}
- \polyglossia@set@language@name[#1]{#2}
+ \str_if_eq:eeF { #2 } { latex }
+ { \xpg_info_msg:n{Default~ language~ is~ #2} }
+ \xpg_set_language_name:n { #2 }
\cs_gset_nopar:Npn \mainlanguagename {#2}
- % Store babelname of main language (for external packages such as biblatex)
- \cs_gset_nopar:Npe \mainbabelname { \prop_item:Nn \g_xpg_langsetup_prop {#2/babelname} }
- % Store babelname of current language (for external packages such as biblatex)
- \cs_gset_eq:NN \babelname \mainbabelname
- \cs_gset_eq:cc{#2@gbabelname}{babelname}%
- % Store BCP-47 ID and subtags of main language:
- % 1. store main.* (sub)tags
- \cs_gset_nopar:cpe {bcp47.main.tag} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47 } }
- \cs_gset_nopar:cpe {bcp47.main.language} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-language } }
- \cs_gset_nopar:cpe {bcp47.main.region} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-region } }
- \cs_gset_nopar:cpe {bcp47.main.script} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-script } }
- \cs_gset_nopar:cpe {bcp47.main.variant} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-variant } }
- \cs_gset_nopar:cpe {bcp47.main.extension.t} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47extension-t } }
- \cs_gset_nopar:cpe {bcp47.main.extension.u} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-u } }
- \cs_gset_nopar:cpe {bcp47.main.extension.x} { \prop_item:Nn \g_xpg_langsetup_prop { #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \prop_item:Nn \g_xpg_langsetup_prop {#2 / bcp47-language} } }
- { \cs_gset_nopar:cpe {bcp47.main.casing} { \tmpcasing } }
- % 2. Store lang (sub)tags
- \cs_gset_eq:cc {bcp47.tag} {bcp47.main.tag}
- \cs_gset_eq:cc {bcp47.language} {bcp47.main.language}
- \cs_gset_eq:cc {bcp47.region} {bcp47.main.region}
- \cs_gset_eq:cc {bcp47.script} {bcp47.main.script}
- \cs_gset_eq:cc {bcp47.variant} {bcp47.main.variant}
- \cs_gset_eq:cc {bcp47.extension.t} {bcp47.main.extension.t}
- \cs_gset_eq:cc {bcp47.extension.u} {bcp47.main.extension.u}
- \cs_gset_eq:cc {bcp47.extension.x} {bcp47.main.extension.x}
- \cs_gset_eq:cc {bcp47.casing} {bcp47.main.casing}
- % 3. Store global language BCP47 settings (with default subtags as set by main language options)
- \cs_gset_eq:cc{#2@g.bcp47.tag}{bcp47.tag}
- \cs_gset_eq:cc{#2@g.bcp47.language}{bcp47.language}
- \cs_gset_eq:cc{#2@g.bcp47.region}{bcp47.region}
- \cs_gset_eq:cc{#2@g.bcp47.script}{bcp47.script}
- \cs_gset_eq:cc{#2@g.bcp47.variant}{bcp47.variant}
- \cs_gset_eq:cc{#2@g.bcp47.extension.t}{bcp47.extension.t}
- \cs_gset_eq:cc{#2@g.bcp47.extension.u}{bcp47.extension.u}
- \cs_gset_eq:cc{#2@g.bcp47.extension.x}{bcp47.extension.x}
- \cs_gset_eq:cc{#2@g.bcp47.casing}{bcp47.casing}
}
\DeclareCommandCopy \setmainlanguage \setdefaultlanguage
@@ -1308,11 +1330,11 @@
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.tag} }
- {bcp47} { \csuse{bcp47.tag} }
+ {bcp-47} { \use:c{bcp47.tag} }
+ {bcp47} { \use:c{bcp47.tag} }
}
{
- \xpg@error{Invalid~ \string\languageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \languageid }
}
}
@@ -1322,11 +1344,11 @@
{
\str_case:nnF {#1}
{
- {bcp-47} { \csuse{bcp47.main.tag} }
- {bcp47} { \csuse{bcp47.main.tag} }
+ {bcp-47} { \use:c{bcp47.main.tag} }
+ {bcp47} { \use:c{bcp47.main.tag} }
}
{
- \xpg@error{Invalid~ \string\mainlanguageid\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \mainlanguageid }
}
}
% Kernel command to access to BCP-47 data.
@@ -1346,281 +1368,205 @@
% and main.* variants thereof
% See https://github.com/latex3/latex2e/issues/1035
\DeclareExpandableDocumentCommand \BCPdata {m}
+ {
+ \cs_if_exist_use:cF{bcp47.#1}
+ { \xpg_ill_arg_msg:nn { #1 } { \BCPdata } }
+ }
+
+\clist_map_inline:nn
+ {
+ language, region, script, variant,
+ extension.t, extension.u, extension.x
+ }{
+ \tl_set:Nn \l_tmpa_tl { #1 }
+ \tl_replace_once:Nnn \l_tmpa_tl { . } { - }
+ \cs_gset_nopar:cpe { bcp47.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \languagename / bcp47-\l_tmpa_tl }
+ }
+ \cs_gset_nopar:cpe { bcp47.main.#1 }
+ {
+ \exp_not:n { \prop_item:Ne \l_xpg_langsetup_prop } { \exp_not:N \mainlanguagename / bcp47-\l_tmpa_tl }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.main.casing }
+ {
+ \tl_if_empty:eTF { \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing } }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-language }
+ }{
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47-casing }
+ }
+ }
+\cs_gset_nopar:cpn { bcp47.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \languagename / bcp47 }
+ }
+\cs_gset_nopar:cpn { bcp47.main.tag }
+ {
+ \prop_item:Ne \l_xpg_langsetup_prop { \mainlanguagename / bcp47 }
+ }
+
+\cs_new_nopar:Npn \languagevariant
+ {
+ \prop_item:Ne \l_xpg_curropt_prop { \languagename / variant }
+ }
+
+\cs_new:Nn \xpg_set_language_name:n
{
- \cs_if_exist_use:cF{bcp47.#1}
- { \xpg@error{Invalid~ \string\BCPdata\space argument:~ #1} }
-}
-
-% main babel name
-\cs_new_nopar:Npn \mainlanguagename {}
-\cs_new_nopar:Npn \mainbabelname {}
-\cs_new_nopar:cpn {bcp47.main.tag} {}
-\cs_new_nopar:cpn {bcp47.main.language} {}
-\cs_new_nopar:cpn {bcp47.main.region} {}
-\cs_new_nopar:cpn {bcp47.main.script} {}
-\cs_new_nopar:cpn {bcp47.main.variant} {}
-\cs_new_nopar:cpn {bcp47.main.extension.t} {}
-\cs_new_nopar:cpn {bcp47.main.extension.u} {}
-\cs_new_nopar:cpn {bcp47.main.extension.x} {}
-\cs_new_nopar:cpn {bcp47.main.casing} {}
-\cs_new_nopar:Npn \mainlanguagevariant {}%
-% Store main language variant for external packages
-\define@key{xpg@main@langvariant}{variant}{
- \cs_gset_nopar:Npn \mainlanguagevariant {#1}
-}
-
-\cs_new_nopar:Npn \babelname {}
-\def\languagevariant{}
-% Store current language variant for external packages
-\define@key{xpg@set@langvariant}{variant}{
- \def\languagevariant{#1}
-}
-
-\newcommand*\polyglossia@set@language@name[2][]{
- \def\languagename{#2}
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gvar}{\def\languagevariant{}}{\def\languagevariant{\csuse{#2@gvar}}}
- }{
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@set@langvariant}
- \cs_set_eq:cc{#2@var}{languagevariant}
- }%
+ \cs_set:Npn \languagename { #1 }
}
-
-\newcommand*{\resetdefaultlanguage}[2][]{
+\NewDocumentCommand \resetdefaultlanguage { O{} m }
+{
\__xpg_reset_default_language:nn
{\xpg_alias_add_to_option_i:nn{#2}{#1}}
{\xpg_alias_base_lang:n{#2}}
}
-\cs_new:Nn \__xpg_store_bcp_info:nn
-{
- % Store BCP-47 ID and subtags of current language
- \tl_if_blank:nTF {#1}{
- % tag (e.g., en-US)
- \ifcsundef{#2@g.bcp47.tag}{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- }{
- \csedef{bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- % language (e.g., en)
- \ifcsundef{#2@g.bcp47.language}{
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- }{
- \csedef{bcp47.language}{\csuse{#2@g.bcp47.language}}
- }
- % region (e.g., US)
- \ifcsundef{#2@g.bcp47.region}{%
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- }{
- \csedef{bcp47.region}{\csuse{#2@g.bcp47.region}}%
- }
- % script (e.g., Latn)
- \ifcsundef{#2@g.bcp47.script}{
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- }{
- \csedef{bcp47.script}{\csuse{#2@g.bcp47.script}}
- }
- % variant (e.g., 1996)
- \ifcsundef{#2@g.bcp47.variant}{
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- }{
- \csedef{bcp47.variant}{\csuse{#2@g.bcp47.variant}}
- }
- % extension.t (tranformation)
- \ifcsundef{#2@g.bcp47.extension.t}{%
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- }{
- \csedef{bcp47.extension.t}{\csuse{#2@g.bcp47.extension.t}}
- }
- % extension.u (additional locale information)
- \ifcsundef{#2@g.bcp47.extension.u}{%
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- }{
- \csedef{bcp47.extension.u}{\csuse{#2@g.bcp47.extension.u}}
- }
- % extension.x (private use area)
- \ifcsundef{#2@g.bcp47.extension.x}{
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- }{
- \csedef{bcp47.extension.x}{\csuse{#2@g.bcp47.extension.x}}
- }
- % casing
- \ifcsundef{#2@g.bcp47.casing}{
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }{
- \csedef{bcp47.casing}{\csuse{#2@g.bcp47.casing}}
- }
- }{
- \csedef{bcp47.tag}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47 } }
- \csedef{bcp47.language}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-language } }
- \csedef{bcp47.region}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-region } }
- \csedef{bcp47.script}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-script } }
- \csedef{bcp47.variant}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-variant } }
- \csedef{bcp47.extension.t}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-t } }
- \csedef{bcp47.extension.u}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-u } }
- \csedef{bcp47.extension.x}{ \prop_item:Nn{ \g_xpg_langsetup_prop}{ #2 / bcp47-extension-x } }
- % For casing, we fall back to language if bcp47-casing is not explicitly set
- \cs_set_nopar:cpx {tmpcasing} { \prop_item:Ne \g_xpg_langsetup_prop { #2 / bcp47-casing } }
- \str_if_empty:NTF \tmpcasing
- { \cs_gset_eq:cc {bcp47.casing} {bcp47.language} }
- { \csedef{bcp47.casing}{ \tmpcasing } }
- }
-}
-
\cs_new:Nn \__xpg_reset_default_language:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
% disable globalnumbers of previously defined default language
- \csuse{no\xpg@main@language @globalnumbers}
- \csuse{noextras@\xpg@main@language}%
+ \use:c{no\xpg_main_language_tl @globalnumbers}
+ \use:c{noextras@\xpg_main_language_tl}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{noextras@bbl@\mainbabelname}%
- \csuse{init@noextras@\xpg@main@language}%
- \polyglossia@set@language@name[#1]{#2}%
- \__xpg_if_LR_str:eF{\prop_item:Ne{\g_xpg_langsetup_prop}{#2/direction}}
+ \cs_if_exist_use:c{noextras@bbl@\mainbabelname}
+ \use:c{init@noextras@\xpg_main_language_tl}
+ \xpg_set_language_name:n { #2 }
+ \__xpg_if_LR_str:eF{\prop_item:Ne{\l_xpg_langsetup_prop}{#2/direction}}
{
\@rlmaintrue\@rl@footnotetrue
}
- \selectlanguage[#1]{#2}%
- \selectbackgroundlanguage{#2}%
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{%
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store variant
- \tl_if_blank:nTF {#1}
- {
- \cs_gset_nopar:Npn \mainlanguagevariant {}
- }
- {
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@main@langvariant}
- }
- \csgdef{#2@gvar}{\mainlanguagevariant}
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
+ \selectlanguage[#1]{#2}
+ \selectbackgroundlanguage{#2}
+ \cs_set_nopar:Npe \mainlanguagevariant { \prop_item:Ne \l_xpg_curropt_prop { \xpg_alias_base_lang:n{#2} / variant } }
}
% This saves the normalfont for the latin script since we may change normalfont in other scripts
-\let\normalfontlatin=\normalfont
+\cs_set_eq:cc { normalfontlatin } { normalfont }
% Provide default fonts (as set with \setmainfont, \setsansfont and \setmonofont)
% for Latin scripts and as a fallback for non-Latin scripts.
-\DeclareRobustCommand\xpg@defaultfont@rm{
+\cs_set_protected:Nn \xpg_defaultfont_rm:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\rmdefault
- \ifdefined\UseHook\UseHook{rmfamily}\fi
+ \hook_use:n { rmfamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@sf{
+
+\cs_set_protected:Nn \xpg_defaultfont_sf:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\sfdefault
- \ifdefined\UseHook\UseHook{sffamily}\fi
+ \hook_use:n { sffamily }
\selectfont
}
-\DeclareRobustCommand\xpg@defaultfont@tt{
+
+\cs_set_protected:Nn \xpg_defaultfont_tt:
+{
\tl_if_empty:NF{\g__fontspec_nfss_enc_tl}{\fontencoding{\g__fontspec_nfss_enc_tl}}
\fontfamily\ttdefault
- \ifdefined\UseHook\UseHook{ttfamily}\fi
+ \hook_use:n { ttfamily }
\selectfont
}
-\def\xpg@patch@fontfamilies{
+\cs_new:Nn \__xpg_patch_fontfamilies:
+{
% This robustifies the redefinitions of \<xx>family (suggestion by Enrico Gregorio)
% e.g. to prevent expansion of the \familytype redefinition in auxiliary files
- \csgappto{rmfamily~}{\def\familytype{rm}}
- \csgappto{sffamily~}{\def\familytype{sf}}
- \csgappto{ttfamily~}{\def\familytype{tt}}
+ \tl_put_right:cn {rmfamily~} {\tl_set:Nn \familytype {rm}}
+ \tl_put_right:cn {sffamily~} {\tl_set:Nn \familytype {sf}}
+ \tl_put_right:cn {ttfamily~} {\tl_set:Nn \familytype {tt}}
}
% These switches activate the default fonts
% Note that a simple \let\rmfamilylatin=\rmfamily
% does not work reliably (see #24)
-\cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
-\cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
-\cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-
-\def\xpg@set@familydefault{
- % We need the \edef route here in order
- % to detect both \renewcommand and \let
- % changes.
- \edef\tempa{\familydefault}
- \edef\tempb{\sfdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{sf}}
- {\edef\tempb{\ttdefault}
- \ifcsequal{tempa}{tempb}
- {\def\familytype{tt}}
- {\def\familytype{rm}}}
- \xpg@patch@fontfamilies
+\cs_set_eq:cc{rmfamilylatin}{xpg_defaultfont_rm:}
+\cs_set_eq:cc{sffamilylatin}{xpg_defaultfont_sf:}
+\cs_set_eq:cc{ttfamilylatin}{xpg_defaultfont_tt:}
+
+\cs_new:Nn \xpg_set_familydefault:
+{
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \__xpg_patch_fontfamilies:
% This (re-)saves the normalfont for the latin script since we may
% change normalfont in other scripts
- \let\normalfontlatin=\normalfont
+ \cs_set_eq:cc{ normalfontlatin }{ normalfont }
% And for all cases, we also reset \<xx>familylatin
- \cs_gset_eq:cc{rmfamilylatin}{xpg@defaultfont@rm}
- \cs_gset_eq:cc{sffamilylatin}{xpg@defaultfont@sf}
- \cs_gset_eq:cc{ttfamilylatin}{xpg@defaultfont@tt}
-}
-
-\def\resetfontlatin{
- \DeclareRobustCommand\rmfamily{\xpg@defaultfont@rm}
- \DeclareRobustCommand\sffamily{\xpg@defaultfont@sf}
- \DeclareRobustCommand\ttfamily{\xpg@defaultfont@tt}
- \xpg@patch@fontfamilies
- \global\let\normalfont=\normalfontlatin
-}
-
-\def\selectfontfamilylatin{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \ttfamilylatin
- \else\ifx\familytype\tmp@sf
- \sffamilylatin
- \else\rmfamilylatin\fi\fi}
-
-\def\xpg@select@fontfamily#1{
- \def\tmp@tt{tt}\def\tmp@sf{sf}
- \ifx\familytype\tmp@tt
- \__xpg_use_or_warn:c{#1@font@tt}
- \else\ifx\familytype\tmp@sf
- \__xpg_use_or_warn:c{#1@font@sf}
- \else\__xpg_use_or_warn:c{#1@font@rm}\fi\fi}
-
-\def\xpg@set@normalfont#1{
- \letcs{\rmfamily}{#1@font@rm}
- \letcs{\sffamily}{#1@font@sf}
- \letcs{\ttfamily}{#1@font@tt}
- \robustify\rmfamily
- \robustify\sffamily
- \robustify\ttfamily
- \gdef\normalfont{\protect\xpg@select@fontfamily{#1}
- \fontseries{\seriesdefault}\selectfont
- \fontshape{\shapedefault}
- \ifdefined\UseHook\UseHook{normalfont}\fi
- \selectfont}
- \gdef\reset@font{\protect\normalfont}
-}
-
-\let\@@fterindentfalse\@afterindentfalse
-\def\french@indent{
- \let\@afterindentfalse\@afterindenttrue
+ \cs_set_eq:cc{ rmfamilylatin }{ xpg_defaultfont_rm: }
+ \cs_set_eq:cc{ sffamilylatin }{ xpg_defaultfont_sf: }
+ \cs_set_eq:cc{ ttfamilylatin }{ xpg_defaultfont_tt: }
+}
+
+\cs_set_nopar:Nn \xpg_select_fontfamily:n
+{
+ \str_if_eq:VnTF \familytype { tt }
+ { \__xpg_use_or_warn:c { #1@font@tt } }
+ { \str_if_eq:VnTF \familytype { sf }
+ { \__xpg_use_or_warn:c { #1@font@sf } }
+ { \__xpg_use_or_warn:c { #1@font@rm } }
+ }
+}
+
+\cs_set_protected:Npn \xpg_select_default_fontfamily:n #1
+ {
+ \tl_set:Ne \l_tmpa_tl { \familydefault }
+ \tl_set:Ne \l_tmpb_tl { \sfdefault }
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {sf} }
+ { \tl_set_eq:NN \l_tmpb_tl \ttdefault
+ \tl_if_eq:NNTF \l_tmpa_tl \l_tmpb_tl
+ { \tl_set:Nn \familytype {tt} }
+ { \tl_set:Nn \familytype {rm} }
+ }
+ \xpg_select_fontfamily:n{#1}
+ }
+
+\cs_new_nopar:Nn \xpg_set_normalfont:n
+{
+ \cs_set_eq:cc { rmfamily } { #1@font@rm }
+ \cs_set_eq:cc { sffamily } { #1@font@sf }
+ \cs_set_eq:cc { ttfamily } { #1@font@tt }
+ \cs_set_nopar:Npn \normalfont
+ { \xpg_select_default_fontfamily:n {#1}
+ \fontseries{\seriesdefault}\selectfont
+ \fontshape{\shapedefault}
+ \hook_use:n { normalfont }
+ \selectfont
+ }
+ \cs_set_nopar:Npn \reset@font {\protect\normalfont}
+}
+
+\cs_gset_eq:cc { @@fterindentfalse } { @afterindentfalse }
+\cs_new_nopar:Nn \__xpg_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @afterindenttrue }
\@afterindenttrue
}
-\def\nofrench@indent{
- \let\@afterindentfalse\@@fterindentfalse
+\cs_new_nopar:Nn \__xpg_no_french_indent:
+{
+ \cs_set_eq:cc { @afterindentfalse } { @@fterindentfalse }
\@afterindentfalse
}
@@ -1631,10 +1577,10 @@
\cs_new:Nn \__xpg_select_background_language:n
{
- \str_if_eq:eeTF{\prop_item:Nn{\g_xpg_langsetup_prop}{#1/lcscript}}{latin}
+ \str_if_eq:eeTF { \prop_item:Nn{\l_xpg_langsetup_prop}{#1/lcscript} } { latin }
{}
- {\xpg@set@normalfont{#1}}
- \csuse{#1@globalnumbers}
+ { \xpg_set_normalfont:n{#1} }
+ \use:c{#1@globalnumbers}
}
\cs_generate_variant:Nn \__xpg_select_background_language:n {e}
% Declare secondary language #2 with language options #1
@@ -1645,7 +1591,7 @@
\__xpg_load_lang_definition:ee {#1} {#2}
% define environment and command if not alias
\str_if_eq:eeT {\prop_item:Ne \__xpg_alias {#2/target}} {#2} {
- \use:c{\prop_item:Ne{\g_xpg_langsetup_prop}
+ \use:c{\prop_item:Ne{\l_xpg_langsetup_prop}
{#2/DefineCommandsCmd}}
{#2}
}
@@ -1658,28 +1604,13 @@
\cs_new:Nn \__xpg_set_otherlanguage:nn
{
\__xpg_register_language:nn{#1}{#2}
- % If a variant is set, store it.
- \gdef\otherlanguagevariant{}
- % Register the language options
- \__xpg_set_language_options:nnn {#2} {#1} {@xpg@other@langvariant}
-
- \csgdef{#2@gvar}{\otherlanguagevariant}
- \prop_get:NeNT \g_xpg_langsetup_prop {#2/babelname} \l_tmpa_tl
- { \xdef\otherlanguagebabelname{\l_tmpa_tl} }
- \cs_gset_eq:cc{#2@gbabelname}{otherlanguagebabelname}
}
\cs_generate_variant:Nn \__xpg_set_otherlanguage:nn { ee }
-
-% Store main language variant for external packages
-\define@key{xpg@other@langvariant}{variant}{
- \gdef\otherlanguagevariant{#1}
-}
-
\NewDocumentCommand \setotherlanguages { m }
- {
+{
\clist_map_function:eN { #1 } \setotherlanguage
- }
+}
\cs_set:Nn \xpg_common_language:
{% FIXME is this really needed???
@@ -1702,7 +1633,8 @@
% for specific (esp. tag-based) aliases
% where \text<alias> would cause clashes
% (e.g., \textit)
-\newcommand\textlang[3][]{
+\NewDocumentCommand \textlang { O{} m +m }
+{
\__xpg_textlanguage:een {#1} {#2} {#3}
}
@@ -1711,45 +1643,20 @@
% inside case changing commands (e.g. \MakeUppercase)
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \textlang }
-% Alias to {<lang>}, but more suitable
-% for specific (esp. tag-based) aliases
-% where {<alias>} would cause clashes
-% (e.g., \fi)
-\DeclareEnvironmentCopy { lang } { otherlanguage }
-
% wrapper for foreignlanguage and otherlanguage*
-\newcommand*\polyglossia@setforeignlanguage[2][]{
- \select@@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_foreign_language:nn
+{
+ \xpg_select_language:nn { #1 } { #2 }
\__xpg_register_language:nn{#1}{#2}
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
-}
-
-% Expandable lowercasing. We use this to assure keyval
-% options are lowercased (also when used in \MakeUppercase
-% contexts e.g. in headings)
-% Macro adapted from tudscr.sty
-\newcommand*\xpg@str@lowercase[2]{
- \protected@edef#1{
- \lowercase{\def\noexpand#1{#2}}
- }#1
}
% lowercase options before passing to setkeys
-\cs_new:Nn \__xpg_set_keys:nn
+\NewDocumentCommand \SetGlossOptions { m m }
{
- \xpg@str@lowercase{\xpg@tmp@opts}{#2}
- \exp_args:Nne \setkeys{#1}{\xpg@tmp@opts}
+ % \text_lowercase:n fully expands
+ % (as opposed to \str_lowercase:n)
+ \use:c { xpg_#1_default_options_tl }
+ \exp_args:Ne \keys_set:ne{ polyglossia / gloss / #1 }{ \text_lowercase:n {#2} }
}
% joint code of \foreignlanguage, otherlanguage*
@@ -1759,54 +1666,30 @@
\cs_new:Nn \xpg_otherlanguage:nn
{
\xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
- \polyglossia@setforeignlanguage[#1]{#2}
+ \SetGlossOptions{#2}{#1}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
\polyglossia@language@switched
% buggy restoration heure
- \csuse{inlineextras@#2}
+ \use:c{inlineextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{inlineextras@bbl@\babelname}
}
\DeclareDocumentCommand { \foreignlanguage } { O{} m +m }
- {
+{
\__xpg_foreignlanguage:eeen {#1} {#2} {\xpg_alias_base_lang:n{#2}} {#3}
- }
+}
% prevent case changing of language name in \foreignlanguage
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \foreignlanguage }
-% Direct access to polyglossia@setforeignlanguage
+% Direct access to \xpg_set_foreign_language:nn
% used in captions
-\newcommand{\setforeignlanguage}[2][]
-{
- \polyglossia@setforeignlanguage[#1]{#2}
-}
-
-% Stack to store matrix languages
-\seq_new:N \__xpg_current_matrixlang_stack
-
-% Store embedding language when an embedded language is switched to
-\cs_new_nopar:Nn \__xpg_store_matrixlang:
+\NewDocumentCommand \setforeignlanguage { O{} m }
{
- \seq_gput_left:Nn \__xpg_current_matrixlang_stack \languagename
-}
-
-% When an embedded language is closed, reset to the embedding language
-% and remove stored matrix language from stack
-\cs_new_nopar:Nn \__xpg_reset_to_matrixlang:
-{
- % if stack is empty, use main language
- \seq_gpop_left:NNTF \__xpg_current_matrixlang_stack \l_tmpa_tl
- { \cs_set_eq:NN \__xpg_current_matrixlang \l_tmpa_tl }
- { \cs_set_eq:NN \__xpg_current_matrixlang \mainlanguagename }
- % Reset the language's/script's font families if the embedding script is latin
- \str_if_eq:eeT{\prop_item:Ne{\g_xpg_langsetup_prop}{\__xpg_current_matrixlang/lcscript}}{latin}
- {\resetfontlatin}
- % In case a \<lang>font is defined, re-activate that
- \exp_args:Ne \xpg@set@normalfont{\__xpg_current_matrixlang}
+ \xpg_set_foreign_language:nn { #1 } { #2 }
}
% internal wrapper for foreign language
@@ -1820,12 +1703,10 @@
{
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}{
- \__xpg_store_matrixlang:
\group_begin:
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_foreignlanguage:nnnn {eeen}
@@ -1834,11 +1715,9 @@
% otherlanguage* is the environment equivalent of \foreignlanguage
\DeclareDocumentEnvironment { otherlanguage* } { O{} m }
{
- \__xpg_store_matrixlang:
\__xpg_otherlanguage:eee { #1 } { #2 } { \xpg_alias_base_lang:n { #2 } }
}{
- \egroup% \group_end: does not work here!
- \__xpg_reset_to_matrixlang:
+ \c_group_end_token% \group_end: does not work here!
}
% internal wrapper
@@ -1853,7 +1732,7 @@
}{
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}%
- \bgroup% \group_begin: does not work here!
+ \c_group_begin_token% \group_begin: does not work here!
}
}
\cs_generate_variant:Nn \__xpg_otherlanguage:nnn { eee }
@@ -1869,9 +1748,6 @@
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnn {een}
-% Track whether we are in an inline lang (\text...) switch
-\bool_new:N \l__xpg_inline_lang_bool
-
% use by \text<lang> and \textlang. Equivalent to \foreignlanguage,
% except that dates are localized.
% #1: option
@@ -1885,41 +1761,43 @@
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}
{
- \__xpg_store_matrixlang:
\group_begin:
- \bool_set_true:N \l__xpg_inline_lang_bool
\xpg_otherlanguage:nn{#1}{#3}
- \csuse{date#3}
+ \use:c{date#3}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
\cs_if_exist_use:c{date@bbl@\babelname}
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
- \__xpg_reset_to_matrixlang:
}
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnnn {nnen}
% Define language-specific hyphenation exceptions
-\newcommand\pghyphenation[3][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \setkeys{#2}{#1}
- \select@@language[#1]{#2}
+\NewDocumentCommand \pghyphenation {O{} m m}
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n { #2 }
+ \SetGlossOptions{#2}{#1}
+ \xpg_select_language:nn { #1 } { #2 }
\hyphenation{#3}
- \egroup
+ \c_group_end_token
}
% Hook that other package authors can use
% (for instance biblatex):
% Do not rename!
-\newcommand*{\xpg@hook@setlanguage}{}
+\cs_set_nopar:Npn \xpg@hook@setlanguage {}
-\def\xpg@pop@language@i#1#2{
- \xpg@set@language@aux[#1]{#2}
+\cs_set_nopar:Nn \__xpg_pop_language:nn
+{
+ \xpg_set_language_aux:nn { #1 } { #2 }
\xpg@hook@setlanguage
- \let\emp@langname\@undefined}
+% FIXME This seems to be a very old relict.
+% The macro is nowhere used. Probably remove.
+% \let\emp@langname\@undefined
+}
\DeclareDocumentCommand \selectlanguage {s O{} m}
{
@@ -1938,131 +1816,124 @@
\cs_new:Nn \__xpg_select_language:nnn
{
% Register the language options
- \__xpg_set_language_options:nnn {#3} {#2} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn {#3} {#2}
\IfBooleanTF { #1 } % The starred variant does not write to the aux
{
- \xpg@set@language@nonaux[#2]{#3}
+ \xpg_set_language_nonaux:nn { #2 } { #3 }
}{
- \cs_set_nopar:Npe \xpg@pop@language { \exp_not:N \xpg@pop@language@i {#2} {#3} }
- \group_insert_after:N \xpg@pop@language
- \xpg@set@language@aux[#2]{#3}
+ \cs_set_nopar:Ne \xpg_pop_language: { \exp_not:N \__xpg_pop_language:nn { #2 } { #3 } }
+ \group_insert_after:N \xpg_pop_language:
+ \xpg_set_language_aux:nn { #2 } { #3 }
}
- \__xpg_register_language:nn{#2}{#3}
+ \__xpg_register_language:nn { #2 } { #3 }
}
\cs_generate_variant:Nn \__xpg_select_language:nnn { nee, nne }
-
% set lang option #2 for lang #1
-\cs_new:Nn \__xpg_set_language_options:nnn
+\cs_new:Nn \__xpg_set_language_options:nn
{
- \tl_if_blank:nF {#2}
+ \cs_if_exist:cT { xpg_#1_default_options_prop }
{
- % If the optional argument sets a value for the key “variantâ€, copy it to xpg@langvariant
- \clist_map_inline:nn { #2 } {
- \xpg@parsevariantkeyvalue##1=#3:#1\relax
- }%
- \__xpg_set_keys:nn{#1}{#2}
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
}
+ \xpg__keyval_parser:eeN { #2 } { #1 } \l_xpg_curropt_prop
+ \SetGlossOptions{#1}{#2}
}
% Initialize default language options, so that
% \iflanguageoption has the info it needs also
% for default settings
-\newcommand*\xpg@initialize@gloss@options[2]{
- \__xpg_set_language_options:nnn {#1} {#2} {@xpg@set@langvariant}
-}
+\NewDocumentCommand \InitializeGlossOptions { m m }
+{
+ \tl_new:c { xpg_#1_default_options_tl }
+ \prop_new:c { xpg_#1_default_options_prop }
+ \keys_precompile:nec { polyglossia / gloss / #1 }
+ { \text_lowercase:n { #2, \xpg__tmp_default_options_tl } }
+ { xpg_#1_default_options_tl }
+ \xpg__keyval_parser:enc { #2, \xpg__tmp_default_options_tl } { #1 }
+ { xpg_#1_default_options_prop }
+ \prop_concat:ccc { l_xpg_curropt_prop } { l_xpg_curropt_prop }
+ { xpg_#1_default_options_prop }
+ \use:c { xpg_#1_default_options_tl }
+ \__xpg_set_language_options:nn {#1} {#2}
+}
+\tl_new:N \xpg__tmp_default_options_tl
+\cs_generate_variant:Nn \keys_precompile:nnN { nec }
% Record synonymous keyvals such as variant=us and variant=american
-% Syntax: \xpg@set@alias@values{<lang>}{<key>}{<val>}{<alias vals, comma-separated>}
-\newcommand*\xpg@set@alias@values[4]{%
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#3 }
- { \prop_new:c {xpg@alias@keyvals@#1@#3} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#3 }
- {#2}{#4}
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
- { \prop_new:c {xpg@alias@keyvals@#1@#4} }
- \prop_put:cnn { xpg@alias@keyvals@#1@#4 }
- {#2}{#3}
-}
-
-% Patch xkeyval to record default values of keys
-\pretocmd{\XKV@define@default}{%
- \csgdef{xpg@default@opt@\XKV@header #1}{#2}
-}{}{\xpg@warning{Patching xkeyval failed!}}
-
-% Helper to get and register option keyvals
-\def\xpg@parsevariantkeyvalue#1=#2@#3:#4\relax{
- \def\@tmpa{#1}
- \def\@tmpb{variant}
- % variant values are stored in specific macros
- % (\xpg@main@langvariant, \xpg@other@langvariant
- % and \xpg@set@langvariant)
- \ifx\@tmpa\@tmpb\setkeys{#3}{#1=#2}\fi
- \tl_if_empty:nTF{#2}
- {
- \ifcsdef{xpg@default@opt@KV@#4@#1}
- {\xpg@store@opt@keyval#1:\csuse{xpg@default@opt@KV@#4@#1}=:#4\relax}
- {}%
- }
- { \xpg@store@opt@keyval#1:#2:#4\relax }
-}%
-
-% Store option keys and values
-% This strips trailing '=' from values.
-\def\xpg@store@opt@keyval#1:#2=:#3\relax{
- \prop_if_exist:cF { xpg@current@options@#3 }
- { \prop_new:c {xpg@current@options@#3} }
- \prop_put:cnn { xpg@current@options@#3 }
- {#1}{#2}
+% Syntax: \SetLanguageAliasValues{<lang>}{<key>}{<alias vals, comma-separated>}
+\int_new:N \l_xpg_alias_keyvals_int
+\int_set:Nn \l_xpg_alias_keyvals_int { 2 }
+\NewDocumentCommand \SetLanguageAliasValues { m m m }
+{
+ \clist_map_inline:nn { #3 }
+ {
+ \int_const:cn { c_xpg_alias_keyvals_#1_#2_##1_int } { \l_xpg_alias_keyvals_int }
+ }
+ \int_incr:N \l_xpg_alias_keyvals_int
}
+\cs_new:Npn \xpg__keyval_parser:nnN #1 #2 #3 % #1 = key-vals, #2 = language, #3 = prop
+ {
+ \keyval_parse:nnn
+ { \xpg__keyval_parser_default:nnn { #2 } { #3 } }
+ { \xpg__keyval_parser_nondefault:nnnn { #2 } { #3 } }
+ { #1 }
+ }
+\cs_generate_variant:Nn \xpg__keyval_parser:nnN { eeN, enc }
+
+\cs_new:Npn \xpg__keyval_parser_default:nnn #1 #2 #3 % #1 = lang, #2 = prop, #3 = key
+ {
+ \str_set:Nn \l_tempa_str { #1 / #3 }
+ \str_concat:NNN \l_tempa_str \c__keys_default_root_str \l_tempa_str
+ \prop_put:Nne #2 { #1 / #3 } { \use:c { \l_tempa_str } }
+ }
+
+\cs_new:Npn \xpg__keyval_parser_nondefault:nnnn #1 #2 #3 #4 % #1 = lang, #2 = prop, #3 = key, #4 = value
+ {
+ \prop_put:Nnn #2 { #1 / #3 } { #4 }
+ }
\prg_set_conditional:Npnn \__xpg_check_option_value:NNN #1#2#3 { p , T , F , TF }
-{
- \prop_get:cnNTF {xpg@current@options@#1} {#2} \l_tmpa_tl
- {
- \str_if_eq:eeTF{\l_tmpa_tl}{#3}
- {\prg_return_true:}
+ {
+ \bool_lazy_or:nnTF
+ {
+ \str_if_eq_p:ee { \prop_item:Nn \l_xpg_curropt_prop { #1 / #2 } } { #3 }
+ } {
+ \int_compare_p:nNn
{
- \prop_get:cnNTF {xpg@alias@keyvals@#1@#3} {#2} \l_tmpb_tl
- {
- \clist_set:Ne{\l_tmpa_clist}{\l_tmpb_tl}
- \providetoggle{xpgvalfound}
- \togglefalse{xpgvalfound}
- \clist_map_inline:Nn \l_tmpa_clist {
- \str_if_eq:eeT{##1}{\l_tmpa_tl}
- { \toggletrue{xpgvalfound} }
- }
- \iftoggle{xpgvalfound}{\prg_return_true:}{\prg_return_false:}
- }
- {
- \prg_return_false:
- }
- }
- }
- {
- \prg_return_false:
- }
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_#3_int } { 0 }
+ } = {
+ \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_\prop_item:Nn \l_xpg_curropt_prop { #1 / #2 }_int } { 1 }
+ }
+ } { \prg_return_true: } { \prg_return_false: }
+ }
+
+\prg_set_conditional:Npnn \xpg_if_main_language:n #1 { T, F, TF }
+{
+ \str_if_eq:VnTF \xpg_main_language_tl { #1 }
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+\cs_set_eq:NN \IfMainLanguageTF \xpg_if_main_language:nTF
+
+\cs_set_eq:NN \IfMainLanguageT \xpg_if_main_language:nT
+
+\cs_set_eq:NN \IfMainLanguageF \xpg_if_main_language:nF
+
% Test if option value is set
\DeclareDocumentCommand \iflanguageoption { m m m m m }
{
\__xpg_check_option_value:NNNTF{#1}{#2}{#3}{#4}{#5}
}
-
-% Append any variant to csv list of variants
-\define@key{xpg@langvariant}{variant}{
- \clist_if_in:NeF \xpg@vloaded {#1}{
- \clist_gput_right:Ne \xpg@vloaded {#1}
- }
-}
-
% Test if language is loaded
\DeclareDocumentCommand \iflanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@loaded{#1}{#2}{#3}
}
}
@@ -2070,7 +1941,8 @@
% Same for babellanguage is loaded
\DeclareDocumentCommand \ifbabellanguageloaded { m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\clist_if_in:NeTF \xpg@bloaded{#1}{#2}{#3}
}
}
@@ -2078,7 +1950,8 @@
% Same for languageid
\DeclareDocumentCommand \iflanguageidloaded { m m m m }
{
- \AddToHook{begindocument/end}{
+ \hook_gput_code:nnn {begindocument/end} {.}
+ {
\str_case:nnTF {#1}
{
{bcp-47} { \clist_if_in:NeTF \xpg@bcp@loaded{#2}{#3}{#4} }
@@ -2086,7 +1959,7 @@
}
{}
{
- \xpg@error{Invalid~ \string\iflanguageidloaded\space argument:~ #1}
+ \xpg_ill_arg_msg:nn { #1 } { \iflanguageidloaded }
}
}%
}
@@ -2116,53 +1989,46 @@
}
-\newcommand*{\xpg@set@language@nonaux}[2][]{
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_nonaux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@aux}[2][]{
- % Store babelname of current language (for external packages such as biblatex)
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@gbabelname}{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }{
- \edef\babelname{\csuse{#2@gbabelname}}
- }
- }{
- \edef\babelname{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/babelname}}
- }
- % Store BCP-47 id of current language
- \__xpg_store_bcp_info:nn {#1}{#2}
- \@select@language[#1]{#2}
+\cs_new_nopar:Nn \xpg_set_language_aux:nn
+{
+ \__xpg_start_language:nn { #1 } { #2 }
% Write to the aux
- \xpg@set@language@only@aux[#1]{#2}
+ \xpg_set_language_only_aux:nn { #1 } { #2 }
}
-\newcommand*{\xpg@set@language@only@aux}[2][]{
+\cs_new_nopar:Nn \xpg_set_language_only_aux:nn
+{
% Write to the aux (toc files)
\if@filesw
\addtocontents{toc}{\selectlanguage*[#1]{#2}}
\fi
}
-\AtBeginDocument{
+\hook_gput_code:nnn {begindocument} {.}
+{
\if@filesw
- \immediate\write\@mainaux
- {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
+ \immediate\write\@mainaux
+ {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
\fi
}
% Since captions might float to other language regions,
% we need to change the language here (#542)
-\AddToHook{cmd/caption/before}{
+\hook_gput_code:nnn {cmd/caption/before} {.}
+{
\ifhmode\unskip\fi
\addtocontents{lof}{\protect\setforeignlanguage{\languagename}}
\addtocontents{lot}{\protect\setforeignlanguage{\languagename}}
}
% check if language is defined
-\prg_set_conditional:Npnn \__xpg_check_if_exist_l@:n #1 { F, TF }
+\prg_set_conditional:Npnn \__xpg_pattern_check_if_exists:n #1 { F, TF }
{
\bool_lazy_and:nnTF
{ \cs_if_exist_p:c { l@#1 } }
@@ -2171,82 +2037,125 @@
{ \prg_return_false: }
}
-\def\polyglossia@luatex@load@lang#1{
+\cs_new_nopar:Nn \__xpg_luatex_load_lang:n
+{
% if \l@#1 is not properly defined, call lua function newloader(#1),
% and assign the returned number to \l@#1
- \__xpg_check_if_exist_l@:nF {#1}
+ \__xpg_pattern_check_if_exists:nF {#1}
{
\directlua { token.set_char('l@#1', polyglossia.newloader'#1') }
}
}
-% This check is also used by biblatex, so don't
-% rename silently.
-\newcommand\xpg@ifdefined[3]{
+% check if language is defined
+\prg_set_conditional:Npnn \xpg_if_language_defined:n #1 { T, F, TF }
+{
% With luatex, we first need to define \l@#1.
\sys_if_engine_luatex:T
{
- \polyglossia@luatex@load@lang{#1}
+ \__xpg_luatex_load_lang:n {#1}
}
- \__xpg_check_if_exist_l@:nTF{#1}{#2}{#3}
+ \__xpg_pattern_check_if_exists:nTF{#1}
+ { \prg_return_true: }
+ { \prg_return_false: }
+}
+
+% Aliases for gloss files
+\cs_gset_eq:cc { IfLanguageDefinedTF } { xpg_if_language_defined:nTF }
+\cs_gset_eq:cc { IfLanguageDefinedT } { xpg_if_language_defined:nT }
+\cs_gset_eq:cc { IfLanguageDefinedF } { xpg_if_language_defined:nF }
+
+% Check if patterns for language #1 is defined. If not, try
+% the comma-separated list of fallbacks in #2
+\NewDocumentCommand \TryPatternWithFallback { m m }
+{
+ \xpg_if_language_defined:nF { #1 }
+ {
+ \clist_clear_new:N \l_xpg_lang_patterns
+ \clist_set:Ne \l_xpg_lang_patterns { #2 }
+ \bool_set_false:N \l_tmpa_bool
+ \clist_map_inline:Nn \l_xpg_lang_patterns
+ {
+ \xpg_if_language_defined:nT { ##1 }
+ {
+ \cs_gset_eq:cc { l@#1 } { l@##1 }
+ \bool_set_true:N \l_tmpa_bool
+ \clist_map_break:
+ }
+ }
+ \bool_if:NF \l_tmpa_bool
+ {
+ \xpg_warning_msg:n
+ {No~ hyphenation~ patterns~ for~ #1~ found \iow_newline:
+ Falling~ back~ to~ the~ default~ patterns~ (=~English)!}
+ \exp_args:Nc \adddialect {l@#1} 0
+ }
+ }
}
+% This old term is used by biblatex, so don't drop!
+\cs_gset_eq:cc { xpg@ifdefined } { xpg_if_language_defined:nTF }
+
% Set \bbl@hyphendata@\the\language, which is (lua)babel's
% hyphenation pattern hook
% FIXME Clarifiy why/when this is needed.
-\newcommand*\xpg@set@bbl@hyphendata[1]{
+\cs_new:Nn \xpg_set_bbl_hyphendata:n
+{
\sys_if_engine_luatex:T
{
- \ifcsdef{bbl@hyphendata@#1}{}{
- \global\@namedef{bbl@hyphendata@\the\language}{}
+ \cs_if_exist:cF {bbl@hyphendata@#1}
+ {
+ \cs_gset:cpn {bbl@hyphendata@\the\language} {}
}
}
}
% Set hyphenation patterns for a given language. This does the right
% thing both for XeTeX and LuaTeX
-\newcommand*\xpg@set@hyphenation@patterns[1]{
- \sys_if_engine_luatex:T { \polyglossia@luatex@load@lang{#1} }
+\cs_new:Nn \xpg_set_hyphenation_patterns:n
+{
+ \sys_if_engine_luatex:T { \__xpg_luatex_load_lang:n {#1} }
\language=\csname l@#1\endcsname
}
-\newcommand*\@select@language[2][]{
+\cs_new:Nn \__xpg_start_language:nn
+{
% hook for compatibility with biblatex
- \select@language{#2}
- \xpg@set@bbl@hyphendata{\the\language}
+ \select@language { #2 }
+ \xpg_set_bbl_hyphendata:n {\the\language}
\xpg_initial_setup:
- \select@@language[#1]{#2}%
+ \xpg_select_language:nn { #1 } { #2 }
% Hook for external packages such as biblatex
- \polyglossia@language@switched%
- \__xpg_lang_set_par_direction:n{#2}
- \csuse{captions#2}%
- \csuse{date#2}%
+ \polyglossia@language@switched
+ \__xpg_lang_set_par_direction:n {#2}
+ \use:c {captions#2}
+ \use:c {date#2}
% These are hooks for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{captions@bbl@\babelname}
- \cs_if_exist_use:c{date@bbl@\babelname}
- \__xpg_local_marks:n{#2}
- \csuse{init@extras@#2}%
+ \cs_if_exist_use:c {captions@bbl@\babelname}
+ \cs_if_exist_use:c {date@bbl@\babelname}
+ \__xpg_local_marks:n {#2}
+ \use:c {init@extras@#2}
\__xpg_indent_first:n { #2 }
- \csuse{blockextras@#2}%
+ \cs_if_exist_use:c {blockextras@#2}
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
- \cs_if_exist_use:c{blockextras@bbl@\babelname}
- }
+ \cs_if_exist_use:c {blockextras@bbl@\babelname}
+}
% hook for compatibility with biblatex
% (probably no longer used due to the
% more general hook that follows, but
% we keep it for backwards comp.)
-\def\select@language#1{}
+\cs_set:Npn \select@language #1 {}
% Hook for external packages such as biblatex
% do not rename!
-\def\polyglossia@language@switched{}
+\cs_new:Npn \polyglossia@language@switched {}
-% remove all custumization for language #1
+% remove all customization for language #1
\cs_new:Npn \noextrascurrent #1
-{%
+{
\cs_if_exist_use:c{noextras@#1}%
% This is a hook for external packages which want to access variants
% via babelname (such as biblatex)
@@ -2254,160 +2163,105 @@
}
% Common code for `\select@language' and `\foreignlanguage'.
-\newcommand{\select@@language}[2][]{%
+\cs_new:Nn \xpg_select_language:nn
+{
% disable the extras and number settings of the previous language
\cs_if_exist:cT{languagename}
{
\noextrascurrent{\languagename}
\cs_if_exist_use:c{no\languagename @numbers}
\sys_if_engine_xetex:T{
- \__xpg_if_LR_str:eTF{\prop_item:Ne{\g_xpg_langsetup_prop}{\languagename/direction}}
+ \__xpg_if_LR_str:eTF{\prop_item:Ne{\l_xpg_langsetup_prop}{\languagename/direction}}
{
- \__xpg_if_LR_str:eF{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eF{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setnonlatin} % LTR -> RTL
}
{
- \__xpg_if_LR_str:eT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/direction}}
+ \__xpg_if_LR_str:eT{\prop_item:Nn{\l_xpg_langsetup_prop}{#2/direction}}
{\setlatin} % RTL -> LTR
}
}
}
- \polyglossia@set@language@name[#1]{#2}
- % Set the language's/script's font families
- \str_if_eq:eeT{\prop_item:Nn{\g_xpg_langsetup_prop}{#2/lcscript}} {latin}
- {
- \resetfontlatin
- }
- \bool_if:NF \l__xpg_inline_lang_bool
- { % This for non-inline font switches
- % in case a \<lang>font is defined
- \xpg@set@normalfont{#2}
- }
- \xpg@select@fontfamily{#2}
+ \xpg_set_language_name:n { #2 }
+ \xpg_set_normalfont:n { #2 }
+ \xpg_select_fontfamily:n { #2 }
\__xpg_use_or_warn:c{#2@language}
\cs_if_exist_use:c{#2@numbers}
- \use@localhyphenmins[#1]{#2}
+ \__xpg_use_localhyphenmins:nn { #1 } { #2 }
\__xpg_french_spacing:n { #2 }
}
-\let\xpg@pop@language\relax
+\cs_undefine:N \xpg_pop_language:
-%
-% Keep track of the active (nested) languages and options
-%
-\clist_new:N \l_xpg_lang_stack
-
-\cs_new:Nn \__xpg_stack_language:nn
-{
- \clist_gpush:Nn \l_xpg_lang_stack {#1:#2}
-}
+\DeclareDocumentEnvironment { otherlanguage } { O{} m }
+ {
+ \selectlanguage[#1]{#2}
+ } { }
-\cs_generate_variant:Nn \__xpg_stack_language:nn {nx}
+% Alias to {<lang>}, but more suitable
+% for specific (esp. tag-based) aliases
+% where {<alias>} would cause clashes
+% (e.g., \fi)
+\DeclareEnvironmentCopy { lang } { otherlanguage }
-\cs_new:Nn \__xpg_unstack_language:n
+\NewDocumentCommand \setlocalhyphenmins { m m m }
{
- \clist_gpop:NNTF \l_xpg_lang_stack \l_tmpa_tl {
- % Stored format = options:language => split:
- \seq_set_split:Nne \l_tmpa_seq {:} \l_tmpa_tl
- \seq_get_left:NN \l_tmpa_seq \l_tmpb_tl
- \seq_get_right:NN \l_tmpa_seq \l_tmpc_tl
- % Execute passed command with language and maybe options
- % and re-set stored language's keys
- \tl_if_empty:NTF \l_tmpb_tl {\cs_if_exist_use:c{#1}{\l_tmpc_tl}}
- {\__xpg_set_keys:nn{\l_tmpc_tl}{\l_tmpb_tl}
- \cs_if_exist_use:c{#1}[\l_tmpb_tl]{\l_tmpc_tl}
- }
- }
- {}
-}
-
-\DeclareDocumentEnvironment { otherlanguage } { O{} m }
- {
- % Get real current (pre-switch) options (incl. defaults)
- \clist_clear_new:N \l_xpg_current_options
- \prop_if_exist:cF { xpg@current@options@\languagename }
- { \prop_new:c {xpg@current@options@\languagename} }
- \prop_map_inline:cn {xpg@current@options@\languagename}
+ \xpg_if_language_defined:nTF{#1}
+ {
+ \cs_if_eq:ccTF { l@#1 } { l@nohyphenation }
{
- \clist_put_right:Nn \l_xpg_current_options {##1=##2}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
+ }{
+ \providehyphenmins{#1}{#2#3}
}
- % Store current (pre-switch) options and language on stack
- \__xpg_stack_language:nx{\clist_use:Nn \l_xpg_current_options {,}}{\languagename}
- \selectlanguage[#1]{#2}
- }
- {
- % restore previous language in aux file and remove closed one from stack
- \__xpg_unstack_language:n{xpg@set@language@only@aux}
- }
-
-\newcommand{\setlocalhyphenmins}[3]{
- \xpg@ifdefined{#1}{
- \expandafter\ifx\csname l@#1\endcsname\l@nohyphenation
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unhyphenated~ language~ #1}
- \else
- \providehyphenmins{#1}{#2#3}
- \fi
}{
- \xpg@warning{\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
+ \xpg_warning_msg:n {\string\setlocalhyphenmin\space~ useless~ for~ unknown~ language~ #1}
}
}
% \setlanghyphenmins[options]{lang}{l}{r}
-\newcommand*\setlanghyphenmins[4][]{%
+\NewDocumentCommand \setlanghyphenmins { O{} m m m }
+{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
- \bgroup
- \xpg_error_if_lang_not_loaded:n{\xpg@tmp@lang}
- \__xpg_set_keys:nn{\xpg@tmp@lang}{\xpg@tmp@opts}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n{\l_tmp_lang_tl}
+ \SetGlossOptions{\l_tmp_lang_tl}{ \l_tmp_opts_tl }
% Store bcp47.tag@hypenmins
- \tl_if_blank:nTF {\xpg@tmp@opts}{%
- \ifcsundef{\csname xpg@tmp@lang\endcsname @g.bcp47.tag}{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }{
- \csedef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csedef{tmp@bcp47.tag}{\prop_item:Ne{\g_xpg_langsetup_prop}{ \xpg@tmp@lang / bcp47 }}
- }
- \csgdef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{{#3}{#4}}
- \egroup
+ \cs_set_nopar:cpe {tmp@bcp47.tag} { \prop_item:Ne{\l_xpg_langsetup_prop}{ \l_tmp_lang_tl / bcp47 } }
+ \cs_gset:cpn {\csname tmp@bcp47.tag\endcsname @hyphenmins} {{#3}{#4}}
+ \c_group_end_token
}
-% \use@localhypenmins[options]{lang}
-\newcommand*\use@localhyphenmins[2][]{
- \bgroup
- \xpg_error_if_lang_not_loaded:n{#2}
- \__xpg_set_keys:nn{#2}{#1}
+% \__xpg_use_localhyphenmins:nn {options}{lang}
+\cs_new_nopar:Nn \__xpg_use_localhyphenmins:nn
+{
+ \c_group_begin_token
+ \xpg_error_if_lang_not_loaded:n {#2}
+ \SetGlossOptions {#2} {#1}
% Use bcp47.tag@hypenmins
- \tl_if_blank:nTF {#1}{
- \ifcsundef{#2@g.bcp47.tag}{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }{
- \csxdef{tmp@bcp47.tag}{\csuse{#2@g.bcp47.tag}}
- }
- }{
- \csxdef{tmp@bcp47.tag}{\prop_item:Nn{\g_xpg_langsetup_prop}{ #2 / bcp47 }}
- }
- \egroup
- \ifcsundef{\csname tmp@bcp47.tag\endcsname @hyphenmins}{
- \ifcsundef{#2hyphenmins}{}
+ \cs_gset_nopar:cpe {tmp@bcp47.tag} { \prop_item:Nn{\l_xpg_langsetup_prop}{ #2 / bcp47 } }
+ \c_group_end_token
+ \cs_if_exist:cTF {\csname tmp@bcp47.tag\endcsname @hyphenmins}
+ {
+ \tl_set:Ne \l_tmpa_tl { \use:c{\csname tmp@bcp47.tag\endcsname @hyphenmins} }
+ \expandafter \set@hyphenmins \l_tmpa_tl
+ }{
+ \cs_if_exist:cT{#2hyphenmins}
{
\expandafter\expandafter\expandafter\set@hyphenmins\csname #2hyphenmins\endcsname\relax
}
- }{
- \edef\tmpa{\csuse{\csname tmp@bcp47.tag\endcsname @hyphenmins}}
- \expandafter\expandafter\expandafter\set@hyphenmins\tmpa\relax
}
- \sys_if_engine_luatex:T{
+ \sys_if_engine_luatex:T
+ {
% Set \totalhyphenmin if specified
- \prop_get:NeNTF \g_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpa_tl
+ \prop_get:NeNT \l_xpg_langsetup_prop {#2/totalhyphenmin} \l_tmpb_tl
{
- \xpg@info{totalhyphenmin: '\l_tmpa_tl'}
- \expandafter\hyphenationmin \l_tmpa_tl
+ \xpg_info_msg:n {totalhyphenmin: '\l_tmpb_tl'}
+ \expandafter\hyphenationmin \l_tmpb_tl
}
- {}
}
}
@@ -2419,23 +2273,26 @@
\DeclareDocumentEnvironment { hyphenrules } { O{} m }
{
% Check for real language name and options
- \edef\xpg@tmp@opts{\xpg_alias_add_to_option_i:nn{#2}{#1}}
- \edef\xpg@tmp@lang{\xpg_alias_base_lang:n{#2}}
+ \tl_set:Nx \l_tmp_opts_tl { \xpg_alias_add_to_option_i:nn{#2}{#1} }
+ \tl_set:Nx \l_tmp_lang_tl { \xpg_alias_base_lang:n{#2} }
% Register the language options
- \__xpg_set_language_options:nnn {\xpg@tmp@lang} {\xpg@tmp@opts} {@xpg@set@langvariant}
+ \__xpg_set_language_options:nn { \l_tmp_lang_tl } { \l_tmp_opts_tl }
% Now switch patterns
- \__xpg_use_or_warn:c{\use:c{xpg@tmp@lang}@language}
+ \__xpg_use_or_warn:c{\use:c{l_tmp_lang_tl}@language}
% And activate hyphenmins
- \use@localhyphenmins[\xpg@tmp@opts]{\xpg@tmp@lang}
+ \__xpg_use_localhyphenmins:nn { \l_tmp_opts_tl } { \l_tmp_lang_tl }
}
{ }
-\AddToHook{begindocument/before}{
- \IfPackageLoadedTF{bidi}{
- \providecommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}
+\hook_gput_code:nnn {begindocument/before} {.}
+{
+ \IfPackageLoadedTF{bidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hboxR{#1}}$ }
}{}
- \IfPackageLoadedTF{luabidi}{
- \providecommand*{\aemph}[1]{$\overline{\hbox{\RL{#1}}}$}
+ \IfPackageLoadedTF{luabidi}
+ {
+ \ProvideDocumentCommand \aemph { m } { $\overline{\hbox{\RL{#1}}}$ }
}{}
}
@@ -2469,7 +2326,8 @@
.value_required:n = true,
}
-\keys_set:nn { polyglossia } {
+\keys_set:nn { polyglossia }
+{
localmarks = false,
verbose = true,
babelshorthands = false,
@@ -2486,23 +2344,35 @@
\sys_if_engine_luatex:T{
\str_if_eq:eeF{\g_xpg_luatex_renderer_str}{none}
{
- \xpg@info{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
+ \xpg_info_msg:n{Setting~ LuaTeX~ font~ renderer~ to~ \g_xpg_luatex_renderer_str}
\exp_args:Ne \defaultfontfeatures{Renderer=\g_xpg_luatex_renderer_str}
}
}
-\bool_if:nF \g_xpg_verbose_bool {
- \gdef\@latex@info#1{\relax} % no latex info
- \gdef\@font@info#1{\relax} % no latex font info
- \gdef\@font@warning#1{\relax} % no latex font warnings
- \gdef\zf@PackageInfo#1{\relax} % no fontspec info
- \gdef\xpg@info#1{\relax} % no polyglossia info
+\bool_if:nF \g_xpg_verbose_bool
+{
+ \cs_gset_nopar:Npn \@latex@info #1 { \relax } % no latex info
+ \cs_gset_nopar:Npn \@font@info #1 { \relax } % no latex font info
+ \cs_gset_nopar:Npn \@font@warning #1 { \relax } % no latex font warnings
+ \msg_redirect_module:nnn { fontspec } { info } { none } % no fontspec info
+ \msg_redirect_module:nnn { polyglossia } { info } { none } % no polyglossia info
}
\bool_if:nT \g_xpg_localmarks_bool {
\__xpg_enable_local_marks:
}
+% common code to initiate babelshordhands in glosses
+\cs_new:Npn \InitializeBabelShorthands
+{
+ \cs_if_exist:cF {initiate@active@char}
+ {
+ \file_input:n {babelsh.def}
+ \initiate@active@char{"}
+ \shorthandoff{"}
+ }
+}
+
% Control shorthand (de-)activation
% This checks that the shorthand char is only deactivated
% if we have activated it ourselves and hence keeps
@@ -2530,21 +2400,22 @@
% Inherit shorthands in other languages
\NewDocumentCommand \inheritbabelshorthands { m m }
{
- \AddToHook{begindocument/before}{
+ \hook_gput_code:nnn {begindocument/before} {.}
+ {
% Load the involved languages if necessary
% Error if they do not exist
\tl_set:Nn \l__xpg_tmpa_lang_tl { \xpg_alias_base_lang:n{#1} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpa_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpa_lang_tl .ldf}
{ \setotherlanguage{#1} }
- { \xpg@error{ Source~ language~ #1,~ used~ in~
+ { \xpg_error_msg:n { Source~ language~ #1,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
\tl_set:Nn \l__xpg_tmpb_lang_tl { \xpg_alias_base_lang:n{#2} }
\clist_if_in:NeF \xpg@loaded {\l__xpg_tmpb_lang_tl}{
\file_if_exist:nTF{gloss-\l__xpg_tmpb_lang_tl .ldf}
{ \setotherlanguage{#2} }
- { \xpg@error{ Target~ language~ #2,~ used~ in~
+ { \xpg_error_msg:n { Target~ language~ #2,~ used~ in~
\string\inheritbabelshorthands,~ does~ not~ exist } }
}
% Test whether the requested shorthands exist
@@ -2556,7 +2427,7 @@
{ \bool_set_true:N \l__xpg_no_shorthands_bool }
\bool_if:nT { \l__xpg_no_shorthands_bool }
{
- \xpg@error{ No~ babel~ shorthands~ exist~ for~ language~ #1 }
+ \xpg_error_msg:n { No~ babel~ shorthands~ exist~ for~ language~ #1 }
}
% If so, apply:
\bool_if:nF { \l__xpg_no_shorthands_bool }
@@ -2581,7 +2452,7 @@
\iflanguageloaded{\l__xpg_tmpa_lang_tl}{
\use:c{\l__xpg_tmpa_lang_tl @shorthands}
}{
- \xpg@error{ Language~ #1,~ requested~ in~
+ \xpg_error_msg:n { Language~ #1,~ requested~ in~
\string\startbabelshorthands,~ is~ not~ loaded }
}
}
diff --git a/Master/texmf-dist/tex/latex/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/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
index c13d91729ab..e37ce44eeb0 100644
--- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
+++ b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
@@ -3,7 +3,8 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2024/05/31 3.04c Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2024/07/13 3.04d Aide pour l'utilisation de LaTeX en lycee]
+% 3.04d PitonInputFile et styles
% 3.04c Max et min pour des fonctions
% 3.04b Travail sur la loi binomiale + Ajout de clés pour les environnements graphiques
% 3.04a Améliorations de la partie graphiques tikz (intégrales, axes) + Factorielle
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
index 418c5aa8cca..0cb6600617a 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex
@@ -2,6 +2,7 @@
% Copyright 2023-2024 Cédric Pierquet
% Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+%3.04d PitonInputFile et styles, pour compatibilité pfm
%3.03c Thonny via piton + modification clé gobble ?
%3.01f PseudoCode via piton (?)
%3.01e Correction du comportement de la console repl piton/pyluatex
@@ -220,6 +221,57 @@
\endtcolorbox%
}
+%inputfile
+\NewDocumentCommand\CodePitonFichier{ O{} m D<>{} }{%
+ {\tcbset{reset}
+ \useKVdefault[envpiton]%
+ \setKV[envpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %------les styles piton
+ \SetPitonStyle{ Number = \color{\CODPITcolnb} }
+ \ifboolKV[envpiton]{Lignes}%si lignes=true
+ {\PitonOptions{left-margin=0.75em,line-numbers,line-numbers={skip-empty-lines=false,label-empty-lines=true,#3}}}%left-margin=auto,
+ {}%
+ \PitonOptions{break-lines,indent-broken-lines,continuation-symbol={\;}}%,numbers-sep=0.65em}%language=Python}
+ %------les styles tcbox
+ \IfEq{\CODPITstyle}{Moderne}%style Moderne (défaut)
+ {%
+ \tcbset{cadre/.style={}}
+ \tcbset{titre/.style={}}
+ \tcbset{stylebase/.style={stylepiton,colframe=CouleurVertForet,colback=CouleurVertForet!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}}
+ \ifboolKV[envpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ }
+ {}%
+ \IfEq{\CODPITstyle}{Classique}%style Classique
+ {%
+ \ifboolKV[envpiton]{Lignes}%si lignes=true
+ {\tcbset{stylebase/.style={thonnystylelineos,leftupper=0.75em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ {\tcbset{stylebase/.style={thonnystyle,leftupper=0.4em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ \ifboolKV[envpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ \ifboolKV[envpiton]{BarreTitre}%
+ {%
+ \ifboolKV[envpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}%
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}%
+ \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black}}
+ }%
+ {%
+ \tcbset{titre/.style={notitle}}
+ \ifboolKV[envpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}
+ }
+ }
+ {}%
+ %on crée la boîte
+ \tcolorbox[stylebase,filigrane,cadre,titre]
+ \PitonInputFile{#2}
+ \endtcolorbox}%
+}
+
%piton >= 2.4
\NewPitonEnvironment{PseudoCodePiton}{ O{} m D<>{} }%
{%
@@ -317,6 +369,86 @@
\endtcolorbox%
}
+%--inputfile
+\NewDocumentCommand\PseudoCodePitonFichier{ O{} m D<>{} }{%
+ {\tcbset{reset}
+ \useKVdefault[envpcpiton]%
+ \setKV[envpcpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %------les styles piton
+ \ifboolKV[envpcpiton]{Lignes}%si lignes=true
+ {\PitonOptions{left-margin=0.75em,all-line-numbers}}%left-margin=auto,
+ {}%
+ \PitonOptions{break-lines,indent-broken-lines,language=minimal,continuation-symbol={\;}}%,numbers-sep=0.65em}%
+ \SetPitonStyle{ Number = }
+ \ifboolKV[envpcpiton]{Couleurs}%
+ {%
+ \SetPitonIdentifier[minimal]{Algorithme,Fonction,Début,Paramètre,Paramètres,Faire,Fin,Si,Pour,Tant,Que,que,alors,Alors,Sinon,SinonSi,FinSi,FinPour,FinTantQue,TantQue,Variable,Variables,Procédure}{\color{MotsClesPseudoCodeA}}
+ \SetPitonIdentifier[minimal]{Afficher,Renvoyer,Saisir}{\color{MotsClesPseudoCodeB}}
+ % \PitonOptions{
+ % identifiers =
+ % {
+ % names = {Algorithme,Fonction,Début,Paramètre,Paramètres,allant,Faire,Fin,Si,Pour,Tant,Que,que,alors,Alors,Sinon,SinonSi,FinSi,FinPour,FinTantQue,TantQue,Variable,Variables,Procédure},
+ % style = \color{MotsClesPseudoCodeA}
+ % } ,
+ % identifiers =
+ % {
+ % names = {Afficher,Retourner,Saisir},
+ % style = \color{MotsClesPseudoCodeB}
+ % }
+ % }%
+ \SetPitonStyle
+ {
+ String = \color{MotsClesPseudoCodeChaine},
+ Comment = \itshape\color{gray},
+ }
+ }%
+ {%
+ \SetPitonStyle
+ {
+ String = ,
+ Comment = \itshape
+ }
+ }%
+ %------les styles tcbox
+ \IfEq{\CODPITPCstyle}{Moderne}%style Moderne (défaut)
+ {%
+ \tcbset{cadre/.style={}}
+ \tcbset{titre/.style={}}
+ \tcbset{stylebase/.style={stylepcpiton,colframe=CouleurVertForet,colback=CouleurVertForet!5,width=\CODPITPClargeur,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign,leftupper=0.75em}}
+ \ifboolKV[envpcpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faCode},watermark opacity=0.175,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ }
+ {}%
+ \IfEq{\CODPITPCstyle}{Classique}%style Classique
+ {%
+ \ifboolKV[envpcpiton]{Lignes}%si lignes=true
+ {\tcbset{stylebase/.style={thonnypcstylelineos,leftupper=0.75em,width=\CODPITPClargeur,colframe=darkgray!50!black,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign}}}%
+ {\tcbset{stylebase/.style={thonnypcstyle,leftupper=0.4em,width=\CODPITPClargeur,colframe=darkgray!50!black,fontupper=\CODPITPCfonte,fontlower=\CODPITPCfonte,\CODPITPCalign}}}%
+ \ifboolKV[envpcpiton]{Filigrane}%si filigrane
+ {\tcbset{filigrane/.style={watermark text={\faCode},watermark opacity=0.25,watermark zoom=0.50}}}%
+ {\tcbset{filigrane/.style={}}}%
+ \ifboolKV[envpcpiton]{BarreTitre}%
+ {%
+ \ifboolKV[envpcpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}%
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}%
+ \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITPCtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black}}
+ }%
+ {%
+ \tcbset{titre/.style={notitle}}
+ \ifboolKV[envpcpiton]{Cadre}
+ {\tcbset{cadre/.style={}}}
+ {\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}
+ }
+ }
+ {}%
+ %on crée la boîte
+ \tcolorbox[stylebase,filigrane,cadre,titre]
+ \PitonInputFile{#2}%
+ \endtcolorbox}%
+}
+
%======CONSOLE PYLUATEX (package à charger manuellement !!)
\tcbset{consolepylua/.style={%base de la boîte
enhanced,colback=white,colframe=CouleurVertForet,sharp corners,boxrule=1pt,%
@@ -428,6 +560,18 @@
\endtcolorbox%
}%
+\NewDocumentCommand\PitonThonnyEditorFichier{ D<>{} O{\linewidth} m }{%
+ {\restoreKV[pitonthonny]%
+ \setKV[pitonthonny]{#1}%
+ \settowidth{\LargeurNumbersThonny}{\footnotesize\texttt{00}}%
+ \PitonOptions{left-margin=\LargeurNumbersThonny+1mm,line-numbers,line-numbers={skip-empty-lines=false,label-empty-lines=true},break-lines,indent-broken-lines,continuation-symbol={}}%
+ \tcbset{tcbthonnypiton/.style={title=\vphantom{pf}\thonnypitonfilename\:\textcolor{gray}{×}},before skip=0.33\baselineskip,after skip=0.33\baselineskip}%
+ \tcolorbox[sharp corners=all,enhanced,size=small,width=#2,colframe=gray,colback=lightgray!5,tcbthonnypiton,fonttitle=\scriptsize\sffamily,coltitle=black,
+ attach boxed title to top left={yshift*=-0.4pt},fontupper=\footnotesize,bottom=-0.25mm,boxed title style={size=tight,colback=lightgray!15,sharp corners=all,boxrule=0.4pt,boxsep=2pt},boxrule=0.4pt,overlay={\begin{tcbclipinterior}\fill[draw=none,gray!25] ([shift={(0.4pt,0.4pt)}]frame.south west) rectangle ([shift={(\LargeurNumbersThonny+1mm+0.8pt,-0.4pt)}]frame.north west) ;\end{tcbclipinterior}}]%
+ \PitonInputFile{#3}
+ \endtcolorbox}%
+}%
+
\NewDocumentEnvironment{PitonThonnyConsole}{ D<>{} O{} m }%
{
\restoreKV[pitonthonny]%
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
index cd01f4393b3..89fe8945032 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-stats.tex
@@ -75,6 +75,69 @@
\expandafter\def\csname\RegLinCoeffrd\endcsname{\fpeval{\csname\RegLinCoeffr\endcsname*\csname\RegLinCoeffr\endcsname}}
}
+\defKV[coeffregquad]{%
+ NomCoeffa=\def\RegQuadCoeffa{#1},%
+ NomCoeffb=\def\RegQuadCoeffb{#1},%
+ NomCoeffc=\def\RegQuadCoeffc{#1},%
+ NomXmin=\def\RegQuadCoeffXmin{#1},%
+ NomXmax=\def\RegQuadCoeffXmax{#1}
+}
+
+\setKVdefault[coeffregquad]{%
+ NomCoeffa=COEFFa,%
+ NomCoeffb=COEFFb,%
+ NomCoeffc=COEFFc,%
+ NomXmin=LXmin,%
+ NomXmax=LXmax
+}
+
+\newcommand\CalculsRegQuad[3][]{%
+ \useKVdefault[coeffregquad]%
+ \setKV[coeffregquad]{#1}% on paramètres les nouvelles clés et on les simplifie
+ %xmin et xmax
+ \expandafter\def\csname\RegQuadCoeffXmin\endcsname{\xintfloateval{min(#2)}}%
+ \expandafter\def\csname\RegQuadCoeffXmax\endcsname{\xintfloateval{max(#2)}}%
+ %listes des données
+ \def\xliste{#2}%
+ \def\yliste{#3}%
+ \readlist*\LX{\xliste}%
+ \readlist*\LY{\yliste}%
+ %taille des listes
+ \def\LNB{\inteval{\LXlen}}
+ %somme importantes
+ \xdef\LXSomme{0}%
+ \xdef\LXCSomme{0}%
+ \xdef\LYSomme{0}%
+ \xdef\LXXSomme{0}%
+ \xdef\LXYSomme{0}%
+ \xdef\LXXCSomme{0}%
+ \xdef\LXCXCSomme{0}%
+ \xdef\LXCYSomme{0}%
+ %calculs
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LXSomme{\xintfloateval{\LXSomme+\LX[\i]}}%
+ \xdef\LXCSomme{\xintfloateval{\LXCSomme+(\LX[\i])^2}}%
+ }%
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LYSomme{\xintfloateval{\LYSomme+\LY[\i]}}%
+ }%
+ \xdef\LXmoy{\xintfloateval{\LXSomme/\LNB}}%
+ \xdef\LYmoy{\xintfloateval{\LYSomme/\LNB}}%
+ \xdef\LXCmoy{\xintfloateval{\LXCSomme/\LNB}}%
+ %calculs suites
+ \foreach \i in {1,2,...,\LNB}{%
+ \xdef\LXXSomme{\xintfloateval{\LXXSomme+(\LX[\i]-\LXmoy)^2}}%
+ \xdef\LXYSomme{\xintfloateval{\LXYSomme+(\LX[\i]-\LXmoy)*(\LY[\i]-\LYmoy)}}%
+ \xdef\LXXCSomme{\xintfloateval{\LXXCSomme+(\LX[\i]-\LXmoy)*((\LX[\i])*(\LX[\i])-\LXCmoy)}}%
+ \xdef\LXCXCSomme{\xintfloateval{\LXCXCSomme+((\LX[\i])^2-\LXCmoy)^2}}%
+ \xdef\LXCYSomme{\xintfloateval{\LXCYSomme+((\LX[\i])^2-\LXCmoy)*(\LY[\i]-\LYmoy)}}%
+ }%
+ %COEFFS OK
+ \expandafter\def\csname\RegQuadCoeffb\endcsname{\xintfloateval{(\LXYSomme*\LXCXCSomme-\LXCYSomme*\LXXCSomme)/(\LXXSomme*\LXCXCSomme-(\LXXCSomme)^2)}}%
+ \expandafter\def\csname\RegQuadCoeffa\endcsname{\xintfloateval{(\LXCYSomme*\LXXSomme-\LXYSomme*\LXXCSomme)/(\LXXSomme*\LXCXCSomme-(\LXXCSomme)^2)}}%
+ \expandafter\def\csname\RegQuadCoeffc\endcsname{\xintfloateval{\LYmoy-\csname\RegQuadCoeffb\endcsname*\LXmoy-\csname\RegQuadCoeffa\endcsname*\LXCmoy}}%
+}
+
%pour un nuage en TiKz
\defKV[nuagereglin]{%
Couleur=\def\RegLinNuageCouleur{#1},%
diff --git a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
index a7f494f0312..4fe6a63aa2c 100644
--- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
@@ -1,10 +1,10 @@
-% $Id: pst-node.sty 438 2022-01-31 17:45:26Z herbert $
+% $Id: pst-node.sty 919 2024-07-10 18:31:27Z herbert $
%%
%% This is file `pst-node.sty'.
%%
%% IMPORTANT NOTICE:
%%
-%% pst-node.sty Copyright (C) 2004-2017 Herbert Voss <voss@perce.de>
+%% pst-node.sty Copyright (C) 2004-2024 Herbert Voss <voss@perce.de>
%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
%%
%% This package may be distributed under the terms of the LaTeX Project
@@ -14,7 +14,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-node}
- [2012/09/18 v1.01 LaTeX wrapper for `pst-node' (HV)]
+ [2024/07/10 v1.02 LaTeX wrapper for `pst-node' (HV)]
%
\newif\ifpst@OldVersion\pst@OldVersionfalse
\DeclareOption{97}{\pst@OldVersiontrue}
@@ -32,13 +32,14 @@
\@addtofilelist{pst-node97.pro}}{}%
\else
\RequirePackage{pstricks}
-\ProvidesPackage{pst-node}[2010/04/22 package wrapper for pst-node.tex]
+\ProvidesPackage{pst-node}[2024/07/10 package wrapper for pst-node.tex]
\input{pst-node.tex}
\ProvidesFile{pst-node.tex}
[\filedate\space \fileversion\space `pst-node' (tvz,hv)]
\IfFileExists{pst-node.pro}{%
\ProvidesFile{pst-node.pro}
- [2014/01/27 v. 1.15, PostScript prologue file (hv)]
+ [2024/07/10 v. 1.15a, PostScript prologue file (hv)]
\@addtofilelist{pst-node.pro}}{}%
\fi
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/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/responsive/responsive.sty b/Master/texmf-dist/tex/latex/responsive/responsive.sty
index 65e5061f455..289f04ca8bb 100644
--- a/Master/texmf-dist/tex/latex/responsive/responsive.sty
+++ b/Master/texmf-dist/tex/latex/responsive/responsive.sty
@@ -3,7 +3,7 @@
\RequirePackage{expl3,l3keys2e}
\RequirePackage{kvoptions}
\ProvidesExplPackage{responsive}
-{2023-12-15}{0.1}{Responsive design for LaTeX}
+{2024-07-14}{v0.1a}{Responsive design for LaTeX}
%%%%%%%%%%%%%%%%%%%%%%
% keyval processing %
@@ -168,6 +168,10 @@
\@setfontsize#1{\resp_multiply_note:nnn\resp_font_size{#2}{1}}{\resp_multiply_note:nnn\resp_line_skip{#2}{\l_resp_lineheight_multiplier}}
}
+% This is a dummy definition. It should restore page dimensions using the Geometry package if it is loaded.
+% The correct definition is added in \AtBeginDocument
+\cs_set:Npn\resp_reset_geometry{}
+
% recalculate \textheight and \headheight with the changed font size
% this is necessary to prevent the underfull \vbox messages from the output rutine
\cs_set:Npn\resp_textheight:n {
@@ -182,6 +186,9 @@
\setlength\headheight{\resp_font_size}
\setlength\headsep {1.5\resp_font_size}
\setlength\footskip{\fp_to_dim:n{2*\resp_font_size+1}}
+ \setlength\topmargin{\fp_to_dim:n{(\paperheight-\textheight -\headheight-\headsep-\footskip)/2 - 1in}}
+ \resp_reset_geometry
+ % \addtolength\topmargin{\topskip}
}
% the functionality to fix the textheight should be available as a document command
@@ -355,6 +362,9 @@
% setup font sizes at the begin document, in order to support Geometry etc.
\AtBeginDocument{
+ \@ifpackageloaded{geometry}{
+ \cs_set:Npn\resp_reset_geometry{\Gm@process}
+ }{}
% set the default font size, based on numbers of characters we want to show on a line of text
% \fonttobox[32]\textwidth{\tl_range:Nnn\l_resp_charlist_tl{1}{\l_resp_charlines_int}}%
\bool_if:NTF\l_resp_no_execute {}{
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty
index a11d6f6325c..6215da68498 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-07-31} {4.3.1}
{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..badcca87339 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-07-31} {4.3.1}
{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..d90249d449d 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-07-31} {4.3.1}
{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..416c4f3788c 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-07-31} {4.3.1}
{A thesis class for the Chair of Software Engineering II}
\prg_new_conditional:Nnn \slcd_package_if_loaded:n { p, T, F, TF }
{
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl
index 0a68a9ef062..5c7f1f86166 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/07/31]
\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..ade918f74a4 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/07/31]
\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 003fefc5b6b..8b0d98c517f 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/05 13.0.0 Simple Icons 13.0.0 Logos]
+\ProvidesPackage{simpleicons}[2024/08/02 13.3.0 Simple Icons 13.3.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 001ee745513..d231da24c5e 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
@@ -1076,2076 +1076,2084 @@
\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@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{37}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{38}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{39}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{40}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{41}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{42}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{43}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{44}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{45}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{46}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{47}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{48}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{49}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{50}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{51}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{52}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{53}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{54}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{55}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{56}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{57}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{58}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{59}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{60}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{61}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{62}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{63}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{64}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{65}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{66}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{67}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{68}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{69}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{70}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{71}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{72}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{73}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{74}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{75}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{76}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{77}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{78}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{79}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{80}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{81}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{82}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{83}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{84}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{85}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{86}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{87}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{88}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{89}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{90}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{91}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{92}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{93}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{94}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{95}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{96}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{97}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{98}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{99}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{100}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{101}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{102}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{103}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{104}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{105}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{106}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{107}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{108}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{109}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{110}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{111}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{112}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{113}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{114}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{115}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{116}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{117}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{118}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{119}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{120}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{121}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{122}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{123}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{124}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{125}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{126}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{127}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{128}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{129}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{130}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{131}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{132}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{133}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{134}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{135}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{136}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{137}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{138}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{139}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{140}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{141}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{142}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{143}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{144}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{145}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{146}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{147}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{148}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{149}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{150}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{151}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{152}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{153}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{154}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{155}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{156}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{157}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{158}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{159}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{160}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{161}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{162}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{163}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{164}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{165}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{166}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{167}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{168}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{169}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{170}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{171}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{172}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{173}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{174}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{175}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{176}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{177}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{178}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{179}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{180}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{181}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{182}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{183}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{184}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{185}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{186}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{187}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{188}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{189}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{190}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{191}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{192}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{193}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{194}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{195}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{196}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{197}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{198}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{199}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{200}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{201}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{202}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{203}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{204}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{205}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{206}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{207}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{208}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{209}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{210}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{211}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{212}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{213}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{214}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{215}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{216}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{217}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{218}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{219}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{220}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{221}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{222}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{223}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{224}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{225}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{226}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{227}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{228}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{229}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{230}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{231}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{232}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{233}}
- \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{234}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{235}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{236}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{237}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{238}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{239}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{240}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{241}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{242}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{243}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{244}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{245}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{246}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{247}}
- \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{248}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{249}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmapnine\symbol{250}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmapnine\symbol{251}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmapnine\symbol{252}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmapnine\symbol{253}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmapnine\symbol{254}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmapnine\symbol{255}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{0}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{1}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{2}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{3}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{4}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{5}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{6}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{7}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{8}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{9}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{10}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{11}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{12}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{13}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{14}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{15}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{16}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{17}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{18}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{19}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{20}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{21}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{22}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{23}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{24}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{25}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{26}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{27}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{28}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{29}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{30}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{31}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{32}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{33}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{34}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{35}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{36}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{37}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{38}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{39}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{40}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{41}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{42}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{43}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{44}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{45}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{46}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{47}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{48}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{49}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{50}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{51}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{52}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{53}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{54}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{55}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{56}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{57}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{58}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{59}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{60}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{61}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{62}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{63}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{64}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{65}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{66}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{67}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{68}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{69}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{70}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{71}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{72}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{73}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{74}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{75}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{76}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{77}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{78}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{79}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{80}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{81}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{82}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{83}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{84}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{85}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{86}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{87}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{88}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{89}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{90}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{91}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{92}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{93}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{94}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{95}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{96}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{97}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{98}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{99}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{100}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{101}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{102}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{103}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{104}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{105}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{106}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{107}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{108}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{109}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{110}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{111}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{112}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{113}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{114}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{115}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{116}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{117}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{118}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{119}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{120}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{121}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{122}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{123}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{124}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{125}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{126}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{127}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{128}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{129}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{130}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{131}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{132}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{133}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{134}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{135}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{136}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{137}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{138}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{139}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{140}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{141}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{142}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{143}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{144}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{145}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{146}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{147}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{148}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{149}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{150}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{151}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{152}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{153}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{154}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{155}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{156}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{157}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{158}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{159}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{160}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{161}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{162}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{163}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{164}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{165}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{166}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{167}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{168}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{169}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{170}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{171}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{172}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{173}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{174}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{175}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{176}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{177}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{178}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{179}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{180}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{181}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{182}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{183}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{184}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{185}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{186}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{187}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{188}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{189}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{190}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{191}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{192}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{193}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{194}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{195}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{196}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{197}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{198}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{199}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{200}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{201}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{202}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{203}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{204}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{205}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{206}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{207}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{208}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{209}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{210}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{211}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{212}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{213}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{214}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{215}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{216}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{217}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{218}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{219}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{220}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{221}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{222}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{223}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{224}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{225}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{226}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{227}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{228}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{229}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{230}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{231}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{232}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{233}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{234}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{235}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{236}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{237}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{238}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{239}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{240}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{241}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{242}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{243}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{244}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{245}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{246}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{247}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{248}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{249}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponezero\symbol{250}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponezero\symbol{251}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponezero\symbol{252}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponezero\symbol{253}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponezero\symbol{254}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponezero\symbol{255}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{0}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{1}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{2}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{3}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{4}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{5}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{6}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{7}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{8}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{9}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{10}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{11}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{12}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{13}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{14}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{15}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{16}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{17}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{18}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{19}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{20}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{21}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{22}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{23}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{24}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{25}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{26}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{27}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{28}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{29}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{30}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{31}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{32}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{33}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{34}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{35}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{36}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{37}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{38}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{39}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{40}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{41}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{42}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{43}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{44}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{45}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{46}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{47}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{48}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{49}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{50}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{51}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{52}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{53}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{54}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{55}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{56}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{57}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{58}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{59}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{60}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{61}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{62}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{63}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{64}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{65}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{66}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{67}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{68}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{69}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{70}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{71}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{72}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{73}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{74}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{75}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{76}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{77}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{78}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{79}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{80}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{81}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{82}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{83}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{84}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{85}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{86}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{87}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{88}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{89}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{90}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{91}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{92}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{93}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{94}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{95}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{96}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{97}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{98}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{99}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{100}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{101}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{102}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{103}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{104}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{105}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{106}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{107}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{108}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{109}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{110}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{111}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{112}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{113}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{114}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{115}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{116}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{117}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{118}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{119}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{120}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{121}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{122}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{123}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{124}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{125}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{126}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{127}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{128}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{129}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{130}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{131}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{132}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{133}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{134}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{135}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{136}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{137}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{138}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{139}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{140}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{141}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{142}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{143}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{144}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{145}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{146}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{147}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{148}}
- \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{149}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{150}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{151}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{152}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{153}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{154}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{155}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{156}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{157}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{158}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{159}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{160}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{161}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{162}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{163}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{164}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{165}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{166}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{167}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{168}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{169}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{170}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{171}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{172}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{173}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{174}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{175}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{176}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{177}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{178}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{179}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{180}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{181}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{182}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{183}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{184}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{185}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{186}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{187}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{188}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{189}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{190}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{191}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{192}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{193}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{194}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{195}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{196}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{197}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{198}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{199}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{200}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{201}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{202}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{203}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{204}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{205}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{206}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{207}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{208}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{209}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{210}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{211}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{212}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{213}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{214}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{215}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{216}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{217}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{218}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{219}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{220}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{221}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{222}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{223}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{224}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{225}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{226}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{227}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{228}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{229}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{230}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{231}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{232}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{233}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{234}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{235}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{236}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{237}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{238}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{239}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{240}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{241}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{242}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{243}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{244}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{245}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{246}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{247}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{248}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{249}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponeone\symbol{250}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponeone\symbol{251}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponeone\symbol{252}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponeone\symbol{253}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponeone\symbol{254}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponeone\symbol{255}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{4}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{5}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{7}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{9}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{12}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{17}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{22}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{23}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{25}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{31}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{39}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{40}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{41}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{42}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{43}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{44}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{45}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{46}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{47}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{48}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{49}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{51}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{52}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{53}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{54}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{60}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{61}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{64}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{65}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{68}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{87}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{88}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{89}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{90}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{91}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{92}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{94}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{96}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{97}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{98}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{99}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{101}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{103}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{116}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{120}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{122}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{137}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{139}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{141}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{143}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{144}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{146}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{148}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{150}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{153}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{161}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{170}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{171}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{172}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{174}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{178}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{179}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{180}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{181}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{186}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{187}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{188}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{189}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{203}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{210}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{212}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{220}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{222}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{223}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponetwo\symbol{248}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponetwo\symbol{255}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{0}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{1}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{2}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{3}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{4}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{5}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{6}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{7}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{8}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{9}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{10}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{11}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{12}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{13}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{14}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{15}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{16}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{17}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{18}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{19}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{20}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{21}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{22}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{23}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{24}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{25}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{26}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{27}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{28}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{29}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{30}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{31}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{32}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{33}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{34}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{35}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{36}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{37}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{38}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{39}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{40}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{41}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{42}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{43}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{44}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{45}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{46}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{47}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{48}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{49}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{50}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{51}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{52}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{53}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{54}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{55}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{56}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{57}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{58}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{59}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{60}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{61}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{62}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{63}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{64}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{65}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{66}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{67}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{68}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{69}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{70}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{71}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{72}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{73}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{74}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{75}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{76}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{77}} \ 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@miniicon\endcsname {\simpleiconsmapseven\symbol{186}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{187}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{188}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{189}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{190}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{191}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{192}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{193}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{194}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{195}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{196}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{197}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{198}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{199}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{200}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{201}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{202}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{203}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{204}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{205}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{206}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{207}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{208}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{209}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{210}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{211}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{212}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{213}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{214}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{215}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{216}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{217}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{218}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{219}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{220}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{221}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{222}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{223}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{224}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{225}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{226}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{227}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{228}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{229}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{230}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{231}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{232}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{233}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{234}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{235}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{236}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{237}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{238}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{239}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{240}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{241}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{242}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{243}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{244}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{245}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{246}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{247}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{248}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{249}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{250}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{251}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{252}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{253}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapseven\symbol{254}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapseven\symbol{255}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{0}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{1}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{2}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{3}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{4}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{5}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{6}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{7}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{8}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{9}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{10}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{11}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{12}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{13}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{14}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{15}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{16}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{17}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{18}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{19}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{20}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{21}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{22}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{23}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{24}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{25}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{26}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{27}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{28}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{29}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{30}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{31}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{32}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{33}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{34}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{35}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{36}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{37}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{38}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{39}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{40}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{41}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{42}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{43}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{44}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{45}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{46}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{47}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{48}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{49}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{50}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{51}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{52}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{53}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{54}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{55}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{56}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{57}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{58}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{59}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{60}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{61}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{62}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{63}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{64}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{65}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{66}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{67}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{68}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{69}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{70}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{71}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{72}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{73}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{74}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{75}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{76}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{77}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{78}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{79}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{80}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{81}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{82}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{83}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{84}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{85}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{86}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{87}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{88}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{89}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{90}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{91}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{92}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{93}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{94}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{95}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{96}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{97}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{98}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{99}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{100}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{101}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{102}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{103}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{104}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{105}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{106}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{107}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{108}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{109}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{110}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{111}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{112}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{113}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{114}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{115}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{116}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{117}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{118}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{119}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{120}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{121}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{122}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{123}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{124}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{125}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{126}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{127}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{128}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{129}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{130}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{131}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{132}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{133}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{134}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{135}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{136}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{137}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{138}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{139}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{140}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{141}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{142}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{143}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{144}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{145}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{146}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{147}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{148}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{149}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{150}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{151}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{152}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{153}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{154}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{155}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{156}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{157}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{158}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{159}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{160}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{161}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{162}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{163}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{164}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{165}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{166}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{167}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{168}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{169}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{170}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{171}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{172}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{173}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{174}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{175}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{176}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{177}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{178}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{179}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{180}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{181}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{182}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{183}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{184}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{185}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{186}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{187}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{188}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{189}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{190}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{191}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{192}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{193}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{194}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{195}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{196}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{197}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{198}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{199}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{200}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{201}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{202}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{203}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{204}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{205}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{206}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{207}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{208}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{209}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{210}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{211}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{212}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{213}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{214}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{215}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{216}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{217}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{218}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{219}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{220}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{221}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{222}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{223}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{224}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{225}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{226}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{227}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{228}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{229}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{230}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{231}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{232}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{233}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{234}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{235}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{236}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{237}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{238}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{239}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{240}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{241}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{242}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{243}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{244}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{245}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{246}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{247}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{248}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{249}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{250}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{251}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{252}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapeight\symbol{253}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapeight\symbol{254}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapeight\symbol{255}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{0}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{1}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{2}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{3}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{4}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{5}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{6}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{7}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{8}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{9}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{10}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{11}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{12}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{13}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{14}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{15}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{16}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{17}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{18}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{19}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{20}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{21}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{22}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{23}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{24}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{25}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{26}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{27}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{28}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{29}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{30}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{31}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{32}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{33}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{34}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{35}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{36}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{37}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{38}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{39}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{40}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{41}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{42}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{43}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{44}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{45}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{46}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{47}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{48}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{49}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{50}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{51}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{52}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{53}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{54}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{55}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{56}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{57}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{58}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{59}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{60}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{61}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{62}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{63}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{64}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{65}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{66}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{67}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{68}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{69}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{70}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{71}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{72}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{73}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{74}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{75}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{76}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{77}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{78}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{79}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{80}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{81}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{82}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{83}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{84}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{85}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{86}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{87}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{88}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{89}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{90}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{91}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{92}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{93}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{94}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{95}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{96}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{97}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{98}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{99}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{100}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{101}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{102}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{103}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{104}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{105}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{106}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{107}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{108}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{109}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{110}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{111}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{112}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{113}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{114}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{115}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{116}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{117}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{118}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{119}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{120}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{121}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{122}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{123}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{124}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{125}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{126}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{127}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{128}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{129}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{130}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{131}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{132}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{133}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{134}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{135}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{136}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{137}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{138}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{139}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{140}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{141}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{142}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{143}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{144}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{145}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{146}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{147}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{148}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{149}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{150}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{151}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{152}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{153}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{154}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{155}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{156}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{157}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{158}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{159}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{160}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{161}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{162}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{163}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{164}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{165}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{166}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{167}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{168}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{169}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{170}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{171}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{172}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{173}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{174}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{175}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{176}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{177}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{178}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{179}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{180}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{181}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{182}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{183}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{184}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{185}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{186}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{187}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{188}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{189}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{190}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{191}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{192}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{193}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{194}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{195}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{196}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{197}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{198}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{199}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{200}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{201}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{202}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{203}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{204}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{205}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{206}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{207}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{208}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{209}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{210}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{211}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{212}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{213}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{214}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{215}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{216}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{217}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{218}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{219}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{220}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{221}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{222}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{223}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{224}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{225}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{226}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{227}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{228}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{229}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{230}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{231}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{232}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{233}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{234}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{235}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{236}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{237}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{238}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{239}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{240}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{241}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{242}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{243}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{244}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{245}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{246}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{247}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{248}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{249}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{250}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{251}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{252}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{253}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{254}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmapnine\symbol{255}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{0}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{1}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{2}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{3}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{4}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{5}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{6}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{7}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{8}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{9}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{10}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{11}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{12}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{13}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{14}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{15}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{16}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{17}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{18}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{19}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{20}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{21}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{22}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{23}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{24}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{25}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{26}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{27}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{28}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{29}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{30}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{31}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{32}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{33}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{34}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{35}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{36}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{37}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{38}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{39}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{40}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{41}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{42}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{43}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{44}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{45}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{46}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{47}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{48}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{49}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{50}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{51}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{52}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{53}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{54}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{55}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{56}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{57}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{58}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{59}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{60}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{61}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{62}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{63}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{64}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{65}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{66}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{67}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{68}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{69}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{70}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{71}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{72}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{73}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{74}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{75}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{76}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{77}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{78}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{79}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{80}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{81}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{82}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{83}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{84}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{85}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{86}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{87}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{88}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{89}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{90}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{91}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{92}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{93}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{94}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{95}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{96}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{97}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{98}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{99}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{100}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{101}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{102}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{103}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{104}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{105}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{106}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{107}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{108}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{109}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{110}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{111}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{112}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{113}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{114}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{115}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{116}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{117}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{118}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{119}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{120}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{121}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{122}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{123}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{124}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{125}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{126}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{127}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{128}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{129}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{130}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{131}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{132}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{133}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{134}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{135}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{136}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{137}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{138}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{139}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{140}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{141}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{142}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{143}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{144}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{145}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{146}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{147}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{148}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{149}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{150}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{151}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{152}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{153}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{154}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{155}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{156}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{157}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{158}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{159}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{160}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{161}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{162}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{163}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{164}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{165}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{166}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{167}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{168}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{169}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{170}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{171}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{172}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{173}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{174}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{175}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{176}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{177}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{178}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{179}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{180}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{181}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{182}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{183}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{184}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{185}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{186}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{187}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{188}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{189}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{190}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{191}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{192}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{193}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{194}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{195}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{196}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{197}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{198}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{199}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{200}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{201}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{202}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{203}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{204}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{205}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{206}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{207}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{208}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{209}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{210}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{211}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{212}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{213}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{214}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{215}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{216}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{217}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{218}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{219}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{220}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{221}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{222}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{223}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{224}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{225}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{226}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{227}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{228}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{229}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{230}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{231}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{232}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{233}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{234}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{235}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{236}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{237}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{238}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{239}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{240}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{241}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{242}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{243}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{244}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{245}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{246}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{247}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{248}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{249}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{250}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{251}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{252}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{253}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{254}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponezero\symbol{255}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{0}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{1}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{2}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{3}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{4}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{5}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{6}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{7}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{8}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{9}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{10}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{11}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{12}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{13}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{14}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{15}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{16}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{17}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{18}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{19}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{20}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{21}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{22}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{23}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{24}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{25}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{26}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{27}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{28}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{29}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{30}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{31}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{32}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{33}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{34}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{35}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{36}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{37}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{38}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{39}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{40}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{41}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{42}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{43}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{44}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{45}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{46}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{47}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{48}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{49}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{50}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{51}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{52}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{53}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{54}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{55}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{56}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{57}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{58}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{59}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{60}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{61}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{62}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{63}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{64}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{65}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{66}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{67}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{68}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{69}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{70}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{71}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{72}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{73}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{74}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{75}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{76}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{77}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{78}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{79}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{80}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{81}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{82}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{83}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{84}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{85}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{86}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{87}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{88}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{89}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{90}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{91}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{92}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{93}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{94}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{95}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{96}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{97}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{98}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{99}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{100}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{101}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{102}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{103}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{104}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{105}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{106}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{107}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{108}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{109}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{110}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{111}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{112}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{113}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{114}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{115}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{116}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{117}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{118}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{119}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{120}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{121}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{122}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{123}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{124}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{125}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{126}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{127}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{128}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{129}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{130}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{131}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{132}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{133}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{134}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{135}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{136}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{137}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{138}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{139}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{140}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{141}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{142}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{143}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{144}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{145}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{146}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{147}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{148}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{149}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{150}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{151}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{152}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{153}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{154}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{155}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{156}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{157}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{158}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{159}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{160}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{161}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{162}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{163}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{164}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{165}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{166}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{167}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{168}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{169}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{170}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{171}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{172}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{173}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{174}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{175}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{176}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{177}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{178}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{179}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{180}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{181}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{182}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{183}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{184}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{185}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{186}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{187}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{188}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{189}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{190}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{191}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{192}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{193}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{194}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{195}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{196}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{197}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{198}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{199}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{200}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{201}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{202}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{203}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{204}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{205}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{206}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{207}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{208}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{209}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{210}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{211}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{212}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{213}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{214}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{215}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{216}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{217}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{218}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{219}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{220}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{221}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{222}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{223}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{224}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{225}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{226}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{227}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{228}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{229}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{230}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{231}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{232}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{233}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{234}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{235}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{236}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{237}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{238}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{239}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{240}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{241}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{242}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{243}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{244}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{245}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{246}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{247}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{248}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{249}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{250}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{251}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{252}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{253}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{254}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponeone\symbol{255}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{5}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{9}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{12}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{22}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{23}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{25}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{28}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{31}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{40}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{41}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{42}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{43}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{44}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{45}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{46}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{47}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{48}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{49}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{51}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{52}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{54}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{58}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{61}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{65}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{68}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{69}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{87}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{88}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{89}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{90}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{91}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{92}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{93}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{94}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{96}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{97}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{98}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{99}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{100}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{101}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{103}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{122}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{126}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{137}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{139}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{141}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{143}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{144}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{145}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{146}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{147}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{148}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{150}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{153}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{159}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{161}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{167}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{170}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{174}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{177}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{178}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{179}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{180}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{181}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{185}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{186}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{187}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{188}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{189}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{203}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{210}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{212}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{219}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{220}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{222}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{223}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponetwo\symbol{255}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{0}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{1}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{2}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{3}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{4}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{5}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{6}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{7}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{8}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{9}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{10}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{11}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{12}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{13}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{14}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{15}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{16}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{17}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{18}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{19}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{20}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{21}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{22}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{23}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{24}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{25}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{26}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{27}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{28}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{29}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{30}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{31}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{32}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{33}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{34}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{35}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{36}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{37}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{38}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{39}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{40}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{41}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{42}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{43}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{44}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{45}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{46}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{47}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{48}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{49}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{50}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{51}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{52}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{53}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{54}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{55}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{56}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{57}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{58}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{59}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{60}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{61}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{62}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{63}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{64}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{65}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{66}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{67}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{68}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{69}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{70}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{71}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{72}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{73}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{74}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{75}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{76}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{77}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{78}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{79}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{80}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{81}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{82}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{83}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{84}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{85}} \ 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 b56bc6f046b..0cdfa19a250 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
@@ -1076,2076 +1076,2084 @@
\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@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F226}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F227}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F228}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F229}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F22A}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F22B}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F22C}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F22D}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F22E}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F22F}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F230}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F231}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F232}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F233}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F234}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F235}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F236}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F237}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F238}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F239}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F23A}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F23B}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F23C}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F23D}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F23E}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F23F}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F240}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F241}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F242}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F243}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F244}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F245}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F246}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F247}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F248}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F249}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F24A}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F24B}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F24C}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F24D}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F24E}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F24F}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F250}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F251}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F252}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F253}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F254}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F255}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F256}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F257}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F258}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F259}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F25A}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F25B}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F25C}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F25D}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F25E}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F25F}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F260}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F261}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F262}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F263}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F264}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F265}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F266}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F267}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F268}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F269}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F26A}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F26B}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F26C}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F26D}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F26E}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F26F}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F270}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F271}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F272}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F273}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F274}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F275}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F276}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F277}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F278}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F279}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F27A}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F27B}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F27C}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F27D}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F27E}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F27F}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F280}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F281}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F282}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F283}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F284}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F285}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F286}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F287}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F288}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F289}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F28A}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F28B}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F28C}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F28D}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F28E}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F28F}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F290}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F291}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F292}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F293}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F294}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F295}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F296}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F297}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F298}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F299}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F29A}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F29B}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F29C}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F29D}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F29E}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F29F}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A2}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A3}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2A6}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2A7}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2A8}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2AA}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2AB}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2AC}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2AD}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2AE}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2AF}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B2}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B3}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2B4}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2B7}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2B8}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2B9}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2BA}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2BC}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2BD}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2BE}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2BF}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C1}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C2}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C3}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2C4}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2C5}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2CA}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2CC}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2CD}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2CE}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2CF}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D1}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D2}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D3}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2D4}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2D6}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2D7}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2D8}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2D9}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2DF}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E0}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2E6}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2E7}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2E9}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
- \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2EC}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2EF}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2F4}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2F5}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2F7}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2F8}}
- \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2F9}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F2FC}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F2FD}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F2FE}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F2FF}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F300}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F301}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F302}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F303}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F304}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F305}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F306}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F307}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F308}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F309}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F30A}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F30B}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F30C}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F30D}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F30E}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F30F}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F310}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F311}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F312}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F313}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F314}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F315}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F316}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F317}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F318}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F319}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F31A}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F31B}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F31C}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F31D}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F31E}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F31F}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F320}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F321}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F322}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F323}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F324}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F325}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F326}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F327}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F328}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F329}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F32A}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F32B}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F32C}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F32D}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F32E}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F32F}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F330}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F331}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F332}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F333}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F334}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F335}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F336}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F337}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F338}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F339}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F33A}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F33B}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F33C}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F33D}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F33E}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F33F}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F340}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F341}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F342}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F343}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F344}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F345}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F346}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F347}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F348}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F349}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F34A}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F34B}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F34C}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F34D}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F34E}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F34F}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F350}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F351}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F352}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F353}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F354}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F355}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F356}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F357}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F358}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F359}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F35A}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F35B}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F35C}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F35D}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F35E}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F35F}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F360}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F361}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F362}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F363}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F364}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F365}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F366}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F367}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F368}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F369}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F36A}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F36B}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F36C}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F36D}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F36E}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F36F}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F370}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F371}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F372}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F373}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F374}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F375}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F376}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F377}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F378}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F379}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F37A}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F37B}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F37C}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F37D}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F37E}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F37F}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F380}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F381}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F382}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F383}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F384}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F385}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F386}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F387}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F388}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F389}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F38A}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F38B}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F38C}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F38D}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F38E}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F38F}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F390}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F391}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F392}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F393}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F394}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F395}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F396}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F397}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F398}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F399}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F39A}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F39B}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F39C}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F39D}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F39E}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F39F}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3A6}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3A7}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3AC}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B1}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3B7}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3C7}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3CB}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3CC}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3CD}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D0}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D1}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D2}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D3}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3D4}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3D5}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3D6}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3D8}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3D9}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3DA}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3DB}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E3}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3E5}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3E7}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3E8}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3EB}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3ED}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F3}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3F5}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3F9}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F3FA}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F3FB}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F3FD}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F3FE}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F3FF}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F400}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F401}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F402}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F403}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F404}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F405}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F406}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F407}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F408}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F409}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F40A}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F40B}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F40C}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F40D}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F40E}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F40F}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F410}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F411}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F412}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F413}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F414}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F415}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F416}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F417}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F418}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F419}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F41A}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F41B}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F41C}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F41D}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F41E}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F41F}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F420}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F421}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F422}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F423}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F424}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F425}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F426}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F427}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F428}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F429}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F42A}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F42B}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F42C}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F42D}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F42E}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F42F}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F430}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F431}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F432}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F433}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F434}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F435}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F436}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F437}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F438}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F439}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F43A}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F43B}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F43C}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F43D}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F43E}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F43F}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F440}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F441}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F442}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F443}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F444}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F445}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F446}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F447}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F448}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F449}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F44A}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F44B}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F44C}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F44D}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F44E}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F44F}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F450}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F451}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F452}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F453}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F454}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F455}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F456}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F457}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F458}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F459}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F45A}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F45B}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F45C}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F45D}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F45E}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F45F}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F460}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F461}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F462}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F463}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F464}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F465}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F466}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F467}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F468}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F469}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F46A}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F46B}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F46C}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F46D}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F46E}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F46F}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F470}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F471}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F472}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F473}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F474}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F475}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F476}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F477}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F478}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F479}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F47A}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F47B}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F47C}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F47D}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F47E}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F47F}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F480}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F481}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F482}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F483}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F484}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F485}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F486}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F487}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F488}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F489}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F48A}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F48B}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F48C}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F48D}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F48E}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F48F}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F490}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F491}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F492}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F493}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F494}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F495}}
- \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F496}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F497}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F498}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F499}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F49A}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F49B}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F49C}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F49D}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F49E}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F49F}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A3}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4AC}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4B9}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4BA}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4BD}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4BE}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4BF}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C2}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C3}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4C8}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4C9}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4CA}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4CF}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4D6}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4D9}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4DA}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4DB}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4DF}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E0}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4E7}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4E8}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4EA}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4EB}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4EC}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4EF}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F0}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F3}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4F4}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4F7}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4F9}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F4FA}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F500}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F501}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F502}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F503}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F504}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F505}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F506}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F507}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F508}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F509}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F50A}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F50B}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F50C}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F50D}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F50E}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F50F}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F510}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F511}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F512}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F513}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F514}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F515}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F516}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F517}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F518}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F519}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F51A}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F51B}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F51C}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F51D}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F51E}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F51F}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F520}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F521}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F522}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F523}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F524}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F525}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F526}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F527}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F528}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F529}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F52A}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F52B}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F52C}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F52D}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F52E}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F52F}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F530}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F531}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F532}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F533}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F534}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F535}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F536}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F537}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F538}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F539}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F53A}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F53B}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F53C}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F53D}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F53E}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F53F}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F540}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F541}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F542}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F543}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F544}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F545}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F546}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F547}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F548}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F549}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F54A}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F54B}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F54C}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F54D}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F54E}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F54F}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F550}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F551}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F552}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F553}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F554}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F555}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F556}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F557}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F558}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F559}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F55A}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F55B}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F55C}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F55D}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F55E}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F55F}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F560}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F561}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F562}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F563}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F564}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F565}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F566}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F567}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F568}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F569}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F56A}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F56B}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F56C}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F56D}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F56E}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F56F}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F570}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F571}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F572}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F573}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F574}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F575}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F576}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F577}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F578}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F579}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F57A}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F57B}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F57C}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F57D}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F57E}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F57F}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F580}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F581}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F582}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F583}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F584}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F585}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F586}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F587}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F588}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F589}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F58A}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F58B}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F58C}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F58D}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F58E}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F58F}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F590}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F591}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F592}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F593}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F594}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F595}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F596}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F597}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F598}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F599}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F59A}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F59B}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F59C}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F59D}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F59E}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F59F}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A2}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5AB}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5AC}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5AD}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5AF}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5B3}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5B4}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5B5}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5B6}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5BB}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5BC}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5BD}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5BE}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5CC}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5D3}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5D5}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5DD}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5DF}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E0}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F5F9}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F600}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F601}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F602}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F603}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F604}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F605}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F606}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F607}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F608}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F609}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F60A}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F60B}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F60C}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F60D}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F60E}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F60F}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F610}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F611}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F612}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F613}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F614}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F615}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F616}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F617}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F618}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F619}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F61A}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F61B}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F61C}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F61D}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F61E}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F61F}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F620}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F621}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F622}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F623}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F624}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F625}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F626}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F627}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F628}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F629}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F62A}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F62B}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F62C}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F62D}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F62E}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F62F}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F630}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F631}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F632}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F633}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F634}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F635}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F636}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F637}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F638}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F639}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F63A}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F63B}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F63C}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F63D}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F63E}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F63F}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F640}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F641}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F642}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F643}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F644}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F645}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F646}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F647}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F648}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F649}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F64A}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F64B}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F64C}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F64D}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F64E}} \ 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@miniicon\endcsname {\simpleiconsmap\symbol{"F0BB}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0BC}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0BE}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0BF}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C0}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C1}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0C8}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0CA}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0CB}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0CC}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CD}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0CE}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D0}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D1}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D2}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D6}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D7}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0D9}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0DB}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0DC}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DD}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0DE}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E1}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E5}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0E8}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0E9}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0EA}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0EC}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0ED}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0EE}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0EF}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F0}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F1}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F2}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F4}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F5}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F6}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0F8}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0F9}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0FA}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0FB}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FD}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F0FE}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F0FF}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F100}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F101}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F102}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F103}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F104}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F105}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F106}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F107}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F108}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F109}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F10A}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F10B}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F10C}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10D}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F10E}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F10F}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F110}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F111}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F112}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F113}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F114}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F115}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F116}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F117}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F118}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F119}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F11A}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F11B}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F11C}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11D}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F11E}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F11F}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F120}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F121}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F122}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F123}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F124}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F125}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F126}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F127}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F128}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F129}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F12A}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F12B}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F12C}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12D}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F12E}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F12F}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F130}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F131}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F132}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F133}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F134}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F135}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F136}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F137}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F138}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F139}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F13A}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F13B}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F13C}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13D}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F13E}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F13F}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F140}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F141}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F142}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F143}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F144}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F145}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F146}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F147}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F148}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F149}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F14A}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F14B}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F14C}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14D}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F14E}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F14F}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F150}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F151}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F152}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F153}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F154}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F155}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F156}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F157}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F158}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F159}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F15A}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F15B}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F15C}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15D}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F15E}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F15F}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F160}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F161}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F162}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F163}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F164}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F165}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F166}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F167}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F168}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F169}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F16A}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F16B}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F16C}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16D}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F16E}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F16F}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F170}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F171}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F172}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F173}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F174}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F175}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F176}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F177}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F178}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F179}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F17A}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F17B}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17C}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F17D}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F17E}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F17F}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F180}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F181}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F182}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F183}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F184}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F185}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F186}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F187}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F188}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F189}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F18A}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F18B}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F18C}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F18D}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F18E}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F18F}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F190}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F191}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F192}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F193}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F194}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F195}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F196}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F197}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F198}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F199}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F19A}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F19B}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F19C}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F19D}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F19E}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F19F}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1AA}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1AB}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1AD}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1AE}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1AF}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B0}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B1}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1B2}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B5}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B6}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1B7}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1B8}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1B9}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1BA}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1BB}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1BC}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1BD}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1BE}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1BF}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C0}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C1}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1C2}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1C3}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C4}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C5}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C6}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1C7}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1C8}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1CA}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1CE}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D0}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D1}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D5}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D6}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1D7}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1D8}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1DB}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1DC}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1DD}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1DE}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1DF}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E0}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1E2}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1E3}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E4}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E5}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E6}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1E7}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1E8}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1E9}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1EA}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1EC}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1ED}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1EE}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1EF}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F0}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F1}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1F2}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F4}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F5}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F6}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1F7}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1FB}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1FC}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F200}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F201}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F202}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F203}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F204}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F205}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F206}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F207}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F208}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F209}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F20A}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F20B}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F20C}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F20D}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F20E}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F20F}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F210}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F211}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F212}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F213}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F214}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F215}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F216}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F217}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F218}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F219}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F21A}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F21B}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F21C}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F21D}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F21E}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F21F}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F220}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F221}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F222}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F223}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F224}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F225}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F226}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F227}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F228}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F229}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F22A}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F22B}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F22C}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F22D}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F22E}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F22F}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F230}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F231}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F232}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F233}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F234}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F235}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F236}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F237}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F238}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F239}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F23A}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F23B}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F23C}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F23D}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F23E}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F23F}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F240}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F241}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F242}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F243}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F244}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F245}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F246}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F247}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F248}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F249}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F24A}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F24B}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F24C}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F24D}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F24E}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F24F}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F250}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F251}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F252}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F253}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F254}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F255}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F256}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F257}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F258}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F259}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F25A}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F25B}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F25C}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F25D}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F25E}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F25F}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F260}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F261}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F262}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F263}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F264}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F265}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F266}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F267}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F268}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F269}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F26A}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F26B}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F26C}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F26D}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F26E}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F26F}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F270}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F271}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F272}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F273}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F274}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F275}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F276}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F277}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F278}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F279}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F27A}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F27B}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F27C}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F27D}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F27E}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F27F}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F280}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F281}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F282}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F283}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F284}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F285}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F286}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F287}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F288}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F289}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F28A}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F28B}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F28C}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F28D}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F28E}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F28F}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F290}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F291}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F292}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F293}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F294}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F295}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F296}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F297}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F298}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F299}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F29A}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F29B}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F29C}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F29D}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F29E}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F29F}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2A2}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2A3}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A7}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A8}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2AA}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2AB}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2AC}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2AD}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2AE}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2AF}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2B2}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2B3}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B7}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B8}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2B9}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2BA}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2BC}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2BD}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2BE}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2BF}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C1}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2C2}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2C3}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C4}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C5}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C7}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2CA}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2CD}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2CE}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2CF}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D1}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2D2}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2D3}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D4}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D6}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D7}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2D9}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2DD}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2DF}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E0}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E6}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E7}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2E9}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2EB}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2EC}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2EF}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F5}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F8}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2F9}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2FC}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2FD}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2FE}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F2FF}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F300}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F301}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F302}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F303}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F304}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F305}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F306}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F307}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F308}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F309}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F30A}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F30B}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F30C}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F30D}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F30E}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F30F}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F310}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F311}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F312}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F313}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F314}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F315}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F316}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F317}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F318}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F319}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F31A}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F31B}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F31C}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F31D}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F31E}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F31F}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F320}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F321}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F322}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F323}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F324}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F325}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F326}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F327}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F328}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F329}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F32A}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F32B}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F32C}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F32D}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F32E}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F32F}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F330}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F331}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F332}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F333}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F334}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F335}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F336}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F337}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F338}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F339}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F33A}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F33B}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F33C}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F33D}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F33E}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F33F}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F340}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F341}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F342}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F343}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F344}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F345}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F346}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F347}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F348}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F349}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F34A}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F34B}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F34C}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F34D}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F34E}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F34F}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F350}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F351}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F352}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F353}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F354}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F355}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F356}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F357}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F358}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F359}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F35A}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F35B}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F35C}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F35D}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F35E}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F35F}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F360}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F361}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F362}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F363}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F364}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F365}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F366}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F367}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F368}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F369}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F36A}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F36B}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F36C}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F36D}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F36E}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F36F}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F370}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F371}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F372}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F373}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F374}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F375}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F376}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F377}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F378}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F379}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F37A}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F37B}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F37C}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F37D}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F37E}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F37F}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F380}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F381}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F382}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F383}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F384}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F385}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F386}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F387}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F388}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F389}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F38A}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F38B}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F38C}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F38D}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F38E}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F38F}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F390}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F391}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F392}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F393}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F394}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F395}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F396}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F397}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F398}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F399}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F39A}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F39B}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F39C}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F39D}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F39E}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F39F}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A7}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3AB}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3AC}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3B1}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B7}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3CC}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3CD}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D0}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3D1}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3D2}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3D3}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D4}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D5}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D6}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D7}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D8}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3D9}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3DA}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3DB}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3DF}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E8}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3EA}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3EB}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3EC}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3ED}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F5}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F8}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3F9}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3FA}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3FB}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3FD}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3FE}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F3FF}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F400}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F401}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F402}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F403}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F404}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F405}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F406}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F407}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F408}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F409}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F40A}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F40B}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F40C}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F40D}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F40E}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F40F}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F410}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F411}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F412}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F413}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F414}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F415}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F416}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F417}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F418}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F419}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F41A}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F41B}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F41C}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F41D}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F41E}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F41F}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F420}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F421}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F422}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F423}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F424}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F425}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F426}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F427}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F428}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F429}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F42A}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F42B}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F42C}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F42D}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F42E}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F42F}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F430}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F431}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F432}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F433}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F434}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F435}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F436}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F437}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F438}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F439}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F43A}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F43B}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F43C}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F43D}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F43E}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F43F}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F440}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F441}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F442}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F443}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F444}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F445}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F446}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F447}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F448}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F449}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F44A}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F44B}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F44C}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F44D}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F44E}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F44F}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F450}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F451}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F452}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F453}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F454}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F455}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F456}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F457}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F458}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F459}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F45A}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F45B}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F45C}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F45D}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F45E}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F45F}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F460}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F461}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F462}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F463}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F464}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F465}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F466}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F467}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F468}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F469}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F46A}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F46B}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F46C}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F46D}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F46E}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F46F}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F470}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F471}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F472}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F473}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F474}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F475}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F476}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F477}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F478}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F479}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F47A}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F47B}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F47C}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F47D}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F47E}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F47F}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F480}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F481}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F482}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F483}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F484}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F485}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F486}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F487}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F488}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F489}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F48A}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F48B}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F48C}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F48D}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F48E}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F48F}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F490}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F491}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F492}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F493}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F494}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F495}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F496}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F497}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F498}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F499}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F49A}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F49B}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F49C}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F49D}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F49E}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F49F}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A0}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4A3}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4B1}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4B9}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4BA}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4BE}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4BF}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4C2}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4C3}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C8}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4CA}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4CE}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4CF}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4D9}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4DB}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4DF}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4E0}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E4}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E7}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E8}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4EA}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4EB}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4EC}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4EF}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4F0}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4F3}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F4}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F7}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F8}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4F9}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4FA}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4FE}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F500}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F501}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F502}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F503}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F504}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F505}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F506}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F507}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F508}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F509}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F50A}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F50B}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F50C}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F50D}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F50E}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F50F}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F510}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F511}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F512}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F513}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F514}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F515}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F516}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F517}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F518}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F519}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F51A}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F51B}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F51C}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F51D}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F51E}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F51F}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F520}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F521}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F522}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F523}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F524}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F525}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F526}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F527}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F528}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F529}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F52A}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F52B}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F52C}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F52D}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F52E}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F52F}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F530}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F531}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F532}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F533}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F534}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F535}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F536}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F537}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F538}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F539}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F53A}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F53B}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F53C}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F53D}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F53E}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F53F}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F540}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F541}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F542}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F543}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F544}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F545}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F546}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F547}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F548}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F549}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F54A}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F54B}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F54C}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F54D}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F54E}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F54F}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F550}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F551}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F552}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F553}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F554}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F555}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F556}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F557}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F558}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F559}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F55A}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F55B}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F55C}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F55D}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F55E}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F55F}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F560}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F561}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F562}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F563}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F564}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F565}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F566}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F567}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F568}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F569}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F56A}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F56B}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F56C}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F56D}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F56E}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F56F}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F570}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F571}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F572}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F573}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F574}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F575}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F576}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F577}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F578}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F579}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F57A}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F57B}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F57C}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F57D}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F57E}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F57F}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F580}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F581}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F582}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F583}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F584}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F585}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F586}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F587}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F588}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F589}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F58A}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F58B}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F58C}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F58D}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F58E}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F58F}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F590}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F591}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F592}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F593}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F594}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F595}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F596}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F597}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F598}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F599}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F59A}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F59B}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F59C}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F59D}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F59E}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F59F}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5A0}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5A2}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A8}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5AB}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5AF}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5B2}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5B3}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B4}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B5}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B6}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5BA}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5BB}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5BC}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5BD}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5BE}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5CC}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5D3}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D5}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5DC}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5DD}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5DF}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5E0}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F600}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F601}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F602}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F603}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F604}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F605}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F606}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F607}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F608}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F609}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F60A}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F60B}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F60C}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F60D}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F60E}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F60F}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F610}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F611}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F612}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F613}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F614}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F615}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F616}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F617}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F618}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F619}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F61A}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F61B}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F61C}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F61D}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F61E}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F61F}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F620}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F621}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F622}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F623}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F624}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F625}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F626}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F627}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F628}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F629}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F62A}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F62B}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F62C}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F62D}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F62E}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F62F}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F630}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F631}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F632}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F633}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F634}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F635}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F636}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F637}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F638}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F639}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F63A}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F63B}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F63C}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F63D}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F63E}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F63F}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F640}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F641}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F642}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F643}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F644}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F645}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F646}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F647}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F648}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F649}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F64A}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F64B}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F64C}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F64D}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F64E}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F64F}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F650}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F651}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F652}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F653}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F654}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F655}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F656}} \ 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 55b7b43d334..84bc2843cb2 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/05 Font definitions for U/simpleiconseight.]
+ \ProvidesFile{usimpleiconseight.fd}[2024/08/02 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 0928d2923e7..5dd190dd18e 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/05 Font definitions for U/simpleiconsfive.]
+ \ProvidesFile{usimpleiconsfive.fd}[2024/08/02 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 6519ae88be0..f15383a56a4 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/05 Font definitions for U/simpleiconsfour.]
+ \ProvidesFile{usimpleiconsfour.fd}[2024/08/02 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 638b791b8e6..3ee41199ab9 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/05 Font definitions for U/simpleiconsnine.]
+ \ProvidesFile{usimpleiconsnine.fd}[2024/08/02 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 87deceb3009..3f3d4d681ec 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/05 Font definitions for U/simpleiconsone.]
+ \ProvidesFile{usimpleiconsone.fd}[2024/08/02 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 2054a875d63..702355765ca 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/05 Font definitions for U/simpleiconsoneone.]
+ \ProvidesFile{usimpleiconsoneone.fd}[2024/08/02 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 cae26012fd0..6e0c8f5e9a6 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/05 Font definitions for U/simpleiconsonethree.]
+ \ProvidesFile{usimpleiconsonethree.fd}[2024/08/02 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 0aa4fc3f3d4..cfc9f0005db 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/05 Font definitions for U/simpleiconsonetwo.]
+ \ProvidesFile{usimpleiconsonetwo.fd}[2024/08/02 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 948e617d1f5..68fe049dd86 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/05 Font definitions for U/simpleiconsonezero.]
+ \ProvidesFile{usimpleiconsonezero.fd}[2024/08/02 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 47df2139663..33118c2aeee 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/05 Font definitions for U/simpleiconsseven.]
+ \ProvidesFile{usimpleiconsseven.fd}[2024/08/02 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 1d29753f9f2..31e89209010 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/05 Font definitions for U/simpleiconssix.]
+ \ProvidesFile{usimpleiconssix.fd}[2024/08/02 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 3e8bb08e5f4..11deb84f2b6 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/05 Font definitions for U/simpleiconsthree.]
+ \ProvidesFile{usimpleiconsthree.fd}[2024/08/02 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 713f0daee7b..cfbc3cc1daa 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/05 Font definitions for U/simpleiconstwo.]
+ \ProvidesFile{usimpleiconstwo.fd}[2024/08/02 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/spbmark/spbmark.sty b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
index cc4e450037f..4046c8bf9c0 100644
--- a/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
+++ b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
@@ -9,7 +9,7 @@
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2018/12/31]
\RequirePackage{xparse}
-\ProvidesExplPackage{spbmark}{2024/07/10}{1.46m}
+\ProvidesExplPackage{spbmark}{2024/07/14}{1.46n}
{Customize superscripts and subscripts}
\cs_generate_variant:Nn \box_set_ht:Nn { cv }
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/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/tikzbricks/tikzbricks-doc-settings.sty b/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty
deleted file mode 100644
index 777cedba6ef..00000000000
--- a/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty
+++ /dev/null
@@ -1,199 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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}
-\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}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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]{./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}{##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/tex/latex/tkz-elements/tkz-elements.sty b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
index 0a11787d21e..597a0508506 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz-elements.sty
@@ -1,5 +1,5 @@
% encoding : utf8
-% tkz-elements.sty v2.25c
+% tkz-elements.sty v2.30c
% Copyright 2024 Alain Matthes
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,7 +11,7 @@
% This work has the LPPL maintenance status “maintainedâ€.
% The Current Maintainer of this work is Alain Matthes.
-\ProvidesPackage{tkz-elements}[2024/04/27 v2.25c Graphic Object Library]
+\ProvidesPackage{tkz-elements}[2024/07/16 version 2.30c Graphic Object Library]
\RequirePackage{luacode}
\directlua{require "tkz_elements_main"}
@@ -34,20 +34,19 @@
V={}}
\luacode}
{\endluacode}
-
+ % new version of the next macro proposed by Sanskar Singh
\def\tkzGetNodes{\directlua{%
- for K,V in pairs(z) do
- local n,sd,ft
- n = string.len(K)
- if n >1 then
- _,_,ft, sd = string.find( K , "(.+)(.)" )
- if sd == "p" then K=ft.."'" end
- _,_,xft, xsd = string.find( ft , "(.+)(.)" )
- if xsd == "p" then K=xft.."'".."'" end
- end
- tex.print("\\coordinate ("..K..") at ("..V.re..","..V.im..") ;\\\\")
-end}
-}
+ for K,V in pairs(z) do
+ local n,sd,ft
+ n = string.len(K)
+ if n >1 then
+ _,_,ft, sd = string.find( K , "(.+)(.)" )
+ if sd == "p" then K=ft.."'" end
+ _,_,xft, xsd = string.find( ft , "(.+)(.)" )
+ if xsd == "p" then K=xft.."'".."'" end
+ end
+ tex.sprint("\string\\coordinate ("..K..") at ("..V.re..","..V.im..") ; \string\r")
+end}}
\def\tkzUseLua#1{\directlua{tex.print(tostring(#1))}}
\makeatletter
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
index 1999b8a0732..e17ccb2ebb4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_circle.lua
@@ -1,6 +1,6 @@
-- tkz_elements-circles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
index b6a1bf7a5a2..3ded691d539 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_class.lua
@@ -1,6 +1,6 @@
-- tkz_elements_class.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- from class.lua (Simple Lua Classes from Lua-users wiki)
-- Compatible with Lua 5.1 (not 5.0).
-- http://lua-users.org/wiki/SimpleLuaClasses DavidManura
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
index a98cf40a63c..7581c19d7a9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_ellipse.lua
@@ -1,6 +1,6 @@
-- tkz_elements-ellipses.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
index 40f2a4ebbf7..88f9040b7f0 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_circles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
index 69dcd6ace32..fe253e9aa23 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
@@ -1,6 +1,6 @@
-- tkz_elements_intersections.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
index 401ad46dda1..a5504593c06 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_lines.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
index a71c0f7c278..c3f7e54ffd3 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_maths.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
index 43712140477..c80420090f4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_matrices.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_matrices.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
index f1c4dc5d412..e2366e25e3d 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_points.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_points.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
index 5e92b4d5987..0f74d28fe98 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_regular.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
index d4523d1826b..02d3058a161 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_triangles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -259,6 +259,15 @@ function feuerbach_tr_ (a,b,c)
intersection_cc_ (e,m,jb,hb),
intersection_cc_ (e,m,jc,hc)
end
+
+function similar_ (a,b,c)
+ local x,y,z,g
+ g = centroid_ (a,b,c)
+ x = homothety_ (g,-2,a)
+ y = homothety_ (g,-2,b)
+ z = homothety_ (g,-2,c)
+ return x,y,z
+end
--------------------
-- ellipse --
--------------------
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
index 9304768f311..797365f33f4 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_line.lua
@@ -1,6 +1,6 @@
-- tkz_elements_lines.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -324,11 +324,25 @@ function line: mediator ()
m = midpoint_ (self.pa,self.pb)
return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb))
end
+
+function line : perpendicular_bisector ()
+ local m
+ m = midpoint_ (self.pa,self.pb)
+ return line : new (rotation_ (m,-math.pi/2,self.pb),rotation_ (m,math.pi/2,self.pb))
+end
+
-------------------
-- Result -> circle
-------------------
-function line: circle ()
+function line: circle (swap)
+ if swap == nil then
+ swap = false
+ end
+ if swap then
+ return circle : new (self.pb,self.pa)
+ else
return circle : new (self.pa,self.pb)
+ end
end
function line: circle_swap ()
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
index 10ee2195196..142f00c8ed0 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_main.lua
@@ -1,6 +1,6 @@
-- tkz_elements-main.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
index 981ac680946..035e8a0a33e 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_matrices.lua
@@ -1,6 +1,6 @@
-- tkz_elements_matrices.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
index 94c9c555c08..daa3e21872b 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_misc.lua
@@ -1,6 +1,6 @@
-- tkz_elements_functions_maths.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
index fd0a3533a3d..d471976d066 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
@@ -1,6 +1,6 @@
-- tkz_elements_parallelogram.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
index 4eb4b549d15..e29779ef791 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_point.lua
@@ -1,6 +1,6 @@
-- tkz_elements_point.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
index e77e0af5615..6625b9d7898 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
@@ -1,6 +1,6 @@
-- tkz_elements_quadrilateral.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
index 2c07f78399d..fdc30845018 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_rectangle.lua
@@ -1,6 +1,6 @@
-- tkz_elements-rectangle.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
index 0641a858ded..a4527c779b9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_regular.lua
@@ -1,6 +1,6 @@
-- tkz_elements_regular.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
index 1852c0ded40..93860b825c9 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_square.lua
@@ -1,6 +1,6 @@
-- tkz_elements-square.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
index c6dd2c37573..84b10273dad 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_triangle.lua
@@ -1,6 +1,6 @@
-- tkz_elements_triangles.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -57,19 +57,19 @@ end
-- points --
-----------------------
function triangle: trilinear (a,b,c)
- return barycenter_ ( {self.pa,a*self.a },{self.pb,b*self.b},{self.pc,c*self.c} )
+ return barycenter_ ({self.pa,a*self.a},{self.pb,b*self.b},{self.pc,c*self.c})
end
function triangle: barycentric (a,b,c)
- return barycenter_ ( {self.pa,a },{self.pb,b},{self.pc,c} )
+ return barycenter_ ({self.pa,a},{self.pb,b},{self.pc,c})
end
function triangle: bevan_point ()
- return circum_center_ ( self : excentral_tr())
+ return circum_center_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
end
function triangle: mittenpunkt_point ()
- return lemoine_point_ ( self : excentral_tr())
+ return lemoine_point_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
end
function triangle: gergonne_point ()
@@ -322,13 +322,20 @@ function triangle : cevian_circle (p)
pta,ptb,ptc = cevian_ (self.pa,self.pb,self.pc,p)
return circle : new (circum_circle_ (pta,ptb,ptc),pta)
end
+
+function triangle : symmedial_circle ()
+ local pta,ptb,ptc,p
+ p = lemoine_point_ ( self.pa , self.pb , self.pc)
+ pta,ptb,ptc = cevian_ (self.pa,self.pb,self.pc,p)
+ return circle : new (circum_circle_ (pta,ptb,ptc),pta)
+end
- function triangle : conway_circle ()
- local i,t
- i = in_center_ (self.pa,self.pb,self.pc)
- t = report_ (self.pb,self.pa,length(self.pb,self.pc),self.pa)
- return circle : new (i,t)
- end
+function triangle : conway_circle ()
+ local i,t
+ i = in_center_ (self.pa,self.pb,self.pc)
+ t = report_ (self.pb,self.pa,length(self.pb,self.pc),self.pa)
+ return circle : new (i,t)
+end
function triangle : pedal_circle (pt)
local x,y,z,c
@@ -338,7 +345,13 @@ function triangle : pedal_circle (pt)
c = circum_center_ (x,y,z)
return circle : new (c,x)
end
-
+
+function triangle: bevan_circle ()
+ local o,r,s,t
+ o = circum_center_ ( excentral_tr_ ( self.pa , self.pb , self.pc))
+ r,s,t = excentral_tr_ ( self.pa , self.pb , self.pc)
+return circle : new (o, r)
+end
-------------------
-- Result -> triangle
-------------------
@@ -392,6 +405,12 @@ function triangle: symmedian ()
return triangle : new (cevian_ (self.pa,self.pb,self.pc,p))
end
+function triangle: symmedial ()
+ local p
+ p = lemoine_point_ ( self.pa , self.pb , self.pc)
+ return triangle : new (cevian_ (self.pa,self.pb,self.pc,p))
+end
+
function triangle: euler ()
return triangle : new (euler_points_ (self.pa,self.pb,self.pc) )
end
@@ -403,6 +422,10 @@ function triangle: pedal (pt)
z = projection_ (self.pa,self.pb,pt)
return triangle : new (x,y,z)
end
+
+function triangle: similar ()
+ return triangle : new (similar_ (self.pa,self.pb,self.pc) )
+end
-------------------
-- Result -> ellipse
-------------------
diff --git a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
index 8b26fe4bd32..0dcbbfde61d 100644
--- a/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
+++ b/Master/texmf-dist/tex/latex/tkz-elements/tkz_elements_vector.lua
@@ -1,6 +1,6 @@
-- tkz_elements_vectors.lua
--- date 2024/04/27
--- version 2.25c
+-- date 2024/07/16
+-- version 2.30c
-- Copyright 2024 Alain Matthes
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty b/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
index 3de4286c8e4..ce321f6d4be 100644
--- a/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
+++ b/Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty
@@ -2,9 +2,10 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-grapheur}[2024/06/22 0.1.5.Des outils en TikZ pour travailler comme avec un grapheur]
+\ProvidesPackage{tkz-grapheur}[2024/07/13 0.1.6.Des outils en TikZ pour travailler comme avec un grapheur]
%====HISTORIQUE
+% v 0.1.6 Asymptote verticale + Monte Carlo + Méthode intégrales (rectangles, etc)
% v 0.1.5 Correction d'un bug avec les valeurs manuelles + NÅ“ud pour une image + [en] version !
% v 0.1.4 Ajout des placements de textes
% v 0.1.3 Régressions, avec xintreg (désactivable)
@@ -49,7 +50,7 @@
\if@lngenglish
\sisetup{mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true}
\else
- \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true}
+ \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true,group-minimum-digits=4}
\fi
\fi
@@ -106,6 +107,7 @@
%====STYLES DE BASE
\tikzset{pflnoeud/.style={}}
\tikzset{pflpoint/.style={line width=0.95pt}}
+\tikzset{pflpointmc/.style={radius=0.875pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
\tikzset{pflcadre/.style={line width=0.8pt,gray}}
@@ -1012,6 +1014,103 @@
\end{scope}
}
+%====MONTE CARLO
+\defKV[graphiquetikzmontecarlo]{%
+ Couleurs=\def\graphtikzmccols{#1},%
+ BornesX=\def\graphtikzmcxbornes{#1},%
+ BornesY=\def\graphtikzmcybornes{#1}
+}
+
+\setKVdefault[graphiquetikzmontecarlo]{%
+ Couleurs={blue/red},%
+ BornesX={\pflxmin,\pflxmax},%
+ BornesY={\pflymin,\pflymax}
+}
+
+\NewDocumentCommand\SimulerMonteCarlo{ O{} D<>{f} m O{\nbptsmcok} O{\nbptsmcko} }{%
+ \restoreKV[graphiquetikzmontecarlo]%
+ \setKV[graphiquetikzmontecarlo]{#1}%
+ \StrCut{\graphtikzmccols}{/}{\tmpMCcolOK}{\tmpMCcolKO}%
+ \StrCut{\graphtikzmcxbornes}{,}{\tmpMCxmin}{\tmpMCxmax}%
+ \StrCut{\graphtikzmcybornes}{,}{\tmpMCymin}{\tmpMCymax}%
+ \xdef#4{0}%
+ \xdef#5{0}%
+ \xdef\nbptsmc{#3}%
+ \foreach \i in {1,...,#3}{%
+ \xdef\tmpMCrandX{\xintfloateval{random()*((\tmpMCxmax)-(\tmpMCxmin))+(\tmpMCxmin)}}%
+ \xdef\tmpMCrandY{\xintfloateval{random()*((\tmpMCymax)-(\tmpMCymin))+(\tmpMCymin)}}%
+ \xdef\tmpMCrandfX{\xintfloateval{#2(\tmpMCrandX)}}%
+ \xintifboolexpr{ \tmpMCrandfX > \tmpMCrandY }%
+ {%
+ \xdef#4{\xinteval{#4+1}}%
+ \filldraw[\tmpMCcolOK] (\tmpMCrandX,\tmpMCrandY) circle[pflpointmc] ;
+ }%
+ {%
+ \xdef#5{\xinteval{#5+1}}%
+ \filldraw[\tmpMCcolKO] (\tmpMCrandX,\tmpMCrandY) circle[pflpointmc] ;
+ }%
+ }%
+}
+
+%====MÉTHODES INTÉGRALES
+
+\defKV[graphiquetikzintegr]{%
+ Couleur=\def\graphtikzintgrcol{#1},%
+ CouleurRemplissage=\def\graphtikzintgrcolrempl{#1},%
+ NbSubDiv=\def\graphtikzintgrnb{#1},%
+ Methode=\def\graphtikzintgrtype{#1},%
+ Opacite=\def\graphtikzintgropac{#1}
+}
+
+\setKVdefault[graphiquetikzintegr]{%
+ Couleur=red,%
+ NbSubDiv=10,%
+ Methode=RectanglesGauche,%
+ Remplir=true,%
+ CouleurRemplissage={\graphtikzintgrcol!25},%
+ Opacite=0.25
+}
+
+\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct+a+b
+ \useKVdefault[graphiquetikzintegr]%
+ \setKV[graphiquetikzintegr]{#1}%
+ \ifboolKV[graphiquetikzintegr]{Remplir}%
+ {%
+ \tikzset{pflfigureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}%
+ }%
+ {%
+ \tikzset{pflfigureintegr/.style={pfltrait,\graphtikzintgrcol}}%
+ }%
+ \tikzset{figureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}%
+ \def\TmpH{(#4-#3)/\graphtikzintgrnb}
+ %rectangles gauches
+ \IfEq{\graphtikzintgrtype}{RectanglesGauche}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesDroite}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesMilieu}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+0.5)*\TmpH)}}) ;
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{Trapezes}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}%
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- ({#3+\i*\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ;
+ }%
+ {}%
+}
+
+
%====INTÉGRALES
%v2 avec modification de la clé [Type=...] ?
\defKV[GraphiqueTikzIntegr]{%
@@ -1961,6 +2060,16 @@
\end{scope}
}
+%====asymptote
+\NewDocumentCommand\TracerAsymptote{ O{} m D<>{} }{%
+ \restoreKV[GraphiquetikzDroite]%
+ \setKV[GraphiquetikzDroite]{#1}%
+ %tracé
+ \draw[pfltrait,{\useKV[GraphiquetikzDroite]{Couleur}},#3] ({#2},{\pflymin})--({#2},{\pflymax}) ;
+}
+
+
+%====MinMax
\defKV[GraphiqueTikzMinMax]{%
Pas=\def\pflminmaxstep{#1},%
Methode=\def\pflminmaxmethode{#1},%
@@ -2117,6 +2226,7 @@
\tikzset{tkzgrphnode/.style={}}
\tikzset{tkzgrphpoint/.style={line width=0.95pt}}
\tikzset{tkzgrphpointc/.style={radius=1.75pt}}
+\tikzset{tkzgrphpointmc/.style={radius=0.875pt}}
\tikzset{tkzgrphscatter/.style={radius=1.75pt}}
\tikzset{tkzgrphframe/.style={line width=0.8pt,gray}}
\tikzset{tkzgrphcurve/.style={line width=1.05pt}}
@@ -3898,11 +4008,11 @@
}
%====droite
-\defKV[GraphiquetikzDroite]{%
+\defKV[GraphicTikzLine]{%
Name=\def\pfldroitename{#1}
}
-\setKVdefault[GraphiquetikzDroite]{%
+\setKVdefault[GraphicTikzLine]{%
Slope=false,%
Color=black,%
Start={\pflxmin},%
@@ -3911,15 +4021,15 @@
}
\NewDocumentCommand\DrawLine{ O{} m m D<>{} }{%
- \restoreKV[GraphiquetikzDroite]%
- \setKV[GraphiquetikzDroite]{#1}%
+ \restoreKV[GraphicTikzLine]%
+ \setKV[GraphicTikzLine]{#1}%
%1er point
\path #2;%
\pgfgetlastxy{\macrox}{\macroy}%
\xdef\pfldtetikzxA{\xintfloateval{(\ConvertPtToCm{\macrox})/(\pflxunit)}}%
\xdef\pfldtetikzyA{\xintfloateval{(\ConvertPtToCm{\macroy})/(\pflyunit)}}%
%2ème point si besoin
- \ifboolKV[GraphiquetikzDroite]{Slope}%
+ \ifboolKV[GraphicTikzLine]{Slope}%
{%
\xdef\pfldtepente{\xintfloateval{#3}}%
}%
@@ -3936,24 +4046,33 @@
{%
\IfEq{\pfldroitename}{}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},#4] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#4] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},#4,name path global=\pfldroitename] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#4,name path global=\pfldroitename] (\pfldtetikzxA,\pflymin) -- (\pfldtetikzxA,\pflymax) ;
}%
}%
{%
\IfEq{\pfldroitename}{}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},domain={\useKV[GraphiquetikzDroite]{Start}}:{\useKV[GraphiquetikzDroite]{End}},samples=2,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},domain={\useKV[GraphicTikzLine]{Start}}:{\useKV[GraphicTikzLine]{End}},samples=2,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
}%
{%
- \draw[tkzgrphline,{\useKV[GraphiquetikzDroite]{Color}},domain={\useKV[GraphiquetikzDroite]{Start}}:{\useKV[GraphiquetikzDroite]{End}},samples=2,name path global=\pfldroitename,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},domain={\useKV[GraphicTikzLine]{Start}}:{\useKV[GraphicTikzLine]{End}},samples=2,name path global=\pfldroitename,#4] plot (\x,{\pfldtepente*(\x-\pfldtetikzxA)+\pfldtetikzyA}) ;
}%
}%
\end{scope}
}
+%====asymptote
+\NewDocumentCommand\DrawAsymptote{ O{} m D<>{} }{%
+ \restoreKV[GraphicTikzLine]%
+ \setKV[GraphicTikzLine]{#1}%
+ %tracé
+ \draw[tkzgrphline,{\useKV[GraphicTikzLine]{Color}},#3] ({#2},{\pflymin})--({#2},{\pflymax}) ;
+}
+
+%====minmax
\defKV[GraphicTikzMinMax]{%
Pas=\def\pflminmaxstep{#1},%
Method=\def\pflminmaxmethode{#1},%
@@ -4061,4 +4180,42 @@
\draw #2 node[tkzgrphnode,font=\pflnodefonte,text=\pflnodecol,\pfnodepos] {#3} ;
}
+%====MONTE CARLO
+\defKV[GraphicTikzmontecarlo]{%
+ Colors=\def\graphtikzmccols{#1},%
+ BoundsX=\def\graphtikzmcxbornes{#1},%
+ BoundsY=\def\graphtikzmcybornes{#1}
+}
+
+\setKVdefault[GraphicTikzmontecarlo]{%
+ Colors={blue/red},%
+ BoundsX={\pflxmin,\pflxmax},%
+ BoundsY={\pflymin,\pflymax}
+}
+
+\NewDocumentCommand\SimulateMonteCarlo{ O{} D<>{f} m O{\nbptsmcok} O{\nbptsmcko} }{%
+ \restoreKV[GraphicTikzmontecarlo]%
+ \setKV[GraphicTikzmontecarlo]{#1}%
+ \StrCut{\graphtikzmccols}{/}{\tmpMCcolOK}{\tmpMCcolKO}%
+ \StrCut{\graphtikzmcxbornes}{,}{\tmpMCxmin}{\tmpMCxmax}%
+ \StrCut{\graphtikzmcybornes}{,}{\tmpMCymin}{\tmpMCymax}%
+ \xdef#4{0}%
+ \xdef#5{0}%
+ \xdef\nbptsmc{#3}%
+ \foreach \i in {1,...,#3}{%
+ \xdef\tmpMCrandX{\xintfloateval{random()*((\tmpMCxmax)-(\tmpMCxmin))+(\tmpMCxmin)}}%
+ \xdef\tmpMCrandY{\xintfloateval{random()*((\tmpMCymax)-(\tmpMCymin))+(\tmpMCymin)}}%
+ \xdef\tmpMCrandfX{\xintfloateval{#2(\tmpMCrandX)}}%
+ \xintifboolexpr{ \tmpMCrandfX > \tmpMCrandY }%
+ {%
+ \xdef#4{\xinteval{#4+1}}%
+ \filldraw[\tmpMCcolOK] (\tmpMCrandX,\tmpMCrandY) circle[tkzgrphpointmc] ;
+ }%
+ {%
+ \xdef#5{\xinteval{#5+1}}%
+ \filldraw[\tmpMCcolKO] (\tmpMCrandX,\tmpMCrandY) circle[tkzgrphpointmc] ;
+ }%
+ }%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/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..5a81b956db7 100644
--- a/Master/texmf-dist/tex/lualatex/piton/piton.lua
+++ b/Master/texmf-dist/tex/lualatex/piton/piton.lua
@@ -20,7 +20,7 @@
-- -------------------------------------------
--
-- This file is part of the LuaLaTeX package 'piton'.
-piton_version = "3.0b" -- 2024/05/23
+piton_version = "3.1" -- 2024/07/30
@@ -124,7 +124,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 +146,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 * "{"
+ Ct ( ( piton.DetectedCommands * "{"
* ( braces
- / ( function ( s ) return LPEG_cleaner[lang] : match ( s ) end ) )
+ / ( function ( s )
+ if s ~= '' then return LPEG_cleaner[lang] : match ( s ) end end ) )
* "}"
+ EscapeClean
+ C ( P ( 1 ) )
@@ -165,56 +167,58 @@ 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 +229,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 +278,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' ,
@@ -509,10 +522,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 +537,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 +560,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 +613,7 @@ local DotNotation =
(
K ( 'Name.Module' , cap_identifier )
* Q "."
- * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" )
+ * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" ) ^ ( -1 )
+
Identifier
* Q "."
@@ -637,7 +652,7 @@ local Char =
K ( 'String.Short' , "'" * ( ( 1 - P "'" ) ^ 0 + "\\'" ) * "'" )
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 +769,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 +787,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 +803,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:'
)
@@ -859,10 +873,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 +889,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 +902,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:'
)
@@ -967,6 +980,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 +1019,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 +1043,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: ]]
)
@@ -1066,9 +1079,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 +1101,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: ]]
)
@@ -1334,7 +1345,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 =
@@ -1599,9 +1610,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 +1632,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..6c4a824cf3f 100644
--- a/Master/texmf-dist/tex/lualatex/piton/piton.sty
+++ b/Master/texmf-dist/tex/lualatex/piton/piton.sty
@@ -19,8 +19,8 @@
%% LaTeX version 2005/12/01 or later.
%% -------------------------------------------
%%
-\def\PitonFileVersion{3.0b}
-\def\PitonFileDate{2024/05/23}
+\def\PitonFileVersion{3.1}
+\def\PitonFileDate{2024/07/30}
@@ -165,7 +165,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 = ''
}
@@ -210,24 +214,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
@@ -431,6 +432,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
@@ -500,14 +503,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 +624,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,8 +707,7 @@
\hbox_overlap_left:n
{
{
- \color { gray }
- \footnotesize
+ \l__piton_line_numbers_format_tl
\int_to_arabic:n \g__piton_visual_line_int
}
\skip_horizontal:N \l__piton_numbers_sep_dim
@@ -912,7 +923,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
@@ -1136,7 +1147,6 @@
\__piton_compute_left_margin:no { CountNonEmptyLinesFile } \l__piton_file_name_str
\__piton_compute_width:
\ttfamily
- % \leavevmode
\lua_now:e
{
piton.ParseFile(
@@ -1480,6 +1490,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 +1567,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/latex/tango/tango.cls b/Master/texmf-dist/tex/lualatex/tango/tango.cls
index d80d9bab102..f188200b4ca 100644
--- a/Master/texmf-dist/tex/latex/tango/tango.cls
+++ b/Master/texmf-dist/tex/lualatex/tango/tango.cls
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesClass{tango}%
-[2024/07/08 v0.7.1 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}
@@ -1022,7 +1273,7 @@ labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!
\titleformat{\subsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont\large}{\thesubsection}{1em}{}%
\titleformat{\subsubsection}{\color{ColorOne}\sffamily\fontseries{sb}\selectfont}{\thesubsubsection}{0.7em}{}%
\titleformat{\paragraph}[runin]{\itshape}{\theparagraph.}{0.5em}{}[. — ]%
-\titleformat{\subparagraph}[runin]{}{\theparagraph.}{0.5em}{}[. — ]%
+\titleformat{\subparagraph}[runin]{}{\thesubparagraph.}{0.5em}{}[. — ]%
\titlespacing{\chapter}{\TgoTitleIndent}{0pt}{6ex}%
\titlespacing{\section}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
\titlespacing{\subsection}{\TgoTitleIndent}{12pt plus 5pt minus 4pt}{6pt plus 3pt minus 2pt}%
@@ -1505,8 +1756,9 @@ headheight=14pt,headsep=10pt,footskip=17pt}
{%
\renewcommand\TgoTempc{\TgoTempb}%
}%
-\par\indent
-\vspace{5pt plus 2pt minus 2pt}\par%
+\@afterindenttrue
+\vspace{5pt plus 2pt minus 2pt}
+\par%
\textsf{\fontseries{sb}\selectfont\TgoTempc}%
\par\nobreak\vspace{0pt plus 1pt}\par%
}%
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 85e9db1843a..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.0",
- date = "2024/07/08",
+ 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 {
@@ -332,7 +308,7 @@ local function luamplibload (name)
local preamble = tableconcat{
format(preamble, replacesuffix(name,"mp")),
luamplib.preambles.mplibcode,
- luamplib.legacy_verbatimtex and luamplib.preambles.legacyverbatimtex or "",
+ luamplib.legacyverbatimtex and luamplib.preambles.legacyverbatimtex or "",
luamplib.textextlabel and luamplib.preambles.textextlabel or "",
}
local result, log
@@ -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
@@ -355,7 +330,7 @@ local function process (data, instancename)
currentformat,
luamplib.numbersystem or "scaled",
tostring(luamplib.textextlabel),
- tostring(luamplib.legacy_verbatimtex),
+ tostring(luamplib.legacyverbatimtex),
}
has_instancename = false
end
@@ -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.legacy_verbatimtex = true
-
+luamplib.legacyverbatimtex = true
function luamplib.maketext (str, what)
if str and str ~= "" then
str = protecttexcontents(str)
@@ -605,7 +569,7 @@ function luamplib.maketext (str, what)
not str:find("\\begin%s*{document}") and
not str:find("\\documentstyle"..name_e) and
not str:find("\\usepackage"..name_e) then
- if luamplib.legacy_verbatimtex then
+ if luamplib.legacyverbatimtex then
if luamplib.in_the_fig then
return process_verbatimtex_infig(str)
else
@@ -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.legacy_verbatimtex then
+ 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,163 +1546,42 @@ 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
end
-local function getobjects(result,figure,f)
- return figure:objects()
-end
-
-function luamplib.convert (result, flusher)
- luamplib.flush(result, flusher)
- return true -- done
-end
-
local figcontents = { post = { } }
local function put2output(a,...)
figcontents[#figcontents+1] = type(a) == "string" and format(a,...) or a
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 pdf_textfigure(font,size,text,width,height,depth)
- text = text:gsub(".",function(c)
- return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
- end)
- put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
-end
-
-local bend_tolerance = 131/65536
-
-local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
-
-local function pen_characteristics(object)
- local t = mplib.pen_info(object)
- rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
- divider = sx*sy - rx*ry
- return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
-end
-
-local function concat(px, py) -- no tx, ty here
- return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
-end
-
-local function curved(ith,pth)
- local d = pth.left_x - ith.right_x
- if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
- d = pth.left_y - ith.right_y
- if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
- return false
- end
- end
- return true
-end
-
-local function flushnormalpath(path,open)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
- elseif curved(ith,pth) then
- pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
- else
- pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
- else
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
- end
-end
-
-local function flushconcatpath(path,open)
- pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
- local pth, ith
- for i=1,#path do
- pth = path[i]
- if not ith then
- pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
- elseif curved(ith,pth) then
- local a, b = concat(ith.right_x,ith.right_y)
- local c, d = concat(pth.left_x,pth.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
- else
- pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
- end
- ith = pth
- end
- if not open then
- local one = path[1]
- if curved(pth,one) then
- local a, b = concat(pth.right_x,pth.right_y)
- local c, d = concat(one.left_x,one.left_y)
- pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
- else
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
- elseif #path == 1 then -- special case .. draw point
- local one = path[1]
- pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
- end
-end
-
-local function start_pdf_code()
- if pdfmode then
- pdf_literalcode("q")
- 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
@@ -1752,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
@@ -1778,7 +1662,7 @@ local function update_pdfobjs (os, stream)
pdfobjs[key] = on
return on,true
end
-
+pdfetcs.resfmt = pdfmode and "%s 0 R" or "@mplibpdfobj%s"
if pdfmode then
pdfetcs.getpageres = pdf.getpageresources or function() return pdf.pageresources end
local getpageres = pdfetcs.getpageres
@@ -1814,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",
@@ -1831,7 +1724,7 @@ local transparancy_modes = { [0] = "Normal",
local function add_extgs_resources (on, new)
local key = format("MPlibTr%s", on)
if new then
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local val = format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ExtGState}{", key, "}{", val, "}"
@@ -1840,100 +1733,98 @@ 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],' '))
- list[i] = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ :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(pdfmode and "%s 0 R" or "@mplibpdfobj%s",update_pdfobjs(os))
+ local objref = format(pdfetcs.resfmt, update_pdfobjs(os))
os = tableconcat {
format("<</ShadingType %i", shtype),
format("/ColorSpace %s", colorspace),
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 = format("MPlibSh%s", on)
- local val = format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on)
+ local key, val = format("MPlibSh%s", on), format(pdfetcs.resfmt, on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/Shading}{", key, "}{", val, "}"
}
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
@@ -1945,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]],
@@ -1957,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
@@ -1965,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
@@ -1994,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
@@ -2069,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
+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))
@@ -2120,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 {
@@ -2155,31 +2008,87 @@ 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)
local on, new = update_pdfobjs(format("[/Pattern %s]", cs))
if new then
- local key = format("MPlibCS%i",on)
- local val = pdfmode and format("%i 0 R",on) or format("@mplibpdfobj%i",on)
+ local key, val = format("MPlibCS%i",on), format(pdfetcs.resfmt,on)
if pdfmanagement then
texsprint {
"\\csname pdfmanagement_add:nnn\\endcsname{Page/Resources/ColorSpace}{", key, "}{", val, "}"
@@ -2188,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)
@@ -2242,52 +2147,38 @@ 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 dx, dy = 0, 0
- local bbox = prescript.mplibfadebbox:explode":"
- if tonumber(bbox[1]) < 0 then
- dx = -bbox[1]
- bbox[1], bbox[3] = 0, bbox[3] + dx
- end
- if tonumber(bbox[2]) < 0 then
- dy = -bbox[2]
- bbox[2], bbox[4] = 0, bbox[4] + dy
+ local fd_stop = prescript and prescript.mplibfadestate
+ if not fd_type then
+ return fd_stop -- returns "stop" (if picture) or nil
end
- local vec, coords = prescript.mplibfadevector, { }
- if vec then
- vec = vec:explode":"
- for i=1,4 do
- coords[#coords+1] = vec[i] + (i % 2 == 0 and dy or dx)
+ local bbox = prescript.mplibfadebbox:explode":"
+ local dx, dy = -bbox[1], -bbox[2]
+ local vec = prescript.mplibfadevector; vec = vec and vec:explode":"
+ if not vec then
+ if fd_type == "linear" then
+ vec = {bbox[1], bbox[2], bbox[3], bbox[2]} -- left to right
+ else
+ local centerx, centery = (bbox[1]+bbox[3])/2, (bbox[2]+bbox[4])/2
+ vec = {centerx, centery, centerx, centery} -- center for both circles
end
end
+ local coords = { vec[1]+dx, vec[2]+dy, vec[3]+dx, vec[4]+dy }
if fd_type == "linear" then
- if not vec then
- coords = { bbox[1], bbox[2], bbox[3], bbox[2] } -- left to right
- end
coords = format("%f %f %f %f", tableunpack(coords))
elseif fd_type == "circular" then
local width, height = bbox[3]-bbox[1], bbox[4]-bbox[2]
- if not vec then
- coords = { width/2, height/2, width/2, height/2 } -- center for both circle
- end
- local radius = prescript.mplibfaderadius or format("0:%f",math.sqrt(width^2+height^2)/2);
- radius = radius:explode":"
+ local radius = (prescript.mplibfaderadius or "0:"..math.sqrt(width^2+height^2)/2):explode":"
tableinsert(coords, 3, radius[1])
tableinsert(coords, radius[2])
coords = format("%f %f %f %f %f %f", tableunpack(coords))
@@ -2295,44 +2186,259 @@ local function do_preobj_FADE (object, prescript)
err("unknown fading method '%s'", fd_type)
end
fd_type = fd_type == "linear" and 2 or 3
- bbox = format("%f %f %f %f", tableunpack(bbox))
local opaq = (prescript.mplibfadeopacity or "1:0"):explode":"
- local ca, cb = {{ opaq[1] }}, {{ opaq[2] }}
local on, os, new
- on = sh_pdfpageresources(fd_type, "0 1", "/DeviceGray", ca, cb, coords, 1)
- if pdfmode then
- os = format("<</PatternType 2/Shading %s 0 R>>", on)
- else
- os = format("<</PatternType 2/Shading @mplibpdfobj%s>>", on)
- end
+ 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)
- if pdfmode then
- os = format("<</Pattern<</MPlibFd%s %s 0 R>>>>", on, on)
- else
- os = format("<</Pattern<</MPlibFd%s @mplibpdfobj%s>>>>", on, on)
- end
+ :gsub(decimals,rmzeros)
+ os = format("<</Pattern<</MPlibFd%s %s>>>>", on, format(pdfetcs.resfmt, on))
on = update_pdfobjs(os)
- local resources = "/Resources "..format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", 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,
- "/Group ", format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on),
- }
+ "/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 = tableconcat {
- "<</SMask<</S/Luminosity/G ",
- format(pdfmode and "%s 0 R" or "@mplibpdfobj%s", on),
- ">>>>",
- }
+ 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)
+ return figure:objects()
+end
+
+function luamplib.convert (result, flusher)
+ luamplib.flush(result, flusher)
+ return true -- done
+end
+
+local function pdf_textfigure(font,size,text,width,height,depth)
+ text = text:gsub(".",function(c)
+ return format("\\hbox{\\char%i}",string.byte(c)) -- kerning happens in metapost : false
+ end)
+ put2output("\\mplibtextext{%s}{%f}{%s}{%s}{%s}",font,size,text,0,0)
+end
+
+local bend_tolerance = 131/65536
+
+local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
+
+local function pen_characteristics(object)
+ local t = mplib.pen_info(object)
+ rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
+ divider = sx*sy - rx*ry
+ return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
+end
+
+local function concat(px, py) -- no tx, ty here
+ return (sy*px-ry*py)/divider,(sx*py-rx*px)/divider
+end
+
+local function curved(ith,pth)
+ local d = pth.left_x - ith.right_x
+ if abs(ith.right_x - ith.x_coord - d) <= bend_tolerance and abs(pth.x_coord - pth.left_x - d) <= bend_tolerance then
+ d = pth.left_y - ith.right_y
+ if abs(ith.right_y - ith.y_coord - d) <= bend_tolerance and abs(pth.y_coord - pth.left_y - d) <= bend_tolerance then
+ return false
+ end
+ end
+ return true
+end
+
+local function flushnormalpath(path,open)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",pth.x_coord,pth.y_coord)
+ elseif curved(ith,pth) then
+ pdf_literalcode("%f %f %f %f %f %f c",ith.right_x,ith.right_y,pth.left_x,pth.left_y,pth.x_coord,pth.y_coord)
+ else
+ pdf_literalcode("%f %f l",pth.x_coord,pth.y_coord)
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ pdf_literalcode("%f %f %f %f %f %f c",pth.right_x,pth.right_y,one.left_x,one.left_y,one.x_coord,one.y_coord )
+ else
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
+ end
+end
+
+local function flushconcatpath(path,open)
+ pdf_literalcode("%f %f %f %f %f %f cm", sx, rx, ry, sy, tx ,ty)
+ local pth, ith
+ for i=1,#path do
+ pth = path[i]
+ if not ith then
+ pdf_literalcode("%f %f m",concat(pth.x_coord,pth.y_coord))
+ elseif curved(ith,pth) then
+ local a, b = concat(ith.right_x,ith.right_y)
+ local c, d = concat(pth.left_x,pth.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(pth.x_coord, pth.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(pth.x_coord, pth.y_coord))
+ end
+ ith = pth
+ end
+ if not open then
+ local one = path[1]
+ if curved(pth,one) then
+ local a, b = concat(pth.right_x,pth.right_y)
+ local c, d = concat(one.left_x,one.left_y)
+ pdf_literalcode("%f %f %f %f %f %f c",a,b,c,d,concat(one.x_coord, one.y_coord))
+ else
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
+ elseif #path == 1 then -- special case .. draw point
+ local one = path[1]
+ pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
+ end
end
function luamplib.flush (result,flusher)
@@ -2365,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
@@ -2386,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
@@ -2410,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
@@ -2453,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
@@ -2473,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
@@ -2524,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 78470a82d07..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/08 v2.33.0 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
@@ -100,16 +138,16 @@
\long\def\mplibdomainmpfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"] or ""
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"] or ""
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode(
"beginfig(0) "..everympfig.." "..[===[\unexpanded{#1}]===].." "..everyendmpfig.." endfig;",
"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -123,14 +161,14 @@
\long\def\mplibdoprempfig#1\endmpfig{%
\endgroup
\directlua{
- local legacy = luamplib.legacy_verbatimtex
+ local legacy = luamplib.legacyverbatimtex
local everympfig = luamplib.everymplib["\mpfiginstancename"]
local everyendmpfig = luamplib.everyendmplib["\mpfiginstancename"]
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
luamplib.everymplib["\mpfiginstancename"] = ""
luamplib.everyendmplib["\mpfiginstancename"] = ""
luamplib.process_mplibcode([===[\unexpanded{#1}]===],"\mpfiginstancename")
- luamplib.legacy_verbatimtex = legacy
+ luamplib.legacyverbatimtex = legacy
luamplib.everymplib["\mpfiginstancename"] = everympfig
luamplib.everyendmplib["\mpfiginstancename"] = everyendmpfig
}%
@@ -197,9 +235,9 @@
\def\mpliblegacybehavior#1{\directlua{
local s = string.lower("#1")
if s == "enable" or s == "true" or s == "yes" then
- luamplib.legacy_verbatimtex = true
+ luamplib.legacyverbatimtex = true
else
- luamplib.legacy_verbatimtex = false
+ luamplib.legacyverbatimtex = false
end
}}
\def\mplibverbatim#1{\directlua{
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
index 76ebf8716c8..6ef3ff1751e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2024-02-19 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
index 1415cee1274..51af33447ce 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29c.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-29c}[2024-05-05 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-29c}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
index e763d91ad7d..02a79ad6ca2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-29e.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-29e}[2024-05-14 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-29e}[2024-05-27 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -359,10 +359,24 @@
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
+\DeclareDocumentCommand \providejfontfamily { m O{} m O{} } {
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+ \providefontfamily #1 [#2,#4] {#3}
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
}
+\DeclareDocumentCommand \renewjfontface { m O{} m O{} } {
+ \renewjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \setjfontface { m O{} m O{} } {
+ \setjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+\DeclareDocumentCommand \providejfontface { m O{} m O{} } {
+ \providejfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
\prop_new:N \l__ltj_fontspec_tmp_prop
\prop_new:N \g__ltj_fontspec_fontopts_prop
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index a83c9305c93..69e709f02ee 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2022-08-24 v1.2k-ltj-14 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2024-05-16 v1.2k-ltj-15 Macros for vertical writing]
\RequirePackage{luatexja}
\newcount\ltj@ext@dir
\let\ltj@lltjext@orig@tabular=\tabular
@@ -541,17 +541,11 @@
\else \let\box@dir\utod
\fi
\fi
-\ifltj@ltfilehook@avail % LaTeX2e >= 2020-10-01
\@defaultunitsset\@picht{#3}\unitlength
\@defaultunitsset\@picwd{#2}\unitlength
\setbox\@picbox\hbox to\@picwd\bgroup\box@dir
\@defaultunitsset\@tempdimc{#4}\unitlength\hskip-\@tempdimc
\@defaultunitsset\@tempdimc{#5}\unitlength\lower\@tempdimc\hbox\bgroup
-\else % <= 2020-02-02
- \@picwd=#2\unitlength \@picht=#3\unitlength
- \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
- \hskip-#4\unitlength\lower#5\unitlength\hbox\bgroup
-\fi
\ltj@@pic@reset@blshift
\ignorespaces}
\def\endpicture{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 7e091d161d1..9f6e4d0a365 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -12,45 +12,14 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2022-10-15 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2024-05-16 LaTeX support of LuaTeX-ja]
\endlinechar=13
%%% LaTeX version detection
-\newif\ifltj@ltfilehook@avail
-\@ifl@t@r\fmtversion{2020-10-01}{%
- \@ifl@t@r\fmtversion{2020-10-02}%
- {\ltj@ltfilehook@availtrue}
- {%
- \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
- \else\ltj@ltfilehook@availtrue\fi
- }%
-}{}
-\@ifl@t@r\fmtversion{2021-05-01}{\count@=1 }{\count@=0 }
-\ifnum \count@<1
-%%%% \shipout
- \newluafunction\ltj@@lua@shipout@inner
- \directlua{
- local t = lua.get_functions_table()
- local getbox, setbox = tex.getbox, tex.setbox
- local shipout_lthook = luatexja.direction.shipout_lthook
- t[\the\ltj@@lua@shipout@inner]=function ()
- local a = shipout_lthook(getbox(\the\ltj@afbox))
- if a then setbox(\the\ltj@afbox, a) end
- end
- }
- \protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
- \def\ltj@shipout@{\ltj@@lua@shipout\primitive\shipout\box\ltj@afbox}%
- \protected\def\ltj@shipout{\ltj@afterbox\ltj@shipout@}
- \ifprimitive\shipout\let\shipout\ltj@shipout\fi
- \ifcsname tex_shipout:D\endcsname
- \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
- \fi
-\else
- \directlua{%
- luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
- }
-\fi
+\directlua{%
+ luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
+}
%%% patch for LaTeX
\usepackage{lltjfont}
@@ -59,36 +28,30 @@
\RequirePackage{lltjp-atbegshi}
%%% patching commands
-\ifltj@ltfilehook@avail
- %% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
- %% no-starred version: do nothing if the <package> is loaded
- %% starred version: do <code> right away if the <package> is loaded
- \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
- \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
- \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
- \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
- \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
- \long\def\@@ltj@ExecuteAfterPackage#1#2{%
- \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
- }
- \long\def\@@ltj@ExecuteBeforePackage#1#2{%
- \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
- }
- }{
- \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
- \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
- \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
- \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
- }
- \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
- \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
- }
+%% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
+%% no-starred version: do nothing if the <package> is loaded
+%% starred version: do <code> right away if the <package> is loaded
+\def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage}
+\def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage}
+\@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15
+ \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}}
+ \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}}
+ \long\def\@@ltj@ExecuteAfterPackage#1#2{%
+ \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}%
}
-\else
- \RequirePackage{filehook}
- \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
- \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
-\fi
+ \long\def\@@ltj@ExecuteBeforePackage#1#2{%
+ \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}%
+ }
+}{
+ \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}
+ \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}}
+ \long\def\@@ltj@ExecuteAfterPackage@star#1#2{%
+ \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}%
+ }
+ \long\def\@@ltj@ExecuteBeforePackage@star#1#2{%
+ \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
+ }
+}
\def\ltj@pkgpatch@im#1{\@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%]
\def\ltj@pkgpatch@im@#1[#2]{\ltj@ExecuteAfterPackage*{#1}{\ltj@pkgpatch@im@@{#2}}}
\def\ltj@pkgpatch@im@@#1{%
@@ -101,11 +64,7 @@
}
\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%]
-\ifltj@ltfilehook@avail
- \def\ltj@pkgpatch@@{\AddToHook{begindocument/before}[luatexja.autopatch]}
-\else
- \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook}
-\fi
+\def\ltj@pkgpatch@@{\AddToHook{begindocument/before}[luatexja.autopatch]}
\def\ltj@pkgpatch@#1[#2]{%
\ltj@pkgpatch@@{%
\@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}%
@@ -121,18 +80,12 @@
\ltj@pkgpatch{tascmac}
\ltj@pkgpatch{ascmac}[lltjp-tascmac]
\ltj@pkgpatch@im{stfloats}
-\ifltj@ltfilehook@avail\else
- \ltj@pkgpatch{preview} %% at \begin{document}
- % (preview package has delayed option)
-\fi
\ltj@pkgpatch{array} %% at \begin{document}
\ltj@pkgpatch{collcell} %% at \begin{document}
\ltj@pkgpatch@im{unicode-math}
\ltj@pkgpatch@im{siunitx}
\ltj@pkgpatch@im{microtype}
-\ifltj@ltfilehook@avail\else\ltj@pkgpatch@im{everyshi}\fi
-
\RequirePackage{lltjp-geometry}
\ltj@ExecuteBeforePackage{breqn}{%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
index 43ecac806c2..8f5632be4e3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
@@ -156,16 +156,17 @@ function set_box_stack_level(head, mode)
if ltjs.list_dir == dir_tate then
for p in traverse_glyph(to_direct(head)) do
if getlang(p)==lang_ja and has_attr(p, attr_icflag, 0) then
- local pf = ltjf_replace_altfont(attr_curtfnt, getchar(p), p)
+ local pc = ltjs_orig_char_table[p] or getchar(p)
+ local pf = ltjf_replace_altfont(attr_curtfnt, pc, p)
if ltjf_font_metric_table[pf].vert_activated then
- local pc = ltjf_font_metric_table[pf].vform[pc]; if pc then setchar(p, pc) end
+ pc = ltjf_font_metric_table[pf].vform[pc]; if pc then setchar(p, pc) end
end
end
end
else
for p in traverse_glyph(to_direct(head)) do
if getlang(p)==lang_ja and has_attr(p, attr_icflag, 0) then
- ltjf_replace_altfont(attr_curjfnt, getchar(p), p)
+ ltjf_replace_altfont(attr_curjfnt, ltjs_orig_char_table[p] or getchar(p), p)
end
end
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
index 88352dd5b24..2b65eb5e5c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
@@ -15,7 +15,7 @@ do
end
local cidfont_data = {}
local cache_chars = {}
-local cache_ver = 13
+local cache_ver = 14
local identifiers = fonts.hashes.identifiers
local cid_reg, cid_order, cid_supp, cid_name
@@ -147,7 +147,7 @@ do
descender = 655360*0.12,
},
embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
- tounicode = 1,
+ tounicode = 1, filename="",
properties = { language = "dflt", script = "dflt" },
}
cidfont_data[cid_name] = k
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index a54ede6758b..f9ae793bb40 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -27,7 +27,7 @@
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20240514.0}
+\def\LuaTeXjaversion{20240714.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index bb63ac68774..00c858e3493 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2022-01-23 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2024-05-16 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
@@ -18,13 +18,8 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
\kanjifamily{mc}
-\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
- \kanjiseries{m}
- \kanjishape{n}
-\else % >=2021-06-01
- \def\k@series{m}
- \def\k@shape{n}
-\fi
+\def\k@series{m}
+\def\k@shape{n}
\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY3}{}{}
\DeclareKanjiSubstitution{JY3}{mc}{m}{n}
@@ -37,12 +32,7 @@
\newcommand\kanjiencodingdefault{JY3}
\newcommand\kanjifamilydefault{\mcdefault}
\newcommand\kanjiseriesdefault{\mddefault}
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
- %% LaTeX 2020-02-02
- \newcommand\kanjishapedefault{\shapedefault}
-\else%% LaTeX 2019-10-01
- \newcommand\kanjishapedefault{\updefault}
-\fi
+\newcommand\kanjishapedefault{\shapedefault}
\DeclareKanjiFamily{JY3}{mc}{}
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
@@ -90,57 +80,36 @@
\DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
\fi
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
-%%%% LaTeX >= 2020-02-02
\edef\bfseries@mc{\bfdefault}
\edef\bfseries@gt{\bfdefault}
\def\bfseries@jtt{\bfseries@mc}
\edef\mdseries@mc{\mddefault}
\edef\mdseries@gt{\mddefault}
\def\mdseries@jtt{\mdseries@mc}
-\fi
\newif\if@ltj@match@family
\@ltj@match@familyfalse
\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont}
-\def\@ltj@hook@family#1#2{% #1: csname #2: contents
- \ifltj@ltfilehook@avail % LaTeX 2020-10-01
- \AddToHook{#1}{#2}%
- \else\ifcsname @#1hook\endcsname % LaTeX 2020-02-02
- \csappto{@#1hook}{#2}%
- \else % LaTeX 2019-10-01
- \ifcsname #1 \endcsname
- \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
- \else
- \PackageWarningNoLine{luatexja}{%
- Patching to \expandafter\string\csname #1\endcsname\space failed%
- }%
- \fi
- \fi\fi
-}
-\@ltj@hook@family{rmfamily}{%
+\AddToHook{rmfamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{mc}\mcdefault
\fi
}
-\@ltj@hook@family{sffamily}{%
+\AddToHook{sffamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{gt}\gtdefault
\fi
}
-\@ltj@hook@family{ttfamily}{%
+\AddToHook{ttfamily}{%
\if@ltj@match@family
\prepare@family@series@update@kanji{jtt}\jttdefault
\fi
}
-\let\@ltj@hook@family\@undefined
-\ifltj@ltfilehook@avail % 2020-10-01
- \expandafter\def\expandafter\kanjiseriesdefault
- \expandafter{\kanjiseriesdefault\@empty}
- \let\kanjiseriesdefault@kernel\kanjiseriesdefault
-\fi
+\expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+\let\kanjiseriesdefault@kernel\kanjiseriesdefault
%%% \eminnershape
\expandafter\patchcmd\csname em \endcsname{\itshape}{\gtfamily\itshape}{}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 2efc9435ab8..52ac44d5ccb 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -3,31 +3,10 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2023-04-13 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2023-05-16 Patch to NFSS2 for LuaTeX-ja]
%%%%%%%% LaTeX2e version detection
-\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
-\ifltj@ltfilehook@avail
-\ExplSyntaxOn
- \cs_if_exist:NTF \__shipout_execute_main_cont:Nnnn
- {\ltj@@latex@plv=1500}% 2021-06-01
- {\ifnum\patch@level>2\relax \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01
-\ExplSyntaxOff
-\else\ifdefined\@rmfamilyhook % 2020-02-02
- \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
- \@latex@error
- {Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 3 is required}%
- {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
- \else
- \ltj@@latex@plv=300
- \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
- \ltj@@latex@plv=501
- \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
- \ltj@@latex@plv=500
- \fi\fi
- \fi
-\fi\fi
+\newcount\ltj@@latex@plv \ltj@@latex@plv=1500
%% patching \DeclareTextComposite
\def\ltj@chardef@text@cmd#1{%
@@ -400,59 +379,7 @@
\directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
}%
\fi}
-\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
-\protected\def\ltj@selectfont@patch{%
- \ltj@@start@time@measure{selectfont}%
- \let\tmp@error@fontshape\error@fontshape
- \let\error@fontshape\error@kfontshape
- \ltj@@is@kyenc{\k@encoding}\ifin@%
- \let\cy@encoding\k@encoding
- \ensure@KanjiEncodingPair{t}%
- \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
- \else
- \ltj@@is@ktenc{\k@encoding}\ifin@%
- \let\ct@encoding\k@encoding
- \ensure@KanjiEncodingPair{y}%
- \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
- \else
- \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
- \fi
- \fi
- \global\let\ltj@afont@name=\font@name
- \ltj@selectfont@tate\ltj@selectfont@yoko
-%
- \edef\tmp@item{{\k@encoding}}\expandafter\def\expandafter\k@encoding\tmp@item
- \kenc@update
- \global\let\font@name=\ltj@afont@name
- \let\error@fontshape\tmp@error@fontshape
- \if@knjcmd \@knjcmdfalse
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
- \expandafter\ifx
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
- \else
- \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\selectfont
- % 警告: å†ã³ \selectfont を呼んã§ã„る.無é™ãƒ«ãƒ¼ãƒ—ã®å¯èƒ½æ€§ã‚ã‚Š
- \fi
- \else
- \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\selectfont
- % 警告: å†ã³ \selectfont を呼んã§ã„る.無é™ãƒ«ãƒ¼ãƒ—ã®å¯èƒ½æ€§ã‚ã‚Š
- \fi
- \fi
- \global\let\font@name=\ltj@afont@name
- \ltj@@stop@time@measure{selectfont}%
-}
-\RequirePackage{everysel}
-\let\ltj@@EverySelectfont@Init=\@EverySelectfont@Init
-\expandafter\expandafter\expandafter\let
-\expandafter\expandafter\csname ltj@@orig@selectfont\endcsname\csname selectfont\space\endcsname
-\@EverySelectfont@Init% for LaTeX2e <=2020-10-01
-\def\@EverySelectfont@Init{%
- \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
- \ltj@@EverySelectfont@Init
-}
-\EverySelectfont{\ltj@selectfont@patch}
-\else % LaTeX2e >=2021-06-01
+
\AddToHook{selectfont}[luatexja]{%
\ltj@@start@time@measure{selectfont}%
\ifx\delayed@k@adjustment\@empty
@@ -514,7 +441,6 @@
\global\let\font@name=\ltj@afont@name
\ltj@@stop@time@measure{selectfont}%
}
-\fi
\bgroup
\def\ltj@@dir@patch#1#2#3{%
@@ -721,8 +647,6 @@
}
%%%%%%
-\ifnum\ltj@@latex@plv>0
-%%%% LaTeX >= 2020-02-02
\newif\if@shape@roman@kanji
\def\merge@kanji@series#1{%
@@ -740,76 +664,11 @@
\@nil
}
-\ifnum\ltj@@latex@plv>500 % !!! pl5 + develop
\def\set@target@series@kanji#1{%
\edef\k@series{#1}%
\series@maybe@drop@one@m\k@series\k@series
}
-\else\ifnum\ltj@@latex@plv>300 % !!! pl5
- \def\set@target@series@kanji#1{%
- \edef\k@series{#1}%
- \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
- }
-\else % !!! pl 3, 4
- \def\set@target@series@kanji#1{%
- \edef\k@series{#1}%
- \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
- }
-\fi\fi
-\ifnum\ltj@@latex@plv<1500% <=2020-10-01
-\def\merge@kanji@series@#1#2#3\@nil{%
- \def\reserved@a{#3}%
- \ifx\reserved@a\@empty
- \set@target@series@kanji{#2}%
- \else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
- \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}%
- \ifcsname \reserved@a \endcsname
- \set@target@series@kanji{#1}%
- \else
- \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname
- \set@target@series@kanji{#2}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \else
- \set@target@series@kanji{#3}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \fi
- \fi
- \fi
-}
-\def\merge@kanji@shape@#1#2#3\@nil{%
- \def\reserved@a{#3}%
- \ifx\reserved@a\@empty
- \if@shape@roman@kanji
- \set@safe@kanji@shape{#2}{}%
- \else
- \edef\k@shape{#2}%
- \fi
- \else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
- \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
- \ifcsname \reserved@a\endcsname
- \edef\k@shape{#1}%
- \else
- \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname
- \edef\k@shape{#2}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \else
- \if@shape@roman@kanji
- \set@safe@kanji@shape{#3}%
- {{\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}}%
- \else
- \edef\k@shape{#3}%
- {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
- \fi
- \fi
- \fi
- \fi
-}
-\else % >=2021-06-01
\def\merge@kanji@series@#1#2#3\@nil{%
\def\reserved@a{#3}%
\ifx\reserved@a\@empty
@@ -892,20 +751,8 @@
\fi
}
\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
-\fi
\newif\if@forced@series@kanji
-\ifnum\ltj@@latex@plv=300 % 2020-02-02 pl3, 4
- \DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
- \DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
- \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
- \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
-\else\ifnum\ltj@@latex@plv<1500% >=2020-02-02 pl5 and <=2020-10-01
- \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
- \DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse\merge@kanji@series{#1}}
- \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
- \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue\edef\k@series{#1}}
-\else% >=2021-06-01
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@series{#1}}}
@@ -919,22 +766,9 @@
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\edef\k@series{#1}}}
\let\delayed@k@adjustment\@empty
-\fi\fi
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}%
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}%
-\ifnum\ltj@@latex@plv<1500% <=2020-10-01
- \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
- \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
- \DeclareRobustCommand\fontshape[1]{%
- \@shape@roman@kanjitrue
- \merge@font@shape{#1}\merge@kanji@shape{#1}%
- \@shape@roman@kanjifalse
- }
- \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
- \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
- \DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}}
-\else% >=2021-06-01
\DeclareRobustCommand\romanshape[1]{%
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@shape{#1}}}
@@ -956,9 +790,6 @@
\romanshapeforce{#1}%
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}}
-\fi
-\ifnum\ltj@@latex@plv>1499
-%%%% LaTeX >= 2021-06-01
\DeclareRobustCommand\usekanji[4]{%
\kanjiencoding{#1}\edef\k@family{#2}%
\set@target@series@kanji{#3}\edef\k@shape{#4}%
@@ -969,42 +800,6 @@
\set@target@series{#3}\edef\f@shape{#4}%
\let\delayed@f@adjustment\@empty
\selectfont\ignorespaces}
-\else\ifnum\ltj@@latex@plv>1000
-%%%% 2021-10-01 PL3 <= LaTeX < 2021-06-01
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\edef\k@family{#2}%
- \set@target@series@kanji{#3}\edef\k@shape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\edef\f@family{#2}%
- \set@target@series{#3}\edef\f@shape{#4}%
- \selectfont\ignorespaces}
-\else
-%%%% 2020-10-01 <= LaTeX < 2020-10-01 PL3
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\edef\k@family{#2}\edef\k@series{#3}\edef\k@shape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}%
- \selectfont\ignorespaces}
-\fi\fi
-%%%% LaTeX >= 2020-02-02 END
-\else
-%%%% LaTeX 2019-10-01
-\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
-\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
-\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
-\DeclareRobustCommand\fontshape[1]{\set@safe@kanji@shape{#1}{}\romanshape{#1}}
-\DeclareRobustCommand\usekanji[4]{%
- \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
- \selectfont\ignorespaces}
-\DeclareRobustCommand\useroman[4]{%
- \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
- \selectfont\ignorespaces}
-%%%% LaTeX 2019-10-01 END
-\fi
%%%%
\def\set@safe@kanji@shape#1#2{%
@@ -1026,8 +821,6 @@
\else\useroman{#1}{#2}{#3}{#4}%
\fi}
-\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
-%%%% LaTeX >= 2020-02-02
\let\prepare@family@series@update@kanji=\prepare@family@series@update
\patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
\patchcmd\prepare@family@series@update@kanji{\if@forced@series}{\if@forced@series@kanji}{}{}
@@ -1049,34 +842,16 @@
\patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
-\def\@ltj@hook@series@default#1#2#3{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{#1/defaults}{#2}%
- \else\ifcsname @set#1defaultshook\endcsname %after 2020-04-07
- \expandafter\g@addto@macro\csname @set#1defaultshook\endcsname{#2}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname #1 \endcsname{#3}{#3#2}{}{}%
- \fi\fi
-}
-\@ltj@hook@series@default{bfseries}{%
+\AddToHook{bfseries/defaults}{%
\let\bfseries@mc\bfdef@ult
\let\bfseries@gt\bfdef@ult
\let\bfseries@jtt\bfdef@ult
-}{%
- \let\bfseries@rm\bfdef@ult
- \let\bfseries@sf\bfdef@ult
- \let\bfseries@tt\bfdef@ult
}
-\@ltj@hook@series@default{mdseries}{%
+\AddToHook{mdseries/defaults}{%
\let\mdseries@mc\mddef@ult
\let\mdseries@gt\mddef@ult
\let\mdseries@jtt\mddef@ult
-}{%
- \let\mdseries@rm\mddef@ult
- \let\mdseries@sf\mddef@ult
- \let\mdseries@tt\mddef@ult
}
-\let\@ltj@hook@series@default\@undefined
\expandafter\patchcmd\csname bfseries \endcsname{%
\ifx\f@family\rmdef@ult \fontseries\bfseries@rm
@@ -1105,105 +880,41 @@
\fi\fi\fi
}{}{}
-\def\@ltj@hook@series#1#2{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{#1}{#2}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
- \fi
-}
-\@ltj@hook@series{bfseries}{%
+\AddToHook{bfseries}{%
\ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc
\else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt
\else\ifx\k@family\jttdef@ult\kanjiseries\bfseries@jtt
\else \kanjiseries\bfdefault
\fi\fi\fi
}
-\@ltj@hook@series{mdseries}{%
+\AddToHook{mdseries}{%
\ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc
\else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt
\else\ifx\k@family\jttdef@ult\kanjiseries\mdseries@jtt
\else \kanjiseries\mddefault
\fi\fi\fi
}
-\let\@ltj@hook@series\@undefined
-\def\@ltj@hook@efd#1#2{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{expand@font@defaults}{#1}%
- \else\ifdefined\@expandfontdefaultshook %after 2020-04-07
- \g@addto@macro\@expandfontdefaultshook{#1#2}%
- \else % 2020-02-02
- \appto\expand@font@defaults{#1#2}%
- \fi\fi
-}
-\@ltj@hook@efd{%
+\AddToHook{expand@font@defaults}{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
\edef\jttdef@ult{\jttdefault}%
-}{\edef\kanjidef@ult{\kanjifamilydefault}}
-\let\@ltj@hook@efd\@undefined
+ \edef\kanjidef@ult{\kanjifamilydefault}}
-\ifltj@ltfilehook@avail % 2020-10-01
- \appto\init@series@setup{%
- \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
- \mdseries
- \let\kanjiseriesdefault\k@series
- \fi
- }
-\else
- \appto\init@series@setup{%
- \ifx\kanjidef@ult\mcdef@ult \mcfamily
- \else\ifx\kanjidef@ult\gtdef@ult \gtfamily
- \else\ifx\kanjidef@ult\jttdef@ult \jttfamily
- \fi\fi\fi
- }
-\fi
-
-\def\@ltj@hook@dfh#1{%
- \ifltj@ltfilehook@avail % 2020-10-01
- \AddToHook{normalfont}{#1}%
- \else\ifdefined\@defaultfamilyhook
- \g@addto@macro\@defaultfamilyhook{#1}%
- \else % 2020-02-02
- \expandafter\patchcmd\csname normalfont \endcsname{\selectfont}{#1\selectfont}{}{}%
- \let\reset@font\normalfont
- \fi\fi
+\appto\init@series@setup{%
+ \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
+ \mdseries
+ \let\kanjiseriesdefault\k@series
+ \fi
}
-\ifnum\ltj@@latex@plv>1499
-\@ltj@hook@dfh{%
+\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
\edef\k@family{\kanjifamilydefault}%
\edef\k@series{\kanjiseriesdefault}%
\edef\k@shape{\kanjishapedefault}%
\let\delayed@k@adjustment\empty
}
-\else
-\@ltj@hook@dfh{%
- \kanjiencoding{\kanjiencodingdefault}%
- \edef\k@family{\kanjifamilydefault}%
- \edef\k@series{\kanjiseriesdefault}%
- \edef\k@shape{\kanjishapedefault}%
-}
-\fi
-\let\@ltj@hook@dfh\@undefined
-%%%% LaTeX >= 2020-02-02 END
-\else
-%%%% LaTeX 2019-10-01
-\DeclareRobustCommand\normalfont{%
- \useroman\encodingdefault\familydefault\seriesdefault\shapedefault
- \usekanji\kanjiencodingdefault\kanjifamilydefault\kanjiseriesdefault\kanjishapedefault}
-\let\reset@font\normalfont
-%%%% LaTeX 2019-10-01 END
-\fi
-
-
-
-\ifdefined\prepare@family@series@update@kanji\else
-%%%% LaTeX 2019-10-01
-\def\prepare@family@series@update@kanji#1{\kanjifamily}
-\fi
\DeclareRobustCommand\mcfamily{%
\unless\ifltj@disablejfam\not@math@alphabet\mcfamily\mathmc\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
index 9575dc3c049..80051535716 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2019-07-18 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2024-06-10 Patch to array for LuaTeX-ja]
\RequirePackage{etoolbox,array}
@@ -11,7 +11,14 @@
\ignorespaces\@sharp\unskip
}{%
\ltj@sharp
-}{}{}
+}{}{% >=2024-06-01
+ \def\ltj@sharp{\relax\pltx@next@inhibitglue\ltjfakeboxbdd\ignorespaces\@sharp\textonly@unskip\ltjfakeboxbdd}
+ \patchcmd\insert@column{%
+ \ignorespaces\@sharp\textonly@unskip
+ }{%
+ \ltj@sharp
+ }{}{}
+}
\@ifpackageloaded{lltjext}{}{%
%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
index 67b0f5de7f7..641fa4a34df 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2021-10-24 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2024-05-16 Patch to geometry for LuaTeX-ja with vertical writing mode]
\RequirePackage{expl3}
\ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
\newif\if@ltj@@geometry@tate
@@ -31,15 +31,6 @@
%============================================
\unless\ifdefined\ltj@ExecuteAfterPackage
-\expandafter\newif\csname ifltj@ltfilehook@avail\endcsname
-\@ifl@t@r\fmtversion{2020-10-01}{%
- \@ifl@t@r\fmtversion{2020-10-02}{\ltj@ltfilehook@availtrue}
- {%
- \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
- \else\ltj@ltfilehook@availtrue\fi
- }%
-}{}
-\ifltj@ltfilehook@avail
%% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code>
%% no-starred version: do nothing if the <package> is loaded
%% starred version: do <code> right away if the <package> is loaded
@@ -64,11 +55,6 @@
\@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}%
}
}
-\else
- \RequirePackage{filehook}
- \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile
- \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile
-\fi
\fi
%============================================
@@ -89,12 +75,8 @@
\else
\@gobble\iftrue\csname iftdir\endcsname \bool_set_true:N \l_tmpa_bool \fi
\fi
-\ifltj@ltfilehook@avail
- \prop_map_inline:Nn \g__hook_begindocument_code_prop
- { \tl_if_in:nnT {#2} {\tate} {\bool_set_true:N \l_tmpa_bool} }
-\else
- \tl_if_in:NnT \@begindocumenthook {\tate} {\bool_set_true:N \l_tmpa_bool}
-\fi
+\prop_map_inline:Nn \g__hook_begindocument_code_prop
+ { \tl_if_in:nnT {#2} {\tate} {\bool_set_true:N \l_tmpa_bool} }
\bool_if:NT \l_tmpa_bool {
\if@ltj@@geometry@forceoff
\@ltj@@geometry@tatefalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
index 9c4526c3fdb..292cbf00bfe 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty
@@ -1,5 +1,5 @@
%
-% lltjp-siunitx.sty 2022-12-14
+% lltjp-siunitx.sty 2024-06-10
%
\NeedsTeXFormat{LaTeX2e}
@@ -7,7 +7,6 @@
\RequirePackage{siunitx}
\makeatletter
\ExplSyntaxOn
-\cs_if_exist:NTF \siunitx_print_text:n {% siunitx v3.00
\cs_set_protected:Npn \siunitx_print_text:n #1
{
\text
@@ -32,104 +31,26 @@
}
}
\cs_set_eq:NN \ltj_orig__siunitx_table_collect_begin:w \__siunitx_table_collect_begin:w
-\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 \relax
- { \ltj_orig__siunitx_table_collect_begin:w }
-\RenewDocumentCommand \tablenum { O { } m }
- {
- \mode_leave_vertical:
- \group_begin:
- \keys_set:nn { siunitx } {#1}
- \siunitx_cell_begin:w
- \relax \ignorespaces #2
- \siunitx_cell_end:
- \group_end:
- }
-}% siunitx v3.00 end
-{% siunitx v2.xx
-\cs_generate_variant:Nn \tl_if_in:NnT { coT }
-\cs_new:Nn \__ltj_siunix_patch_inner:n {
- \cs_if_exist:cT { #1_tl } {
- \tl_if_in:coT { #1_tl } { \tex_char:D } {
- \tl_replace_all:cnn { #1_tl } { \tex_char:D } { \ltjalchar }
- }
+\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 {
+ \token_if_eq_meaning:NNTF #1 \relax
+ {\ltj_orig__siunitx_table_collect_begin:w }
+ {\ltj_orig__siunitx_table_collect_begin:w #1 }
}
-}
-\cs_new:Nn \__ltj_siunix_patch_inner_math:n {
- \__ltj_siunix_patch_inner:n { l__siunitx_#1_math }
- \__ltj_siunix_patch_inner:n { l__siunitx_#1_text }
-}
-\AtBeginDocument {
- \__ltj_siunix_patch_inner:n { c__siunitx_minus }
- \__ltj_siunix_patch_inner:n { c__siunitx_mu }
- \__ltj_siunix_patch_inner_math:n { angstrom }
- \__ltj_siunix_patch_inner_math:n { arcminute }
- \__ltj_siunix_patch_inner_math:n { arcsecond }
- \__ltj_siunix_patch_inner_math:n { ohm }
-}
-
-%%%% new table column: S and s
-\bool_new:N \l__ltj_siunitx_table_collect_relax_bool
-\cs_set_protected:Npn \__siunitx_table_collect_begin_s: {
- \bool_set_false:N \l__ltj_siunitx_table_collect_relax_bool
- \cs_set_eq:NN \__siunitx_table_collect_token:N
- \__siunitx_table_collect_token_s:N
- \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s:
- \__siunitx_table_collect_init_s:
- \__siunitx_table_collect_get:
-}
-
-\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
+\cs_set_protected:Npn \__siunitx_table_collect_token:N #1
{
- \token_if_eq_meaning:NNTF #1 \tex_relax:D {
- \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
- \__siunitx_table_collect_not_braced_aux_i:N #1
- } {
- \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
- }
- } {
- \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
- \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
- \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
+ \__siunitx_table_collect_search:NnF #1
{
- \token_if_eq_meaning:NNF #1 \tex_unskip:D
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ \ignorespaces { \__siunitx_table_collect_ignore_spaces:N #1}
+ \pltx@next@inhibitglue { \__siunitx_table_collect_loop:}
+ \ltjfakeboxbdd { \__siunitx_table_collect_loop:}
+ \textonly@unskip { \__siunitx_table_collect_loop:}
+ \unskip { \__siunitx_table_collect_loop:}
+ \end { \tabularnewline \end }
+ \relax { \__siunitx_table_collect_relax:N #1 }
+ \tabularnewline { \tabularnewline }
+ \siunitx_cell_end: { \siunitx_cell_end:}
}
- }}}
- \__siunitx_table_collect_next:
- }
-
-\AtBeginDocument
- {
- \@ifpackageloaded { mdwtab }
- {
- \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
- {
- \token_if_eq_meaning:NNTF #1 \tex_relax:D {
- \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool {
- \__siunitx_table_collect_not_braced_aux_i:N #1
- } {
- \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool
- }
- } {
- \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
- \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
- \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
- {
- \token_if_eq_meaning:NNF #1 \tex_unskip:D
- {
- \token_if_eq_meaning:NNF #1 \tab@setcr
- {
- \token_if_eq_meaning:NNF #1 \@maybe@unskip
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
- }
- }
- }
- }}}
- \__siunitx_table_collect_next:
- }
- }
- { }
- }
+ { \__siunitx_table_collect_token_aux:N #1 }
}
\ExplSyntaxOff
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
index ebb29abb15c..452656845c4 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-cssquery.lua
@@ -156,7 +156,7 @@ local function cssquery()
-- make sure we deal with a string
value = tostring(value)
-- make the search string safe for pattern matching
- local escaped_search = search:gsub("([%(%)%.%%%+%–%*%?%[%^%$])", "%%%1")
+ local escaped_search = search:gsub("([%(%)%.%%%+%-%#%*%?%[%^%$])", "%%%1")
if modifier == "" then
return value == search
elseif modifier == "|" then
@@ -434,6 +434,18 @@ local function cssquery()
return querylist
end
+ --- Remove selector from the CSS list object.
+ -- All actions that literaly match the given selector will be removed.
+ function CssQuery:remove_selector(
+ selector -- CSS selector to be removed
+ )
+ for pos, obj in ipairs(self.querylist) do
+ if obj.source == selector then
+ table.remove(self.querylist, pos)
+ end
+ end
+ end
+
--- It tests list of queries agaings a DOM element and executes the
--- coresponding function that is saved for the matched query.
-- @return nothing
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
index 73689add5a1..dca38df0db5 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
@@ -6,16 +6,20 @@ local dom = {}
local xml
local handler
local css_query
+local html
if kpse then
xml = require("luaxml-mod-xml")
handler = require("luaxml-mod-handler")
css_query = require("luaxml-cssquery")
+ html = require("luaxml-mod-html")
else
xml = require("luaxml.mod-xml")
handler = require("luaxml.mod-handler")
css_query = require("luaxml.cssquery")
+ html = require("luaxml.mod-html")
end
+local HtmlParser = html.HtmlParser
local void = {area = true, base = true, br = true, col = true, hr = true, img = true, input = true, link = true, meta = true, param = true}
@@ -91,9 +95,14 @@ local function serialize_dom(parser, current,level, output)
local format = get_action(typ, "start")
insert(format, el, prepare_attributes(attr))
end
- local function text(typ, text)
+ local function text(typ, text, parent)
+ local parent = parent or {}
local format = get_action(typ, "text")
- insert(format, escape_element(text))
+ if parent.verbatim then
+ insert(format, text)
+ else
+ insert(format, escape_element(text))
+ end
end
local function stop(typ, el)
local format = get_action(typ, "stop")
@@ -141,7 +150,7 @@ local function serialize_dom(parser, current,level, output)
end
start(xtype, name, attributes)
- text(xtype,text_content)
+ text(xtype,text_content, (current or {})._parent)
local children = root._children or {}
for _, child in ipairs(children) do
output = serialize_dom(parser,child, level + 1, output)
@@ -411,8 +420,8 @@ local parse = function(
return strings
end
- --- Get table with the inner text of an element -- leading and trailing spaces are removed and elements that contain only white space are ignored.
- --- @return table
+ --- Get table with the inner text of an element - leading and trailing spaces are removed and elements that contain only white space are ignored.
+ -- @return table
function DOM_Object:stripped_strings(
current --- [optional] element to be selected
)
@@ -612,11 +621,83 @@ local parse = function(
-- include the methods to all xml nodes
save_methods(parser._handler.root)
-- parser:
- return parser
+ return parser, DOM_Object
+end
+
+-- table of elements that should be kept without XML escaping in the DOM serialization
+local verbatim_elements = {script=true, style=true}
+
+local function html_to_dom(html_object)
+ -- convert parsed HTML DOM to the XML DOM
+ local dom, DOM_Object = parse("") -- use empty text to just initialize the DOM object
+ -- use root of the DOM object as the original parent
+ local current_parent = dom._handler.root
+
+ local function create_node(tbl)
+ -- create node suitable for LuaXML DOM object
+ tbl._children = {}
+ -- this should copy methods from the DOM object to the newly created object
+ tbl.__index = DOM_Object
+ return setmetatable(tbl, DOM_Object)
+ end
+
+ local function build_tree(object)
+ -- convert tree produced by the HTML parser to LuaXML DOM
+ local typ = object._type
+ -- process particular node types from the HTML parser
+ if typ == "doctype" then
+ current_parent:add_child_node(create_node {_name=object.name, _type="DTD"})
+ elseif typ == "comment" then
+ current_parent:add_child_node(create_node {_text=object.text, _type="COMMENT"})
+ elseif typ == "element" then
+ local attributes = {}
+ -- convert attributes to the form expected by the DOM object
+ for _, attr in ipairs(object.attr) do
+ attributes[attr.name] = attr.value
+ end
+ local element = current_parent:create_element(object.tag, attributes)
+ -- disable escaping of text in dom:serialize() for <script> or <style> elements
+ if verbatim_elements[string.lower(object.tag)] then element.verbatim = true end
+ current_parent:add_child_node(element)
+ -- set the current element as parent for the processing of children
+ local old_parent = current_parent
+ current_parent = element
+ -- process children
+ for k,v in ipairs(object.children) do
+ build_tree(v)
+ end
+ -- restore original parent
+ current_parent = old_parent
+ elseif typ == "text" then
+ local text = current_parent:create_text_node(object.text)
+ current_parent:add_child_node(text)
+ else
+ -- for other node types, just process the children
+ for k,v in ipairs(object.children) do
+ build_tree(v)
+ end
+ end
+
+ end
+ build_tree(html_object)
+ return dom
+end
+
+--- Parse HTML text as a DOM object.
+-- It supports all methods as the object returned by the parse() function.
+-- @param html_str string with the HTML code to be parsed
+-- @return DOM_Object
+local function html_parse(html_str)
+ local html_obj = HtmlParser:init(html_str)
+ local html_dom = html_obj:parse()
+ return html_to_dom(html_dom)
end
+
+
--- @export
return {
parse = parse,
- serialize_dom= serialize_dom
+ serialize_dom= serialize_dom,
+ html_parse = html_parse
}
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua
new file mode 100644
index 00000000000..71bfc81dd1b
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-encodings.lua
@@ -0,0 +1,88 @@
+--- Convert 8-bit encodings to UTF-8
+--- @module luaxml-encodings
+-- this table is generated automatically by this command:
+-- texlua encodings/make_encodings.lua
+local encodings = {
+ ['ibm866'] = 'ÐБВГДЕЖЗИЙКЛМÐОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗â•â•œâ•›â”└┴┬├─┼╞╟╚╔╩╦╠â•â•¬â•§â•¨â•¤â•¥â•™â•˜â•’╓╫╪┘┌█▄▌â–▀рÑтуфхцчшщъыьÑÑŽÑÐёЄєЇїЎў°∙·√№¤■ ',
+ ['iso-8859-5'] = '�������������������������������� ÐЂЃЄЅІЇЈЉЊЋЌ­ЎÐÐБВГДЕЖЗИЙКЛМÐОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрÑтуфхцчшщъыьÑÑŽÑ№ёђѓєѕіїјљњћќ§ўџ',
+ ['macintosh'] = 'ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑âˆÏ€âˆ«ÂªÂºÎ©Ã¦Ã¸Â¿Â¡Â¬âˆšÆ’≈∆«»… ÀÃÕŒœ–—“â€â€˜â€™Ã·â—ŠÃ¿Å¸â„€‹›ï¬ï¬‚‡·‚„‰ÂÊÃËÈÃÃŽÃÌÓÔÒÚÛÙıˆ˜¯˘˙˚¸Ë˛ˇ',
+ ['windows-1251'] = 'ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋÐђ‘’“â€â€¢â€“—�™љ›њќћџ ЎўЈ¤Ò¦§Ð©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїÐБВГДЕЖЗИЙКЛМÐОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрÑтуфхцчшщъыьÑÑŽÑ',
+ ['iso-8859-13'] = '�������������������������������� â€Â¢Â£Â¤â€žÂ¦Â§Ã˜Â©Å–«¬­®Æ°±²³“µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲÅŚŪÜŻŽßąįÄćäåęēÄéźėģķīļšńņóÅõö÷ųłśūüżž’',
+ ['iso-8859-6'] = '�������������������������������� ���¤�������،­�������������؛���؟�ءآأؤإئابةتثجحخدذرزسشصضطظعغ�����ـÙقكلمنهوىيًٌÙÙŽÙÙّْ',
+ ['iso-8859-8'] = '�������������������������������� �¢£¤¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾��������������������������������‗×בגדהוזחטיךכל×מןנסעףפץצקרשת��‎â€',
+ ['iso-8859-4'] = '�������������������������������� ĄĸŖ¤ĨĻ§¨ŠĒĢŦ­Ž¯°ą˛ŗ´ĩļˇ¸šēģŧŊžŋĀÃÂÃÄÅÆĮČÉĘËĖÃÎĪÄŅŌĶÔÕÖ×ØŲÚÛÜŨŪßÄáâãäåæįÄéęëėíîīđņÅķôõö÷øųúûüũū˙',
+ ['koi8-r'] = '─│┌â”└┘├┤┬┴┼▀▄█▌â–░▒▓⌠■∙√≈≤≥ ⌡°²·÷â•â•‘╒ё╓╔╕╖╗╘╙╚╛╜â•â•žâ•Ÿâ• â•¡Ð╢╣╤╥╦╧╨╩╪╫╬©юабцдефгхийклмнопÑÑ€ÑтужвьызшÑщчъЮÐБЦДЕФГХИЙКЛМÐОПЯРСТУЖВЬЫЗШЭЩЧЪ',
+ ['iso-8859-7'] = '�������������������������������� ‘’£€₯¦§¨©ͺ«¬­�―°±²³΄΅Ά·ΈΉΊ»Ό½ΎÎÎΑΒΓΔΕΖΗΘΙΚΛΜÎΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπÏςστυφχψωϊϋόÏÏŽ',
+ ['iso-8859-3'] = '�������������������������������� Ħ˘£¤�Ĥ§¨İŞĞĴ­�Ż°ħ²³´µĥ·¸ışğĵ½�żÀÃÂ�ÄĊĈÇÈÉÊËÌÃÃŽÃ�ÑÒÓÔĠÖ×ĜÙÚÛÜŬŜßàáâ�äċĉçèéêëìíîï�ñòóôġö÷ÄùúûüŭÅË™',
+ ['windows-1256'] = '€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“â€â€¢â€“—ک™ڑ›œ‌â€ÚºÂ ØŒÂ¢Â£Â¤Â¥Â¦Â§Â¨Â©Ú¾Â«Â¬Â­Â®Â¯Â°Â±Â²Â³Â´ÂµÂ¶Â·Â¸Â¹Ø›Â»Â¼Â½Â¾ØŸÛءآأؤإئابةتثجحخدذرزسشصض×طظعغـÙقكàلâمنهوçèéêëىيîïًٌÙَôÙÙ÷ّùْûü‎â€Û’',
+ ['windows-1258'] = '€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“â€â€¢â€“—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÃÂĂÄÅÆÇÈÉÊË̀ÃÃŽÃÄÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêëÌíîïđṇ̃óôơö÷øùúûüư₫ÿ',
+ ['iso-8859-14'] = '�������������������������������� Ḃḃ£ĊċḊ§Ẁ©ẂḋỲ­®ŸḞḟĠġṀá¹Â¶á¹–áºá¹—ẃṠỳẄẅṡÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃŴÑÒÓÔÕÖṪØÙÚÛÜÃŶßàáâãäåæçèéêëìíîïŵñòóôõöṫøùúûüýŷÿ',
+ ['windows-1252'] = '€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“â€â€¢â€“—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖ×ØÙÚÛÜÃÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ',
+ ['iso-8859-15'] = '�������������������������������� ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖ×ØÙÚÛÜÃÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ',
+ ['x-mac-cyrillic'] = 'ÐБВГДЕЖЗИЙКЛМÐОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ò£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“â€â€˜â€™Ã·â€žÐŽÑžÐÑŸâ„–ÐÑ‘ÑабвгдежзийклмнопрÑтуфхцчшщъыьÑю€',
+ ['windows-1254'] = '€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“â€â€¢â€“—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ',
+ ['windows-1255'] = '€�‚ƒ„…†‡ˆ‰�‹�����‘’“â€â€¢â€“—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹֺֻּֽ־ֿ׀×ׂ׃װױײ׳״�������×בגדהוזחטיךכל×מןנסעףפץצקרשת��‎â€',
+ ['windows-1250'] = '€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“â€â€¢â€“—�™š›śťžź ˇ˘Å¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»ĽËľżŔÃÂĂÄĹĆÇČÉĘËĚÃÃŽÄŽÄŃŇÓÔÅÖ×ŘŮÚŰÜÃŢßŕáâăäĺćçÄéęëěíîÄđńňóôőö÷řůúűüýţ˙',
+ ['koi8-u'] = '─│┌â”└┘├┤┬┴┼▀▄█▌â–░▒▓⌠■∙√≈≤≥ ⌡°²·÷â•â•‘╒ёє╔ії╗╘╙╚╛ґў╞╟╠╡ÐЄ╣ІЇ╦╧╨╩╪ÒЎ©юабцдефгхийклмнопÑÑ€ÑтужвьызшÑщчъЮÐБЦДЕФГХИЙКЛМÐОПЯРСТУЖВЬЫЗШЭЩЧЪ',
+ ['iso-8859-10'] = '�������������������������������� ĄĒĢĪĨĶ§ĻÄŠŦŽ­ŪŊ°ąēģīĩķ·ļđšŧž―ūŋĀÃÂÃÄÅÆĮČÉĘËĖÃÃŽÃÃŅŌÓÔÕÖŨØŲÚÛÜÃÞßÄáâãäåæįÄéęëėíîïðņÅóôõöũøųúûüýþĸ',
+ ['windows-1257'] = '€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“â€â€¢â€“—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲÅŚŪÜŻŽßąįÄćäåęēÄéźėģķīļšńņóÅõö÷ųłśūüżž˙',
+ ['windows-1253'] = '€�‚ƒ„…†‡�‰�‹�����‘’“â€â€¢â€“—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎÎÎΑΒΓΔΕΖΗΘΙΚΛΜÎΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπÏςστυφχψωϊϋόÏÏŽ',
+ ['iso-8859-2'] = '�������������������������������� Ą˘Å¤ĽŚ§¨ŠŞŤŹ­ŽŻ°ą˛ł´ľśˇ¸šşťźËžżŔÃÂĂÄĹĆÇČÉĘËĚÃÃŽÄŽÄŃŇÓÔÅÖ×ŘŮÚŰÜÃŢßŕáâăäĺćçÄéęëěíîÄđńňóôőö÷řůúűüýţ˙',
+ ['windows-874'] = '€����…�����������‘’“â€â€¢â€“—�������� à¸à¸‚ฃคฅฆงจฉชซฌà¸à¸Žà¸à¸à¸‘ฒณดตถทธนบปผà¸à¸žà¸Ÿà¸ à¸¡à¸¢à¸£à¸¤à¸¥à¸¦à¸§à¸¨à¸©à¸ªà¸«à¸¬à¸­à¸®à¸¯à¸°à¸±à¸²à¸³à¸´à¸µà¸¶à¸·à¸¸à¸¹à¸ºï¿½ï¿½ï¿½ï¿½à¸¿à¹€à¹à¹‚ใไๅๆ็่้๊๋์à¹à¹Žà¹à¹à¹‘๒๓๔๕๖๗๘๙๚๛',
+ ['iso-8859-16'] = '�������������������������������� ĄąÅ€„Š§š©Ș«Ź­źŻ°±ČłŽâ€Â¶Â·Å¾Äș»ŒœŸżÀÃÂĂÄĆÆÇÈÉÊËÌÃÃŽÃÄŃÒÓÔÅÖŚŰÙÚÛÜĘȚßàáâăäćæçèéêëìíîïđńòóôőöśűùúûüęțÿ',
+}
+
+
+local utfchar = utf8.char
+
+--- Try to find an encoding in HTML string
+---@param str string HTML document
+---@param len number count of characters from the start of the string where it should search for the encoding metadata
+---@return string encoding identifier, or nil and message if no encoding was found
+local function find_html_encoding(str, len)
+ -- try to find encoding in the html document
+ -- we limit search length, because encoding should be in the document head, ideally near the start
+ local len = len or 4096
+ local sub = str:sub(1, len)
+ for meta in sub:gmatch("<meta (.-)>") do
+ local charset = meta:match("charset%s*=%s*[\"']?(.-)[\"']")
+ if charset then return string.lower(charset) end
+ end
+ return nil, "Cannot find the document encoding"
+end
+
+local function load_mapping(enc_name)
+ local enc_name = enc_name or ""
+ local enc = encodings[enc_name]
+ if not enc then return nil, "Cannot load encoding " .. enc_name end
+ local mapping,i = {}, 128
+ for pos, codepoint in utf8.codes(enc) do
+ mapping[i] = utfchar(codepoint)
+ i = i + 1
+ end
+ return mapping
+end
+
+--- Convert string to utf-8
+---@param text string for converting
+---@param mapping table
+---@return string converted string
+local function recode(text, mapping)
+ return text:gsub("(.)", function(char)
+ local charpoint = string.byte(char)
+ if charpoint > 127 then
+ return mapping[charpoint]
+ else
+ return false
+ end
+ end)
+end
+
+
+return {
+ encodings = encodings,
+ find_html_encoding = find_html_encoding,
+ load_mapping = load_mapping,
+ recode = recode
+}
+
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
index 69e32b16e22..d8c2b7e9327 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-mod-html.lua
@@ -1,3 +1,6 @@
+--- HTML parsing module for LuaXML
+-- @module luaxml-mod-html
+-- @author Michal Hoftich <michal.h21@gmail.com
-- Copyright Michal Hoftich, 2022
-- HTML parser inspired by https://browser.engineering/html.html
-- but then redone using https://html.spec.whatwg.org/multipage/parsing.html
@@ -1540,9 +1543,14 @@ local function is_formatting_element(name)
return formatting_element_names[name]
end
-local special_elements = {}
+local function hash_from_array(tbl)
+ local t = {}
+ for _, v in ipairs(tbl) do t[v] = true end
+ return t
+end
+
-local special_elements_list = {"address", "applet", "area", "article", "aside",
+local special_elements_list = hash_from_array {"address", "applet", "area", "article", "aside",
"base", "basefont", "bgsound", "blockquote", "body", "br", "button", "caption",
"center", "col", "colgroup", "dd", "details", "dir", "div", "dl", "dt",
"embed", "fieldset", "figcaption", "figure", "footer", "form", "frame",
@@ -1555,13 +1563,9 @@ local special_elements_list = {"address", "applet", "area", "article", "aside",
"mi","mo","mn","ms","mtext", "annotation-xml","foreignObject","desc", "title"
}
-for k,v in ipairs(special_elements_list) do
- special_elements[v] = true
-end
-
local function is_special(name)
- return special_elements[name]
+ return special_elements_list[name]
end
-- these lists are used in HtmlParser:generate_implied_endtags()
@@ -1649,8 +1653,12 @@ local HtmlTreeStates = {}
+--- @type HtmlParser
local HtmlParser = {}
+--- Initialize the HTML Object
+---@param body string HTML to be parsed
+---@return table initialized object
function HtmlParser:init(body)
local o ={}
setmetatable(o, self)
@@ -1686,10 +1694,11 @@ for _,v in ipairs(self_closing_tags_list) do self_closing_tags[v] = true end
-
+--- Execute the HTML parser
+--- @return table Root node of the HTML DOM
function HtmlParser:parse()
-- we assume utf8 input, you must convert it yourself if the source is
- -- in a different encoding
+ -- in a different encoding. for example using luaxml-encodings library
self.text = {}
self.state = self.default_state
-- this should enable us to pass over some characters that we want to ignore
@@ -1791,6 +1800,7 @@ function HtmlParser:emit(token)
elseif token_type == "start_tag" then
self:add_text()
-- self:start_attribute()
+ self:reset_insertion_mode()
self:start_tag()
-- print("Emit start tag", table.concat(token.name))
-- save last attribute
@@ -1882,8 +1892,139 @@ function HtmlParser:set_xmlns(node, parent)
end
end
+function HtmlParser:pop_element()
+ -- close the current element and add it to the DOM
+ local el = self:close_element()
+ local parent = self:get_parent()
+ parent:add_child(el)
+ return el
+end
+
+local close_p_at_start = hash_from_array {"address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul", "pre", "listing", "form", "table", "xmp", "hr"}
+
+local close_headers = hash_from_array {"h1", "h2", "h3", "h4", "h5", "h6"}
+
+local body_modes = hash_from_array {"in_body", "in_cell", "in_row", "in_select", "in_table", "in_table_body", "in_frameset"}
+
+local list_items = hash_from_array {"li", "dt", "dd"}
+
+local close_address_at_end = hash_from_array{"address", "article", "aside", "blockquote", "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre", "search", "section", "summary", "ul", "form"}
+
+
+function HtmlParser:close_unfinished(name)
+ -- close all unfinished elements until the element with the given name is found
+ for i = #self.unfinished, 1, -1 do
+ local el = self:pop_element()
+ if el.tag == name then
+ break
+ end
+ end
+end
+
+
+function HtmlParser:close_paragraph()
+ -- close currently open <p> elements
+ self:close_unfinished("p")
+end
+
+function HtmlParser:current_element_name()
+ -- return name of the current element
+ return self:get_parent().tag
+end
+
+local not_specials = hash_from_array { "address", "div", "p"}
+
+local function handle_list_item(self, name)
+ -- we handle li, dt and dd. dt and dd should close each other, li closes only itself
+ local names = {dt = true, dd = true}
+ if name == "li" then names = {li=true} end
+ for i = #self.unfinished, 1, -1 do
+ local current = self.unfinished[i]
+ local current_tag = current.tag
+ if names[current_tag] then
+ self:generate_implied_endtags(nil, {current.tag})
+ for j = #self.unfinished, i, -1 do
+ self:pop_element()
+ end
+ break
+ elseif is_special(current_tag) and not not_specials[name] then
+ break
+ end
+ end
+end
+
+local close_paragraph = function(self)
+ if is_in_button_scope(self, "p") then
+ self:close_paragraph()
+ end
+end
+
+function HtmlParser:handle_insertion_mode(token)
+ -- simple handling of https://html.spec.whatwg.org/multipage/parsing.html#tree-construction
+ -- we don't support most rules, just the most important for avoiding mismatched tags
+
+ if body_modes[self.insertion_mode] then
+ if token.type == "start_tag" then
+ local name = table.concat(token.name)
+ if close_p_at_start[name] then close_paragraph(self) end
+ if close_headers[name] then
+ close_paragraph(self)
+ -- close current element if it is already header
+ if close_headers[self:current_element_name()] then
+ self:pop_element()
+ end
+ elseif name == "pre" or name == "listing" then
+ -- we should ignore next "\n" char token
+ elseif name == "image" then
+ -- image tag is an error, change to <img>
+ token.name = {"img"}
+ elseif list_items[name] then
+ handle_list_item(self, name)
+ close_paragraph(self)
+ end
+ elseif token.type == "end_tag" then
+ local name = table.concat(token.name)
+ if close_address_at_end[name] then
+ if is_in_scope(self, name, {}) then
+ self:close_unfinished(name)
+ else
+ token.type = "ignore"
+ end
+ elseif name == "p" then
+ if not is_in_button_scope(self, "p") then
+ local parent = self:get_parent()
+ local node = Element:init("p", parent)
+ table.insert(self.unfinished, node)
+ end
+ -- use self:close_paragraph() instead of close_paragraph() because we don't need to check scope at this point
+ self:close_paragraph()
+ elseif name == "br" then
+ token.type = "start_tag"
+ elseif close_headers[name] then
+ local header_in_scope = false
+ -- detect, if there are any open h1-h6 tag and close it
+ for el, _ in pairs(close_headers) do
+ if is_in_scope(self, el, {}) then
+ header_in_scope = el
+ break
+ end
+ end
+ if not header_in_scope then
+ token.type = "ignore"
+ else
+ self:close_unfinished(header_in_scope)
+ end
+ end
+ end
+ end
+end
+
+local rawtext_elements = hash_from_array {"style", "textarea", "xmp"}
+
+
function HtmlParser:start_tag()
local token = self.current_token
+ self:handle_insertion_mode(token)
if token.type == "start_tag" then
-- close all currently opened attributes
self:start_attribute()
@@ -1894,18 +2035,18 @@ function HtmlParser:start_tag()
node.attr = token.attr
node.self_closing = token.self_closing
self:set_xmlns(node)
- --
+ -- in this handler we should close <p> or <li> elements without explicit closing tags
if token.self_closing -- <img />
or self_closing_tags[name] -- void elements
then
- parent:add_child(node)
+ parent:add_child(node, node.tag)
else
-- add to the unfinished list
table.insert(self.unfinished, node)
end
if name == "title" then
self.element_state = "rcdata"
- elseif name == "style" then
+ elseif rawtext_elements[name] then
self.element_state = "rawtext"
elseif name == "script" then
self.element_state = "script_data"
@@ -1916,11 +2057,13 @@ end
function HtmlParser:end_tag()
-- close current opened element
local token = self.current_token
+ self:handle_insertion_mode(token)
if token.type == "end_tag" then
if #self.unfinished==0 then return nil end
- local node = self:close_element()
- local parent = self:get_parent()
- parent:add_child(node)
+ -- close the current element only if the token is in the current scope
+ if is_in_scope(self, table.concat(token.name), {}) then
+ self:pop_element()
+ end
end
end
@@ -1964,6 +2107,21 @@ function HtmlParser:adjusted_current_node()
end
+local simple_modes = {
+ body = "in_body",
+ td = "in_cell",
+ th = "in_cell",
+ tr = "in_row",
+ tbody = "in_table_body",
+ thead = "in_table_body",
+ tfoot = "in_table_body",
+ caption = "in_caption",
+ colgroup = "in_column_group",
+ table = "in_table",
+ template = "current_template_insertion_mode",
+ frameset = "in_frameset"
+}
+
function HtmlParser:reset_insertion_mode()
-- https://html.spec.whatwg.org/multipage/parsing.html#reset-the-insertion-mode-appropriately
local last = false
@@ -1977,16 +2135,33 @@ function HtmlParser:reset_insertion_mode()
if name == "head" and last == true then
self:switch_insertion("in_head")
return
- elseif name == "body" then
- self:switch_insertion("in_body")
- return
elseif name == "html" then
- if self.head_pointer then
+ if not self.head_pointer then
self:switch_insertion("before_head")
return
else
self:switch_insertion("after_head")
+ return
+ end
+ elseif name == "select" then
+ if not last then
+ for x = position -1, 1, -1 do
+ if x == 1 then break end
+ local ancestor = self.unfinished[x]
+ local ancestor_name = ancestor.tag
+ if ancestor_name == "template" then
+ break
+ elseif ancestor_name == "table" then
+ self:switch_insertion("in_select_in_table")
+ return
+ end
+ end
end
+ self:switch_insertion("in_select")
+ return
+ elseif simple_modes[name] then
+ self:switch_insertion(simple_modes[name])
+ return
elseif last == true then
self:switch_insertion("in_body")
return
@@ -2006,8 +2181,8 @@ function HtmlParser:generate_implied_endtags(included, ignored)
local current = self:current_node() or {}
-- keep removing elements while they are in the "included" list
if included[current.tag] then
- table.remove(self.unfinished)
- self:generate_implied_endtags(ignored)
+ self:pop_element()
+ self:generate_implied_endtags(included, ignored)
end
end
@@ -2023,9 +2198,7 @@ function HtmlParser:finish()
self:start_tag("html")
end
while #self.unfinished > 0 do
- local node = self:close_element()
- local parent = self:get_parent()
- parent:add_child(node)
+ self:pop_element()
end
-- return root element
return self.Document -- self:close_element()
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
index 0e6399ab135..5c5ff007770 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-namedentities.lua
@@ -1,2234 +1,2233 @@
-local utf8 = require "utf8"
return {
-["Subset"]="â‹",
-["Chi"]="Χ",
-["tprime"]="‴",
-["lneq"]="⪇",
-["RightUpTeeVector"]="⥜",
-["cscr"]="ð’¸",
-["leftrightarrows"]="⇆",
-["LeftRightVector"]="⥎",
-["Laplacetrf"]="â„’",
-["boxHd"]="╤",
-["GreaterSlantEqual"]="⩾",
-["sqsub"]="âŠ",
-["nvdash"]="⊬",
-["boxHu"]="╧",
-["vcy"]="в",
-["DiacriticalDoubleAcute"]="Ë",
-["nvHarr"]="⤄",
-["lnapprox"]="⪉",
-["fscr"]="ð’»",
-["OverBracket"]="⎴",
-["pm"]="±",
-["ovbar"]="⌽",
-["larrhk"]="↩",
-["atilde"]="ã",
-["Igrave"]="Ì",
-["profsurf"]="⌓",
-["Sigma"]="Σ",
-["rHar"]="⥤",
-["Gcedil"]="Ä¢",
-["sect"]="§",
-["nmid"]="∤",
-["escr"]="ℯ",
-["delta"]="δ",
-["male"]="♂",
-["Integral"]="∫",
-["RightUpVectorBar"]="⥔",
-["alefsym"]="ℵ",
-["nsqsube"]="â‹¢",
-["Nacute"]="Ń",
-["mcomma"]="⨩",
-["ApplyFunction"]=utf8.char(0x2061),
-["rfisht"]="⥽",
-["phmmat"]="ℳ",
-["rarrw"]="â†",
-["backepsilon"]="϶",
-["hscr"]="ð’½",
-["middot"]="·",
-["ldrushar"]="⥋",
-["supne"]="⊋",
-["Longleftrightarrow"]="⟺",
-["Oacute"]="Ó",
-["af"]="â¡",
+["Implies"]="⇒",
+["longrightarrow"]="⟶",
+["precneqq"]="⪵",
+["geqslant"]="⩾",
+["Product"]="âˆ",
+["Scirc"]="Ŝ",
+["lvnE"]="≨︀",
+["dotminus"]="∸",
+["sscr"]="ð“ˆ",
+["capdot"]="â©€",
+["dlcrop"]="âŒ",
+["omacr"]="Å",
+["sext"]="✶",
+["xutri"]="â–³",
+["xrArr"]="⟹",
+["glE"]="⪒",
+["NotSupersetEqual"]="⊉",
+["backsim"]="∽",
["sup"]="⊃",
-["lozenge"]="â—Š",
-["scy"]="Ñ",
-["gscr"]="â„Š",
-["smallsetminus"]="∖",
+["realpart"]="ℜ",
["hardcy"]="ÑŠ",
-["DoubleVerticalBar"]="∥",
-["Yuml"]="Ÿ",
-["plusdu"]="⨥",
-["NotSucceedsSlantEqual"]="â‹¡",
-["nwnear"]="⤧",
-["lfloor"]="⌊",
-["rcy"]="Ñ€",
-["jscr"]="ð’¿",
-["AMP"]="&",
-["acute"]="´",
-["uacute"]="ú",
-["Or"]="â©”",
-["rdldhar"]="⥩",
-["langd"]="⦑",
-["Iacute"]="Ã",
-["spar"]="∥",
-["ucy"]="у",
-["rsh"]="↱",
-["Kcedil"]="Ķ",
-["iscr"]="ð’¾",
-["lambda"]="λ",
-["lbrkslu"]="â¦",
-["napE"]="⩰̸",
-["shcy"]="ш",
-["nsupE"]="⫆̸",
-["Ycirc"]="Ŷ",
-["sect"]="§",
-["precnapprox"]="⪹",
-["iocy"]="Ñ‘",
-["dzcy"]="ÑŸ",
+["sqcap"]="⊓",
+["brvbar"]="¦",
+["LT"]="<",
+["udarr"]="⇅",
+["lozf"]="⧫",
+["Eogon"]="Ę",
+["frac18"]="â…›",
+["lesssim"]="≲",
+["wedbar"]="â©Ÿ",
+["EmptyVerySmallSquare"]="â–«",
+["aring"]="Ã¥",
+["lesdoto"]="âª",
+["ltquest"]="â©»",
+["LeftUpTeeVector"]="⥠",
+["FilledSmallSquare"]="â—¼",
+["mho"]="℧",
+["NotGreaterTilde"]="≵",
+["xharr"]="⟷",
+["NotSucceedsEqual"]="⪰̸",
+["sqsupset"]="âŠ",
+["Ccedil"]="Ç",
+["aacute"]="á",
+["succcurlyeq"]="≽",
+["gneq"]="⪈",
+["forall"]="∀",
+["rightharpoonup"]="⇀",
+["leftarrow"]="â†",
+["ang"]="∠",
+["mapstoup"]="↥",
+["xscr"]="ð“",
+["NotTildeEqual"]="≄",
+["ograve"]="ò",
+["boxdl"]="â”",
+["DownLeftVectorBar"]="⥖",
+["nsup"]="⊅",
+["shchcy"]="щ",
+["demptyv"]="⦱",
+["apos"]="'",
+["between"]="≬",
+["leftrightsquigarrow"]="↭",
+["gtcc"]="⪧",
+["grave"]="`",
+["bigodot"]="⨀",
+["oline"]="‾",
+["angmsdad"]="⦫",
+["NotCongruent"]="≢",
+["gtquest"]="⩼",
+["fltns"]="â–±",
+["smeparsl"]="⧤",
+["Eta"]="Η",
+["ltdot"]="â‹–",
+["rhard"]="â‡",
+["rscr"]="ð“‡",
["ETH"]="Ã",
-["GreaterTilde"]="≳",
-["coprod"]="âˆ",
-["rpar"]=")",
-["lthree"]="â‹‹",
-["ImaginaryI"]="â…ˆ",
-["DoubleUpDownArrow"]="⇕",
-["intercal"]="⊺",
-["spadesuit"]="â™ ",
-["boxVH"]="╬",
-["smashp"]="⨳",
-["nu"]="ν",
-["Agrave"]="À",
-["boxtimes"]="⊠",
-["sext"]="✶",
-["nsub"]="⊄",
-["oelig"]="Å“",
-["GreaterEqual"]="≥",
-["TRADE"]="â„¢",
-["dtrif"]="â–¾",
-["nless"]="≮",
-["mu"]="μ",
-["larrsim"]="⥳",
-["GreaterEqualLess"]="â‹›",
-["Uuml"]="Ü",
-["LeftArrowBar"]="⇤",
-["ntrianglerighteq"]="â‹­",
-["DiacriticalDot"]="Ë™",
-["LongLeftArrow"]="⟵",
-["agrave"]="à",
-["lmoustache"]="⎰",
-["nvDash"]="⊭",
-["para"]="¶",
-["nlt"]="≮",
-["Eacute"]="É",
-["spades"]="â™ ",
-["lrcorner"]="⌟",
-["checkmark"]="✓",
-["lessdot"]="â‹–",
-["opar"]="⦷",
-["nVDash"]="⊯",
-["pertenk"]="‱",
-["range"]="⦥",
-["Pr"]="⪻",
-["Gammad"]="Ϝ",
-["ape"]="≊",
-["Longleftarrow"]="⟸",
-["boxV"]="â•‘",
-["rightthreetimes"]="⋌",
+["iocy"]="Ñ‘",
+["semi"]=";",
+["nexists"]="∄",
+["approxeq"]="≊",
+["compfn"]="∘",
+["sstarf"]="⋆",
+["angrtvbd"]="â¦",
["gnap"]="⪊",
-["vzigzag"]="⦚",
-["Ecirc"]="Ê",
-["npar"]="∦",
-["notinvb"]="â‹·",
-["Tau"]="Τ",
-["blank"]="â£",
-["Kappa"]="Κ",
-["rmoust"]="⎱",
-["GJcy"]="Ѓ",
-["ufisht"]="⥾",
-["NotLeftTriangleBar"]="â§Ì¸",
-["bigvee"]="â‹",
-["lrhar"]="⇋",
-["supset"]="⊃",
-["uwangle"]="⦧",
-["UpTeeArrow"]="↥",
-["supE"]="⫆",
-["imof"]="⊷",
-["leg"]="â‹š",
-["notniva"]="∌",
-["nvgt"]=">⃒",
-["rthree"]="⋌",
-["yfr"]="ð”¶",
-["uHar"]="⥣",
-["nshortmid"]="∤",
-["biguplus"]="⨄",
-["barvee"]="⊽",
-["iff"]="⇔",
-["boxvH"]="╪",
-["simrarr"]="⥲",
-["Egrave"]="È",
-["ntilde"]="ñ",
-["VerticalTilde"]="≀",
-["sigmaf"]="Ï‚",
-["khcy"]="Ñ…",
-["planck"]="â„",
-["NotNestedGreaterGreater"]="⪢̸",
-["NonBreakingSpace"]=" ",
-["OpenCurlyQuote"]="‘",
-["supsim"]="⫈",
-["cudarrl"]="⤸",
-["theta"]="θ",
-["notindot"]="⋵̸",
-["Omicron"]="Ο",
-["ccedil"]="ç",
-["colone"]="≔",
-["bscr"]="ð’·",
-["Dagger"]="‡",
-["comma"]=",",
+["mDDot"]="∺",
+["udblac"]="ű",
["Acirc"]="Â",
-["plankv"]="â„",
-["boxdr"]="┌",
-["rarrap"]="⥵",
-["rmoustache"]="⎱",
-["LeftAngleBracket"]="⟨",
-["Cacute"]="Ć",
-["blk34"]="â–“",
-["rfloor"]="⌋",
-["awconint"]="∳",
-["sfrown"]="⌢",
-["middot"]="·",
-["ascr"]="ð’¶",
-["dot"]="Ë™",
-["caron"]="ˇ",
-["image"]="â„‘",
-["esdot"]="â‰",
-["ohbar"]="⦵",
-["rarrb"]="⇥",
-["submult"]="â«",
-["plusb"]="⊞",
-["oopf"]="ð• ",
-["breve"]="˘",
-["conint"]="∮",
-["angrt"]="∟",
-["nbump"]="≎̸",
-["raquo"]="»",
-["Iuml"]="Ã",
-["Rcedil"]="Å–",
-["minus"]="−",
-["nsucceq"]="⪰̸",
-["telrec"]="⌕",
-["CHcy"]="Ч",
-["nrightarrow"]="↛",
-["NotRightTriangle"]="â‹«",
-["zfr"]="ð”·",
-["succ"]="≻",
-["Aacute"]="Ã",
-["NestedLessLess"]="≪",
-["RightTeeArrow"]="↦",
-["homtht"]="∻",
-["Cup"]="â‹“",
-["lcub"]="{",
-["race"]="∽̱",
-["THORN"]="Þ",
-["propto"]="âˆ",
-["odblac"]="Å‘",
-["mumap"]="⊸",
-["filig"]="ï¬",
-["ecir"]="≖",
-["DoubleRightArrow"]="⇒",
-["npreceq"]="⪯̸",
-["female"]="♀",
-["LeftFloor"]="⌊",
-["gtrarr"]="⥸",
-["dotsquare"]="⊡",
-["map"]="↦",
-["OverBrace"]="âž",
-["zopf"]="ð•«",
-["rang"]="⟩",
-["laquo"]="«",
-["elsdot"]="⪗",
-["frac56"]="â…š",
-["Iuml"]="Ã",
-["ocirc"]="ô",
-["clubs"]="♣",
-["IOcy"]="Ð",
-["scnE"]="⪶",
-["deg"]="°",
-["simgE"]="⪠",
-["nap"]="≉",
-["blacktriangle"]="â–´",
-["edot"]="Ä—",
-["epsiv"]="ϵ",
-["napprox"]="≉",
-["NotGreaterSlantEqual"]="⩾̸",
-["prap"]="⪷",
-["lnap"]="⪉",
-["circledS"]="Ⓢ",
-["lang"]="⟨",
-["qprime"]="â—",
-["aelig"]="æ",
-["ncongdot"]="⩭̸",
-["supdsub"]="⫘",
-["nltrie"]="⋬",
-["xopf"]="ð•©",
+["UnderParenthesis"]="â",
+["nisd"]="⋺",
+["lneq"]="⪇",
+["Dagger"]="‡",
+["qscr"]="ð“†",
+["gneqq"]="≩",
+["doteqdot"]="≑",
+["DoubleVerticalBar"]="∥",
+["emptyset"]="∅",
+["lEg"]="⪋",
+["subseteq"]="⊆",
+["dwangle"]="⦦",
+["dotplus"]="∔",
+["NotPrecedesSlantEqual"]="â‹ ",
+["bnot"]="âŒ",
["LeftDownVector"]="⇃",
-["duarr"]="⇵",
-["urcorner"]="âŒ",
-["nvltrie"]="⊴⃒",
-["Pi"]="Π",
+["leg"]="â‹š",
+["Therefore"]="∴",
+["Omega"]="Ω",
+["acE"]="∾̳",
+["Auml"]="Ä",
+["xvee"]="â‹",
["Eacute"]="É",
-["nGtv"]="≫̸",
-["icirc"]="î",
-["twoheadleftarrow"]="↞",
+["LeftFloor"]="⌊",
+["swnwar"]="⤪",
+["Jukcy"]="Є",
+["nless"]="≮",
+["NotSquareSupersetEqual"]="â‹£",
+["larrfs"]="â¤",
+["gcy"]="г",
+["solbar"]="⌿",
+["rharul"]="⥬",
+["dscy"]="Ñ•",
+["yen"]="Â¥",
+["ForAll"]="∀",
+["DownArrow"]="↓",
+["qprime"]="â—",
+["NegativeThickSpace"]="​",
+["part"]="∂",
+["Iukcy"]="І",
+["ltcc"]="⪦",
+["xlArr"]="⟸",
+["fcy"]="Ñ„",
+["gl"]="≷",
+["rsh"]="↱",
+["lrhar"]="⇋",
["divide"]="÷",
-["yopf"]="ð•ª",
-["ntlg"]="≸",
-["Darr"]="↡",
+["bemptyv"]="⦰",
+["rx"]="â„ž",
+["ecy"]="Ñ",
+["ApplyFunction"]="â¡",
+["divideontimes"]="⋇",
+["prod"]="âˆ",
+["boxHU"]="â•©",
+["HARDcy"]="Ъ",
+["mstpos"]="∾",
+["llcorner"]="⌞",
+["rsquor"]="’",
+["NotTildeFullEqual"]="≇",
+["mlcp"]="â«›",
+["cemptyv"]="⦲",
+["Proportional"]="âˆ",
+["DiacriticalDoubleAcute"]="Ë",
+["dcy"]="д",
+["Yacute"]="Ã",
+["egsdot"]="⪘",
["hslash"]="â„",
-["Coproduct"]="âˆ",
-["profline"]="⌒",
-["imagline"]="â„",
-["chcy"]="ч",
-["ccedil"]="ç",
-["PrecedesEqual"]="⪯",
-["jcirc"]="ĵ",
-["nang"]="∠⃒",
-["Icirc"]="ÃŽ",
-["nbumpe"]="â‰Ì¸",
-["incare"]="â„…",
-["tint"]="∭",
-["nhArr"]="⇎",
-["emsp13"]=" ",
-["blacktriangleleft"]="â—‚",
-["Star"]="⋆",
-["hkswarow"]="⤦",
-["NegativeThickSpace"]="​",
-["eDot"]="≑",
-["Euml"]="Ë",
-["scaron"]="Å¡",
-["RightDownVectorBar"]="⥕",
-["cent"]="¢",
-["jukcy"]="Ñ”",
-["backsimeq"]="â‹",
-["Ncy"]="Ð",
-["DD"]="â……",
-["circledast"]="⊛",
-["ccirc"]="ĉ",
-["rsaquo"]="›",
-["YIcy"]="Ї",
-["iquest"]="¿",
-["NotExists"]="∄",
-["iukcy"]="Ñ–",
-["Tab"]=" ",
-["Equilibrium"]="⇌",
-["nLt"]="≪⃒",
-["yen"]="Â¥",
-["CircleDot"]="⊙",
-["CircleMinus"]="⊖",
-["topf"]="ð•¥",
-["equivDD"]="⩸",
-["DoubleLeftRightArrow"]="⇔",
-["ngsim"]="≵",
-["upuparrows"]="⇈",
-["ll"]="≪",
-["cirscir"]="⧂",
-["ShortLeftArrow"]="â†",
-["angmsdag"]="⦮",
-["shortmid"]="∣",
-["ngeqslant"]="⩾̸",
-["subset"]="⊂",
-["curvearrowleft"]="↶",
-["gdot"]="Ä¡",
-["circledcirc"]="⊚",
-["Pcy"]="П",
-["asymp"]="≈",
-["boxUr"]="â•™",
-["uopf"]="ð•¦",
-["frac15"]="â…•",
-["Iacute"]="Ã",
-["Utilde"]="Ũ",
-["Congruent"]="≡",
-["nhpar"]="⫲",
-["capbrcup"]="⩉",
-["ordf"]="ª",
-["SOFTcy"]="Ь",
-["nlArr"]="â‡",
-["not"]="¬",
-["ffllig"]="ffl",
-["nprec"]="⊀",
-["Hat"]="^",
+["infin"]="∞",
["Auml"]="Ä",
-["ntriangleleft"]="⋪",
-["longmapsto"]="⟼",
-["nvrtrie"]="⊵⃒",
-["timesb"]="⊠",
-["lsh"]="↰",
-["Jcy"]="Й",
-["gcirc"]="Ä",
-["Oacute"]="Ó",
-["vartriangleright"]="⊳",
-["NotRightTriangleEqual"]="â‹­",
-["Rightarrow"]="⇒",
-["ast"]="*",
-["hamilt"]="â„‹",
-["Ncedil"]="Å…",
-["apE"]="â©°",
-["macr"]="¯",
-["cwconint"]="∲",
-["Kcy"]="К",
-["Ucirc"]="Û",
-["hcirc"]="Ä¥",
-["yacy"]="Ñ",
-["uml"]="¨",
-["popf"]="ð•¡",
-["bumpE"]="⪮",
-["varnothing"]="∅",
-["RightUpVector"]="↾",
-["curren"]="¤",
-["Scedil"]="Åž",
-["FilledVerySmallSquare"]="â–ª",
-["dollar"]="$",
-["Lcy"]="Л",
-["longrightarrow"]="⟶",
-["LeftTee"]="⊣",
-["excl"]="!",
-["acirc"]="â",
-["wp"]="℘",
-["lcaron"]="ľ",
-["NotGreaterFullEqual"]="≧̸",
-["CounterClockwiseContourIntegral"]="∳",
-["sup2"]="²",
-["rnmid"]="â«®",
-["Lcedil"]="Ä»",
-["ddotseq"]="â©·",
-["tbrk"]="⎴",
-["mlcp"]="â«›",
-["rarrhk"]="↪",
-["Tilde"]="∼",
-["Mcy"]="М",
-["aring"]="Ã¥",
-["rarrsim"]="⥴",
-["nopf"]="ð•Ÿ",
-["aelig"]="æ",
-["order"]="â„´",
-["diamondsuit"]="♦",
-["nvsim"]="∼⃒",
-["lhard"]="↽",
-["commat"]="@",
-["qint"]="⨌",
-["lsquo"]="‘",
-["sqcaps"]="⊓︀",
-["circlearrowleft"]="↺",
-["NotElement"]="∉",
-["measuredangle"]="∡",
-["Atilde"]="Ã",
-["CapitalDifferentialD"]="â……",
-["kgreen"]="ĸ",
-["Cscr"]="ð’ž",
+["Wcirc"]="Å´",
+["larrtl"]="↢",
+["Aacute"]="Ã",
+["LeftTriangleEqual"]="⊴",
+["NegativeMediumSpace"]="​",
+["TripleDot"]="⃛",
+["utdot"]="â‹°",
+["isinv"]="∈",
+["looparrowright"]="↬",
+["loang"]="⟬",
+["multimap"]="⊸",
["NotLessEqual"]="≰",
-["trpezium"]="â¢",
-["ne"]="≠",
-["NotSuperset"]="⊃⃒",
-["nearrow"]="↗",
-["ncong"]="≇",
-["doteqdot"]="≑",
-["supmult"]="â«‚",
-["longleftrightarrow"]="⟷",
-["Rarr"]="↠",
-["DoubleUpArrow"]="⇑",
-["Dscr"]="ð’Ÿ",
-["mp"]="∓",
-["jmath"]="È·",
-["erarr"]="⥱",
-["searrow"]="↘",
-["Sup"]="â‹‘",
-["lvnE"]="≨︀",
-["ffilig"]="ffi",
-["NotSquareSupersetEqual"]="â‹£",
-["bullet"]="•",
-["bigstar"]="★",
-["cylcty"]="⌭",
-["nvle"]="≤⃒",
-["TildeFullEqual"]="≅",
-["lopf"]="ð•",
-["sqsupseteq"]="⊒",
-["lt"]="<",
-["geqslant"]="⩾",
+["midcir"]="â«°",
+["nge"]="≱",
["quot"]="\"",
-["le"]="≤",
-["square"]="â–¡",
-["sigma"]="σ",
-["prE"]="⪳",
-["rtrie"]="⊵",
-["triangleq"]="≜",
+["REG"]="®",
+["div"]="÷",
+["complexes"]="â„‚",
+["lhblk"]="â–„",
+["gvnE"]="≩︀",
+["leftharpoonup"]="↼",
+["it"]="â¢",
+["clubsuit"]="♣",
+["iff"]="⇔",
+["Hacek"]="ˇ",
+["CircleTimes"]="⊗",
+["Cacute"]="Ć",
+["rarrtl"]="↣",
+["RightDownVector"]="⇂",
+["rarrfs"]="⤞",
+["UpArrowBar"]="⤒",
+["male"]="♂",
+["RightTriangle"]="⊳",
+["GreaterTilde"]="≳",
+["Barwed"]="⌆",
+["ltlarr"]="⥶",
+["Zdot"]="Å»",
+["parsim"]="⫳",
+["Ugrave"]="Ù",
+["Dot"]="¨",
+["circleddash"]="âŠ",
+["rsaquo"]="›",
+["hyphen"]="â€",
+["angrt"]="∟",
+["RightTriangleEqual"]="⊵",
+["Darr"]="↡",
+["ulcrop"]="âŒ",
+["olcir"]="⦾",
+["gimel"]="â„·",
+["gel"]="â‹›",
+["SquareSubset"]="âŠ",
+["Uacute"]="Ú",
+["gt"]=">",
+["lnap"]="⪉",
+["Union"]="⋃",
+["nu"]="ν",
+["and"]="∧",
+["ltcir"]="⩹",
["Fscr"]="ℱ",
+["ee"]="â…‡",
+["laquo"]="«",
+["Hfr"]="ℌ",
+["prec"]="≺",
+["imagline"]="â„",
+["precnsim"]="⋨",
+["zhcy"]="ж",
+["mu"]="μ",
+["rlarr"]="⇄",
+["pound"]="£",
+["origof"]="⊶",
+["rfloor"]="⌋",
+["lnsim"]="⋦",
+["nVdash"]="⊮",
+["otimes"]="⊗",
+["iuml"]="ï",
+["Cscr"]="ð’ž",
+["lsime"]="âª",
+["ngeqq"]="≧̸",
+["Del"]="∇",
+["Coproduct"]="âˆ",
+["NotSubsetEqual"]="⊈",
+["HilbertSpace"]="â„‹",
+["frac58"]="â…",
+["cap"]="∩",
+["roang"]="⟭",
+["intlarhk"]="⨗",
+["DownTee"]="⊤",
+["thickapprox"]="≈",
+["prnap"]="⪹",
+["laquo"]="«",
+["lesdot"]="â©¿",
+["inodot"]="ı",
+["Hscr"]="â„‹",
+["YIcy"]="Ї",
+["ctdot"]="⋯",
+["thetav"]="Ï‘",
+["DoubleUpDownArrow"]="⇕",
+["succ"]="≻",
+["nbumpe"]="â‰Ì¸",
+["ReverseElement"]="∋",
+["Oacute"]="Ó",
+["equest"]="≟",
+["Lt"]="≪",
+["Nacute"]="Ń",
["DiacriticalTilde"]="˜",
-["SucceedsSlantEqual"]="≽",
-["mopf"]="ð•ž",
-["Ecaron"]="Äš",
-["UpArrowDownArrow"]="⇅",
-["ges"]="⩾",
-["nsqsupe"]="â‹£",
-["ubrcy"]="Ñž",
-["Gscr"]="ð’¢",
-["HARDcy"]="Ъ",
-["jopf"]="ð•›",
-["gtquest"]="⩼",
-["iinfin"]="⧜",
-["twixt"]="≬",
+["Escr"]="â„°",
+["boxvH"]="╪",
+["Ifr"]="â„‘",
+["mp"]="∓",
+["ell"]="â„“",
+["Iacute"]="Ã",
+["NotNestedGreaterGreater"]="⪢̸",
+["raquo"]="»",
+["Zcy"]="З",
+["micro"]="µ",
+["dzigrarr"]="⟿",
+["rtrif"]="â–¸",
+["Uuml"]="Ü",
+["nvHarr"]="⤄",
+["leqslant"]="⩽",
+["tritime"]="⨻",
+["nlarr"]="↚",
+["NotRightTriangle"]="â‹«",
+["apid"]="≋",
+["succeq"]="⪰",
+["NotEqualTilde"]="≂̸",
+["varphi"]="Ï•",
+["Vert"]="‖",
+["int"]="∫",
+["lurdshar"]="⥊",
+["lneqq"]="≨",
+["Jsercy"]="Ј",
+["Superset"]="⊃",
+["subsetneqq"]="â«‹",
+["gap"]="⪆",
+["ssmile"]="⌣",
+["Ugrave"]="Ù",
+["IOcy"]="Ð",
+["ltimes"]="⋉",
+["UnderBracket"]="⎵",
+["subseteqq"]="â«…",
+["Dscr"]="ð’Ÿ",
+["dtrif"]="â–¾",
+["raquo"]="»",
+["hbar"]="â„",
+["ge"]="≥",
+["cudarrr"]="⤵",
+["icy"]="и",
+["plusdo"]="∔",
+["bull"]="•",
+["weierp"]="℘",
+["mapsto"]="↦",
+["Uring"]="Å®",
+["supplus"]="â«€",
+["Succeeds"]="≻",
+["Ascr"]="ð’œ",
+["cdot"]="Ä‹",
+["nwarr"]="↖",
+["target"]="⌖",
+["dharr"]="⇂",
+["curlyvee"]="â‹Ž",
+["supE"]="⫆",
+["emsp13"]=" ",
["ltrie"]="⊴",
+["olarr"]="↺",
+["RightTeeVector"]="⥛",
+["Vvdash"]="⊪",
+["larrsim"]="⥳",
+["varsubsetneq"]="⊊︀",
+["Not"]="⫬",
+["CenterDot"]="·",
+["PlusMinus"]="±",
+["aring"]="Ã¥",
+["Nscr"]="ð’©",
+["delta"]="δ",
+["npre"]="⪯̸",
+["Vcy"]="Ð’",
+["NotVerticalBar"]="∤",
+["scpolint"]="⨓",
+["rcedil"]="Å—",
+["Lmidot"]="Ä¿",
+["DScy"]="Ð…",
+["nsubseteq"]="⊈",
+["ngE"]="≧̸",
+["NotSquareSubsetEqual"]="â‹¢",
+["edot"]="Ä—",
+["Ucy"]="У",
+["lessapprox"]="⪅",
+["niv"]="∋",
+["Kscr"]="ð’¦",
+["LeftVectorBar"]="⥒",
+["nhpar"]="⫲",
+["scedil"]="ÅŸ",
+["Uacute"]="Ú",
+["ntrianglelefteq"]="⋬",
+["Otilde"]="Õ",
+["iexcl"]="¡",
+["lbrke"]="⦋",
+["simdot"]="⩪",
+["sigmaf"]="Ï‚",
+["Bfr"]="ð”…",
+["pitchfork"]="â‹”",
+["ngeqslant"]="⩾̸",
+["Pscr"]="ð’«",
+["gsime"]="⪎",
+["Ouml"]="Ö",
+["rarrsim"]="⥴",
+["subE"]="â«…",
+["otimesas"]="⨶",
+["lfloor"]="⌊",
+["prop"]="âˆ",
+["imacr"]="Ä«",
+["blacktriangleleft"]="â—‚",
+["Ntilde"]="Ñ",
+["llarr"]="⇇",
+["nsucc"]="âŠ",
+["PartialD"]="∂",
+["Iacute"]="Ã",
+["gdot"]="Ä¡",
+["Afr"]="ð”„",
+["Igrave"]="Ì",
["csub"]="â«",
-["Hscr"]="â„‹",
-["leftharpoondown"]="↽",
+["Mscr"]="ℳ",
+["Scy"]="С",
+["bsime"]="â‹",
+["nequiv"]="≢",
+["scnap"]="⪺",
+["Tab"]=" ",
+["Equal"]="⩵",
+["blacklozenge"]="⧫",
+["nrarrc"]="⤳̸",
+["divide"]="÷",
["RightUpDownVector"]="â¥",
-["LongLeftRightArrow"]="⟷",
-["Im"]="â„‘",
-["dcaron"]="Ä",
+["iinfin"]="⧜",
+["precnapprox"]="⪹",
+["dArr"]="⇓",
+["orslope"]="â©—",
+["Rcy"]="Р",
+["sqsub"]="âŠ",
+["OverBracket"]="⎴",
+["sum"]="∑",
+["ncedil"]="ņ",
+["ltrPar"]="⦖",
+["ii"]="â…ˆ",
+["Gcirc"]="Ĝ",
+["SucceedsTilde"]="≿",
+["RightFloor"]="⌋",
+["osol"]="⊘",
["barwedge"]="⌅",
-["nexist"]="∄",
-["blacktriangledown"]="â–¾",
-["fork"]="â‹”",
-["rhard"]="â‡",
-["cent"]="¢",
-["RightTriangle"]="⊳",
-["Eta"]="Η",
-["dotminus"]="∸",
-["nles"]="⩽̸",
-["larrtl"]="↢",
-["LeftTriangleEqual"]="⊴",
-["hopf"]="ð•™",
-["gammad"]="Ï",
-["gsime"]="⪎",
-["llhard"]="⥫",
-["precapprox"]="⪷",
-["profalar"]="⌮",
-["lnE"]="≨",
-["ddagger"]="‡",
-["leq"]="≤",
-["smile"]="⌣",
-["robrk"]="⟧",
-["Jscr"]="ð’¥",
-["triangleleft"]="â—ƒ",
-["acd"]="∿",
-["prod"]="âˆ",
-["atilde"]="ã",
-["seArr"]="⇘",
-["therefore"]="∴",
-["iopf"]="ð•š",
-["solbar"]="⌿",
-["kcedil"]="Ä·",
-["NotHumpEqual"]="â‰Ì¸",
-["nspar"]="∦",
-["frac14"]="¼",
-["nsime"]="≄",
-["DoubleLongLeftArrow"]="⟸",
-["sccue"]="≽",
-["models"]="⊧",
-["SupersetEqual"]="⊇",
-["iquest"]="¿",
-["oline"]="‾",
-["lparlt"]="⦓",
-["triplus"]="⨹",
-["nequiv"]="≢",
-["nlE"]="≦̸",
-["nldr"]="‥",
-["equals"]="=",
-["Agrave"]="À",
-["ccaron"]="Ä",
-["Yacute"]="Ã",
-["Oslash"]="Ø",
-["udarr"]="⇅",
-["ang"]="∠",
-["dopf"]="ð••",
-["comp"]="âˆ",
-["caps"]="∩︀",
-["bowtie"]="⋈",
-["glj"]="⪤",
-["ltquest"]="â©»",
-["cirmid"]="⫯",
-["ordm"]="º",
-["esim"]="≂",
-["reals"]="â„",
-["LeftTriangle"]="⊲",
-["flat"]="â™­",
-["eopf"]="ð•–",
-["lap"]="⪅",
-["not"]="¬",
-["ENG"]="ÅŠ",
-["DiacriticalAcute"]="´",
-["sharp"]="♯",
-["longleftarrow"]="⟵",
-["dblac"]="Ë",
-["UpArrow"]="↑",
-["npre"]="⪯̸",
-["bopf"]="ð•“",
-["DScy"]="Ð…",
+["twoheadrightarrow"]="↠",
+["Gscr"]="ð’¢",
+["acy"]="а",
+["dtdot"]="⋱",
+["rbrke"]="⦌",
+["imath"]="ı",
+["Hcirc"]="Ĥ",
+["num"]="#",
+["nprec"]="⊀",
+["smallsetminus"]="∖",
+["lesges"]="⪓",
+["LeftUpVector"]="↿",
+["gtdot"]="â‹—",
+["theta"]="θ",
+["kappav"]="Ï°",
+["jmath"]="È·",
+["Lscr"]="â„’",
+["Aogon"]="Ä„",
+["ltrif"]="â—‚",
+["DownArrowUpArrow"]="⇵",
+["prap"]="⪷",
+["Racute"]="Å”",
+["curlyeqprec"]="â‹ž",
["bepsi"]="϶",
-["angrtvb"]="⊾",
-["ccaps"]="â©",
-["UnderParenthesis"]="â",
-["subne"]="⊊",
-["succnsim"]="â‹©",
-["Bumpeq"]="≎",
-["xvee"]="â‹",
-["colon"]=":",
-["deg"]="°",
-["fnof"]="Æ’",
-["Uarr"]="↟",
-["Zcaron"]="Ž",
-["copf"]="ð•”",
-["Theta"]="Θ",
-["omicron"]="ο",
-["ntriangleright"]="â‹«",
-["DoubleLongRightArrow"]="⟹",
-["UnderBrace"]="âŸ",
-["GT"]=">",
-["lEg"]="⪋",
-["supplus"]="â«€",
-["acute"]="´",
+["blacktriangle"]="â–´",
+["nvap"]="â‰âƒ’",
+["Supset"]="â‹‘",
+["angmsd"]="∡",
+["boxul"]="┘",
+["LessSlantEqual"]="⩽",
["GT"]=">",
-["upsilon"]="Ï…",
-["sc"]="≻",
-["xrarr"]="⟶",
-["eng"]="Å‹",
-["it"]="â¢",
-["Ntilde"]="Ñ",
-["Mu"]="Μ",
-["CircleTimes"]="⊗",
-["NotTildeTilde"]="≉",
-["NotLessLess"]="≪̸",
-["vellip"]="â‹®",
-["cularrp"]="⤽",
-["UnderBracket"]="⎵",
-["aopf"]="ð•’",
-["itilde"]="Ä©",
-["latail"]="⤙",
-["Nu"]="Î",
-["Ascr"]="ð’œ",
-["complement"]="âˆ",
-["gjcy"]="Ñ“",
-["radic"]="√",
-["maltese"]="✠",
-["glE"]="⪒",
-["plusmn"]="±",
-["curvearrowright"]="↷",
-["gt"]=">",
-["Colone"]="â©´",
-["Bscr"]="ℬ",
-["ic"]="â£",
-["clubsuit"]="♣",
-["djcy"]="Ñ’",
-["Oopf"]="ð•†",
-["ltrPar"]="⦖",
-["ngtr"]="≯",
-["eqcirc"]="≖",
-["Hacek"]="ˇ",
-["vdash"]="⊢",
-["NotCupCap"]="≭",
-["Gdot"]="Ä ",
-["jsercy"]="ј",
-["marker"]="â–®",
+["nexist"]="∄",
+["ccupssm"]="â©",
+["Eacute"]="É",
+["ddarr"]="⇊",
+["ntlg"]="≸",
+["Iscr"]="â„",
+["Jcirc"]="Ä´",
+["Sacute"]="Åš",
+["capand"]="â©„",
+["gesdoto"]="⪂",
+["olcross"]="⦻",
+["amalg"]="⨿",
+["rarrlp"]="↬",
+["NotLeftTriangle"]="⋪",
+["reals"]="â„",
+["bigcup"]="⋃",
+["NJcy"]="Њ",
+["Odblac"]="Å",
+["hArr"]="⇔",
+["RightArrowLeftArrow"]="⇄",
+["SOFTcy"]="Ь",
+["Lambda"]="Λ",
+["RightCeiling"]="⌉",
+["Vdash"]="⊩",
+["elinters"]="â§",
+["lsimg"]="âª",
["Nopf"]="â„•",
-["Wfr"]="ð”š",
-["boxHD"]="╦",
-["mho"]="℧",
-["ulcrop"]="âŒ",
-["DifferentialD"]="â…†",
-["aacute"]="á",
-["lpar"]="(",
+["Esim"]="⩳",
+["vzigzag"]="⦚",
+["acd"]="∿",
+["ccedil"]="ç",
+["lbarr"]="⤌",
+["nmid"]="∤",
+["Backslash"]="∖",
+["Laplacetrf"]="â„’",
+["npr"]="⊀",
+["nap"]="≉",
+["nsupseteqq"]="⫆̸",
+["igrave"]="ì",
+["LJcy"]="Љ",
+["lessgtr"]="≶",
["angle"]="∠",
-["rharu"]="⇀",
-["Breve"]="˘",
-["Dot"]="¨",
-["rect"]="â–­",
-["NotNestedLessLess"]="⪡̸",
-["boxplus"]="⊞",
-["NotSucceeds"]="âŠ",
-["gnapprox"]="⪊",
-["DownLeftTeeVector"]="⥞",
-["Xfr"]="ð”›",
-["Lang"]="⟪",
-["Element"]="∈",
-["sung"]="♪",
-["RightVectorBar"]="⥓",
-["simne"]="≆",
-["LeftVector"]="↼",
-["Idot"]="Ä°",
+["lAarr"]="⇚",
+["notin"]="∉",
+["orv"]="â©›",
+["gtreqqless"]="⪌",
+["CircleMinus"]="⊖",
+["Diamond"]="â‹„",
+["map"]="↦",
+["nvsim"]="∼⃒",
+["pi"]="Ï€",
+["pluscir"]="⨢",
+["boxVH"]="╬",
["QUOT"]="\"",
-["nsmid"]="∤",
-["fjlig"]="fj",
-["Ufr"]="ð”˜",
-["cuvee"]="â‹Ž",
+["duarr"]="⇵",
+["lgE"]="⪑",
+["lmoust"]="⎰",
+["lsquo"]="‘",
+["rightrightarrows"]="⇉",
+["times"]="×",
+["iuml"]="ï",
+["andslope"]="⩘",
+["order"]="â„´",
+["Sub"]="â‹",
+["capcap"]="â©‹",
+["nabla"]="∇",
+["ntriangleleft"]="⋪",
+["blk14"]="â–‘",
+["Kopf"]="ð•‚",
+["lArr"]="â‡",
+["Qopf"]="â„š",
+["circledS"]="Ⓢ",
+["omid"]="⦶",
+["ord"]="â©",
+["lvertneqq"]="≨︀",
+["updownarrow"]="↕",
+["yacute"]="ý",
+["ni"]="∋",
+["hamilt"]="â„‹",
+["Jopf"]="ð•",
+["CupCap"]="â‰",
+["lbrack"]="[",
+["preccurlyeq"]="≼",
+["Ropf"]="â„",
+["lessdot"]="â‹–",
+["blank"]="â£",
+["SucceedsEqual"]="⪰",
+["triangleleft"]="â—ƒ",
+["ring"]="Ëš",
+["omega"]="ω",
+["bowtie"]="⋈",
+["Sqrt"]="√",
+["uuml"]="ü",
+["Udblac"]="Å°",
+["diams"]="♦",
+["Oslash"]="Ø",
["real"]="ℜ",
-["luruhar"]="⥦",
-["NotRightTriangleBar"]="â§Ì¸",
-["target"]="⌖",
-["lharu"]="↼",
-["CloseCurlyQuote"]="’",
-["rAtail"]="⤜",
-["nparallel"]="∦",
-["brvbar"]="¦",
-["Vfr"]="ð”™",
-["wedbar"]="â©Ÿ",
-["REG"]="®",
-["boxur"]="â””",
-["Rcaron"]="Ř",
-["Rang"]="⟫",
-["sqsubseteq"]="⊑",
-["div"]="÷",
-["boxul"]="┘",
-["Cdot"]="ÄŠ",
-["vsupnE"]="⫌︀",
-["zeetrf"]="ℨ",
-["Sfr"]="ð”–",
-["roang"]="⟭",
-["LessTilde"]="≲",
-["equiv"]="≡",
-["frac12"]="½",
-["eacute"]="é",
-["rrarr"]="⇉",
-["nearhk"]="⤤",
-["Zopf"]="ℤ",
-["SucceedsTilde"]="≿",
+["egrave"]="è",
+["prurel"]="⊰",
+["LeftUpDownVector"]="⥑",
+["TildeEqual"]="≃",
+["cuwed"]="â‹",
+["times"]="×",
["ap"]="≈",
-["lfisht"]="⥼",
-["timesd"]="⨰",
-["UpDownArrow"]="↕",
-["xuplus"]="⨄",
-["cularr"]="↶",
-["iprod"]="⨼",
-["AElig"]="Æ",
-["rationals"]="â„š",
-["geqq"]="≧",
-["Tfr"]="ð”—",
-["Yopf"]="ð•",
-["rtimes"]="â‹Š",
-["Tcaron"]="Ť",
-["srarr"]="→",
-["diam"]="â‹„",
-["mid"]="∣",
-["imath"]="ı",
-["PlusMinus"]="±",
-["isin"]="∈",
-["vprop"]="âˆ",
-["RightArrowLeftArrow"]="⇄",
-["NotSubset"]="⊂⃒",
-["bigtriangledown"]="â–½",
-["ldsh"]="↲",
-["Qfr"]="ð””",
-["nvap"]="â‰âƒ’",
-["vert"]="|",
-["Xopf"]="ð•",
-["lBarr"]="⤎",
-["egsdot"]="⪘",
-["Tcedil"]="Å¢",
-["xi"]="ξ",
-["LeftUpVectorBar"]="⥘",
-["circ"]="ˆ",
-["ocir"]="⊚",
-["gtlPar"]="⦕",
-["Rfr"]="ℜ",
-["RightTriangleBar"]="â§",
-["nwarhk"]="⤣",
-["zhcy"]="ж",
-["Iukcy"]="І",
-["plusdo"]="∔",
+["lowast"]="∗",
+["Lopf"]="ð•ƒ",
+["bdquo"]="„",
+["blacktriangledown"]="â–¾",
+["vBarv"]="â«©",
+["Longleftarrow"]="⟸",
+["lesg"]="⋚︀",
+["Popf"]="â„™",
+["iogon"]="į",
+["vellip"]="â‹®",
+["Ntilde"]="Ñ",
+["cwconint"]="∲",
["boxv"]="│",
-["minusb"]="⊟",
-["Ncaron"]="Ň",
-["angmsdaa"]="⦨",
-["varsubsetneqq"]="⫋︀",
-["cirfnint"]="â¨",
-["LongRightArrow"]="⟶",
-["ddarr"]="⇊",
-["piv"]="Ï–",
-["fopf"]="ð•—",
-["Ofr"]="ð”’",
-["fflig"]="ff",
-["Jukcy"]="Є",
-["xhArr"]="⟺",
-["ncy"]="н",
-["Scaron"]="Å ",
-["TildeEqual"]="≃",
-["subrarr"]="⥹",
-["iacute"]="í",
-["ogt"]="â§",
-["nvge"]="≥⃒",
-["vee"]="∨",
-["UnderBar"]="_",
-["andslope"]="⩘",
-["gopf"]="ð•˜",
-["Pfr"]="ð”“",
-["die"]="¨",
+["boxbox"]="⧉",
+["langd"]="⦑",
+["diam"]="â‹„",
+["boxHu"]="╧",
+["acute"]="´",
["Uopf"]="ð•Œ",
+["Fcy"]="Ф",
+["vee"]="∨",
+["eqslantless"]="⪕",
+["NotLeftTriangleEqual"]="⋬",
+["OverBrace"]="âž",
+["beta"]="β",
+["Otilde"]="Õ",
+["fjlig"]="fj",
+["uacute"]="ú",
+["CirclePlus"]="⊕",
+["Mellintrf"]="ℳ",
+["Vopf"]="ð•",
+["Gcy"]="Г",
+["searhk"]="⤥",
+["boxur"]="â””",
+["LeftTeeVector"]="⥚",
+["nsubE"]="⫅̸",
+["gvertneqq"]="≩︀",
+["eqcirc"]="≖",
+["nrightarrow"]="↛",
+["DJcy"]="Ђ",
+["tdot"]="⃛",
+["Dcy"]="Д",
+["Sopf"]="ð•Š",
+["range"]="⦥",
+["agrave"]="à",
+["gtrsim"]="≳",
["RightArrowBar"]="⇥",
-["orarr"]="↻",
-["Precedes"]="≺",
-["oror"]="â©–",
-["straightepsilon"]="ϵ",
-["cong"]="≅",
-["TScy"]="Ц",
-["nleftarrow"]="↚",
-["DZcy"]="Ð",
-["horbar"]="―",
+["larrlp"]="↫",
+["le"]="≤",
+["xi"]="ξ",
+["gla"]="⪥",
+["GT"]=">",
+["leftarrowtail"]="↢",
+["commat"]="@",
+["rightarrowtail"]="↣",
+["approx"]="≈",
+["sdot"]="â‹…",
["Topf"]="ð•‹",
-["Cayleys"]="â„­",
-["leqq"]="≦",
-["curlyeqprec"]="â‹ž",
-["nLeftarrow"]="â‡",
-["pcy"]="п",
-["realine"]="â„›",
-["nlsim"]="≴",
+["Ecy"]="Э",
+["eplus"]="⩱",
+["cir"]="â—‹",
["Rarrtl"]="⤖",
-["CupCap"]="â‰",
-["vDash"]="⊨",
-["shortparallel"]="∥",
-["ExponentialE"]="â…‡",
-["Sopf"]="ð•Š",
-["iiota"]="â„©",
-["Nfr"]="ð”‘",
-["pointint"]="⨕",
-["NotGreaterLess"]="≹",
-["olcross"]="⦻",
-["kcy"]="к",
-["complexes"]="â„‚",
-["varepsilon"]="ϵ",
-["Fouriertrf"]="ℱ",
-["rho"]="Ï",
-["Lsh"]="↰",
-["exponentiale"]="â…‡",
-["hookrightarrow"]="↪",
-["Ropf"]="â„",
-["lAtail"]="⤛",
-["Kfr"]="ð”Ž",
-["bsim"]="∽",
-["jcy"]="й",
-["frac34"]="¾",
-["DotDot"]="⃜",
+["Emacr"]="Ä’",
+["Dcaron"]="ÄŽ",
+["Sc"]="⪼",
+["cent"]="¢",
+["rtri"]="â–¹",
+["cedil"]="¸",
+["spades"]="â™ ",
+["upsilon"]="Ï…",
+["boxminus"]="⊟",
+["angmsdaa"]="⦨",
+["zdot"]="ż",
+["Bcy"]="Б",
+["Zscr"]="ð’µ",
+["looparrowleft"]="↫",
+["Dfr"]="ð”‡",
+["Bumpeq"]="≎",
+["nLeftarrow"]="â‡",
+["equiv"]="≡",
+["Ccaron"]="Č",
+["UpperLeftArrow"]="↖",
+["SubsetEqual"]="⊆",
+["nrArr"]="â‡",
+["loarr"]="⇽",
+["minusdu"]="⨪",
+["sup3"]="³",
+["Zopf"]="ℤ",
+["elsdot"]="⪗",
+["NotLessLess"]="≪̸",
+["eta"]="η",
+["ubrcy"]="Ñž",
+["Yscr"]="ð’´",
+["subset"]="⊂",
+["Cfr"]="â„­",
+["harrcir"]="⥈",
+["supsetneq"]="⊋",
+["LeftUpVectorBar"]="⥘",
+["LT"]="<",
+["DoubleLeftArrow"]="â‡",
+["circledcirc"]="⊚",
+["bkarow"]="â¤",
+["rangd"]="⦒",
+["downharpoonright"]="⇂",
+["Wopf"]="ð•Ž",
+["ast"]="*",
+["planck"]="â„",
+["gtrdot"]="â‹—",
+["Ffr"]="ð”‰",
+["rArr"]="⇒",
+["VeryThinSpace"]=" ",
+["Ecaron"]="Äš",
+["RightVectorBar"]="⥓",
+["divonx"]="⋇",
+["Xopf"]="ð•",
+["nsubset"]="⊂⃒",
+["Otimes"]="⨷",
+["bot"]="⊥",
+["nsime"]="≄",
["thorn"]="þ",
-["ThickSpace"]="âŸâ€Š",
-["SquareUnion"]="⊔",
-["frac58"]="â…",
-["dfisht"]="⥿",
-["MediumSpace"]="âŸ",
-["Lfr"]="ð”",
-["Qopf"]="â„š",
+["subsetneq"]="⊊",
+["nltri"]="⋪",
+["Cayleys"]="â„­",
+["Efr"]="ð”ˆ",
+["Intersection"]="â‹‚",
+["UnderBar"]="_",
+["fpartint"]="â¨",
+["Iuml"]="Ã",
+["rsquo"]="’",
+["ecir"]="≖",
+["nis"]="⋼",
+["fscr"]="ð’»",
+["hellip"]="…",
+["ogt"]="â§",
["ntgl"]="≹",
-["LessFullEqual"]="≦",
-["malt"]="✠",
-["mcy"]="м",
-["NotGreaterEqual"]="≱",
-["bottom"]="⊥",
-["NotSucceedsEqual"]="⪰̸",
-["lcedil"]="ļ",
-["infintie"]="â§",
-["Lcaron"]="Ľ",
-["NotSquareSubset"]="âŠÌ¸",
-["brvbar"]="¦",
-["fallingdotseq"]="≒",
-["AElig"]="Æ",
-["swarhk"]="⤦",
-["Ifr"]="â„‘",
-["pi"]="Ï€",
-["lcy"]="л",
-["copy"]="©",
-["dlcorn"]="⌞",
-["oacute"]="ó",
-["gtreqless"]="â‹›",
-["neArr"]="⇗",
+["frac14"]="¼",
+["squf"]="â–ª",
+["circ"]="ˆ",
+["prE"]="⪳",
+["ordf"]="ª",
["ZHcy"]="Ж",
-["Vdashl"]="⫦",
-["darr"]="↓",
-["circeq"]="≗",
+["NegativeVeryThinSpace"]="​",
+["quot"]="\"",
+["excl"]="!",
+["sqcaps"]="⊓︀",
+["gfr"]="ð”¤",
+["varsigma"]="Ï‚",
+["nwarrow"]="↖",
+["reg"]="®",
+["longmapsto"]="⟼",
+["And"]="â©“",
+["cuvee"]="â‹Ž",
+["zwj"]="â€",
+["plankv"]="â„",
+["varepsilon"]="ϵ",
+["Aopf"]="ð”¸",
+["UpTee"]="⊥",
+["lescc"]="⪨",
+["ltri"]="â—ƒ",
+["iiint"]="∭",
+["ccups"]="⩌",
+["alefsym"]="ℵ",
+["succneqq"]="⪶",
+["hscr"]="ð’½",
+["Or"]="â©”",
["yuml"]="ÿ",
-["Jfr"]="ð”",
-["Product"]="âˆ",
-["boxDL"]="â•—",
-["el"]="⪙",
-["supe"]="⊇",
-["frac13"]="â…“",
-["Barwed"]="⌆",
-["larrpl"]="⤹",
-["SHCHcy"]="Щ",
-["LeftUpDownVector"]="⥑",
-["Diamond"]="â‹„",
-["DownLeftVectorBar"]="⥖",
-["Cross"]="⨯",
-["ncup"]="â©‚",
-["supnE"]="⫌",
-["lne"]="⪇",
-["micro"]="µ",
-["lowbar"]="_",
-["perp"]="⊥",
-["sqcap"]="⊓",
-["Gfr"]="ð”Š",
-["raemptyv"]="⦳",
-["gesl"]="⋛︀",
-["drcrop"]="⌌",
-["boxUL"]="â•",
-["becaus"]="∵",
-["gne"]="⪈",
-["scap"]="⪸",
-["swarrow"]="↙",
-["nesim"]="≂̸",
-["DoubleDot"]="¨",
-["Mopf"]="ð•„",
-["apid"]="≋",
-["InvisibleComma"]="â£",
-["Backslash"]="∖",
-["mnplus"]="∓",
-["niv"]="∋",
-["Hfr"]="ℌ",
-["rarrlp"]="↬",
-["Because"]="∵",
-["parsl"]="⫽",
-["sup1"]="¹",
-["Lt"]="≪",
-["par"]="∥",
-["Iota"]="Ι",
-["beth"]="ℶ",
-["Lopf"]="ð•ƒ",
+["rcub"]="}",
+["lt"]="<",
+["vArr"]="⇕",
+["EqualTilde"]="≂",
+["vDash"]="⊨",
+["RightArrow"]="→",
+["dlcorn"]="⌞",
+["Barv"]="⫧",
+["nsc"]="âŠ",
+["Proportion"]="∷",
+["iota"]="ι",
+["gscr"]="â„Š",
+["abreve"]="ă",
+["ThickSpace"]="âŸâ€Š",
+["szlig"]="ß",
+["lhard"]="↽",
+["emptyv"]="∅",
+["Tau"]="Τ",
+["sharp"]="♯",
+["bNot"]="â«­",
+["LongLeftRightArrow"]="⟷",
+["frac23"]="â…”",
+["NotEqual"]="≠",
+["scE"]="⪴",
+["jfr"]="ð”§",
+["bscr"]="ð’·",
+["uhblk"]="â–€",
+["frac35"]="â…—",
+["TSHcy"]="Ћ",
+["ntrianglerighteq"]="â‹­",
+["Tcedil"]="Å¢",
+["NotGreaterFullEqual"]="≧̸",
+["asympeq"]="â‰",
+["oror"]="â©–",
+["ecirc"]="ê",
+["ohbar"]="⦵",
+["Rho"]="Ρ",
+["iacute"]="í",
+["ascr"]="ð’¶",
+["RightUpVector"]="↾",
+["Ocirc"]="Ô",
+["cedil"]="¸",
+["sect"]="§",
+["angmsdab"]="⦩",
+["FilledVerySmallSquare"]="â–ª",
+["curlywedge"]="â‹",
+["lesdotor"]="⪃",
+["esdot"]="â‰",
+["eqvparsl"]="⧥",
["Cap"]="â‹’",
-["Aring"]="Ã…",
-["rarr"]="→",
-["Efr"]="ð”ˆ",
-["bigcup"]="⋃",
-["DownLeftRightVector"]="â¥",
-["lesges"]="⪓",
-["NegativeThinSpace"]="​",
-["DownRightTeeVector"]="⥟",
-["npolint"]="⨔",
-["gEl"]="⪌",
-["lltri"]="â—º",
-["ogon"]="Ë›",
-["LessEqualGreater"]="â‹š",
-["sqsupset"]="âŠ",
-["NotSubsetEqual"]="⊈",
-["Ubrcy"]="ÐŽ",
-["ShortDownArrow"]="↓",
-["ugrave"]="ù",
-["Dcaron"]="ÄŽ",
-["subE"]="â«…",
-["divide"]="÷",
-["bigotimes"]="⨂",
-["dscy"]="Ñ•",
-["wreath"]="≀",
-["Jopf"]="ð•",
-["pre"]="⪯",
-["tdot"]="⃛",
-["Cfr"]="â„­",
-["Uogon"]="Ų",
-["softcy"]="ь",
-["isinE"]="⋹",
-["Dstrok"]="Ä",
-["Jsercy"]="Ј",
-["capdot"]="â©€",
-["realpart"]="ℜ",
-["hearts"]="♥",
-["Atilde"]="Ã",
-["LeftArrowRightArrow"]="⇆",
-["upharpoonleft"]="↿",
-["Iopf"]="ð•€",
-["Intersection"]="â‹‚",
-["midcir"]="â«°",
-["ocirc"]="ô",
-["sdot"]="â‹…",
-["Dfr"]="ð”‡",
-["gla"]="⪥",
-["DiacriticalGrave"]="`",
+["dscr"]="ð’¹",
+["rbrace"]="}",
+["nsccue"]="â‹¡",
+["neArr"]="⇗",
+["rightthreetimes"]="⋌",
+["plusmn"]="±",
["Ubreve"]="Ŭ",
-["int"]="∫",
-["PrecedesSlantEqual"]="≼",
-["Square"]="â–¡",
-["Acy"]="Ð",
+["ifr"]="ð”¦",
+["Poincareplane"]="ℌ",
+["leftrightarrows"]="⇆",
+["scnsim"]="â‹©",
+["cscr"]="ð’¸",
+["NotHumpEqual"]="â‰Ì¸",
+["capbrcup"]="⩉",
+["curarr"]="↷",
+["notinvb"]="â‹·",
+["LeftArrow"]="â†",
+["Gopf"]="ð”¾",
+["ldrushar"]="⥋",
+["nscr"]="ð“ƒ",
+["Gg"]="â‹™",
+["ouml"]="ö",
+["nsce"]="⪰̸",
+["cupbrcap"]="⩈",
+["nLt"]="≪⃒",
+["bullet"]="•",
+["nsqsupe"]="â‹£",
+["rect"]="â–­",
+["lbrace"]="{",
+["Fopf"]="ð”½",
+["COPY"]="©",
+["epar"]="â‹•",
+["mscr"]="ð“‚",
+["odsold"]="⦼",
+["cupor"]="â©…",
+["not"]="¬",
+["subsim"]="⫇",
+["hoarr"]="⇿",
+["Scedil"]="Åž",
+["eacute"]="é",
+["emsp"]=" ",
+["uml"]="¨",
+["igrave"]="ì",
+["pscr"]="ð“…",
+["LeftTee"]="⊣",
+["Cedilla"]="¸",
+["Iopf"]="ð•€",
+["HumpEqual"]="â‰",
+["les"]="⩽",
+["Rcedil"]="Å–",
+["lsquor"]="‚",
+["raemptyv"]="⦳",
+["NotSucceedsSlantEqual"]="â‹¡",
+["SuchThat"]="∋",
+["vert"]="|",
+["backcong"]="≌",
["Hopf"]="â„",
-["precsim"]="≾",
-["nleq"]="≰",
-["urcorn"]="âŒ",
-["hyphen"]="â€",
-["FilledSmallSquare"]="â—¼",
-["zdot"]="ż",
-["ndash"]="–",
-["hbar"]="â„",
-["Wopf"]="ð•Ž",
-["Esim"]="⩳",
-["subsetneq"]="⊊",
-["boxhD"]="â•¥",
-["searhk"]="⤥",
-["late"]="⪭",
+["CircleDot"]="⊙",
+["Kappa"]="Κ",
+["conint"]="∮",
+["DZcy"]="Ð",
+["prsim"]="≾",
+["Copf"]="â„‚",
+["curvearrowright"]="↷",
+["twixt"]="≬",
+["curren"]="¤",
+["rtriltri"]="⧎",
+["jscr"]="ð’¿",
+["cupcup"]="â©Š",
+["Lcedil"]="Ä»",
+["supseteqq"]="⫆",
+["bfr"]="ð”Ÿ",
+["lesseqqgtr"]="⪋",
+["leftleftarrows"]="⇇",
+["Bopf"]="ð”¹",
+["acute"]="´",
["blacktriangleright"]="â–¸",
-["auml"]="ä",
-["NotLessTilde"]="≴",
-["Bfr"]="ð”…",
-["grave"]="`",
-["ltlarr"]="⥶",
-["Aogon"]="Ä„",
-["sdote"]="⩦",
-["gtrsim"]="≳",
-["nvinfin"]="⧞",
-["lgE"]="⪑",
-["mdash"]="—",
-["Vopf"]="ð•",
-["leftrightarrow"]="↔",
-["RBarr"]="â¤",
-["amalg"]="⨿",
-["preccurlyeq"]="≼",
-["EqualTilde"]="≂",
-["scpolint"]="⨓",
-["NotHumpDownHump"]="≎̸",
-["uparrow"]="↑",
-["downarrow"]="↓",
-["boxdL"]="â••",
-["Hstrok"]="Ħ",
-["Ccaron"]="Č",
-["succsim"]="≿",
-["RightFloor"]="⌋",
-["DownBreve"]="Ì‘",
-["succapprox"]="⪸",
-["dsol"]="⧶",
-["napid"]="≋̸",
-["nprcue"]="â‹ ",
+["frac34"]="¾",
+["Gbreve"]="Äž",
+["Updownarrow"]="⇕",
+["iscr"]="ð’¾",
+["sigmav"]="Ï‚",
+["trade"]="â„¢",
+["minusb"]="⊟",
+["GJcy"]="Ѓ",
+["TildeFullEqual"]="≅",
+["DoubleRightTee"]="⊨",
+["nang"]="∠⃒",
+["ddotseq"]="â©·",
+["copy"]="©",
["Eopf"]="ð”¼",
-["ell"]="â„“",
-["cupdot"]="âŠ",
-["Not"]="⫬",
-["zigrarr"]="â‡",
-["downharpoonright"]="⇂",
-["nisd"]="⋺",
-["lotimes"]="⨴",
-["plusmn"]="±",
-["ngE"]="≧̸",
-["odash"]="âŠ",
-["emptyset"]="∅",
+["Psi"]="Ψ",
+["UpperRightArrow"]="↗",
+["geqq"]="≧",
+["subedot"]="⫃",
+["nvlArr"]="⤂",
+["Ncedil"]="Å…",
+["vsupne"]="⊋︀",
+["supset"]="⊃",
["squarf"]="â–ª",
-["NotGreaterTilde"]="≵",
-["NotTildeFullEqual"]="≇",
-["DownArrowUpArrow"]="⇵",
-["nwarrow"]="↖",
-["looparrowright"]="↬",
+["LeftDoubleBracket"]="⟦",
+["utrif"]="â–´",
["Dopf"]="ð”»",
-["oplus"]="⊕",
-["UpEquilibrium"]="⥮",
-["leftthreetimes"]="â‹‹",
-["DoubleLeftTee"]="⫤",
-["nabla"]="∇",
-["RuleDelayed"]="⧴",
-["euml"]="ë",
-["varsupsetneqq"]="⫌︀",
-["upsi"]="Ï…",
-["supsup"]="â«–",
-["bsol"]="\\",
-["Copf"]="â„‚",
-["DDotrahd"]="⤑",
-["Upsilon"]="Î¥",
-["UpperRightArrow"]="↗",
-["nedot"]="â‰Ì¸",
-["NotEqual"]="≠",
-["bumpeq"]="â‰",
-["emsp14"]=" ",
-["frac38"]="⅜",
-["DownTeeArrow"]="↧",
-["Bopf"]="ð”¹",
-["capand"]="â©„",
-["nleqq"]="≦̸",
-["ratio"]="∶",
-["eplus"]="⩱",
-["nge"]="≱",
-["laquo"]="«",
-["urtri"]="â—¹",
-["LeftUpVector"]="↿",
-["gl"]="≷",
-["Gt"]="≫",
-["andd"]="⩜",
+["ape"]="≊",
+["gEl"]="⪌",
+["COPY"]="©",
+["afr"]="ð”ž",
+["Acy"]="Ð",
+["ldquor"]="„",
+["because"]="∵",
+["Pr"]="⪻",
+["OverBar"]="‾",
+["lang"]="⟨",
+["mopf"]="ð•ž",
+["crarr"]="↵",
+["Epsilon"]="Ε",
+["Nfr"]="ð”‘",
+["kjcy"]="ќ",
+["TildeTilde"]="≈",
+["bsim"]="∽",
+["lcy"]="л",
+["larrb"]="⇤",
+["ncong"]="≇",
+["ENG"]="ÅŠ",
+["brvbar"]="¦",
+["Rightarrow"]="⇒",
+["nopf"]="ð•Ÿ",
+["Wfr"]="ð”š",
+["ljcy"]="Ñ™",
+["diamondsuit"]="♦",
+["latail"]="⤙",
+["lambda"]="λ",
+["frac14"]="¼",
+["mcy"]="м",
+["nparsl"]="⫽⃥",
+["lBarr"]="⤎",
+["subdot"]="⪽",
+["frac12"]="½",
+["kopf"]="ð•œ",
+["LeftCeiling"]="⌈",
+["erarr"]="⥱",
+["pre"]="⪯",
+["varr"]="↕",
+["Pi"]="Π",
+["sub"]="⊂",
+["ncy"]="н",
+["marker"]="â–®",
+["rpargt"]="⦔",
+["supe"]="⊇",
+["veebar"]="⊻",
+["checkmark"]="✓",
+["nbsp"]=" ",
+["sqsupseteq"]="⊒",
+["upharpoonright"]="↾",
+["lopf"]="ð•",
+["Omicron"]="Ο",
+["ccaps"]="â©",
+["lrhard"]="⥭",
["Lstrok"]="Å",
-["gamma"]="γ",
-["Sc"]="⪼",
-["Aopf"]="ð”¸",
-["pluscir"]="⨢",
-["Itilde"]="Ĩ",
-["DoubleRightTee"]="⊨",
-["pluse"]="⩲",
-["iiint"]="∭",
-["dotplus"]="∔",
-["vrtri"]="⊳",
-["Proportion"]="∷",
-["bne"]="=⃥",
-["cuepr"]="â‹ž",
+["Mfr"]="ð”",
+["njcy"]="Ñš",
+["ocy"]="о",
+["Zcaron"]="Ž",
+["NotSucceeds"]="âŠ",
+["rarrbfs"]="⤠",
+["gtrapprox"]="⪆",
+["oS"]="Ⓢ",
+["diamond"]="â‹„",
+["gesdot"]="⪀",
+["urcorner"]="âŒ",
+["lotimes"]="⨴",
+["pertenk"]="‱",
+["rfisht"]="⥽",
+["Zfr"]="ℨ",
+["Map"]="⤅",
+["cross"]="✗",
+["DifferentialD"]="â…†",
+["boxtimes"]="⊠",
+["horbar"]="―",
+["lg"]="≶",
+["orarr"]="↻",
+["Vbar"]="â««",
+["ropf"]="ð•£",
+["NotDoubleVerticalBar"]="∦",
+["Sfr"]="ð”–",
+["Iuml"]="Ã",
+["leftharpoondown"]="↽",
+["atilde"]="ã",
+["VerticalTilde"]="≀",
+["DoubleContourIntegral"]="∯",
+["longleftarrow"]="⟵",
+["Im"]="â„‘",
+["RightUpVectorBar"]="⥔",
+["nGg"]="⋙̸",
+["scap"]="⪸",
+["nrarr"]="↛",
+["ycy"]="Ñ‹",
+["ucirc"]="û",
+["qopf"]="ð•¢",
+["oopf"]="ð• ",
+["yacute"]="ý",
+["Xfr"]="ð”›",
+["fork"]="â‹”",
+["in"]="∈",
+["xcap"]="â‹‚",
+["check"]="✓",
+["jcy"]="й",
+["Phi"]="Φ",
+["doteq"]="â‰",
["vBar"]="⫨",
-["yucy"]="ÑŽ",
-["PrecedesTilde"]="≾",
-["varr"]="↕",
-["leftarrowtail"]="↢",
-["rangle"]="⟩",
-["subsub"]="â«•",
-["rightarrowtail"]="↣",
-["oslash"]="ø",
-["mapstodown"]="↧",
-["sqsube"]="⊑",
-["NewLine"]="\n",
-["Vdash"]="⊩",
-["num"]="#",
-["umacr"]="Å«",
-["InvisibleTimes"]="â¢",
-["bemptyv"]="⦰",
+["frown"]="⌢",
["Iogon"]="Ä®",
-["ssmile"]="⌣",
-["timesbar"]="⨱",
-["Tstrok"]="Ŧ",
-["Icy"]="И",
-["zacute"]="ź",
-["Cedilla"]="¸",
-["daleth"]="ℸ",
-["semi"]=";",
-["ssetmn"]="∖",
-["subdot"]="⪽",
-["Bernoullis"]="ℬ",
-["otimesas"]="⨶",
-["circleddash"]="âŠ",
-["circlearrowright"]="↻",
-["NotLeftTriangleEqual"]="⋬",
-["NotTilde"]="â‰",
-["npart"]="∂̸",
-["Gbreve"]="Äž",
-["gtrless"]="≷",
-["pound"]="£",
-["curlyeqsucc"]="â‹Ÿ",
-["blacklozenge"]="⧫",
-["ldca"]="⤶",
-["nsucc"]="âŠ",
-["top"]="⊤",
-["ufr"]="ð”²",
-["sscr"]="ð“ˆ",
-["eDDot"]="â©·",
-["Updownarrow"]="⇕",
-["loz"]="â—Š",
-["Gcy"]="Г",
-["boxdl"]="â”",
+["gnsim"]="⋧",
+["nsupset"]="⊃⃒",
+["equals"]="=",
+["angmsdac"]="⦪",
+["odash"]="âŠ",
+["Hstrok"]="Ħ",
+["homtht"]="∻",
+["maltese"]="✠",
+["esim"]="≂",
+["realine"]="â„›",
+["straightepsilon"]="ϵ",
+["utri"]="â–µ",
+["primes"]="â„™",
+["dbkarow"]="â¤",
+["NotLessTilde"]="≴",
+["nvrArr"]="⤃",
+["cularrp"]="⤽",
+["supsup"]="â«–",
+["rang"]="⟩",
+["nshortmid"]="∤",
+["NotCupCap"]="≭",
+["gnE"]="≩",
+["otilde"]="õ",
+["LeftTriangle"]="⊲",
+["oelig"]="Å“",
+["curarrm"]="⤼",
+["orderof"]="â„´",
+["DoubleLongLeftArrow"]="⟸",
+["OverParenthesis"]="âœ",
+["amacr"]="Ä",
+["copysr"]="â„—",
+["acirc"]="â",
+["LeftArrowRightArrow"]="⇆",
+["filig"]="ï¬",
+["uopf"]="ð•¦",
+["rlhar"]="⇌",
+["dharl"]="⇃",
+["rAarr"]="⇛",
+["rarrw"]="â†",
+["isin"]="∈",
+["simg"]="⪞",
+["NoBreak"]="â ",
+["rAtail"]="⤜",
+["ndash"]="–",
+["IJlig"]="IJ",
+["dfr"]="ð”¡",
+["ohm"]="Ω",
+["breve"]="˘",
+["ccedil"]="ç",
+["topf"]="ð•¥",
+["nvDash"]="⊭",
+["RBarr"]="â¤",
+["clubs"]="♣",
["napos"]="ʼn",
-["Sqrt"]="√",
-["xsqcup"]="⨆",
-["Implies"]="⇒",
-["uring"]="ů",
-["thetav"]="Ï‘",
-["iiiint"]="⨌",
-["nLeftrightarrow"]="⇎",
-["lobrk"]="⟦",
-["xfr"]="ð”µ",
-["Abreve"]="Ä‚",
-["micro"]="µ",
-["quatint"]="⨖",
-["congdot"]="â©­",
-["nrtrie"]="â‹­",
-["Fcy"]="Ф",
-["hksearow"]="⤥",
-["LowerLeftArrow"]="↙",
-["rdca"]="⤷",
-["OverBar"]="‾",
-["frac12"]="½",
-["imacr"]="Ä«",
-["boxVL"]="â•£",
-["sfr"]="ð”°",
-["ensp"]=" ",
-["dwangle"]="⦦",
-["boxh"]="─",
-["Eogon"]="Ę",
+["ngtr"]="≯",
+["Tstrok"]="Ŧ",
+["lrarr"]="⇆",
+["eqslantgtr"]="⪖",
+["efr"]="ð”¢",
+["gne"]="⪈",
+["csube"]="â«‘",
+["Xi"]="Ξ",
+["sopf"]="ð•¤",
+["LeftVector"]="↼",
+["ggg"]="â‹™",
+["Ubrcy"]="ÐŽ",
+["die"]="¨",
+["topbot"]="⌶",
+["Rfr"]="ℜ",
+["ofcir"]="⦿",
["imped"]="Ƶ",
-["Ecy"]="Э",
-["lates"]="⪭︀",
-["phi"]="φ",
-["minusd"]="∸",
-["planckh"]="â„Ž",
-["Ocirc"]="Ô",
-["lE"]="≦",
-["sum"]="∑",
-["lrtri"]="⊿",
-["ruluhar"]="⥨",
-["lAarr"]="⇚",
-["DownArrow"]="↓",
-["zscr"]="ð“",
-["questeq"]="≟",
-["ngeqq"]="≧̸",
-["And"]="â©“",
-["Dcy"]="Д",
-["angrtvbd"]="â¦",
-["rarrpl"]="⥅",
-["thkap"]="≈",
-["Otimes"]="⨷",
-["lesssim"]="≲",
-["gE"]="≧",
-["ouml"]="ö",
-["nsubseteq"]="⊈",
-["bigcirc"]="â—¯",
+["plusmn"]="±",
+["nles"]="⩽̸",
+["pcy"]="п",
+["permil"]="‰",
+["notinE"]="⋹̸",
+["bigoplus"]="â¨",
+["boxplus"]="⊞",
+["doublebarwedge"]="⌆",
+["ccaron"]="Ä",
+["asymp"]="≈",
+["sup1"]="¹",
+["bumpeq"]="â‰",
+["nrtrie"]="â‹­",
+["larrbfs"]="⤟",
+["emacr"]="Ä“",
+["gtrless"]="≷",
+["Kfr"]="ð”Ž",
+["plus"]="+",
+["risingdotseq"]="≓",
+["notindot"]="⋵̸",
+["Subset"]="â‹",
+["CloseCurlyDoubleQuote"]="â€",
+["nlsim"]="≴",
+["dcaron"]="Ä",
["boxVR"]="â• ",
-["Vert"]="‖",
-["naturals"]="â„•",
-["plussim"]="⨦",
-["wscr"]="ð“Œ",
-["raquo"]="»",
-["bigodot"]="⨀",
-["dashv"]="⊣",
-["hairsp"]=" ",
-["inodot"]="ı",
-["vnsup"]="⊃⃒",
+["lne"]="⪇",
+["Pfr"]="ð”“",
+["rightsquigarrow"]="â†",
+["phone"]="☎",
+["DiacriticalDot"]="Ë™",
+["Congruent"]="≡",
+["SquareIntersection"]="⊓",
+["ordf"]="ª",
+["loz"]="â—Š",
["cire"]="≗",
-["vartriangleleft"]="⊲",
-["rbrke"]="⦌",
-["boxuL"]="â•›",
-["sce"]="⪰",
-["nrtri"]="â‹«",
-["loarr"]="⇽",
-["ShortRightArrow"]="→",
-["xscr"]="ð“",
-["Bcy"]="Б",
-["HumpEqual"]="â‰",
-["lmidot"]="Å€",
-["DownLeftVector"]="↽",
-["leftharpoonup"]="↼",
+["ecaron"]="Ä›",
+["nsub"]="⊄",
+["Fouriertrf"]="ℱ",
+["Qfr"]="ð””",
+["dblac"]="Ë",
+["sc"]="≻",
+["xrarr"]="⟶",
+["ImaginaryI"]="â…ˆ",
+["angmsdag"]="⦮",
+["wopf"]="ð•¨",
+["middot"]="·",
+["gsiml"]="âª",
+["biguplus"]="⨄",
+["Prime"]="″",
+["bigcirc"]="â—¯",
+["vsubnE"]="⫋︀",
+["lrtri"]="⊿",
+["nparallel"]="∦",
["lbbrk"]="â²",
-["rarrtl"]="↣",
-["SucceedsEqual"]="⪰",
-["HumpDownHump"]="≎",
-["Vee"]="â‹",
-["Gopf"]="ð”¾",
-["otilde"]="õ",
-["ofr"]="ð”¬",
-["Sub"]="â‹",
-["gnE"]="≩",
-["SquareSuperset"]="âŠ",
-["leftrightharpoons"]="⇋",
-["tosa"]="⤩",
-["Ucirc"]="Û",
-["mscr"]="ð“‚",
-["Exists"]="∃",
-["langle"]="⟨",
-["rfr"]="ð”¯",
-["THORN"]="Þ",
-["gtreqqless"]="⪌",
-["eqvparsl"]="⧥",
-["NotCongruent"]="≢",
-["phiv"]="Ï•",
-["lsquor"]="‚",
-["prec"]="≺",
-["igrave"]="ì",
-["Fopf"]="ð”½",
-["nwArr"]="⇖",
-["nscr"]="ð“ƒ",
-["gescc"]="⪩",
-["intprod"]="⨼",
-["larrlp"]="↫",
-["AMP"]="&",
-["psi"]="ψ",
-["mDDot"]="∺",
-["VDash"]="⊫",
-["Lleftarrow"]="⇚",
-["mfr"]="ð”ª",
+["dotsquare"]="⊡",
+["rceil"]="⌉",
["gesles"]="⪔",
-["kscr"]="ð“€",
-["Omega"]="Ω",
-["bumpe"]="â‰",
-["NotDoubleVerticalBar"]="∦",
-["frac18"]="â…›",
-["ecolon"]="≕",
-["compfn"]="∘",
-["supdot"]="⪾",
-["Alpha"]="Α",
-["rsquor"]="’",
+["roarr"]="⇾",
+["simplus"]="⨤",
+["lagran"]="â„’",
+["pr"]="≺",
+["mnplus"]="∓",
+["Iota"]="Ι",
+["NestedLessLess"]="≪",
+["utilde"]="Å©",
+["mldr"]="…",
+["bigstar"]="★",
+["micro"]="µ",
["percnt"]="%",
-["pfr"]="ð”­",
-["frasl"]="â„",
-["lscr"]="ð“",
-["aleph"]="ℵ",
-["swArr"]="⇙",
-["uuml"]="ü",
-["uacute"]="ú",
-["scE"]="⪴",
-["hellip"]="…",
+["fllig"]="fl",
+["euml"]="ë",
+["circledR"]="®",
+["lltri"]="â—º",
+["IEcy"]="Е",
+["notniva"]="∌",
+["or"]="∨",
+["curvearrowleft"]="↶",
+["gnapprox"]="⪊",
+["NotLessSlantEqual"]="⩽̸",
+["Cconint"]="∰",
+["NotSucceedsTilde"]="≿̸",
+["gammad"]="Ï",
+["rightharpoondown"]="â‡",
+["CounterClockwiseContourIntegral"]="∳",
+["supdot"]="⪾",
+["upsi"]="Ï…",
+["nvle"]="≤⃒",
+["beth"]="ℶ",
+["nhArr"]="⇎",
+["Gamma"]="Γ",
+["complement"]="âˆ",
+["xoplus"]="â¨",
+["chi"]="χ",
+["backepsilon"]="϶",
+["nsube"]="⊈",
+["aopf"]="ð•’",
+["para"]="¶",
+["drbkarow"]="â¤",
+["Dstrok"]="Ä",
+["isinE"]="⋹",
+["Ecirc"]="Ê",
+["aelig"]="æ",
["ulcorner"]="⌜",
-["prnap"]="⪹",
-["Gg"]="â‹™",
-["wedge"]="∧",
-["SquareSubset"]="âŠ",
-["qscr"]="ð“†",
-["kfr"]="ð”¨",
-["RightTee"]="⊢",
-["eqsim"]="≂",
-["rbrksld"]="⦎",
-["ohm"]="Ω",
-["lozf"]="⧫",
-["cups"]="∪︀",
-["epsilon"]="ε",
-["ncap"]="⩃",
-["Leftarrow"]="â‡",
-["ultri"]="â—¸",
-["egrave"]="è",
-["vBarv"]="â«©",
-["bNot"]="â«­",
-["nfr"]="ð”«",
-["rsqb"]="]",
-["OpenCurlyDoubleQuote"]="“",
-["rsquo"]="’",
-["Del"]="∇",
-["smtes"]="⪬︀",
-["varphi"]="Ï•",
-["CirclePlus"]="⊕",
-["prcue"]="≼",
-["curren"]="¤",
-["nltri"]="⋪",
-["oscr"]="â„´",
-["Wcirc"]="Å´",
-["prime"]="′",
-["ifr"]="ð”¦",
-["apos"]="'",
-["UpTee"]="⊥",
-["lescc"]="⪨",
-["NegativeMediumSpace"]="​",
-["DownTee"]="⊤",
-["NotSquareSubsetEqual"]="â‹¢",
-["LowerRightArrow"]="↘",
-["wr"]="≀",
+["Lcaron"]="Ľ",
+["bopf"]="ð•“",
+["midast"]="*",
+["barvee"]="⊽",
+["nvgt"]=">⃒",
+["bnequiv"]="≡⃥",
+["caron"]="ˇ",
["andand"]="â©•",
-["gvnE"]="≩︀",
-["lfr"]="ð”©",
-["lowast"]="∗",
-["gfr"]="ð”¤",
-["digamma"]="Ï",
-["cemptyv"]="⦲",
-["ubreve"]="Å­",
-["dstrok"]="Ä‘",
+["eparsl"]="⧣",
+["xhArr"]="⟺",
+["Yuml"]="Ÿ",
+["fallingdotseq"]="≒",
+["vltri"]="⊲",
+["gtrarr"]="⥸",
+["nGtv"]="≫̸",
+["congdot"]="â©­",
+["lfisht"]="⥼",
+["nrtri"]="â‹«",
+["prnsim"]="⋨",
+["nsupE"]="⫆̸",
+["Colone"]="â©´",
+["SquareSuperset"]="âŠ",
+["boxUL"]="â•",
+["Rrightarrow"]="⇛",
+["nleftrightarrow"]="↮",
+["Conint"]="∯",
+["ffilig"]="ffi",
+["nleqq"]="≦̸",
+["drcrop"]="⌌",
+["boxh"]="─",
+["Lang"]="⟪",
+["ldrdhar"]="⥧",
+["rbrack"]="]",
+["nvinfin"]="⧞",
+["succsim"]="≿",
+["boxhu"]="â”´",
+["tau"]="Ï„",
+["incare"]="â„…",
+["flat"]="â™­",
+["angst"]="Ã…",
+["Oslash"]="Ø",
+["Vfr"]="ð”™",
+["tscy"]="ц",
+["lates"]="⪭︀",
+["eopf"]="ð•–",
+["Because"]="∵",
+["frac25"]="â…–",
+["daleth"]="ℸ",
+["ic"]="â£",
+["ensp"]=" ",
+["lrm"]="‎",
+["DoubleLeftRightArrow"]="⇔",
+["kappa"]="κ",
+["fopf"]="ð•—",
+["cularr"]="↶",
+["shy"]="­",
+["yen"]="Â¥",
+["glj"]="⪤",
+["dzcy"]="ÑŸ",
["expectation"]="â„°",
-["sime"]="≃",
-["ltrif"]="â—‚",
-["iacute"]="í",
-["chi"]="χ",
+["dash"]="â€",
+["female"]="♀",
+["UnderBrace"]="âŸ",
+["rotimes"]="⨵",
+["caps"]="∩︀",
+["copf"]="ð•”",
+["lparlt"]="⦓",
+["NotLess"]="≮",
+["simrarr"]="⥲",
+["dtri"]="â–¿",
+["supne"]="⊋",
+["block"]="â–ˆ",
+["siml"]="âª",
+["blk12"]="â–’",
+["natural"]="â™®",
+["frac34"]="¾",
+["frac38"]="⅜",
+["Ufr"]="ð”˜",
+["gg"]="≫",
+["Square"]="â–¡",
+["lt"]="<",
["erDot"]="≓",
-["Vcy"]="Ð’",
+["RightAngleBracket"]="⟩",
+["LeftDownTeeVector"]="⥡",
+["NotGreaterGreater"]="≫̸",
+["uogon"]="ų",
+["ocirc"]="ô",
+["sung"]="♪",
+["dollar"]="$",
+["Scaron"]="Å ",
+["top"]="⊤",
+["iopf"]="ð•š",
+["udhar"]="⥮",
+["gjcy"]="Ñ“",
+["ncap"]="⩃",
+["circlearrowleft"]="↺",
+["bernou"]="ℬ",
+["angmsdaf"]="⦭",
+["ldsh"]="↲",
+["isins"]="â‹´",
+["RoundImplies"]="⥰",
+["bigtriangledown"]="â–½",
+["LeftAngleBracket"]="⟨",
+["HorizontalLine"]="─",
+["Vdashl"]="⫦",
+["rHar"]="⥤",
+["Tcaron"]="Ť",
+["LeftDownVectorBar"]="⥙",
+["jopf"]="ð•›",
+["LeftRightVector"]="⥎",
+["LessGreater"]="≶",
+["npart"]="∂̸",
+["nsmid"]="∤",
+["RightTriangleBar"]="â§",
+["nesim"]="≂̸",
+["deg"]="°",
+["LeftTeeArrow"]="↤",
+["NotHumpDownHump"]="≎̸",
+["tridot"]="â—¬",
+["lceil"]="⌈",
+["ExponentialE"]="â…‡",
+["tosa"]="⤩",
+["gopf"]="ð•˜",
+["ContourIntegral"]="∮",
+["late"]="⪭",
+["bbrk"]="⎵",
+["half"]="½",
["boxhd"]="┬",
-["DoubleDownArrow"]="⇓",
-["lArr"]="â‡",
-["demptyv"]="⦱",
-["smt"]="⪪",
-["intcal"]="⊺",
-["in"]="∈",
-["capcup"]="⩇",
-["kjcy"]="ќ",
-["Ccirc"]="Ĉ",
-["bnequiv"]="≡⃥",
-["Emacr"]="Ä’",
-["siml"]="âª",
-["jfr"]="ð”§",
-["gesdoto"]="⪂",
-["efr"]="ð”¢",
-["precneqq"]="⪵",
-["because"]="∵",
-["Udblac"]="Å°",
-["lg"]="≶",
-["boxvr"]="├",
-["fpartint"]="â¨",
-["rbbrk"]="â³",
-["LT"]="<",
-["cap"]="∩",
-["circledR"]="®",
-["notinvc"]="⋶",
-["zwj"]="â€",
-["nle"]="≰",
-["hfr"]="ð”¥",
-["bigsqcup"]="⨆",
-["nGg"]="⋙̸",
-["doublebarwedge"]="⌆",
+["hopf"]="ð•™",
+["Ouml"]="Ö",
+["Atilde"]="Ã",
+["planckh"]="â„Ž",
+["MinusPlus"]="∓",
+["uharl"]="↿",
+["aleph"]="ℵ",
+["boxHD"]="╦",
+["lesseqgtr"]="â‹š",
+["colon"]=":",
+["SquareSupersetEqual"]="⊒",
+["isinsv"]="⋳",
+["lnapprox"]="⪉",
+["PrecedesSlantEqual"]="≼",
+["boxuL"]="â•›",
+["csup"]="â«",
+["hstrok"]="ħ",
+["leftrightharpoons"]="⇋",
+["boxuR"]="╘",
+["DD"]="â……",
+["Longrightarrow"]="⟹",
+["epsilon"]="ε",
+["NotTildeTilde"]="≉",
+["nfr"]="ð”«",
+["Vscr"]="ð’±",
+["Ncy"]="Ð",
+["boxUl"]="╜",
+["searr"]="↘",
+["ddagger"]="‡",
+["KHcy"]="Ð¥",
+["NotSuperset"]="⊃⃒",
+["Uparrow"]="⇑",
+["nsqsube"]="â‹¢",
+["Imacr"]="Ī",
+["nspar"]="∦",
+["supsetneqq"]="⫌",
+["Sscr"]="ð’®",
+["lobrk"]="⟦",
+["mfr"]="ð”ª",
+["acirc"]="â",
+["subne"]="⊊",
+["Icirc"]="ÃŽ",
+["Re"]="ℜ",
+["nearrow"]="↗",
["YUcy"]="Ю",
-["empty"]="∅",
-["nacute"]="Å„",
-["Acirc"]="Â",
-["bigtriangleup"]="â–³",
-["hybull"]="âƒ",
-["Ycy"]="Ы",
-["isindot"]="⋵",
-["iota"]="ι",
-["numero"]="â„–",
-["cfr"]="ð” ",
-["llarr"]="⇇",
-["lrhard"]="⥭",
-["cross"]="✗",
+["eqsim"]="≂",
+["UnionPlus"]="⊎",
+["topcir"]="⫱",
+["boxVL"]="â•£",
+["Xscr"]="ð’³",
+["QUOT"]="\"",
+["RightDownVectorBar"]="⥕",
+["epsi"]="ε",
+["natur"]="â™®",
+["leftthreetimes"]="â‹‹",
+["hercon"]="⊹",
+["lHar"]="⥢",
+["Aring"]="Ã…",
+["Kcedil"]="Ķ",
+["kfr"]="ð”¨",
+["Oacute"]="Ó",
["zwnj"]="‌",
+["plusdu"]="⨥",
+["Kcy"]="К",
+["sqcup"]="⊔",
+["zscr"]="ð“",
+["Assign"]="≔",
+["zopf"]="ð•«",
+["lstrok"]="Å‚",
+["zigrarr"]="â‡",
+["ShortDownArrow"]="↓",
+["simlE"]="⪟",
+["mid"]="∣",
["zeta"]="ζ",
-["precnsim"]="⋨",
-["zcy"]="з",
+["gE"]="≧",
+["zeetrf"]="ℨ",
+["qfr"]="ð”®",
["zcaron"]="ž",
-["xodot"]="⨀",
-["RightDownTeeVector"]="â¥",
-["ljcy"]="Ñ™",
+["Yacute"]="Ã",
+["hksearow"]="⤥",
+["Atilde"]="Ã",
+["zacute"]="ź",
+["bsemi"]="â",
+["bigtriangleup"]="â–³",
+["yuml"]="ÿ",
+["yucy"]="ÑŽ",
["yscr"]="ð“Ž",
+["yopf"]="ð•ª",
["yicy"]="Ñ—",
-["Rcy"]="Р",
-["nsubset"]="⊂⃒",
-["yen"]="Â¥",
-["ycy"]="Ñ‹",
-["simeq"]="≃",
-["dharr"]="⇂",
-["ycirc"]="Å·",
-["hArr"]="⇔",
-["yacute"]="ý",
-["yacute"]="ý",
+["urcorn"]="âŒ",
+["Aacute"]="Ã",
+["backsimeq"]="â‹",
+["ShortUpArrow"]="↑",
["xwedge"]="â‹€",
-["xoplus"]="â¨",
-["nparsl"]="⫽⃥",
-["PartialD"]="∂",
-["YAcy"]="Я",
-["xrArr"]="⟹",
-["xotime"]="⨂",
-["sstarf"]="⋆",
-["yuml"]="ÿ",
-["Int"]="∬",
-["bsolb"]="⧅",
+["Jcy"]="Й",
+["nltrie"]="⋬",
+["starf"]="★",
+["zfr"]="ð”·",
+["comma"]=",",
+["xsqcup"]="⨆",
+["boxVr"]="â•Ÿ",
+["cirscir"]="⧂",
+["ucirc"]="û",
+["Cross"]="⨯",
+["naturals"]="â„•",
+["quaternions"]="â„",
+["xopf"]="ð•©",
+["xodot"]="⨀",
["xnis"]="â‹»",
-["xmap"]="⟼",
-["hercon"]="⊹",
-["xlArr"]="⟸",
-["xharr"]="⟷",
-["rbrack"]="]",
+["lsaquo"]="‹",
+["xlarr"]="⟵",
+["Zacute"]="Ź",
+["vdash"]="⊢",
+["submult"]="â«",
+["Oscr"]="ð’ª",
["xdtri"]="â–½",
-["diamond"]="â‹„",
+["LowerRightArrow"]="↘",
["xcup"]="⋃",
-["subsup"]="â«“",
-["lneqq"]="≨",
-["dharl"]="⇃",
-["Scy"]="С",
-["wopf"]="ð•¨",
-["rightleftharpoons"]="⇌",
-["wfr"]="ð”´",
-["nsupseteqq"]="⫆̸",
-["boxuR"]="╘",
-["permil"]="‰",
+["Ycy"]="Ы",
+["timesb"]="⊠",
+["Ucirc"]="Û",
+["eth"]="ð",
+["wscr"]="ð“Œ",
+["ratail"]="⤚",
+["wr"]="≀",
+["Ograve"]="Ã’",
+["wp"]="℘",
+["euml"]="ë",
+["yfr"]="ð”¶",
+["rangle"]="⟩",
+["hearts"]="♥",
["wedgeq"]="≙",
-["eparsl"]="⧣",
-["RoundImplies"]="⥰",
-["afr"]="ð”ž",
-["vsubne"]="⊊︀",
-["sup2"]="²",
+["wedge"]="∧",
+["gtcir"]="⩺",
+["par"]="∥",
+["swarr"]="↙",
+["phiv"]="Ï•",
+["NotElement"]="∉",
+["alpha"]="α",
+["SquareUnion"]="⊔",
+["parsl"]="⫽",
["vscr"]="ð“‹",
+["rharu"]="⇀",
+["vrtri"]="⊳",
+["comp"]="âˆ",
+["Agrave"]="À",
+["rdca"]="⤷",
+["vprop"]="âˆ",
+["Tscr"]="ð’¯",
["vopf"]="ð•§",
-["lbrace"]="{",
+["ldca"]="⤶",
["vnsub"]="⊂⃒",
-["vltri"]="⊲",
-["Uacute"]="Ú",
-["vfr"]="ð”³",
-["sacute"]="Å›",
-["njcy"]="Ñš",
-["frac35"]="â…—",
-["squf"]="â–ª",
+["gbreve"]="ÄŸ",
+["NotSquareSubset"]="âŠÌ¸",
+["verbar"]="|",
+["YAcy"]="Я",
["veeeq"]="≚",
-["lsime"]="âª",
-["mapstoleft"]="↤",
+["downharpoonleft"]="⇃",
+["Star"]="⋆",
+["xfr"]="ð”µ",
+["nges"]="⩾̸",
+["GreaterGreater"]="⪢",
+["vartriangleright"]="⊳",
+["rcy"]="Ñ€",
+["vartheta"]="Ï‘",
+["varsupsetneqq"]="⫌︀",
+["dashv"]="⊣",
["varsupsetneq"]="⊋︀",
-["varsubsetneq"]="⊊︀",
-["Tcy"]="Т",
-["cwint"]="∱",
-["varsigma"]="Ï‚",
-["LessGreater"]="≶",
+["Ncaron"]="Ň",
+["varsubsetneqq"]="⫋︀",
["varrho"]="ϱ",
-["varpropto"]="âˆ",
-["pr"]="≺",
-["backprime"]="‵",
+["triangledown"]="â–¿",
+["varpi"]="Ï–",
+["sol"]="/",
+["ssetmn"]="∖",
+["varnothing"]="∅",
["varkappa"]="Ï°",
-["Poincareplane"]="ℌ",
-["roplus"]="⨮",
-["Edot"]="Ä–",
-["copysr"]="â„—",
+["vangrt"]="⦜",
+["Leftarrow"]="â‡",
+["Qscr"]="ð’¬",
+["uwangle"]="⦧",
+["rarrap"]="⥵",
["uuml"]="ü",
-["dfr"]="ð”¡",
["uuarr"]="⇈",
-["uogon"]="ų",
-["Uscr"]="ð’°",
-["gel"]="â‹›",
-["olarr"]="↺",
-["lsaquo"]="‹",
-["omacr"]="Å",
-["utdot"]="â‹°",
-["or"]="∨",
-["Ocirc"]="Ô",
-["ClockwiseContourIntegral"]="∲",
-["SmallCircle"]="∘",
-["gtcc"]="⪧",
["uscr"]="ð“Š",
+["urtri"]="â—¹",
+["uring"]="ů",
+["sect"]="§",
+["quatint"]="⨖",
["urcrop"]="⌎",
-["ContourIntegral"]="∮",
-["szlig"]="ß",
-["egs"]="⪖",
-["Ucy"]="У",
-["ange"]="⦤",
-["upharpoonright"]="↾",
-["xcap"]="â‹‚",
+["wfr"]="ð”´",
+["duhar"]="⥯",
+["upuparrows"]="⇈",
+["macr"]="¯",
+["SmallCircle"]="∘",
+["upsih"]="Ï’",
+["uplus"]="⊎",
+["shy"]="­",
+["uparrow"]="↑",
["uml"]="¨",
-["nsubseteqq"]="⫅̸",
+["eDot"]="≑",
+["blk34"]="â–“",
+["umacr"]="Å«",
+["ultri"]="â—¸",
+["rbbrk"]="â³",
["ulcorn"]="⌜",
-["uhblk"]="â–€",
-["scirc"]="Å",
-["shy"]="­",
-["uharl"]="↿",
+["uharr"]="↾",
["ugrave"]="ù",
-["lstrok"]="Å‚",
-["Gamma"]="Γ",
-["udhar"]="⥮",
-["udblac"]="ű",
-["ucirc"]="û",
-["loang"]="⟬",
-["uarr"]="↑",
+["Ograve"]="Ã’",
+["nsupseteq"]="⊉",
+["ufisht"]="⥾",
+["Breve"]="˘",
+["ucy"]="у",
+["cylcty"]="⌭",
+["ubreve"]="Å­",
+["SHcy"]="Ш",
+["boxdR"]="â•’",
+["awint"]="⨑",
+["uHar"]="⥣",
["uArr"]="⇑",
-["twoheadrightarrow"]="↠",
+["REG"]="®",
+["twoheadleftarrow"]="↞",
["tstrok"]="ŧ",
+["iprod"]="⨼",
["tshcy"]="Ñ›",
-["tscy"]="ц",
-["angsph"]="∢",
-["kappa"]="κ",
["tscr"]="ð“‰",
-["tritime"]="⨻",
-["trisb"]="â§",
+["trpezium"]="â¢",
+["ycirc"]="Å·",
+["larrhk"]="↩",
+["triplus"]="⨹",
["triminus"]="⨺",
-["trie"]="≜",
-["tridot"]="â—¬",
-["aacute"]="á",
+["Rsh"]="↱",
+["becaus"]="∵",
+["Acirc"]="Â",
["trianglerighteq"]="⊵",
-["RightTeeVector"]="⥛",
["triangleright"]="â–¹",
+["hkswarow"]="⤦",
+["triangleq"]="≜",
+["AElig"]="Æ",
["trianglelefteq"]="⊴",
+["varpropto"]="âˆ",
["triangle"]="â–µ",
-["NegativeVeryThinSpace"]="​",
-["triangledown"]="â–¿",
-["dash"]="â€",
-["trade"]="â„¢",
+["tprime"]="‴",
["topfork"]="â«š",
-["Upsi"]="Ï’",
-["topcir"]="⫱",
-["loplus"]="⨭",
-["Zdot"]="Å»",
-["lbrke"]="⦋",
-["angmsd"]="∡",
-["dArr"]="⇓",
-["topbot"]="⌶",
["toea"]="⤨",
-["iexcl"]="¡",
-["acirc"]="â",
-["easter"]="â©®",
-["CloseCurlyDoubleQuote"]="â€",
-["cupcup"]="â©Š",
-["rlhar"]="⇌",
-["nsimeq"]="≄",
-["Uparrow"]="⇑",
-["tau"]="Ï„",
-["npr"]="⊀",
-["phone"]="☎",
-["emacr"]="Ä“",
-["SHcy"]="Ш",
-["gtdot"]="â‹—",
-["ReverseUpEquilibrium"]="⥯",
+["ac"]="∾",
+["timesd"]="⨰",
+["UpArrowDownArrow"]="⇅",
+["timesbar"]="⨱",
+["llhard"]="⥫",
+["CHcy"]="Ч",
+["odblac"]="Å‘",
+["THORN"]="Þ",
+["notni"]="∌",
+["nbump"]="≎̸",
+["eqcolon"]="≕",
["tilde"]="˜",
-["angmsdac"]="⦪",
-["duhar"]="⥯",
-["approxeq"]="≊",
-["NotSupersetEqual"]="⊉",
-["thorn"]="þ",
-["thksim"]="∼",
-["subsim"]="⫇",
-["bnot"]="âŒ",
+["simgE"]="⪠",
+["intercal"]="⊺",
+["thetasym"]="Ï‘",
+["xcirc"]="â—¯",
["thinsp"]=" ",
["thicksim"]="∼",
-["gt"]=">",
-["UpperLeftArrow"]="↖",
-["thetasym"]="Ï‘",
-["simlE"]="⪟",
-["bbrktbrk"]="⎶",
-["Jcirc"]="Ä´",
-["cedil"]="¸",
-["NotLessSlantEqual"]="⩽̸",
-["rx"]="â„ž",
-["infin"]="∞",
-["curlyvee"]="â‹Ž",
-["LeftArrow"]="â†",
-["tfr"]="ð”±",
-["blacksquare"]="â–ª",
-["emptyv"]="∅",
-["Mellintrf"]="ℳ",
-["aogon"]="Ä…",
-["succnapprox"]="⪺",
-["tcy"]="Ñ‚",
-["ecaron"]="Ä›",
+["LeftArrowBar"]="⇤",
+["Uuml"]="Ü",
+["DownTeeArrow"]="↧",
+["cent"]="¢",
+["hookleftarrow"]="↩",
+["odiv"]="⨸",
+["therefore"]="∴",
+["ClockwiseContourIntegral"]="∲",
+["Ofr"]="ð”’",
+["auml"]="ä",
+["frac12"]="½",
+["nRightarrow"]="â‡",
+["kcedil"]="Ä·",
+["DownRightVectorBar"]="⥗",
+["boxDL"]="â•—",
["tcedil"]="Å£",
-["boxhU"]="╨",
-["boxVl"]="â•¢",
-["gacute"]="ǵ",
-["tcaron"]="Å¥",
-["boxDr"]="â•“",
-["bump"]="≎",
-["blk12"]="â–’",
-["RightArrow"]="→",
-["els"]="⪕",
-["apacir"]="⩯",
-["acy"]="а",
-["omid"]="⦶",
-["boxbox"]="⧉",
-["iecy"]="е",
-["szlig"]="ß",
-["upsih"]="Ï’",
-["swnwar"]="⤪",
-["Icirc"]="ÃŽ",
-["swarr"]="↙",
-["times"]="×",
-["Ograve"]="Ã’",
-["hoarr"]="⇿",
-["NotTildeEqual"]="≄",
-["IEcy"]="Е",
-["iexcl"]="¡",
-["bdquo"]="„",
-["TildeTilde"]="≈",
+["boxUr"]="â•™",
+["icirc"]="î",
+["lmoustache"]="⎰",
+["prime"]="′",
+["ngeq"]="≱",
["nshortparallel"]="∦",
-["subedot"]="⫃",
-["supsetneq"]="⊋",
-["CenterDot"]="·",
-["lessapprox"]="⪅",
-["LeftVectorBar"]="⥒",
-["bigoplus"]="â¨",
-["supseteqq"]="⫆",
-["drcorn"]="⌟",
-["hstrok"]="ħ",
-["HorizontalLine"]="─",
-["curarrm"]="⤼",
-["lopar"]="⦅",
+["szlig"]="ß",
+["Egrave"]="È",
+["sqsubset"]="âŠ",
+["NotRightTriangleEqual"]="â‹­",
+["swarrow"]="↙",
+["Ucirc"]="Û",
+["DownArrowBar"]="⤓",
+["Lfr"]="ð”",
["wcirc"]="ŵ",
+["LessLess"]="⪡",
+["Tilde"]="∼",
+["empty"]="∅",
+["swarhk"]="⤦",
+["DownLeftVector"]="↽",
+["Uscr"]="ð’°",
+["khcy"]="Ñ…",
+["gesl"]="⋛︀",
+["supsub"]="â«”",
+["malt"]="✠",
+["cirmid"]="⫯",
+["PrecedesTilde"]="≾",
+["lharul"]="⥪",
+["rightleftharpoons"]="⇌",
+["Ccedil"]="Ç",
+["plusb"]="⊞",
+["nsupe"]="⊉",
+["geq"]="≥",
+["dHar"]="⥥",
+["lcedil"]="ļ",
+["ange"]="⦤",
+["supseteq"]="⊇",
+["Upsi"]="Ï’",
+["mapstodown"]="↧",
+["profalar"]="⌮",
+["cupdot"]="âŠ",
+["mapstoleft"]="↤",
+["xotime"]="⨂",
+["tbrk"]="⎴",
+["supmult"]="â«‚",
+["disin"]="⋲",
["suphsub"]="â«—",
-["Otilde"]="Õ",
-["EmptySmallSquare"]="â—»",
+["eg"]="⪚",
["supedot"]="â«„",
-["Kopf"]="ð•‚",
-["boxminus"]="⊟",
-["csupe"]="â«’",
-["Ffr"]="ð”‰",
-["origof"]="⊶",
-["sup3"]="³",
-["boxH"]="â•",
-["vsubnE"]="⫋︀",
-["Hcirc"]="Ĥ",
-["block"]="â–ˆ",
+["NonBreakingSpace"]=" ",
+["Euml"]="Ë",
["bsolhsub"]="⟈",
-["Supset"]="â‹‘",
-["GreaterFullEqual"]="≧",
+["supdsub"]="⫘",
+["sup3"]="³",
+["DoubleLeftTee"]="⫤",
+["angrtvb"]="⊾",
+["supsim"]="⫈",
+["sup2"]="²",
+["sup2"]="²",
+["circledast"]="⊛",
+["rfr"]="ð”¯",
+["darr"]="↓",
+["rarrhk"]="↪",
+["macr"]="¯",
["sup1"]="¹",
-["llcorner"]="⌞",
-["sopf"]="ð•¤",
-["larrbfs"]="⤟",
-["succneqq"]="⪶",
-["part"]="∂",
-["eacute"]="é",
-["COPY"]="©",
-["frac23"]="â…”",
-["dbkarow"]="â¤",
-["succeq"]="⪰",
-["notni"]="∌",
-["Euml"]="Ë",
-["harrcir"]="⥈",
-["leftrightsquigarrow"]="↭",
-["xcirc"]="â—¯",
-["caret"]="â",
-["les"]="⩽",
-["lharul"]="⥪",
-["bsime"]="â‹",
-["DoubleLeftArrow"]="â‡",
-["ecirc"]="ê",
-["subsetneqq"]="â«‹",
-["crarr"]="↵",
-["cuwed"]="â‹",
-["Ugrave"]="Ù",
-["Gcirc"]="Ĝ",
-["LeftTriangleBar"]="â§",
+["aacute"]="á",
+["oscr"]="â„´",
+["lharu"]="↼",
+["telrec"]="⌕",
+["Dashv"]="⫤",
+["succnsim"]="â‹©",
+["AElig"]="Æ",
+["Vee"]="â‹",
+["succnapprox"]="⪺",
+["CapitalDifferentialD"]="â……",
["gsim"]="≳",
-["RightTriangleEqual"]="⊵",
-["lacute"]="ĺ",
-["Ccedil"]="Ç",
-["ee"]="â…‡",
-["heartsuit"]="♥",
-["coloneq"]="≔",
-["subseteq"]="⊆",
-["NotSucceedsTilde"]="≿̸",
+["succapprox"]="⪸",
+["rmoustache"]="⎱",
+["DotEqual"]="â‰",
+["subsup"]="â«“",
+["Gcedil"]="Ä¢",
+["questeq"]="≟",
+["lthree"]="â‹‹",
+["cong"]="≅",
+["lcub"]="{",
+["radic"]="√",
+["subrarr"]="⥹",
+["nvlt"]="<⃒",
["subplus"]="⪿",
-["cupcap"]="⩆",
-["Amacr"]="Ä€",
-["angst"]="Ã…",
-["supsetneqq"]="⫌",
-["sube"]="⊆",
-["imagpart"]="â„‘",
-["Lambda"]="Λ",
-["Afr"]="ð”„",
-["sub"]="⊂",
+["bigsqcup"]="⨆",
+["downarrow"]="↓",
+["auml"]="ä",
+["boxdL"]="â••",
+["boxvr"]="├",
+["lbrkslu"]="â¦",
+["bigwedge"]="â‹€",
+["apacir"]="⩯",
+["Wscr"]="ð’²",
+["iecy"]="е",
+["VerticalSeparator"]="â˜",
+["Yfr"]="ð”œ",
["strns"]="¯",
["straightphi"]="Ï•",
-["boxvL"]="â•¡",
-["dagger"]="†",
-["eta"]="η",
-["KHcy"]="Ð¥",
-["Yfr"]="ð”œ",
-["lbrack"]="[",
-["VerticalBar"]="∣",
-["rightleftarrows"]="⇄",
-["fltns"]="â–±",
-["verbar"]="|",
-["RightAngleBracket"]="⟩",
-["DownRightVector"]="â‡",
-["Lacute"]="Ĺ",
-["sol"]="/",
-["lrm"]="‎",
-["lesdot"]="â©¿",
-["nleqslant"]="⩽̸",
-["capcap"]="â©‹",
+["kcy"]="к",
+["aogon"]="Ä…",
+["star"]="☆",
+["caret"]="â",
+["cups"]="∪︀",
+["iquest"]="¿",
+["spar"]="∥",
+["NotExists"]="∄",
+["Gt"]="≫",
["squ"]="â–¡",
-["xutri"]="â–³",
-["TSHcy"]="Ћ",
-["gap"]="⪆",
-["gtrdot"]="â‹—",
-["scnap"]="⪺",
-["bkarow"]="â¤",
-["NotPrecedes"]="⊀",
-["suphsol"]="⟉",
+["sqsupe"]="⊒",
+["subnE"]="â«‹",
["sqsup"]="âŠ",
-["epsi"]="ε",
-["sqsubset"]="âŠ",
-["check"]="✓",
-["UpArrowBar"]="⤒",
-["NotPrecedesEqual"]="⪯̸",
-["csube"]="â«‘",
-["nsupset"]="⊃⃒",
-["lesdoto"]="âª",
+["sqsubseteq"]="⊑",
+["ffr"]="ð”£",
+["UpTeeArrow"]="↥",
+["middot"]="·",
+["DoubleLongRightArrow"]="⟹",
+["sqsube"]="⊑",
+["sce"]="⪰",
+["Sup"]="â‹‘",
+["cacute"]="ć",
+["GreaterFullEqual"]="≧",
+["pfr"]="ð”­",
+["Lleftarrow"]="⇚",
+["heartsuit"]="♥",
+["precsim"]="≾",
+["nsucceq"]="⪰̸",
["sqcups"]="⊔︀",
-["suplarr"]="⥻",
-["nsim"]="â‰",
-["NotEqualTilde"]="≂̸",
-["nearr"]="↗",
-["SquareIntersection"]="⊓",
-["intlarhk"]="⨗",
-["Ecirc"]="Ê",
-["vangrt"]="⦜",
-["fllig"]="fl",
-["Leftrightarrow"]="⇔",
-["primes"]="â„™",
-["nvlArr"]="⤂",
+["Igrave"]="Ì",
+["iquest"]="¿",
+["Pcy"]="П",
+["thksim"]="∼",
+["djcy"]="Ñ’",
+["hfr"]="ð”¥",
+["spadesuit"]="â™ ",
+["rbrkslu"]="â¦",
+["shcy"]="ш",
+["barwed"]="⌅",
+["rpar"]=")",
+["iiiint"]="⨌",
+["solb"]="⧄",
+["Integral"]="∫",
+["napE"]="⩰̸",
+["softcy"]="ь",
+["NotRightTriangleBar"]="â§Ì¸",
+["Mu"]="Μ",
+["frasl"]="â„",
+["Icy"]="И",
+["dfisht"]="⥿",
["smte"]="⪬",
-["ltri"]="â—ƒ",
-["Tscr"]="ð’¯",
+["smt"]="⪪",
+["bottom"]="⊥",
+["oacute"]="ó",
+["ofr"]="ð”¬",
["smid"]="∣",
-["smeparsl"]="⧤",
-["rarrc"]="⤳",
-["divideontimes"]="⋇",
-["eth"]="ð",
-["boxvR"]="â•ž",
-["copy"]="©",
-["nges"]="⩾̸",
-["fcy"]="Ñ„",
-["ShortUpArrow"]="↑",
-["simplus"]="⨤",
-["frac45"]="â…˜",
-["nexists"]="∄",
-["LeftTeeArrow"]="↤",
-["leftleftarrows"]="⇇",
-["simg"]="⪞",
-["euro"]="€",
-["simdot"]="⩪",
-["sim"]="∼",
-["sigmav"]="Ï‚",
-["iuml"]="ï",
-["updownarrow"]="↕",
-["shy"]="­",
-["solb"]="⧄",
+["ReverseUpEquilibrium"]="⥯",
+["smashp"]="⨳",
+["slarr"]="â†",
+["simne"]="≆",
+["LeftRightArrow"]="↔",
+["thkap"]="≈",
+["nlArr"]="â‡",
+["chcy"]="ч",
+["not"]="¬",
+["kgreen"]="ĸ",
+["simeq"]="≃",
+["LongRightArrow"]="⟶",
+["sime"]="≃",
+["sigma"]="σ",
+["odot"]="⊙",
+["amp"]="&",
+["Longleftrightarrow"]="⟺",
+["Upsilon"]="Î¥",
+["upharpoonleft"]="↿",
+["bigotimes"]="⨂",
+["parallel"]="∥",
+["ffllig"]="ffl",
+["shortparallel"]="∥",
+["boxdr"]="┌",
+["shortmid"]="∣",
+["Euml"]="Ë",
+["UpDownArrow"]="↕",
+["lcaron"]="ľ",
+["sfrown"]="⌢",
+["harr"]="↔",
+["dsol"]="⧶",
+["Beta"]="Î’",
+["srarr"]="→",
+["boxHd"]="╤",
["nesear"]="⤨",
-["Umacr"]="Ū",
-["uharr"]="↾",
-["Therefore"]="∴",
-["Barv"]="⫧",
-["amacr"]="Ä",
["setmn"]="∖",
+["DoubleDot"]="¨",
["setminus"]="∖",
-["Sscr"]="ð’®",
+["andd"]="⩜",
+["leftrightarrow"]="↔",
["seswar"]="⤩",
-["ccupssm"]="â©",
-["searr"]="↘",
+["eogon"]="Ä™",
+["bne"]="=⃥",
+["DownBreve"]="Ì‘",
+["nLtv"]="≪̸",
+["nprcue"]="â‹ ",
+["SucceedsSlantEqual"]="≽",
+["downdownarrows"]="⇊",
+["seArr"]="⇘",
+["Utilde"]="Ũ",
+["Gammad"]="Ϝ",
+["sdote"]="⩦",
+["iexcl"]="¡",
+["nvdash"]="⊬",
+["csupe"]="â«’",
["sdotb"]="⊡",
-["icirc"]="î",
-["amp"]="&",
-["gcy"]="г",
-["Aacute"]="Ã",
-["boxvh"]="┼",
-["bfr"]="ð”Ÿ",
-["OverParenthesis"]="âœ",
-["sqsupe"]="⊒",
-["amp"]="&",
-["frac14"]="¼",
-["ZeroWidthSpace"]="​",
-["Colon"]="∷",
-["Proportional"]="âˆ",
-["thickapprox"]="≈",
-["subseteqq"]="â«…",
-["IJlig"]="IJ",
-["scedil"]="ÅŸ",
-["lrarr"]="⇆",
-["angmsdaf"]="⦭",
-["downharpoonleft"]="⇃",
+["scsim"]="≿",
+["bcy"]="б",
+["NotTilde"]="â‰",
+["minus"]="−",
+["scnE"]="⪶",
+["scirc"]="Å",
+["oplus"]="⊕",
+["para"]="¶",
+["Ycirc"]="Ŷ",
+["notinva"]="∉",
+["nLl"]="⋘̸",
+["Aring"]="Ã…",
+["THORN"]="Þ",
+["numero"]="â„–",
+["scaron"]="Å¡",
+["bsol"]="\\",
+["harrw"]="↭",
+["exponentiale"]="â…‡",
+["eDDot"]="â©·",
+["AMP"]="&",
+["gamma"]="γ",
+["opar"]="⦷",
+["cwint"]="∱",
+["GreaterEqual"]="≥",
+["bigcap"]="â‹‚",
+["rtimes"]="â‹Š",
+["integers"]="ℤ",
+["easter"]="â©®",
["RightDoubleBracket"]="⟧",
-["half"]="½",
-["larr"]="â†",
["sbquo"]="‚",
-["Vscr"]="ð’±",
-["nVdash"]="⊮",
-["DownRightVectorBar"]="⥗",
-["RightDownVector"]="⇂",
-["disin"]="⋲",
-["nsce"]="⪰̸",
-["rbrace"]="}",
-["MinusPlus"]="∓",
-["rtrif"]="â–¸",
-["parsim"]="⫳",
-["supseteq"]="⊇",
-["Superset"]="⊃",
-["Verbar"]="‖",
+["cfr"]="ð” ",
+["ruluhar"]="⥨",
+["image"]="â„‘",
+["nleqslant"]="⩽̸",
+["Yopf"]="ð•",
+["apE"]="â©°",
+["NotPrecedesEqual"]="⪯̸",
+["rsqb"]="]",
+["rtrie"]="⊵",
+["rthree"]="⋌",
+["amp"]="&",
+["eng"]="Å‹",
+["ll"]="≪",
+["rrarr"]="⇉",
+["RightTee"]="⊢",
+["ETH"]="Ã",
+["ReverseEquilibrium"]="⇋",
+["langle"]="⟨",
["Zeta"]="Ζ",
-["nsccue"]="â‹¡",
-["bsemi"]="â",
-["ldquor"]="„",
-["curarr"]="↷",
-["rscr"]="ð“‡",
-["rppolint"]="⨒",
-["rpargt"]="⦔",
-["rotimes"]="⨵",
-["Equal"]="⩵",
-["ropf"]="ð•£",
-["ropar"]="⦆",
-["roarr"]="⇾",
-["odot"]="⊙",
-["natural"]="â™®",
-["slarr"]="â†",
-["angmsdae"]="⦬",
-["acE"]="∾̳",
+["roplus"]="⨮",
+["there4"]="∴",
+["DownRightTeeVector"]="⥟",
+["npar"]="∦",
+["robrk"]="⟧",
+["exist"]="∃",
+["lfr"]="ð”©",
+["VDash"]="⊫",
+["rnmid"]="â«®",
+["rmoust"]="⎱",
["rlm"]="â€",
-["COPY"]="©",
-["iogon"]="į",
-["nleftrightarrow"]="↮",
-["reg"]="®",
-["risingdotseq"]="≓",
-["rightsquigarrow"]="â†",
-["dtri"]="â–¿",
-["Larr"]="↞",
-["icy"]="и",
-["gimel"]="â„·",
+["Ccirc"]="Ĉ",
+["imagpart"]="â„‘",
+["Equilibrium"]="⇌",
+["dd"]="â…†",
+["cuepr"]="â‹ž",
+["Agrave"]="À",
+["cuesc"]="â‹Ÿ",
+["square"]="â–¡",
+["notnivc"]="⋽",
+["rbrksld"]="⦎",
["cup"]="∪",
-["DJcy"]="Ђ",
-["gtrapprox"]="⪆",
-["rightharpoonup"]="⇀",
-["prsim"]="≾",
-["rightharpoondown"]="â‡",
-["frac16"]="â…™",
-["nbsp"]=" ",
-["cedil"]="¸",
-["numsp"]=" ",
+["OpenCurlyDoubleQuote"]="“",
+["Lacute"]="Ĺ",
+["NewLine"]="\n",
+["Sigma"]="Σ",
+["Abreve"]="Ä‚",
+["rightleftarrows"]="⇄",
+["tint"]="∭",
+["angmsdae"]="⦬",
+["Leftrightarrow"]="⇔",
+["rdquor"]="â€",
+["Verbar"]="‖",
+["Gfr"]="ð”Š",
["rightarrow"]="→",
["rhov"]="ϱ",
-["rdquo"]="â€",
-["rharul"]="⥬",
-["frac34"]="¾",
-["ldrdhar"]="⥧",
-["gnsim"]="⋧",
-["rtriltri"]="⧎",
-["emsp"]=" ",
-["rlarr"]="⇄",
-["Oslash"]="Ø",
-["LeftDownTeeVector"]="⥡",
+["Alpha"]="Α",
+["rho"]="Ï",
+["DownLeftTeeVector"]="⥞",
+["ntriangleright"]="â‹«",
["reg"]="®",
-["LeftTeeVector"]="⥚",
-["gsiml"]="âª",
-["QUOT"]="\"",
-["blk14"]="â–‘",
-["rightrightarrows"]="⇉",
-["NotGreaterGreater"]="≫̸",
-["Xscr"]="ð’³",
-["Re"]="ℜ",
-["Ouml"]="Ö",
+["Int"]="∬",
+["agrave"]="à",
+["Ecirc"]="Ê",
+["NotReverseElement"]="∌",
+["backprime"]="‵",
+["Jfr"]="ð”",
["rdsh"]="↳",
-["and"]="∧",
-["larrb"]="⇤",
-["TripleDot"]="⃛",
-["bcy"]="б",
-["diams"]="♦",
-["veebar"]="⊻",
-["rcub"]="}",
-["Scirc"]="Ŝ",
-["ac"]="∾",
-["rceil"]="⌉",
-["rcedil"]="Å—",
-["cupbrcap"]="⩈",
-["rcaron"]="Å™",
-["cuesc"]="â‹Ÿ",
-["HilbertSpace"]="â„‹",
-["plus"]="+",
-["rbrkslu"]="â¦",
-["LessLess"]="⪡",
-["macr"]="¯",
-["notinE"]="⋹̸",
+["jsercy"]="ј",
+["Bscr"]="ℬ",
+["boxH"]="â•",
+["leq"]="≤",
+["NotPrecedes"]="⊀",
+["coloneq"]="≔",
+["boxvh"]="┼",
+["larr"]="â†",
+["ncup"]="â©‚",
+["EmptySmallSquare"]="â—»",
+["vartriangleleft"]="⊲",
+["iacute"]="í",
+["nVDash"]="⊯",
+["lap"]="⪅",
+["precapprox"]="⪷",
+["ecolon"]="≕",
+["lsqb"]="[",
["rbarr"]="â¤",
-["abreve"]="ă",
-["sqcup"]="⊔",
-["ratail"]="⤚",
-["VeryThinSpace"]=" ",
-["Uarrocir"]="⥉",
-["rarrfs"]="⤞",
-["Odblac"]="Å",
-["Imacr"]="Ī",
-["ordm"]="º",
-["odsold"]="⦼",
-["NJcy"]="Њ",
-["Yacute"]="Ã",
-["rarrbfs"]="⤠",
-["prop"]="âˆ",
-["notin"]="∉",
-["vsupne"]="⊋︀",
-["bigcap"]="â‹‚",
-["Phi"]="Φ",
-["Ograve"]="Ã’",
-["Yscr"]="ð’´",
-["approx"]="≈",
-["racute"]="Å•",
-["ggg"]="â‹™",
-["lmoust"]="⎰",
+["yacy"]="Ñ",
+["efDot"]="≒",
+["ratio"]="∶",
+["wreath"]="≀",
+["nearhk"]="⤤",
+["rarrpl"]="⥅",
+["nvge"]="≥⃒",
+["searrow"]="↘",
+["thorn"]="þ",
+["rdquo"]="â€",
+["LessFullEqual"]="≦",
+["nvrtrie"]="⊵⃒",
+["nsubseteqq"]="⫅̸",
+["nedot"]="â‰Ì¸",
+["VerticalLine"]="|",
+["lsh"]="↰",
+["DownRightVector"]="â‡",
+["ecirc"]="ê",
+["andv"]="â©š",
+["trie"]="≜",
+["race"]="∽̱",
["rBarr"]="â¤",
-["gneqq"]="≩",
-["isinv"]="∈",
-["harr"]="↔",
-["rArr"]="⇒",
-["rAarr"]="⇛",
-["quot"]="\"",
+["lbrksld"]="â¦",
+["emsp14"]=" ",
+["RuleDelayed"]="⧴",
+["vsubne"]="⊊︀",
+["ShortLeftArrow"]="â†",
+["gtlPar"]="⦕",
["quest"]="?",
-["iuml"]="ï",
-["LeftRightArrow"]="↔",
-["LeftDoubleBracket"]="⟦",
-["gesdot"]="⪀",
-["Ntilde"]="Ñ",
-["boxUR"]="â•š",
-["exist"]="∃",
-["subnE"]="â«‹",
-["ograve"]="ò",
-["qopf"]="ð•¢",
-["Zacute"]="Ź",
-["qfr"]="ð”®",
-["dcy"]="д",
-["NotReverseElement"]="∌",
-["DotEqual"]="â‰",
-["VerticalLine"]="|",
-["pscr"]="ð“…",
-["prurel"]="⊰",
-["cdot"]="Ä‹",
-["bprime"]="‵",
-["ltdot"]="â‹–",
-["prnsim"]="⋨",
-["curlywedge"]="â‹",
-["prnE"]="⪵",
-["REG"]="®",
-["sup3"]="³",
+["dot"]="Ë™",
+["RightVector"]="⇀",
+["rppolint"]="⨒",
+["Hat"]="^",
+["zcy"]="з",
+["suplarr"]="⥻",
+["boxhU"]="╨",
+["puncsp"]=" ",
+["GreaterLess"]="≷",
+["psi"]="ψ",
+["ncaron"]="ň",
+["SupersetEqual"]="⊇",
+["propto"]="âˆ",
["preceq"]="⪯",
-["LeftDownVectorBar"]="⥙",
-["ForAll"]="∀",
+["frac56"]="â…š",
+["NotLessGreater"]="≸",
+["jukcy"]="Ñ”",
+["swArr"]="⇙",
+["profline"]="⌒",
+["prnE"]="⪵",
+["larrpl"]="⤹",
+["af"]="â¡",
+["profsurf"]="⌓",
+["Larr"]="↞",
["forkv"]="â«™",
-["varpi"]="Ï–",
-["nrArr"]="â‡",
+["prcue"]="≼",
+["RightUpTeeVector"]="⥜",
["pound"]="£",
+["ugrave"]="ù",
+["popf"]="ð•¡",
+["frac78"]="â…ž",
+["suphsol"]="⟉",
+["loplus"]="⨭",
+["pointint"]="⨕",
+["cupcap"]="⩆",
+["LessTilde"]="≲",
+["pm"]="±",
+["blacksquare"]="â–ª",
["plustwo"]="⨧",
-["shchcy"]="щ",
-["cacute"]="ć",
-["Dashv"]="⫤",
-["lHar"]="⥢",
-["NotLeftTriangle"]="⋪",
-["gbreve"]="ÄŸ",
-["boxDl"]="â•–",
-["Beta"]="Î’",
-["ReverseEquilibrium"]="⇋",
+["copy"]="©",
+["plussim"]="⨦",
+["Lcy"]="Л",
+["pluse"]="⩲",
+["ropar"]="⦆",
+["OpenCurlyQuote"]="‘",
["plusacir"]="⨣",
-["eqslantgtr"]="⪖",
-["ecy"]="Ñ",
-["pitchfork"]="â‹”",
-["ctdot"]="⋯",
-["odiv"]="⨸",
-["lesseqqgtr"]="⪋",
-["GreaterLess"]="≷",
-["Ocy"]="О",
-["weierp"]="℘",
-["Uring"]="Å®",
-["period"]=".",
-["nis"]="⋼",
-["cudarrr"]="⤵",
-["boxHU"]="â•©",
-["Ouml"]="Ö",
-["Assign"]="≔",
-["Lscr"]="â„’",
-["parallel"]="∥",
-["there4"]="∴",
-["cupor"]="â©…",
-["nwarr"]="↖",
-["para"]="¶",
-["ouml"]="ö",
-["otimes"]="⊗",
-["drbkarow"]="â¤",
-["puncsp"]=" ",
-["otilde"]="õ",
-["Vvdash"]="⊪",
-["osol"]="⊘",
+["Exists"]="∃",
+["piv"]="Ï–",
+["phmmat"]="ℳ",
+["angzarr"]="â¼",
+["vsupnE"]="⫌︀",
+["phi"]="φ",
+["perp"]="⊥",
+["rdldhar"]="⥩",
+["ccirc"]="ĉ",
+["Tfr"]="ð”—",
+["Tcy"]="Т",
+["circeq"]="≗",
+["InvisibleTimes"]="â¢",
+["OElig"]="Å’",
+["trisb"]="â§",
+["Rcaron"]="Ř",
+["olt"]="⧀",
+["UpArrow"]="↑",
+["DDotrahd"]="⤑",
+["Uarrocir"]="⥉",
+["lacute"]="ĺ",
["oslash"]="ø",
-["dd"]="â…†",
-["NotPrecedesSlantEqual"]="â‹ ",
-["orv"]="â©›",
-["orslope"]="â©—",
-["KJcy"]="Ќ",
-["larrfs"]="â¤",
-["orderof"]="â„´",
-["asympeq"]="â‰",
-["ord"]="â©",
-["NotLess"]="≮",
-["NotGreater"]="≯",
-["ThinSpace"]=" ",
-["ominus"]="⊖",
+["Uarr"]="↟",
+["bsolb"]="⧅",
+["gt"]=">",
+["ordm"]="º",
+["Itilde"]="Ĩ",
+["ordm"]="º",
+["Jscr"]="ð’¥",
+["Rarr"]="↠",
+["measuredangle"]="∡",
["DoubleLongLeftRightArrow"]="⟺",
-["lesseqgtr"]="â‹š",
+["lmidot"]="Å€",
+["period"]=".",
["operp"]="⦹",
-["quaternions"]="â„",
-["boxdR"]="â•’",
-["omega"]="ω",
-["Kscr"]="ð’¦",
-["lessgtr"]="≶",
-["utilde"]="Å©",
-["olt"]="⧀",
-["Rho"]="Ρ",
-["olcir"]="⦾",
-["oint"]="∮",
+["bprime"]="‵",
+["numsp"]=" ",
+["ominus"]="⊖",
+["nldr"]="‥",
["ograve"]="ò",
-["Succeeds"]="≻",
-["Igrave"]="Ì",
-["eogon"]="Ä™",
-["Uacute"]="Ú",
-["bbrk"]="⎵",
-["ocy"]="о",
-["bcong"]="≌",
+["omicron"]="ο",
+["nearr"]="↗",
+["jcirc"]="ĵ",
+["nlE"]="≦̸",
+["deg"]="°",
+["frac13"]="â…“",
+["tcy"]="Ñ‚",
+["lowbar"]="_",
+["vfr"]="ð”³",
+["ogon"]="Ë›",
+["sim"]="∼",
+["ocirc"]="ô",
+["Icirc"]="ÃŽ",
+["ocir"]="⊚",
+["ZeroWidthSpace"]="​",
["oast"]="⊛",
+["smile"]="⌣",
+["bigvee"]="â‹",
["oacute"]="ó",
-["cir"]="â—‹",
-["angmsdab"]="⦩",
-["Iscr"]="â„",
-["ldquo"]="“",
-["RightVector"]="⇀",
-["euml"]="ë",
-["between"]="≬",
-["oS"]="Ⓢ",
-["downdownarrows"]="⇊",
-["nvlt"]="<⃒",
-["lurdshar"]="⥊",
-["starf"]="★",
-["xlarr"]="⟵",
-["Aring"]="Ã…",
-["Xi"]="Ξ",
-["gtcir"]="⩺",
-["Nscr"]="ð’©",
-["elinters"]="â§",
-["ntrianglelefteq"]="⋬",
-["Vbar"]="â««",
+["Egrave"]="È",
+["nwnear"]="⤧",
+["nwarhk"]="⤣",
+["rationals"]="â„š",
+["DiacriticalGrave"]="`",
+["npreceq"]="⪯̸",
+["rarrc"]="⤳",
+["Uogon"]="Ų",
+["InvisibleComma"]="â£",
+["nvltrie"]="⊴⃒",
+["digamma"]="Ï",
+["cirE"]="⧃",
+["AMP"]="&",
+["Theta"]="Θ",
+["frac15"]="â…•",
+["fnof"]="Æ’",
+["icirc"]="î",
+["Cdot"]="ÄŠ",
+["ngsim"]="≵",
+["sube"]="⊆",
+["tcaron"]="Å¥",
["ntilde"]="ñ",
-["andv"]="â©š",
-["Rsh"]="↱",
-["angmsdad"]="⦫",
-["nsup"]="⊅",
-["nbsp"]=" ",
-["SquareSupersetEqual"]="⊒",
-["ETH"]="Ã",
-["nsube"]="⊈",
-["DoubleContourIntegral"]="∯",
-["nsubE"]="⫅̸",
-["angmsdah"]="⦯",
-["NotLessGreater"]="≸",
-["awint"]="⨑",
-["rtri"]="â–¹",
-["nsc"]="âŠ",
-["boxvl"]="┤",
-["beta"]="β",
-["LessSlantEqual"]="⩽",
-["supsub"]="â«”",
-["agrave"]="à",
-["LeftUpTeeVector"]="⥠",
-["nrarrw"]="â†Ì¸",
-["ltcc"]="⪦",
-["nrarrc"]="⤳̸",
-["frac78"]="â…ž",
-["nvrArr"]="⤃",
-["igrave"]="ì",
-["barwed"]="⌅",
-["Mscr"]="ℳ",
-["nrarr"]="↛",
-["SubsetEqual"]="⊆",
-["notnivc"]="⋽",
-["notnivb"]="⋾",
-["succcurlyeq"]="≽",
-["eth"]="ð",
-["notinva"]="∉",
-["Otilde"]="Õ",
-["star"]="☆",
-["rangd"]="⦒",
-["Psi"]="Ψ",
-["nsupe"]="⊉",
-["mapstoup"]="↥",
-["LJcy"]="Љ",
-["looparrowleft"]="↫",
-["nlarr"]="↚",
-["Ll"]="⋘",
-["ordf"]="ª",
-["ni"]="∋",
+["ufr"]="ð”²",
+["Mcy"]="М",
["Delta"]="Δ",
-["NotVerticalBar"]="∤",
-["backcong"]="≌",
-["NoBreak"]="â ",
+["vnsup"]="⊃⃒",
+["lAtail"]="⤛",
+["DoubleUpArrow"]="⇑",
+["aelig"]="æ",
+["lscr"]="ð“",
+["Rscr"]="â„›",
+["capcup"]="⩇",
+["npolint"]="⨔",
+["gesdotol"]="⪄",
+["uacute"]="ú",
+["bumpE"]="⪮",
+["drcorn"]="⌟",
+["notnivb"]="⋾",
+["notinvc"]="⋶",
+["ovbar"]="⌽",
+["Mopf"]="ð•„",
+["NotGreater"]="≯",
+["boxDr"]="â•“",
+["lrcorner"]="⌟",
+["nleq"]="≰",
+["nleftarrow"]="↚",
+["nle"]="≰",
+["boxvl"]="┤",
+["Downarrow"]="⇓",
+["hcirc"]="Ä¥",
["nharr"]="↮",
+["tfr"]="ð”±",
+["nlt"]="≮",
+["gacute"]="ǵ",
+["colone"]="≔",
+["Rang"]="⟫",
["ngt"]="≯",
-["Pscr"]="ð’«",
-["laemptyv"]="⦴",
-["utrif"]="â–´",
-["ngeq"]="≱",
-["ncedil"]="ņ",
-["ncaron"]="ň",
-["boxhu"]="â”´",
-["NotSquareSuperset"]="âŠÌ¸",
-["bull"]="•",
+["ntilde"]="ñ",
+["vcy"]="в",
+["boxvL"]="â•¡",
+["NotLeftTriangleBar"]="â§Ì¸",
+["NestedGreaterGreater"]="≫",
+["xmap"]="⟼",
+["napid"]="≋̸",
+["LeftTriangleBar"]="â§",
["SquareSubsetEqual"]="⊑",
-["VerticalSeparator"]="â˜",
-["natur"]="â™®",
-["ffr"]="ð”£",
-["rdquor"]="â€",
-["lagran"]="â„’",
-["nRightarrow"]="â‡",
-["nLtv"]="≪̸",
-["nLl"]="⋘̸",
-["Epsilon"]="Ε",
-["csup"]="â«",
-["leftarrow"]="â†",
-["nGt"]="≫⃒",
-["multimap"]="⊸",
-["mstpos"]="∾",
-["SuchThat"]="∋",
-["mldr"]="…",
-["midast"]="*",
-["Sum"]="∑",
-["vartheta"]="Ï‘",
-["mapsto"]="↦",
-["nsupseteq"]="⊉",
-["Oscr"]="ð’ª",
-["forall"]="∀",
-["aring"]="Ã¥",
-["ltimes"]="⋉",
-["ltcir"]="⩹",
-["lt"]="<",
-["ii"]="â…ˆ",
-["equest"]="≟",
-["scsim"]="≿",
-["lsqb"]="[",
-["lsimg"]="âª",
-["Egrave"]="È",
-["Downarrow"]="⇓",
-["lsim"]="≲",
-["eqslantless"]="⪕",
-["ucirc"]="û",
-["Auml"]="Ä",
-["lnsim"]="⋦",
-["uplus"]="⊎",
-["lhblk"]="â–„",
-["Ugrave"]="Ù",
-["dlcrop"]="âŒ",
-["OElig"]="Å’",
-["lesg"]="⋚︀",
-["lesdotor"]="⪃",
-["eg"]="⪚",
-["lvertneqq"]="≨︀",
-["leqslant"]="⩽",
-["ccups"]="⩌",
-["lceil"]="⌈",
-["auml"]="ä",
-["RightCeiling"]="⌉",
-["lbrksld"]="â¦",
-["lbarr"]="⤌",
+["eacute"]="é",
+["ne"]="≠",
+["ncongdot"]="⩭̸",
+["boxvR"]="â•ž",
+["PrecedesEqual"]="⪯",
+["Omacr"]="Ō",
+["egs"]="⪖",
+["ouml"]="ö",
+["nbsp"]=" ",
+["xuplus"]="⨄",
+["napprox"]="≉",
+["CloseCurlyQuote"]="’",
+["nacute"]="Å„",
+["Chi"]="Χ",
+["subsub"]="â«•",
+["gescc"]="⪩",
+["gcirc"]="Ä",
+["Lsh"]="↰",
+["sfr"]="ð”°",
+["circlearrowright"]="↻",
+["rcaron"]="Å™",
+["ThinSpace"]=" ",
+["otilde"]="õ",
+["TRADE"]="â„¢",
+["cudarrl"]="⤸",
["lat"]="⪫",
-["Rscr"]="â„›",
-["Zcy"]="З",
-["bigwedge"]="â‹€",
-["Prime"]="″",
+["nLeftrightarrow"]="⇎",
+["leqq"]="≦",
+["dagger"]="†",
+["dstrok"]="Ä‘",
+["sacute"]="Å›",
+["Amacr"]="Ä€",
+["mumap"]="⊸",
+["models"]="⊧",
+["DiacriticalAcute"]="´",
+["minusd"]="∸",
+["hybull"]="âƒ",
+["ijlig"]="ij",
+["fflig"]="ff",
+["NotGreaterEqual"]="≱",
+["Colon"]="∷",
+["boxV"]="â•‘",
+["DotDot"]="⃜",
+["mdash"]="—",
+["hairsp"]=" ",
+["bcong"]="≌",
+["mcomma"]="⨩",
+["cirfnint"]="â¨",
+["TScy"]="Ц",
+["luruhar"]="⥦",
+["awconint"]="∳",
+["nsim"]="â‰",
+["els"]="⪕",
+["imof"]="⊷",
+["lpar"]="(",
+["lozenge"]="â—Š",
+["oint"]="∮",
+["Umacr"]="Ū",
+["Sum"]="∑",
+["lopar"]="⦅",
+["racute"]="Å•",
+["LessEqualGreater"]="â‹š",
+["Wedge"]="â‹€",
+["bbrktbrk"]="⎶",
+["RightDownTeeVector"]="â¥",
+["HumpDownHump"]="≎",
+["rarrb"]="⇥",
+["longleftrightarrow"]="⟷",
+["lnE"]="≨",
+["NotGreaterSlantEqual"]="⩾̸",
+["Nu"]="Î",
+["NotNestedLessLess"]="⪡̸",
+["UpEquilibrium"]="⥮",
+["boxhD"]="â•¥",
+["el"]="⪙",
["boxDR"]="â•”",
-["scnsim"]="â‹©",
-["efDot"]="≒",
-["kopf"]="ð•œ",
-["minusdu"]="⨪",
-["kappav"]="Ï°",
+["Gdot"]="Ä ",
+["itilde"]="Ä©",
+["isindot"]="⋵",
+["GreaterEqualLess"]="â‹›",
+["Ll"]="⋘",
+["nrarrw"]="â†Ì¸",
+["supnE"]="⫌",
+["epsiv"]="ϵ",
+["Element"]="∈",
+["gtreqless"]="â‹›",
+["laemptyv"]="⦴",
+["nGt"]="≫⃒",
+["angsph"]="∢",
+["lE"]="≦",
+["kscr"]="ð“€",
+["Ocy"]="О",
+["LowerLeftArrow"]="↙",
+["dopf"]="ð••",
+["iukcy"]="Ñ–",
+["atilde"]="ã",
+["DoubleRightArrow"]="⇒",
+["oslash"]="ø",
+["rarr"]="→",
+["intprod"]="⨼",
+["hookrightarrow"]="↪",
+["intcal"]="⊺",
+["infintie"]="â§",
+["escr"]="ℯ",
+["iiota"]="â„©",
+["curren"]="¤",
+["Bernoullis"]="ℬ",
+["angmsdah"]="⦯",
+["ShortRightArrow"]="→",
+["boxUR"]="â•š",
+["ges"]="⩾",
+["DoubleDownArrow"]="⇓",
+["NotSquareSuperset"]="âŠÌ¸",
+["lsim"]="≲",
+["bump"]="≎",
+["curlyeqsucc"]="â‹Ÿ",
+["SHCHcy"]="Щ",
+["frac45"]="â…˜",
+["qint"]="⨌",
+["Precedes"]="≺",
+["RightTeeArrow"]="↦",
+["frac16"]="â…™",
+["euro"]="€",
+["smtes"]="⪬︀",
+["eth"]="ð",
+["ldquo"]="“",
+["equivDD"]="⩸",
+["Oopf"]="ð•†",
["boxVh"]="â•«",
-["Uuml"]="Ü",
-["centerdot"]="·",
-["isinsv"]="⋳",
-["isins"]="â‹´",
-["bot"]="⊥",
-["integers"]="ℤ",
-["Racute"]="Å”",
-["ijlig"]="ij",
-["bernou"]="ℬ",
-["Cconint"]="∰",
-["doteq"]="â‰",
-["hookleftarrow"]="↩",
-["epar"]="â‹•",
-["harrw"]="↭",
-["dzigrarr"]="⟿",
-["Zscr"]="ð’µ",
-["alpha"]="α",
-["times"]="×",
+["GreaterSlantEqual"]="⩾",
+["KJcy"]="Ќ",
["egrave"]="è",
-["UnionPlus"]="⊎",
-["Qscr"]="ð’¬",
-["Omacr"]="Ō",
-["Zfr"]="ℨ",
-["gneq"]="⪈",
-["divonx"]="⋇",
-["gesdotol"]="⪄",
-["gvertneqq"]="≩︀",
-["geq"]="≥",
-["utri"]="â–µ",
-["ge"]="≥",
-["vArr"]="⇕",
-["Rrightarrow"]="⇛",
-["frac25"]="â…–",
-["LeftCeiling"]="⌈",
-["GreaterGreater"]="⪢",
-["LT"]="<",
-["Longrightarrow"]="⟹",
-["eqcolon"]="≕",
-["ofcir"]="⦿",
-["boxUl"]="╜",
-["Wscr"]="ð’²",
-["Sacute"]="Åš",
-["Union"]="⋃",
-["gg"]="≫",
-["DownArrowBar"]="⤓",
-["Escr"]="â„°",
-["ecirc"]="ê",
-["Lmidot"]="Ä¿",
-["Wedge"]="â‹€",
-["frown"]="⌢",
-["ring"]="Ëš",
-["dtdot"]="⋱",
-["Ccedil"]="Ç",
-["Conint"]="∯",
-["dscr"]="ð’¹",
-["Map"]="⤅",
-["EmptyVerySmallSquare"]="â–«",
-["backsim"]="∽",
-["angzarr"]="â¼",
-["dHar"]="⥥",
-["Mfr"]="ð”",
-["cirE"]="⧃",
-["Popf"]="â„™",
-["NestedGreaterGreater"]="≫",
-["ReverseElement"]="∋",
-["boxVr"]="â•Ÿ",
+["NotGreaterLess"]="≹",
+["boxVl"]="â•¢",
+["MediumSpace"]="âŸ",
+["LongLeftArrow"]="⟵",
+["uarr"]="↑",
+["Ocirc"]="Ô",
+["Idot"]="Ä°",
+["bumpe"]="â‰",
+["nwArr"]="⇖",
+["NegativeThinSpace"]="​",
+["coprod"]="âˆ",
+["VerticalBar"]="∣",
+["sccue"]="≽",
+["boxDl"]="â•–",
+["NotSubset"]="⊂⃒",
+["Edot"]="Ä–",
+["scy"]="Ñ",
+["Cup"]="â‹“",
+["centerdot"]="·",
+["nsimeq"]="≄",
+["DownLeftRightVector"]="â¥",
}
diff --git a/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua b/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
index b6841fea5fb..4b51eed1170 100644
--- a/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
+++ b/Master/texmf-dist/tex/luatex/luaxml/luaxml-transform.lua
@@ -198,6 +198,10 @@ local function add_action(selector, template, parameters, csspar)
end
+local function reset_actions(selector, csspar)
+ local css = csspar or css
+ css:remove_selector(selector)
+end
--- Transform XML string
@@ -243,7 +247,7 @@ end
local Transformer
--- Make new Transformer object
--- @return Tranformer object
+-- @return Transformer object
local function new()
local self = setmetatable({}, Transformer)
self.css = cssquery()
@@ -289,6 +293,12 @@ function Transformer:add_custom_action(selector, fn )
add_custom_action(selector, fn, self.css)
end
+--- Remove all actions that match the given selector
+---@param selector string
+function Transformer:reset_actions(selector)
+ reset_actions(selector, self.css)
+end
+
-- all methods that use transformation functions must
-- correctly handle the cssquery object that this library uses
@@ -338,6 +348,7 @@ local M = {
print_tex = print_tex,
add_action = add_action,
add_custom_action = add_custom_action,
+ reset_actions = reset_actions,
simple_content = simple_content,
load_file = load_file,
process_dom = process_dom,
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua b/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
index 36cef293ed9..25b351f7e40 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown-tinyyaml.lua
@@ -253,7 +253,9 @@ function Parser:parsestring(line, stopper)
end
line = ssub(line, 2)
end
- return rtrim(buf), line
+ buf = rtrim(buf)
+ local val = tonumber(buf) or buf
+ return val, line
end
local function isemptyline(line)
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index f9154d8103b..92e02be8018 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -20,7 +20,7 @@
-- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--
--- Copyright (C) 2016-2024 Vít Starý Novotný
+-- Copyright (C) 2016-2024 Vít Starý Novotný, Andrej GenÄur
--
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either version 1.3
@@ -58,11 +58,11 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "3.6.1-0-g5a45a922",
+ version = "3.6.2-0-g6c30af7e",
comment = "A module for the conversion from markdown to plain TeX",
- author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
+ author = "John MacFarlane, Hans Hagen, Vít Starý Novotný, Andrej GenÄur",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",
- "2016-2023 Vít Starý Novotný"},
+ "2016-2024 Vít Starý Novotný, Andrej GenÄur"},
license = "LPPL 1.3c"
}
@@ -5182,7 +5182,7 @@ function M.reader.new(writer, options)
+ #parsers.link_text
* Cg(Cc("link_text"), "link_type")
- parsers.note_opening = #(parsers.circumflex * parsers.shortcut_link)
+ parsers.note_opening = #(parsers.circumflex * parsers.link_text)
* Cg(Cc("note_inline"), "link_type")
parsers.raw_note_opening = #( parsers.lbracket
@@ -5495,9 +5495,10 @@ function M.reader.new(writer, options)
end
for i,value in ipairs(t) do
- if not value.is_closing or
- value.type ~= "delimiter" or
- not (value.element == "link" or value.element == "image" or value.element == "note") then
+ if not value.is_closing
+ or value.type ~= "delimiter"
+ or not (value.element == "link" or value.element == "image" or value.element == "note")
+ or value.removed then
goto continue
end
@@ -6462,7 +6463,7 @@ M.extensions.citations = function(citation_nbsps)
)
* citation_name
* (parsers.internal_punctuation - parsers.semicolon)^-1
- * ( parsers.spnlc
+ * ( parsers.spnlc / function(_) return end
* citation_body_postnote
+ Cc("")
* parsers.spnlc
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
index 237b9f39c38..1d8fd1a0aae 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex
@@ -18,7 +18,7 @@
\newread\testread
\openin\testread=\contentsfile\relax
\ifeof\testread % First run
-\else % Second run
+\else\closein\testread % Second run
% Fix page numbers in the PDF bootmarks with 'Page Labels'
\def\tocpages{1} % Most programs have one-page Table-of-Contents
\def\tocstart{2} % so we start with (fake) page 2 for the rest
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
index 99e899476ce..f9891daf1bc 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
@@ -1,5 +1,5 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.12 --- May 2024
+% Version 4.12 --- July 2024
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
\xdef\fmtversion{\fmtversion+CWEB4.12}
\chardef\cwebversion=4 \chardef\cwebrevision=12
@@ -12,15 +12,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 % for smallish caps (NOT a caps-and-small-caps font)
\let\mainfont=\tenrm
@@ -31,6 +22,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
@@ -112,8 +113,6 @@
\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
@@ -159,6 +158,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