summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls3492
-rw-r--r--Master/texmf-dist/tex/latex/acmart/acmart.cls74
-rw-r--r--Master/texmf-dist/tex/latex/acronym/acronym.sty72
-rw-r--r--Master/texmf-dist/tex/latex/adforn/adforn.sty104
-rw-r--r--Master/texmf-dist/tex/latex/adforn/uornementsadf.fd78
-rw-r--r--Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex121
-rw-r--r--Master/texmf-dist/tex/latex/animate/animate.sty9
-rw-r--r--Master/texmf-dist/tex/latex/argumentation/argumentation.sty182
-rw-r--r--Master/texmf-dist/tex/latex/baskervald/baskervald.sty24
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldadf/baskervald.sty70
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldadf/t1ybv.fd (renamed from Master/texmf-dist/tex/latex/baskervald/t1ybv.fd)21
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldadf/t1ybvw.fd (renamed from Master/texmf-dist/tex/latex/baskervald/t1ybvw.fd)21
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldadf/ts1ybv.fd (renamed from Master/texmf-dist/tex/latex/baskervald/ts1ybv.fd)21
-rw-r--r--Master/texmf-dist/tex/latex/baskervaldadf/ts1ybvw.fd (renamed from Master/texmf-dist/tex/latex/baskervald/ts1ybvw.fd)21
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty328
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty580
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty1949
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty2173
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty173
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-tcolorbox/beamerinnerthemetcolorbox.sty12
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/berenis.sty350
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd0.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd1.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd2.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd2j.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd2jw.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybd2w.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybdj.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybdjw.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ly1ybdw.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybd.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybd0.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybd1.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybd2.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybd2j.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/t1ybdj.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd0.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd1.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd2.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd2j.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd2jw.fd87
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybd2w.fd87
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybdj.fd64
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybdjw.fd87
-rw-r--r--Master/texmf-dist/tex/latex/berenisadf/ts1ybdw.fd87
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx116
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx176
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx7
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx311
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx166
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty13
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty9
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty20
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty17
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty26
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty449
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2d.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2dj.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2j.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2jqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2js.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2jt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2jv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2qs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2s.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2t.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clm2v.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmd.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmdj.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmj.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmjqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmjs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmjt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmjv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clms.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/t1clmv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2d.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2dj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2j.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jqs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2js.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jt.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2qs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2s.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2t.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clm2v.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmd.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmdj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmj.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmjqs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmjs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmjt.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmjv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmqs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clms.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmt.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/ts1clmv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2d.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2dj.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2j.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2jqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2js.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2jt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2jv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2qs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2s.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2t.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclm2v.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmd.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmdj.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmj.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmjqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmjs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmjt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmjv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmqs.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclms.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmt.fd5
-rw-r--r--Master/texmf-dist/tex/latex/cfr-lm/uclmv.fd2
-rw-r--r--Master/texmf-dist/tex/latex/changelog/changelog.sty32
-rw-r--r--Master/texmf-dist/tex/latex/circledtext/circledtext.sty324
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty158
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty2
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl13
-rw-r--r--Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty10
-rw-r--r--Master/texmf-dist/tex/latex/commalists-tools/commalists-tools.sty188
-rw-r--r--Master/texmf-dist/tex/latex/cs-techrep/cs-techrep.cls41
-rw-r--r--Master/texmf-dist/tex/latex/csthm/csthm.sty146
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty36
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty4
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty4
-rw-r--r--Master/texmf-dist/tex/latex/customenvs/customenvs.sty756
-rw-r--r--Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty4
-rw-r--r--Master/texmf-dist/tex/latex/dccpaper/idcc.cls12
-rw-r--r--Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls4
-rw-r--r--Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls4
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty195
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/edmaths/edmaths.sty8
-rw-r--r--Master/texmf-dist/tex/latex/electrum/electrum.sty35
-rw-r--r--Master/texmf-dist/tex/latex/electrum/t1yes.fd91
-rw-r--r--Master/texmf-dist/tex/latex/electrum/t1yesj.fd91
-rw-r--r--Master/texmf-dist/tex/latex/electrum/t1yesjw.fd91
-rw-r--r--Master/texmf-dist/tex/latex/electrum/t1yesw.fd91
-rw-r--r--Master/texmf-dist/tex/latex/electrum/ts1yes.fd67
-rw-r--r--Master/texmf-dist/tex/latex/electrum/ts1yesj.fd67
-rw-r--r--Master/texmf-dist/tex/latex/electrum/ts1yesjw.fd67
-rw-r--r--Master/texmf-dist/tex/latex/electrum/ts1yesw.fd67
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/electrum.sty100
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yes.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yes0.fd (renamed from Master/texmf-dist/tex/latex/electrum/t1yes0.fd)35
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yes1.fd (renamed from Master/texmf-dist/tex/latex/electrum/t1yes1.fd)35
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yesj.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yesjw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/t1yesw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yes.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yes0.fd (renamed from Master/texmf-dist/tex/latex/electrum/ts1yes0.fd)35
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yes1.fd (renamed from Master/texmf-dist/tex/latex/electrum/ts1yes1.fd)35
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yesj.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yesjw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/electrumadf/ts1yesw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/enverb/enverb.sty380
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-100euro.pdfbin0 -> 955673 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimple.pdfbin0 -> 62058 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimplebw.pdfbin0 -> 62345 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10cent.pdfbin0 -> 27497 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimple.pdfbin0 -> 11617 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimplebw.pdfbin0 -> 11163 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10euro.pdfbin0 -> 160214 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimple.pdfbin0 -> 22792 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimplebw.pdfbin0 -> 22996 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1cent.pdfbin0 -> 46257 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimple.pdfbin0 -> 2172 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimplebw.pdfbin0 -> 2164 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1euro.pdfbin0 -> 19980 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimple.pdfbin0 -> 5894 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimplebw.pdfbin0 -> 5910 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-200euro.pdfbin0 -> 354898 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimple.pdfbin0 -> 22825 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimplebw.pdfbin0 -> 23006 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20cent.pdfbin0 -> 26569 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimple.pdfbin0 -> 10164 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimplebw.pdfbin0 -> 9960 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20euro.pdfbin0 -> 78801 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimple.pdfbin0 -> 22382 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimplebw.pdfbin0 -> 22394 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2cent.pdfbin0 -> 45967 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimple.pdfbin0 -> 2130 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimplebw.pdfbin0 -> 2122 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2euro.pdfbin0 -> 23244 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimple.pdfbin0 -> 5941 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimplebw.pdfbin0 -> 5897 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-500euro.pdfbin0 -> 231203 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimple.pdfbin0 -> 22885 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimplebw.pdfbin0 -> 23168 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50cent.pdfbin0 -> 27558 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimple.pdfbin0 -> 11748 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimplebw.pdfbin0 -> 11303 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50euro.pdfbin0 -> 235259 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimple.pdfbin0 -> 17891 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimplebw.pdfbin0 -> 18128 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5cent.pdfbin0 -> 45981 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimple.pdfbin0 -> 2200 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimplebw.pdfbin0 -> 2181 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5euro.pdfbin0 -> 424391 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimple.pdfbin0 -> 60083 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimplebw.pdfbin0 -> 60042 bytes
-rw-r--r--Master/texmf-dist/tex/latex/euromoney/euromoney.sty549
-rw-r--r--Master/texmf-dist/tex/latex/ezedits/ezedits.sty221
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-american.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-british.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-dutch.def (renamed from Master/texmf-dist/tex/latex/regulatory/fc-dutch.def)96
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-english.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-francais.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-french.def8
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-german.def46
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-italian.def59
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def226
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty6
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fontscale/fontscale.sty554
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty10
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex7
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex11
-rw-r--r--Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex7
-rw-r--r--Master/texmf-dist/tex/latex/fourier/fourier-orns.sty14
-rw-r--r--Master/texmf-dist/tex/latex/fourier/fourier.sty5
-rw-r--r--Master/texmf-dist/tex/latex/fourier/ufuts.fd4
-rw-r--r--Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty257
-rw-r--r--Master/texmf-dist/tex/latex/fvextra/fvextra.sty426
-rw-r--r--Master/texmf-dist/tex/latex/heria/heria.cls8
-rw-r--r--Master/texmf-dist/tex/latex/iaria-lite/iaria-lite.cls26
-rw-r--r--Master/texmf-dist/tex/latex/iaria/iaria.cls36
-rw-r--r--Master/texmf-dist/tex/latex/interlinear/interlinear.sty1176
-rw-r--r--Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdfbin971 -> 972 bytes
-rw-r--r--Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdfbin1109 -> 1110 bytes
-rw-r--r--Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdfbin1064 -> 1064 bytes
-rw-r--r--Master/texmf-dist/tex/latex/isosafety/isosafety.sty12
-rw-r--r--Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty14
-rw-r--r--Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty17
-rw-r--r--Master/texmf-dist/tex/latex/jlreq/jlreq.cls324
-rw-r--r--Master/texmf-dist/tex/latex/joinbox/joinbox.sty94
-rw-r--r--Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty3
-rw-r--r--Master/texmf-dist/tex/latex/jupynotex/jupynotex.py331
-rw-r--r--Master/texmf-dist/tex/latex/jupynotex/jupynotex.sty18
-rw-r--r--Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls26
-rw-r--r--Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsart-support.tex64
-rw-r--r--Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsbook-support.tex31
-rw-r--r--Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsproc-support.tex31
-rw-r--r--Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-memoir-support.tex48
-rw-r--r--Master/texmf-dist/tex/latex/keytheorems/keytheorems.sty2396
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex13
-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.cls23
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty19
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty2
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusMono-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-LF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-OsF.fd100
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-Sup.fd28
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TLF.fd112
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TOsF.fd96
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-LF.fd144
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-OsF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-Sup.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TLF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TOsF.fd164
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusMono-TLF.fd59
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-LF.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-OsF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-Sup.fd44
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TLF.fd72
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TOsF.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-LF.fd170
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-OsF.fd174
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-Sup.fd76
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TLF.fd144
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TOsF.fd166
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusMono-TLF.fd59
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-LF.fd102
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-OsF.fd96
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-Sup.fd60
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TLF.fd72
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TOsF.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-LF.fd152
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-OsF.fd114
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-Sup.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TLF.fd166
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TOsF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusMono-TLF.fd59
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-LF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-OsF.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-Sup.fd42
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TLF.fd106
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TOsF.fd88
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-LF.fd158
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-OsF.fd174
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-Sup.fd28
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TLF.fd114
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TOsF.fd174
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusMono-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-LF.fd98
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-OsF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-Sup.fd58
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TLF.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TOsF.fd106
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-LF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-OsF.fd170
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-Sup.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TLF.fd164
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TOsF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusMono-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-LF.fd96
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-OsF.fd108
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-Sup.fd28
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TLF.fd100
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TOsF.fd76
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-LF.fd128
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-OsF.fd170
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-Sup.fd80
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TLF.fd136
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TOsF.fd172
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusMono-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-LF.fd84
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-OsF.fd100
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-Sup.fd28
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TLF.fd108
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TOsF.fd102
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-LF.fd160
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-OsF.fd166
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-Sup.fd64
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TLF.fd170
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TOsF.fd170
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-Sup.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusMono-TLF.fd59
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-LF.fd54
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-OsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TLF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TOsF.fd48
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-LF.fd28
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-OsF.fd82
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TLF.fd64
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TOsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifInitials-TLF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty7
-rw-r--r--Master/texmf-dist/tex/latex/libris/libris.sty69
-rw-r--r--Master/texmf-dist/tex/latex/libris/t1yly.fd33
-rw-r--r--Master/texmf-dist/tex/latex/libris/t1ylyw.fd33
-rw-r--r--Master/texmf-dist/tex/latex/libris/ts1yly.fd33
-rw-r--r--Master/texmf-dist/tex/latex/libris/ts1ylyw.fd33
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-acm.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-bash.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-fortran.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-hansl.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-lua.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-python.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-rexx.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings.sty46
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstdoc.sty6
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang1.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstmisc.sty12
-rw-r--r--Master/texmf-dist/tex/latex/litetable/litetable.cls694
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty29
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty3
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty76
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty13
-rw-r--r--Master/texmf-dist/tex/latex/media9/pdfbase.sty144
-rw-r--r--Master/texmf-dist/tex/latex/minted/minted.sty2720
-rw-r--r--Master/texmf-dist/tex/latex/minted/minted2.sty1285
-rw-r--r--Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls69
-rw-r--r--Master/texmf-dist/tex/latex/mlacls/mla.cls21
-rw-r--r--Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty5
-rw-r--r--Master/texmf-dist/tex/latex/newcomputermodern/newcomputermodern.sty2
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty8
-rw-r--r--Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nfss.sty554
-rw-r--r--Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nnfss.sty721
-rw-r--r--Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty768
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty275
-rw-r--r--Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty255
-rw-r--r--Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty141
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Indication/PanneauRouteC24a.pdfbin0 -> 1345 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB14_80.pdfbin0 -> 2775 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB1j.pdfbin0 -> 1506 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB30_30.pdfbin0 -> 4929 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b1.pdfbin0 -> 1761 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b2.pdfbin0 -> 3914 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b3.pdfbin0 -> 1919 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b4.pdfbin0 -> 1957 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b5.pdfbin0 -> 4093 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB49VL.pdfbin0 -> 4986 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50a.pdfbin0 -> 1642 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50b.pdfbin0 -> 3758 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50c.pdfbin0 -> 1797 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50d.pdfbin0 -> 2031 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50e.pdfbin0 -> 3932 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB51_30.pdfbin0 -> 4867 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB52.pdfbin0 -> 5184 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB53.pdfbin0 -> 5314 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB54.pdfbin0 -> 3128 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB55.pdfbin0 -> 3255 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB56.pdfbin0 -> 2954 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB57.pdfbin0 -> 2892 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB58.pdfbin0 -> 19271 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB59.pdfbin0 -> 11639 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/PanneauxRoute.sty18
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK14.pdfbin0 -> 1651 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK17.pdfbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK2.pdfbin0 -> 1695 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK22.pdfbin0 -> 2921 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK3.pdfbin0 -> 1514 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK30.pdfbin0 -> 3705 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK31.pdfbin0 -> 1903 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK32.pdfbin0 -> 1719 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK4.pdfbin0 -> 2265 bytes
-rw-r--r--Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK5.pdfbin0 -> 2191 bytes
-rw-r--r--Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty91
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def28
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx108
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppluatex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def16
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty5
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex51
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.buildcell.tex23
-rw-r--r--Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty20
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf72
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-croatian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf2
-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.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1901.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1901.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1901.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-AT.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1901.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-CH.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1901.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE-1996.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf-DE.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA-u-sd-canb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf62
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf11
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-classic.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-ecclesia.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la-x-medieval.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf3
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-marathi.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf2
-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.ldf12
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf16
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf12
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf2
-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.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf2
-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.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-welsh.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua6
-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.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua2
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty133
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex3
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex3
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex3
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex17
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex6
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex3
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex147
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex6
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex125
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCible.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex15
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex147
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex5
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex3
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex6
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex54
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex6
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex12
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex10
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex31
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCLego.tex10
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex36
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex8
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex208
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex14
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex50
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex82
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex307
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex19
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex575
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex15
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCRose.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex211
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex10
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex12
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex76
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex12
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex62
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex11
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCThales.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex163
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex7
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex15
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex4
-rw-r--r--Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty41
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty33
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-cup.pdfbin0 -> 2781 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal-flat.pdfbin0 -> 1857 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal.pdfbin0 -> 154573 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-checked.pdfbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-crossed.pdfbin0 -> 1484 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-cup.pdfbin0 -> 2764 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal-flat.pdfbin0 -> 1713 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal.pdfbin0 -> 119155 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-center.pdfbin0 -> 8987 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-left.pdfbin0 -> 8987 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-right.pdfbin0 -> 8988 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse.pdfbin0 -> 8348 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-notok.pdfbin0 -> 3347 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-ok.pdfbin0 -> 3291 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-cup.pdfbin0 -> 2759 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal-flat.pdfbin0 -> 1763 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal.pdfbin0 -> 98514 bytes
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-arithm.tex61
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-cliparts.tex126
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex33
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex1
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-piton.tex23
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex26
-rw-r--r--Master/texmf-dist/tex/latex/proflycee/proflycee-tools-trigo.tex25
-rw-r--r--Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty1569
-rw-r--r--Master/texmf-dist/tex/latex/quizztex/quizztex.sty11
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran-transde.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran-transen.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran-transfa.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran-transfr.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran-translt.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/quran.sty8
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-de.translation.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-en.translation.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-en.transliteration.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-fa.translation.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-fr.translation.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-simple.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-uthmani-min.def4
-rw-r--r--Master/texmf-dist/tex/latex/quran/qurantext-uthmani.def4
-rw-r--r--Master/texmf-dist/tex/latex/randintlist/randintlist.sty246
-rw-r--r--Master/texmf-dist/tex/latex/regulatory/regulatory.sty4
-rw-r--r--Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty28
-rw-r--r--Master/texmf-dist/tex/latex/romande/romande.sty21
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/romande.sty64
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/t1yrd.fd (renamed from Master/texmf-dist/tex/latex/romande/t1yrd.fd)35
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/t1yrda.fd (renamed from Master/texmf-dist/tex/latex/romande/t1yrda.fd)31
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/t1yrdaw.fd (renamed from Master/texmf-dist/tex/latex/romande/t1yrdaw.fd)25
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/t1yrdw.fd (renamed from Master/texmf-dist/tex/latex/romande/t1yrdw.fd)25
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/ts1yrd.fd (renamed from Master/texmf-dist/tex/latex/romande/ts1yrd.fd)31
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/ts1yrda.fd (renamed from Master/texmf-dist/tex/latex/romande/ts1yrda.fd)31
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/ts1yrdaw.fd (renamed from Master/texmf-dist/tex/latex/romande/ts1yrdaw.fd)25
-rw-r--r--Master/texmf-dist/tex/latex/romandeadf/ts1yrdw.fd (renamed from Master/texmf-dist/tex/latex/romande/ts1yrdw.fd)25
-rw-r--r--Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls46
-rw-r--r--Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty190
-rw-r--r--Master/texmf-dist/tex/latex/scrhack/scrhack.sty390
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2colors.sty2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty3
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2packages.sty2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls7
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl2
-rw-r--r--Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls44
-rw-r--r--Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty16
-rw-r--r--Master/texmf-dist/tex/latex/sim-os-menus/sim-os-menus.sty180
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex6354
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex6354
-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.sty7
-rw-r--r--Master/texmf-dist/tex/latex/spelatex/spelatex.sty105
-rw-r--r--Master/texmf-dist/tex/latex/stickstoo/ly1minstickstootext.fd84
-rw-r--r--Master/texmf-dist/tex/latex/stickstoo/ot1minstickstootext.fd84
-rw-r--r--Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty10
-rw-r--r--Master/texmf-dist/tex/latex/stickstoo/t1minstickstootext.fd90
-rw-r--r--Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty1401
-rw-r--r--Master/texmf-dist/tex/latex/tableof/tableof.sty27
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty29
-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.sty94
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def10
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty6
-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.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty349
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tikz3d-fr/tikz3d-fr.sty259
-rw-r--r--Master/texmf-dist/tex/latex/tkz-grapheur/tkz-grapheur.sty417
-rw-r--r--Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-english.cfg.sty8
-rw-r--r--Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty10
-rw-r--r--Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty582
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data4
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls2
-rw-r--r--Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ucph-revy/ucph-revy.cls5
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls19
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls19
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls19
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls2
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls113
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls30
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx50
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvt.fd97
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtajw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtaw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtd.fd82
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtj.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtjw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/t1yvtw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvt.fd97
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtajw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtaw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtd.fd78
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtj.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtjw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis/ts1yvtw.fd86
-rw-r--r--Master/texmf-dist/tex/latex/venturis2/t1yv2.fd84
-rw-r--r--Master/texmf-dist/tex/latex/venturis2/ts1yv2.fd84
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yv1.fd163
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yv1d.fd135
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yv2.fd105
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yv3.fd98
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvo.fd (renamed from Master/texmf-dist/tex/latex/venturisold/t1yvo.fd)27
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvoa.fd (renamed from Master/texmf-dist/tex/latex/venturisold/t1yvoa.fd)27
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvoad.fd46
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvod.fd46
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvt.fd116
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtajw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtaw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtd.fd101
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtj.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtjw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/t1yvtw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yv1.fd163
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yv1d.fd135
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yv2.fd105
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yv3.fd98
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvo.fd (renamed from Master/texmf-dist/tex/latex/venturisold/ts1yvo.fd)27
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvoa.fd (renamed from Master/texmf-dist/tex/latex/venturisold/ts1yvoa.fd)27
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvoad.fd46
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvod.fd46
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvt.fd116
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtajw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtaw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtd.fd97
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtj.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtjw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/ts1yvtw.fd103
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturis.sty164
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturis2.sty121
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturisold.sty78
-rw-r--r--Master/texmf-dist/tex/latex/venturisold/t1yvoad.fd31
-rw-r--r--Master/texmf-dist/tex/latex/venturisold/t1yvod.fd31
-rw-r--r--Master/texmf-dist/tex/latex/venturisold/ts1yvoad.fd31
-rw-r--r--Master/texmf-dist/tex/latex/venturisold/ts1yvod.fd31
-rw-r--r--Master/texmf-dist/tex/latex/venturissans/t1yv1.fd134
-rw-r--r--Master/texmf-dist/tex/latex/venturissans/t1yv1d.fd106
-rw-r--r--Master/texmf-dist/tex/latex/venturissans/ts1yv1.fd134
-rw-r--r--Master/texmf-dist/tex/latex/venturissans/ts1yv1d.fd106
-rw-r--r--Master/texmf-dist/tex/latex/venturissans2/t1yv3.fd79
-rw-r--r--Master/texmf-dist/tex/latex/venturissans2/ts1yv3.fd79
-rw-r--r--Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty194
-rw-r--r--Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty54
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/svgnam.def4
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/x11nam.def4
-rw-r--r--Master/texmf-dist/tex/latex/xcolor/xcolor.sty23
-rw-r--r--Master/texmf-dist/tex/latex/xindex/xindex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/xreview/xreview.sty135
-rw-r--r--Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty433
-rw-r--r--Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty193
-rw-r--r--Master/texmf-dist/tex/latex/zugferd/zugferd.sty1132
1164 files changed, 51344 insertions, 23575 deletions
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls
new file mode 100644
index 00000000000..4a264e00c9d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls
@@ -0,0 +1,3492 @@
+%%
+%% This is file `acmart-tagged.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% acmart.dtx (with options: `class,tagged')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from acmart-tagged.cls.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file acmart.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{acmart-tagged}
+[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery]
+\def\@classname{acmart-tagged}
+\InputIfFileExists{acmart-preload-hook.tex}{%
+ \ClassWarning{\@classname}{%
+ I am loading acmart-preload-hook.tex. You are fully responsible
+ for any problems from now on.}}{}
+\RequirePackage{xkeyval}
+\RequirePackage{xstring}
+\RequirePackage{iftex}
+\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{%
+ manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph,
+ sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{%
+ \ClassError{\@classname}{The option format must be manuscript,
+ acmsmall, acmlarge, acmtog, sigconf, siggraph,
+ sigplan, sigchi or sigchi-a}}
+\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}}
+\@DeclareACMFormat{manuscript}
+\@DeclareACMFormat{acmsmall}
+\@DeclareACMFormat{acmlarge}
+\@DeclareACMFormat{acmtog}
+\@DeclareACMFormat{sigconf}
+\@DeclareACMFormat{siggraph}
+\@DeclareACMFormat{sigplan}
+\@DeclareACMFormat{sigchi}
+\@DeclareACMFormat{sigchi-a}
+\@DeclareACMFormat{acmengage}
+\@DeclareACMFormat{acmcp}
+\ExecuteOptionsX{format}
+\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{%
+ \if@ACM@screen
+ \PackageInfo{\@classname}{Using screen mode}%
+ \else
+ \PackageInfo{\@classname}{Not using screen mode}%
+ \fi}{\PackageError{\@classname}{The option screen can be either true or
+ false}}
+\ExecuteOptionsX{screen=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{%
+ \if@ACM@urlbreakonhyphens
+ \PackageInfo{\@classname}{Using breaking urls on hyphens}%
+ \else
+ \PackageInfo{\@classname}{Not breaking urls on hyphens}%
+ \fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or
+ false}}
+\ExecuteOptionsX{urlbreakonhyphens=true}
+\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{%
+ \if@ACM@acmthm
+ \PackageInfo{\@classname}{Requiring acmthm}%
+ \else
+ \PackageInfo{\@classname}{Suppressing acmthm}%
+ \fi}{\PackageError{\@classname}{The option acmthm can be either true or
+ false}}
+\ExecuteOptionsX{acmthm=true}
+\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{%
+ \if@ACM@review
+ \PackageInfo{\@classname}{Using review mode}%
+ \AtBeginDocument{\@ACM@printfoliostrue}%
+ \else
+ \PackageInfo{\@classname}{Not using review mode}%
+ \fi}{\PackageError{\@classname}{The option review can be either true or
+ false}}
+\ExecuteOptionsX{review=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{%
+ \if@ACM@authorversion
+ \PackageInfo{\@classname}{Using authorversion mode}%
+ \else
+ \PackageInfo{\@classname}{Not using authorversion mode}%
+ \fi}{\PackageError{\@classname}{The option authorversion can be either true or
+ false}}
+\ExecuteOptionsX{authorversion=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{%
+ \if@ACM@nonacm
+ \PackageInfo{\@classname}{Using nonacm mode}%
+ \AtBeginDocument{\@ACM@printacmreffalse}%
+ % in 'nonacm' mode we disable the "ACM Reference Format"
+ % printing by default, but this can be re-enabled by the
+ % user using \settopmatter{printacmref=true}
+ \else
+ \PackageInfo{\@classname}{Not using nonacm mode}%
+ \fi}{\PackageError{\@classname}{The option nonacm can be either true or
+ false}}
+\ExecuteOptionsX{nonacm=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{%
+ \PackageError{\@classname}{The option balance can be either true or
+ false}}
+\ExecuteOptionsX{balance}
+\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{%
+ \PackageError{\@classname}{The option pbalance can be either true or
+ false}}
+\ExecuteOptionsX{pbalance=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{%
+ \if@ACM@natbib
+ \PackageInfo{\@classname}{Explicitly selecting natbib mode}%
+ \else
+ \PackageInfo{\@classname}{Explicitly deselecting natbib mode}%
+ \fi}{\PackageError{\@classname}{The option natbib can be either true or
+ false}}
+\ExecuteOptionsX{natbib=true}
+\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{%
+ \if@ACM@anonymous
+ \PackageInfo{\@classname}{Using anonymous mode}%
+ \else
+ \PackageInfo{\@classname}{Not using anonymous mode}%
+ \fi}{\PackageError{\@classname}{The option anonymous can be either true or
+ false}}
+\ExecuteOptionsX{anonymous=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{%
+ \if@ACM@timestamp
+ \PackageInfo{\@classname}{Using timestamp mode}%
+ \else
+ \PackageInfo{\@classname}{Not using timestamp mode}%
+ \fi}{\PackageError{\@classname}{The option timestamp can be either true or
+ false}}
+\ExecuteOptionsX{timestamp=false}
+\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{%
+ \if@ACM@authordraft
+ \PackageInfo{\@classname}{Using authordraft mode}%
+ \@ACM@timestamptrue
+ \@ACM@reviewtrue
+ \else
+ \PackageInfo{\@classname}{Not using authordraft mode}%
+ \fi}{\PackageError{\@classname}{The option authordraft can be either true or
+ false}}
+\ExecuteOptionsX{authordraft=false}
+\def\ACM@fontsize{}
+\DeclareOptionX{8pt}{\edef\ACM@fontsize{\CurrentOption}}
+\DeclareOptionX{9pt}{\edef\ACM@fontsize{\CurrentOption}}
+\DeclareOptionX{10pt}{\edef\ACM@fontsize{\CurrentOption}}
+\DeclareOptionX{11pt}{\edef\ACM@fontsize{\CurrentOption}}
+\DeclareOptionX{12pt}{\edef\ACM@fontsize{\CurrentOption}}
+\def\ACM@languages{}
+\DeclareOptionX{language}{%
+ \ifx\ACM@languages\@empty
+ \gdef\ACM@languages{english}\fi
+ \g@addto@macro\ACM@languages{, #1}}
+\DeclareOptionX{draft}{\PassOptionsToClass{\CurrentOption}{amsart}}
+\DeclareOptionX{*}{\PassOptionsToClass{\CurrentOption}{amsart}}
+\ProcessOptionsX
+\ClassInfo{\@classname}{Using format \ACM@format, number \ACM@format@nr}
+\newif\if@ACM@manuscript
+\newif\if@ACM@journal
+\newif\if@ACM@journal@bibstrip
+\newif\if@ACM@journal@bibstrip@or@tog
+\newif\if@ACM@sigchiamode
+\newif\if@ACM@engage
+\@ACM@engagefalse
+\newif\if@ACM@acmcp
+\@ACM@acmcpfalse
+\ifnum\ACM@format@nr=5\relax % siggraph
+\ClassWarning{\@classname}{%
+ The format siggraph is now obsolete.\MessageBreak
+ I am switching to sigconf.}
+ \setkeys{\@classname.cls}{format=sigconf}
+\fi
+\ifnum\ACM@format@nr=7\relax % sigchi
+\ClassWarning{\@classname}{%
+ The format sigchi is now obsolete.\MessageBreak
+ I am switching to sigconf.}
+ \setkeys{\@classname.cls}{format=sigconf}
+\fi
+\ifnum\ACM@format@nr=8\relax % sigchi
+\ClassWarning{\@classname}{%
+ ACM SIGCHI has retired the SIGCHI-A template\MessageBreak
+ effective immediately. ACM is keeping this template\MessageBreak
+ option available to authors who are working on legacy\MessageBreak
+ documents only. ACM will not, under any circumstances,\MessageBreak
+ accept documents in this format for publication and\MessageBreak
+ will not offer technical support to the authors who use\MessageBreak
+ this template.\MessageBreak
+ ACM SIGCHI is directing Conference leaders and\MessageBreak
+ authors to publish their articles using the SIGCONF\MessageBreak
+ template call.}
+\fi
+\ifnum\ACM@format@nr=0\relax
+ \@ACM@manuscripttrue
+\else
+ \@ACM@manuscriptfalse
+\fi
+\@ACM@sigchiamodefalse
+\ifcase\ACM@format@nr
+\relax % manuscript
+ \@ACM@journaltrue
+\or % acmsmall
+ \@ACM@journaltrue
+\or % acmlarge
+ \@ACM@journaltrue
+\or % acmtog
+ \@ACM@journaltrue
+ \@ACM@journal@bibstrip@or@togtrue
+\or % sigconf
+ \@ACM@journalfalse
+\or % siggraph
+ \@ACM@journalfalse
+ \or % sigplan
+ \@ACM@journalfalse
+ \or % sigchi
+ \@ACM@journalfalse
+\or % sigchi-a
+ \@ACM@journalfalse
+ \@ACM@sigchiamodetrue
+\or % acmengage
+ \@ACM@journalfalse
+ \@ACM@engagetrue
+\or % acmcp
+ \@ACM@journaltrue
+ \@ACM@acmcptrue
+ \AtBeginDocument{\@ACM@printacmreffalse}%
+\fi
+\if@ACM@journal
+ \@ACM@journal@bibstriptrue
+ \@ACM@journal@bibstrip@or@togtrue
+\else
+ \@ACM@journal@bibstripfalse
+\fi
+\let\@startsection@kernel\@startsection
+\let\@xsect@kernel\@xsect
+\let\@sect@kernel\@sect
+\let\@ssect@kernel\@ssect
+\ifx\ACM@fontsize\@empty
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \def\ACM@fontsize{9pt}%
+ \or % acmsmall
+ \def\ACM@fontsize{10pt}%
+ \or % acmlarge
+ \def\ACM@fontsize{10pt}%
+ \or % acmtog
+ \def\ACM@fontsize{9pt}%
+ \or % sigconf
+ \def\ACM@fontsize{9pt}%
+ \or % siggraph
+ \def\ACM@fontsize{9pt}%
+ \or % sigplan
+ \def\ACM@fontsize{10pt}%
+ \or % sigchi
+ \def\ACM@fontsize{9pt}%
+ \or % sigchi-a
+ \def\ACM@fontsize{10pt}%
+ \or % acmengage
+ \def\ACM@fontsize{10pt}%
+ \or % acmcp
+ \def\ACM@fontsize{9pt}%
+ \fi
+\fi
+\ClassInfo{\@classname}{Using fontsize \ACM@fontsize}
+\LoadClass[\ACM@fontsize, reqno]{amsart}
+\RequirePackage{microtype}
+\RequirePackage{etoolbox}
+\RequirePackage{booktabs}
+\RequirePackage{refcount}
+\RequirePackage{totpages}
+\RequirePackage{environ}
+\if@ACM@manuscript
+\RequirePackage{setspace}
+\onehalfspacing
+\fi
+\RequirePackage{textcase}
+\if@ACM@acmcp
+\RequirePackage{framed}
+\RequirePackage{zref-savepos, zref-user}
+\fi
+\newdimen\@ACM@acmcp@delta
+\@ACM@acmcp@delta=0pt\relax
+\if@ACM@natbib
+ \RequirePackage{natbib}
+ \renewcommand{\bibsection}{%
+ \section*{\refname}%
+ \phantomsection\addcontentsline{toc}{section}{\refname}%
+ }
+ \renewcommand{\bibfont}{\bibliofont}
+ \renewcommand\setcitestyle[1]{
+ \@for\@tempa:=#1\do
+ {\def\@tempb{round}\ifx\@tempa\@tempb
+ \renewcommand\NAT@open{(}\renewcommand\NAT@close{)}\fi
+ \def\@tempb{square}\ifx\@tempa\@tempb
+ \renewcommand\NAT@open{[}\renewcommand\NAT@close{]}\fi
+ \def\@tempb{angle}\ifx\@tempa\@tempb
+ \renewcommand\NAT@open{$<$}\renewcommand\NAT@close{$>$}\fi
+ \def\@tempb{curly}\ifx\@tempa\@tempb
+ \renewcommand\NAT@open{\{}\renewcommand\NAT@close{\}}\fi
+ \def\@tempb{semicolon}\ifx\@tempa\@tempb
+ \renewcommand\NAT@sep{;}\fi
+ \def\@tempb{colon}\ifx\@tempa\@tempb
+ \renewcommand\NAT@sep{;}\fi
+ \def\@tempb{comma}\ifx\@tempa\@tempb
+ \renewcommand\NAT@sep{,}\fi
+ \def\@tempb{authoryear}\ifx\@tempa\@tempb
+ \NAT@numbersfalse\fi
+ \def\@tempb{numbers}\ifx\@tempa\@tempb
+ \NAT@numberstrue\NAT@superfalse\fi
+ \def\@tempb{super}\ifx\@tempa\@tempb
+ \NAT@numberstrue\NAT@supertrue\fi
+ \def\@tempb{nobibstyle}\ifx\@tempa\@tempb
+ \let\bibstyle=\@gobble\fi
+ \def\@tempb{bibstyle}\ifx\@tempa\@tempb
+ \let\bibstyle=\@citestyle\fi
+ \def\@tempb{sort}\ifx\@tempa\@tempb
+ \def\NAT@sort{\@ne}\fi
+ \def\@tempb{nosort}\ifx\@tempa\@tempb
+ \def\NAT@sort{\z@}\fi
+ \def\@tempb{compress}\ifx\@tempa\@tempb
+ \def\NAT@cmprs{\@ne}\fi
+ \def\@tempb{nocompress}\ifx\@tempa\@tempb
+ \def\NAT@cmprs{\z@}\fi
+ \def\@tempb{sort&compress}\ifx\@tempa\@tempb
+ \def\NAT@sort{\@ne}\def\NAT@cmprs{\@ne}\fi
+ \def\@tempb{mcite}\ifx\@tempa\@tempb
+ \let\NAT@merge\@ne\fi
+ \def\@tempb{merge}\ifx\@tempa\@tempb
+ \@ifnum{\NAT@merge<\tw@}{\let\NAT@merge\tw@}{}\fi
+ \def\@tempb{elide}\ifx\@tempa\@tempb
+ \@ifnum{\NAT@merge<\thr@@}{\let\NAT@merge\thr@@}{}\fi
+ \def\@tempb{longnamesfirst}\ifx\@tempa\@tempb
+ \NAT@longnamestrue\fi
+ \def\@tempb{nonamebreak}\ifx\@tempa\@tempb
+ \def\NAT@nmfmt#1{\mbox{\NAT@up#1}}\fi
+ \expandafter\NAT@find@eq\@tempa=\relax\@nil
+ \if\@tempc\relax\else
+ \expandafter\NAT@rem@eq\@tempc
+ \def\@tempb{open}\ifx\@tempa\@tempb
+ \xdef\NAT@open{\@tempc}\fi
+ \def\@tempb{close}\ifx\@tempa\@tempb
+ \xdef\NAT@close{\@tempc}\fi
+ \def\@tempb{aysep}\ifx\@tempa\@tempb
+ \xdef\NAT@aysep{\@tempc}\fi
+ \def\@tempb{yysep}\ifx\@tempa\@tempb
+ \xdef\NAT@yrsep{\@tempc}\fi
+ \def\@tempb{notesep}\ifx\@tempa\@tempb
+ \xdef\NAT@cmt{\@tempc}\fi
+ \def\@tempb{citesep}\ifx\@tempa\@tempb
+ \xdef\NAT@sep{\@tempc}\fi
+ \fi
+ }%
+ \NAT@@setcites
+ }
+ \renewcommand\citestyle[1]{%
+ \ifcsname bibstyle@#1\endcsname%
+ \csname bibstyle@#1\endcsname\let\bibstyle\@gobble%
+ \else%
+ \@latex@error{Undefined `#1' citestyle}%
+ \fi
+ }%
+\fi
+\newcommand{\bibstyle@acmauthoryear}{%
+ \setcitestyle{%
+ authoryear,%
+ open={[},close={]},citesep={;},%
+ aysep={},yysep={,},%
+ notesep={, }}}
+\newcommand{\bibstyle@acmnumeric}{%
+ \setcitestyle{%
+ numbers,sort&compress,%
+ open={[},close={]},citesep={,},%
+ notesep={, }}}
+\if@ACM@natbib
+\citestyle{acmnumeric}
+\fi
+\if@ACM@journal
+ \renewcommand\keywordsname{Additional Key Words and Phrases}%
+\else
+ \renewcommand\keywordsname{Keywords}%
+\fi
+\if@ACM@engage
+ \renewcommand\abstractname{Synopsis}%
+\fi
+\ifx\ACM@languages\@empty
+\else
+ \RequirePackage[\ACM@languages]{babel}%
+ \addto\captionsenglish{%
+ \if@ACM@journal
+ \renewcommand\keywordsname{Additional Key Words and Phrases}%
+ \else
+ \renewcommand\keywordsname{Keywords}%
+ \fi
+ \renewcommand\acksname{Acknowledgements}%
+ \if@ACM@engage
+ \renewcommand\abstractname{Synopsis}%
+ \fi
+ }%
+ \addto\captionsfrench{%
+ \if@ACM@journal
+ \renewcommand\keywordsname{Mots Clés et Phrases Supplémentaires}%
+ \else
+ \renewcommand\keywordsname{Mots clés}%
+ \fi
+ \renewcommand\acksname{Remerciements}%
+ }%
+ \addto\captionsgerman{%
+ \if@ACM@journal
+ \renewcommand\keywordsname{Zusätzliche Schlagwörter und Phrasen}%
+ \else
+ \renewcommand\keywordsname{Schlagwörter}%
+ \fi
+ \renewcommand\acksname{Danksagungen}%
+ }%
+ \addto\captionsspanish{%
+ \if@ACM@journal
+ \renewcommand\keywordsname{Palabras y Frases Claves Adicionales}%
+ \else
+ \renewcommand\keywordsname{Palabras claves}%
+ \fi
+ \renewcommand\acksname{Expresiones de gratitud}%
+ }%
+\fi
+\newcommand\ACM@lang@check[1]{%
+ \ifx\ACM@languages\@empty\relax
+ \ClassError{\@classname}{%
+ Command \string#1 \MessageBreak is used in monlingual document}{%
+ You used a command (\string#1) \MessageBreak
+ that does not have a meaning \MessageBreak
+ unless are languages are defined. \MessageBreak
+ Please choose the languages in \string\documentclass
+ \MessageBreak
+ (e.g. \string\documentclass[languages={french, english}]{acmart}),
+ \MessageBreak
+ or delete the command.}%
+ \fi}
+\def\@translatedtitle{}
+\newcommand\translatedtitle[2]{\ACM@lang@check{\translatedtitle}%
+\g@addto@macro\@translatedtitle{\par\foreignlanguage{#1}{#2}}}
+\def\@translatedsubtitle{}
+\newcommand\translatedsubtitle[2]{\ACM@lang@check{\translatedsubtitle}%
+\g@addto@macro\@translatedsubtitle{\par\foreignlanguage{#1}{#2}}}
+\def\@translatedkeywords{}
+\newcommand\translatedkeywords[2]{\ACM@lang@check{\translatedkeywords}%
+\g@addto@macro\@translatedkeywords{\@mktranslatedkeywords{#1}{#2}}}
+\def\@translatedabstracts{}
+\newenvironment{translatedabstract}[1]{\Collect@Body
+ \@savetranslatedabstract\@mktranslatedabstract{#1}}{}
+\long\def\@savetranslatedabstract#1{\if@ACM@maketitle@typeset
+ \ClassError{\@classname}{Abstract must be defined before maketitle
+ command. Please move it!}\fi
+ \ACM@lang@check{translatedabstract}%
+ \g@addto@macro\@translatedabstracts{\bgroup#1\egroup}}
+\let\@startsection\@startsection@kernel
+\let\@sect\@sect@kernel
+\let\@ssect\@ssect@kernel
+\let\@xsect\@xsect@kernel
+\def\@seccntformat#1{\csname the#1\endcsname\quad}
+\def\@starttoc#1#2{\begingroup\makeatletter
+ \setTrue{#1}%
+ \par\removelastskip\vskip\z@skip
+ \@startsection{section}\@M\z@{\linespacing\@plus\linespacing}%
+ {.5\linespacing}{\centering\contentsnamefont}{#2}%
+\@starttoc@cfgpoint@before{#1}%NEW<<<<<<<<<< (name will change)
+ \@input{\jobname.#1}%
+\@starttoc@cfgpoint@after{#1}%NEW<<<<<<<<<<<< (name will change)
+ \if@filesw
+ \@xp\newwrite\csname tf@#1\endcsname
+ \immediate\@xp\openout\csname tf@#1\endcsname \jobname.#1\relax
+ \fi
+ \global\@nobreakfalse \endgroup
+ \addvspace{32\p@\@plus14\p@}%
+}
+\def\l@section{\@tocline{1}{0pt}{1pc}{2pc}{}}
+\def\l@subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
+\def\l@subsubsection{\@tocline{3}{0pt}{1pc}{5pc}{}}
+\def\@makefntext{\noindent\@makefnmark}
+\if@ACM@sigchiamode
+\long\def\@footnotetext#1{\marginpar{%
+ \reset@font\small
+ \interlinepenalty\interfootnotelinepenalty
+ \protected@edef\@currentlabel{%
+ \csname p@footnote\endcsname\@thefnmark
+ }%
+ \color@begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color@endgroup}}%
+\fi
+\long\def\@mpfootnotetext#1{%
+ \global\setbox\@mpfootins\vbox{%
+ \unvbox\@mpfootins
+ \reset@font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected@edef\@currentlabel
+ {\csname p@mpfootnote\endcsname\@thefnmark}%
+ \color@begingroup\centering
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color@endgroup}}
+\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
+\let\@footnotemark@nolink\@footnotemark
+\let\@footnotetext@nolink\@footnotetext
+\RequirePackage[bookmarksnumbered,unicode]{hyperref}
+\RequirePackage{hyperxmp}
+\pdfstringdefDisableCommands{%
+ \def\addtocounter#1#2{}%
+ \def\unskip{}%
+ \def\textbullet{- }%
+ \def\textrightarrow{ -> }%
+ \def\footnotemark{}%
+}
+\urlstyle{rm}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+ \urlstyle{sf}
+\or % sigchi
+\or % sigchi-a
+ \urlstyle{sf}
+\or % acmengage
+\or % acmcp
+\fi
+\AtEndPreamble{%
+ \if@ACM@urlbreakonhyphens
+ \def\do@url@hyp{\do\-}%
+ \fi
+ \if@ACM@screen
+ \hypersetup{colorlinks,
+ linkcolor=ACMPurple,
+ citecolor=ACMPurple,
+ urlcolor=ACMDarkBlue,
+ filecolor=ACMDarkBlue}
+ \else
+ \hypersetup{hidelinks}
+ \fi
+ \hypersetup{pdflang={en},
+ pdfdisplaydoctitle}}
+\if@ACM@natbib
+ \let\citeN\cite
+ \let\cite\citep
+ \let\citeANP\citeauthor
+ \let\citeNN\citeyearpar
+ \let\citeyearNP\citeyear
+ \let\citeNP\citealt
+ \DeclareRobustCommand\citeA
+ {\begingroup\NAT@swafalse
+ \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}%
+ \providecommand\newblock{}%
+\else
+ \AtBeginDocument{%
+ \let\shortcite\cite%
+ \providecommand\citename[1]{#1}}
+\fi
+\newcommand\shortcite[2][]{%
+ \ifNAT@numbers\cite[#1]{#2}\else\citeyearpar[#1]{#2}\fi}
+\def\bibliographystyle#1{%
+ \ifx\@begindocumenthook\@undefined\else
+ \expandafter\AtBeginDocument
+ \fi
+ {\if@filesw
+ \immediate\write\@auxout{\string\bibstyle{#1}}%
+ \fi}}
+\RequirePackage{graphicx}
+\RequirePackage[prologue]{xcolor}
+\definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
+\definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
+\definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01}
+\definecolor[named]{ACMRed}{cmyk}{0,0.90,0.86,0}
+\definecolor[named]{ACMLightBlue}{cmyk}{0.49,0.01,0,0}
+\definecolor[named]{ACMGreen}{cmyk}{0.20,0,1,0.19}
+\definecolor[named]{ACMPurple}{cmyk}{0.55,1,0,0.15}
+\definecolor[named]{ACMDarkBlue}{cmyk}{1,0.58,0,0.21}
+\if@ACM@authordraft
+ \RequirePackage{draftwatermark}
+ \SetWatermarkFontSize{0.5in}
+ \SetWatermarkColor[gray]{.9}
+ \SetWatermarkText{\parbox{12em}{\centering
+ Unpublished working draft.\\
+ Not for distribution.}}
+\else
+ \if@ACM@sigchiamode
+ \if@ACM@nonacm\else
+ \RequirePackage{draftwatermark}
+ \SetWatermarkFontSize{0.5in}
+ \SetWatermarkColor[gray]{.9}
+ \SetWatermarkText{\parbox{12em}{\centering
+ Legacy document. \\
+ Not for publication in an ACM venue}}
+ \fi
+ \fi
+\fi
+\RequirePackage{geometry}
+\ifcase\ACM@format@nr
+\relax % manuscript
+ \geometry{letterpaper,head=13pt,
+ marginparwidth=6pc,heightrounded}%
+\or % acmsmall
+ \geometry{twoside=true,
+ includeheadfoot, head=13pt, foot=2pc,
+ paperwidth=6.75in, paperheight=10in,
+ top=58pt, bottom=44pt, inner=46pt, outer=46pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % acmlarge
+ \geometry{twoside=true, head=13pt, foot=2pc,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot,
+ top=78pt, bottom=114pt, inner=81pt, outer=81pt,
+ marginparwidth=4pc,heightrounded
+ }%
+\or % acmtog
+ \geometry{twoside=true, head=13pt, foot=2pc,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot, columnsep=24pt,
+ top=52pt, bottom=75pt, inner=52pt, outer=52pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % sigconf
+ \geometry{twoside=true, head=13pt,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot, columnsep=2pc,
+ top=57pt, bottom=73pt, inner=54pt, outer=54pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % siggraph
+ \geometry{twoside=true, head=13pt,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot, columnsep=2pc,
+ top=57pt, bottom=73pt, inner=54pt, outer=54pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % sigplan
+ \geometry{twoside=true, head=13pt,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot=false, columnsep=2pc,
+ top=1in, bottom=1in, inner=0.75in, outer=0.75in,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % sigchi
+ \geometry{twoside=true, head=13pt,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot, columnsep=2pc,
+ top=66pt, bottom=73pt, inner=54pt, outer=54pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % sigchi-a
+ \geometry{twoside=false, head=13pt,
+ paperwidth=11in, paperheight=8.5in,
+ includeheadfoot, marginparsep=72pt,
+ marginparwidth=170pt, columnsep=20pt,
+ top=72pt, bottom=72pt, left=314pt, right=72pt
+ }%
+ \@mparswitchfalse
+ \reversemarginpar
+\or % acmengage
+ \geometry{twoside=true, head=13pt,
+ paperwidth=8.5in, paperheight=11in,
+ includeheadfoot, columnsep=2pc,
+ top=57pt, bottom=73pt, inner=54pt, outer=54pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\or % acmcp
+ \geometry{twoside=true,
+ includeheadfoot, head=13pt, foot=2pc,
+ paperwidth=6.75in, paperheight=10in,
+ top=58pt, bottom=44pt, inner=46pt, outer=46pt,
+ marginparwidth=2pc,heightrounded
+ }%
+\fi
+\setlength\parindent{10\p@}
+\setlength\parskip{\z@}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+ \setlength\parindent{9\p@}%
+\or % sigconf
+\or % siggraph
+\or % sigplan
+\or % sigchi
+\or % sigchi-a
+\or % acmengage
+\or % acmcp
+\fi
+\setlength\normalparindent{\parindent}
+\def\copyrightpermissionfootnoterule{\kern-3\p@
+ \hrule \@width \columnwidth \kern 2.6\p@}
+\RequirePackage{manyfoot}
+\SelectFootnoteRule[2]{copyrightpermission}
+\DeclareNewFootnote{authorsaddresses}
+\SelectFootnoteRule[2]{copyrightpermission}
+\DeclareNewFootnote{copyrightpermission}
+\def\footnoterule{\kern-3\p@
+ \hrule \@width 4pc \kern 2.6\p@}
+\def\endminipage{%
+ \par
+ \unskip
+ \ifvoid\@mpfootins\else
+ \vskip\skip\@mpfootins
+ \normalcolor
+ \unvbox\@mpfootins
+ \fi
+ \@minipagefalse
+ \color@endgroup
+ \egroup
+ \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
+\def\@textbottom{\vskip \z@ \@plus 1pt}
+\let\@texttop\relax
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+ \flushbottom
+\or % sigconf
+ \flushbottom
+\or % siggraph
+ \flushbottom
+\or % sigplan
+ \flushbottom
+\or % sigchi
+ \flushbottom
+\or % sigchi-a
+\or % acmengage
+ \flushbottom
+\or % acmcp
+ \flushbottom
+\fi
+\ifPDFTeX
+\input{glyphtounicode}
+\pdfglyphtounicode{f_f}{FB00}
+\pdfglyphtounicode{f_f_i}{FB03}
+\pdfglyphtounicode{f_f_l}{FB04}
+\pdfglyphtounicode{f_i}{FB01}
+\pdfglyphtounicode{t_t}{0074 0074}
+\pdfglyphtounicode{f_t}{0066 0074}
+\pdfglyphtounicode{T_h}{0054 0068}
+\pdfgentounicode=1
+\RequirePackage{cmap}
+\fi
+\newif\if@ACM@newfonts
+\@ACM@newfontstrue
+\IfFileExists{libertine.sty}{}{\ClassWarning{\@classname}{You do not
+ have the libertine package installed. Please upgrade your
+ TeX}\@ACM@newfontsfalse}
+\IfFileExists{zi4.sty}{}{\ClassWarning{\@classname}{You do not
+ have the inconsolata (zi4.sty) package installed. Please upgrade your
+ TeX}\@ACM@newfontsfalse}
+\IfFileExists{newtxmath.sty}{}{\ClassWarning{\@classname}{You do not
+ have the newtxmath package installed. Please upgrade your
+ TeX}\@ACM@newfontsfalse}
+\if@ACM@newfonts
+ \RequirePackage[T1]{fontenc}
+ % Note that the order in which packages are loaded matters,
+ % and the correct order depends on the LaTeX engine used.
+ % See https://github.com/borisveytsman/acmart/issues/402
+ % and https://github.com/borisveytsman/acmart/issues/410
+ \ifxetex
+ \RequirePackage[libertine]{newtxmath}
+ \RequirePackage[tt=false]{libertine}
+ \setmonofont[StylisticSet=3]{inconsolata}
+ \else
+ \ifluatex
+ \RequirePackage[libertine]{newtxmath}
+ \RequirePackage[tt=false]{libertine}
+ \setmonofont[StylisticSet=3]{inconsolata}
+ \else
+ \RequirePackage[tt=false, type1=true]{libertine}
+ \RequirePackage[varqu]{zi4}
+ \RequirePackage[libertine]{newtxmath}
+ \fi
+ \fi
+\fi
+\let\liningnums\@undefined
+\AtEndPreamble{%
+ \DeclareTextFontCommand{\liningnums}{\libertineLF}}
+\if@ACM@sigchiamode
+ \renewcommand{\familydefault}{\sfdefault}
+\fi
+\newif\if@Description@present
+\@Description@presenttrue
+\newif\if@undescribed@images
+\@undescribed@imagesfalse
+\newcommand\Description[2][]{\global\@Description@presenttrue\ignorespaces}
+\AtEndDocument{\if@undescribed@images
+ \ClassWarningNoLine{\@classname}{Some images may lack descriptions}\fi}
+\AtBeginEnvironment{figure}{\@Description@presentfalse
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{figure*}{\@Description@presentfalse
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtEndEnvironment{figure}{\if@Description@present\else
+ \global\@undescribed@imagestrue
+ \ClassWarning{\@classname}{A possible image without description}\fi}
+\AtEndEnvironment{figure*}{\if@Description@present\else
+ \global\@undescribed@imagestrue
+ \ClassWarning{\@classname}{A possible image without description}\fi}
+\AtBeginEnvironment{table}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{table*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{algorithm}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{algorithm*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{lstlisting}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{lstlisting*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{minted}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{minted*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{listing}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{listing*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+
+\RequirePackage{caption, float}
+\captionsetup[table]{position=top}
+\if@ACM@journal
+ \captionsetup{labelfont={sf, small},
+ textfont={sf, small}, margin=\z@}
+ \captionsetup[figure]{name={Fig.}}
+\else
+ \captionsetup{labelfont={bf},
+ textfont={bf}, labelsep=colon, margin=\z@}
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \or % acmsmall
+ \or % acmlarge
+ \or % acmtog
+ \or % sigconf
+ \or % siggraph
+ \captionsetup{textfont={it}}
+ \or % sigplan
+ \captionsetup{labelfont={bf},
+ textfont={normalfont}, labelsep=period, margin=\z@}
+ \or % sigchi
+ \captionsetup[figure]{labelfont={bf, small},
+ textfont={bf, small}}
+ \captionsetup[table]{labelfont={bf, small},
+ textfont={bf, small}}
+ \or % sigchi-a
+ \captionsetup[figure]{labelfont={bf, small},
+ textfont={bf, small}}
+ \captionsetup[table]{labelfont={bf, small},
+ textfont={bf, small}}
+ \or % acmengage
+ \or % acmcp
+ \fi
+\fi
+\newfloat{sidebar}{}{sbar}
+\floatname{sidebar}{Sidebar}
+\renewenvironment{sidebar}{\Collect@Body\@sidebar}{}
+\long\def\@sidebar#1{\bgroup\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig\captionsetup{type=sidebar}%
+ \marginpar{\small#1}\egroup}
+\newenvironment{marginfigure}{\Collect@Body\@marginfigure}{}
+\long\def\@marginfigure#1{\bgroup
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
+ \captionsetup{type=figure}%
+ \marginpar{\@Description@presentfalse\centering
+ \small#1\if@Description@present\else
+ \global\@undescribed@imagestrue
+ \ClassWarning{\@classname}{A possible image without description}
+ \fi}%
+ \egroup}
+\newenvironment{margintable}{\Collect@Body\@margintable}{}
+\long\def\@margintable#1{\bgroup\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig\captionsetup{type=table}%
+ \marginpar{\centering\small#1}\egroup}
+\newdimen\fulltextwidth
+\fulltextwidth=\dimexpr(\textwidth+\marginparwidth+\marginparsep)
+\if@ACM@sigchiamode
+\def\@dblfloat{\bgroup\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig\columnwidth=\fulltextwidth
+ \let\@endfloatbox\@endwidefloatbox
+ \def\@fpsadddefault{\def\@fps{tp}}%
+ \@float}
+\fi
+\if@ACM@sigchiamode
+\def\end@dblfloat{%
+ \end@float\egroup}
+\fi
+\def\@endwidefloatbox{%
+ \par\vskip\z@skip
+ \@minipagefalse
+ \outer@nobreak
+ \egroup
+ \color@endbox
+ \global\setbox\@currbox=\vbox{\moveleft
+ \dimexpr(\fulltextwidth-\textwidth)\box\@currbox}%
+ \wd\@currbox=\textwidth
+}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+\def\labelenumi{\theenumi.}
+\def\labelenumii{\theenumii.}
+\def\labelenumiii{\theenumiii.}
+\def\labelenumiv{\theenumiv.}
+\or % sigchi
+\or % sigchi-a
+\or % acmengage
+\or % acmcp
+\fi
+\newdimen\@ACM@labelwidth
+\AtBeginDocument{%
+ \setlength\labelsep{4pt}
+ \setlength{\@ACM@labelwidth}{6.5pt}
+
+ %% First-level list: when beginning after the first line of an
+ %% indented paragraph or ending before an indented paragraph, labels
+ %% should not hang to the left of the preceding/following text.
+ \setlength\leftmargini{\z@}
+ \addtolength\leftmargini{\parindent}
+ \addtolength\leftmargini{2\labelsep}
+ \addtolength\leftmargini{\@ACM@labelwidth}
+
+ %% Second-level and higher lists.
+ \setlength\leftmarginii{\z@}
+ \addtolength\leftmarginii{0.5\labelsep}
+ \addtolength\leftmarginii{\@ACM@labelwidth}
+ \setlength\leftmarginiii{\leftmarginii}
+ \setlength\leftmarginiv{\leftmarginiii}
+ \setlength\leftmarginv{\leftmarginiv}
+ \setlength\leftmarginvi{\leftmarginv}
+ \@listi}
+\newskip\listisep
+\listisep\smallskipamount
+\def\@listI{\leftmargin\leftmargini
+ \labelwidth\leftmargini \advance\labelwidth-\labelsep
+ \listparindent\z@
+ \topsep\listisep}
+\let\@listi\@listI
+\def\@listii{\leftmargin\leftmarginii
+ \labelwidth\leftmarginii \advance\labelwidth-\labelsep
+ \topsep\z@skip}
+\def\@listiii{\leftmargin\leftmarginiii
+ \labelwidth\leftmarginiii \advance\labelwidth-\labelsep}
+\def\@listiv{\leftmargin\leftmarginiv
+ \labelwidth\leftmarginiv \advance\labelwidth-\labelsep}
+\def\@listv{\leftmargin\leftmarginv
+ \labelwidth\leftmarginv \advance\labelwidth-\labelsep}
+\def\@listvi{\leftmargin\leftmarginvi
+ \labelwidth\leftmarginvi \advance\labelwidth-\labelsep}
+\renewcommand{\descriptionlabel}[1]{\upshape\bfseries #1}
+\renewenvironment{description}{\list{}{%
+ \labelwidth\@ACM@labelwidth
+ \let\makelabel\descriptionlabel}%
+}{
+ \endlist
+}
+\let\enddescription=\endlist % for efficiency
+\newif\if@ACM@maketitle@typeset
+\@ACM@maketitle@typesetfalse
+\define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
+ ACMJCSS,%
+ CIE,%
+ CSUR,%
+ DGOV,%
+ DLT,%
+ DTRAP,%
+ FAC,%
+ GAMES,%
+ HEALTH,%
+ IMWUT,%
+ JACM,%
+ JATS,%
+ JDIQ,%
+ JDS,%
+ JEA,%
+ JERIC,%
+ JETC,%
+ JOCCH,%
+ JRC,%
+ PACMCGIT,%
+ PACMHCI,%
+ PACMMOD,%
+ PACMNET,%
+ PACMPL,%
+ PACMSE,%
+ POMACS,%
+ TAAS,%
+ TACCESS,%
+ TACO,%
+ TALG,%
+ TALLIP,%
+ TAP,%
+ TCPS,%
+ TDS,%
+ TEAC,%
+ TECS,%
+ TELO,%
+ THRI,%
+ TIIS,%
+ TIOT,%
+ TISSEC,%
+ TIST,%
+ TKDD,%
+ TMIS,%
+ TOCE,%
+ TOCHI,%
+ TOCL,%
+ TOCS,%
+ TOCT,%
+ TODAES,%
+ TODS,%
+ TOG,%
+ TOIS,%
+ TOIT,%
+ TOMACS,%
+ TOMM,%
+ TOMPECS,%
+ TOMS,%
+ TOPC,%
+ TOPLAS,%
+ TOPML,%
+ TOPS,%
+ TORS,%
+ TOS,%
+ TOSEM,%
+ TOSN,%
+ TQC,%
+ TRETS,%
+ TSAS,%
+ TSC,%
+ TSLP,%
+ TWEB,%
+ FACMP%
+}{%
+\ifcase\@journalCode@nr
+\relax % ACMJCSS
+ \def\@journalName{ACM Journal on Computing and Sustainable Societies}%
+ \def\@journalNameShort{ACM J. Comput. Sustain. Soc.}%
+ \def\@permissionCodeOne{2834-5533}%
+ \def\@permissionCodeTwo{2834-5533}%
+\or % CIE
+ \def\@journalName{ACM Computers in Entertainment}%
+ \def\@journalNameShort{ACM Comput. Entertain.}%
+ \def\@permissionCodeOne{1544-3574}%
+\or % CSUR
+ \def\@journalName{ACM Computing Surveys}%
+ \def\@journalNameShort{ACM Comput. Surv.}%
+ \def\@permissionCodeOne{0360-0300}%
+ \def\@permissionCodeTwo{1557-7341}%
+\or % DGOV
+ \def\@journalName{Digital Government: Research and Practice}%
+ \def\@journalNameShort{Digit. Gov. Res. Pract.}%
+ \def\@permissionCodeOne{2639-0175}%
+ \def\@permissionCodeTwo{2639-0175}%
+\or % DLT
+ \def\@journalName{Distributed Ledger Technologies: Research and Practice}%
+ \def\@journalNameShort{Distrib. Ledger Technol.}%
+ \def\@permissionCodeOne{2769-6472}%
+ \def\@permissionCodeTwo{2769-6480}%
+\or % DTRAP
+ \def\@journalName{Digital Threats: Research and Practice}%
+ \def\@journalNameShort{Digit. Threat. Res. Pract.}%
+ \def\@permissionCodeOne{2576-5337}%
+ \def\@permissionCodeTwo{2576-5337}%
+\or % FAC
+ \def\@journalName{Formal Aspects of Computing}%
+ \def\@journalNameShort{Form. Asp. Comput.}%
+ \def\@permissionCodeOne{0934-5043}%
+ \def\@permissionCodeTwo{1433-299X}%
+\or % GAMES
+ \def\@journalName{ACM Games: Research and Practice}%
+ \def\@journalNameShort{ACM Games}%
+ \def\@permissionCodeOne{2832-5516}%
+ \def\@permissionCodeTwo{2832-5516}%
+\or % HEALTH
+ \def\@journalName{ACM Transactions on Computing for Healthcare}%
+ \def\@journalNameShort{ACM Trans. Comput. Healthcare}%
+ \def\@permissionCodeOne{2637-8051}%
+ \def\@permissionCodeTwo{2637-8051}%
+\or % IMWUT
+ \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
+ Wearable and Ubiquitous Technologies}%
+ \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}%
+ \def\@permissionCodeOne{2474-9567}%
+ \def\@permissionCodeTwo{2474-9567}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % JACM
+ \def\@journalName{Journal of the ACM}%
+ \def\@journalNameShort{J. ACM}%
+ \def\@permissionCodeOne{0004-5411}%
+ \def\@permissionCodeTwo{1557-735X}%
+\or % JATS
+ \def\@journalName{Journal on Autonomous Transportation Systems}%
+ \def\@journalNameShort{ACM J. Auton. Transport. Syst.}%
+ \def\@permissionCodeOne{2833-0528}%
+ \def\@permissionCodeTwo{2833-0528}%
+\or % JDIQ
+ \def\@journalName{ACM Journal of Data and Information Quality}%
+ \def\@journalNameShort{ACM J. Data Inform. Quality}%
+ \def\@permissionCodeOne{1936-1955}%
+ \def\@permissionCodeTwo{1936-1963}%
+\or % JDS
+ \def\@journalName{ACM/IMS Journal of Data Science}%
+ \def\@journalNameShort{ACM/IMS J. Data Sci.}%
+ \def\@permissionCodeOne{2831-3194}%
+ \def\@permissionCodeTwo{2831-3194}%
+\or % JEA
+ \def\@journalName{ACM Journal of Experimental Algorithmics}%
+ \def\@journalNameShort{ACM J. Exp. Algor.}%
+ \def\@permissionCodeOne{1084-6654}%
+ \def\@permissionCodeTwo{1084-6654}%
+\or % JERIC
+ \def\@journalName{ACM Journal of Educational Resources in Computing}%
+ \def\@journalNameShort{ACM J. Edu. Resources in Comput.}%
+ \def\@permissionCodeOne{1073-0516}%
+\or % JETC
+ \def\@journalName{ACM Journal on Emerging Technologies in Computing Systems}%
+ \def\@journalNameShort{ACM J. Emerg. Technol. Comput. Syst.}%
+ \def\@permissionCodeOne{1550-4832}%
+ \def\@permissionCodeTwo{1550-4840}%
+\or % JOCCH
+ \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
+ \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
+ \def\@permissionCodeOne{1556-4673}%
+ \def\@permissionCodeTwo{1556-4711}%
+\or % JRC
+ \def\@journalName{ACM Journal on Responsible Computing}%
+ \def\@journalNameShort{ACM J. Responsib. Comput.}%
+ \def\@permissionCodeOne{2832-0565}%
+ \def\@permissionCodeTwo{2832-0565}%
+\or % PACMCGIT
+ \def\@journalName{Proceedings of the ACM on Computer Graphics and Interactive Techniques}%
+ \def\@journalNameShort{Proc. ACM Comput. Graph. Interact. Tech.}%
+ \def\@permissionCodeOne{2577-6193}%
+ \def\@permissionCodeTwo{2577-6193}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % PACMHCI
+ \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
+ \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
+ \def\@permissionCodeOne{2573-0142}%
+ \def\@permissionCodeTwo{2573-0142}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % PACMMOD
+ \def\@journalName{Proceedings of the ACM on Management of Data}%
+ \def\@journalNameShort{Proc. ACM Manag. Data}%
+ \def\@permissionCodeOne{2836-6573}%
+ \def\@permissionCodeTwo{2836-6573}%
+\or % PACMNET
+ \def\@journalName{Proceedings of the ACM on Networkng}%
+ \def\@journalNameShort{Proc. ACM Netw.}%
+ \def\@permissionCodeOne{2834-5509}%
+ \def\@permissionCodeTwo{2834-5509}%
+\or % PACMPL
+ \def\@journalName{Proceedings of the ACM on Programming Languages}%
+ \def\@journalNameShort{Proc. ACM Program. Lang.}%
+ \def\@permissionCodeOne{2475-1421}%
+ \def\@permissionCodeTwo{2475-1421}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % PACMSE
+ \def\@journalName{Proceedings of the ACM on Software Engineering}%
+ \def\@journalNameShort{Proc. ACM Softw. Eng.}%
+ \def\@permissionCodeOne{2994-970X}%
+ \def\@permissionCodeTwo{2994-970X}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % POMACS
+ \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}%
+ \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}%
+ \def\@permissionCodeOne{2476-1249}%
+ \def\@permissionCodeTwo{2476-1249}%
+ \@ACM@screentrue
+ \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
+\or % TAAS
+ \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}%
+ \def\@journalNameShort{ACM Trans. Autonom. Adapt. Syst.}%
+ \def\@permissionCodeOne{1556-4665}%
+ \def\@permissionCodeTwo{1556-4703}%
+\or % TACCESS
+ \def\@journalName{ACM Transactions on Accessible Computing}%
+ \def\@journalNameShort{ACM Trans. Access. Comput.}%
+ \def\@permissionCodeOne{1936-7228}%
+ \def\@permissionCodeTwo{1936-7236}%
+\or % TACO
+ \def\@journalName{ACM Transactions on Architecture and Code Optimization}%
+ \def\@journalNameShort{ACM Trans. Arch. Code Optim.}%
+ \def\@permissionCodeOne{1544-3566}%
+ \def\@permissionCodeTwo{1544-3973}%
+\or % TALG
+ \def\@journalName{ACM Transactions on Algorithms}%
+ \def\@journalNameShort{ACM Trans. Algor.}%
+ \def\@permissionCodeOne{1549-6325}%
+ \def\@permissionCodeTwo{1549-6333}%
+\or % TALLIP
+ \def\@journalName{ACM Transactions on Asian and Low-Resource Language Information Processing}%
+ \def\@journalNameShort{ACM Trans. Asian Low-Resour. Lang. Inf. Process.}%
+ \def\@permissionCodeOne{2375-4699}%
+ \def\@permissionCodeTwo{2375-4702}%
+\or % TAP
+ \def\@journalName{ACM Transactions on Applied Perception}%
+ \def\@journalNameShort{ACM Trans. Appl. Percept.}%
+ \def\@permissionCodeOne{1544-3558}%
+ \def\@permissionCodeTwo{1544-3965}%
+\or % TCPS
+ \def\@journalName{ACM Transactions on Cyber-Physical Systems}%
+ \def\@journalNameShort{ACM Trans. Cyber-Phys. Syst.}%
+ \def\@permissionCodeOne{2378-962X}%
+ \def\@permissionCodeTwo{2378-9638}%
+\or % TDS
+ \def\@journalName{ACM/IMS Transactions on Data Science}%
+ \def\@journalNameShort{ACM/IMS Trans. Data Sci.}%
+ \def\@permissionCodeOne{2577-3224}%
+\or % TEAC
+ \def\@journalName{ACM Transactions on Economics and Computation}%
+ \def\@journalNameShort{ACM Trans. Econ. Comput.}%
+ \def\@permissionCodeOne{2167-8375}%
+ \def\@permissionCodeTwo{2167-8383}%
+\or % TECS
+ \def\@journalName{ACM Transactions on Embedded Computing Systems}%
+ \def\@journalNameShort{ACM Trans. Embedd. Comput. Syst.}%
+ \def\@permissionCodeOne{1539-9087}%
+ \def\@permissionCodeTwo{1558-3465}%
+\or % TELO
+ \def\@journalName{ACM Transactions on Evolutionary Learning and Optimization}%
+ \def\@journalNameShort{ACM Trans. Evol. Learn. Optim.}%
+ \def\@permissionCodeOne{2688-299X}%
+ \def\@permissionCodeTwo{2688-3007}%
+\or % THRI
+ \def\@journalName{ACM Transactions on Human-Robot Interaction}%
+ \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}%
+ \def\@permissionCodeOne{2573-9522}%
+ \def\@permissionCodeTwo{2573-9522}%
+\or % TIIS
+ \def\@journalName{ACM Transactions on Interactive Intelligent Systems}%
+ \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}%
+ \def\@permissionCodeOne{2160-6455}%
+ \def\@permissionCodeTwo{2160-6463}%
+\or % TIOT
+ \def\@journalName{ACM Transactions on Internet of Things}%
+ \def\@journalNameShort{ACM Trans. Internet Things}%
+ \def\@permissionCodeOne{2577-6207}%
+ \def\@permissionCodeTwo{2577-6207}%
+\or % TISSEC
+ \def\@journalName{ACM Transactions on Information and System Security}%
+ \def\@journalNameShort{ACM Trans. Info. Syst. Sec.}%
+ \def\@permissionCodeOne{1094-9224}%
+\or % TIST
+ \def\@journalName{ACM Transactions on Intelligent Systems and Technology}%
+ \def\@journalNameShort{ACM Trans. Intell. Syst. Technol.}%
+ \def\@permissionCodeOne{2157-6904}%
+ \def\@permissionCodeTwo{2157-6912}%
+\or % TKDD
+ \def\@journalName{ACM Transactions on Knowledge Discovery from Data}%
+ \def\@journalNameShort{ACM Trans. Knowl. Discov. Data.}%
+ \def\@permissionCodeOne{1556-4681}%
+ \def\@permissionCodeTwo{1556-472X}%
+\or % TMIS
+ \def\@journalName{ACM Transactions on Management Information Systems}%
+ \def\@journalNameShort{ACM Trans. Manag. Inform. Syst.}%
+ \def\@permissionCodeOne{2158-656X}%
+ \def\@permissionCodeTwo{2158-6578}%
+\or % TOCE
+ \def\@journalName{ACM Transactions on Computing Education}%
+ \def\@journalNameShort{ACM Trans. Comput. Educ.}%
+ \def\@permissionCodeOne{1946-6226}%
+ \def\@permissionCodeTwo{1946-6226}%
+\or % TOCHI
+ \def\@journalName{ACM Transactions on Computer-Human Interaction}%
+ \def\@journalNameShort{ACM Trans. Comput.-Hum. Interact.}%
+ \def\@permissionCodeOne{1073-0516}%
+ \def\@permissionCodeTwo{1557-7325}%
+\or % TOCL
+ \def\@journalName{ACM Transactions on Computational Logic}%
+ \def\@journalNameShort{ACM Trans. Comput. Logic}%
+ \def\@permissionCodeOne{1529-3785}%
+ \def\@permissionCodeTwo{1557-945X}%
+\or % TOCS
+ \def\@journalName{ACM Transactions on Computer Systems}%
+ \def\@journalNameShort{ACM Trans. Comput. Syst.}%
+ \def\@permissionCodeOne{0734-2071}%
+ \def\@permissionCodeTwo{1557-7333}%
+\or % TOCT
+ \def\@journalName{ACM Transactions on Computation Theory}%
+ \def\@journalNameShort{ACM Trans. Comput. Theory}%
+ \def\@permissionCodeOne{1942-3454}%
+ \def\@permissionCodeTwo{1942-3462}%
+\or % TODAES
+ \def\@journalName{ACM Transactions on Design Automation of Electronic Systems}%
+ \def\@journalNameShort{ACM Trans. Des. Autom. Electron. Syst.}%
+ \def\@permissionCodeOne{1084-4309}%
+ \def\@permissionCodeTwo{1557-7309}%
+\or % TODS
+ \def\@journalName{ACM Transactions on Database Systems}%
+ \def\@journalNameShort{ACM Trans. Datab. Syst.}%
+ \def\@permissionCodeOne{0362-5915}%
+ \def\@permissionCodeTwo{1557-4644}%
+\or % TOG
+ \def\@journalName{ACM Transactions on Graphics}%
+ \def\@journalNameShort{ACM Trans. Graph.}%
+ \def\@permissionCodeOne{0730-0301}%
+ \def\@permissionCodeTwo{1557-7368}%
+\or % TOIS
+ \def\@journalName{ACM Transactions on Information Systems}%
+ \def\@journalNameShort{ACM Trans. Inf. Syst.}%
+ \def\@permissionCodeOne{1046-8188}%
+ \def\@permissionCodeTwo{1558-2868}%
+\or % TOIT
+ \def\@journalName{ACM Transactions on Internet Technology}%
+ \def\@journalNameShort{ACM Trans. Internet Technol.}%
+ \def\@permissionCodeOne{1533-5399}%
+ \def\@permissionCodeTwo{1557-6051}%
+\or % TOMACS
+ \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
+ \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}%
+ \def\@permissionCodeOne{1049-3301}%
+ \def\@permissionCodeTwo{1558-1195}%
+\or % TOMM
+ \def\@journalName{ACM Transactions on Multimedia Computing, Communications and Applications}%
+ \def\@journalNameShort{ACM Trans. Multimedia Comput. Commun. Appl.}%
+ \def\@permissionCodeOne{1551-6857}%
+ \def\@permissionCodeTwo{1551-6865}%
+\or % TOMPECS
+ \def\@journalName{ACM Transactions on Modeling and Performance Evaluation of Computing Systems}%
+ \def\@journalNameShort{ACM Trans. Model. Perform. Eval. Comput. Syst.}%
+ \def\@permissionCodeOne{2376-3639}%
+ \def\@permissionCodeTwo{2376-3647}%
+\or % TOMS
+ \def\@journalName{ACM Transactions on Mathematical Software}%
+ \def\@journalNameShort{ACM Trans. Math. Softw.}%
+ \def\@permissionCodeOne{0098-3500}%
+ \def\@permissionCodeTwo{1557-7295}%
+\or % TOPC
+ \def\@journalName{ACM Transactions on Parallel Computing}%
+ \def\@journalNameShort{ACM Trans. Parallel Comput.}%
+ \def\@permissionCodeOne{2329-4949}%
+ \def\@permissionCodeTwo{2329-4957}%
+\or % TOPLAS
+ \def\@journalName{ACM Transactions on Programming Languages and Systems}%
+ \def\@journalNameShort{ACM Trans. Program. Lang. Syst.}%
+ \def\@permissionCodeOne{0164-0925}%
+ \def\@permissionCodeTwo{1558-4593}%
+\or % TOPML
+ \def\@journalName{ACM Transactions on Probabilistic Machine Learning}%
+ \def\@journalNameShort{ACM Trans. Probab. Mach. Learn.}%
+ \def\@permissionCodeOne{2836-8924}%
+ \def\@permissionCodeTwo{2836-8924}%
+\or % TOPS
+ \def\@journalName{ACM Transactions on Privacy and Security}%
+ \def\@journalNameShort{ACM Trans. Priv. Sec.}%
+ \def\@permissionCodeOne{2471-2566}%
+ \def\@permissionCodeTwo{2471-2574}%
+\or % TORS
+ \def\@journalName{ACM Transactions on Recommender Systems}%
+ \def\@journalNameShort{ACM Trans. Recomm. Syst.}%
+ \def\@permissionCodeOne{2770-6699}%
+ \def\@permissionCodeTwo{2770-6699}%
+\or % TOS
+ \def\@journalName{ACM Transactions on Storage}%
+ \def\@journalNameShort{ACM Trans. Storage}%
+ \def\@permissionCodeOne{1553-3077}%
+ \def\@permissionCodeTwo{1553-3093}%
+\or % TOSEM
+ \def\@journalName{ACM Transactions on Software Engineering and Methodology}%
+ \def\@journalNameShort{ACM Trans. Softw. Eng. Methodol.}%
+ \def\@permissionCodeOne{1049-331X}%
+ \def\@permissionCodeTwo{1557-7392}%
+\or % TOSN
+ \def\@journalName{ACM Transactions on Sensor Networks}%
+ \def\@journalNameShort{ACM Trans. Sensor Netw.}%
+ \def\@permissionCodeOne{1550-4859}%
+ \def\@permissionCodeTwo{1550-4867}%
+\or % TQC
+ \def\@journalName{ACM Transactions on Quantum Computing}%
+ \def\@journalNameShort{ACM Trans. Quantum Comput.}%
+ \def\@permissionCodeOne{2643-6817}%
+ \def\@permissionCodeTwo{2643-6817}%
+\or % TRETS
+ \def\@journalName{ACM Transactions on Reconfigurable Technology and Systems}%
+ \def\@journalNameShort{ACM Trans. Reconfig. Technol. Syst.}%
+ \def\@permissionCodeOne{1936-7406}%
+ \def\@permissionCodeTwo{1936-7414}%
+\or % TSAS
+ \def\@journalName{ACM Transactions on Spatial Algorithms and Systems}%
+ \def\@journalNameShort{ACM Trans. Spatial Algorithms Syst.}%
+ \def\@permissionCodeOne{2374-0353}%
+ \def\@permissionCodeTwo{2374-0361}%
+\or % TSC
+ \def\@journalName{ACM Transactions on Social Computing}%
+ \def\@journalNameShort{ACM Trans. Soc. Comput.}%
+ \def\@permissionCodeOne{2469-7818}%
+ \def\@permissionCodeTwo{2469-7826}%
+\or % TSLP
+ \def\@journalName{ACM Transactions on Speech and Language Processing}%
+ \def\@journalNameShort{ACM Trans. Speech Lang. Process.}%
+ \def\@permissionCodeOne{1550-4875}%
+ \def\@permissionCodeTwo{2329-9304}%
+\or % TWEB
+ \def\@journalName{ACM Transactions on the Web}%
+ \def\@journalNameShort{ACM Trans. Web}%
+ \def\@permissionCodeOne{1559-1131}%
+ \def\@permissionCodeTwo{1559-114X}%
+\else % FACMP, a dummy journal
+ \def\@journalName{ACM Just Accepted}%
+ \def\@journalNameShort{ACM Accepted}%
+ \def\@permissionCodeOne{XXXX-XXXX}%
+\fi
+\ClassInfo{\@classname}{Using journal code \@journalCode}%
+}{%
+ \ClassError{\@classname}{Incorrect journal #1}%
+}%
+\def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}%
+ \global\@ACM@journal@bibstriptrue
+ \global\@ACM@journal@bibstrip@or@togtrue}
+\def\@journalCode@nr{0}
+\def\@journalName{}%
+\def\@journalNameShort{\@journalName}%
+\def\@permissionCodeOne{XXXX-XXXX}%
+\def\@permissionCodeTwo{\@permissionCodeOne}%
+\newcommand\acmConference[4][]{%
+ \gdef\acmConference@shortname{#1}%
+ \gdef\acmConference@name{#2}%
+ \gdef\acmConference@date{#3}%
+ \gdef\acmConference@venue{#4}%
+ \ifx\acmConference@shortname\@empty
+ \gdef\acmConference@shortname{#2}%
+ \fi
+ \global\@ACM@journal@bibstripfalse
+ \ifx\@acmBooktitle\@empty\relax
+ \acmBooktitle{Proceedings of \acmConference@name
+ \ifx\acmConference@name\acmConference@shortname\else
+ \ (\acmConference@shortname)\fi}%
+ \fi
+}
+\if@ACM@journal\else
+\acmConference[Conference'17]{ACM Conference}{July 2017}{Washington,
+ DC, USA}%
+\fi
+\def\acmBooktitle#1{\gdef\@acmBooktitle{#1}}
+\acmBooktitle{}
+\def\@editorsAbbrev{(Ed.)}
+\def\@acmEditors{}
+\def\editor#1{\ifx\@acmEditors\@empty
+ \gdef\@acmEditors{#1}%
+ \else
+ \gdef\@editorsAbbrev{(Eds.)}%
+ \g@addto@macro\@acmEditors{\and#1}%
+\fi}
+\def\subtitle#1{\def\@subtitle{#1}}
+\subtitle{}
+\newcount\num@authorgroups
+\num@authorgroups=0\relax
+\newcount\num@authors
+\num@authors=0\relax
+\newif\if@insideauthorgroup
+\@insideauthorgroupfalse
+\renewcommand\author[2][]{%
+ \IfSubStr{\detokenize{#2}}{,}{\ClassWarning{\@classname}{Do not put several
+ authors in the same \string\author\space macro!}}{}%
+ \global\advance\num@authors by 1\relax
+ \if@insideauthorgroup\else
+ \global\advance\num@authorgroups by 1\relax
+ \global\@insideauthorgrouptrue
+ \fi
+ \ifx\addresses\@empty
+ \if@ACM@anonymous
+ \gdef\addresses{\@author{Anonymous Author(s)%
+ \ifx\@acmSubmissionID\@empty\else\\Submission Id:
+ \@acmSubmissionID\fi}}%
+ \gdef\authors{Anonymous Author(s)}%
+ \else
+ \expandafter\gdef\expandafter\addresses\expandafter{%
+ \expandafter\@author\expandafter{%
+ \csname typeset@author\the\num@authors\endcsname{#2}}}%
+ \gdef\authors{#2}%
+ \fi
+ \else
+ \if@ACM@anonymous\else
+ \expandafter\g@addto@macro\expandafter\addresses\expandafter{%
+ \expandafter\and\expandafter\@author\expandafter{%
+ \csname typeset@author\the\num@authors\endcsname{#2}}}%
+ \g@addto@macro\authors{\and#2}%
+ \fi
+ \fi
+ \if@ACM@anonymous
+ \ifx\shortauthors\@empty
+ \gdef\shortauthors{Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id:
+ \@acmSubmissionID\fi}%
+ \fi
+ \else
+ \def\@tempa{#1}%
+ \ifx\@tempa\@empty
+ \ifx\shortauthors\@empty
+ \gdef\shortauthors{#2}%
+ \else
+ \g@addto@macro\shortauthors{\and#2}%
+ \fi
+ \else
+ \ifx\shortauthors\@empty
+ \gdef\shortauthors{#1}%
+ \else
+ \g@addto@macro\shortauthors{\and#1}%
+ \fi
+ \fi
+ \fi}
+\newcommand{\affiliation}[2][]{%
+ \global\@insideauthorgroupfalse
+ \if@ACM@anonymous\else
+ \g@addto@macro\addresses{\affiliation{#1}{#2}}%
+ \fi}
+\define@boolkey+{@ACM@affiliation@}[@ACM@affiliation@]{obeypunctuation}%
+[true]{}{\ClassError{\@classname}{The option obeypunctuation can be either true or false}}
+\def\additionalaffiliation#1{\authornote{\@additionalaffiliation{#1}}}
+\def\@additionalaffiliation#1{\bgroup
+ \def\position##1{\ignorespaces}%
+ \def\institution##1{##1\ignorespaces}%
+ \def\department{\@ifnextchar[{\@department}{\@department[]}}%
+ \def\@department[##1]##2{\unskip, ##2\ignorespaces}%
+ \let\city\position
+ \let\state\position
+ \let\country\position
+ Also with #1\unskip.\egroup}
+\renewcommand{\email}[2][]{%
+ \IfSubStr{#2}{,}{\ClassWarning{\@classname}{Do not put several
+ addresses in the same \string\email\space macro!}}{}%
+ \if@ACM@anonymous\else
+ \g@addto@macro\addresses{\email{#1}{#2}}%
+ \fi}
+\def\orcid#1{\unskip\ignorespaces%
+ \IfBeginWith{#1}{http}{%
+ \expandafter\gdef\csname
+ typeset@author\the\num@authors\endcsname##1{%
+ \href{#1}{##1}}}{%
+ \expandafter\gdef\csname
+ typeset@author\the\num@authors\endcsname##1{%
+ \href{https://orcid.org/#1}{##1}}}}
+\def\authorsaddresses#1{\def\@authorsaddresses{#1}}
+\authorsaddresses{\@mkauthorsaddresses}
+\newcommand\@mktranslatedkeywords[2]{\bgroup
+ \selectlanguage{#1}%
+ {\@specialsection{\keywordsname}%
+ \noindent#2\par}\egroup}
+\def\@titlenotes{}
+\def\titlenote#1{%
+ \g@addto@macro\@title{\footnotemark}%
+ \if@ACM@anonymous
+ \g@addto@macro\@titlenotes{%
+ \stepcounter{footnote}\footnotetext{Title note}}%
+ \else
+ \g@addto@macro\@titlenotes{\stepcounter{footnote}\footnotetext{#1}}%
+ \fi}
+\def\@subtitlenotes{}
+\def\subtitlenote#1{%
+ \g@addto@macro\@subtitle{\footnotemark}%
+ \if@ACM@anonymous
+ \g@addto@macro\@subtitlenotes{%
+ \stepcounter{footnote}\footnotetext{Subtitle note}}%
+ \else
+ \g@addto@macro\@subtitlenotes{%
+ \stepcounter{footnote}\footnotetext{#1}}%
+ \fi}
+\def\@authornotes{}
+\def\authornote#1{%
+ \if@ACM@anonymous\else
+ \g@addto@macro\addresses{\@authornotemark}%
+ \g@addto@macro\@authornotes{%
+ \stepcounter{footnote}\footnotetext{#1}}%
+ \fi}
+\newcommand\authornotemark[1][\relax]{%
+ \ifx#1\relax\relax\relax
+ \g@addto@macro\addresses{\@authornotemark}%
+ \else
+ \g@addto@macro\addresses{\@@authornotemark{#1}}%
+ \fi}
+\def\acmVolume#1{\def\@acmVolume{#1}}
+\acmVolume{1}
+\def\acmNumber#1{\def\@acmNumber{#1}}
+\acmNumber{1}
+\def\acmArticle#1{\def\@acmArticle{#1}}
+\acmArticle{}
+\def\acmArticleSeq#1{\def\@acmArticleSeq{#1}}
+\acmArticleSeq{\@acmArticle}
+\def\acmYear#1{\def\@acmYear{#1}}
+\acmYear{\the\year}
+\def\acmMonth#1{\def\@acmMonth{#1}}
+\acmMonth{\the\month}
+\def\@acmPubDate{\ifcase\@acmMonth\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~\@acmYear}
+\def\acmPrice#1{\ClassWarning{\@classname}{The macro \string\acmPrice
+ is obsolete. ACM no longer prints the price in bibstrip.}}
+\def\acmSubmissionID#1{\def\@acmSubmissionID{#1}}
+\acmSubmissionID{}
+\def\acmISBN#1{\def\@acmISBN{#1}}
+\acmISBN{978-x-xxxx-xxxx-x/YY/MM}
+\def\acmDOI#1{\def\@acmDOI{#1}}
+\acmDOI{10.1145/nnnnnnn.nnnnnnn}
+\newlength\@ACM@badge@width
+\setlength\@ACM@badge@width{3pc}
+\newlength\@ACM@title@width
+\newlength\@ACM@badge@skip
+\setlength\@ACM@badge@skip{1pt}
+\def\@acmBadgeR{}
+\def\@acmBadgeL{}
+\newcommand\acmBadgeR[2][]{%
+ \ifx\@acmBadgeR\@empty
+ \gdef\@acmBadgeR{%
+ \smash{%
+ \raisebox{0.5\height}{%
+ \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}%
+ \else
+ \g@addto@macro{\@acmBadgeR}{%
+ \hspace{\@ACM@badge@skip}%
+ \smash{%
+ \raisebox{0.5\height}{%
+ \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}%
+ \fi}
+\newcommand\acmBadgeL[2][]{%
+ \ifx\@acmBadgeL\@empty
+ \gdef\@acmBadgeL{%
+ \smash{%
+ \raisebox{0.5\height}{%
+ \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}%
+ \else
+ \g@addto@macro{\@acmBadgeL}{%
+ \hspace{\@ACM@badge@skip}%
+ \smash{%
+ \raisebox{0.5\height}{%
+ \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}%
+ \fi}
+\let\acmBadge=\acmBadgeR
+\def\startPage#1{\def\@startPage{#1}}
+\startPage{}
+\def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is
+ obsolete. I am going to ignore it}}
+\def\keywords#1{\def\@keywords{#1}}
+\let\@keywords\@empty
+\AtEndDocument{\if@ACM@nonacm\else\ifx\@keywords\@empty
+ \ifnum\getrefnumber{TotPages}>2\relax
+ \ClassWarningNoLine{\@classname}{ACM keywords are mandatory
+ for papers over two pages}%
+ \fi\fi\fi}
+\renewenvironment{abstract}{\Collect@Body\@saveabstract}{}
+\long\def\@saveabstract#1{\if@ACM@maketitle@typeset
+ \ClassError{\@classname}{Abstract must be defined before maketitle
+ command. Please move it!}\fi
+ \long\gdef\@abstract{#1}}
+\@saveabstract{}
+\long\def\@lempty{}
+\define@boolkey+{@ACM@topmatter@}[@ACM@]{printccs}[true]{%
+ \if@ACM@printccs
+ \ClassInfo{\@classname}{Printing CCS}%
+ \else
+ \ClassInfo{\@classname}{Suppressing CCS}%
+ \fi}{\ClassError{\@classname}{The option printccs can be either true or false}}
+\define@boolkey+{@ACM@topmatter@}[@ACM@]{printacmref}[true]{%
+ \if@ACM@printacmref
+ \ClassInfo{\@classname}{Printing bibformat}%
+ \else
+ \ClassInfo{\@classname}{Suppressing bibformat}%
+ \fi}{\ClassError{\@classname}{The option printacmref can be either true or false}}
+\AtEndDocument{\if@ACM@nonacm\else\if@ACM@printacmref\else
+ \ifnum\getrefnumber{TotPages}>1\relax
+ \ClassWarningNoLine{\@classname}{%
+ ACM reference format is mandatory \MessageBreak
+ for papers over one page. \MessageBreak
+ Please add printacmref=true to the \MessageBreak
+ \string\settopmatter\space command.}%
+ \fi\fi\fi}
+\define@boolkey+{@ACM@topmatter@}[@ACM@]{printfolios}[true]{%
+ \if@ACM@printfolios
+ \ClassInfo{\@classname}{Printing folios}%
+ \else
+ \ClassInfo{\@classname}{Suppressing folios}%
+ \fi}{\ClassError{\@classname}{The option printfolios can be either true or false}}
+\define@cmdkey{@ACM@topmatter@}[@ACM@]{authorsperrow}[0]{%
+ \IfInteger{#1}{\ClassInfo{\@classname}{Setting authorsperrow to
+ #1}}{\ClassWarning{\@classname}{The parameter authorsperrow must be
+ numerical. Ignoring the input #1}\gdef\@ACM@authorsperrow{0}}}
+\def\settopmatter#1{\setkeys{@ACM@topmatter@}{#1}}
+\settopmatter{printccs=true, printacmref=true}
+\if@ACM@manuscript
+ \settopmatter{printfolios=true}
+\else
+ \if@ACM@journal
+ \settopmatter{printfolios=true}
+ \else
+ \settopmatter{printfolios=false}
+ \fi
+\fi
+\settopmatter{authorsperrow=0}
+\def\@received{}
+\newcommand\received[2][]{\def\@tempa{#1}%
+ \ifx\@tempa\@empty
+ \ifx\@received\@empty
+ \gdef\@received{Received #2}%
+ \else
+ \g@addto@macro{\@received}{; revised #2}%
+ \fi
+ \else
+ \ifx\@received\@empty
+ \gdef\@received{#1 #2}%
+ \else
+ \g@addto@macro{\@received}{; #1 #2}%
+ \fi
+ \fi}
+\AtEndDocument{%
+ \ifx\@received\@empty\else
+ \par\bigskip\noindent\small\normalfont\@received\par
+ \fi}
+\define@choicekey+{ACM}{articletype}[\ACM@ArticleType\ACM@ArticleType@nr]{%
+ Research,Review,Discussion,Invited,Position}[Review]{%
+ \ifcase\ACM@ArticleType@nr
+ \relax % Research
+ \colorlet{@ACM@Article@color}{ACMBlue}%
+ \or % Review
+ \colorlet{@ACM@Article@color}{ACMOrange}%
+ \or % Discussion
+ \colorlet{@ACM@Article@color}{ACMGreen}%
+ \or % Invited
+ \colorlet{@ACM@Article@color}{ACMPurple}%
+ \or % Position
+ \colorlet{@ACM@Article@color}{ACMRed}%
+ \fi
+}{%
+ \ClassError{\@classname}{Article Type must be Research, Review,\MessageBreak
+ Discussion, Invited, or Position}}
+\def\acmArticleType#1{\setkeys{ACM}{articletype=#1}}
+\if@ACM@acmcp
+\acmArticleType{Research}%
+\fi
+ % \end{macrocode}
+\newenvironment{@ACM@color@frame}{%
+ \def\FrameCommand{\hspace*{-6.5pc}%
+ \colorbox{@ACM@Article@color!10!white}}%
+ \MakeFramed {\advance\hsize
+ -6.5pc\relax\FrameRestore}}{\zsaveposy{@ACM@acmcpframe@y}%
+ \endMakeFramed}
+\def\acmCodeLink#1{%
+ \ifx\@acmCodeDataLink\@empty
+ \gdef\@acmCodeDataLink{\url{#1}}%
+ \else
+ \g@addto@macro{\@acmCodeDataLink}{\\ \url{#1}}%
+ \fi}
+\def\@acmCodeDataLink{}
+\def\acmContributions#1{\gdef\@acmContributions{#1}}
+\acmContributions{}
+\let\acmDataLink\acmCodeLink
+\RequirePackage{comment}
+\excludecomment{CCSXML}
+\let\@concepts\@empty
+\newcounter{@concepts}
+\newcommand\ccsdesc[2][100]{%
+ \ccsdesc@parse#1~#2~~\ccsdesc@parse@end}
+\def\textrightarrow{$\rightarrow$}
+\def\ccsdesc@parse#1~#2~#3~{%
+ \stepcounter{@concepts}%
+ \expandafter\ifx\csname CCS@General@#2\endcsname\relax
+ \expandafter\gdef\csname CCS@General@#2\endcsname{\textbullet\
+ \textbf{#2}}%
+ \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{; }%
+ \expandafter\gdef\csname CCS@Specific@#2\endcsname{}%
+ \g@addto@macro{\@concepts}{\csname CCS@General@#2\endcsname
+ \csname CCS@Punctuation@#2\endcsname
+ \csname CCS@Specific@#2\endcsname}%
+ \fi
+ \ifx#3\relax\relax\else
+ \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{
+ \textrightarrow\ }%
+ \expandafter\g@addto@macro\expandafter{\csname CCS@Specific@#2\endcsname}{%
+ \addtocounter{@concepts}{-1}%
+ \ifnum#1>499\textbf{#3}\else
+ \ifnum#1>299\textit{#3}\else
+ #3\fi\fi\ifnum\value{@concepts}=0.\else; \fi}%
+ \fi
+\ccsdesc@parse@finish}
+\AtEndDocument{\if@ACM@nonacm\else\ifx\@concepts\@empty\relax
+ \ifnum\getrefnumber{TotPages}>2\relax
+ \ClassWarningNoLine{\@classname}{CCS concepts are mandatory
+ for papers over two pages}%
+ \fi\fi\fi}
+\def\ccsdesc@parse@finish#1\ccsdesc@parse@end{}
+\newif\if@printcopyright
+\@printcopyrighttrue
+\newif\if@printpermission
+\@printpermissiontrue
+\newif\if@acmowned
+\@acmownedtrue
+\define@choicekey*{ACM@}{acmcopyrightmode}[%
+ \acm@copyrightinput\acm@copyrightmode]{none,%
+ acmcopyright,acmlicensed,rightsretained,%
+ usgov,usgovmixed,cagov,cagovmixed,licensedusgovmixed,%
+ licensedcagov,licensedcagovmixed,othergov,licensedothergov,%
+ iw3c2w3,iw3c2w3g,cc}{%
+ \@printpermissiontrue
+ \@printcopyrighttrue
+ \@acmownedtrue
+ \ifnum\acm@copyrightmode=0\relax % none
+ \@printpermissionfalse
+ \@printcopyrightfalse
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=2\relax % acmlicensed
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=3\relax % rightsretained
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=4\relax % usgov
+ \@printpermissiontrue
+ \@printcopyrightfalse
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=6\relax % cagov
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=8\relax % licensedusgovmixed
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=9\relax % licensedcagov
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=10\relax % licensedcagovmixed
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=11\relax % othergov
+ \@acmownedtrue
+ \fi
+ \ifnum\acm@copyrightmode=12\relax % licensedothergov
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=13\relax % iw3c2w3
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=14\relax % iw3c2w3g
+ \@acmownedfalse
+ \fi
+ \ifnum\acm@copyrightmode=15\relax % cc
+ \@acmownedfalse
+ \fi}
+\def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
+\setcopyright{acmlicensed}
+\newcommand\setcctype[2][4.0]{%
+ \def\ACM@cc@version{#1}%
+ \def\ACM@cc@type{#2}}
+\setcctype{by}
+\def\@copyrightowner{%
+ \ifcase\acm@copyrightmode\relax % none
+ \or % acmcopyright
+ ACM\@.
+ \or % acmlicensed
+ Copyright held by the owner/author(s). Publication rights licensed to
+ ACM\@.
+ \or % rightsretained
+ Copyright held by the owner/author(s).
+ \or % usgov
+ \or % usgovmixed
+ Copyright held by the owner/author(s).
+ \or % cagov
+ Copyright Crown in Right of Canada.
+ \or %cagovmixed
+ Copyright held by the owner/author(s).
+ \or %licensedusgovmixed
+ Copyright held by the owner/author(s). Publication rights licensed to
+ ACM\@.
+ \or % licensedcagov
+ Copyright held by the owner/author(s).
+ \or %licensedcagovmixed
+ Copyright held by the owner/author(s). Publication rights licensed to
+ ACM\@.
+ \or % othergov
+ Copyright held by the owner/author(s).
+ \or % licensedothergov
+ Copyright held by the owner/author(s). Publication rights licensed to
+ ACM\@.
+ \or % ic2w3www
+ IW3C2 (International World Wide Web Conference Committee), published
+ under Creative Commons CC-BY~4.0 License.
+ \or % ic2w3wwwgoogle
+ IW3C2 (International World Wide Web Conference Committee), published
+ under Creative Commons CC-BY-NC-ND~4.0 License.
+ \or % cc
+ Copyright held by the owner/author(s).
+ \fi}
+\def\@formatdoi#1{\url{https://doi.org/#1}}
+\def\@copyrightpermission{%
+ \ifcase\acm@copyrightmode\relax % none
+ \or % acmcopyright
+ Permission to make digital or hard copies of all or part of this
+ work for personal or classroom use is granted without fee provided
+ that copies are not made or distributed for profit or commercial
+ advantage and that copies bear this notice and the full citation on
+ the first page. Copyrights for components of this work owned by
+ others than ACM must be honored. Abstracting with credit is
+ permitted. To copy otherwise, or republish, to post on servers or
+ to redistribute to lists, requires prior specific permission
+ and\hspace*{.5pt}/or
+ a fee. Request permissions from permissions@acm.org.
+ \or % acmlicensed
+ Permission to make digital or hard copies of all or part of this
+ work for personal or classroom use is granted without fee provided
+ that copies are not made or distributed for profit or commercial
+ advantage and that copies bear this notice and the full citation on
+ the first page. Copyrights for components of this work owned by
+ others than the author(s) must be honored. Abstracting with credit
+ is permitted. To copy otherwise, or republish, to post on servers
+ or to redistribute to lists, requires prior specific permission
+ and\hspace*{.5pt}/or a fee. Request permissions from
+ permissions@acm.org.
+ \or % rightsretained
+ Permission to make digital or hard copies of all or part of this
+ work for personal or classroom use is granted without fee provided
+ that copies are not made or distributed for profit or commercial
+ advantage and that copies bear this notice and the full citation on
+ the first page. Copyrights for third-party components of this work
+ must be honored. For all other uses, contact the
+ owner\hspace*{.5pt}/author(s).
+ \or % usgov
+ This paper is authored by an employee(s) of the United States
+ Government and is in the public domain. Non-exclusive copying or
+ redistribution is allowed, provided that the article citation is
+ given and the authors and agency are clearly identified as its
+ source. All others Request permissions from
+ owner\hspace*{.5pt}/author(s).
+ \or % usgovmixed
+ ACM acknowledges that this contribution was authored or co-authored
+ by an employee, contractor, or affiliate of the United States
+ government. As such, the United States government retains a
+ nonexclusive, royalty-free right to publish or reproduce this
+ article, or to allow others to do so, for government purposes
+ only. Request permissions from owner\hspace*{.5pt}/author(s).
+ \or % cagov
+ This article was authored by employees of the Government of
+ Canada. As such, the Canadian government retains all interest in
+ the copyright to this work and grants to ACM a nonexclusive,
+ royalty-free right to publish or reproduce this article, or to
+ allow others to do so, provided that clear attribution is given
+ both to the authors and the Canadian government agency employing
+ them. Permission to make digital or hard copies for personal or
+ classroom use is granted. Copies must bear this notice and the full
+ citation on the first page. Copyrights for components of this work
+ owned by others than the Canadian Government must be honored. To
+ copy otherwise, distribute, republish, or post, requires prior
+ specific permission and/or a fee. Request permissions from
+ owner\hspace*{.5pt}/author(s).
+ \or % cagovmixed
+ ACM acknowledges that this contribution was co-authored by an
+ affiliate of the national government of Canada. As such, the Crown
+ in Right of Canada retains an equal interest in the
+ copyright. Reprints must include clear attribution to ACM and the
+ author’s government agency affiliation. Permission to make digital
+ or hard copies for personal or classroom use is granted. Copies
+ must bear this notice and the full citation on the first
+ page. Copyrights for components of this work owned by others than
+ ACM must be honored. To copy otherwise, distribute, republish, or
+ post, requires prior specific permission and/or a fee. Request
+ permissions from owner\hspace*{.5pt}/author(s).
+ \or % licensedusgovmixed
+ Publication rights licensed to ACM\@. ACM acknowledges that this
+ contribution was authored or co-authored by an employee, contractor
+ or affiliate of the United States government. As such, the
+ Government retains a nonexclusive, royalty-free right to publish or
+ reproduce this article, or to allow others to do so, for Government
+ purposes only. Request permissions from
+ owner\hspace*{.5pt}/author(s).
+ \or % licensedcagov
+ This article was authored by employees of the Government of
+ Canada. As such, the Canadian government retains all interest in
+ the copyright to this work and grants to ACM a nonexclusive,
+ royalty-free right to publish or reproduce this article, or to
+ allow others to do so, provided that clear attribution is given
+ both to the authors and the Canadian government agency employing
+ them. Permission to make digital or hard copies for personal or
+ classroom use is granted. Copies must bear this notice and the full
+ citation on the first page. Copyrights for components of this work
+ owned by others than the Canadian Government must be honored. To
+ copy otherwise, distribute, republish, or post, requires prior
+ specific permission and/or a fee. Request permissions from
+ owner\hspace*{.5pt}/author(s).
+ \or % licensedcagovmixed
+ Publication rights licensed to ACM. ACM acknowledges that this
+ contribution was authored or co-authored by an employee, contractor
+ or affiliate of the national government of Canada. As such, the
+ Government retains a nonexclusive, royalty-free right to publish or
+ reproduce this article, or to allow others to do so, for Government
+ purposes only. Request permissions from
+ owner\hspace*{.5pt}/author(s).
+ \or % othergov
+ ACM acknowledges that this contribution was authored or co-authored
+ by an employee, contractor or affiliate of a national
+ government. As such, the Government retains a nonexclusive,
+ royalty-free right to publish or reproduce this article, or to
+ allow others to do so, for Government purposes only. Request
+ permissions from owner\hspace*{.5pt}/author(s).
+ \or % licensedothergov
+ Publication rights licensed to ACM\@. ACM acknowledges that this
+ contribution was authored or co-authored by an employee, contractor
+ or affiliate of a national government. As such, the Government
+ retains a nonexclusive, royalty-free right to publish or reproduce
+ this article, or to allow others to do so, for Government purposes
+ only. Request permissions from owner\hspace*{.5pt}/author(s).
+ \or % iw3c2w3
+ This paper is published under the Creative Commons Attribution~4.0
+ International (CC-BY~4.0) license. Authors reserve their rights to
+ disseminate the work on their personal and corporate Web sites with
+ the appropriate attribution.
+ \or % iw3c2w3g
+ This paper is published under the Creative Commons
+ Attribution-NonCommercial-NoDerivs~4.0 International
+ (CC-BY-NC-ND~4.0) license. Authors reserve their rights to
+ disseminate the work on their personal and corporate Web sites with
+ the appropriate attribution.
+ \or % CC
+ \IfEq{\ACM@cc@type}{zero}{%
+ \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{%
+ \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}%
+ \href{\ACM@CC@Url}{\includegraphics[height=5ex]{doclicense-CC-\ACM@cc@type-88x31}}\\
+ \href{\ACM@CC@Url}{%
+ This work is licensed under a Creative Commons
+ \IfEq{\ACM@cc@type}{zero}{CC0 1.0 Universal}{%
+ \IfEq{\ACM@cc@type}{by}{Attribution}{}%
+ \IfEq{\ACM@cc@type}{by-sa}{Attribution-ShareAlike}{}%
+ \IfEq{\ACM@cc@type}{by-nd}{Attribution-NoDerivatives}{}%
+ \IfEq{\ACM@cc@type}{by-nc}{Attribution-NonCommercial}{}%
+ \IfEq{\ACM@cc@type}{by-nc-sa}{Attribution-NonCommercial-ShareAlike}{}%
+ \IfEq{\ACM@cc@type}{by-nc-nd}{Attribution-NonCommercial-NoDerivatives}{}%
+ ~\IfEq{\ACM@cc@version}{4.0}{4.0 International}{3.0 Unported}%
+ }
+ License.}%
+ \fi}
+%%
+\def\copyrightyear#1{\def\@copyrightyear{#1}}
+\copyrightyear{\@acmYear}
+\def\@teaserfigures{}
+\newenvironment{teaserfigure}{\Collect@Body\@saveteaser}{}
+\long\def\@saveteaser#1{\g@addto@macro\@teaserfigures{\@teaser{#1}}}
+\renewcommand{\thanks}[1]{%
+ \@ifnotempty{#1}{%
+ \if@ACM@anonymous
+ \g@addto@macro\thankses{\thanks{A note}}%
+ \else
+ \g@addto@macro\thankses{\thanks{#1}}%
+ \fi}}
+\newcommand{\anon}[2][ANONYMIZED]{%
+ \if@ACM@anonymous%
+ {\color{ACMOrange}#1}%
+ \else%
+ #2%
+ \fi}
+\ifx\@beginmaketitlehook\@undefined
+ \let\@beginmaketitlehook\@empty
+\fi
+\def\AtBeginMaketitle{\g@addto@macro\@beginmaketitlehook}
+\def\@acmengagemetadata{}
+\def\setengagemetadata#1#2{%
+ \g@addto@macro{\@acmengagemetadata}{%
+ \@setengagemetadata{#1}{#2}}}
+\newbox\mktitle@bx
+\def\maketitle{\@beginmaketitlehook
+ \@ACM@maketitle@typesettrue
+ \if@ACM@anonymous
+ % Anonymize omission of \author-s
+ \ifnum\num@authorgroups=0\author{}\fi
+ \fi
+ \begingroup
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
+ \let\@footnotemark\@footnotemark@nolink
+ \let\@footnotetext\@footnotetext@nolink
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \hsize=\textwidth
+ \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}%
+ \@mktitle\if@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers
+ \@printtopmatter
+ \if@ACM@sigchiamode\@mkauthors\fi
+ \setcounter{footnote}{0}%
+ \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}%
+ \@titlenotes
+ \@subtitlenotes
+ \@authornotes
+ \let\@makefnmark\relax
+ \let\@thefnmark\relax
+ \let\@makefntext\noindent
+ \ifx\@empty\thankses\else
+ \footnotetextauthorsaddresses{%
+ \def\par{\let\par\@par}\parindent\z@\@setthanks}%
+ \fi
+ \if@ACM@acmcp\else
+ \ifx\@empty\@authorsaddresses\else
+ \if@ACM@anonymous\else
+ \if@ACM@journal@bibstrip@or@tog
+ \footnotetextauthorsaddresses{%
+ \def\par{\let\par\@par}\parindent\z@\@setauthorsaddresses}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \if@ACM@nonacm
+ \ifnum\acm@copyrightmode=15\relax % cc
+ \footnotetextcopyrightpermission{\@copyrightpermission}%
+ \fi
+ \else
+ \if@ACM@acmcp\else
+ \footnotetextcopyrightpermission{%
+ \if@ACM@authordraft
+ \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
+ Unpublished working draft. Not for distribution.}}%
+ \color[gray]{0.9}%
+ \fi
+ \parindent\z@\parskip0.1\baselineskip
+ \if@ACM@authorversion\else
+ \if@printpermission\@copyrightpermission\par\fi
+ \fi
+ \if@ACM@manuscript\else
+ \if@ACM@journal@bibstrip\else % Print the conference information
+ \if@ACM@engage
+ {\itshape \@acmBooktitle, \@acmYear.}\par
+ \else
+ {\itshape \acmConference@shortname, \acmConference@date, \acmConference@venue}\par
+ \fi
+ \fi
+ \fi
+ \if@printcopyright
+ \copyright\ \@copyrightyear\ \@copyrightowner\\
+ \else
+ \@copyrightyear.\
+ \fi
+ \if@ACM@manuscript
+ Manuscript submitted to ACM\\
+ \else
+ \if@ACM@authorversion
+ This is the author's version of the work. It is posted here for
+ your personal use. Not for redistribution. The definitive Version
+ of Record was published in
+ \if@ACM@journal@bibstrip
+ \emph{\@journalName}%
+ \else
+ \emph{\@acmBooktitle}%
+ \fi
+ \ifx\@acmDOI\@empty
+ .
+ \else
+ , \@formatdoi{\@acmDOI}.
+ \fi\\
+ \else
+ \if@ACM@nonacm\else
+ \if@ACM@journal@bibstrip
+ ACM~\@permissionCodeTwo/\@acmYear/\@acmMonth-ART\@acmArticle\\
+ \@formatdoi{\@acmDOI}%
+ \else % Conference
+ \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi
+ \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
+ \fi
+ \fi
+ \fi
+ \fi}%
+ \fi
+ \fi
+ \endgroup
+ \if@ACM@engage\@typesetengagemetadata\fi
+ \setcounter{footnote}{0}%
+ \@mkabstract
+ \ifx\@translatedabstracts\@empty\else
+ \@translatedabstracts\fi
+ \if@ACM@printccs
+ \ifx\@concepts\@empty\else\bgroup
+ {\@specialsection{CCS Concepts}%
+ \noindent\@concepts\par}\egroup
+ \fi
+ \fi
+ \if@ACM@acmcp\else
+ \ifx\@keywords\@empty\else\bgroup
+ {\@specialsection{\keywordsname}%
+ \noindent\@keywords\par}\egroup
+ \fi
+ \ifx\@translatedkeywords\@empty\else
+ \@translatedkeywords
+ \fi
+ \fi
+ \let\metadata@authors=\authors
+ \nxandlist{, }{, }{, }\metadata@authors
+ \def\@ACM@checkaffil{}%
+ \hypersetup{%
+ pdfauthor={\metadata@authors},
+ pdftitle={\@title},
+ pdfsubject={\@concepts},
+ pdfkeywords={\@keywords},
+ pdfcreator={LaTeX with acmart
+ \csname ver@\@classname.cls\endcsname\space
+ and hyperref
+ \csname ver@hyperref.sty\endcsname}}%
+ \andify\authors
+ \andify\shortauthors
+ \global\let\authors=\authors
+ \global\let\shortauthors=\shortauthors
+ \if@ACM@printacmref
+ \@mkbibcitation
+ \fi
+ \global\@topnum\z@ % this prevents floats from falling
+ % at the top of page 1
+ \global\@botnum\z@ % we do not want them to be on the bottom either
+ \@printendtopmatter
+ \@afterindentfalse
+ \@afterheading
+ \if@ACM@acmcp
+ \set@ACM@acmcpbox
+ \AtEndDocument{\end@ACM@color@frame}%
+ \@ACM@color@frame
+ \fi
+}
+\newbox\@ACM@acmcpbox
+\def\set@ACM@acmcpbox{%
+ \bgroup
+ \hsize=5pc
+ \global\setbox\@ACM@acmcpbox=\vbox{%
+ \setlength{\parindent}{\z@}%
+ {\includegraphics[width=\hsize]{acm-jdslogo}\par}%
+ \scriptsize
+ \ifnum\getrefnumber{TotPages}>1\else
+ \zrefused{@ACM@acmcpbox@y}%
+ \zrefused{@ACM@acmcpframe@y}%
+ \@tempdima=\dimexpr\zposy{@ACM@acmcpbox@y}sp -
+ \zposy{@ACM@acmcpframe@y}sp+0.3\FrameSep+
+ \@ACM@acmcp@delta\relax
+ \ifdim\@tempdima>0pt\relax
+ \vspace*{\@tempdima}%
+ \protected@write\@auxout{}%
+ {\string\global\@ACM@acmcp@delta=\the\@tempdima\relax}%
+ \fi
+ \fi
+ \ifx\@acmCodeDataLink\@empty\else\bigskip
+ Code and data links:\\ \@acmCodeDataLink\par\bigskip
+ \fi
+ \ifx\@keywords\@empty\else\bigskip
+ Keywords: \@keywords\par
+ \fi
+ \ifx\@acmContributions\@empty\else\bigskip
+ \@acmContributions\par
+ \fi
+ \ifx\@empty\@authorsaddresses\else\bigskip\@setauthorsaddresses\fi
+ \zsaveposy{@ACM@acmcpbox@y}%
+ }
+\egroup}
+\def\@specialsection#1{%
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \par\medskip\small\noindent#1: %
+ \or % acmsmall
+ \par\medskip\small\noindent#1: %
+ \or % acmlarge
+ \par\medskip\small\noindent#1: %
+ \or % acmtog
+ \par\medskip\small\noindent#1: %
+ \or % sigconf
+ \section*{#1}%
+ \or % siggraph
+ \section*{#1}%
+ \or % sigplan
+ \noindentparagraph*{#1:~}%
+ \or % sigchi
+ \section*{#1}%
+ \or % sigchi-a
+ \section*{#1}%
+ \or % acmengage
+ \section*{#1}%
+ \or % acmcp
+ \section*{#1}%
+ \fi
+ \let\@vspace\@vspace@acm
+ \let\@vspacer\@vspacer@acm
+}
+\def\@printtopmatter{%
+ \ifx\@startPage\@empty
+ \gdef\@startPage{1}%
+ \else
+ \setcounter{page}{\@startPage}%
+ \fi
+ \@tempdima=\ht\mktitle@bx
+ \advance\@tempdima by \dp\mktitle@bx
+ \ifdim\@tempdima>0.9\textheight
+ \loop
+ \setbox\@tempboxa=\vsplit \mktitle@bx to 0.9\textheight
+ \thispagestyle{firstpagestyle}%
+ \noindent\unvbox\@tempboxa
+ \clearpage
+ \@tempdima=\ht\mktitle@bx
+ \advance\@tempdima by \dp\mktitle@bx
+ \ifdim\@tempdima>0.9\textheight\repeat
+ \fi
+ \thispagestyle{firstpagestyle}%
+ \noindent
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \box\mktitle@bx\par
+ \or % acmsmall
+ \box\mktitle@bx\par
+ \or % acmlarge
+ \box\mktitle@bx\par
+ \or % acmtog
+ \twocolumn[\box\mktitle@bx]%
+ \or % sigconf
+ \twocolumn[\box\mktitle@bx]%
+ \or % siggraph
+ \twocolumn[\box\mktitle@bx]%
+ \or % sigplan
+ \twocolumn[\box\mktitle@bx]%
+ \or % sigchi
+ \twocolumn[\box\mktitle@bx]%
+ \or % sigchi-a
+ \par\box\mktitle@bx\par\bigskip
+ \or % acmengage
+ \twocolumn[\box\mktitle@bx]%
+ \or % acmcp
+ \box\mktitle@bx\par
+ \fi
+}
+\def\@mktitle{%
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \@mktitle@i
+ \or % acmsmall
+ \@mktitle@i
+ \or % acmlarge
+ \@mktitle@i
+ \or % acmtog
+ \@mktitle@i
+ \or % sigconf
+ \@mktitle@iii
+ \or % siggraph
+ \@mktitle@iii
+ \or % sigplan
+ \@mktitle@iii
+ \or % sigchi
+ \@mktitle@iii
+ \or % sigchi-a
+ \@mktitle@iv
+ \or % acmengage
+ \@mktitle@iii
+ \or % acmcp
+ \@mktitle@i
+ \fi
+}
+\def\@titlefont{%
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \LARGE\sffamily\bfseries
+ \or % acmsmall
+ \LARGE\sffamily\bfseries
+ \or % acmlarge
+ \LARGE\sffamily\bfseries
+ \or % acmtog
+ \Huge\sffamily
+ \or % sigconf
+ \Huge\sffamily\bfseries
+ \or % siggraph
+ \Huge\sffamily\bfseries
+ \or % sigplan
+ \Huge\bfseries
+ \or % sigchi
+ \Huge\sffamily\bfseries
+ \or % sigchi-a
+ \Huge\bfseries
+ \or % acmengage
+ \Huge\sffamily\bfseries
+ \or % acmcp
+ \LARGE\sffamily\bfseries
+ \fi}
+\def\@subtitlefont{\normalsize
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \mdseries
+ \or % acmsmall
+ \mdseries
+ \or % acmlarge
+ \mdseries
+ \or % acmtog
+ \LARGE
+ \or % sigconf
+ \LARGE\mdseries
+ \or % siggraph
+ \LARGE\mdseries
+ \or % sigplan
+ \LARGE\mdseries
+ \or % sigchi
+ \LARGE\mdseries
+ \or % sigchi-a
+ \mdseries
+ \or % acmengage
+ \LARGE\mdseries
+ \or % acmcp
+ \mdseries
+ \fi}
+\def\@mktitle@i{\hsize=\textwidth
+ \if@ACM@acmcp
+ \advance\hsize by -6pc%
+ \fi
+ \@ACM@title@width=\hsize
+ \setbox\mktitle@bx=\vbox{\noindent\@titlefont
+ \parbox[t]{\@ACM@title@width}{\raggedright
+ \@titlefont\noindent
+ \@title\@translatedtitle%
+ \ifx\@subtitle\@empty\else
+ \par\noindent{\@subtitlefont\@subtitle\@translatedsubtitle}%
+ \fi}%
+ \par\bigskip}}%
+\def\@mktitle@iii{\hsize=\textwidth
+ \setbox\mktitle@bx=\vbox{\@titlefont\centering
+ \@ACM@title@width=\hsize
+ \parbox[t]{\@ACM@title@width}{\centering\@titlefont
+ \@title\@translatedtitle%
+ \ifx\@subtitle\@empty\else
+ \par\noindent{\@subtitlefont\@subtitle\@translatedsubtitle}
+ \fi
+ }%
+ \par\bigskip}}%
+\def\@mktitle@iv{\hsize=\textwidth
+ \setbox\mktitle@bx=\vbox{\raggedright\leftskip5pc\@titlefont
+ \noindent\leavevmode\leaders\hrule height 2pt\hfill\kern0pt\par
+ \noindent\@title\@translatedtitle%
+ \ifx\@subtitle\@empty\else
+ \par\noindent\@subtitlefont\@subtitle\@translatedsubtitle%
+ \fi
+ \par\bigskip}}%
+\newbox\@ACM@commabox
+\def\@ACM@addtoaddress#1{%
+ \ifvmode\else
+ \if@ACM@affiliation@obeypunctuation\else
+ \setbox\@ACM@commabox=\hbox{, }%
+ \unskip\cleaders\copy\@ACM@commabox\hskip\wd\@ACM@commabox
+ \fi\fi
+ #1}
+\def\streetaddress#1{\ClassWarning{\@classname}{ACM no longer collects
+ authors' postal addresses. I am ignoring your street
+ address}\unskip\ignorespaces}
+\def\postcode#1{\ClassWarning{\@classname}{ACM no longer collects
+ authors' postal addresses. I am ignoring your postal
+ code}\unskip\ignorespaces}
+\if@ACM@journal
+ \def\position#1{\unskip\ignorespaces}
+ \def\institution#1{\global\@ACM@instpresenttrue
+ \unskip~#1\ignorespaces}
+ \def\city#1{\global\@ACM@citypresenttrue\unskip\ignorespaces}
+ \def\state#1{\unskip\ignorespaces}
+ \newcommand\department[2][0]{\unskip\ignorespaces}
+ \def\country#1{\StrDel{#1}{ }[\@tempa]%
+ \ifx\@tempa\@empty\else
+ \global\@ACM@countrypresenttrue\fi
+ \if@ACM@affiliation@obeypunctuation\else, \fi#1\ignorespaces}
+\else
+ \def\position#1{\if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}%
+ \def\institution#1{\global\@ACM@instpresenttrue
+ \if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}%
+ \newcommand\department[2][0]{\if@ACM@affiliation@obeypunctuation
+ #2\else#2\par\fi}%
+ \def\city#1{\global\@ACM@citypresenttrue\@ACM@addtoaddress{#1}}%
+ \let\state\@ACM@addtoaddress
+ \def\country#1{\global\@ACM@countrypresenttrue\@ACM@addtoaddress{#1}}%
+\fi
+\def\@mkauthors{\begingroup
+ \hsize=\textwidth
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \@mkauthors@i
+ \or % acmsmall
+ \@mkauthors@i
+ \or % acmlarge
+ \@mkauthors@i
+ \or % acmtog
+ \@mkauthors@i
+ \or % sigconf
+ \@mkauthors@iii
+ \or % siggraph
+ \@mkauthors@iii
+ \or % sigplan
+ \@mkauthors@iii
+ \or % sigchi
+ \@mkauthors@iii
+ \or % sigchi-a
+ \@mkauthors@iv
+ \or % acmengage
+ \@mkauthors@iii
+ \or % acmcp
+ \@mkauthors@i
+ \fi
+ \endgroup
+}
+\def\@authorfont{\Large\sffamily}
+\def\@affiliationfont{\normalsize\normalfont}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+ \def\@authorfont{\large\sffamily}
+ \def\@affiliationfont{\small\normalfont}
+\or % acmlarge
+\or % acmtog
+ \def\@authorfont{\LARGE\sffamily}
+ \def\@affiliationfont{\large}
+\or % sigconf
+ \def\@authorfont{\LARGE}
+ \def\@affiliationfont{\large}
+\or % siggraph
+ \def\@authorfont{\normalsize\normalfont}
+ \def\@affiliationfont{\normalsize\normalfont}
+\or % sigplan
+ \def\@authorfont{\Large\normalfont}
+ \def\@affiliationfont{\normalsize\normalfont}
+\or % sigchi
+ \def\@authorfont{\bfseries}
+ \def\@affiliationfont{\mdseries}
+\or % sigchi-a
+ \def\@authorfont{\bfseries}
+ \def\@affiliationfont{\mdseries}
+\or % acmengage
+ \def\@authorfont{\LARGE}
+ \def\@affiliationfont{\large}
+\or % acmcp
+ \def\@authorfont{\large\sffamily}
+ \def\@affiliationfont{\small\normalfont}
+\fi
+\def\@typeset@author@line{%
+ \andify\@currentauthors\par\noindent
+ \@currentauthors\def\@currentauthors{}%
+ \ifx\@currentaffiliations\@empty\else
+ \andify\@currentaffiliations
+ \unskip, {\@currentaffiliations}\par
+ \fi
+ \def\@currentaffiliations{}}
+\newif\if@ACM@instpresent
+\@ACM@instpresenttrue
+\newif\if@ACM@citypresent
+\@ACM@citypresenttrue
+\newif\if@ACM@countrypresent
+\@ACM@countrypresenttrue
+\def\@ACM@resetaffil{%
+ \global\@ACM@instpresentfalse
+ \global\@ACM@citypresentfalse
+ \global\@ACM@countrypresentfalse
+}
+\def\@ACM@checkaffil{%
+ \if@ACM@instpresent\else
+ \ClassWarningNoLine{\@classname}{No institution present for an affiliation}%
+ \fi
+ \if@ACM@citypresent\else
+ \ClassWarningNoLine{\@classname}{No city present for an affiliation}%
+ \fi
+ \if@ACM@countrypresent\else
+ \ClassError{\@classname}{No country present for an affiliation}{ACM
+ requires each author to indicate their country using country macro.}%
+ \fi
+}
+\def\@mkauthors@i{%
+ \def\@currentauthors{}%
+ \def\@currentaffiliations{}%
+ \global\let\and\@typeset@author@line
+ \def\@author##1{%
+ \ifx\@currentauthors\@empty
+ \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}%
+ \else
+ \g@addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}%
+ \fi
+ \gdef\and{}}%
+ \def\email##1##2{}%
+ \def\affiliation##1##2{%
+ \def\@tempa{##2}\ifx\@tempa\@empty\else
+ \ifx\@currentaffiliations\@empty
+ \gdef\@currentaffiliations{%
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}%
+ \@ACM@resetaffil
+ \@affiliationfont##2\@ACM@checkaffil}%
+ \else
+ \g@addto@macro{\@currentaffiliations}{\and
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil
+ ##2\@ACM@checkaffil}%
+ \fi
+ \fi
+ \global\let\and\@typeset@author@line}%
+ \if@ACM@acmcp
+ \advance\hsize by -6pc%
+ \fi
+ \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par\medskip
+ \noindent\addresses\@typeset@author@line
+ \par\medskip}%
+}
+\newbox\author@bx
+\newdimen\author@bx@wd
+\newskip\author@bx@sep
+\author@bx@sep=1pc\relax
+\def\@typeset@author@bx{\bgroup\hsize=\author@bx@wd
+ \def\and{\par}\normalbaselines
+ \global\setbox\author@bx=\vtop{\if@ACM@sigchiamode\else\centering\fi
+ \@authorfont\@currentauthors\par\@affiliationfont
+ \@currentaffiliation}\egroup
+ \box\author@bx\hspace{\author@bx@sep}%
+ \gdef\@currentauthors{}%
+ \gdef\@currentaffiliation{}}
+\def\@mkauthors@iii{%
+ \author@bx@wd=\textwidth\relax
+ \advance\author@bx@wd by -\author@bx@sep\relax
+ \ifnum\@ACM@authorsperrow>0\relax
+ \divide\author@bx@wd by \@ACM@authorsperrow\relax
+ \else
+ \ifcase\num@authorgroups
+ \relax % 0?
+ \or % 1=one author per row
+ \or % 2=two authors per row
+ \divide\author@bx@wd by \num@authorgroups\relax
+ \or % 3=three authors per row
+ \divide\author@bx@wd by \num@authorgroups\relax
+ \or % 4=two authors per row (!)
+ \divide\author@bx@wd by 2\relax
+ \else % three authors per row
+ \divide\author@bx@wd by 3\relax
+ \fi
+ \fi
+ \advance\author@bx@wd by -\author@bx@sep\relax
+ \gdef\@currentauthors{}%
+ \gdef\@currentaffiliation{}%
+ \def\@author##1{\ifx\@currentauthors\@empty
+ \gdef\@currentauthors{\par##1}%
+ \else
+ \g@addto@macro\@currentauthors{\par##1}%
+ \fi
+ \gdef\and{}}%
+ \def\email##1##2{\ifx\@currentaffiliation\@empty
+ \gdef\@currentaffiliation{\bgroup
+ \mathchardef\UrlBreakPenalty=10000\nolinkurl{##2}\egroup}%
+ \else
+ \g@addto@macro\@currentaffiliation{\par\bgroup
+ \mathchardef\UrlBreakPenalty=10000\nolinkurl{##2}\egroup}%
+ \fi}%
+ \def\affiliation##1##2{\ifx\@currentaffiliation\@empty
+ \gdef\@currentaffiliation{%
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil
+ ##2\@ACM@checkaffil}%
+ \else
+ \g@addto@macro\@currentaffiliation{\par
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil
+ ##2\@ACM@checkaffil}%
+ \fi
+ \global\let\and\@typeset@author@bx
+}%
+ \hsize=\textwidth
+ \global\setbox\mktitle@bx=\vbox{\noindent
+ \unvbox\mktitle@bx\par\medskip\leavevmode
+ \lineskip=1pc\relax\centering\hspace*{-1em}%
+ \addresses\let\and\@typeset@author@bx\and\par\bigskip}}
+\def\@mkauthors@iv{%
+ \author@bx@wd=\columnwidth\relax
+ \advance\author@bx@wd by -\author@bx@sep\relax
+ \ifnum\@ACM@authorsperrow>0\relax
+ \divide\author@bx@wd by \@ACM@authorsperrow\relax
+ \else
+ \ifcase\num@authorgroups
+ \relax % 0?
+ \or % 1=one author per row
+ \else % 2=two authors per row
+ \divide\author@bx@wd by 2\relax
+ \fi
+ \fi
+ \advance\author@bx@wd by -\author@bx@sep\relax
+ \gdef\@currentauthors{}%
+ \gdef\@currentaffiliation{}%
+ \def\@author##1{\ifx\@currentauthors\@empty
+ \gdef\@currentauthors{\par##1}%
+ \else
+ \g@addto@macro\@currentauthors{\par##1}%
+ \fi
+ \gdef\and{}}%
+ \def\email##1##2{\ifx\@currentaffiliation\@empty
+ \gdef\@currentaffiliation{\nolinkurl{##2}}%
+ \else
+ \g@addto@macro\@currentaffiliation{\par\nolinkurl{##2}}%
+ \fi}%
+ \def\affiliation##1##2{\ifx\@currentaffiliation\@empty
+ \gdef\@currentaffiliation{%
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil
+ ##2\@ACM@checkaffil}%
+ \else
+ \g@addto@macro\@currentaffiliation{\par
+ \setkeys{@ACM@affiliation@}{obeypunctuation=false}%
+ \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil
+ ##2\@ACM@checkaffil}%
+ \fi
+ \global\let\and\@typeset@author@bx}%
+ \bgroup\hsize=\columnwidth
+ \par\raggedright\leftskip=\z@
+ \lineskip=1pc\noindent
+ \addresses\let\and\@typeset@author@bx\and\par\bigskip\egroup}
+\def\@mkauthorsaddresses{%
+ \ifnum\num@authors>1\relax
+ Authors' \else Author's \fi
+ Contact Information:
+ \bgroup
+ \def\streetaddress##1{\ClassWarning{\@classname}{ACM no longer collects
+ authors' postal addresses. I am ignoring your street
+ address}\unskip\ignorespaces}%
+ \def\postcode##1{\ClassWarning{\@classname}{ACM no longer collects
+ authors' postal addresses. I am ignoring your postal
+ code}\unskip\ignorespaces}%
+ \def\position##1{\unskip\ignorespaces}%
+ \gdef\@ACM@institution@separator{, }%
+ \def\institution##1{\unskip\@ACM@institution@separator ##1\gdef\@ACM@institution@separator{ and }}%
+ \def\city##1{\unskip, ##1}%
+ \def\state##1{\unskip, ##1}%
+ \renewcommand\department[2][0]{\unskip\@addpunct, ##2}%
+ \def\country##1{\unskip, ##1}%
+ \def\and{\unskip; \gdef\@ACM@institution@separator{, }}%
+ \def\@author##1{##1}%
+ \def\email##1##2{\unskip, \nolinkurl{##2}}%
+ \addresses
+ \egroup}
+\AtEndDocument{\if@ACM@nonacm\else\if@ACM@journal
+ \ifx\@authorsaddresses\@empty
+ \ClassWarningNoLine{\@classname}{Authors'
+ addresses are mandatory for ACM journals}%
+ \fi\fi\fi}
+\def\@setaddresses{}
+\def\@authornotemark{\g@addto@macro\@currentauthors{\footnotemark\relax}}
+\def\@@authornotemark#1{\g@addto@macro\@currentauthors{\footnotemark[#1]}}
+\def\@mkteasers{%
+ \ifx\@teaserfigures\@empty\else
+ \def\@teaser##1{\par\bigskip\bgroup
+ \captionsetup{type=figure}##1\egroup\par}
+ \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par
+ \noindent\@Description@presentfalse
+ \@teaserfigures\par\if@Description@present\else
+ \global\@undescribed@imagestrue
+ \ClassWarning{\@classname}{A possible image without
+ description}\fi
+ \medskip}%
+ \fi}
+\def\@mkabstract{\bgroup
+ \ifx\@abstract\@lempty\else
+ {\phantomsection\addcontentsline{toc}{section}{\abstractname}%
+ \if@ACM@journal
+ \everypar{\setbox\z@\lastbox\everypar{}}\small
+ \else
+ \section*{\abstractname}%
+ \fi
+ \ignorespaces\@abstract\par}%
+ \fi\egroup}
+\def\@mktranslatedabstract#1{\selectlanguage{#1}%
+ \if@ACM@journal
+ \everypar{\setbox\z@\lastbox\everypar{}}\small
+ \else
+ \section*{\abstractname}%
+ \fi
+ \ignorespaces}
+\def\@mkbibcitation{\bgroup
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
+ \def\@pages@word{\ifnum\getrefnumber{TotPages}=1\relax page\else pages\fi}%
+ \def\footnotemark{}%
+ \def\\{\unskip{} \ignorespaces}%
+ \def\footnote{\ClassError{\@classname}{Please do not use footnotes
+ inside a \string\title{} or \string\author{} command! Use
+ \string\titlenote{} or \string\authornote{} instead!}}%
+ \def\@article@string{\ifx\@acmArticle\@empty{\ }\else,
+ Article~\@acmArticle\ \fi}%
+ \par\medskip\small\noindent{\bfseries ACM Reference Format:}\par\nobreak
+ \noindent\bgroup
+ \def\\{\unskip{}, \ignorespaces}\authors\egroup. \@acmYear. \@title
+ \ifx\@subtitle\@empty. \else: \@subtitle. \fi
+ \if@ACM@nonacm\else
+ % The 'nonacm' option disables 'printacmref' by default,
+ % and the present \@mkbibcitation definition is never used
+ % in this case. The conditional remains useful if the user
+ % explicitly sets \settopmatter{printacmref=true}.
+ \if@ACM@journal@bibstrip
+ \textit{\@journalNameShort}
+ \@acmVolume, \@acmNumber \@article@string (\@acmPubDate),
+ \ref{TotPages}~\@pages@word.
+ \else
+ In \textit{\@acmBooktitle}%
+ \ifx\@acmEditors\@empty\textit{.}\else
+ \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
+ \fi\
+ ACM, New York, NY, USA%
+ \@article@string\unskip, \ref{TotPages}~\@pages@word.
+ \fi
+ \fi
+ \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
+\par\egroup}
+\def\@printendtopmatter{%
+ \let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig
+ \par\bigskip
+ \let\@vspace\@vspace@acm
+ \let\@vspacer\@vspacer@acm
+ }
+\def\@setthanks{\long\def\thanks##1{\par##1\@addpunct.}\thankses}
+\def\@setauthorsaddresses{\@authorsaddresses\unskip\@addpunct.}
+\def\@typesetengagemetadata{%
+ \def\@setengagemetadata##1##2{\par\noindent\textbf{##1} ##2\par}%
+ \@acmengagemetadata}
+\ExplSyntaxOn
+\AddToHook{cmd/maketitle/before}
+ {\tagstructbegin{tag=Title}\tagmcbegin{} \tag_stop:}
+\AddToHook{cmd/maketitle/after}
+ {\tag_start:\tagmcend\tagstructend }
+\ExplSyntaxOff
+\RequirePackage{fancyhdr}
+\let\ACM@ps@plain\ps@plain
+\let\ACM@ps@myheadings\ps@myheadings
+\let\ACM@ps@headings\ps@headings
+\def\ACM@restore@pagestyle{%
+ \let\ps@plain\ACM@ps@plain
+ \let\ps@myheadings\ACM@ps@myheadings
+ \let\ps@headings\ACM@ps@headings}
+\AtBeginDocument{\ACM@restore@pagestyle}
+\if@ACM@review
+ \newsavebox{\ACM@linecount@bx}
+ \newlength\ACM@linecount@bxht
+ \newcount\ACM@linecount
+ \ACM@linecount\@ne\relax
+ \def\ACM@mk@linecount{%
+ \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{\normalfont
+ \normalsize
+ \setlength{\ACM@linecount@bxht}{0pt}%
+ \loop{\color{red}\scriptsize\the\ACM@linecount}\\
+ \global\advance\ACM@linecount by \@ne
+ \addtolength{\ACM@linecount@bxht}{\baselineskip}%
+ \ifdim\ACM@linecount@bxht<\textheight\repeat
+ {\color{red}\scriptsize\the\ACM@linecount}\hfill
+ \global\advance\ACM@linecount by \@ne}}}
+\fi
+\def\ACM@linecountL{%
+ \if@ACM@review
+ \ACM@mk@linecount
+ \begin{picture}(0,0)%
+ \put(-26,-22){\usebox{\ACM@linecount@bx}}%
+ \end{picture}%
+ \fi}
+\def\ACM@linecountR{%
+ \if@ACM@review
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \relax
+ \or % acmsmall
+ \relax
+ \or % acmlarge
+ \relax
+ \or % acmtog
+ \ACM@mk@linecount
+ \or % sigconf
+ \ACM@mk@linecount
+ \or % siggraph
+ \ACM@mk@linecount
+ \or % sigplan
+ \ACM@mk@linecount
+ \or % sigchi
+ \ACM@mk@linecount
+ \or % sigchi-a
+ \ACM@mk@linecount
+ \or % acmengage
+ \ACM@mk@linecount
+ \or % acmcp
+ \relax
+ \fi
+ \begin{picture}(0,0)%
+ \put(20,-22){\usebox{\ACM@linecount@bx}}%
+ \end{picture}%
+ \fi}
+\if@ACM@timestamp
+ % Subtracting 30 from \time gives us the effect of rounding down despite
+ % \numexpr rounding to nearest
+ \newcounter{ACM@time@hours}
+ \setcounter{ACM@time@hours}{\numexpr (\time - 30) / 60 \relax}
+ \newcounter{ACM@time@minutes}
+ \setcounter{ACM@time@minutes}{\numexpr \time - \theACM@time@hours * 60 \relax}
+ \newcommand\ACM@timestamp{%
+ \footnotesize%
+ \ifx\@acmSubmissionID\@empty\relax\else
+ Submission ID: \@acmSubmissionID.{ }%
+ \fi
+ \the\year-\two@digits{\the\month}-\two@digits{\the\day}{ }%
+ \two@digits{\theACM@time@hours}:\two@digits{\theACM@time@minutes}{. }%
+ Page \thepage\ of \@startPage--\pageref*{TotPages}.%
+ }
+\fi
+\def\@shortauthors{%
+ \if@ACM@anonymous
+ Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi
+ \else\shortauthors\fi}
+\def\@headfootfont{\sffamily\footnotesize}
+\AtBeginDocument{%
+\fancypagestyle{standardpagestyle}{%
+ \fancyhf{}%
+ \renewcommand{\headrulewidth}{\z@}%
+ \renewcommand{\footrulewidth}{\z@}%
+ \def\@acmArticlePage{%
+ \ifx\@acmArticle\empty%
+ \if@ACM@printfolios\thepage\fi%
+ \else%
+ \@acmArticle\if@ACM@printfolios:\thepage\fi%
+ \fi%
+ }%
+ \if@ACM@journal@bibstrip@or@tog
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}%
+ \fancyhead[RO]{\if@ACM@printfolios\thepage\fi}%
+ \fancyhead[RE]{\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL\shorttitle}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}
+ \fi%
+ \or % acmsmall
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont\@acmArticlePage}%
+ \fancyhead[RO]{\@headfootfont\@acmArticlePage}%
+ \fancyhead[RE]{\@headfootfont\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi
+ \or % acmlarge
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyhead[RO]{\@headfootfont
+ \shorttitle\quad\textbullet\quad\@acmArticlePage}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi
+ \or % acmtog
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyhead[RE]{\ACM@linecountR}%
+ \fancyhead[RO]{\@headfootfont
+ \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}%
+ \if@ACM@nonacm\else
+ \if@ACM@journal@bibstrip
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+ Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+ Publication date: \@acmPubDate.}%
+ \else
+ \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+ \acmConference@date, \acmConference@venue.}%
+ \fi
+ \fi
+ \else % Proceedings
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
+ \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}%
+ \if@ACM@nonacm
+ \fancyhead[LE]{\ACM@linecountL}%
+ \fancyhead[RO]{\ACM@linecountR}%
+ \else%
+ \if@ACM@engage
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize
+ EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}%
+ \fancyhead[RO]{\@headfootfont
+ EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
+ \ACM@linecountR}%
+ \else
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue}%
+ \fancyhead[RO]{\@headfootfont
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue\ACM@linecountR}%
+ \fi
+ \fi
+ \fi
+ \else % Proceedings
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
+ \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}%
+ \if@ACM@nonacm
+ \fancyhead[LE]{\ACM@linecountL}%
+ \fancyhead[RO]{\ACM@linecountR}%
+ \else%
+ \if@ACM@engage
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}%
+ \fancyhead[RO]{\@headfootfont
+ EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
+ \ACM@linecountR}%
+ \else
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue}%
+ \fancyhead[RO]{\@headfootfont
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue\ACM@linecountR}%
+ \fi
+ \fi
+ \fi
+ \if@ACM@sigchiamode
+ \fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}%
+ \fi
+ \if@ACM@timestamp
+ \fancyfoot[LO,RE]{\ACM@timestamp}
+ \fi
+ \if@ACM@acmcp
+ \renewcommand{\footrulewidth}{0.1\p@}%
+ \fancyheadoffset[L]{46pt}%
+ \fancyhead[L]{\makebox[\z@][l]{%
+ \raisebox{-\dimexpr(0.2\textheight*(\ACM@ArticleType@nr-2))}{%
+ \rotatebox{90}{\colorbox{@ACM@Article@color}{\color{white}%
+ \strut\ACM@ArticleType~Article}}}}%
+ \ACM@linecountL}%
+ \fancyhead[R]{\makebox[\z@][r]{\box\@ACM@acmcpbox}}%
+ \fancyfoot[L,C]{}%
+ \fancyfoot[R]{\footnotesize
+ \@journalName, Volume~\@acmVolume, Issue~\@acmNumber,
+ \ifx\@acmArticle\@empty\else Article~\@acmArticle\fi\space
+ (\@acmPubDate)\ifx\@acmDOI\@empty\else\\\@formatdoi{\@acmDOI}\fi}
+ \fi
+}%
+\pagestyle{standardpagestyle}
+}
+\AtBeginDocument{%
+\fancypagestyle{firstpagestyle}{%
+ \fancyhf{}%
+ \renewcommand{\headrulewidth}{\z@}%
+ \renewcommand{\footrulewidth}{\z@}%
+ \if@ACM@journal@bibstrip@or@tog
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[R]{\@acmBadgeR}%
+ \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \fi%
+ \or % acmsmall
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
+ \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[RO]{\@acmBadgeR}%
+ \fancyhead[RE]{\@acmBadgeR}%
+ \or % acmlarge
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
+ \fancyhead[RO]{\@acmBadgeR}%
+ \fancyhead[RE]{\@acmBadgeR}%
+ \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
+ \or % acmtog
+ \if@ACM@nonacm\else%
+ \if@ACM@journal@bibstrip
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+ Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+ Publication date: \@acmPubDate.}%
+ \else
+ \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+ \acmConference@date, \acmConference@venue.}%
+ \fi
+ \fi%
+ \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[R]{\@acmBadgeR\ACM@linecountR}%
+ \else % Conference proceedings
+ \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[R]{\@acmBadgeR\ACM@linecountR}%
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fi
+ \else
+ \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
+ \fancyhead[R]{\@acmBadgeR\ACM@linecountR}%
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fi
+ \if@ACM@timestamp
+ \ifnum\ACM@format@nr=0\relax % Manuscript
+ \fancyfoot[LO,RE]{\ACM@timestamp\quad
+ \if@ACM@nonacm\else
+ \footnotesize Manuscript submitted to ACM
+ \fi}
+ \else
+ \fancyfoot[LO,RE]{\ACM@timestamp}
+ \fi
+ \fi
+ \if@ACM@acmcp
+ \renewcommand{\footrulewidth}{0.1\p@}%
+ \fancyheadoffset[L]{46pt}%
+ \fancyhead[L]{\makebox[\z@][l]{%
+ \raisebox{-\dimexpr(0.2\textheight*(\ACM@ArticleType@nr-2))}{%
+ \rotatebox{90}{\colorbox{@ACM@Article@color}{\color{white}%
+ \strut\ACM@ArticleType~Article}}}}%
+ \ACM@linecountL\@acmBadgeL}%
+ \fancyhead[R]{\@acmBadgeR\makebox[\z@][r]{\box\@ACM@acmcpbox}}%
+ \fancyfoot[L,C]{}%
+ \fancyfoot[R]{\footnotesize
+ \@journalName, Volume~\@acmVolume, Issue~\@acmNumber,
+ \ifx\@acmArticle\@empty\else Article~\@acmArticle\fi\space
+ (\@acmPubDate)\ifx\@acmDOI\@empty\else\\\@formatdoi{\@acmDOI}\fi}
+ \fi
+}}
+\def\ACM@NRadjust#1{%
+ \begingroup
+ \expandafter\ifx\csname Sectionformat\endcsname\relax
+ % do nothing when \Sectionformat is unknown
+ \def\next{\endgroup #1}%
+ \else
+ \def\next{\endgroup
+ \let\realSectionformat\Sectionformat
+ \def\ACM@sect@format@{#1}%
+ \let\Sectionformat\ACM@NR@adjustedSectionformat
+ %% next lines added 2018-06-17 to ensure section number is styled
+ \let\real@adddotafter\@adddotafter
+ \let\@adddotafter\ACM@adddotafter
+ #1{}% imposes the styles, but nullifies \MakeUppercase
+ \let\@adddotafter\real@adddotafter
+ }%
+ \fi \next
+}
+\def\ACM@NR@adjustedSectionformat#1#2{%
+ \realSectionformat{\ACM@sect@format{#1}}{#2}%
+ \let\Sectionformat\realSectionformat}
+\DeclareRobustCommand{\ACM@sect@format}{\ACM@sect@format@}
+\def\ACM@sect@format@null#1{#1}
+\let\ACM@sect@format@\ACM@sect@format@null
+\AtBeginDocument{%
+ \expandafter\ifx\csname LTX@adddotafter\endcsname\relax
+ \let\LTX@adddotafter\@adddotafter
+ \fi
+}
+\def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi}
+\renewcommand\section{\def\@toclevel{1}%
+ \@startsection{section}{1}{\z@}%
+ {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {.25\baselineskip}%
+ {\ACM@NRadjust\@secfont}}
+\renewcommand\subsection{\def\@toclevel{2}%
+ \@startsection{subsection}{2}{\z@}%
+ {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {.25\baselineskip}%
+ {\ACM@NRadjust\@subsecfont}}
+\renewcommand\subsubsection{\def\@toclevel{3}%
+ \@startsection{subsubsection}{3}{\z@}%
+ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {-3.5\p@}%
+ {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}}
+\renewcommand\paragraph{\def\@toclevel{4}%
+ \@startsection{paragraph}{4}{\parindent}%
+ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {-3.5\p@}%
+ {\ACM@NRadjust{\@parfont\@adddotafter}}}
+\newcommand\noindentparagraph{\def\@toclevel{4}%
+ \@startsection{paragraph}{4}{\z@}%
+ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {-3.5\p@}%
+ {\ACM@NRadjust{\@parfont}}}
+\renewcommand\part{\def\@toclevel{9}%
+ \@startsection{part}{9}{\z@}%
+ {-10\p@ \@plus -4\p@ \@minus -2\p@}%
+ {4\p@}%
+ {\ACM@NRadjust\@parfont}}
+\def\section@raggedright{\@rightskip\@flushglue
+ \rightskip\@rightskip
+ \leftskip\z@skip
+ \parindent\z@}
+\def\@secfont{\sffamily\bfseries\section@raggedright}
+\def\@subsecfont{\sffamily\bfseries\section@raggedright}
+\def\@subsubsecfont{\sffamily\itshape}
+\def\@parfont{\itshape}
+\setcounter{secnumdepth}{3}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+ \def\@secfont{\sffamily\large\section@raggedright}
+ \def\@subsecfont{\sffamily\large\section@raggedright}
+\or % acmtog
+ \def\@secfont{\sffamily\large\section@raggedright}
+ \def\@subsecfont{\sffamily\large\section@raggedright}
+\or % sigconf
+ \def\@secfont{\bfseries\Large\section@raggedright}
+ \def\@subsecfont{\bfseries\Large\section@raggedright}
+\or % siggraph
+ \def\@secfont{\sffamily\bfseries\Large\section@raggedright}
+ \def\@subsecfont{\sffamily\bfseries\Large\section@raggedright}
+\or % sigplan
+ \def\@secfont{\bfseries\Large\section@raggedright}
+ \def\@subsecfont{\bfseries\section@raggedright}
+ \def\@subsubsecfont{\bfseries\section@raggedright}
+ \def\@parfont{\bfseries\itshape}
+ \def\@subparfont{\itshape}
+\or % sigchi
+ \setcounter{secnumdepth}{1}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
+ \def\@subsecfont{\sffamily\bfseries\section@raggedright}
+\or % sigchi-a
+ \setcounter{secnumdepth}{0}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
+ \def\@subsecfont{\sffamily\bfseries\section@raggedright}
+\or % acmengage
+ \def\@secfont{\bfseries\Large\section@raggedright}
+ \def\@subsecfont{\bfseries\Large\section@raggedright}
+\or %acmcp
+\fi
+\def\@adddotafter#1{#1\@addpunct{.}}
+\def\@addspaceafter#1{#1\@addpunct{\enspace}}
+\if@ACM@acmcp
+ \setcounter{secnumdepth}{-1}%
+\fi
+\providecommand*\@dotsep{4.5}
+\def\@acmplainbodyfont{\itshape}
+\def\@acmplainindent{\parindent}
+\def\@acmplainheadfont{\scshape}
+\def\@acmplainnotefont{\@empty}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+ \def\@acmplainbodyfont{\itshape}
+ \def\@acmplainindent{\z@}
+ \def\@acmplainheadfont{\bfseries}
+ \def\@acmplainnotefont{\normalfont}
+\or % sigchi
+\or % sigchi-a
+\or % acmengage
+\or % acmcp
+\fi
+\newtheoremstyle{acmplain}%
+ {.5\baselineskip\@plus.2\baselineskip
+ \@minus.2\baselineskip}% space above
+ {.5\baselineskip\@plus.2\baselineskip
+ \@minus.2\baselineskip}% space below
+ {\@acmplainbodyfont}% body font
+ {\@acmplainindent}% indent amount
+ {\@acmplainheadfont}% head font
+ {.}% punctuation after head
+ {.5em}% spacing after head
+ {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmplainnotefont(#3)}}}% head spec
+\def\@acmdefinitionbodyfont{\normalfont}
+\def\@acmdefinitionindent{\parindent}
+\def\@acmdefinitionheadfont{\itshape}
+\def\@acmdefinitionnotefont{\@empty}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+ \def\@acmdefinitionbodyfont{\normalfont}
+ \def\@acmdefinitionindent{\z@}
+ \def\@acmdefinitionheadfont{\bfseries}
+ \def\@acmdefinitionnotefont{\normalfont}
+\or % sigchi
+\or % sigchi-a
+\or % acmengage
+\or % acmcp
+\fi
+\newtheoremstyle{acmdefinition}%
+ {.5\baselineskip\@plus.2\baselineskip
+ \@minus.2\baselineskip}% space above
+ {.5\baselineskip\@plus.2\baselineskip
+ \@minus.2\baselineskip}% space below
+ {\@acmdefinitionbodyfont}% body font
+ {\@acmdefinitionindent}% indent amount
+ {\@acmdefinitionheadfont}% head font
+ {.}% punctuation after head
+ {.5em}% spacing after head
+ {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmdefinitionnotefont(#3)}}}% head spec
+\theoremstyle{acmplain}
+\AtEndPreamble{%
+ \if@ACM@acmthm
+ \theoremstyle{acmplain}
+ \@ifundefined{theorem}{%
+ \newtheorem{theorem}{Theorem}[section]
+ }{}
+ \@ifundefined{conjecture}{%
+ \newtheorem{conjecture}[theorem]{Conjecture}
+ }{}
+ \@ifundefined{proposition}{%
+ \newtheorem{proposition}[theorem]{Proposition}
+ }{}
+ \@ifundefined{lemma}{%
+ \newtheorem{lemma}[theorem]{Lemma}
+ }{}
+ \@ifundefined{corollary}{%
+ \newtheorem{corollary}[theorem]{Corollary}
+ }{}
+ \theoremstyle{acmdefinition}
+ \@ifundefined{example}{%
+ \newtheorem{example}[theorem]{Example}
+ }{}
+ \@ifundefined{definition}{%
+ \newtheorem{definition}[theorem]{Definition}
+ }{}
+ \fi
+ \theoremstyle{acmplain}
+}
+\def\@proofnamefont{\scshape}
+\def\@proofindent{\indent}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+ \def\@proofnamefont{\itshape}
+ \def\@proofindent{\noindent}
+\or % sigchi
+\or % sigchi-a
+\or % acmengage
+\or % acmcp
+\fi
+\renewenvironment{proof}[1][\proofname]{\par
+ \pushQED{\qed}%
+ \normalfont \topsep6\p@\@plus6\p@\relax
+ \trivlist
+ \item[\@proofindent\hskip\labelsep
+ {\@proofnamefont #1\@addpunct{.}}]\ignorespaces
+}{%
+ \popQED\endtrivlist\@endpefalse
+}
+\AtEndPreamble{%
+ \if@ACM@pbalance
+ \global\@ACM@balancefalse
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \or % acmsmall
+ \or % acmlarge
+ \or % acmtog
+ \RequirePackage{pbalance}%
+ \or % sigconf
+ \RequirePackage{pbalance}%
+ \or % siggraph
+ \RequirePackage{pbalance}%
+ \or % sigplan
+ \RequirePackage{pbalance}%
+ \or % sigchi
+ \RequirePackage{pbalance}%
+ \or % sigchi-a
+ \or % acmengage
+ \RequirePackage{pbalance}%
+ \or % acmcp
+ \fi
+ \fi
+ \if@ACM@balance
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \global\@ACM@balancefalse
+ \or % acmsmall
+ \global\@ACM@balancefalse
+ \or % acmlarge
+ \global\@ACM@balancefalse
+ \or % acmtog
+ \RequirePackage{balance}%
+ \or % sigconf
+ \RequirePackage{balance}%
+ \or % siggraph
+ \RequirePackage{balance}%
+ \or % sigplan
+ \RequirePackage{balance}%
+ \or % sigchi
+ \RequirePackage{balance}%
+ \or % sigchi-a
+ \global\@ACM@balancefalse
+ \or % acmengage
+ \RequirePackage{balance}%
+ \or % acmcp
+ \global\@ACM@balancefalse
+ \fi
+ \fi
+}
+\AtEndDocument{%
+ \if@ACM@balance
+ \if@twocolumn
+ \balance
+ \fi\fi}
+\newcommand\acksname{Acknowledgments}
+\specialcomment{acks}{%
+ \begingroup
+ \section*{\acksname}
+ \phantomsection\addcontentsline{toc}{section}{\acksname}
+}{%
+ \endgroup
+}
+\def\grantsponsor#1#2#3{#2}
+\newcommand\grantnum[3][]{#3%
+ \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi}
+\AtEndPreamble{%
+\if@ACM@screen
+ \includecomment{screenonly}
+ \excludecomment{printonly}
+\else
+ \excludecomment{screenonly}
+ \includecomment{printonly}
+\fi
+\if@ACM@anonymous
+ \excludecomment{anonsuppress}
+ \excludecomment{acks}
+\else
+ \includecomment{anonsuppress}
+\fi}
+\newcommand\showeprint[2][arxiv]{%
+ \def\@tempa{#1}%
+ \ifx\@tempa\@empty\def\@tempa{arxiv}\fi
+ \def\@tempb{arxiv}%
+ \ifx\@tempa\@tempb\relax
+ arXiv:\href{https://arxiv.org/abs/#2}{#2}%
+ \else
+ \def\@tempb{arXiv}%
+ \ifx\@tempa\@tempb\relax
+ arXiv:\href{https://arxiv.org/abs/#2}{#2}%
+ \else
+ #1:#2%
+ \fi
+ \fi}
+\def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi
+ \columnseprule\z@ \columnsep 35\p@
+ \@indextitlestyle
+ \let\item\@idxitem
+ \parindent\z@ \parskip\z@\@plus.3\p@\relax
+ \raggedright
+ \hyphenpenalty\@M
+ \footnotesize}
+\let\@vspace@orig=\@vspace
+\let\@vspacer@orig=\@vspacer
+\apptocmd{\@vspace}{\ClassWarning{\@classname}{\string\vspace\space should
+ only be used to provide space above/below surrounding
+ objects}}{}{}
+\apptocmd{\@vspacer}{\ClassWarning{\@classname}{\string\vspace\space should
+ only be used to provide space above/below surrounding
+ objects}}{}{}
+\let\@vspace@acm=\@vspace
+\let\@vspacer@acm=\@vspacer
+\let\ACM@origbaselinestretch\baselinestretch
+\AtEndDocument{\ifx\baselinestretch\ACM@origbaselinestretch\else
+ \ClassError{\@classname}{An attempt to redefine
+ \string\baselinestretch\space detected. Please do not do this for
+ ACM submissions!}\fi}
+\normalsize\normalfont\frenchspacing
+\endinput
+%%
+%% End of file `acmart-tagged.cls'.
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index d0bbde47afb..b6ea2e7f9c4 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -38,7 +38,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-[2024/05/27 v2.08 Typesetting articles for the Association for Computing Machinery]
+[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery]
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
\ClassWarning{\@classname}{%
@@ -47,13 +47,13 @@
\RequirePackage{xkeyval}
\RequirePackage{xstring}
\RequirePackage{iftex}
-\define@choicekey*+{acmart.cls}{format}[\ACM@format\ACM@format@nr]{%
+\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{%
manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph,
sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{%
\ClassError{\@classname}{The option format must be manuscript,
acmsmall, acmlarge, acmtog, sigconf, siggraph,
sigplan, sigchi or sigchi-a}}
-\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{acmart.cls}{format=#1}}}
+\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}}
\@DeclareACMFormat{manuscript}
\@DeclareACMFormat{acmsmall}
\@DeclareACMFormat{acmlarge}
@@ -66,7 +66,7 @@
\@DeclareACMFormat{acmengage}
\@DeclareACMFormat{acmcp}
\ExecuteOptionsX{format}
-\define@boolkey+{acmart.cls}[@ACM@]{screen}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{%
\if@ACM@screen
\PackageInfo{\@classname}{Using screen mode}%
\else
@@ -74,7 +74,7 @@
\fi}{\PackageError{\@classname}{The option screen can be either true or
false}}
\ExecuteOptionsX{screen=false}
-\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{%
\if@ACM@urlbreakonhyphens
\PackageInfo{\@classname}{Using breaking urls on hyphens}%
\else
@@ -82,7 +82,7 @@
\fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or
false}}
\ExecuteOptionsX{urlbreakonhyphens=true}
-\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{%
\if@ACM@acmthm
\PackageInfo{\@classname}{Requiring acmthm}%
\else
@@ -90,7 +90,7 @@
\fi}{\PackageError{\@classname}{The option acmthm can be either true or
false}}
\ExecuteOptionsX{acmthm=true}
-\define@boolkey+{acmart.cls}[@ACM@]{review}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{%
\if@ACM@review
\PackageInfo{\@classname}{Using review mode}%
\AtBeginDocument{\@ACM@printfoliostrue}%
@@ -99,7 +99,7 @@
\fi}{\PackageError{\@classname}{The option review can be either true or
false}}
\ExecuteOptionsX{review=false}
-\define@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{%
\if@ACM@authorversion
\PackageInfo{\@classname}{Using authorversion mode}%
\else
@@ -107,7 +107,7 @@
\fi}{\PackageError{\@classname}{The option authorversion can be either true or
false}}
\ExecuteOptionsX{authorversion=false}
-\define@boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{%
\if@ACM@nonacm
\PackageInfo{\@classname}{Using nonacm mode}%
\AtBeginDocument{\@ACM@printacmreffalse}%
@@ -119,15 +119,15 @@
\fi}{\PackageError{\@classname}{The option nonacm can be either true or
false}}
\ExecuteOptionsX{nonacm=false}
-\define@boolkey+{acmart.cls}[@ACM@]{balance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{%
\PackageError{\@classname}{The option balance can be either true or
false}}
\ExecuteOptionsX{balance}
-\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{%
\PackageError{\@classname}{The option pbalance can be either true or
false}}
\ExecuteOptionsX{pbalance=false}
-\define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{%
\if@ACM@natbib
\PackageInfo{\@classname}{Explicitly selecting natbib mode}%
\else
@@ -135,7 +135,7 @@
\fi}{\PackageError{\@classname}{The option natbib can be either true or
false}}
\ExecuteOptionsX{natbib=true}
-\define@boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{%
\if@ACM@anonymous
\PackageInfo{\@classname}{Using anonymous mode}%
\else
@@ -143,7 +143,7 @@
\fi}{\PackageError{\@classname}{The option anonymous can be either true or
false}}
\ExecuteOptionsX{anonymous=false}
-\define@boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{%
\if@ACM@timestamp
\PackageInfo{\@classname}{Using timestamp mode}%
\else
@@ -151,7 +151,7 @@
\fi}{\PackageError{\@classname}{The option timestamp can be either true or
false}}
\ExecuteOptionsX{timestamp=false}
-\define@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{%
\if@ACM@authordraft
\PackageInfo{\@classname}{Using authordraft mode}%
\@ACM@timestamptrue
@@ -189,13 +189,13 @@
\ClassWarning{\@classname}{%
The format siggraph is now obsolete.\MessageBreak
I am switching to sigconf.}
- \setkeys{acmart.cls}{format=sigconf}
+ \setkeys{\@classname.cls}{format=sigconf}
\fi
\ifnum\ACM@format@nr=7\relax % sigchi
\ClassWarning{\@classname}{%
The format sigchi is now obsolete.\MessageBreak
I am switching to sigconf.}
- \setkeys{acmart.cls}{format=sigconf}
+ \setkeys{\@classname.cls}{format=sigconf}
\fi
\ifnum\ACM@format@nr=8\relax % sigchi
\ClassWarning{\@classname}{%
@@ -546,7 +546,6 @@
\fi}%
\fi
\ignorespaces}
-\def\@seccntformat#1{\csname the#1\endcsname\quad}
\def\@ssect#1#2#3#4#5{%
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
@@ -559,6 +558,7 @@
\def\@svsechd{#4{\hskip #1\relax #5}}%
\fi
\@xsect{#3}}
+\def\@seccntformat#1{\csname the#1\endcsname\quad}
\def\@starttoc#1#2{\begingroup\makeatletter
\setTrue{#1}%
\par\removelastskip\vskip\z@skip
@@ -2001,22 +2001,6 @@
Copyright held by the owner/author(s).
\fi}
\def\@formatdoi#1{\url{https://doi.org/#1}}
-\def\@ACM@copyright@check@cc{%
- \if@ACM@nonacm
- \ClassInfo{\@classname}{Using CC license with a non-acm
- material}%
- \else
- \if@ACM@engage
- \ClassInfo{\@classname}{Using CC license with ACM Enage
- material}%
- \else
- \ClassWarning{\@classname}{%
- Sorry, Creative Commons licenses are\MessageBreak
- currently not used with ACM publications\MessageBreak
- typeset by the authors}{Please use nonacm
- option or ACM Engage class to enable CC licenses}%
- \fi
- \fi}
\def\@copyrightpermission{%
\ifcase\acm@copyrightmode\relax % none
\or % acmcopyright
@@ -2145,7 +2129,6 @@
disseminate the work on their personal and corporate Web sites with
the appropriate attribution.
\or % CC
- \@ACM@copyright@check@cc
\IfEq{\ACM@cc@type}{zero}{%
\def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{%
\edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}%
@@ -2321,7 +2304,7 @@
pdfsubject={\@concepts},
pdfkeywords={\@keywords},
pdfcreator={LaTeX with acmart
- \csname ver@acmart.cls\endcsname\space
+ \csname ver@\@classname.cls\endcsname\space
and hyperref
\csname ver@hyperref.sty\endcsname}}%
\andify\authors
@@ -3263,28 +3246,33 @@
\fi
}
\def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi}
-\renewcommand\section{\@startsection{section}{1}{\z@}%
+\renewcommand\section{\def\@toclevel{1}%
+ \@startsection{section}{1}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
{\ACM@NRadjust\@secfont}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\renewcommand\subsection{\def\@toclevel{2}%
+ \@startsection{subsection}{2}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
{\ACM@NRadjust\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\renewcommand\subsubsection{\def\@toclevel{3}%
+ \@startsection{subsubsection}{3}{\z@}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
{\ACM@NRadjust{\@subsubsecfont\@adddotafter}}}
-\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
+\renewcommand\paragraph{\def\@toclevel{4}%
+ \@startsection{paragraph}{4}{\parindent}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
{\ACM@NRadjust{\@parfont\@adddotafter}}}
-\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\noindentparagraph{\def\@toclevel{4}%
+ \@startsection{paragraph}{4}{\z@}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
{\ACM@NRadjust{\@parfont}}}
-
-\renewcommand\part{\@startsection{part}{9}{\z@}%
+\renewcommand\part{\def\@toclevel{9}%
+ \@startsection{part}{9}{\z@}%
{-10\p@ \@plus -4\p@ \@minus -2\p@}%
{4\p@}%
{\ACM@NRadjust\@parfont}}
diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty
index cd6f1cf2921..26054b1c25e 100644
--- a/Master/texmf-dist/tex/latex/acronym/acronym.sty
+++ b/Master/texmf-dist/tex/latex/acronym/acronym.sty
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% acronym.dtx (with options: `acronym')
-%% Copyright 1995--2020 by Tobias Oetiker (tobi@oetiker.ch)
+%% Copyright 1995--2021 by Tobias Oetiker (tobi@oetiker.ch)
%% and individual authors listed elsewhere.
%% All rights reserved.
%%
@@ -40,8 +40,8 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2020/04/17
- v1.47
+\ProvidesPackage{acronym}[2024/03/30
+ v1.49
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix,xstring}
\newif\ifAC@footnote
@@ -50,6 +50,9 @@
\newif\ifAC@nohyperlinks
\AC@nohyperlinksfalse
\DeclareOption{nohyperlinks}{\AC@nohyperlinkstrue}
+\newif\ifAC@noforwardlinks
+\AC@noforwardlinksfalse
+\DeclareOption{noforwardlinks}{\AC@noforwardlinkstrue}
\newif\ifAC@noacroprefix
\AC@noacroprefixfalse
\DeclareOption{noacroprefix}{\AC@noacroprefixtrue}
@@ -97,7 +100,7 @@
\AtBeginDocument{%
\@ifpackageloaded{hyperref}
{\let\AC@hyperlink=\hyperlink
- \let\AC@hyperref=\hyperref
+ \ifAC@noforwardlinks\else\let\AC@hyperref=\hyperref\fi
\newcommand*\AC@raisedhypertarget[2]{%
\Hy@raisedlink{\hypertarget{#1}{}}#2}%
\let\AC@hypertarget=\AC@raisedhypertarget
@@ -152,6 +155,8 @@
\def\Acp#1{\AChy@call{#1}\@Acp}%
\def\acfi#1{\AChy@call{#1}\AChy@acf}%
\def\Acfi#1{\AChy@call{#1}\AChy@Acf}%
+ \def\acfip#1{\AChy@call{#1}\AChy@acfp}%
+ \def\Acfip#1{\AChy@call{#1}\AChy@Acfp}%
\let\acsu\acs
\let\aclu\acl
\let\Aclu\Acl
@@ -201,6 +206,13 @@
\StrSplit{#1}{1}{\head}{\tail}%
\MakeUppercase\head\tail%
}
+\newcommand{\@firstupper@maybe}{%
+ \ifAC@upper
+ \expandafter\@firstupper
+ \else
+ \expandafter\@firstofone
+ \fi
+}
\ifAC@noacroprefix
\newcommand*\AC@prefix{}
\else
@@ -391,7 +403,7 @@
}
\newcommand*\AC@aclp[1]{%
\ifcsname fn@#1@PL\endcsname
- \csname fn@#1@PL\endcsname
+ \@firstupper@maybe{\csname fn@#1@PL\endcsname}%
\else
\AC@acl{#1}s%
\fi
@@ -415,11 +427,7 @@
\PackageWarning{acronym}{Acronym `#3' is not defined}%
\textbf{#3!}%
\else
- \ifAC@upper
- \@firstupper{\expandafter#2#1}%
- \else
- \expandafter#2#1%
- \fi
+ \@firstupper@maybe{\expandafter#2#1}%
\fi
}
\newcommand*\AC@acs[1]{%
@@ -436,7 +444,7 @@
\newcommand*{\acsa}[1]{%
\texorpdfstring{\protect\@acs{#1}}{#1}}
\newcommand*{\@acs}[1]{%
- \acsfont{\AC@acs{#1}}%
+ \acsfont{\AC@placelabel@part{#1}\AC@acs{#1}}%
%% having a footnote on acs sort of defeats the purpose
%% \ifAC@footnote
%% \footnote{\AC@acl{#1}{}}%
@@ -447,10 +455,10 @@
\newcommand*{\Acl}{\AC@starredfalse\protect\@Acl}%
\WithSuffix\newcommand\Acl*{\AC@starredtrue\protect\@Acl}%
\newcommand*{\@acl}[1]{%
- \AC@acl{#1}%
+ \AC@placelabel@part{#1}\AC@acl{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\@Acl}[1]{%
- \AC@Acl{#1}%
+ \AC@placelabel@part{#1}\AC@Acl{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*\@verridelabel[1]{%
\@bsphack
@@ -518,6 +526,12 @@
\let\AC@undonewlabel\@gobble
\fi
}%
+\newcommand*\AC@placelabel@part[1]{%
+ \expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used
+ \else
+ {\AC@phantomsection\@verridelabel{acro:#1}}%
+ \fi
+}%
\newcommand*\AC@placelabel[1]{%
\expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used
\else
@@ -591,12 +605,12 @@
\newcommand*{\@iaci}[1]{%
\ifcsname fn@#1@IL\endcsname
\ifAC@dua
- \csname fn@#1@IL\endcsname%
+ \@firstupper@maybe{\csname fn@#1@IL\endcsname}%
\else
\expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used%
\csname fn@#1@IS\endcsname%
\else
- \csname fn@#1@IL\endcsname%
+ \@firstupper@maybe{\csname fn@#1@IL\endcsname}%
\fi
\fi
\else
@@ -615,17 +629,17 @@
\newcommand*{\acspa}[1]{%
\texorpdfstring{\protect\@acsp{#1}}{\AC@acsp{#1}}}
\newcommand*{\@acsp}[1]{%
- \acsfont{\AC@acsp{#1}}%
+ \acsfont{\AC@placelabel@part{#1}\AC@acsp{#1}}%
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\aclp}{\AC@starredfalse\protect\@aclp}%
\WithSuffix\newcommand\aclp*{\AC@starredtrue\protect\@aclp}%
\newcommand*{\Aclp}{\AC@starredfalse\protect\@Aclp}%
\WithSuffix\newcommand\Aclp*{\AC@starredtrue\protect\@Aclp}%
\newcommand*{\@aclp}[1]{%
- \AC@aclp{#1}%
+ \AC@placelabel@part{#1}\AC@aclp{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\@Aclp}[1]{%
- \AC@Aclp{#1}%
+ \AC@placelabel@part{#1}\AC@Aclp{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\acfp}{\AC@starredfalse\protect\acfpa}%
\WithSuffix\newcommand\acfp*{\AC@starredtrue\protect\acfpa}%
@@ -705,6 +719,28 @@
\acfsfont{(\acsfont{\AC@acs{#2}})}%
}%
\ifAC@starred\else\AC@logged{#2}\fi}
+\newcommand*{\acfip}{\AC@starredfalse\protect\acfipa}%
+\WithSuffix\newcommand\acfip*{\AC@starredtrue\protect\acfipa}%
+\newcommand*{\Acfip}{\AC@starredfalse\protect\Acfipa}%
+\WithSuffix\newcommand\Acfip*{\AC@starredtrue\protect\Acfipa}%
+\newcommand{\acfipa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@acfip[#1]{#2}}{{\AC@aclp{#2}} (#2)}}
+\newcommand{\Acfipa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@Acfip[#1]{#2}}{{\AC@Aclp{#2}} (#2)}}
+\newcommand*{\@acfip}[2][\AC@linebreakpenalty]{%
+ \acffont{%
+ \AC@placelabel{#2}{\itshape\AC@aclp{#2}}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acsp{#2}})}%
+ }%
+ \ifAC@starred\else\AC@logged{#2}\fi}
+\newcommand*{\@Acfip}[2][\AC@linebreakpenalty]{%
+ \acffont{%
+ \AC@placelabel{#2}{\itshape\AC@Aclp{#2}}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acsp{#2}})}%
+ }%
+ \ifAC@starred\else\AC@logged{#2}\fi}
\newcommand{\acused}[1]{%
\global\expandafter\let\csname AC@\AC@prefix#1\endcsname\AC@used%
\AC@addtoAC@clearlist{#1}}
diff --git a/Master/texmf-dist/tex/latex/adforn/adforn.sty b/Master/texmf-dist/tex/latex/adforn/adforn.sty
index b52f55068c5..d9634438e26 100644
--- a/Master/texmf-dist/tex/latex/adforn/adforn.sty
+++ b/Master/texmf-dist/tex/latex/adforn/adforn.sty
@@ -1,26 +1,86 @@
+%%
+%% This is file `adforn.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% adforn.dtx (with options: `sty')
+%%
+%% Copyright (C) 2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% fontscripts. You may however distribute the package fontscripts without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{adforn}[2019/10/13 v1.1b adforn CFR]
-\RequirePackage{pifont}
-{\Pifont{OrnementsADF}}
-
-\newcommand*{\adforn}[1]{%
- \Pisymbol{OrnementsADF}{#1}}
-
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: adforn.dtx 10442 2024-09-29 18:25:09Z cfrees $}[v1.2 \revinfo]
+\DefineFileInfoSVN[adforn]
+\newif\if@adforn@digonnew
+\@ifundefined{ExplLoaderFileDate}{%
+ \IfFileExists{expl3.sty}{%
+ \RequirePackage{expl3}%
+ }{%
+ \@adforn@digonnewfalse
+ }%
+}{\@adforn@digonnewtrue}
+\if@adforn@digonnew
+\ExplSyntaxOn
+\keys_define:nn { adforn }
+{
+ scale .tl_set:N = \adforn@scale,
+ scale .initial:V = \@empty,
+}
+\else
+ \let\adforn@scale\@empty
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
+\IfFormatAtLeastTF { 2022-06-01 }
+{
+ \ProcessKeyOptions [ adforn ]
+}{
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { adforn }
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ExplSyntaxOff
+\DeclareRobustCommand{\adforn@style}{%% do NOT break line below!
+ \not@math@alphabet\adforn@style\relax
+ \fontencoding{U}\fontfamily{OrnementsADF}\fontseries{m}\fontshape{n}\selectfont
+}
+\newcommand*\adforn[1]{{\adforn@style\char#1}}
\newcommand*{\adfhalfleftarrowhead}{\adforn{1}}
\newcommand*{\adfhalfrightarrowhead}{\adforn{2}}
\gdef\adfast#1{%
- \ifcase #1 \relax
- \or \adforn{3}%
- \or \adforn{4}%
- \or \adforn{5}%
- \or \adforn{6}%
- \or \adforn{7}%
- \or \adforn{8}%
- \or \adforn{9}%
- \or \adforn{10}%
- \or \adforn{11}%
- \or \adforn{12}%
- \fi}
+\ifcase #1 \relax
+\or \adforn{3}%
+\or \adforn{4}%
+\or \adforn{5}%
+\or \adforn{6}%
+\or \adforn{7}%
+\or \adforn{8}%
+\or \adforn{9}%
+\or \adforn{10}%
+\or \adforn{11}%
+\or \adforn{12}%
+\fi}
\newcommand*{\adfhalfleafleft}{\adforn{13}}
\newcommand*{\adfdiamond}{\adforn{14}}
\newcommand*{\adfhalfleafright}{\adforn{15}}
@@ -84,7 +144,7 @@
\newcommand*{\adfbullet}{\adforn{73}}
\newcommand*{\adfS}{\adforn{74}}
\newcommand*{\adfgee}{\adforn{75}}
-
-\endinput
%% end adforn.sty
-
+\endinput
+%%
+%% End of file `adforn.sty'.
diff --git a/Master/texmf-dist/tex/latex/adforn/uornementsadf.fd b/Master/texmf-dist/tex/latex/adforn/uornementsadf.fd
index 1e0d4a6748c..3a6be26a167 100644
--- a/Master/texmf-dist/tex/latex/adforn/uornementsadf.fd
+++ b/Master/texmf-dist/tex/latex/adforn/uornementsadf.fd
@@ -1,17 +1,63 @@
-% Font declarations for OrnementsADF font
+%%
+%% This is file `uornementsadf.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% adforn.dtx (with options: `fd')
+%%
+%% Copyright (C) 2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% fontscripts. You may however distribute the package fontscripts without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ProvidesFile{uornements.fd}[v1.2 2024/09/29 font definitions for U/OrnementsADF.]
+ \expandafter\ifx\csname adforn@scale\endcsname\relax
+ \let\adforn@@scale\@empty
+ \else
+ \edef\adforn@@scale{s*[\csname adforn@scale\endcsname]}%
+ \fi
\DeclareFontFamily{U}{OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{m}{n}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{m}{sc}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{m}{it}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{m}{sl}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{m}{si}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{b}{n}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{b}{sc}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{b}{it}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{b}{sl}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{b}{si}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{bx}{n}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{bx}{sc}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{bx}{it}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{bx}{sl}{<-> OrnementsADF}{}
-\DeclareFontShape{U}{OrnementsADF}{bx}{si}{<-> OrnementsADF}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{n}{
+ <-> \adforn@@scale OrnementsADF
+}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{sc}{<->ssub * OrnementsADF/m/n}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{it}{<->ssub * OrnementsADF/m/sc}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{sl}{<->ssub * OrnementsADF/m/it}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{si}{<->ssub * OrnementsADF/m/sl}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{scit}{<->ssub * OrnementsADF/m/si}{}
+\DeclareFontShape{U}{OrnementsADF}{m}{scsl}{<->ssub * OrnementsADF/m/scit}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{n}{<->ssub * OrnementsADF/m/scsl}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{sc}{<->ssub * OrnementsADF/b/n}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{it}{<->ssub * OrnementsADF/b/sc}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{sl}{<->ssub * OrnementsADF/b/it}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{si}{<->ssub * OrnementsADF/b/sl}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{scit}{<->ssub * OrnementsADF/b/si}{}
+\DeclareFontShape{U}{OrnementsADF}{b}{scsl}{<->ssub * OrnementsADF/b/scit}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{n}{<->ssub * OrnementsADF/b/scsl}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{sc}{<->ssub * OrnementsADF/bx/n}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{it}{<->ssub * OrnementsADF/bx/sc}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{sl}{<->ssub * OrnementsADF/bx/it}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{si}{<->ssub * OrnementsADF/bx/sl}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{scit}{<->ssub * OrnementsADF/bx/si}{}
+\DeclareFontShape{U}{OrnementsADF}{bx}{scsl}{<->ssub * OrnementsADF/bx/scit}{}
+\endinput
+%%
+%% End of file `uornementsadf.fd'.
diff --git a/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex b/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex
new file mode 100644
index 00000000000..5b6d23860c6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex
@@ -0,0 +1,121 @@
+\ProvidesPackage{aiplan}
+\RequirePackage{tikz}
+\RequirePackage{listofitems}
+\usetikzlibrary{calc}
+\usetikzlibrary{decorations.pathreplacing, decorations.markings}
+
+
+\tikzset{
+ action/.style n args={8}{
+ draw,
+ minimum width=3cm,
+ fill=blue,
+ rounded corners,
+ minimum height={max(#1,#2)*\baseHeight cm + 0.5*\baseHeight cm},
+ label={center:#7},
+ append after command={
+ \pgfextra{
+ % Define the node name
+ \edef\nodename{\tikzlastnode}
+ \ifx#3\empty % Check if label list is empty
+ \else % Process only if not empty
+ % Read the label content
+ \setsepchar{,}
+ \readlist\nameparts{\nodename}
+ \setsepchar{,}
+
+ \ifnum#8=0\relax
+ % Define positions for preconditions and effects relative to the node with shifts
+ \ifnum#1>0
+ \readlist\labellist{#3}
+ \foreach \i in {1,...,#1} {
+ % Precondition coordinates and lines
+ \coordinate (\nodename-pre-\i) at ([xshift=-#5cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.west);
+ \draw (\nodename.west |- \nodename-pre-\i) -- +(-#5,0) node [midway, above, sloped, font=\scriptsize] {\labellist[\i]};
+ }
+ \fi;
+ \readlist\labellist{#4}
+ \ifnum#2>0
+ \foreach \j in {1,...,#2} {
+ % Effect coordinates and lines
+ \coordinate (\nodename-eff-\j) at ([xshift=#6cm, yshift=(-\j + (#2)/2+0.25) * \baseHeight cm] \nodename.east);
+ \draw (\nodename.east |- \nodename-eff-\j) -- +(#6,0) node [midway, above, sloped, font=\scriptsize] {\labellist[\j]};
+ }
+ \fi;
+ \else
+ \ifnum#1>0
+ \readlist\labellist{#3}
+ \foreach \i in {1,...,#1} {
+ % Precondition coordinates and lines
+ \coordinate (\nodename-pre-\i) at ([xshift=-#5 cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.west);
+ \draw (\nodename.west |- \nodename-pre-\i) -- +(-#5,0) node [midway, anchor=east, xshift=-0.5 cm, sloped, font=\scriptsize]{\labellist[\i]};
+ }
+ \fi;
+ \readlist\labellist{#4}
+ \ifnum#2>0
+ \foreach \j in {1,...,#2} {
+ % Effect coordinates and lines
+ \coordinate (\nodename-eff-\j) at ([xshift=#6 cm, yshift=(-\j + (#2)/2+0.25) * \baseHeight cm] \nodename.east);
+ \draw (\nodename.east |- \nodename-eff-\j) -- +(#6,0) node [midway,anchor=west, xshift=0.5 cm, font=\scriptsize] {\labellist[\j]};
+ }
+ \fi;
+ \fi;
+ \fi;
+ }
+ },
+ label content/.initial={#3}
+ }
+}
+
+
+% Common base style for nodes
+\tikzset{
+ % COMMENT MISSING
+ base/.style n args={5}{
+ draw,
+ minimum width=0.05cm,
+ fill=black,
+ minimum height={#1*\baseHeight cm},
+ append after command={
+ \pgfextra{
+ \edef\nodename{\tikzlastnode}
+ \setsepchar{,}
+ \readlist\labellist{#2}
+ \foreach \i in {1,...,#1} {
+ \coordinate (\nodename-#5-\i) at ([xshift=#3 cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.#4);
+ \draw (\nodename.#4 |- \nodename-#5-\i) -- +(#3,0)
+ node [midway, above, sloped, font=\scriptsize] {\labellist[\i]};
+ }
+ }
+ }
+ }
+}
+
+\tikzset{
+ % Init style
+ init/.style n args={3}{
+ base={#1}{#2}{#3}{east}{eff}
+ }
+}
+
+\tikzset{
+ % Goal style
+ goal/.style n args={3}{
+ base={#1}{#2}{-#3}{west}{pre}
+ }
+}
+
+
+
+\tikzset{
+ dot/.style={
+ circle,fill,inner sep=0.1em
+ }
+}
+
+\tikzset{
+ causallink/.style={
+ ->, shorten <= 0.2cm, shorten >= 0.1cm
+ }
+}
+
diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index fc126ce70ad..08dbf8a8810 100644
--- a/Master/texmf-dist/tex/latex/animate/animate.sty
+++ b/Master/texmf-dist/tex/latex/animate/animate.sty
@@ -13,7 +13,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\def\@anim@version{2023/06/18}
+\def\@anim@version{2024/09/17}
\ProvidesPackage{animate}
[\@anim@version\space PDF & SVG animations from files and inline graphics]
@@ -530,6 +530,7 @@
/Subtype/Widget%
/F 2%
/FT/Btn/Ff 65537%
+ /A <</S/ResetForm>>% to make pdf.js happy
/BS <</W 0>>%
/AP <</N \@anim@framexform>>%
/MK <</TP 1/I \@anim@framexform%
@@ -562,6 +563,7 @@
/Subtype/Widget%
\@anim@annotflag%
/FT/Btn/Ff 65537%
+ /A <</S/ResetForm>>%
/BS <</W 0>>%
/AP <</N \@anim@framexform>>%
/MK <</TP 1/I \@anim@framexform%
@@ -2072,6 +2074,8 @@
\@anim@tooltip%
\if@anim@js%
/AA <</D <</S/JavaScript/JS (\@anim@btnJS{#1}{\@anim@arg})>>>>%
+ \else%
+ /A <</S/ResetForm>>%
\fi%
}%
\if@anim@js%
@@ -3347,7 +3351,8 @@
\setboolean{@anim@@draft}{false}%
}
\newboolean{@anim@@nomouse}
-\def\@anim@@method{\z@}%default animation method is `icon'
+%\def\@anim@@method{\z@}%default animation method is `icon'
+\def\@anim@@method{\@ne}%default animation method is `widget'
\def\@anim@@ftype{}% file type (extension) of graphics
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/argumentation/argumentation.sty b/Master/texmf-dist/tex/latex/argumentation/argumentation.sty
index f247cd959a3..18ab4dc2582 100644
--- a/Master/texmf-dist/tex/latex/argumentation/argumentation.sty
+++ b/Master/texmf-dist/tex/latex/argumentation/argumentation.sty
@@ -1,78 +1,89 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{argumentation}[2024/05/03 Argumentation]
+\ProvidesPackage{argumentation}[2024/09/25 Argumentation]
% Author: Lars Bengel
% E-Mail: lars.bengel@fernuni-hagen.de
-% Version: 1.1
-% Date: 2023/12/03
+% Version: 1.3
+% Date: 2024/09/25
% License: LaTeX Project Public License 1.3c
-%%%%%%%%%%% Package Requirements %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{amsbsy,amsmath} % For proper bold letters in math mode
-\RequirePackage{pgfopts} % For managing package options
-\RequirePackage{tikz} % For drawing the argumentation frameworks
-\usetikzlibrary{positioning} % For relative node positioning
-\usetikzlibrary{arrows.meta} % For directed edges / attack arrows
-\usetikzlibrary{arrows} % For directed edges / attack arrows
-\usetikzlibrary{decorations.markings} % For creating the support edge markings
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%% Package Tikz Style Definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcounter{argument}
-%\newcommand{\argument}{\relax}
-\newcommand{\argstyle}[1]{#1} % Defines the font style in which argument names are displayed
+%%%%%%%%%%% Package Requirements %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{amsbsy,amsmath} % Proper bold letters in math mode
+\RequirePackage{pgfopts} % Managing package options
+\RequirePackage{xspace} % Dynamic spaces after math commands
+\RequirePackage{xcolor} % Defining colors
+\RequirePackage{tikz} % Drawing the argumentation frameworks
+\usetikzlibrary{positioning} % Relative node positioning
+\usetikzlibrary{arrows.meta} % Directed edges / attack arrows
+\usetikzlibrary{arrows} % Directed edges / attack arrows
+\usetikzlibrary{decorations.markings} % Creating the support edge markings
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%% Package Style Definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcounter{argument} % Counter for arguments in the af-environment
+\newcommand{\argstyle}[1]{#1} % Defines the font style in which argument names are displayed
+\definecolor{aigyellow}{RGB}{210,149,81} % Highlight color
+\definecolor{aigblue}{RGB}{0,76,151} % Node color
%%% Argument Style Definitions
\tikzset{ % global base styles
- argument size/.style={minimum size=0.7cm}, % Standard size of argument nodes
- argument/.style={}, % Base style for argument nodes
- argument standard/.style={circle,draw=black,inner sep=0,outer sep=0, argument size},
- argument large/.style={circle,draw=black,inner sep=0,outer sep=0, argument size, font=\large},
- argument thick/.style={circle,draw=black,inner sep=0,outer sep=0, argument size, thick},
+ argument size/.style={}, % Size of argument nodes
+ argument/.style={}, % Base style for argument nodes
+ argument standard/.style={circle,draw=black,inner sep=0,outer sep=0},
+ argument large/.style={circle,draw=black,inner sep=0,outer sep=0, font=\large},
+ argument thick/.style={circle,draw=black,inner sep=0,outer sep=0, line width=0.1em},
+ argument gray/.style={argument thick,fill=gray!30,draw=gray!65,text=black!80},
+ argument colored/.style={argument thick,fill=aigblue!40,draw=aigblue!80,text=black!80},
}
%%% Attack/Support Edge Definitions
\tikzset{ % global base styles
- attack/.style={}, % Base style for attack arrow
+ attack width/.style={}, % Width of attack arrows
+ attack/.style={}, % Base style for attack arrow
attack standard/.style={-{stealth'}}, % Standard attack arrow
attack large/.style={-{Stealth[scale=1.25]}}, % Larger arrow tip
- attack modern/.style={-{To[sharp,length=0.9mm,line width=0.7pt]}}, % Mordern rightarrow style tip
+ attack modern/.style={-{To[sharp,length=0.65ex,line width=0.05em]}}, % Mordern rightarrow style tip
support/.style={},
- support standard/.style = {attack, postaction = {decorate,decoration={markings,mark=at position 0.36 with {\draw[-] (0,-0.1) -- (0.1,0.1);}}}}, % Standard support arrow
- support dashed/.style={attack,densely dashed},
- support double/.style={-{Classical TikZ Rightarrow},double},
+ support standard/.style = {attack, postaction = {decorate,decoration={markings,mark=at position 0.36 with {\draw[-] (0,-0.1) -- (0.1,0.1);}}}}, % Standard support arrow
+ support dashed/.style={attack,densely dashed}, % Dashed Support arrow
+ support double/.style={-{Classical TikZ Rightarrow},double}, % double-line support arrow
}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%% Package Options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%% Package Options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Options for style of the argument node itself
\pgfkeys{/tikz/.cd,
argumentstyle/.is choice,
- argumentstyle/standard/.code={\tikzset{argument/.style={argument standard}}},
- argumentstyle/large/.code={\tikzset{argument/.style={argument large}}},
- argumentstyle/thick/.code={\tikzset{argument/.style={argument thick}}},
+ argumentstyle/standard/.code={\tikzset{argument/.style={argument standard,argument size}}},
+ argumentstyle/large/.code={\tikzset{argument/.style={argument large,argument size}}},
+ argumentstyle/thick/.code={\tikzset{argument/.style={argument thick,argument size}}},
+ argumentstyle/gray/.code={\tikzset{argument/.style={argument gray,argument size}}},
+ argumentstyle/colored/.code={\tikzset{argument/.style={argument colored,argument size}}},
}
\pgfkeys{/argumentation/.cd,
.unknown/.code={},
argumentstyle/.is choice,
- argumentstyle/standard/.code={\tikzset{argument/.style={argument standard}}},
- argumentstyle/large/.code={\tikzset{argument/.style={argument large}}},
- argumentstyle/thick/.code={\tikzset{argument/.style={argument thick}}},
+ argumentstyle/standard/.code={\tikzset{argument/.style={argument standard,argument size}}},
+ argumentstyle/large/.code={\tikzset{argument/.style={argument large,argument size}}},
+ argumentstyle/thick/.code={\tikzset{argument/.style={argument thick,argument size}}},
+ argumentstyle/gray/.code={\tikzset{argument/.style={argument gray,argument size}}},
+ argumentstyle/colored/.code={\tikzset{argument/.style={argument colored,argument size}}},
argumentstyle=standard,
}
%%% Options for the style of the attack edges
\pgfkeys{/tikz/.cd,
attackstyle/.is choice,
- attackstyle/standard/.code={\tikzset{attack/.style={attack standard}}},
- attackstyle/large/.code={\tikzset{attack/.style={attack large}}},
- attackstyle/modern/.code={\tikzset{attack/.style={attack modern}}},
+ attackstyle/standard/.code={\tikzset{attack/.style={attack width,attack standard}}},
+ attackstyle/large/.code={\tikzset{attack/.style={attack width,attack large}}},
+ attackstyle/modern/.code={\tikzset{attack/.style={attack width,attack modern}}},
attackstyle=standard,
}
\pgfkeys{/argumentation/.cd,
attackstyle/.is choice,
- attackstyle/standard/.code={\tikzset{attack/.style={attack standard}}},
- attackstyle/large/.code={\tikzset{attack/.style={attack large}}},
- attackstyle/modern/.code={\tikzset{attack/.style={attack modern}}},
+ attackstyle/standard/.code={\tikzset{attack/.style={attack width,attack standard}}},
+ attackstyle/large/.code={\tikzset{attack/.style={attack width,attack large}}},
+ attackstyle/modern/.code={\tikzset{attack/.style={attack width,attack modern}}},
attackstyle=standard,
}
@@ -97,18 +108,18 @@
namestyle/.is choice,
namestyle/none/.code={\renewcommand{\argstyle}[1]{##1}},
namestyle/math/.code={\renewcommand{\argstyle}[1]{\ensuremath{##1}}},
- namestyle/italics/.code={\renewcommand{\argstyle}[1]{\ensuremath{\mathit{\text{##1}}}}},
- namestyle/bold/.code={\renewcommand{\argstyle}[1]{\ensuremath{\boldsymbol{\text{##1}}}}},
- namestyle/monospace/.code={\renewcommand{\argstyle}[1]{\ensuremath{\mathtt{\text{##1}}}}},
+ namestyle/bold/.code={\renewcommand{\argstyle}[1]{\ensuremath{\boldsymbol{##1}}}},
+ namestyle/monospace/.code={\renewcommand{\argstyle}[1]{{\ttfamily##1}}},
+ namestyle/monoemph/.code={\renewcommand{\argstyle}[1]{{\ttfamily\itshape##1}}},
namestyle=none,
}
\pgfkeys{/argumentation/.cd,
namestyle/.is choice,
namestyle/none/.code={\renewcommand{\argstyle}[1]{##1}},
namestyle/math/.code={\renewcommand{\argstyle}[1]{\ensuremath{##1}}},
- namestyle/italics/.code={\renewcommand{\argstyle}[1]{\ensuremath{\mathit{##1}}}},
- namestyle/bold/.code={\renewcommand{\argstyle}[1]{\ensuremath{\boldsymbol{\text{##1}}}}},
- namestyle/monospace/.code={\renewcommand{\argstyle}[1]{\ensuremath{\mathtt{##1}}}},
+ namestyle/bold/.code={\renewcommand{\argstyle}[1]{\ensuremath{\boldsymbol{##1}}}},
+ namestyle/monospace/.code={\renewcommand{\argstyle}[1]{{\ttfamily##1}}},
+ namestyle/monoemph/.code={\renewcommand{\argstyle}[1]{{\ttfamily\itshape##1}}},
namestyle=none,
}
@@ -116,7 +127,7 @@
\NewDocumentCommand { \argument } {} {\relax}
\pgfkeys{/argumentation/.cd,
indexing/.is choice,
- indexing/none/.code={
+ indexing/none/.code={ % No auto-indexing, node identifier required
\RenewDocumentCommand { \argument } {O{} r() m dat d()} {
\IfNoValueTF {##5}{%
\node[argument size,argument,##1](##2) {\argstyle{##3}};
@@ -125,7 +136,7 @@
}
}
},
- indexing/numeric/.code={
+ indexing/numeric/.code={ % Numeric auto-indexing: a1,a2,...
\RenewDocumentCommand { \argument } {O{} d() m dat d()} {
\stepcounter{argument}
\IfNoValueTF {##2}{%
@@ -143,7 +154,7 @@
}
}
},
- indexing/alphabetic/.code={
+ indexing/alphabetic/.code={ % Alphabetic auto-indexing: a,b,...
\RenewDocumentCommand { \argument } {O{} d() m dat d()} {
\stepcounter{argument}
\IfNoValueTF {##2}{%
@@ -165,43 +176,70 @@
indexing=numeric,
}
+\newif\ifmacros
+\pgfkeys{/argumentation/.cd,
+ macros/.is choice,
+ macros/true/.code={
+ \macrostrue
+ },
+ macros/false/.code={
+ \macrosfalse
+ },
+ macros/.default=true,
+ macros=false,
+}
+
\ProcessPgfPackageOptions{/argumentation}
-%%%%%%%%%%%%%%% AF Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%% AF Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Additional AF Style Parameters
\tikzset{ % global predefined tikz-styles
- selfattack/.style={loop,min distance=2mm,in=0,out=60,looseness=5}, % Standard style for self-attacks
- inactive/.style={draw=black!30,text=black!40}, % Make a node or edge inactive, i.e., greyed out
- incomplete/.style={densely dashed}, % Style for displaying incomplete nodes or attacks
- accepted/.style={fill=green}, % Color an argument that is labelled in
- rejected/.style={fill=red}, % Color an argument that is labelled out
- undecided/.style={fill=cyan}, % Color an argument that is labelled undecided
- caption/.style={draw=none}, % Style for displaying AF name in Figure
- invisible/.style={draw=none,text=black!0}, % Make a node or edge invisible
- annotation/.style={font=\small}, % text annotation style
+ selfattack/.style={loop,min distance=0.4em,in=0,out=60,looseness=4.5}, % Self-attack
+ inactive/.style={fill=none,draw=gray!50,text=gray!60}, % Inactive argument or edge (reduct)
+ incomplete/.style={densely dashed}, % incomplete argument or edge
+ accepted/.style={fill=green!40}, % Accepted argument (in)
+ rejected/.style={fill=red!40}, % Rejected argument (out)
+ undecided/.style={fill=cyan!40}, % Undecided Argument (undec)
+ highlight/.style={fill=aigyellow!60}, % Highlighted argument
+ caption/.style={draw=none}, % Caption or text
+ invisible/.style={draw=none,text=black!0,fill=none}, % Invisible argument or edge
+ annotation/.style={font=\small}, % Argument annotation
argin/.style={accepted},
argout/.style={rejected},
argundec/.style={undecided},
}
-%%% Options for af environment
+%%% Style-Options for af environment
\pgfkeys{/tikz/.cd,
- small/.style = {node distance=0.55cm,argument size/.style={minimum size=0.55cm},caption/.append style={font=\small}},
- tiny/.style = {node distance=0.35cm,argument size/.style={minimum size=0.4cm,font=\small},caption/.append style={font=\small}},
+ standard/.style={node distance=6.6ex,argument size/.style={minimum size=4.5ex},attack width/.style={line width=0.05em},},
+ small/.style={node distance=3.5ex,argument size/.style={minimum size=3.4ex},attack width/.style={line width=0.045em},caption/.append style={font=\small}},
+ tiny/.style={node distance=2.3ex,argument size/.style={minimum size=2.6ex,font=\small},attack width/.style={line width=0.03em},caption/.append style={font=\small}},
}
+
+\ifmacros
+%%% Definitions for referencing
+\providecommand{\AF}{\ensuremath{F}\xspace} % AF abbreviation
+\providecommand{\arguments}{\ensuremath{A}\xspace} % Set of arguments
+\providecommand{\attacks}{\ensuremath{R}\xspace} % Set of attacks
+\providecommand{\AFcomplete}{\ensuremath{\AF = (\arguments, \attacks)}\xspace} % Full AF
+\newcommand{\afref}[1]{\ensuremath{\AF_{\ref{#1}}}\xspace} % Reference an AF
+\newcommand{\fullafref}[1]{\ensuremath{\afref{#1} = (\arguments_{\ref{#1}}, \attacks_{\ref{#1}})}\xspace} % Full AF with reference
+\else\relax
+\fi
+
%%% Initializing the af environment
\newcounter{af}
\newenvironment{af}[1][]{
\refstepcounter{af}
\setcounter{argument}{0}
\pgfkeys{/argumentation/.cd, #1}
- \tikzpicture[#1]
+ \tikzpicture[standard,#1]
}{%
\endtikzpicture
}
-%%%%%%%%%%%%%%%% Commands %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% Additional Commands %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Creates a node displaying the name of the AF
\NewDocumentCommand { \afname } { O{} D(){caption} m dat d()} {
@@ -215,24 +253,24 @@
\newcommand{\annotation}[3][]{\node[annotation,above of=#2,#1](an_#2){#3};}
-% Creates an attack edge
+% Basic attack edge
\newcommand{\attack}[3][]{\path(#2) edge [attack,#1] (#3);}
-% Creates a self-attack
+% Self-attack edge
\newcommand{\selfattack}[2][]{\path(#2) edge [attack,selfattack,#1] (#2);}
-% Creates two symmetric attack edges between two arguments
+% Symmetric attack edges between two arguments
\newcommand{\dualattack}[3][]{\path(#2) edge [attack, bend right,#1] (#3);\path(#3) edge [attack, bend right,#1] (#2);}
-% Creates a weighted attack
+% Attack edge with value
\newcommand{\annotatedattack}[4][]{\path(#2) edge [attack,#1] node[annotation](p_#2_#3){#4} (#3);}
-% Creates a support edge between two arguments
+% Support edge
\newcommand{\support}[3][]{\path(#2) edge [support=0.35,#1] (#3);}
%%% Commands for setting custom tikz-style parameters
-\newcommand{\setargumentstyle}[1]{\tikzset{argument/.style={#1}}}
-\newcommand{\setattackstyle}[1]{\tikzset{attack/.style={#1}}}
+\newcommand{\setargumentstyle}[1]{\tikzset{argument/.style={argument size,#1}}}
+\newcommand{\setattackstyle}[1]{\tikzset{attack/.style={attack width,#1}}}
\newcommand{\setsupportstyle}[1]{\tikzset{support/.style={#1}}}
\newcommand{\setannotationstyle}[1]{\tikzset{annotation/.style={#1}}}
diff --git a/Master/texmf-dist/tex/latex/baskervald/baskervald.sty b/Master/texmf-dist/tex/latex/baskervald/baskervald.sty
deleted file mode 100644
index d104cca143e..00000000000
--- a/Master/texmf-dist/tex/latex/baskervald/baskervald.sty
+++ /dev/null
@@ -1,24 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{baskervald}[2010/07/13 v1.0 baskervald]
-\RequirePackage{xkeyval}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
-%:boolkey for alternative encoding as default
-\define@boolkey{baskervald.sty}[baskervald@]{lig}[true]{%
- \relax}
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{lig=false}
-%:options override defaults
-\ProcessOptionsX
-%:make BaskervaldADF default roman font, implementing option for alternative encoding as applicable
-\ifbaskervald@lig
- \renewcommand{\rmdefault}{ybvw}%
-\else
- \renewcommand{\rmdefault}{ybv}%
-\fi
-\renewcommand{\rmdefault}{ybv}
-\DeclareTextSymbol{\zeroslash}{TS1}{225}
-\DeclareTextSymbolDefault{\zeroslash}{TS1}
-\endinput
-%% end baskervald.sty
diff --git a/Master/texmf-dist/tex/latex/baskervaldadf/baskervald.sty b/Master/texmf-dist/tex/latex/baskervaldadf/baskervald.sty
new file mode 100644
index 00000000000..4bfcc4b5269
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/baskervaldadf/baskervald.sty
@@ -0,0 +1,70 @@
+%%
+%% This is file `baskervald.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% baskervaldadf.dtx (with options: `sty')
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% baskervaldadf. You may however distribute the package baskervaldadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[baskervald.sty]{$Id: baskervaldadf.dtx 10395 2024-09-26 23:52:22Z cfrees $}[v1.1 \revinfo]
+\DefineFileInfoSVN[baskervald]
+\RequirePackage[T1]{fontenc}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{ybv}{1}%
+ \DeclareEncodingSubset{TS1}{ybvw}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\ExplSyntaxOn
+\keys_define:nn { baskervald }
+{
+ lig .bool_set:N = \g__baskervald_lig_bool,
+ lig .default:n = true,
+ lig .initial:n = false,
+ scale .tl_set:N = \ybv@scale,
+ scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[baskervald]
+\tl_new:N \g__baskervald_rm_tl
+\tl_gset:Nn \g__baskervald_rm_tl {ybv}
+\bool_if:NT \g__baskervald_lig_bool
+{
+ \tl_gput_right:Nn \g__baskervald_rm_tl {w}
+}
+\renewcommand{\rmdefault}{\g__baskervald_rm_tl}
+\ExplSyntaxOff
+\DeclareTextSymbol{\zeroslash}{TS1}{225}
+\DeclareTextSymbolDefault{\zeroslash}{TS1}
+\AddToHook {begindocument}[.]
+{%
+ \@ifpackageloaded{hyperref}{%
+ \DeclareTextCommand{\zeroslash}{PU}{0}% U+0030
+ \DeclareTextCommand{\zeroslash}{PD1}{0}% U+0030
+ }{}%
+}
+%% end baskervald.sty
+\endinput
+%%
+%% End of file `baskervald.sty'.
diff --git a/Master/texmf-dist/tex/latex/baskervald/t1ybv.fd b/Master/texmf-dist/tex/latex/baskervaldadf/t1ybv.fd
index 91383bc0cd7..d9fcf7222ea 100644
--- a/Master/texmf-dist/tex/latex/baskervald/t1ybv.fd
+++ b/Master/texmf-dist/tex/latex/baskervaldadf/t1ybv.fd
@@ -5,32 +5,39 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybv.fd}
- [2010/07/13 Fontinst v1.933 font definitions for T1/ybv.]
+ [2024/07/24 Fontinst v1.933 font definitions for T1/ybv.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname ybv@scale\endcsname\relax
+ \let\ybv@@scale\@empty
+\else
+ \edef\ybv@@scale{s*[\csname ybv@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{ybv}{}
\DeclareFontShape{T1}{ybv}{m}{n}{
- <-> ybvr8t
+ <-> \ybv@@scale ybvr8t
}{}
\DeclareFontShape{T1}{ybv}{m}{it}{
- <-> ybvri8t
+ <-> \ybv@@scale ybvri8t
}{}
\DeclareFontShape{T1}{ybv}{b}{n}{
- <-> ybvb8t
+ <-> \ybv@@scale ybvb8t
}{}
\DeclareFontShape{T1}{ybv}{b}{it}{
- <-> ybvbi8t
+ <-> \ybv@@scale ybvbi8t
}{}
\DeclareFontShape{T1}{ybv}{eb}{n}{
- <-> ybvh8t
+ <-> \ybv@@scale ybvh8t
}{}
\DeclareFontShape{T1}{ybv}{eb}{sl}{
- <-> ybvho8t
+ <-> \ybv@@scale ybvho8t
}{}
\DeclareFontShape{T1}{ybv}{m}{sc}{<->ssub * ybv/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/baskervald/t1ybvw.fd b/Master/texmf-dist/tex/latex/baskervaldadf/t1ybvw.fd
index 09de2c0c99b..6b3e6467e02 100644
--- a/Master/texmf-dist/tex/latex/baskervald/t1ybvw.fd
+++ b/Master/texmf-dist/tex/latex/baskervaldadf/t1ybvw.fd
@@ -5,32 +5,39 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybvw.fd}
- [2010/07/13 Fontinst v1.933 font definitions for T1/ybvw.]
+ [2024/07/24 Fontinst v1.933 font definitions for T1/ybvw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname ybv@scale\endcsname\relax
+ \let\ybv@@scale\@empty
+\else
+ \edef\ybv@@scale{s*[\csname ybv@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{ybvw}{}
\DeclareFontShape{T1}{ybvw}{m}{n}{
- <-> ybvrw8t
+ <-> \ybv@@scale ybvrw8t
}{}
\DeclareFontShape{T1}{ybvw}{m}{it}{
- <-> ybvriw8t
+ <-> \ybv@@scale ybvriw8t
}{}
\DeclareFontShape{T1}{ybvw}{b}{n}{
- <-> ybvbw8t
+ <-> \ybv@@scale ybvbw8t
}{}
\DeclareFontShape{T1}{ybvw}{b}{it}{
- <-> ybvbiw8t
+ <-> \ybv@@scale ybvbiw8t
}{}
\DeclareFontShape{T1}{ybvw}{eb}{n}{
- <-> ybvhw8t
+ <-> \ybv@@scale ybvhw8t
}{}
\DeclareFontShape{T1}{ybvw}{eb}{sl}{
- <-> ybvhow8t
+ <-> \ybv@@scale ybvhow8t
}{}
\DeclareFontShape{T1}{ybvw}{m}{sc}{<->ssub * ybvw/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/baskervald/ts1ybv.fd b/Master/texmf-dist/tex/latex/baskervaldadf/ts1ybv.fd
index d3a17cb96c9..e986d57f671 100644
--- a/Master/texmf-dist/tex/latex/baskervald/ts1ybv.fd
+++ b/Master/texmf-dist/tex/latex/baskervaldadf/ts1ybv.fd
@@ -5,32 +5,39 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybv.fd}
- [2010/07/13 Fontinst v1.933 font definitions for TS1/ybv.]
+ [2024/07/24 Fontinst v1.933 font definitions for TS1/ybv.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname ybv@scale\endcsname\relax
+ \let\ybv@@scale\@empty
+\else
+ \edef\ybv@@scale{s*[\csname ybv@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{ybv}{}
\DeclareFontShape{TS1}{ybv}{m}{n}{
- <-> ybvr8c
+ <-> \ybv@@scale ybvr8c
}{}
\DeclareFontShape{TS1}{ybv}{m}{it}{
- <-> ybvri8c
+ <-> \ybv@@scale ybvri8c
}{}
\DeclareFontShape{TS1}{ybv}{b}{n}{
- <-> ybvb8c
+ <-> \ybv@@scale ybvb8c
}{}
\DeclareFontShape{TS1}{ybv}{b}{it}{
- <-> ybvbi8c
+ <-> \ybv@@scale ybvbi8c
}{}
\DeclareFontShape{TS1}{ybv}{eb}{n}{
- <-> ybvh8c
+ <-> \ybv@@scale ybvh8c
}{}
\DeclareFontShape{TS1}{ybv}{eb}{sl}{
- <-> ybvho8c
+ <-> \ybv@@scale ybvho8c
}{}
\DeclareFontShape{TS1}{ybv}{m}{sc}{<->ssub * ybv/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/baskervald/ts1ybvw.fd b/Master/texmf-dist/tex/latex/baskervaldadf/ts1ybvw.fd
index 23205ea9789..b4bed39a528 100644
--- a/Master/texmf-dist/tex/latex/baskervald/ts1ybvw.fd
+++ b/Master/texmf-dist/tex/latex/baskervaldadf/ts1ybvw.fd
@@ -5,32 +5,39 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybvw.fd}
- [2010/07/13 Fontinst v1.933 font definitions for TS1/ybvw.]
+ [2024/07/24 Fontinst v1.933 font definitions for TS1/ybvw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname ybv@scale\endcsname\relax
+ \let\ybv@@scale\@empty
+\else
+ \edef\ybv@@scale{s*[\csname ybv@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{ybvw}{}
\DeclareFontShape{TS1}{ybvw}{m}{n}{
- <-> ybvr8c
+ <-> \ybv@@scale ybvr8c
}{}
\DeclareFontShape{TS1}{ybvw}{m}{it}{
- <-> ybvri8c
+ <-> \ybv@@scale ybvri8c
}{}
\DeclareFontShape{TS1}{ybvw}{b}{n}{
- <-> ybvb8c
+ <-> \ybv@@scale ybvb8c
}{}
\DeclareFontShape{TS1}{ybvw}{b}{it}{
- <-> ybvbi8c
+ <-> \ybv@@scale ybvbi8c
}{}
\DeclareFontShape{TS1}{ybvw}{eb}{n}{
- <-> ybvh8c
+ <-> \ybv@@scale ybvh8c
}{}
\DeclareFontShape{TS1}{ybvw}{eb}{sl}{
- <-> ybvho8c
+ <-> \ybv@@scale ybvho8c
}{}
\DeclareFontShape{TS1}{ybvw}{m}{sc}{<->ssub * ybvw/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty
new file mode 100644
index 00000000000..db9e5c713dc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamercolorthemegotham.sty
@@ -0,0 +1,328 @@
+%%
+%% This is file `beamercolorthemegotham.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gotham.dtx (with options: `color')
+%%
+%% Copyright (C) 2023-20** by Romain NOËL <romainoel@free.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Romain NOËL.
+%% Contributors: Romain NOËL (2023-20**)
+%%
+\ProvidesExplPackage{beamercolorthemegotham}{2024/09/20}{1.1.0.b}{Gotham color theme}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+\RequirePackage{xcolor}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% COLOR %%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\definecolor[named]{gLightOrange}{HTML}{EB811B}
+\definecolor[named]{gLightGreen}{HTML}{14B03D}
+\definecolor[named]{gDeepBlue}{RGB}{42, 42, 255}
+\definecolor[named]{gDeepYellOr}{RGB}{255, 204, 0}
+\definecolor[named]{gAnthracite}{HTML}{2d3e50}
+\definecolor[named]{gLightTeal}{RGB}{172, 195, 210}
+\definecolor[named]{gPaleYell}{RGB}{255, 255, 240}
+\definecolor[named]{gDarkBlack}{gray}{0.1}
+\definecolor[named]{gDarkGrey}{gray}{0.25}
+\definecolor[named]{gMidGrey}{gray}{0.5}
+\definecolor[named]{gLightGrey}{gray}{0.9}
+
+%%%%%%
+\@ifundefined{\string\color@colorAreversed}{
+\colorlet{colorPale}{gPaleYell} % BG in light/normal mode
+\colorlet{colorDark}{gDarkBlack} % FG in light/normal mode
+\colorlet{colorA}{gAnthracite} % frametitle, standin.out,
+\colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in,
+\colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks
+\colorlet{colorC}{gDeepYellOr} % progress bar
+\colorlet{colorD}{gLightOrange} % alert
+\colorlet{colorE}{gLightGreen} % example
+}{
+}
+
+\cs_new_protected:Nn \__gotham_color_set_style_anthracite:{
+\colorlet{colorPale}{gPaleYell} % BG in light/normal mode
+\colorlet{colorDark}{gDarkBlack} % FG in light/normal mode
+\colorlet{colorA}{gAnthracite} % frametitle, standin.out,
+\colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in,
+\colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks
+\colorlet{colorC}{gDeepYellOr} % progress bar
+\colorlet{colorD}{gLightOrange} % alert
+\colorlet{colorE}{gLightGreen} % example
+}
+
+\cs_new_protected:Nn \__gotham_color_set_style_red:{
+\colorlet{colorPale}{gPaleYell} % BG in light/normal mode
+\colorlet{colorDark}{gDarkBlack} % FG in light/normal mode
+\colorlet{colorA}{red} % frametitle, standin.out,
+\colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in,
+\colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks
+\colorlet{colorC}{gDeepYellOr} % progress bar
+\colorlet{colorD}{gLightOrange} % alert
+\colorlet{colorE}{gLightGreen} % example
+}
+
+%%%%%%
+\colorlet{colorBG}{colorPale}
+\colorlet{colorFG}{colorDark}
+\colorlet{colorFrametitle}{colorA}
+\colorlet{colorStandout}{colorA}
+\colorlet{colorStandin}{colorPale}
+\colorlet{colorTitlepage}{colorA}
+\colorlet{colorFiligrane}{colorB}
+\colorlet{colorBackElement}{colorB}
+\colorlet{colorProgBar}{colorC}
+\colorlet{colorAlert}{colorD}
+\colorlet{colorExample}{colorE}
+
+\providebool{darkBG}
+\boolfalse{darkBG}
+\providebool{transparentBG}
+\booltrue{transparentBG}
+
+\cs_new_protected:Nn \__gotham_color_set_darkBG:{
+\setbeamercolor{normal~text}{%
+fg=colorBG,
+bg=colorFG,
+}%
+\usebeamercolor[fg]{normal~text}%
+\booltrue{darkBG}%
+\boolfalse{transparentBG}
+\colorlet{colorFrametitle}{colorAreversed}
+\colorlet{colorStandout}{colorAreversed}
+\colorlet{colorStandin}{colorFG}
+\colorlet{colorTitlepage}{colorAreversed}
+\setbeamercolor{palette~primary}{% reversed color compared to normal text
+use=normal~text,
+fg=normal~text.bg,
+bg=normal~text.fg
+}
+}
+
+\cs_new_protected:Nn \__gotham_color_set_lightBG:{
+\setbeamercolor{normal~text}{
+fg=colorFG,
+bg=colorBG
+}
+\usebeamercolor[fg]{normal~text}
+\boolfalse{darkBG}
+\boolfalse{transparentBG}
+\colorlet{colorFrametitle}{colorA}
+\colorlet{colorStandout}{colorA}
+\colorlet{colorStandin}{colorBG}
+\colorlet{colorTitlepage}{colorA}
+\setbeamercolor{palette~primary}{
+use=normal~text,
+fg=normal~text.bg,
+bg=normal~text.fg
+}
+}
+
+\cs_new_protected:Nn \__gotham_color_set_transparentBG:{
+\setbeamercolor{normal~text}{
+fg=colorFG,
+bg=,
+}
+\usebeamercolor[fg]{normal~text}
+\boolfalse{darkBG}
+\booltrue{transparentBG}
+\colorlet{colorFrametitle}{colorA}
+\colorlet{colorStandout}{colorA}
+{\usebeamercolor[bg]{normal~text}\colorlet{colorStandin}{bg}}% this is not working because the colorlet is not kept outside of the {} environment...
+\colorlet{colorStandin}{colorBG} % since the two previous lines are not working, let define it like light-bg
+\colorlet{colorTitlepage}{colorA}
+\setbeamercolor{palette~primary}{
+use=normal~text,
+fg=colorBG,
+bg=normal~text.fg
+}
+}
+
+\cs_new_protected:Nn \__gotham_color_set_transparent_block:{
+\setbeamercolor{block~title}{
+use=normal~text,
+fg=normal~text.fg,
+bg=
+}
+\setbeamercolor{block~body}{
+bg=
+}
+\setbeamercolor{alerted~text}{
+fg=colorAlert
+}
+\setbeamercolor{example~text}{
+fg=colorExample
+}
+\setbeamercolor{block~title~example}{
+use={block~title, example~text},
+bg=block~title.bg,
+fg=example~text.fg
+}
+\setbeamercolor{block~title~alerted}{
+use={block~title, alerted~text},
+bg=block~title.bg,
+fg=alerted~text.fg
+}
+}
+
+\cs_new_protected:Nn \__gotham_color_set_fill_block:{
+\setbeamercolor{block~title}{
+fg=colorBackElement!10!normal~text.fg,
+bg=colorBackElement!135!fg
+}
+\setbeamercolor{block~body}{
+use={block~title, normal~text},
+bg=block~title.bg!50!normal~text.bg
+}
+\setbeamercolor{alerted~text}{
+fg=colorAlert
+}
+\setbeamercolor{example~text}{
+fg=colorExample
+}
+\setbeamercolor{block~title~example}{
+use={block~title, example~text},
+bg=block~title.bg,
+fg=example~text.fg
+}
+\setbeamercolor{block~title~alerted}{
+use={block~title, alerted~text},
+bg=block~title.bg,
+fg=alerted~text.fg
+}
+}% \end{macrocode}
+
+\cs_new_protected:Nn \__gotham_color_set_native_block:{
+\setbeamercolor{block~title}{
+fg=colorPale,
+bg=colorBackElement!90!fg
+}
+\setbeamercolor{block~body}{
+use={block~title, normal~text},
+bg=block~title.bg!50!normal~text.bg
+}
+\setbeamercolor{alerted~text}{
+fg=colorAlert
+}
+\setbeamercolor{alertedBlock~text}{
+fg=colorPale
+}
+\setbeamercolor{example~text}{
+fg=colorPale
+}
+\setbeamercolor{block~title~alerted}{
+use={block~title, alertedBlock~text},
+bg=colorAlert,
+fg=alertedBlock~text.fg
+}
+\setbeamercolor{block~title~example}{
+use={block~title, example~text},
+bg=colorExample,
+fg=example~text.fg
+}
+}
+
+\setbeamercolor{structure}{use=normal~text, fg=normal~text.fg}
+\setbeamercolor{progress~bar}{
+use=alerted~text,
+fg=colorProgBar,
+bg=alerted~text.fg!50!black!30
+}
+
+\setbeamercolor{titlelike}{use=normal~text, parent=normal~text}
+\setbeamercolor{author}{use=normal~text, parent=normal~text}
+\setbeamercolor{date}{use=normal~text, parent=normal~text}
+\setbeamercolor{institute}{use=normal~text, parent=normal~text}
+\setbeamercolor{frametitle}{
+use=palette~primary,
+parent=palette~primary,
+bg=colorFrametitle
+}
+\setbeamercolor{title~separator}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~head/foot}{%
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~part~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~section~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~splitvert}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{block~body~alerted}{use=block~body, parent=block~body}
+\setbeamercolor{block~body~example}{use=block~body, parent=block~body}
+\setbeamercolor{footnote}{fg=normal~text.fg!90}
+\setbeamercolor{footnote~mark}{fg=.}
+
+\setbeamercolor{frametitleSection}{use=primary~palette, bg=, fg=primary~palette.bg}
+\setbeamercolor{standout}{use=primary~palette, bg=colorStandout, fg=primary~palette.bg}
+\setbeamercolor{standin}{use=normal~text, bg=colorStandin, fg=normal~text.fg}
+
+\setbeamercolor{section~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsection~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsubsection~in~toc}{use=normal~text, parent=normal~text,}
+
+%%%%
+\keys_define:nn { gotham / color }
+{
+block .choice:,
+block .usage:n = { general },
+block .default:n = { native },
+block / native .code:n = { \__gotham_color_set_native_block: },
+block / transparent .code:n = { \__gotham_color_set_transparent_block: },
+block / fill .code:n = { \__gotham_color_set_fill_block: },
+block / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: block / unknown} },
+}
+
+\keys_define:nn { gotham / color }
+{
+background .choice:,
+background .usage:n = { general },
+background .default:n = { transparent },
+background / transparent .code:n = { \__gotham_color_set_transparentBG: },
+background / light .code:n = { \__gotham_color_set_lightBG: },
+background / dark .code:n = { \__gotham_color_set_darkBG: },
+background / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: background / unknown} },
+}
+
+\keys_define:nn { gotham / color }
+{
+colorset .choice:,
+colorset .usage:n = { general },
+colorset .default:n = { anthracite },
+colorset / anthracite .code:n = { \__gotham_color_set_style_anthracite: },
+colorset / red .code:n = { \__gotham_color_set_style_red: },
+colorset / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: colorset / unknown} },
+}
+
+\keys_set:nn { gotham / color } { background, block, colorset }
+
+\ProcessKeyOptions[ gotham / color ]
+\mode<all>
+%%
+%% Adapted from classic "A model .dtx file" by Joseph Wright
+%% https://www.texdev.net/2009/10/06/a-model-dtx-file/
+%%
+%% End of file `beamercolorthemegotham.sty'.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty
new file mode 100644
index 00000000000..74d2cc4151a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerfontthemegotham.sty
@@ -0,0 +1,580 @@
+%%
+%% This is file `beamerfontthemegotham.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gotham.dtx (with options: `font')
+%%
+%% Copyright (C) 2023-20** by Romain NOËL <romainoel@free.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Romain NOËL.
+%% Contributors: Romain NOËL (2023-20**)
+%%
+\ProvidesExplPackage{beamerfontthemegotham}{2024/09/20}{1.1.0.b}{gotham font theme}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+\RequirePackage{etoolbox}
+\RequirePackage{ifxetex}
+\RequirePackage{ifluatex}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% FONT %%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\msg_new:nnn { gotham } { font-not-found }
+{
+ Could~not~find~font~'#1'.\c_space_tl
+}
+
+\msg_new:nnn { gotham } { fonts-not-available }
+{
+ No~suitable~fonts~found.~Using~fallback~fonts.
+}
+
+\msg_new:nnn { gotham } { compiler-xe-or-lua }
+{
+ You~need~to~compile~with~XeLaTeX~or~LuaLaTeX~to~use~the~Fira~fonts.
+}
+
+\int_new:N \g_gotham_fontsnotfound_int
+
+\cs_new_protected:Nn \checkfont:n
+{
+\fontspec_font_if_exist:nF { #1 }
+{
+\fontspec_font_if_exist:nF { #1~Regular }
+{
+\int_incr:N \g_gotham_fontsnotfound_int
+\msg_warning:nnn { gotham } { font-not-found } { #1 }
+}
+}
+}
+
+\newcommand{\iffontsavailable}[3]
+{
+\int_zero:N \g_gotham_fontsnotfound_int
+\clist_map_function:nN { #1 } \checkfont:n
+\int_compare:nTF { \g_gotham_fontsnotfound_int = 0 }
+{% True
+#2
+}{% False
+#3
+}
+}
+
+\ifboolexpr{bool~{xetex}~or~bool~{luatex}}{
+\@ifpackageloaded{fontspec}{
+\PassOptionsToPackage{no-math}{fontspec}
+}{
+\RequirePackage[no-math]{fontspec}
+}
+\iffontsavailable{FiraSans-Light.otf,
+FiraSans-LightItalic.otf,
+FiraSans-Regular.otf,
+FiraSans-Italic.otf}
+{
+\setsansfont[ItalicFont={FiraSans-LightItalic.otf},
+BoldFont={FiraSans-Regular.otf},
+BoldItalicFont={FiraSans-Italic.otf}]
+{FiraSans-Light.otf}
+}{
+\iffontsavailable{FiraSans~Light~OT,
+FiraSans~LightItalic~OT,
+FiraSans~Regular~OT,
+FiraSans~Italic~OT}
+{
+\setsansfont[ItalicFont={Fira~Sans~LightItalic~OT},
+BoldFont={Fira~Sans~Regular~OT},
+BoldItalicFont={Fira~Sans~Italic~OT}]
+{Fira~Sans~Light~OT}
+}{
+\msg_warning:nn { gotham } { fonts-not-available }%
+}
+}
+\iffontsavailable{FiraMono-Medium.otf, FiraMono-Bold.otf}{
+\setmonofont[BoldFont={FiraMono-Medium.otf}]{FiraMono-Bold.otf}
+}{
+\iffontsavailable{Fira~Mono~Medium~OT, Fira~Mono~Bold~OT}{
+\setmonofont[BoldFont={Fira~Mono~Medium~OT}]{Fira~Mono~Bold~OT}
+}{
+\msg_warning:nn { gotham } { fonts-not-available }
+}
+}
+\AtBeginEnvironment{tabular}{
+\addfontfeature{Numbers={Monospaced}}
+}
+}{
+\msg_warning:nn { gotham } { compiler-xe-or-lua }
+\DeclareFontShape{OT1}{cmss}{bx}{sc}{<-> cmbcsc10}{}
+\DeclareFontShape{OT1}{cmss}{bx}{it}{<->sub*cmss/m/sl}{}
+}
+
+\setbeamerfont{title}{size=\Large, series=\bfseries}
+\setbeamerfont*{subtitle}{size=\large}
+\setbeamerfont{author}{size=\small}
+\setbeamerfont{date}{size=\small}
+
+\setbeamerfont{section~title}{size=\Large, series=\bfseries}
+\setbeamerfont{subsection~title}{size=\large, series=\bfseries}
+\setbeamerfont{subsubsection~title}{size=\normalsize, series=\bfseries}
+
+\setbeamerfont{frametitle}{size=\large, series=\bfseries}
+\setbeamerfont{frametitleToc}{size=\LARGE, series=\bfseries}
+\setbeamerfont{frametitleSection}{size*={60}{1}, series=\bfseries}
+
+\setbeamerfont{block~title}{size=\normalsize, series=\bfseries}
+\setbeamerfont{block~title~alerted}{size=\normalsize, series=\bfseries}
+\setbeamerfont{caption}{size=\small}
+\setbeamerfont{caption~name}{series=\bfseries}
+\setbeamerfont{description~item}{series=\bfseries}
+\setbeamerfont{page~number~in~head/foot}{size=\scriptsize}
+
+\setbeamerfont{bibliography~entry~author}{size=\normalsize, series=\normalfont}
+\setbeamerfont{bibliography~entry~title}{size=\normalsize, series=\bfseries}
+\setbeamerfont{bibliography~entry~location}{size=\normalsize, series=\normalfont}
+\setbeamerfont{bibliography~entry~note}{size=\small, series=\normalfont}
+\setbeamerfont{standout}{size=\Large, series=\bfseries}
+
+\def\gotham@titleformat#1{#1}
+\def\gotham@subtitleformat#1{#1}
+\def\gotham@parttitleformat#1{#1}
+\def\gotham@sectiontitleformat#1{#1}
+\def\gotham@subsectiontitleformat#1{#1}
+\def\gotham@frametitleformat#1{#1}
+\def\gotham@framesubtitleformat#1{#1}
+
+\ExplSyntaxOff
+\patchcmd{\beamer@title}
+{\def\inserttitle{#2}}
+{\def\inserttitle{\gotham@titleformat{#2}}}
+{}
+{\PackageError{beamerfontthemegotham}{Patching~title~failed}\@ehc}
+\patchcmd{\beamer@subtitle}
+{\def\insertsubtitle{#2}}
+{\def\insertsubtitle{{\gotham@subtitleformat{#2}}}}
+{}
+{\PackageError{beamerfontthemegotham}{Patching~subtitle~failed}\@ehc}
+\patchcmd{\sectionentry} % beamerbasenavigation.sty l.335
+{\def\insertsectionhead{#2}}
+{\def\insertsectionhead{\gotham@sectiontitleformat{#2}}}
+{}
+{\PackageError{beamerfontthemegotham}{Patching~section~title~failed}\@ehc}%
+%% NOT WORKING YET!
+%% \patchcmd{\subsectionentry} % beamerbasenavigation.sty l.384
+%% {\def\insertsubsectionhead{##5}}
+%% {\def\insertsubsectionhead{\gotham@subsectiontitleformat{##5}}}
+%% {}
+%% {\PackageError{beamerfontthemegotham}{Patching~subsection~title~failed}\@ehc}%
+\@tempswafalse
+\patchcmd{\beamer@section} % beamerbasesection.sty l. 209
+{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+{\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{\gotham@sectiontitleformat{#1}}}}
+{\@tempswatrue}
+{}
+\patchcmd{\beamer@section} % beamerbasesection.sty l. 209
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
+{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\noexpand\gotham@sectiontitleformat{\unexpanded{#1}}}}}
+{\@tempswatrue}
+{}
+\if@tempswa\else
+{\PackageError{beamerfontthemegotham}{Patching~section~title~failed}\@ehc}
+\fi
+\@tempswafalse
+%% NOT WORKING YET !
+%% \patchcmd{\beamer@subsection} % beamerbasesection.sty l. 209
+%% {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+%% {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}\gotham@subsectiontitleformat{#1}}}
+%% % \__gotham_subsection_title_format:n{#2}
+%% {\@tempswatrue}
+%% {}
+%% \patchcmd{\beamer@subsection} % beamerbasesection.sty l. 209
+%% {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
+%% {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\noexpand\gotham@subsectiontitleformat{#1}}}}
+%% % \exp_not:N \__gotham_subsection_title_format:n {#1}
+%% {\@tempswatrue}
+%% {}
+%% \if@tempswa\else
+%% {\PackageError{beamerfontthemegotham}{Patching~subsection~title~failed}\@ehc}
+%% \fi%
+%% \@tempswafalse
+\providecommand{\beamer@insertframetitlecontinuation}{
+\usebeamertemplate*{frametitle~continuation}
+}
+\patchcmd{\beamer@@frametitle} % beamerbaselocalstructure.sty l. 32
+{\gdef\insertframetitle{{%
+#2%
+\ifnum\beamer@autobreakcount>0
+\relax{}\space%
+\beamer@insertframetitlecontinuation%
+\fi%
+}}%
+}
+{\gdef\insertframetitle{{%
+\gotham@frametitleformat{#2}%
+\ifnum\beamer@autobreakcount>0
+\relax{}\space%
+\beamer@insertframetitlecontinuation%
+\fi%
+}}%
+}
+{}
+{\PackageWarning{beamerfontthemegotham}{Patching~frametitle~failed}\@ehc}
+%% NOT WORKING YET !
+%% \patchcmd{\framesubtitle} % beamerbaselocalstructure.sty l.55
+%% {\only#2{\ifblank{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
+%% {\only{#2}{\ifblank{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
+%% {}
+%% {\PackageWarning{beamerfontthemegotham}{Patching~framesubtitle~failed}\@ehc}
+\ExplSyntaxOn
+
+%%%%
+\keys_define:nn { gotham / font }
+{
+format~title .choice:,
+format~title .usage:n = { general },
+format~title .default:n = { regular },
+format~title / regular .code:n =
+{
+\let\gotham@titleformat\@empty
+},
+format~title / lower .code:n =
+{
+\let\gotham@titleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~title=lower~can~lead~to~problems. }
+},
+format~title / upper .code:n =
+{
+\let\gotham@titleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~title=upper~can~lead~to~problems. }
+},
+format~title / titlecase .code:n =
+{
+\let\gotham@titleformat \text_titlecase_all:n %\MakeTitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~title=titlecase~can~lead~to~problems. }
+},
+format~title / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~title / unknown } },
+}
+\keys_define:nn { gotham / font }
+{
+shape~title .choice:,
+shape~title .usage:n = { general },
+shape~title .default:n = { regular },
+shape~title / regular .code:n =
+{
+\setbeamerfont{title}{shape=\normalfont}
+},
+shape~title / smallcaps .code:n =
+{
+\setbeamerfont{title}{shape=\scshape}
+},
+shape~title / italic .code:n =
+{
+\setbeamerfont{title}{shape=\itshape}
+},
+shape~title / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~title / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~subtitle .choice:,
+format~subtitle .usage:n = { general },
+format~subtitle .default:n = { regular },
+format~subtitle / regular .code:n =
+{
+\let\gotham@subtitleformat\@empty
+},
+format~subtitle / lower .code:n =
+{
+\let\gotham@subtitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~subtitle=lower~can~lead~to~problems. }
+},
+format~subtitle / upper .code:n =
+{
+\let\gotham@subtitleformat \text_uppercase:n %\uppercase
+\cs_set_eq:NN \__gotham_subtitle_format:n \text_uppercase:n
+\PackageWarning{ gotham } { Be~aware~that~format~subtitle=upper~can~lead~to~problems. }
+},
+format~subtitle / titlecase .code:n =
+{
+\let\gotham@subtitleformat \text_titlecase_all:n %\MakeTitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~subtitle=titlecase~can~lead~to~problems. }
+},
+format~subtitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~subtitle / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~subtitle .choice:,
+shape~subtitle .usage:n = { general },
+shape~subtitle .default:n = { regular },
+shape~subtitle / regular .code:n =
+{
+\setbeamerfont{subtitle}{shape=\normalfont}
+},
+shape~subtitle / smallcaps .code:n =
+{
+\setbeamerfont{subtitle}{shape=\scshape}
+},
+shape~subtitle / italic .code:n =
+{
+\setbeamerfont{subtitle}{shape=\itshape}
+},
+shape~subtitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~subtitle / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~frametitle .choice:,
+format~frametitle .usage:n = { general },
+format~frametitle .default:n = { regular },
+format~frametitle / regular .code:n =
+{
+\let\gotham@frametitleformat\@empty
+},
+format~frametitle / lower .code:n =
+{
+\let\gotham@frametitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~frametitle=lower~can~lead~to~problems. }
+},
+format~frametitle / upper .code:n =
+{
+\let\gotham@frametitleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~frametitle=upper~can~lead~to~problems. }
+},
+format~frametitle / titlecase .code:n =
+{
+\let\gotham@frametitleformat \text_titlecase_all:n %\Maketitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~frametitle=titlecase~can~lead~to~problems. }
+},
+format~frametitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~frametitle / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~frametitle .choice:,
+shape~frametitle .usage:n = { general },
+shape~frametitle .default:n = { regular },
+shape~frametitle / regular .code:n =
+{
+\setbeamerfont{frametitle}{shape=\normalfont}
+},
+shape~frametitle / smallcaps .code:n =
+{
+\setbeamerfont{frametitle}{shape=\scshape}
+},
+shape~frametitle / italic .code:n =
+{
+\setbeamerfont{frametitle}{shape=\itshape}
+},
+shape~frametitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~frametitle / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~framesubtitle .choice:,
+format~framesubtitle .usage:n = { general },
+format~framesubtitle .default:n = { regular },
+format~framesubtitle / regular .code:n =
+{
+\let\gotham@framesubtitleformat\@empty
+},
+format~framesubtitle / lower .code:n =
+{
+\let\gotham@framesubtitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~framesubtitle=lower~can~lead~to~problems. }
+},
+format~framesubtitle / upper .code:n =
+{
+\let\gotham@framesubtitleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~framesubtitle=upper~can~lead~to~problems. }
+},
+format~framesubtitle / titlecase .code:n =
+{
+\let\gotham@framesubtitleformat \text_titlecase_all:n %\Maketitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~framesubtitle=titlecase~can~lead~to~problems. }
+},
+format~framesubtitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~framesubtitle / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~framesubtitle .choice:,
+shape~framesubtitle .usage:n = { general },
+shape~framesubtitle .default:n = { regular },
+shape~framesubtitle / regular .code:n =
+{
+\setbeamerfont{framesubtitle}{shape=\normalfont}
+},
+shape~framesubtitle / smallcaps .code:n =
+{
+\setbeamerfont{framesubtitle}{shape=\scshape}
+},
+shape~framesubtitle / italic .code:n =
+{
+\setbeamerfont{framesubtitle}{shape=\itshape}
+},
+shape~framesubtitle / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~framesubtitle / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~part .choice:,
+format~part .usage:n = { general },
+format~part .default:n = { regular },
+format~part / regular .code:n =
+{
+\let\gotham@parttitleformat\@empty
+},
+format~part / lower .code:n =
+{
+\let\gotham@parttitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~part=lower~can~lead~to~problems. }
+},
+format~part / upper .code:n =
+{
+\let\gotham@parttitleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~part=upper~can~lead~to~problems. }
+},
+format~part / titlecase .code:n =
+{
+\let\gotham@parttitleformat\text_titlecase_all:n %\Maketitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~part=titlecase~can~lead~to~problems. }
+},
+format~part / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~part / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~part .choice:,
+shape~part .usage:n = { general },
+shape~part .default:n = { regular },
+shape~part / regular .code:n =
+{
+\setbeamerfont{part~title}{shape=\normalfont}
+},
+shape~part / smallcaps .code:n =
+{
+\setbeamerfont{part~title}{shape=\scshape}
+},
+shape~part / italic .code:n =
+{
+\setbeamerfont{part~title}{shape=\itshape}
+},
+shape~part / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~part / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~section .choice:,
+format~section .usage:n = { general },
+format~section .default:n = { regular },
+format~section / regular .code:n =
+{
+\let\gotham@sectiontitleformat\@empty
+},
+format~section / lower .code:n =
+{
+\let\gotham@sectiontitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~section=lower~can~lead~to~problems. }
+},
+format~section / upper .code:n =
+{
+\let\gotham@sectiontitleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~section=upper~can~lead~to~problems. }
+},
+format~section / titlecase .code:n =
+{
+\let\gotham@sectiontitleformat \text_titlecase_all:n %\Maketitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~section=titlecase~can~lead~to~problems. }
+},
+format~section / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~section / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~section .choice:,
+shape~section .usage:n = { general },
+shape~section .default:n = { regular },
+shape~section / regular .code:n =
+{
+\setbeamerfont{section~title}{shape=\normalfont}
+},
+shape~section / smallcaps .code:n =
+{
+\setbeamerfont{section~title}{shape=\scshape}
+},
+shape~section / italic .code:n =
+{
+\setbeamerfont{section~title}{shape=\itshape}
+},
+shape~section / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~section / unknown} },
+}
+
+\keys_define:nn { gotham / font }
+{
+format~subsection .choice:,
+format~subsection .usage:n = { general },
+format~subsection .default:n = { regular },
+format~subsection / regular .code:n =
+{
+\let\gotham@subsectiontitleformat\@empty
+},
+format~subsection / lower .code:n =
+{
+\let\gotham@subsectiontitleformat \text_lowercase:n %\lowercase
+\PackageWarning{ gotham } { Be~aware~that~format~subsection=lower~can~lead~to~problems. }
+},
+format~subsection / upper .code:n =
+{
+\let\gotham@subsectiontitleformat \text_uppercase:n %\uppercase
+\PackageWarning{ gotham } { Be~aware~that~format~subsection=upper~can~lead~to~problems. }
+},
+format~subsection / titlecase .code:n =
+{
+\let\gotham@subsectiontitleformat\text_titlecase_all:n %\Maketitlecase
+\PackageWarning{ gotham } { Be~aware~that~format~subsection=titlecase~can~lead~to~problems. }
+},
+format~subsection / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: format~subsection / unknown} },
+}
+\keys_define:nn { gotham / font }
+{
+shape~subsection .choice:,
+shape~subsection .usage:n = { general },
+shape~subsection .default:n = { regular },
+shape~subsection / regular .code:n =
+{
+\setbeamerfont{subsection~title}{shape=\normalfont}
+},
+shape~subsection / smallcaps .code:n =
+{
+\setbeamerfont{subsection~title}{shape=\scshape}
+},
+shape~subsection / italic .code:n =
+{
+\setbeamerfont{subsection~title}{shape=\itshape}
+},
+shape~subsection / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'\l_keys_value_tl'~is~unknown~for~the~(known)~option~'\l_keys_key_tl',~so~being~ignored. }{helping~message: shape~subsection / unknown} },
+}
+
+\keys_set:nn { gotham / font } {
+format~title, shape~title,
+format~subtitle, shape~subtitle,
+format~frametitle, shape~frametitle,
+format~framesubtitle, shape~framesubtitle,
+format~part, shape~part,
+format~section, shape~section,
+format~subsection, shape~subsection,
+}
+
+\ProcessKeyOptions[ gotham / font ]
+%%
+%% Adapted from classic "A model .dtx file" by Joseph Wright
+%% https://www.texdev.net/2009/10/06/a-model-dtx-file/
+%%
+%% End of file `beamerfontthemegotham.sty'.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty
new file mode 100644
index 00000000000..5d67edabad3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerinnerthemegotham.sty
@@ -0,0 +1,1949 @@
+%%
+%% This is file `beamerinnerthemegotham.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gotham.dtx (with options: `inner')
+%%
+%% Copyright (C) 2023-20** by Romain NOËL <romainoel@free.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Romain NOËL.
+%% Contributors: Romain NOËL (2023-20**)
+%%
+\ProvidesExplPackage{beamerinnerthemegotham}{2024/09/20}{1.1.0.b}{gotham inner theme}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+\RequirePackage{calc}
+\RequirePackage{tikz}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% INNER %%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% Titlepage %%%
+%%%%%%%%%%%%%%%%%%%
+\@ifundefined{\string\color@colorProgBar}{
+\providebool{darkBG} \boolfalse{darkBG}
+\providebool{transparentBG} \booltrue{transparentBG}
+\colorlet{colorBG}{white}
+\colorlet{colorFG}{black}
+\colorlet{colorFrametitle}{purple}
+\colorlet{colorStandout}{purple}
+\colorlet{colorStandin}{purple}
+\colorlet{colorTitlepage}{purple}
+\colorlet{colorFiligrane}{gray}
+\colorlet{colorBackElement}{gray}
+\colorlet{colorProgBar}{orange}
+\colorlet{colorAlert}{red}
+\colorlet{colorExample}{green}
+\colorlet{colorFrametitle}{purple}
+\colorlet{colorTitlepage}{purple}
+\setbeamercolor{progress~bar}{
+use=alerted~text,
+fg=colorProgBar,
+bg=alerted~text.fg!50!black!30
+}
+\setbeamercolor{progress~bar~in~head/foot}{%
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~part~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~section~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~splitvert}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{frametitleSection}{use=primary~palette, bg=, fg=primary~palette.bg}
+\setbeamercolor{standout}{use=primary~palette, bg=colorStandout, fg=primary~palette.bg}
+\setbeamercolor{standin}{use=normal~text, bg=colorStandin, fg=normal~text.fg}
+\setbeamercolor{section~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsection~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsubsection~in~toc}{use=normal~text, parent=normal~text,}
+}{
+}
+
+\def\maketitle{
+\ifbeamer@inframe
+\titlepage
+\else
+\frame[plain, noframenumbering]{\titlepage}
+\fi
+}
+\def\titlepage{
+\usebeamertemplate{title~page}
+}
+
+\defbeamertemplate*{title~graphic}{gotham}{
+\vbox{
+\inserttitlegraphic
+}
+\nointerlineskip
+}
+\defbeamertemplate*{title}{gotham}{
+\linespread{1.0}
+\inserttitle
+\par
+\vspace*{0.5em}
+}
+\defbeamertemplate*{subtitle}{gotham}{
+\insertsubtitle
+\par
+\vspace*{0.5em}
+}
+\defbeamertemplate*{author}{gotham}{
+\vspace*{1.em}
+\insertauthor
+\par
+\vspace*{0.25em}
+}
+\defbeamertemplate*{date}{gotham}{
+\insertdate
+\par
+}
+\defbeamertemplate*{institute}{gotham}{
+\vspace*{3mm}
+\insertinstitute
+\par
+}
+
+\dim_new:N \l__gotham_titleseparator_width_dim
+\dim_set:Nn \l__gotham_titleseparator_width_dim {\textwidth}
+\dim_new:N \l__gotham_titleseparator_height_dim
+\dim_set:Nn \l__gotham_titleseparator_height_dim {2pt}
+\dim_new:N \l__gotham_title_width_dim
+\dim_new:N \l__gotham_subtitle_width_dim
+\dim_new:N \l__gotham_title_max_width_dim
+
+\defbeamertemplate*{title~separator}{gotham}{
+\begin{tikzpicture}
+\fill[fg] (0,0) rectangle
+(\dim_use:N \l__gotham_titleseparator_width_dim,
+\dim_use:N \l__gotham_titleseparator_height_dim);
+\end{tikzpicture}
+\par
+}
+
+%%%%
+\providecommand{\gothamtitlepagelogo}{}
+
+%%%%%
+\providecommand{\gothamtitlepagebg}{}
+
+
+
+\defbeamertemplate{title~page}{gotham~normal}{
+\ifx\insertframetitle\@empty\else\vspace*{-3em}\fi
+\begin{picture}(0,0)
+\put(-30,-125){\noindent
+\fcolorbox{normal~text.bg}{normal~text.bg}{
+\begin{minipage}[b][\paperheight]{\paperwidth}
+\parbox[c][0pt][c]{0pt}{\gothamtitlepagebg}
+\centering
+\vfill
+\ifx\inserttitle\@empty\else\usebeamertemplate*{title}\fi
+\ifx\insertsubtitle\@empty\else\usebeamertemplate*{subtitle}\fi
+\usebeamertemplate*{title~separator}
+\expandafter\ifblank\expandafter{\beamer@andstripped}{
+\vspace*{1.em}
+}{
+\usebeamertemplate*{author}
+}
+\ifx\insertdate\@empty\else\usebeamertemplate*{date}\fi
+\ifx\insertinstitute\@empty\else{\parbox{0.9\textwidth}{\raggedright\usebeamertemplate*{institute}} }\fi
+\vfill
+\vbox{}
+\end{minipage}
+}
+}
+
+\put(234,-120){
+\gothamtitlepagelogo
+}
+
+\put(-27,-123){
+\noindent\vbox{
+\begin{minipage}[b][0.96\paperheight]{0.899\textwidth}
+\ifx\inserttitlegraphic\@empty\else\usebeamertemplate*{title~graphic}\fi
+\end{minipage}
+}
+}
+\end{picture}
+}
+
+\defbeamertemplate{title~page}{gotham~reversed}{
+\begin{picture}(0,0)
+\put(-28,-128){\gothamtitlepagebg}
+
+\put(-4,-125){\noindent
+\ifbool{darkBG}{
+\setbeamercolor{normal~text}{fg=colorFG, }
+\fcolorbox{colorPale}{colorPale}% reversed
+}{
+\setbeamercolor{normal~text}{fg=colorBG, }
+\fcolorbox{colorTitlepage}{colorTitlepage}% reversed
+}% end if
+{
+\begin{minipage}[b][\paperheight]{\textwidth}
+\centering
+\vfill
+\ifx\inserttitle\@empty\else\usebeamertemplate*{title}\fi
+\ifx\insertsubtitle\@empty\else\usebeamertemplate*{subtitle}\fi
+\usebeamertemplate*{title~separator}
+\expandafter\ifblank\expandafter{\beamer@andstripped}{
+\vspace*{1.em}
+}{
+\usebeamertemplate*{author}
+}
+\ifx\insertdate\@empty\else\usebeamertemplate*{date}\fi
+\ifx\insertinstitute\@empty\else{\parbox{0.9\textwidth}{\raggedright\usebeamertemplate*{institute}} }\fi
+\vfill
+\vbox{}
+\end{minipage}
+}
+}
+
+\put(234,-120){
+\gothamtitlepagelogo
+}
+
+\put(-27,-123){
+\noindent\vbox{
+\begin{minipage}[b][0.96\paperheight]{0.899\textwidth}
+\ifx\inserttitlegraphic\@empty\else\usebeamertemplate*{title~graphic}\fi
+\end{minipage}
+}
+}
+\end{picture}
+}
+
+\defbeamertemplate{title~page}{gotham~dividedpic}{
+\long\def\tmpEmpty{}
+\def\titlecontent{\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle}
+\def\subtitlecontent{\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle}
+\settowidth\l__gotham_title_width_dim\titlecontent
+\settowidth\l__gotham_subtitle_width_dim\subtitlecontent
+\setlength\l__gotham_title_max_width_dim{\ifdim\l__gotham_title_width_dim>\l__gotham_subtitle_width_dim\l__gotham_title_width_dim\else\l__gotham_subtitle_width_dim\fi}
+\begin{minipage}{.55\textwidth}
+\raggedright
+\titlecontent\\
+\subtitlecontent\\
+\textcolor{colorProgBar}{\rule{\ifdim\l__gotham_title_max_width_dim<.55\textwidth\l__gotham_title_max_width_dim\else.55\textwidth\fi}{\dim_use:N \l__gotham_titleseparator_height_dim}}\\[2em]
+\usebeamerfont{author}\usebeamercolor[fg]{author}
+\insertauthor\\
+\expandafter\ifblank\expandafter{\beamer@andstripped}{
+\vspace*{1.em}
+}{
+\usebeamerfont{author}\usebeamercolor[fg]{author}
+\insertshortauthor
+\vspace{2em}
+}
+\ifx\insertinstitute\@empty\else{
+\usebeamertemplate*{institute}\vspace{2em}
+}\fi
+\insertdate
+\end{minipage}
+
+\begin{tikzpicture}[remember~picture, overlay]
+\clip (current~page.south~east)
+-- (current~page.north~east)
+-- ++(-5.1, 0)
+-- ++(-3, -\paperheight)
+-- cycle;
+
+\ifx\gothamtitlepagebg\tmpEmpty
+\fill[
+right~color=colorTitlepage!100,%\ifbool{darkBG}{colorPale!100}{colorDark!100},
+]
+(current~page.south~east)
+rectangle
+++(\dimexpr-0.55\paperwidth, \dimexpr\paperheight+1cm);
+\else
+\node[
+anchor=south~east,
+inner~sep=0,
+outer~sep=0
+] at (current~page.south~east) {
+\gothamtitlepagebg
+};
+\fi
+\end{tikzpicture}
+}
+
+\defbeamertemplate{title~page}{gotham~splitvert}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.5\paperheight}
+\else %}{
+\vspace*{-0.63\paperheight}
+\fi %}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}%
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor] (current~page.north~west) rectangle ([shift = {(0, -0.45\paperheight)}] current~page.north~east);
+\end{tikzpicture}
+}
+
+\begin{minipage}[b][0.35\paperheight]{\textwidth}
+\usebeamerfont{title}
+\usebeamercolor[fg]{frametitle}
+\inserttitle
+\end{minipage}
+
+\newline
+\begin{minipage}[t][0.1\paperheight]{\textwidth}
+\usebeamerfont{subtitle}
+\usebeamercolor[fg]{frametitle}
+\insertsubtitle
+\end{minipage}
+
+\ifx\inserttitlegraphic\@empty\else
+\newline
+\vspace*{-1.65\baselineskip}
+{\parbox[c][0pt][c]{\textwidth}{
+\raggedleft
+\inserttitlegraphic
+}}
+\fi
+
+\expandafter\ifblank\expandafter{\beamer@andstripped}{
+\vspace*{1.em}
+}{
+\newline
+\begin{minipage}[t]{\textwidth}
+\vspace*{-1.5\baselineskip}
+\usebeamertemplate*{author}
+\end{minipage}
+}
+
+\ifx\insertinstitute\@empty\else
+\newline
+\vspace*{-1.65\baselineskip}
+\begin{minipage}[t]{\textwidth}
+\usebeamertemplate*{institute}
+\end{minipage}
+\fi
+
+\ifx\insertdate\@empty\else
+\newline
+\begin{minipage}[t]{\textwidth}
+\vspace*{2.65\baselineskip}
+\usebeamertemplate*{date}
+\end{minipage}
+\vspace*{-3.15\baselineskip}
+\fi
+}
+
+%%%%%%
+\cs_if_exist:NTF \__gotham_set_template:nn {}{
+
+\cs_new_protected:Nn \__gotham_set_template:nn
+{
+\cs_if_exist:cTF {beamer@@tmpop@#1@#2} {
+\setbeamertemplate{#1}[#2]
+}{
+\PackageError{beamerinnerthemegotham}
+{The~beamer~template~named~'#1'~with~the~option~'#2'~does~not~exist}
+{helping~message unknown setbeamertemplate option}
+}
+}
+}
+
+%%%%
+\keys_define:nn { gotham / inner }
+{
+title~page .usage:n = { general },
+title~page .default:n = { gotham~normal },
+title~page .code:n = { \__gotham_set_template:nn{title~page}{#1} },
+}
+
+%% Backgrounds %%%
+%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%
+\prop_if_exist:NTF \l__gotham_template_name_prop
+{}{
+\prop_new:N \l__gotham_template_name_prop
+}
+
+%%%%%%
+\defbeamertemplate{background~canvas}{empty}{% empty background style has a color.
+\hspace*{28pt}
+\begin{beamercolorbox}[wd=\paperwidth,
+ ht=\paperheight,
+ ]{background}
+ % nothing to write, only a background color
+ \end{beamercolorbox}
+}%
+\defbeamertemplate{background}{empty}{}%
+
+\defbeamertemplate{background}{watermark/gotham~draft}{
+\begin{tikzpicture}[overlay,remember~picture]
+\node[color=red, opacity=0.3, scale=5, rotate=45] at ([shift={(0,0)}]current~page.center) {DRAFT};
+\end{tikzpicture}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {background/watermark} {gotham~draft}
+
+\seq_if_exist:NTF \l__gotham_frameoption_tmp_seq {}{
+\seq_new:N \l__gotham_frameoption_tmp_seq
+}
+
+\cs_if_exist:NTF \__gotham_add_beamerframe_key:n {}{
+
+\cs_new_protected:Nn \__gotham_add_beamerframe_key:n {
+\define@key{beamerframe}{ #1 }[true]{
+\begin{#1env}
+\seq_put_left:Nn \l__gotham_frameoption_tmp_seq { \end{#1env} }
+}
+}
+
+\apptocmd{\beamer@reseteecodes}{
+\seq_use:Nn \l__gotham_frameoption_tmp_seq {}
+\seq_clear:N \l__gotham_frameoption_tmp_seq
+}{}{}
+}
+
+%%%%%%
+
+\newenvironment{noBGCenv}{
+\setbeamertemplate{background~canvas}[empty]
+}{}
+\__gotham_add_beamerframe_key:n {noBGC}
+
+%%%%%%
+\bool_new:N \l_gotham_defaultWatermark
+\bool_set_false:N \l_gotham_defaultWatermark
+\BeforeBeginEnvironment{frame}{
+\bool_if:NTF \l_gotham_defaultWatermark {
+\setbeamertemplate{background}[watermark/\prop_item:Nn \l__gotham_template_name_prop {background/watermark}]
+}{% false
+\setbeamertemplate{background}[empty]
+}
+}
+
+%%%%%%
+\newenvironment{watermarkenv}{
+\setbeamertemplate{background}[
+watermark/\prop_item:Nn \l__gotham_template_name_prop {background/watermark}
+]
+}{}
+\__gotham_add_beamerframe_key:n {watermark}
+
+%%%%%%
+\newenvironment{nowatermarkenv}{
+\setbeamertemplate{background}[empty]
+}{}
+\__gotham_add_beamerframe_key:n {nowatermark}
+
+\seq_if_exist:NTF \l__gotham_tmpa_seq
+{}{
+\seq_new:N \l__gotham_tmpa_seq
+}
+\tl_if_exist:NTF \l__gotham_tmpa_tl
+{}{
+\tl_new:N \l__gotham_tmpa_tl
+}
+\tl_if_exist:NTF \l__gotham_tmpb_tl
+{}{
+\tl_new:N \l__gotham_tmpb_tl
+}
+
+\cs_if_exist:NTF \__gotham_set_prop_template:nn {}{
+\cs_new_protected:Nn \__gotham_set_prop_template:nn
+{
+\tl_if_in:nnTF { #1 } { / }
+{
+\seq_set_split:Nnn \l__gotham_tmpa_seq { / } { #1 }
+\tl_set:Nn \l__gotham_tmpa_tl { \seq_item:Nn \l__gotham_tmpa_seq { 1 } }
+\tl_set:Nn \l__gotham_tmpb_tl { \seq_item:Nn \l__gotham_tmpa_seq { 2 } }
+\cs_if_exist:cTF {beamer@@tmpop@\exp_not:V \l__gotham_tmpa_tl @\exp_not:V \l__gotham_tmpb_tl /#2} {
+\prop_put:Nnn \l__gotham_template_name_prop {#1} {#2}
+}{
+\PackageError{beamerthemegotham}
+{The~beamer~template~named~'\l__gotham_tmpa_tl'~with~the~option~'\l__gotham_tmpb_tl/#2'~does~not~exist}
+{helping~message}
+}
+}{% false -> error
+\PackageError{beamerthemegotham}
+{%
+When~using~'\c_backslash_str\cs_to_str:N \__gotham_set_prop_template'~the~first~argument~should~contain~a~'/'~to~respect~the~naming~convention~used~(Template/what/Who~name),~but~you~gave~'#1'.~
+As~example:~if~'\c_backslash_str defbeamertemplate{background}{watermark/gotham~draft}'...,~then~use~'\c_backslash_str\cs_to_str:N \__gotham_set_prop_template{background/watermark}{gotham~draft}'
+}{helping~message}
+}
+}
+}
+
+%%%%
+\keys_define:nn { gotham / inner }{
+watermark~template .usage:n = { general },
+watermark~template .default:n = { gotham~draft },
+watermark~template .code:n = { \__gotham_set_prop_template:nn{background/watermark}{#1} },
+}
+\keys_define:nn { gotham / inner }{
+watermark~default .choice:,
+watermark~default .usage:n = { general },
+watermark~default .default:n = { false },
+
+watermark~default / true .code:n = { \bool_set_true:N \l_gotham_defaultWatermark },
+watermark~default / on .code:n = { \bool_set_true:N \l_gotham_defaultWatermark },
+watermark~default / enable .code:n = { \bool_set_true:N \l_gotham_defaultWatermark },
+
+watermark~default / false .code:n = { \bool_set_false:N \l_gotham_defaultWatermark },
+watermark~default / off .code:n = { \bool_set_false:N \l_gotham_defaultWatermark },
+watermark~default / disable .code:n = { \bool_set_false:N \l_gotham_defaultWatermark },
+
+watermark~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'watermark~default',~so~being~ignored. }{helping~message: watermark~default / unknown} },
+}
+
+%%%% Stand IN/OUT %%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%
+\define@key{beamerframe}{c}[true]{
+\beamer@frametopskip=0pt~plus~1fill\relax
+\beamer@framebottomskip=0pt~plus~1fill\relax
+\beamer@frametopskipautobreak=0pt~plus~.4\paperheight\relax
+\beamer@framebottomskipautobreak=0pt~plus~.6\paperheight\relax
+\def\beamer@initfirstlineunskip{}
+}
+
+\defbeamertemplate{background~canvas}{standout/gotham}{
+\ifbeamercolorempty[bg]{standout}{
+}{
+\usebeamercolor[bg]{standout}\color{bg}
+\vrule~width\paperwidth~height\paperheight
+}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {background~canvas/standout} {gotham}
+
+\defbeamertemplate*{standout}{gotham}{%
+
+\setbeamertemplate{background~canvas}[standout/\prop_item:Nn \l__gotham_template_name_prop {background~canvas/standout}]
+\usebeamerfont{standout}
+\ifbeamercolorempty[bg]{palette~primary}{
+\setbeamercolor{background~canvas}{
+use=palette~primary,
+bg=palette~primary.fg
+}
+}{
+\setbeamercolor{background~canvas}{
+use=palette~primary,
+bg=palette~primary.bg
+}
+}
+\setbeamercolor{local~structure}{
+fg=palette~primary.bg
+}
+\usebeamercolor[fg]{palette~primary}
+}
+
+%%%%%%
+\newenvironment{standoutenv}{
+\usebeamertemplate{standout}
+}{}
+\__gotham_add_beamerframe_key:n {standout}
+
+\defbeamertemplate{background~canvas}{standin/gotham}{
+\ifbeamercolorempty[bg]{standin}{
+}{
+\ifbool{transparentBG}{
+}{
+\usebeamercolor[bg]{standin}\color{bg}
+\vrule~width\paperwidth~height\paperheight
+}
+}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {background~canvas/standin} {gotham}
+
+\defbeamertemplate*{standin}{gotham}{
+\setbeamertemplate{background~canvas}[standin/\prop_item:Nn \l__gotham_template_name_prop {background~canvas/standin}]
+\usebeamerfont{standin}
+\setbeamercolor{frametitle}{
+use=normal~text,
+bg=normal~text.bg,
+fg=normal~text.fg
+}
+}
+
+%%%%%%
+\newenvironment{standinenv}{
+\usebeamertemplate{standin}
+}{}
+\__gotham_add_beamerframe_key:n {standin}
+
+%%%%
+\keys_define:nn { gotham / inner }
+{
+standout~template .usage:n = { general },
+standout~template .default:n = { gotham },
+standout~template .code:n = { \__gotham_set_prop_template:nn{background~canvas/standout}{#1} },
+}
+\keys_define:nn { gotham / inner }
+{
+standin~template .usage:n = { general },
+standin~template .default:n = { gotham },
+standin~template .code:n = { \__gotham_set_prop_template:nn{background~canvas/standin}{#1} },
+}
+
+%%%% Sections %%%%
+%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%
+\bool_new:N \l_gotham_partframe
+\bool_set_false:N \l_gotham_partframe
+\define@key{beamerframe}{part}[true]{
+\bool_set_true:N \l_gotham_partframe
+\begingroup
+\usebeamertemplate{part~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_partframe {
+\endgroup
+\bool_set_false:N \l_gotham_partframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_sectionframe
+\bool_set_false:N \l_gotham_sectionframe
+\define@key{beamerframe}{section}[true]{
+\bool_set_true:N \l_gotham_sectionframe
+\begingroup
+\usebeamertemplate{section~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_sectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_sectionframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_subsectionframe
+\bool_set_false:N \l_gotham_subsectionframe
+\define@key{beamerframe}{subsec}[true]{
+\bool_set_true:N \l_gotham_subsectionframe
+\begingroup
+\usebeamertemplate{subsection~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_subsectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_subsectionframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_subsubsectionframe
+\bool_set_false:N \l_gotham_subsubsectionframe
+\define@key{beamerframe}{subsubsec}[true]{
+\bool_set_true:N \l_gotham_subsubsectionframe
+\begingroup
+\usebeamertemplate{subsubsection~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_subsubsectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_subsubsectionframe
+}{}
+}{}{}
+
+%%%%%%
+\providebool{partContent}
+\booltrue{partContent}
+\providecommand{\partContentName}{Part~content}
+\providebool{sectionContent}
+\booltrue{sectionContent}
+\providecommand{\secContentName}{Section~content}
+\providebool{subsectionContent}
+\booltrue{subsectionContent}
+\providecommand{\subsecContentName}{Subsection~content}
+
+\def\partname{\translate{Part}}
+\defbeamertemplate*{part~title}{gotham}{
+\usebeamercolor[fg]{part~title}
+\usebeamerfont{part~title}
+\partname \ \insertromanpartnumber
+\\[1.75ex]
+\insertpart
+}
+\defbeamertemplate*{section~title}{gotham}{
+\usebeamercolor[fg]{section~title}
+\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead
+}
+\defbeamertemplate*{subsection~title}{gotham}{
+\usebeamercolor[fg]{subsection~title}
+\usebeamerfont{subsection~title}
+\insertsectionnumber.\insertsubsectionnumber.~
+\insertsubsectionhead
+}
+\def\subsubsectionname{\translate{Subsubsection}}
+\def\insertsubsubsectionnumber{\arabic{subsubsection}}
+\def\subsubsectionpage{\usebeamertemplate*{subsubsection~page}}
+\defbeamertemplate*{subsubsection~title}{gotham}{
+\usebeamercolor[fg]{subsubsection~title}
+\usebeamerfont{subsubsection~title}
+\insertsectionnumber.\insertsubsectionnumber.\insertsubsubsectionnumber.~
+\insertsubsubsectionhead
+}
+
+\cs_new_protected:Nn \__gotham_inner_disable_partpage:
+{
+\AtBeginPart{
+}
+}
+
+\cs_new_protected:Nn \__gotham_inner_enable_partpage:
+{
+\AtBeginPart{
+\ifbeamer@inframe
+\partpage
+\else
+\frame[c, noframenumbering, part]{\partpage}
+\fi
+
+\ifbool{partContent}{
+\begin{frame}[noframenumbering, tocpart]
+\frametitle{\partContentName}
+\tableofcontents[part=\thepart]
+\end{frame}
+}{
+}
+}
+}
+
+\cs_new_protected:Nn \__gotham_inner_disable_sectionpage:
+{
+\AtBeginSection{
+}
+}
+
+\cs_new_protected:Nn \__gotham_inner_enable_sectionpage:
+{
+\AtBeginSection{
+\ifbeamer@inframe
+\sectionpage
+\else
+\frame[c, noframenumbering, section]{\sectionpage}
+\fi
+
+\ifbool{sectionContent}{
+\begin{frame}[noframenumbering, tocsec]
+\frametitle{\secContentName}
+{\tableofcontents[currentsection, currentsubsection,
+hideothersubsections,
+sectionstyle=show/shaded,
+]
+}
+\end{frame}
+}{
+}
+}
+}
+
+\cs_new_protected:Nn \__gotham_inner_disable_subsectionpage:
+{
+ \AtBeginSubsection{
+ % intentionally empty
+ }
+}
+
+\cs_new_protected:Nn \__gotham_inner_enable_subsectionpage:
+{
+\AtBeginSubsection{
+\ifbeamer@inframe
+\subsectionpage
+\else
+\frame[c, noframenumbering, subsec]{\subsectionpage}
+\fi
+
+\ifbool{subsectionContent}{
+\begin{frame}[noframenumbering, tocsubsec]
+\frametitle{\subsecContentName}
+{\tableofcontents[currentsection, currentsubsection,
+hideothersubsections,
+sectionstyle=show/shaded,
+subsectionstyle=show/shaded/hide,
+subsubsectionstyle=show/show/hide,
+]
+}
+\end{frame}
+}{
+}
+}
+}
+
+\cs_new_protected:Nn \__gotham_inner_disable_subsubsectionpage:
+{
+ \AtBeginSubsubsection{
+ % intentionally empty
+ }
+}
+
+\cs_new_protected:Nn \__gotham_inner_enable_subsubsectionpage:
+{
+\AtBeginSubsubsection{
+\ifbeamer@inframe
+\subsubsectionpage
+\else
+\frame[c, noframenumbering, subsubsec]{\subsubsectionpage}
+\fi
+}
+}
+
+%%%%%%
+\newlength{\gotham@progressonsectionpage}
+\newlength{\gotham@progressonsectionpage@linewidth}
+\setlength{\gotham@progressonsectionpage@linewidth}{3pt}
+
+\defbeamertemplate{progress~bar~in~section~page}{empty}{
+\vspace{\gotham@progressonsectionpage@linewidth+1ex}
+}
+
+\def\inserttotalframenumber{100}
+\defbeamertemplate{progress~bar~in~section~page}{display}{
+\setlength{\gotham@progressonsectionpage}{
+\textwidth * \ratio{\insertframenumber~pt}{\inserttotalframenumber~pt}
+}
+\begin{tikzpicture}
+\fill[bg] (0,0) rectangle (\textwidth, \gotham@progressonsectionpage@linewidth);
+\fill[fg] (0,0) rectangle (\gotham@progressonsectionpage, \gotham@progressonsectionpage@linewidth);
+\end{tikzpicture}
+}
+
+%%%%%%
+\newlength{\sectionhoffset}
+\setlength{\sectionhoffset}{0pt}
+
+\defbeamertemplate{part~page}{progressbar/simple}{
+\centering
+\hspace*{\sectionhoffset}
+\begin{minipage}{22em}
+\centering
+\usebeamertemplate*{part~title}\\[-1ex]
+\usebeamertemplate*{progress~bar~in~section~page}
+\par
+\end{minipage}
+\par
+\vspace{\baselineskip}
+}
+\defbeamertemplate{section~page}{progressbar/simple}{
+\centering
+\hspace*{\sectionhoffset}
+\begin{minipage}{22em}
+\raggedright
+\usebeamertemplate*{section~title}\\[-1ex]
+\usebeamertemplate*{progress~bar~in~section~page}
+\par
+\end{minipage}
+\par
+\vspace{\baselineskip}
+}
+\defbeamertemplate{subsection~page}{progressbar/simple}{
+\centering
+\hspace*{\sectionhoffset}
+\begin{minipage}{22em}
+\raggedright
+\usebeamertemplate*{section~title}\\[-1ex]
+\usebeamertemplate*{progress~bar~in~section~page}
+\par
+\usebeamertemplate*{subsection~title}
+\end{minipage}
+\par
+\vspace{\baselineskip}
+}
+\defbeamertemplate{subsubsection~page}{progressbar/simple}{
+\centering
+\hspace*{\sectionhoffset}
+\begin{minipage}{22em}
+\raggedright
+\usebeamertemplate*{section~title}\\[-1ex]
+\usebeamertemplate*{progress~bar~in~section~page}
+\par
+\usebeamertemplate*{subsection~title}
+\par
+\usebeamertemplate*{subsubsection~title}
+\end{minipage}
+\par
+\vspace{\baselineskip}
+}
+
+\defbeamertemplate{background~canvas}{part/gotham}{
+\ifbeamercolorempty[bg]{normal~text}{}{\color{bg}\vrule width\paperwidth height\paperheight}
+}
+\defbeamertemplate{background~canvas}{section/gotham}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\usebeamertemplate{background~canvas}
+}
+\defbeamertemplate{background~canvas}{subsection/gotham}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\usebeamertemplate{background~canvas}
+}
+\defbeamertemplate{background~canvas}{subsubsection/gotham}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\usebeamertemplate{background~canvas}
+}
+
+\defbeamertemplate{part~frame}{gotham~simple}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[empty]
+\setbeamertemplate{part~page}[progressbar/simple]
+ % \usebeamertemplate*{part~page}% activated automatically
+}
+
+\defbeamertemplate{section~frame}{gotham~simple}{
+\setbeamertemplate{background~canvas}[section/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[empty]
+\setbeamertemplate{section~page}[progressbar/simple]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+
+\defbeamertemplate{subsection~frame}{gotham~simple}{
+\setbeamertemplate{background~canvas}[subsection/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[empty]
+\setbeamertemplate{subsection~page}[progressbar/simple]
+ % \usebeamertemplate*{subsection~page}% activated automatically
+}
+
+\defbeamertemplate{subsubsection~frame}{gotham~simple}{
+\setbeamertemplate{background~canvas}[subsubsection/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[empty]
+\setbeamertemplate{subsubsection~page}[progressbar/simple]
+ % \usebeamertemplate*{subsubsection~page}% activated automatically
+}
+
+\defbeamertemplate{part~frame}{gotham~progressbar}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[display]
+\setbeamertemplate{part~page}[progressbar/simple]
+ % \usebeamertemplate*{part~page}% activated automatically
+}
+
+\defbeamertemplate{section~frame}{gotham~progressbar}{
+\setbeamertemplate{background~canvas}[section/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[display]
+\setbeamertemplate{section~page}[progressbar/simple]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+
+\defbeamertemplate{subsection~frame}{gotham~progressbar}{
+\setbeamertemplate{background~canvas}[subsection/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[display]
+\setbeamertemplate{subsection~page}[progressbar/simple]
+ % \usebeamertemplate*{subsection~page}% activated automatically
+}
+
+\defbeamertemplate{subsubsection~frame}{gotham~progressbar}{
+\setbeamertemplate{background~canvas}[subsubsection/gotham]
+\setbeamercolor{frametitle}{
+use={frametitleSection, normal~text},
+bg=frametitleSection.fg,
+fg=normal~text.fg
+}
+\setbeamertemplate{progress~bar~in~section~page}[display]
+\setbeamertemplate{subsubsection~page}[progressbar/simple]
+ % \usebeamertemplate*{subsubsection~page}% activated automatically
+}
+
+\defbeamertemplate{progress~bar~in~splitvert}{empty}{
+\vspace{-0.5ex}
+}
+
+\defbeamertemplate*{progress~bar~in~splitvert}{display}{
+\setlength{\gotham@progressonsectionpage}{
+\paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+\begin{tikzpicture}
+\fill[bg] (0,0) rectangle (\paperwidth, \gotham@progressonsectionpage@linewidth);
+\fill[fg] (0,0) rectangle (\gotham@progressonsectionpage, \gotham@progressonsectionpage@linewidth);
+\end{tikzpicture}
+}
+
+\defbeamertemplate{part~page}{gotham~splitvert~progressbar/simple}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor] (current~page.north~west) rectangle ([shift = {(0, -0.45\paperheight)}] current~page.north~east);
+\end{tikzpicture}
+}
+
+\begin{minipage}[b][0.45\paperheight]{\textwidth}
+\centering
+\usebeamertemplate*{part~title}
+\end{minipage}
+\\[-0.1\baselineskip]
+\hspace*{-1.0cm}\noindent
+\usebeamertemplate*{progress~bar~in~splitvert}
+
+\newline
+\begin{minipage}[t][0.5\paperheight]{\textwidth}
+\end{minipage}
+}
+\defbeamertemplate{part~frame}{gotham~splitvert~progressbar}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\setbeamercolor{part~title}{use=frametitle, fg=frametitle.fg}
+\setbeamertemplate{progress~bar~in~splitvert}[display]
+\setbeamertemplate{part~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{part~page}% activated automatically
+}
+\defbeamertemplate{part~frame}{gotham~splitvert~simple}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\setbeamercolor{part~title}{use=frametitle, fg=frametitle.fg}
+\setbeamertemplate{progress~bar~in~splitvert}[empty]
+\setbeamertemplate{part~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{part~page}% activated automatically
+}
+
+\defbeamertemplate{section~page}{gotham~splitvert~progressbar/simple}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor] (current~page.north~west) rectangle ([shift = {(0, -0.45\paperheight)}] current~page.north~east);
+\end{tikzpicture}
+}
+
+\hspace*{\sectionhoffset}
+\begin{minipage}[b][0.45\paperheight]{\textwidth}
+\usebeamertemplate*{section~title}
+\end{minipage}
+\\[-0.1\baselineskip]
+\hspace*{-1.0cm}\noindent
+\usebeamertemplate*{progress~bar~in~splitvert}
+
+\newline
+\hspace*{\sectionhoffset}
+\begin{minipage}[t][0.5\paperheight]{\textwidth}
+\usebeamerfont{subsection~title}
+\usebeamercolor[bg]{frametitle}
+\end{minipage}
+}
+\defbeamertemplate{section~frame}{gotham~splitvert~progressbar}{
+\setbeamertemplate{background~canvas}[section/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamertemplate{progress~bar~in~splitvert}[display]
+\setbeamertemplate{section~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+\defbeamertemplate{section~frame}{gotham~splitvert~simple}{
+\setbeamertemplate{background~canvas}[section/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamertemplate{progress~bar~in~splitvert}[empty]
+\setbeamertemplate{section~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+
+\defbeamertemplate{subsection~page}{gotham~splitvert~progressbar/simple}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor] (current~page.north~west) rectangle ([shift = {(0, -0.45\paperheight)}] current~page.north~east);
+\end{tikzpicture}
+}
+
+\hspace*{\sectionhoffset}
+\begin{minipage}[b][0.45\paperheight]{\textwidth}
+\usebeamertemplate*{section~title}
+\end{minipage}
+\\[-0.1\baselineskip]
+\hspace*{-1.0cm}\noindent
+\usebeamertemplate*{progress~bar~in~splitvert}
+
+\newline
+\hspace*{\sectionhoffset}
+\begin{minipage}[t][0.5\paperheight]{\textwidth}
+\usebeamerfont{subsection~title}
+\usebeamercolor[bg]{frametitle}
+\usebeamertemplate*{subsection~title}
+\end{minipage}
+}
+\defbeamertemplate{subsection~frame}{gotham~splitvert~progressbar}{
+\setbeamertemplate{background~canvas}[subsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamercolor{subsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamertemplate{progress~bar~in~splitvert}[display]
+\setbeamertemplate{subsection~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{subsection~page}% activated automatically
+}
+\defbeamertemplate{subsection~frame}{gotham~splitvert~simple}{
+\setbeamertemplate{background~canvas}[subsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamercolor{subsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamertemplate{progress~bar~in~splitvert}[empty]
+\setbeamertemplate{subsection~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{subsection~page}% activated automatically
+}
+
+\defbeamertemplate{subsubsection~page}{gotham~splitvert~progressbar/simple}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor] (current~page.north~west) rectangle ([shift = {(0, -0.45\paperheight)}] current~page.north~east);
+\end{tikzpicture}
+}
+
+\hspace*{\sectionhoffset}
+\begin{minipage}[b][0.45\paperheight]{\textwidth}
+\usebeamertemplate*{section~title}
+\end{minipage}
+\\[-0.1\baselineskip]
+\hspace*{-1.0cm}\noindent
+\usebeamertemplate*{progress~bar~in~splitvert}
+
+\newline
+\hspace*{\sectionhoffset}
+\begin{minipage}[t][0.5\paperheight]{\textwidth}
+\usebeamerfont{subsubsection~title}
+\usebeamercolor[bg]{frametitle}
+\usebeamertemplate*{subsection~title}
+\par
+\usebeamertemplate*{subsubsection~title}
+\end{minipage}
+}
+\defbeamertemplate{subsubsection~frame}{gotham~splitvert~progressbar}{
+\setbeamertemplate{background~canvas}[subsubsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamercolor{subsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamercolor{subsubsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamertemplate{progress~bar~in~splitvert}[display]
+\setbeamertemplate{subsubsection~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{subsubsection~page}% activated automatically
+}
+\defbeamertemplate{subsubsection~frame}{gotham~splitvert~simple}{
+\setbeamertemplate{background~canvas}[subsubsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamercolor{section~title}{use=frametitle, fg=frametitle.fg}
+\setbeamercolor{subsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamercolor{subsubsection~title}{use=frametitle, fg=frametitle.bg}
+\setbeamertemplate{progress~bar~in~splitvert}[empty]
+\setbeamertemplate{subsubsection~page}[gotham~splitvert~progressbar/simple]
+ % \usebeamertemplate*{subsubsection~page}% activated automatically
+}
+
+
+\defbeamertemplate{part~page}{gotham~progressvert}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+\setlength{\gotham@progressonsectionpage}{
+\paperheight * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\colorlet{gotham@@tempColorB}{fg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor]
+([shift={(0,0)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~east) --
+([shift={(0,0)}] current~page.north~east)
+--cycle;
+\node[color=gotham@@tempColorB, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{part~title}
+\partname \ \insertromanpartnumber
+\\[1.75ex]
+\insertpart
+}
+};
+
+\clip
+([shift={(0,0)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+
+\fill[color=gotham@@tempColorB]
+([shift={(0,0)}]current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+\node[color=gotham@@tempColor, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{part~title}
+\partname \ \insertromanpartnumber
+\\
+\insertpart
+}
+};
+\end{tikzpicture}
+}
+}
+\defbeamertemplate{part~frame}{gotham~progressvert}{
+\setbeamertemplate{background~canvas}[part/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamertemplate{part~page}[gotham~progressvert]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+
+\defbeamertemplate{section~page}{gotham~progressvert}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+\setlength{\gotham@progressonsectionpage}{
+\paperheight * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\colorlet{gotham@@tempColorB}{fg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor]
+([shift={(0,0)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~east) --
+([shift={(0,0)}] current~page.north~east)
+--cycle;
+\node[color=gotham@@tempColorB, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+};
+
+\clip
+([shift={(0,0)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+
+\fill[color=gotham@@tempColorB]
+([shift={(0,0)}]current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+\node[color=gotham@@tempColor, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+};
+\end{tikzpicture}
+}
+}
+\defbeamertemplate{section~frame}{gotham~progressvert}{
+\setbeamertemplate{background~canvas}[section/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamertemplate{section~page}[gotham~progressvert]
+ % \usebeamertemplate*{section~page}% activated automatically
+}
+
+\defbeamertemplate{subsection~page}{gotham~progressvert}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+\setlength{\gotham@progressonsectionpage}{
+\paperheight * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\colorlet{gotham@@tempColorB}{fg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor]
+([shift={(0,0)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~east) --
+([shift={(0,0)}] current~page.north~east)
+--cycle;
+\node[color=gotham@@tempColorB, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+\\
+{\usebeamerfont{subsection~title}
+\insertsectionnumber.\insertsubsectionnumber.~
+\insertsubsectionhead}
+};
+
+\clip
+([shift={(0,0)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+
+\fill[color=gotham@@tempColorB]
+([shift={(0,0)}]current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+\node[color=gotham@@tempColor, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+\\
+{\usebeamerfont{subsection~title}
+\insertsectionnumber.\insertsubsectionnumber.~
+\insertsubsectionhead}
+};
+\end{tikzpicture}
+}
+}
+\defbeamertemplate{subsection~frame}{gotham~progressvert}{
+\setbeamertemplate{background~canvas}[subsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamertemplate{subsection~page}[gotham~progressvert]
+ % \usebeamertemplate*{subsection~page}% activated automatically
+}
+
+\defbeamertemplate{subsubsection~page}{gotham~progressvert}{
+\ifx\beamer@frametitle\@empty
+\vspace*{-0.05\paperheight}
+\else %}{
+\vspace*{-0.165\paperheight}
+\fi %}
+\setlength{\gotham@progressonsectionpage}{
+\paperheight * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+{
+\usebeamercolor{frametitle}\colorlet{gotham@@tempColor}{bg}
+\colorlet{gotham@@tempColorB}{fg}
+\begin{tikzpicture}[overlay, remember~picture]
+\fill[color=gotham@@tempColor]
+([shift={(0,0)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~west) --
+([shift={(0,-\gotham@progressonsectionpage)}] current~page.north~east) --
+([shift={(0,0)}] current~page.north~east)
+--cycle;
+\node[color=gotham@@tempColorB, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+\\
+{\usebeamerfont{subsection~title}
+\insertsectionnumber.\insertsubsectionnumber.~
+\insertsubsectionhead}
+\\
+{\usebeamerfont{subsubsection~title}
+\insertsectionnumber.\insertsubsectionnumber.\insertsubsubsectionnumber.~
+\insertsubsubsectionhead}
+};
+
+\clip
+([shift={(0,0)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+
+\fill[color=gotham@@tempColorB]
+([shift={(0,0)}]current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~west) --
+([shift={(0,\paperheight-\gotham@progressonsectionpage)}] current~page.south~east) --
+([shift={(0,0)}] current~page.south~east)
+--cycle;
+\node[color=gotham@@tempColor, align=left, text~width=0.8\textwidth] at ([shift={(\sectionhoffset,0)}] current~page.center) {
+{\usebeamerfont{section~title}
+\insertsectionnumber.~
+\insertsectionhead}
+\\
+{\usebeamerfont{subsection~title}
+\insertsectionnumber.\insertsubsectionnumber.~
+\insertsubsectionhead}
+\\
+{\usebeamerfont{subsubsection~title}
+\insertsectionnumber.\insertsubsectionnumber.\insertsubsubsectionnumber.~
+\insertsubsubsectionhead}
+};
+\end{tikzpicture}
+}
+}
+\defbeamertemplate{subsubsection~frame}{gotham~progressvert}{
+\setbeamertemplate{background~canvas}[subsubsection/gotham]
+\setlength{\sectionhoffset}{1cm}
+\setbeamertemplate{subsubsection~page}[gotham~progressvert]
+ % \usebeamertemplate*{subsubsection~page}% activated automatically
+}
+
+%%%%
+\keys_define:nn { gotham / inner }{
+partframe~template .usage:n = { general },
+partframe~template .default:n = { gotham~progressbar },
+partframe~template .code:n = { \__gotham_set_template:nn{part~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+partframe~default .choice:,
+partframe~default .usage:n = { general },
+partframe~default .default:n = { true },
+
+partframe~default / true .code:n = { \__gotham_inner_enable_partpage: },
+partframe~default / on .code:n = { \__gotham_inner_enable_partpage: },
+partframe~default / enable .code:n = { \__gotham_inner_enable_partpage: },
+
+partframe~default / false .code:n = { \__gotham_inner_disable_partpage: },
+partframe~default / off .code:n = { \__gotham_inner_disable_partpage: },
+partframe~default / disable .code:n = { \__gotham_inner_disable_partpage: },
+
+partframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'partframe~default',~so~being~ignored. }{helping~message: partframe~default / unknown} },
+}
+
+\keys_define:nn { gotham / inner }{
+sectionframe~template .usage:n = { general },
+sectionframe~template .default:n = { gotham~progressbar },
+sectionframe~template .code:n = { \__gotham_set_template:nn{section~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+sectionframe~default .choice:,
+sectionframe~default .usage:n = { general },
+sectionframe~default .default:n = { true },
+
+sectionframe~default / true .code:n = { \__gotham_inner_enable_sectionpage: },
+sectionframe~default / on .code:n = { \__gotham_inner_enable_sectionpage: },
+sectionframe~default / enable .code:n = { \__gotham_inner_enable_sectionpage: },
+
+sectionframe~default / false .code:n = { \__gotham_inner_disable_sectionpage: },
+sectionframe~default / off .code:n = { \__gotham_inner_disable_sectionpage: },
+sectionframe~default / disable .code:n = { \__gotham_inner_disable_sectionpage: },
+
+sectionframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'sectionframe~default',~so~being~ignored. }{helping~message: sectionframe~default / unknown} },
+}
+
+\keys_define:nn { gotham / inner }{
+subsectionframe~template .usage:n = { general },
+subsectionframe~template .default:n = { gotham~progressbar },
+subsectionframe~template .code:n = { \__gotham_set_template:nn{subsection~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+subsectionframe~default .choice:,
+subsectionframe~default .usage:n = { general },
+subsectionframe~default .default:n = { true },
+
+subsectionframe~default / true .code:n = { \__gotham_inner_enable_subsectionpage: },
+subsectionframe~default / on .code:n = { \__gotham_inner_enable_subsectionpage: },
+subsectionframe~default / enable .code:n = { \__gotham_inner_enable_subsectionpage: },
+
+subsectionframe~default / false .code:n = { \__gotham_inner_disable_subsectionpage: },
+subsectionframe~default / off .code:n = { \__gotham_inner_disable_subsectionpage: },
+subsectionframe~default / disable .code:n = { \__gotham_inner_disable_subsectionpage: },
+
+subsectionframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'subsectionframe~default',~so~being~ignored. }{helping~message: subsectionframe~default / unknown} },
+}
+
+\keys_define:nn { gotham / inner }{
+subsubsectionframe~template .usage:n = { general },
+subsubsectionframe~template .default:n = { gotham~progressbar },
+subsubsectionframe~template .code:n = { \__gotham_set_template:nn{subsubsection~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+subsubsectionframe~default .choice:,
+subsubsectionframe~default .usage:n = { general },
+subsubsectionframe~default .default:n = { true },
+
+subsubsectionframe~default / true .code:n = { \__gotham_inner_enable_subsubsectionpage: },
+subsubsectionframe~default / on .code:n = { \__gotham_inner_enable_subsubsectionpage: },
+subsubsectionframe~default / enable .code:n = { \__gotham_inner_enable_subsubsectionpage: },
+
+subsubsectionframe~default / false .code:n = { \__gotham_inner_disable_subsubsectionpage: },
+subsubsectionframe~default / off .code:n = { \__gotham_inner_disable_subsubsectionpage: },
+subsubsectionframe~default / disable .code:n = { \__gotham_inner_disable_subsubsectionpage: },
+
+subsubsectionframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'subsubsectionframe~default',~so~being~ignored. }{helping~message: subsubsectionframe~default / unknown} },
+}
+
+%%%% Table of Content %%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\tikzset{section~number/.style={
+circle,
+fill=colorAlert,
+minimum~size=0.4em,
+text=colorAlert!10,
+inner~sep=1.5pt,
+},
+section/.style={
+draw=none,
+rectangle,
+minimum~height=1em,
+minimum~width=0.8\textwidth,
+text~width=0.8\textwidth,
+text=fg,
+align=left
+},
+subsection~number/.style={
+circle,
+fill=colorBackElement!50,
+inner~sep=0pt,
+minimum~size=0.15cm,
+},
+subsection/.style={
+draw=none,
+rectangle,
+minimum~height=1em,
+minimum~width=0.8\textwidth,
+text~width=0.8\textwidth,
+text=fg!80,
+align=left
+},
+subsubsection~number/.style={
+circle,
+fill=colorBackElement!50,
+inner~sep=0pt,
+minimum~size=0.06cm,
+},
+subsubsection/.style={
+draw=none,
+rectangle,
+minimum~height=1em,
+minimum~width=0.8\textwidth,
+text~width=0.8\textwidth,
+text=fg!80,
+align=left
+},
+}
+
+\defbeamertemplate{section~in~toc}{gotham~bullet}{
+\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number]{\textbf{\small\inserttocsectionnumber}};
+\ \tikz[baseline=-0.5ex]\node[section]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm]
+\hspace*{1.13cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip}
+}
+\defbeamertemplate{subsection~in~toc}{gotham~bullet}{
+\hspace*{0.53cm}\tikz[baseline=-0.5ex]\node[subsection~number]{};
+\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsection};\\[-0.2cm]
+}
+\defbeamertemplate{subsubsection~in~toc}{gotham~bullet}{
+\hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number]{};
+\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm]
+}
+\defbeamertemplate{section~in~toc~shaded}{gotham~bullet}{
+\hspace*{0.4cm}\tikz[baseline=-0.5ex]\node[section~number, fill=colorBackElement!40, text=background]{\usebeamerfont*{toc~subtitle}\textbf{\inserttocsectionnumber}};
+\ \tikz[baseline=-0.5ex]\node[section, text=colorExample!20]{\usebeamerfont*{toc~title} \inserttocsection};\\[-0.35cm]
+\hspace*{1.3cm}{\usebeamercolor*[fg]{footer} \rule{0.6\paperwidth}{0.2pt}\\\nointerlineskip}
+}
+\defbeamertemplate{subsection~in~toc~shaded}{gotham~bullet}{
+\hspace*{0.55cm}\tikz[baseline=-0.5ex]\node[subsection~number,fill=colorBackElement!20]{};
+\hspace*{0.5cm}\tikz[baseline=-0.5ex]\node[subsection, text=colorBackElement!20]{};\\[-0.2cm]
+}
+\defbeamertemplate{subsubsection~in~toc~shaded}{gotham~bullet}{
+\hspace*{0.58cm}\tikz[baseline=-0.5ex]\node[subsubsection~number,fill=colorBackElement!20]{};
+\hspace*{0.69cm}\tikz[baseline=-0.5ex]\node[subsubsection,text=colorBackElement!20]{\usebeamerfont*{toc~subtitle}\inserttocsubsubsection};\\[-0.2cm]
+}
+
+\defbeamertemplate{part~in~toc}{gotham~simple}{
+{{\inserttocpartnumber}.}~\inserttocpart
+\\
+}
+\defbeamertemplate{section~in~toc}{gotham~simple}{
+{{\inserttocsectionnumber}.}~\inserttocsection
+\\
+}
+\defbeamertemplate{subsection~in~toc}{gotham~simple}{
+\quad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.}~\inserttocsubsection%
+\\
+}
+\defbeamertemplate{subsubsection~in~toc}{gotham~simple}{
+\qquad{{\inserttocsectionnumber}.\inserttocsubsectionnumber.\inserttocsubsubsectionnumber.}~\inserttocsubsubsection
+\\
+}
+
+\defbeamertemplate{background~canvas}{toc/gotham~simple}{
+\ifbeamercolorempty[bg]{standin}{}{
+\color{bg}\vrule width\paperwidth height\paperheight
+}
+}
+\defbeamertemplate{toc~page}{gotham~simple}{
+\setbeamertemplate{part~in~toc}[gotham~simple]
+\setbeamertemplate{section~in~toc}[gotham~simple]
+\setbeamertemplate{subsection~in~toc}[gotham~simple]
+\setbeamertemplate{subsubsection~in~toc}[gotham~simple]
+\setbeamertemplate{background~canvas}[toc/gotham~simple]
+}
+\defbeamertemplate{toc~page}{gotham~bullet}{
+\setbeamertemplate{part~in~toc}[gotham~bullet]
+\setbeamertemplate{section~in~toc}[gotham~bullet]
+\setbeamertemplate{subsection~in~toc}[gotham~bullet]
+\setbeamertemplate{subsubsection~in~toc}[gotham~bullet]
+\setbeamertemplate{background~canvas}[toc/gotham~simple]
+}
+
+%%%%%%
+\newenvironment{tocenv}{
+\usebeamertemplate{toc~page}
+}{}
+\__gotham_add_beamerframe_key:n {toc}
+
+\defbeamertemplate{background~canvas}{toc~part~gotham}{
+\ifbeamercolorempty[bg]{normal~text}{}{\color{bg}\vrule width\paperwidth height\paperheight}
+}
+\defbeamertemplate{background~canvas}{toc~section~gotham}{
+\ifbeamercolorempty[bg]{normal~text}{}{\color{bg}\vrule width\paperwidth height\paperheight}
+}
+\defbeamertemplate{background~canvas}{toc~subsection~gotham}{
+\ifbeamercolorempty[bg]{normal~text}{}{\color{bg}\vrule width\paperwidth height\paperheight}
+}
+
+\defbeamertemplate{toc~part~frame}{gotham~simple}{
+\setbeamertemplate{part~in~toc}[gotham~simple]
+\setbeamertemplate{section~in~toc}[gotham~simple]
+\setbeamertemplate{subsection~in~toc}[gotham~simple]
+\setbeamertemplate{subsubsection~in~toc}[gotham~simple]
+\setbeamertemplate{background~canvas}[toc~part~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]
+}
+\defbeamertemplate{toc~section~frame}{gotham~simple}{
+\setbeamertemplate{part~in~toc}[gotham~simple]
+\setbeamertemplate{section~in~toc}[gotham~simple]
+\setbeamertemplate{subsection~in~toc}[gotham~simple]
+\setbeamertemplate{subsubsection~in~toc}[gotham~simple]
+\setbeamertemplate{background~canvas}[toc~section~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]%
+}
+\defbeamertemplate{toc~subsection~frame}{gotham~simple}{
+\setbeamertemplate{part~in~toc}[gotham~simple]
+\setbeamertemplate{section~in~toc}[gotham~simple]
+\setbeamertemplate{subsection~in~toc}[gotham~simple]
+\setbeamertemplate{subsubsection~in~toc}[gotham~simple]
+\setbeamertemplate{background~canvas}[toc~subsection~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]
+}
+
+\defbeamertemplate{toc~part~frame}{gotham~bullet}{
+\setbeamertemplate{part~in~toc}[gotham~bullet]
+\setbeamertemplate{section~in~toc}[gotham~bullet]
+\setbeamertemplate{subsection~in~toc}[gotham~bullet]
+\setbeamertemplate{subsubsection~in~toc}[gotham~bullet]
+\setbeamertemplate{background~canvas}[toc~part~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]
+}
+\defbeamertemplate{toc~section~frame}{gotham~bullet}{
+\setbeamertemplate{part~in~toc}[gotham~bullet]
+\setbeamertemplate{section~in~toc}[gotham~bullet]
+\setbeamertemplate{subsection~in~toc}[gotham~bullet]
+\setbeamertemplate{subsubsection~in~toc}[gotham~bullet]
+\setbeamertemplate{background~canvas}[toc~section~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]%
+}
+\defbeamertemplate{toc~subsection~frame}{gotham~bullet}{
+\setbeamertemplate{part~in~toc}[gotham~bullet]
+\setbeamertemplate{section~in~toc}[gotham~bullet]
+\setbeamertemplate{subsection~in~toc}[gotham~bullet]
+\setbeamertemplate{subsubsection~in~toc}[gotham~bullet]
+\setbeamertemplate{background~canvas}[toc~subsection~gotham]
+\setbeamertemplate{frametitle}[toc~gotham]
+}
+
+%%%%%%
+\bool_new:N \l_gotham_tocpartframe
+\bool_set_false:N \l_gotham_tocpartframe
+\define@key{beamerframe}{tocpart}[true]{
+\bool_set_true:N \l_gotham_tocpartframe
+\begingroup
+\usebeamertemplate{toc~part~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_tocpartframe {
+\endgroup
+\bool_set_false:N \l_gotham_tocpartframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_tocsectionframe
+\bool_set_false:N \l_gotham_tocsectionframe
+\define@key{beamerframe}{tocsec}[true]{
+\bool_set_true:N \l_gotham_tocsectionframe
+\begingroup
+\usebeamertemplate{toc~section~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_tocsectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_tocsectionframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_tocsubsectionframe
+\bool_set_false:N \l_gotham_tocsubsectionframe
+\define@key{beamerframe}{tocsubsec}[true]{
+\bool_set_true:N \l_gotham_tocsubsectionframe
+\begingroup
+\usebeamertemplate{toc~subsection~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_tocsubsectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_tocsubsectionframe
+}{}
+}{}{}
+
+%%%%%%
+\bool_new:N \l_gotham_tocsubsubsectionframe
+\bool_set_false:N \l_gotham_tocsubsubsectionframe
+\define@key{beamerframe}{tocsubsubsec}[true]{
+\bool_set_true:N \l_gotham_tocsubsubsectionframe
+\begingroup
+\usebeamertemplate{toc~subsubsection~frame}
+}
+\apptocmd{\beamer@reseteecodes}{
+\bool_if:NTF \l_gotham_tocsubsubsectionframe {
+\endgroup
+\bool_set_false:N \l_gotham_tocsubsubsectionframe
+}{}
+}{}{}
+
+%%%%
+\keys_define:nn { gotham / inner }
+{
+tocframe~template .usage:n = { general },
+tocframe~template .default:n = { gotham~bullet },
+tocframe~template .code:n = { \__gotham_set_template:nn{toc~page}{#1} }
+}
+
+\keys_define:nn { gotham / inner }{
+parttocframe~template .usage:n = { general },
+parttocframe~template .default:n = { gotham~simple },
+parttocframe~template .code:n = { \__gotham_set_template:nn{toc~part~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+parttocframe~default .choice:,
+parttocframe~default .usage:n = { general },
+parttocframe~default .default:n = { true },
+
+parttocframe~default / true .code:n = { \booltrue{partContent} },
+parttocframe~default / on .code:n = { \booltrue{partContent} },
+parttocframe~default / enable .code:n = { \booltrue{partContent} },
+
+parttocframe~default / false .code:n = { \boolfalse{partContent} },
+parttocframe~default / off .code:n = { \boolfalse{partContent} },
+parttocframe~default / disable .code:n = { \boolfalse{partContent} },
+
+parttocframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'parttocframe~default',~so~being~ignored. }{helping~message: parttocframe~default / unknown} },
+}
+
+\keys_define:nn { gotham / inner }{
+sectiontocframe~template .usage:n = { general },
+sectiontocframe~template .default:n = { gotham~simple },
+sectiontocframe~template .code:n = { \__gotham_set_template:nn{toc~section~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+sectiontocframe~default .choice:,
+sectiontocframe~default .usage:n = { general },
+sectiontocframe~default .default:n = { true },
+
+sectiontocframe~default / true .code:n = { \booltrue{sectionContent} },
+sectiontocframe~default / on .code:n = { \booltrue{sectionContent} },
+sectiontocframe~default / enable .code:n = { \booltrue{sectionContent} },
+
+sectiontocframe~default / false .code:n = { \boolfalse{sectionContent} },
+sectiontocframe~default / off .code:n = { \boolfalse{sectionContent} },
+sectiontocframe~default / disable .code:n = { \boolfalse{sectionContent} },
+
+sectiontocframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'sectiontocframe~default',~so~being~ignored. }{helping~message: sectiontocframe~default / unknown} },
+}
+
+\keys_define:nn { gotham / inner }{
+subsectiontocframe~template .usage:n = { general },
+subsectiontocframe~template .default:n = { gotham~simple },
+subsectiontocframe~template .code:n = { \__gotham_set_template:nn{toc~subsection~frame}{#1} }
+}
+\keys_define:nn { gotham / inner }
+{
+subsectiontocframe~default .choice:,
+subsectiontocframe~default .usage:n = { general },
+subsectiontocframe~default .default:n = { true },
+
+subsectiontocframe~default / true .code:n = { \booltrue{subsectionContent} },
+subsectiontocframe~default / on .code:n = { \booltrue{subsectionContent} },
+subsectiontocframe~default / enable .code:n = { \booltrue{subsectionContent} },
+
+subsectiontocframe~default / false .code:n = { \boolfalse{subsectionContent} },
+subsectiontocframe~default / off .code:n = { \boolfalse{subsectionContent} },
+subsectiontocframe~default / disable .code:n = { \boolfalse{subsectionContent} },
+
+subsectiontocframe~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'subsectiontocframe~default',~so~being~ignored. }{helping~message: subsectiontocframe~default / unknown} },
+}
+
+%% Environments styles %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newlength{\gotham@blocksep}
+\newlength{\gotham@blockadjust}
+\setlength{\gotham@blocksep}{0.75ex}
+\setlength{\gotham@blockadjust}{0.25ex}
+\providecommand{\gotham@strut}{
+\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (/)}
+}
+
+\newlength{\gotham@parskip}
+\setlength{\gotham@parskip}{0.5em}
+\setlength{\parskip}{\gotham@parskip}
+\linespread{1.15}
+
+\newcommand{\gotham@block}[1]{
+\par\vskip\medskipamount
+\setlength{\parskip}{0pt}
+
+\ifbeamercolorempty[bg]{block~title#1}{%
+\begin{beamercolorbox}[rightskip=0pt~plus~4em]{block~title#1}
+}{
+\ifbeamercolorempty[bg]{block~title}{
+\begin{beamercolorbox}[rightskip=0pt~plus~4em]{block~title#1}
+}
+{
+\begin{beamercolorbox}[
+sep=\dimexpr\gotham@blocksep-\gotham@blockadjust\relax,
+leftskip=\gotham@blockadjust,
+rightskip=\dimexpr\gotham@blockadjust~plus~4em\relax,
+]{block~title#1}
+}
+}
+\usebeamerfont*{block~title#1}
+\gotham@strut
+\insertblocktitle
+\gotham@strut
+\end{beamercolorbox}
+\nointerlineskip
+\ifbeamercolorempty[bg]{block~body#1}{
+\begin{beamercolorbox}[vmode]{block~body#1}
+}{
+\ifbeamercolorempty[bg]{block~body}{
+\begin{beamercolorbox}[vmode]{block~body#1}
+}{
+\begin{beamercolorbox}[sep=\gotham@blocksep, vmode]{block~body#1}
+\vspace{-\gotham@parskip}
+}
+}
+\usebeamerfont{block~body#1}
+\setlength{\parskip}{\gotham@parskip}
+}
+
+%%%%
+
+%%%%
+\defbeamertemplate*{itemize~item}{gotham}{%\textbullet}
+\Large
+\setbeamertemplate{itemize~item}[circle]
+\usebeamertemplate{itemize~item}
+}
+\defbeamertemplate*{itemize~subitem}{gotham}{%$\blacktriangleright$
+\scriptsize
+\setbeamertemplate{itemize~subitem}[triangle]
+\usebeamertemplate{itemize~subitem}
+}
+\defbeamertemplate*{itemize~subsubitem}{gotham}{%square or -
+\Tiny
+$\blacksquare$ % \textbf{-}
+}
+
+%% TRY: enumitem package, enumitem and beamer are incompatible.
+%% I tried to redefine everything to make them compatible, but it breaks the [alert] environment... So, I gave up.
+
+
+%%%%%%
+\defbeamertemplate*{caption~label~separator}{gotham}{:~}
+\setbeamertemplate{caption}[numbered]
+\defbeamertemplate*{footnote}{gotham}{
+\parindent~0em\noindent
+\raggedright
+\usebeamercolor{footnote}\hbox~to~0.8em{\hfil\insertfootnotemark}\insertfootnotetext\par
+}
+
+\keys_set:nn { gotham / inner } {
+title~page,
+watermark~template, watermark~default,
+standout~template, standin~template,
+partframe~template, partframe~default,
+sectionframe~template, sectionframe~default,
+subsectionframe~template, subsectionframe~default,
+subsubsectionframe~template, subsubsectionframe~default,
+tocframe~template,
+parttocframe~template, parttocframe~default,
+sectiontocframe~template, sectiontocframe~default,
+subsectiontocframe~template, subsectiontocframe~default,
+}
+
+\ProcessKeyOptions[ gotham / inner ]
+
+%%
+%% Adapted from classic "A model .dtx file" by Joseph Wright
+%% https://www.texdev.net/2009/10/06/a-model-dtx-file/
+%%
+%% End of file `beamerinnerthemegotham.sty'.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty
new file mode 100644
index 00000000000..c391be96919
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerouterthemegotham.sty
@@ -0,0 +1,2173 @@
+%%
+%% This is file `beamerouterthemegotham.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gotham.dtx (with options: `outer')
+%%
+%% Copyright (C) 2023-20** by Romain NOËL <romainoel@free.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Romain NOËL.
+%% Contributors: Romain NOËL (2023-20**)
+%%
+\ProvidesExplPackage{beamerouterthemegotham}{2024/09/20}{1.1.0.b}{gotham outer theme}
+\RequirePackage{expl3}
+\RequirePackage{xfp}
+\RequirePackage{calc}
+\RequirePackage{tikz}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% OUTER %%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifundefined{\string\color@colorProgBar}{
+\providebool{darkBG} \boolfalse{darkBG}
+\providebool{transparentBG} \booltrue{transparentBG}
+\colorlet{colorBG}{white}
+\colorlet{colorFG}{black}
+\colorlet{colorFrametitle}{purple}
+\colorlet{colorStandout}{purple}
+\colorlet{colorStandin}{purple}
+\colorlet{colorTitlepage}{purple}
+\colorlet{colorFiligrane}{gray}
+\colorlet{colorBackElement}{gray}
+\colorlet{colorProgBar}{orange}
+\colorlet{colorAlert}{red}
+\colorlet{colorExample}{green}
+\colorlet{colorFrametitle}{purple}
+\colorlet{colorTitlepage}{purple}
+\setbeamercolor{progress~bar}{
+use=alerted~text,
+fg=colorProgBar,
+bg=alerted~text.fg!50!black!30
+}
+\setbeamercolor{progress~bar~in~head/foot}{%
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~part~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~section~page}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{progress~bar~in~splitvert}{
+use=progress~bar,
+parent=progress~bar
+}
+\setbeamercolor{frametitleSection}{use=primary~palette, bg=, fg=primary~palette.bg}
+\setbeamercolor{standout}{use=primary~palette, bg=colorStandout, fg=primary~palette.bg}
+\setbeamercolor{standin}{use=normal~text, bg=colorStandin, fg=normal~text.fg}
+\setbeamercolor{section~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsection~in~toc}{use=normal~text, parent=normal~text,}
+\setbeamercolor{subsubsection~in~toc}{use=normal~text, parent=normal~text,}
+}{
+}
+
+%%%%%%
+\prop_if_exist:NTF \l__gotham_template_name_prop
+{}{
+\prop_new:N \l__gotham_template_name_prop
+}
+
+\seq_if_exist:NTF \l__gotham_tmpa_seq
+{}{
+\seq_new:N \l__gotham_tmpa_seq
+}
+\tl_if_exist:NTF \l__gotham_tmpa_tl
+{}{
+\tl_new:N \l__gotham_tmpa_tl
+}
+\tl_if_exist:NTF \l__gotham_tmpb_tl
+{}{
+\tl_new:N \l__gotham_tmpb_tl
+}
+
+\cs_if_exist:NTF \__gotham_set_prop_template:nn {}{
+\cs_new_protected:Nn \__gotham_set_prop_template:nn
+{
+\tl_if_in:nnTF { #1 } { / }
+{
+\seq_set_split:Nnn \l__gotham_tmpa_seq { / } { #1 }
+\tl_set:Nn \l__gotham_tmpa_tl { \seq_item:Nn \l__gotham_tmpa_seq { 1 } }
+\tl_set:Nn \l__gotham_tmpb_tl { \seq_item:Nn \l__gotham_tmpa_seq { 2 } }
+\cs_if_exist:cTF {beamer@@tmpop@\exp_not:V \l__gotham_tmpa_tl @\exp_not:V \l__gotham_tmpb_tl /#2} {
+\prop_put:Nnn \l__gotham_template_name_prop {#1} {#2}
+}{
+\PackageError{beamerthemegotham}
+{The~beamer~template~named~'\l__gotham_tmpa_tl'~with~the~option~'\l__gotham_tmpb_tl/#2'~does~not~exist}
+{helping~message}
+}
+}{% false -> error
+\PackageError{beamerthemegotham}
+{
+When~using~'\c_backslash_str\cs_to_str:N \__gotham_set_prop_template'~the~first~argument~should~contain~a~'/'~to~respect~the~naming~convention~used~(Template/what/Who~name),~but~you~gave~'#1'.~
+As~example:~if~'\c_backslash_str defbeamertemplate{background}{watermark/gotham~draft}'...,~then~use~'\c_backslash_str\cs_to_str:N \__gotham_set_prop_template{background/watermark}{gotham~draft}'
+}{helping~message}
+}
+}
+}
+
+\seq_if_exist:NTF \l__gotham_frameoption_tmp_seq {}{
+\seq_new:N \l__gotham_frameoption_tmp_seq
+}
+
+\cs_if_exist:NTF \__gotham_add_beamerframe_key:n {}{
+
+\cs_new_protected:Nn \__gotham_add_beamerframe_key:n {
+\define@key{beamerframe}{ #1 }[true]{
+\begin{#1env}
+\seq_put_left:Nn \l__gotham_frameoption_tmp_seq { \end{#1env} }
+}
+}
+
+\apptocmd{\beamer@reseteecodes}{
+\seq_use:Nn \l__gotham_frameoption_tmp_seq {}
+\seq_clear:N \l__gotham_frameoption_tmp_seq
+}{}{}
+}
+
+%%%%%%
+\cs_if_exist:NTF \__gotham_set_template:nn {}{
+
+\cs_new_protected:Nn \__gotham_set_template:nn
+{
+\cs_if_exist:cTF {beamer@@tmpop@#1@#2} {
+\setbeamertemplate{#1}[#2]
+}{
+\PackageError{beamerinnerthemegotham}
+{The~beamer~template~named~'#1'~with~the~option~'#2'~does~not~exist}
+{helping~message unknown setbeamertemplate option}
+}
+}
+}
+
+%%% Sidebars %%%
+%%%%%%%%%%%%%%%%
+
+%%%%%%
+\newlength{\sidebarRightHOffset}
+\setlength{\sidebarRightHOffset}{-2.5ex}
+\newlength{\sidebarLeftHOffset}
+\setlength{\sidebarLeftHOffset}{+0.5ex}
+
+%%%%%%
+\newcommand{\gothamRightFiligrane}{
+
+}
+\newcommand{\gothamLeftFiligrane}{
+}
+
+\defbeamertemplate{sidebar~right}{default/beamer}{
+\vfill
+\llap{\insertlogo\hskip0.1cm}
+\vskip2pt
+\llap{\usebeamertemplate***{navigation~symbols}\hskip0.1cm}
+\vskip2pt
+}
+\defbeamertemplate{sidebar~right}{default/empty}{}
+\defbeamertemplate{sidebar~canvas~right}{default/empty}{}
+\defbeamertemplate{sidebar~canvas~right}{default/gotham~filigrane}{
+\hspace*{\sidebarRightHOffset}
+\gothamRightFiligrane
+}
+\defbeamertemplate{sidebar~left}{default/empty}{}
+\defbeamertemplate{sidebar~canvas~left}{default/empty}{}
+\defbeamertemplate{sidebar~canvas~left}{default/gotham~filigrane}{
+\hspace*{\sidebarLeftHOffset}
+\gothamLeftFiligrane
+}
+\prop_put:Nnn \l__gotham_template_name_prop {sidebar~canvas~left/default} {gotham~filigrane}
+\prop_put:Nnn \l__gotham_template_name_prop {sidebar~canvas~right/default} {gotham~filigrane}
+\prop_put:Nnn \l__gotham_template_name_prop {sidebar~left/default} {empty}
+\prop_put:Nnn \l__gotham_template_name_prop {sidebar~right/default} {beamer}
+
+%%%%%%
+\bool_new:N \l_gotham_defaultEdging
+\bool_set_false:N \l_gotham_defaultEdging
+\BeforeBeginEnvironment{frame}{
+\bool_if:NTF \l_gotham_defaultEdging {
+\setbeamertemplate{sidebar~canvas~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~canvas~left/default}]
+\setbeamertemplate{sidebar~canvas~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~canvas~right/default}]
+}{
+\setbeamertemplate{sidebar~canvas~left}[default/empty]
+\setbeamertemplate{sidebar~canvas~right}[default/empty]
+}
+}
+
+%%%%%%
+\newenvironment{edgingenv}{
+\setbeamertemplate{sidebar~canvas~left}[
+default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~canvas~left/default}
+]
+\setbeamertemplate{sidebar~canvas~right}[
+default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~canvas~right/default}
+]
+}{}
+\__gotham_add_beamerframe_key:n {edging}
+
+%%%%%%
+\newenvironment{noedgingenv}{
+\setbeamertemplate{sidebar~canvas~left}[default/empty]
+\setbeamertemplate{sidebar~canvas~right}[default/empty]
+}{}
+\__gotham_add_beamerframe_key:n {noedging}
+
+%%%%
+\keys_define:nn { gotham / outer }
+{
+sidebar~canvas~right~template .usage:n = { general },
+sidebar~canvas~right~template .default:n = { gotham~filigrane },
+sidebar~canvas~right~template .code:n = { \__gotham_set_prop_template:nn{sidebar~canvas~right/default}{#1} },
+}
+\keys_define:nn { gotham / outer }
+{
+sidebar~canvas~left~template .usage:n = { general },
+sidebar~canvas~left~template .default:n = { gotham~filigrane },
+sidebar~canvas~left~template .code:n = { \__gotham_set_prop_template:nn{sidebar~canvas~left/default}{#1} },
+}
+\keys_define:nn { gotham / outer }{
+edging~default .choice:,
+edging~default .usage:n = { general },
+edging~default .default:n = { false },
+
+edging~default / true .code:n = { \bool_set_true:N \l_gotham_defaultEdging },
+edging~default / on .code:n = { \bool_set_true:N \l_gotham_defaultEdging },
+edging~default / enable .code:n = { \bool_set_true:N \l_gotham_defaultEdging },
+
+edging~default / false .code:n = { \bool_set_false:N \l_gotham_defaultEdging },
+edging~default / off .code:n = { \bool_set_false:N \l_gotham_defaultEdging },
+edging~default / disable .code:n = { \bool_set_false:N \l_gotham_defaultEdging },
+
+edging~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'edging~default',~so~being~ignored. }{helping~message: edging~default / unknown} },
+}
+
+%%% Navigation \& Logo %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%
+\defbeamertemplate*{navigation~symbols}{empty}{}
+
+%%%%%%
+
+\defbeamertemplate{logo}{empty}{}
+
+%%%%%%
+\newenvironment{nologoenv}{
+\setbeamertemplate{logo}[empty]
+}{}
+\__gotham_add_beamerframe_key:n {nologo}
+
+%%% Headline \& Frametitle %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% Headline %%%
+
+\defbeamertemplate{headline}{default/gotham}{}
+\prop_put:Nnn \l__gotham_template_name_prop {headline/default} {gotham}
+
+\defbeamertemplate{headline}{default/gotham~section}{
+\begin{beamercolorbox}[wd=1.0\paperwidth, ht=2.5ex, dp=1.4ex, left]{headfoot}
+\usebeamerfont{section~in~head/foot}\hspace*{3.5ex}
+\usebeamertemplate{section~in~head/foot}
+\end{beamercolorbox}
+}
+
+%%% Frametitle %%%
+
+%%%%%%
+\newlength{\gotham@frametitle@toppadding}
+\setlength{\gotham@frametitle@toppadding}{2.2ex}
+\newlength{\gotham@frametitle@bottompadding}
+\setlength{\gotham@frametitle@bottompadding}{2.2ex}
+\newlength{\gotham@frametitle@leftpadding}
+\setlength{\gotham@frametitle@leftpadding}{2.2ex}
+\newlength{\gotham@frametitle@rightpadding}
+\setlength{\gotham@frametitle@rightpadding}{2.2ex}
+\providecommand{\gotham@strut}{
+\vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz (/)}
+}
+
+\newcommand{\gotham@frametitlestrut@start}{
+\rule{0pt}{\gotham@frametitle@toppadding +
+\totalheightof{
+\ifcsdef{gotham@frametitleformat}{\gotham@frametitleformat{X}}{X}
+}
+}
+}
+\newcommand{\gotham@frametitlestrut@end}{
+\rule[-\gotham@frametitle@bottompadding]{0pt}{\gotham@frametitle@bottompadding}
+}
+
+%%%%%%
+\newcommand{\gothamInstituteLogoSquare}[1][4ex]{
+}
+\defbeamertemplate{includeLogo}{default/gotham~square}{
+\gothamInstituteLogoSquare
+}
+\prop_put:Nnn \l__gotham_template_name_prop {includeLogo/default} {gotham~square}
+
+\defbeamertemplate{includeLogo}{default/gotham~circle}{
+\gothamProgressCircle
+}
+
+\defbeamertemplate{instituteLogo}{default/gotham}{
+\raisebox{0pt}[0pt][0pt]{
+\raisebox{.5\fontcharht\font`E-0.5\height}{
+\setbeamertemplate{includeLogo}[default/\prop_item:Nn \l__gotham_template_name_prop {includeLogo/default}]
+\usebeamertemplate{includeLogo}
+}
+}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {instituteLogo/default} {gotham}
+
+%%%%%%
+\newcommand{\gothamFrameSubtitleSep}{
+\ ---~
+}
+
+%%%%%%
+\newlength{\gothamFramesubtitleStrutend}
+\setlength{\gothamFramesubtitleStrutend}{0pt}
+
+\defbeamertemplate{frametitle}{default/gotham~subsameline}{
+\nointerlineskip
+\begin{beamercolorbox}[
+wd=\paperwidth,
+sep=0pt,
+leftskip=\gotham@frametitle@leftpadding,
+rightskip=\gotham@frametitle@rightpadding,
+]{frametitle}
+\gotham@frametitlestrut@start
+\insertframetitle
+\ifx\insertframesubtitle\@empty
+%% if subtitle to the frame is empty
+\else
+%% if not empty: add subtitle
+{\usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\gothamFrameSubtitleSep \insertframesubtitle}
+\vspace*{\gothamFramesubtitleStrutend}
+\fi
+\nolinebreak
+%% Add logo
+\hfill{
+\setbeamertemplate{instituteLogo}[default/\prop_item:Nn \l__gotham_template_name_prop {instituteLogo/default}]
+\usebeamertemplate{instituteLogo}
+}
+\gotham@frametitlestrut@end
+\end{beamercolorbox}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {frametitle/default} {gotham~subsameline}
+
+\dim_new:N \l__gotham_framesubtitle_subnewline_strutend_dim
+\defbeamertemplate{framesubtitle}{default/gotham~subnewline}{
+\nointerlineskip
+\begin{beamercolorbox}[
+wd=\paperwidth,
+sep=0pt,
+leftskip=\gotham@frametitle@leftpadding,
+rightskip=\gotham@frametitle@rightpadding,
+]{frametitle}
+\raisebox{0pt}[0pt][0pt]{
+\raisebox{-0.3ex}{
+{ \usebeamerfont{framesubtitle}\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}
+}
+}
+\dim_set:Nn \l__gotham_framesubtitle_subnewline_strutend_dim {1.ex+\gothamFramesubtitleStrutend}
+\vspace{\l__gotham_framesubtitle_subnewline_strutend_dim}
+\end{beamercolorbox}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {framesubtitle/default} {gotham~subnewline}
+
+\defbeamertemplate{frametitle}{default/gotham~subnewline}{
+\nointerlineskip
+\begin{beamercolorbox}[
+wd=\paperwidth,
+sep=0pt,
+leftskip=\gotham@frametitle@leftpadding,
+rightskip=\gotham@frametitle@rightpadding,
+]{frametitle}
+\gotham@frametitlestrut@start
+\insertframetitle
+\nolinebreak
+\hfill{
+\setbeamertemplate{instituteLogo}[default/\prop_item:Nn \l__gotham_template_name_prop {instituteLogo/default}]
+\usebeamertemplate{instituteLogo}
+}
+\gotham@frametitlestrut@end
+\end{beamercolorbox}
+%% End of the frametitle box, start then use the subtitle template if needed.
+\ifx\insertframesubtitle\@empty
+%% if subtitle to the frame is not empty
+\else
+\vspace*{-1pt}
+\setbeamertemplate{framesubtitle}[default/\prop_item:Nn \l__gotham_template_name_prop {framesubtitle/default}]
+\usebeamertemplate{framesubtitle}
+\fi
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+frametitle~template .usage:n = { general },
+frametitle~template .default:n = { gotham~subsameline },
+frametitle~template .code:n = {
+\__gotham_set_prop_template:nn{frametitle/default}{#1}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+}
+}
+\keys_define:nn { gotham / outer }{
+framesubtitle~template .usage:n = { general },
+framesubtitle~template .default:n = { gotham~subnewline },
+framesubtitle~template .code:n = {
+\__gotham_set_prop_template:nn{framesubtitle/default}{#1}
+\setbeamertemplate{framesubtitle}[default/\prop_item:Nn \l__gotham_template_name_prop {framesubtitle/default}]
+}
+}
+
+%%% Continuation %%%
+
+\defbeamertemplate{frametitle~continuation}{default/beamer}{
+\usebeamerfont{frametitle}
+{
+\MakeUppercase{\romannumeral \insertcontinuationcount}
+}
+}
+
+\defbeamertemplate{frametitle~continuation}{default/tot}{
+\usebeamerfont{frametitle}
+{
+\textmd{%
+[\insertcontinuationcount
+\,/\,%
+\the\numexpr\beamer@endpageofframe+1-\beamer@startpageofframe
+]%
+}%
+}
+}
+
+\defbeamertemplate{frametitle~continuation}{default/gotham}{
+\usebeamerfont{frametitle}
+{
+(\romannumeral \insertcontinuationcount)
+}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {frametitle~continuation/default} {gotham}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+frametitle~continuation~template .usage:n = { general },
+frametitle~continuation~template .default:n = { gotham },
+frametitle~continuation~template .code:n = {
+\__gotham_set_prop_template:nn{frametitle~continuation/default}{#1}
+\setbeamertemplate{frametitle~continuation}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle~continuation/default}]
+}
+}
+
+%%% Footer \& Footline %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% Footline %%%
+
+\defbeamertemplate{footline}{empty}{}
+
+%%%%%%
+\newenvironment{nofootlineenv}{
+\setbeamertemplate{footline}[empty]
+}{}
+\__gotham_add_beamerframe_key:n {nofootline}
+
+%%%%%%
+\newlength{\gothamFootlineOffset}
+\setlength{\gothamFootlineOffset}{-0.5ex}
+
+\newlength{\gothamFootlineHeight}
+\setlength{\gothamFootlineHeight}{1.5ex}
+\newlength{\gothamFootlineDepth}
+\setlength{\gothamFootlineDepth}{0.1ex}
+
+\defbeamertemplate*{footline}{default/gotham}{
+\vspace*{\gothamFootlineOffset}
+\begin{beamercolorbox}[
+wd=\textwidth,
+sep=0pt,
+leftskip=3ex,
+rightskip=3ex,
+ht={\gothamFootlineHeight},
+dp={\gothamFootlineDepth},
+]{footline}
+\usebeamerfont{page number in head/foot}
+\ifbeamertemplateempty{frame~footer}{
+\hfill \ \gotham@strut
+}{
+\usebeamertemplate*{frame~footer}
+}
+\hspace{\gothamRightFooterPadding}
+{\usebeamertemplate{page~number~in~head/foot}}~
+\end{beamercolorbox}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {footline/default} {gotham}
+
+%%% Footer %%%
+
+%%%%%%
+\newlength{\gothamLeftFooterPadding}
+\setlength{\gothamLeftFooterPadding}{2.0ex}
+\newlength{\gothamRightFooterPadding}
+\setlength{\gothamRightFooterPadding}{3.5ex}
+\newlength{\gothamFooterHOffset}
+\setlength{\gothamFooterHOffset}{0pt}
+
+\defbeamertemplate{frame~footer}{none}{}
+
+\defbeamertemplate{frame~footer}{empty}{
+\hspace{\gothamLeftFooterPadding}
+\hfill \
+\gotham@strut
+\vspace*{\gothamFooterHOffset}
+}
+
+%%%%%%
+\newenvironment{nofooterenv}{
+\setbeamertemplate{frame~footer}[empty]
+}{}
+\__gotham_add_beamerframe_key:n {nofooter}
+
+%%%%%%
+\bool_new:N \l_gotham_defaultRotateFooter
+\bool_set_false:N \l_gotham_defaultRotateFooter
+\bool_new:N \l_gotham_RotateFooter
+\bool_set_false:N \l_gotham_RotateFooter
+\BeforeBeginEnvironment{frame}{
+\bool_if:NTF \l_gotham_defaultRotateFooter {
+\bool_set_true:N \l_gotham_RotateFooter
+}{% false
+\bool_set_false:N \l_gotham_RotateFooter
+}
+}
+
+%%%%%%
+\define@key{beamerframe}{rotateFooter}[true]{
+\bool_set_true:N \l_gotham_RotateFooter
+}
+
+%%%%%%
+\define@key{beamerframe}{noRotateFooter}[true]{
+\bool_set_false:N \l_gotham_RotateFooter
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+rotateFooter~default .choice:,
+rotateFooter~default .usage:n = { general },
+rotateFooter~default .default:n = { false },
+
+rotateFooter~default / true .code:n = { \bool_set_true:N \l_gotham_defaultRotateFooter },
+rotateFooter~default / on .code:n = { \bool_set_true:N \l_gotham_defaultRotateFooter },
+rotateFooter~default / enable .code:n = { \bool_set_true:N \l_gotham_defaultRotateFooter },
+
+rotateFooter~default / false .code:n = { \bool_set_false:N \l_gotham_defaultRotateFooter },
+rotateFooter~default / off .code:n = { \bool_set_false:N \l_gotham_defaultRotateFooter },
+rotateFooter~default / disable .code:n = { \bool_set_false:N \l_gotham_defaultRotateFooter },
+
+rotateFooter~default / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'rotateFooter~default',~so~being~ignored. }{helping~message: rotateFooter~default / unknown} },
+}
+
+%%%%%%
+\newlength{\gothamFootlineRuleLeftPadding}
+\newlength{\gothamFootlineRuleHeight}
+\newlength{\gothamFootlineRuleLength}
+\setlength{\gothamFootlineRuleLeftPadding}{7mm}
+\setlength{\gothamFootlineRuleHeight}{0.0pt}
+\setlength{\gothamFootlineRuleLength}{15mm}
+
+\newlength{\gothamHposLeftRotFooter}
+\newlength{\gothamHposRightRotFooter}
+\newlength{\gothamVposLeftRotFooter}
+\newlength{\gothamVposRightRotFooter}
+
+\setlength{\gothamHposLeftRotFooter}{-7pt}
+\setlength{\gothamHposRightRotFooter}{2pt}
+\setlength{\gothamVposLeftRotFooter}{15pt}
+\setlength{\gothamVposRightRotFooter}{15pt}
+
+\newlength{\hlenRightRotFooter}
+\newlength{\hlenLeftRotFooter}
+
+\defbeamertemplate{frame~footer}{default/gotham}{
+\vbox to 0pt{
+\vss
+\hbox to 0pt{
+\hspace*{\gothamFootlineRuleLeftPadding}
+\usebeamercolor{frametitle}
+\color{frametitle.bg}
+\rule{\gothamFootlineRuleLength}{\gothamFootlineRuleHeight}
+\vspace*{
+\dimexpr \gothamFootlineHeight -0.25em\relax
+}
+\hss
+}
+}
+\hspace{\gothamLeftFooterPadding}
+\settowidth{\hlenLeftRotFooter}{\hspace{-\gothamLeftFooterPadding}}
+\addtolength{\hlenLeftRotFooter}{\gothamHposLeftRotFooter}
+\bool_if:NTF \l_gotham_RotateFooter {
+\begin{picture}(0,0)(0,0)
+\put(\hlenLeftRotFooter,\gothamVposLeftRotFooter){\rotatebox{90}{\insertshortdate}}
+\end{picture}
+}{
+\insertshortdate
+}
+\hfill \
+\hfill \ \insertshorttitle
+\gotham@strut
+\hfill \
+\hfill \
+\bool_if:NTF \l_gotham_RotateFooter {
+\settowidth{\hlenRightRotFooter}{\hspace{\gothamRightFooterPadding}\usebeamertemplate{page~number~in~head/foot}}
+\addtolength{\hlenRightRotFooter}{\gothamHposRightRotFooter}
+\begin{picture}(0,0)(0,0)
+\put(\hlenRightRotFooter,\gothamVposRightRotFooter){\rotatebox{90}{\insertshortauthor}}
+\end{picture}
+}{
+\insertshortauthor
+}
+\vspace*{\gothamFooterHOffset}
+}
+\prop_put:Nnn \l__gotham_template_name_prop {frame~footer/default} {gotham}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+footer~template .usage:n = { general },
+footer~template .default:n = { gotham },
+footer~template .code:n = {
+\__gotham_set_prop_template:nn{frame~footer/default}{#1}
+\setbeamertemplate{frame~footer}[
+default/\prop_item:Nn \l__gotham_template_name_prop {frame~footer/default}
+]
+}
+}
+
+%%% Numbering %%%
+%%%%%%%%%%%%%%%%%
+
+\def\inserttotalframenumber{100}
+
+\defbeamertemplate{page~number~in~head/foot}{none}{ }
+
+%%%%
+\newlength{\gothamCircleNumberingVshift}
+\setlength{\gothamCircleNumberingVshift}{1.4mm}
+\newlength{\gothamCircleNumberingHshift}
+\setlength{\gothamCircleNumberingHshift}{2.6mm}
+
+\defbeamertemplate{page~number~in~head/foot}{circle}{
+\hspace{+2em}
+\raisebox{\gothamCircleNumberingVshift}[0pt][0pt]{
+\begin{tikzpicture}[remember~picture, overlay]
+\coordinate (circleCenter);
+
+\usebeamercolor{frametitle}
+
+\draw[fill, color=frametitle.bg] (circleCenter) circle (6mm);
+\draw[fill, color=frametitle.fg] (circleCenter) circle (5mm);
+\node[color=frametitle.bg] at (circleCenter)
+{\small$^{\insertframenumber}\negmedspace/\negthinspace\sb{\inserttotalframenumber}$}
+;
+\end{tikzpicture}
+\hspace{\gothamCircleNumberingHshift}
+}
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+numbering .choice:,
+numbering .usage:n = { general },
+numbering .default:n = { none },
+
+numbering / none .code:n = { \setbeamertemplate{page~number~in~head/foot}[none] },
+numbering / framenumber .code:n = { \setbeamertemplate{page~number~in~head/foot}[framenumber] },
+numbering / totalframenumber .code:n = {\setbeamertemplate{page~number~in~head/foot}[totalframenumber] },
+numbering / appendixframenumber .code:n = {\setbeamertemplate{page~number~in~head/foot}[appendixframenumber] },
+numbering / pagenumber .code:n = { \setbeamertemplate{page~number~in~head/foot}[pagenumber] },
+numbering / totalpagenumber .code:n = {\setbeamertemplate{page~number~in~head/foot}[totalpagenumber] },
+numbering / circle .code:n = {\setbeamertemplate{page~number~in~head/foot}[circle] },
+
+numbering / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'numbering',~so~being~ignored. }{helping~message} },
+}
+
+%%% MiniFrames \& Progress bar %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% MiniFrames %%%
+
+\defbeamertemplate{section~in~head/foot}{default/beamer}{
+\insertsectionhead
+}
+\defbeamertemplate{section~in~head/foot~shaded}{default/beamer}{
+\color{fg!50!bg}\usebeamertemplate{section~in~head/foot}
+}
+
+\prop_put:Nnn \l__gotham_template_name_prop {section~in~head/foot~shaded/default} {beamer}
+\prop_put:Nnn \l__gotham_template_name_prop {section~in~head/foot/default} {beamer}
+
+\defbeamertemplate{section~in~head/foot}{default/gotham~secSubsec}{
+\insertsectionhead
+\ifx\insertsubsection\empty\else
+\ifdefempty{\subsecname}{\relax}{
+\ \textbar\ \insertsubsectionhead
+}
+\fi
+}
+\defbeamertemplate{section~in~head/foot~shaded}{default/gotham~secSubsec}{
+\insertsectionhead
+}
+
+\defbeamertemplate{section~in~head/foot}{default/empty}{
+\vspace{3.875ex}
+}
+\defbeamertemplate{section~in~head/foot~shaded}{default/empty}{
+\vspace{3.875ex}
+}
+
+\newlength{\gotham@temp@heightFrametitle}
+\newlength{\gotham@temp@PaperheightFrametitle}
+
+\defbeamertemplate*{mini~nav~progress~head/foot}{gotham~miniframes~theme}
+{
+\begin{beamercolorbox}[ignorebg]{section~in~head/foot}
+\hfuzz=\paperwidth
+\insertnavigation{\paperwidth}
+\vspace{0.05cm}
+\end{beamercolorbox}
+}
+\defbeamertemplate*{mini~nav~progress~left}{gotham~miniframes~theme}
+{
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-\gothamProgressHeadFootLineheight}
+
+\vspace{-0.6\paperheight}
+\rotatebox{90}{
+\begin{beamercolorbox}[ignorebg]{section~in~head/foot}
+\hfuzz=\gotham@temp@PaperheightFrametitle
+\insertnavigation{\gotham@temp@PaperheightFrametitle}
+\end{beamercolorbox}
+}
+}
+\defbeamertemplate*{mini~nav~progress~right}{gotham~miniframes~theme}
+{
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-\gothamProgressHeadFootLineheight}
+
+\vspace{\gotham@temp@heightFrametitle}
+\hspace{-2.3em}
+\rotatebox{-90}{
+\begin{beamercolorbox}[ignorebg]{section~in~head/foot}
+\hfuzz=\gotham@temp@PaperheightFrametitle
+\insertnavigation{\gotham@temp@PaperheightFrametitle}
+\end{beamercolorbox}
+}
+}
+
+%% Select the bullets shape
+\defbeamertemplate{mini~frame}{gotham~box}
+{
+\begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
+\pgfpathrectangle{\pgfpointorigin}{\pgfpoint{0.1cm}{0.1cm}}
+\pgfusepath{fill,stroke}
+\end{pgfpicture}
+}[action]{
+\setbeamersize{mini~frame~size=.14cm, mini~frame~offset=.05cm}
+}
+\defbeamertemplate{mini~frame~in~current~subsection}{gotham~box}
+{
+\begin{pgfpicture}{0pt}{0pt}{.1cm}{.1cm}
+\pgfpathrectangle{\pgfpointorigin}{\pgfpoint{0.1cm}{0.1cm}}
+\pgfusepath{stroke}
+\end{pgfpicture}
+}
+
+\defbeamertemplate{mini~frame}{gotham~minibox}
+{
+\begin{pgfpicture}{0pt}{0pt}{.05cm}{.05cm}
+\pgfpathrectangle{\pgfpointorigin}{\pgfpoint{0.05cm}{0.05cm}}
+\pgfusepath{fill,stroke}
+\end{pgfpicture}
+}[action]{
+\setbeamersize{mini~frame~size=.08cm, mini~frame~offset=.05cm}
+}
+\defbeamertemplate{mini~frame~in~current~subsection}{gotham~minibox}
+{
+\begin{pgfpicture}{0pt}{0pt}{.05cm}{.05cm}
+\pgfpathrectangle{\pgfpointorigin}{\pgfpoint{0.05cm}{0.05cm}}
+\pgfusepath{stroke}
+\end{pgfpicture}
+}
+
+\defbeamertemplate{mini~frame}{gotham~minibullet}
+{
+\beamer@xelatex@fixminiframes
+\begin{pgfpicture}{0pt}{0pt}{0.05cm}{0.05cm}
+\pgfpathcircle{\pgfpoint{0.03cm}{0.03cm}}{0.03cm}
+\pgfusepath{fill,stroke}
+\end{pgfpicture}
+}[action]{
+\setbeamersize{mini~frame~size=.09cm, mini~frame~offset=.05cm}
+}
+\defbeamertemplate{mini~frame~in~current~subsection}{gotham~minibullet}
+{
+\beamer@xelatex@fixminiframes
+\begin{pgfpicture}{0pt}{0pt}{0.05cm}{0.05cm}
+\pgfpathcircle{\pgfpoint{0.03cm}{0.03cm}}{0.03cm}
+\pgfusepath{stroke}
+\end{pgfpicture}
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+%% mini~frames~shape
+mini~frames~shape .usage:n = { general },
+mini~frames~shape .default:n = { gotham~minibullet },
+mini~frames~shape .code:n = {
+\setbeamertemplate{mini~frames}[#1]
+},
+}
+
+\defbeamertemplate*{miniframe~home}{beamer}{
+}
+\defbeamertemplate*{miniframe~current~slide}{beamer}{
+\usebeamertemplate{mini~frame}
+}
+\defbeamertemplate*{miniframe~done~current~section}{beamer}{
+\usebeamertemplate{mini~frame~in~current~subsection}
+}
+\defbeamertemplate*{miniframe~todo~current~section}{beamer}{
+\usebeamertemplate{mini~frame~in~current~subsection}
+}
+\defbeamertemplate*{miniframe~done~other~section}{beamer}{
+\usebeamertemplate{mini~frame~in~other~subsection}
+}
+\defbeamertemplate*{miniframe~todo~other~section}{beamer}{
+\usebeamertemplate{mini~frame~in~other~subsection}
+}
+\defbeamertemplate*{miniframe~section~current}{beamer}{}
+\defbeamertemplate*{miniframe~section~done}{beamer}{}
+\defbeamertemplate*{miniframe~section~todo}{beamer}{}
+\defbeamertemplate*{miniframe~subsection~current}{beamer}{}
+\defbeamertemplate*{miniframe~subsection~todo}{beamer}{}
+\defbeamertemplate*{miniframe~subsection~done}{beamer}{}
+\defbeamertemplate*{miniframe~section~done~in~other~section}{default}[1][50]
+{
+\color{fg!#1!bg}\usebeamertemplate{miniframe~section~done}
+}
+\defbeamertemplate*{miniframe~section~todo~in~other~section}{default}[1][50]
+{
+\color{fg!#1!bg}\usebeamertemplate{miniframe~section~todo}
+}
+\defbeamertemplate*{miniframe~subsection~done~in~other~section}{default}[1][50]
+{
+\color{fg!#1!bg}\usebeamertemplate{miniframe~subsection~done}
+}
+\defbeamertemplate*{miniframe~subsection~todo~in~other~section}{default}[1][50]
+{
+\color{fg!#1!bg}\usebeamertemplate{miniframe~subsection~todo}
+}
+
+\defbeamertemplate{miniframe~home}{gotham~mini}{
+\resizebox{0.85\beamer@boxsize}{\beamer@boxsize}{$\equiv$}
+}
+\defbeamertemplate{miniframe~current~slide}{gotham~mini}{
+\usebeamercolor[fg]{alerted~text}
+\usebeamertemplate{mini~frame}
+}
+\defbeamertemplate{miniframe~done~current~section}{gotham~mini}{
+\usebeamertemplate{mini~frame}
+}
+\defbeamertemplate{miniframe~todo~current~section}{gotham~mini}{
+\usebeamertemplate{mini~frame~in~current~subsection}
+}
+\defbeamertemplate{miniframe~done~other~section}{gotham~mini}[1][50]{
+\color{fg!#1!bg}\usebeamertemplate{mini~frame}
+}
+\defbeamertemplate{miniframe~todo~other~section}{gotham~mini}[1][50]{
+\color{fg!#1!bg}\usebeamertemplate{mini~frame~in~other~subsection}
+}
+\defbeamertemplate{miniframe~section~current}{gotham~mini}{
+\fontsize{3pt}{0pt}\selectfont
+\tl_use:N \l__gotham_minif_tmpa_tl
+\hspace{1.pt}
+}
+\defbeamertemplate{miniframe~section~done}{gotham~mini}{
+\fontsize{3pt}{0pt}\selectfont
+\tl_use:N \l__gotham_minif_tmpa_tl
+\hspace{1.pt}
+}
+\defbeamertemplate{miniframe~section~todo}{gotham~mini}{
+\fontsize{3pt}{0pt}\selectfont
+\tl_use:N \l__gotham_minif_tmpa_tl
+\hspace{1.pt}
+}
+\defbeamertemplate{miniframe~subsection~current}{gotham~mini}{
+\usebeamercolor[fg]{alerted~text}
+\hspace{-0.15pt}
+\resizebox{\beamer@boxsize}{!}{\hspace{-0.75pt}$\blacklozenge$}
+}
+\defbeamertemplate{miniframe~subsection~todo}{gotham~mini}{
+\hspace{-0.15pt}
+\resizebox{\beamer@boxsize}{!}{\hspace{-0.75pt}$\lozenge$}
+}
+\defbeamertemplate{miniframe~subsection~done}{gotham~mini}{
+\hspace{-0.15pt}
+\resizebox{\beamer@boxsize}{!}{\hspace{-0.75pt}$\blacklozenge$}
+}
+
+\defbeamertemplate{miniframe~home}{gotham~nano}{
+\scalebox{0.5}[0.95]{$\equiv$}
+}
+\defbeamertemplate{miniframe~current~slide}{gotham~nano}{
+o
+}
+\defbeamertemplate{miniframe~done~current~section}{gotham~nano}{
+x
+}
+\defbeamertemplate{miniframe~todo~current~section}{gotham~nano}{
+$\cdot$
+}
+\defbeamertemplate{miniframe~done~other~section}{gotham~nano}{
+x
+}
+\defbeamertemplate{miniframe~todo~other~section}{gotham~nano}{
+$\cdot$
+}
+\defbeamertemplate{miniframe~section~current}{gotham~nano}{
+\tl_use:N \l__gotham_minif_tmpa_tl
+}
+\defbeamertemplate{miniframe~section~done}{gotham~nano}{
+\tl_use:N \l__gotham_minif_tmpa_tl
+}
+\defbeamertemplate{miniframe~section~todo}{gotham~nano}{
+\tl_use:N \l__gotham_minif_tmpa_tl
+}
+\defbeamertemplate{miniframe~subsection~current}{gotham~nano}{
+\usebeamercolor[fg]{alerted~text}$\diamond$
+}
+\defbeamertemplate{miniframe~subsection~todo}{gotham~nano}{
+$\diamond$
+}
+\defbeamertemplate{miniframe~subsection~done}{gotham~nano}{
+$\diamond$
+}
+
+\defbeamertemplateparent{mini~frames~bundle}
+{ miniframe~home, miniframe~current~slide,
+miniframe~done~current~section, miniframe~todo~current~section, miniframe~done~other~section, miniframe~todo~other~section,
+miniframe~section~current, miniframe~section~done, miniframe~section~todo,
+miniframe~subsection~current, miniframe~subsection~done, miniframe~subsection~todo,
+}{}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+%% mini~frames~bundle
+mini~frames~bundle .usage:n = { general },
+mini~frames~bundle .default:n = { gotham~mini },
+mini~frames~bundle .code:n = {
+\setbeamertemplate{mini~frames~bundle}[#1]
+},
+}
+
+%%% MiniFrames Navigation %%%
+
+%%%%
+\keys_define:nn { gotham / outer }{
+mini~frames~compress .choice:,
+mini~frames~compress .usage:n = { general },
+mini~frames~compress .default:n = { true },
+
+mini~frames~compress / true .code:n = { \beamer@compresstrue },
+mini~frames~compress / on .code:n = { \beamer@compresstrue },
+mini~frames~compress / enable .code:n = { \beamer@compresstrue },
+
+mini~frames~compress / false .code:n = { \beamer@compressfalse },
+mini~frames~compress / off .code:n = { \beamer@compressfalse },
+mini~frames~compress / disable .code:n = { \beamer@compressfalse },
+
+mini~frames~compress / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'mini~frames~compress',~so~being~ignored. }{helping~message: mini~frames~compress / unknown} },
+}
+
+\newlength{\gotham@temp@MiniframeSubsecDim}
+\newlength{\gotham@temp@MiniframeSecDim}
+\def\gotham@temp@lastSec{-1}
+\tl_new:N \l__gotham_minif_tmpa_tl
+\tl_new:N \l__gotham_minif_tmpb_tl
+
+\renewcommand{\slideentry}[6]{%
+ %section number, subsection number, slide number, first/last frame, page number, part number
+\ifnum#6=\c@part\ifnum#3>0%\ifnum#6=\c@part\ifnum#1>0\ifnum#3>0 MODIF
+\ifbeamer@compress%
+\advance\beamer@xpos by1\relax%
+\else%
+\ifnum#2=0%
+\beamer@ypos@offset=1\relax%
+\fi%
+\beamer@xpos=#3\relax%
+\beamer@ypos=#2\relax%
+\advance\beamer@ypos by \beamer@ypos@offset\relax%
+\fi%
+%% Add section number and subsection symbol to miniframes.
+%% MODIF below, inspired from https://tex.stackexchange.com/questions/722523
+\ifnum#3=1%\c@subsectionslide=#3 % if =1, so it has been reset => new section or subsection
+\ifnum#1>0\ifnum#2<2% => there no subsection in this section.
+\ifnum\gotham@temp@lastSec=#1%
+\else%
+\tl_set:Nn \l__gotham_minif_tmpa_tl {#1}
+\settowidth{\gotham@temp@MiniframeSecDim}{\usebeamertemplate{miniframe~section~current}}%
+\hbox to 0pt{%
+\beamer@tempdim=-\beamer@vboxoffset%
+\advance\beamer@tempdim by-\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@ypos%
+\advance\beamer@tempdim by -.05cm%
+\raise\beamer@tempdim\hbox{%
+\beamer@tempdim=\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@xpos%
+\advance\beamer@tempdim by -\beamer@boxsize%
+\advance\beamer@tempdim by -\gotham@temp@MiniframeSecDim% NEW
+\advance\beamer@tempdim by 1pt%
+\kern\beamer@tempdim%
+\global\beamer@section@min@dim\beamer@tempdim%
+\hbox{\beamer@link(#4){%
+\ifnum\c@section=#1%
+\ifnum\c@subsectionslide=#3%
+\usebeamertemplate{miniframe~section~current}
+\else%
+\ifnum\c@subsectionslide<#3
+\usebeamertemplate{miniframe~section~todo}
+\else%
+\usebeamertemplate{miniframe~section~done}
+\fi%
+\fi%
+\else% \ifnum\c@section=#1%
+\ifnum\c@section<#1
+\usebeamertemplate{miniframe~section~todo~in~other~section}
+\else%
+\usebeamertemplate{miniframe~section~done~in~other~section}
+\fi%
+\fi% \ifnum\c@section=#1
+}}%
+}%
+}%
+\def\gotham@temp@lastSec{#1}%
+\fi%
+\fi\fi%
+\ifnum#2>0%
+\ifbeamertemplateempty{miniframe~subsection~current}{
+}{
+\tl_set:Nn \l__gotham_minif_tmpb_tl {#2}
+\settowidth{\gotham@temp@MiniframeSubsecDim}{}%\usebeamertemplate{miniframe~subsection~current}}%
+\addtolength{\gotham@temp@MiniframeSubsecDim}{+1.\beamer@boxsize}%
+\advance\beamer@xpos by1\relax%
+\hbox to 0pt{%
+\beamer@tempdim=-\beamer@vboxoffset%
+\advance\beamer@tempdim by-\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@ypos%
+\advance\beamer@tempdim by -.05cm%
+\raise\beamer@tempdim\hbox{%
+\beamer@tempdim=\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@xpos%
+\advance\beamer@tempdim by -\beamer@boxsize%
+\advance\beamer@tempdim by -\gotham@temp@MiniframeSubsecDim% NEW
+\advance\beamer@tempdim by 1pt%
+\kern\beamer@tempdim%
+\global\beamer@section@min@dim\beamer@tempdim%
+\hbox{\beamer@link(#4){%
+\ifnum\c@section=#1%
+\ifnum\c@subsection=#2%
+\ifnum\c@subsectionslide=#3%
+\usebeamertemplate{miniframe~subsection~current}
+\else%
+\ifnum\c@subsectionslide<#3
+\usebeamertemplate{miniframe~subsection~todo}
+\else%
+\usebeamertemplate{miniframe~subsection~done}
+\fi%
+\fi%
+\else% \ifnum\c@subsection=#2%
+\ifnum\c@subsection<#2
+\usebeamertemplate{miniframe~subsection~todo}
+\else%
+\usebeamertemplate{miniframe~subsection~done}
+\fi%
+\fi% \ifnum\c@subsection=#2%
+\else% \ifnum\c@section=#1%
+\ifnum\c@section<#1
+\usebeamertemplate{miniframe~subsection~todo~in~other~section}
+\else%
+\usebeamertemplate{miniframe~subsection~done~in~other~section}
+\fi%
+\fi% \ifnum\c@section=#1
+}}% \hbox{\beamer@link
+}% raisebox
+}% hbox
+}% end if template empty
+\fi% \ifnum#2>0
+\else
+\ifbeamer@compress%
+\else%
+\ifbeamertemplateempty{miniframe~subsection~current}{
+}{
+\advance\beamer@xpos by 1\relax%
+}
+\fi%
+\fi% \ifnum#3=1
+
+%% end of modif to add section number and subsection symbol.
+\hbox to 0pt{%
+\beamer@tempdim=-\beamer@vboxoffset%
+\advance\beamer@tempdim by-\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@ypos%
+\advance\beamer@tempdim by -.05cm%
+\raise\beamer@tempdim\hbox{%
+\beamer@tempdim=\beamer@boxsize%
+\multiply\beamer@tempdim by\beamer@xpos%
+\advance\beamer@tempdim by -\beamer@boxsize%
+\advance\beamer@tempdim by 1pt%
+\kern\beamer@tempdim
+\global\beamer@section@min@dim\beamer@tempdim
+\hbox{\beamer@link(#4){%
+\usebeamerfont{mini~frame}%
+%%
+%% CHANGE FROM HERE: I rewrote this part.
+\def\gotham@temp@i{1/1}
+\def\gotham@temp@ii{#4}
+\ifx\gotham@temp@i\gotham@temp@ii
+\usebeamertemplate{miniframe~home}
+\else
+\ifnum\c@section=#1%
+\ifnum\c@subsection=#2%
+\usebeamercolor[fg]{mini~frame}%
+\ifnum\c@subsectionslide=#3%
+\usebeamertemplate{miniframe~current~slide}
+\else%
+\ifnum\c@subsectionslide<#3
+\usebeamertemplate{miniframe~todo~current~section}
+\else%
+\usebeamertemplate{miniframe~done~current~section}
+\fi%
+\fi%
+\else% \ifnum\c@subsection=#2%
+\usebeamercolor{mini~frame}%
+\ifnum\c@subsection<#2
+\usebeamertemplate{miniframe~todo~other~section}
+\else%
+\usebeamertemplate{miniframe~done~other~section}
+\fi%
+\fi% \ifnum\c@subsection=#2%
+\else% \ifnum\c@section=#1%
+\usebeamercolor{mini~frame}%
+\ifnum\c@section<#1
+\usebeamertemplate{miniframe~todo~other~section}
+\else%
+\usebeamertemplate{miniframe~done~other~section}
+\fi%
+\fi% \ifnum\c@section=#1
+\fi% \ifx\gotham@temp@i\gotham@temp@ii
+}}}\hskip-10cm plus 1fil%
+}\fi% \ifnum#1>0\ifnum#3>0%
+\else% \ifnum#6=\c@part
+\fakeslideentry{#1}{#2}{#3}{#4}{#5}{#6}%
+\fi\ignorespaces%
+}%
+
+%%%%
+\providebool{gothamZerosectionframes}
+\boolfalse{gothamZerosectionframes}
+
+\providecommand{\gothamInsertNavlength}{
+\ifbool{gothamZerosectionframes}{
+\hskip-0.5ex~plus~1fill
+}{
+\hskip-1.875ex~plus-1fill
+}%
+}
+\providecommand{\gothamPatchInsertNav}{
+\box\beamer@sectionbox\hfil\hskip.3cm
+}
+\providecommand{\gothamPatchSectionentry}{
+\hskip1.875ex~plus~1fill
+}
+\providecommand{\gothamPatchSectionbox}{
+\ht\beamer@sectionbox=1.875ex
+\dp\beamer@sectionbox=0.75ex
+}
+\ExplSyntaxOff
+\patchcmd{\insertnavigation}{\hskip-1.875ex plus-1fill}{%
+\ifnum\value{section}=0%
+\ifnum\value{framenumber}>0%
+\hskip-0ex%
+\global\booltrue{gothamZerosectionframes}%
+\fi\fi%
+\gothamInsertNavlength%
+}{}{}
+%% Remove hfill between sections => flush right bullet bar, if not corrected.
+\patchcmd{\sectionentry}{\hskip1.875ex plus 1fill}{\gothamPatchSectionentry}{}{}
+%% Centering the bullet bar
+\patchcmd{\insertnavigation}{\box\beamer@sectionbox\hfil\hskip.3cm}{\gothamPatchInsertNav}{}{}
+\patchcmd{\insertnavigation}{\ht\beamer@sectionbox=1.875ex%
+\dp\beamer@sectionbox=0.75ex%
+}{
+\gothamPatchSectionbox
+}{}{}
+\patchcmd{\sectionentry}{\ht\beamer@sectionbox=1.875ex%
+\dp\beamer@sectionbox=0.75ex%
+}{
+\gothamPatchSectionbox
+}{}{}
+\ExplSyntaxOn
+
+%%%%
+\keys_define:nn { gotham / outer }{
+mini~frames~nav~spreading .choice:,
+mini~frames~nav~spreading .usage:n = { general },
+mini~frames~nav~spreading .default:n = { spreading },
+
+mini~frames~nav~spreading / spreading .code:n = {
+\renewcommand{\gothamInsertNavlength}{
+\ifbool{gothamZerosectionframes}{
+\hskip-0.5ex
+}{
+\hskip-1.875ex~plus-1fill
+}%
+}
+\renewcommand{\gothamPatchInsertNav}{
+\box\beamer@sectionbox\hfil\hskip.3cm
+}
+\renewcommand{\gothamPatchSectionentry}{
+\hskip1.875ex~plus~1fill
+}
+},
+mini~frames~nav~spreading / centering .code:n = {
+\renewcommand{\gothamInsertNavlength}{
+\ifbool{gothamZerosectionframes}{
+\hskip-0.5ex~plus~1fill
+}{
+\hfill
+}%
+}
+\renewcommand{\gothamPatchInsertNav}{
+\box\beamer@sectionbox\hfill\hskip.3cm
+}
+%% Remove hfill between sections => flush right bullet bar, if not corrected.
+\renewcommand{\gothamPatchSectionentry}{
+\hskip~3.5ex
+}
+},
+mini~frames~nav~spreading / left .code:n = {
+\renewcommand{\gothamInsertNavlength}{
+\ifbool{gothamZerosectionframes}{
+\hskip-0.5ex
+}{
+\hskip-1.875ex plus-1fill
+}%
+}
+\renewcommand{\gothamPatchInsertNav}{
+\box\beamer@sectionbox\hfil\hskip.3cm
+}
+%% Remove hfill between sections => flush right bullet bar, if not corrected.
+\renewcommand{\gothamPatchSectionentry}{
+\hskip~3.5ex
+}
+},
+mini~frames~nav~spreading / right .code:n = {
+\renewcommand{\gothamInsertNavlength}{
+\ifbool{gothamZerosectionframes}{
+\hskip-0.5ex~plus~1fill
+}{
+\hskip-1.875ex plus-1fill
+}%
+}
+\renewcommand{\gothamPatchInsertNav}{
+\box\beamer@sectionbox\hfil\hskip.3cm
+}
+%% Remove hfill between sections => flush right bullet bar, if not corrected.
+\renewcommand{\gothamPatchSectionentry}{
+\hskip~3.5ex
+}
+},
+mini~frames~nav~spreading / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'mini~frames~nav~spreading',~so~being~ignored. }{helping~message: mini~frames~nav~spreading / unknown} },
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+mini~frames~nav~sectioning .choice:,
+mini~frames~nav~sectioning .usage:n = { general },
+mini~frames~nav~sectioning .default:n = { secsubsection },
+
+mini~frames~nav~sectioning / none .code:n = {
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/empty}
+\__gotham_set_template:nn{section~in~head/foot}{default/empty}
+\renewcommand{\gothamPatchSectionbox}{
+\ht\beamer@sectionbox=0pt
+\dp\beamer@sectionbox=0pt
+}
+},
+mini~frames~nav~sectioning / section .code:n = {
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default} %from Beamer
+\__gotham_set_template:nn{section~in~head/foot}{default} %from Beamer
+},
+mini~frames~nav~sectioning / secsubsection .code:n = {
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/gotham~secSubsec}
+\__gotham_set_template:nn{section~in~head/foot}{default/gotham~secSubsec}
+},
+
+mini~frames~nav~sectioning / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'mini~frames~nav~sectioning',~so~being~ignored. }{helping~message: mini~frames~nav~sectioning / unknown} },
+}
+
+%%%%
+\tl_new:N \l__gotham_out_tmp_mfnposi_tl
+\keys_define:nn { gotham / outer }{
+mini~frames~nav~position .choice:,
+mini~frames~nav~position .usage:n = { general },
+mini~frames~nav~position .default:n = { none },
+
+mini~frames~nav~position / none .code:n = {
+\tl_set:Nn \l__gotham_out_tmp_mfnposi_tl {none}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+},
+mini~frames~nav~position / head .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\tl_set:Nn \l__gotham_out_tmp_mfnposi_tl {head}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{headline}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+\usebeamertemplate*{mini~nav~progress~head/foot}
+}{}
+}
+}
+},
+mini~frames~nav~position / foot .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\tl_set:Nn \l__gotham_out_tmp_mfnposi_tl {foot}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{footline}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+\usebeamertemplate*{mini~nav~progress~head/foot}
+}{}
+}
+}
+},
+mini~frames~nav~position / left .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\tl_set:Nn \l__gotham_out_tmp_mfnposi_tl {left}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{sidebar~left}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+\usebeamertemplate*{mini~nav~progress~left}
+}{}
+}
+}
+},
+mini~frames~nav~position / right .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\tl_set:Nn \l__gotham_out_tmp_mfnposi_tl {right}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{sidebar~right}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+\usebeamertemplate*{mini~nav~progress~right}
+}{}
+}
+}
+},
+
+mini~frames~nav~position / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'mini~frames~nav~position',~so~being~ignored. }{helping~message: mini~frames~nav~position / unknown} },
+}
+
+%%% Progress bar %%%
+
+%%%%%%
+\newlength{\gotham@progressinheadfoot}
+\newlength{\gothamProgressHeadFootLineheight}
+\setlength{\gothamProgressHeadFootLineheight}{1.2ex}
+
+%%%%%%
+\bool_new:N \l_gotham_ProgCircleMoving_bool
+\bool_set_true:N \l_gotham_ProgCircleMoving_bool
+
+\bool_new:N \l_gotham_progbar_advancement_tlbr_bool
+\bool_set_true:N \l_gotham_progbar_advancement_tlbr_bool
+
+\bool_new:N \l_gotham_pmfn_bool
+\bool_set_false:N \l_gotham_pmfn_bool
+
+\cs_new_protected:Npn \__gotham_rectangle_box_progressbar:n #1
+{
+\setlength{\gotham@progressinheadfoot}{
+#1 * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+
+\begin{beamercolorbox}[wd=#1]{progress~bar~in~head/foot}
+\begin{tikzpicture}
+\usebeamercolor{progress~bar~in~head/foot}
+
+\fill[color=progress~bar~in~head/foot.bg]
+(0pt, 0pt) rectangle ++ (#1, \gothamProgressHeadFootLineheight)
+;
+
+\bool_if:NTF \l_gotham_progbar_advancement_tlbr_bool {
+\fill[color=progress~bar~in~head/foot.fg]
+(0pt, 0pt) rectangle ++ (\gotham@progressinheadfoot, \gothamProgressHeadFootLineheight)
+;
+}{
+\fill[color=progress~bar~in~head/foot.fg]
+(#1, \gothamProgressHeadFootLineheight) rectangle ++ (-\gotham@progressinheadfoot, -\gothamProgressHeadFootLineheight)
+;
+}
+
+\bool_if:NTF \l_gotham_pmfn_bool {
+\node at (#1/2, \gothamProgressHeadFootLineheight/2)
+[text~height=0.1pt, text~depth=0.05pt, inner~sep=0pt] %draw=red,
+{
+\usebeamercolor[fg]{normal~text}
+\raisebox{0.5\gothamProgressHeadFootLineheight+1.4pt}[0pt][0pt]{
+\hfuzz=#1
+\insertnavigation{#1}
+}
+}
+;
+}{
+}
+\end{tikzpicture}
+\end{beamercolorbox}
+}
+
+\defbeamertemplate{progress~bar~in~head/foot}{gotham~rectangle}{
+\nointerlineskip
+\__gotham_rectangle_box_progressbar:n {\paperwidth}
+}
+
+\defbeamertemplate{progress~bar~in~left}{gotham~rectangle}{
+\nointerlineskip
+
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-0.25\baselineskip}
+
+\vspace{0.12275\paperheight}
+\rotatebox{90}{
+\__gotham_rectangle_box_progressbar:n {\gotham@temp@PaperheightFrametitle}
+}
+}
+\defbeamertemplate{progress~bar~in~right}{gotham~rectangle}{
+\nointerlineskip
+
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-0.25\baselineskip}
+
+\hspace{-\gothamProgressHeadFootLineheight}
+\vspace{\gotham@temp@heightFrametitle-27.75pt}
+\rotatebox{-90}{
+\__gotham_rectangle_box_progressbar:n {\gotham@temp@PaperheightFrametitle}
+}
+}
+
+\cs_new_protected:Npn \__gotham_rounded_box_progressbar:nnnn #1#2#3#4
+{
+\setlength{\gotham@progressinheadfoot}{
+#2#1 * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}
+}
+
+\begin{beamercolorbox}[wd=#1, ht=1.035\gothamProgressHeadFootLineheight]{#3}
+\;\hfill
+\begin{tikzpicture}[rounded~corners=0.5\gothamProgressHeadFootLineheight, very~thin]
+\usebeamercolor{progress~bar~in~head/foot}
+
+\shade[top~color=progress~bar~in~head/foot.bg!65, bottom~color=progress~bar~in~head/foot.bg!65, middle~color=progress~bar~in~head/foot.bg]
+(0pt, 0pt) rectangle ++ (#2#1, \gothamProgressHeadFootLineheight)
+;
+
+\bool_if:NTF \l_gotham_progbar_advancement_tlbr_bool {
+\shade[draw=progress~bar~in~head/foot.fg, top~color=progress~bar~in~head/foot.fg!70, bottom~color=progress~bar~in~head/foot.fg!70, middle~color=progress~bar~in~head/foot.fg]
+(0pt, 0pt) rectangle ++ (\gotham@progressinheadfoot, \gothamProgressHeadFootLineheight)
+;
+}{
+\shade[draw=progress~bar~in~head/foot.fg, top~color=progress~bar~in~head/foot.fg!70, bottom~color=progress~bar~in~head/foot.fg!70, middle~color=progress~bar~in~head/foot.fg]
+(#2#1, \gothamProgressHeadFootLineheight) rectangle ++ (-\gotham@progressinheadfoot, -\gothamProgressHeadFootLineheight)
+;
+}
+
+\bool_if:NTF \l_gotham_pmfn_bool {
+\node at (#2#1/2, \gothamProgressHeadFootLineheight/2)
+[text~height=0.1pt, text~depth=0.05pt, inner~sep=0pt] %draw=red,
+{
+\usebeamercolor[fg]{normal~text}
+\raisebox{0.5\gothamProgressHeadFootLineheight+1.4pt}[0pt][0pt]{
+\hfuzz=#2#1
+\insertnavigation{#2#1}
+}
+}
+;
+}{
+}
+\end{tikzpicture}
+#4
+\hfill \;
+\end{beamercolorbox}
+}
+
+\defbeamertemplate{progress~bar~in~head/foot}{gotham~rounded~box}{
+\nointerlineskip
+\__gotham_rounded_box_progressbar:nnnn {\paperwidth}{0.93}{footline}{
+\hfill
+\raisebox{0.5\gothamProgressHeadFootLineheight-1.75pt}[0pt][0pt]{
+\fontsize{5pt}{0pt}\selectfont
+\usebeamercolor[fg]{normal~text}
+\fp_eval:n {round(\insertframenumber*100/\inserttotalframenumber,0)}\,\%
+}
+}
+}
+
+\defbeamertemplate{progress~bar~in~left}{gotham~rounded~box}{
+\nointerlineskip
+
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-0.25\baselineskip}
+
+\vspace{0.12275\paperheight}
+\rotatebox{90}{
+\__gotham_rounded_box_progressbar:nnnn {\gotham@temp@PaperheightFrametitle}{0.89}{footline}{
+\hfill
+\raisebox{0.5\gothamProgressHeadFootLineheight-1.75pt}[0pt][0pt]{
+\fontsize{5pt}{0pt}\selectfont
+\fp_eval:n {round(\insertframenumber*100/\inserttotalframenumber,0)}\,\%
+}
+}
+}
+}
+\defbeamertemplate{progress~bar~in~right}{gotham~rounded~box}{
+\nointerlineskip
+
+\settoheight{\gotham@temp@heightFrametitle}{\gotham@strut}
+\addtolength{\gotham@temp@heightFrametitle}{\gotham@frametitle@toppadding+\gotham@frametitle@bottompadding+\gothamProgressHeadFootLineheight}
+
+\setlength{\gotham@temp@PaperheightFrametitle}{\paperheight-\gotham@temp@heightFrametitle-\gothamFootlineHeight-\gothamFootlineDepth-0.25\baselineskip}
+
+\hspace{-\gothamProgressHeadFootLineheight-0.2pt}
+\vspace{\gotham@temp@heightFrametitle-27.75pt}
+\rotatebox{-90}{
+\__gotham_rounded_box_progressbar:nnnn {\gotham@temp@PaperheightFrametitle}{0.89}{footline}{
+\hfill
+\raisebox{0.5\gothamProgressHeadFootLineheight-1.75pt}[0pt][0pt]{
+\fontsize{5pt}{0pt}\selectfont
+\fp_eval:n {round(\insertframenumber*100/\inserttotalframenumber,0)}\,\%
+}
+}
+}
+}
+
+%%%%%%
+\newlength{\gothamProgressCircHeight}
+\setlength{\gothamProgressCircHeight}{1.8\baselineskip}
+\newlength{\gothamCounterCircleRadius}
+\setlength{\gothamCounterCircleRadius}{1.12ex}
+\newlength{\gothamProgressCircBorderWidth}
+\setlength{\gothamProgressCircBorderWidth}{1.65mm}
+
+%% Induced length used internally, but can still be tuned manually by inspired people.
+\newlength{\gothamProgressCircLogoRadius}
+\setlength{\gothamProgressCircLogoRadius}{1.2\gothamProgressCircHeight/2}
+\newlength{\gothamProgressCircLogoInnerRadius}
+\setlength{\gothamProgressCircLogoInnerRadius}{1.1\gothamProgressCircLogoRadius}
+\newlength{\gothamProgressCircLogoOuterRadius}
+\setlength{\gothamProgressCircLogoOuterRadius}{\gothamProgressCircLogoInnerRadius+\gothamProgressCircBorderWidth}
+\newlength{\gothamCounterRadius}
+\setlength{\gothamCounterRadius}{\gothamProgressCircLogoInnerRadius/2+\gothamProgressCircLogoOuterRadius/2}
+
+\fp_new:N \l_gotham_ratio_progresscircle_fp
+\fp_new:N \l_gotham_angle_counterradius_fp
+\fp_set:Nn \l_gotham_angle_counterradius_fp {
+\fpeval{ 2* asind (\gothamCounterCircleRadius / (2*\gothamCounterRadius)) }
+}
+
+%%%%%%
+\newcommand{\gothamInstituteLogoCircle}[1][4ex]{
+\includegraphics[height=#1]{gotham-logo.pdf}
+}
+
+\newcommand{\gothamProgressCircle}{
+\begin{tikzpicture}[remember~picture,overlay]
+\usebeamercolor{standin}
+\usebeamercolor{frametitle}
+\usebeamercolor{progress~bar~in~head/foot}
+
+\coordinate (localCenter);
+ \fill[fill=progress~bar~in~head/foot.bg] (localCenter) circle (\gothamProgressCircLogoOuterRadius);
+ % draw the inner circle
+ \fill[fill=frametitle.bg] (localCenter) circle (\gothamProgressCircLogoInnerRadius);
+\node at (localCenter) {\gothamInstituteLogoCircle[1.9\gothamProgressCircLogoRadius]};
+
+%% draw progress circle/bar
+\bool_if:NTF \l_gotham_ProgCircleMoving_bool {
+
+%% compute the angle for the progress circle
+\bool_if:NTF \l_gotham_progbar_advancement_tlbr_bool {
+\fp_set:Nn \l_gotham_ratio_progresscircle_fp {-(360)*\insertframenumber/\inserttotalframenumber }
+}{
+\fp_set:Nn \l_gotham_ratio_progresscircle_fp {(360)*(\insertframenumber/\inserttotalframenumber)}
+}
+
+\draw[
+color=progress~bar~in~head/foot.fg,
+line~width=0.6*\gothamProgressCircBorderWidth
+]
+(localCenter)
+++
+([
+xshift=\gothamCounterRadius
+]localCenter)
+arc[
+radius=\gothamCounterRadius,
+start~angle=0,
+end~angle={\fp_eval:n \l_gotham_ratio_progresscircle_fp}
+]
+;
+
+\fill[fill=frametitle.bg]
+([
+xshift={\gothamCounterRadius}
+]localCenter.center)
+circle (0.3*\gothamProgressCircBorderWidth)
+;
+\node[
+]
+(pagenumframe) at (
+[rotate=
+{\fp_eval:n {\l_gotham_ratio_progresscircle_fp}},
+xshift=\gothamCounterRadius
+]localCenter) {}
+;
+\filldraw[
+draw=progress~bar~in~head/foot.bg,
+fill=standin.bg,
+thick,
+]
+(pagenumframe) circle (\gothamCounterCircleRadius)
+;
+\node[at=(pagenumframe.center), anchor=center] {
+{\usebeamercolor[fg]{standin}\tiny\insertframenumber}
+};
+}{
+
+%% compute the angle for the progress circle
+\bool_if:NTF \l_gotham_progbar_advancement_tlbr_bool {
+\fp_set:Nn \l_gotham_ratio_progresscircle_fp {-(360-2\l_gotham_angle_counterradius_fp)*\insertframenumber/\inserttotalframenumber -\l_gotham_angle_counterradius_fp}
+}{
+\fp_set:Nn \l_gotham_ratio_progresscircle_fp {(360-2\l_gotham_angle_counterradius_fp)*(\insertframenumber/\inserttotalframenumber) +\l_gotham_angle_counterradius_fp}
+}
+
+\draw[
+color=progress~bar~in~head/foot.fg,
+line~width=0.6*\gothamProgressCircBorderWidth
+]
+(localCenter)
+++
+([rotate={\fp_eval:n {\l_gotham_angle_counterradius_fp}},
+xshift=\gothamCounterRadius
+]localCenter)
+arc[
+radius=\gothamCounterRadius,
+start~angle={\fp_eval:n \l_gotham_angle_counterradius_fp},
+end~angle={\fp_eval:n \l_gotham_ratio_progresscircle_fp}
+]
+;
+
+\fill[fill=frametitle.bg]
+([
+rotate={\fp_eval:n {\l_gotham_ratio_progresscircle_fp}}, xshift={\gothamCounterRadius}
+]localCenter.center)
+circle (0.3*\gothamProgressCircBorderWidth)
+;
+\node[] (leftick)
+at ([xshift={\gothamProgressCircLogoOuterRadius+1.25ex}]localCenter) {}
+;
+%% draw a line ticks
+\draw[
+color=frametitle.fg,
+fill=frametitle.fg,
+]
+([xshift=\gothamProgressCircLogoOuterRadius,yshift={-0.05ex}] localCenter)
+rectangle ([yshift={0.05ex}] leftick)
+;
+\node[ at=(leftick), anchor=west, inner~sep = 1pt,]
+{\usebeamercolor[fg]{frametitle}\tiny\inserttotalframenumber}
+;
+\node[
+]
+(pagenumframe) at ([xshift=\gothamCounterRadius]localCenter) {}
+;
+\filldraw[
+draw=progress~bar~in~head/foot.bg,
+fill=standin.bg,
+thick,
+]
+(pagenumframe) circle (\gothamCounterCircleRadius)
+;
+\node[at=(pagenumframe.center), anchor=center] {
+{\usebeamercolor[fg]{standin}\tiny\insertframenumber}
+};
+}
+\end{tikzpicture}
+\bool_if:NTF \l_gotham_ProgCircleMoving_bool {
+\hspace{\gothamProgressCircLogoOuterRadius+0.75ex}
+}{
+\hspace{\gothamProgressCircLogoOuterRadius+3ex}
+}
+ % \tikzexternalenable
+}
+
+%%%%
+\tl_new:N \l__gotham_out_tmp_pbar_tl
+\keys_define:nn { gotham / outer }{
+progressbar~position .choice:,
+progressbar~position .usage:n = { general },
+progressbar~position .default:n = { none },
+
+progressbar~position / none .code:n = {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {none}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\__gotham_set_prop_template:nn{includeLogo/default}{gotham~square}
+\setbeamertemplate{section~in~head/foot~shaded}[default/\prop_item:Nn \l__gotham_template_name_prop {section~in~head/foot~shaded/default}]
+\setbeamertemplate{section~in~head/foot}[default/\prop_item:Nn \l__gotham_template_name_prop {section~in~head/foot/default}]
+},
+progressbar~position / head .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {head}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{headline}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {head} {
+\usebeamertemplate*{progress~bar~in~head/foot}
+}{}
+}
+}
+},
+progressbar~position / frametitle .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {frametitle} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {frametitle}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{frametitle}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {frametitle} {
+\usebeamertemplate*{progress~bar~in~head/foot}
+}{}
+}
+}
+},
+progressbar~position / foot .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {footline}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{footline}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {footline} {
+\usebeamertemplate*{progress~bar~in~head/foot}
+}{}
+}
+}
+},
+progressbar~position / circlehead .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {circlehead} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {circlehead}
+
+%%%\prop_put:Nnn \l__gotham_template_name_SAVE_prop {includeLogo/default} {gotham~square} % not needed after all.
+\__gotham_set_prop_template:nn{includeLogo/default}{gotham~circle}
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/gotham~secSubsec}
+\__gotham_set_template:nn{section~in~head/foot}{default/gotham~secSubsec}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+\addtobeamertemplate{headline}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {circlehead} {
+\begin{beamercolorbox}[wd=1.0\paperwidth, ht=2.5ex, dp=1.4ex, left]{headfoot}
+\usebeamerfont{section~in~head/foot}\hspace*{3.5ex}
+\usebeamertemplate{section~in~head/foot}
+\end{beamercolorbox}
+}{}
+}
+}{
+\__gotham_set_template:nn{headline}{default/gotham~section}
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+}
+},
+progressbar~position / left .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {left}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{sidebar~left}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {left} {
+\usebeamertemplate*{progress~bar~in~left}
+}{}
+}
+}
+},
+progressbar~position / right .code:n = {
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+} {
+\tl_set:Nn \l__gotham_out_tmp_pbar_tl {right}
+
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {head} {
+}{
+\setbeamertemplate{headline}[default/\prop_item:Nn \l__gotham_template_name_prop {headline/default}]
+}
+\setbeamertemplate{frametitle}[default/\prop_item:Nn \l__gotham_template_name_prop {frametitle/default}]
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {foot} {
+}{
+\setbeamertemplate{footline}[default/\prop_item:Nn \l__gotham_template_name_prop {footline/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {left} {
+}{
+\setbeamertemplate{sidebar~left}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~left/default}]
+}
+\tl_if_eq:VnTF \l__gotham_out_tmp_mfnposi_tl {right} {
+}{
+\setbeamertemplate{sidebar~right}[default/\prop_item:Nn \l__gotham_template_name_prop {sidebar~right/default}]
+}
+
+\addtobeamertemplate{sidebar~right}{}{
+\tl_if_eq:VnTF \l__gotham_out_tmp_pbar_tl {right} {
+\usebeamertemplate*{progress~bar~in~right}
+}{}
+}
+}
+},
+
+progressbar~position / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'progressbar~position',~so~being~ignored. }{helping~message: progressbar~position / unknown} },
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+progressbar~style .choice:,
+progressbar~style .usage:n = { general },
+progressbar~style .default:n = { rectangle },
+
+progressbar~style / rectangle .code:n = {
+\__gotham_set_template:nn{progress~bar~in~head/foot}{gotham~rectangle}
+\__gotham_set_template:nn{progress~bar~in~left}{gotham~rectangle}
+\__gotham_set_template:nn{progress~bar~in~right}{gotham~rectangle}
+},
+
+progressbar~style / rounded~box .code:n = {
+\__gotham_set_template:nn{progress~bar~in~head/foot}{gotham~rounded~box}
+\__gotham_set_template:nn{progress~bar~in~left}{gotham~rounded~box}
+\__gotham_set_template:nn{progress~bar~in~right}{gotham~rounded~box}
+},
+
+progressbar~style / moving~circle .code:n = {
+\bool_set_true:N \l_gotham_ProgCircleMoving_bool
+},
+
+progressbar~style / fixed~circle .code:n = {
+\bool_set_false:N \l_gotham_ProgCircleMoving_bool
+},
+
+progressbar~style / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'progressbar~style',~so~being~ignored. }{helping~message: progressbar~style / unknown} },
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+progressbar~advancement .choice:,
+progressbar~advancement .usage:n = { general },
+progressbar~advancement .default:n = { tlbr },
+
+progressbar~advancement / tlbr .code:n = {
+\bool_set_true:N \l_gotham_progbar_advancement_tlbr_bool
+},
+progressbar~advancement / TLBR .code:n = {
+\bool_set_true:N \l_gotham_progbar_advancement_tlbr_bool
+},
+
+progressbar~advancement / brlt .code:n = {
+\bool_set_false:N \l_gotham_progbar_advancement_tlbr_bool
+},
+progressbar~advancement / BRLT .code:n = {
+\bool_set_false:N \l_gotham_progbar_advancement_tlbr_bool
+},
+
+progressbar~advancement / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'progressbar~advancement',~so~being~ignored. }{helping~message: progressbar~advancement / unknown} },
+}
+
+%%%%
+\keys_define:nn { gotham / outer }{
+progressbar~mfn .choice:,
+progressbar~mfn .usage:n = { general },
+progressbar~mfn .default:n = { off },
+
+progressbar~mfn / true .code:n = {
+\bool_set_true:N \l_gotham_pmfn_bool
+
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/empty}
+\__gotham_set_template:nn{section~in~head/foot}{default/empty}
+\renewcommand{\gothamPatchSectionbox}{
+\ht\beamer@sectionbox=0.ex
+\dp\beamer@sectionbox=0.ex
+}
+},
+progressbar~mfn / on .code:n = {
+\bool_set_true:N \l_gotham_pmfn_bool
+
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/empty}
+\__gotham_set_template:nn{section~in~head/foot}{default/empty}
+\renewcommand{\gothamPatchSectionbox}{
+\ht\beamer@sectionbox=0.ex
+\dp\beamer@sectionbox=0.ex
+}
+},
+progressbar~mfn / enable .code:n = {
+\bool_set_true:N \l_gotham_pmfn_bool
+
+\__gotham_set_template:nn{section~in~head/foot~shaded}{default/empty}
+\__gotham_set_template:nn{section~in~head/foot}{default/empty}
+\renewcommand{\gothamPatchSectionbox}{
+\ht\beamer@sectionbox=0.ex
+\dp\beamer@sectionbox=0.ex
+}
+},
+
+progressbar~mfn / false .code:n = { \bool_set_false:N \l_gotham_pmfn_bool },
+progressbar~mfn / off .code:n = { \bool_set_false:N \l_gotham_pmfn_bool },
+progressbar~mfn / disable .code:n = { \bool_set_false:N \l_gotham_pmfn_bool },
+
+progressbar~mfn / unknown .code:n = { \PackageWarning{ gotham } { The~choice~'#1'~is~unknown~for~the~(known)~option~'progressbar~mfn',~so~being~ignored. }{helping~message: progressbar~mfn / unknown} },
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\keys_set:nn { gotham / outer } {
+sidebar~canvas~right~template, sidebar~canvas~left~template,
+edging~default,
+frametitle~template, framesubtitle~template, frametitle~continuation~template,
+numbering,
+rotateFooter~default,
+footer~template,
+mini~frames~shape, mini~frames~bundle,
+mini~frames~compress,
+mini~frames~nav~spreading,
+mini~frames~nav~sectioning,
+mini~frames~nav~position,
+progressbar~position, progressbar~style, progressbar~advancement, progressbar~mfn,
+}
+
+\ProcessKeyOptions[ gotham / outer ]
+
+%%
+%% Adapted from classic "A model .dtx file" by Joseph Wright
+%% https://www.texdev.net/2009/10/06/a-model-dtx-file/
+%%
+%% End of file `beamerouterthemegotham.sty'.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty
new file mode 100644
index 00000000000..d430da2c568
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-gotham/beamerthemegotham.sty
@@ -0,0 +1,173 @@
+%%
+%% This is file `beamerthemegotham.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gotham.dtx (with options: `package')
+%%
+%% Copyright (C) 2023-20** by Romain NOËL <romainoel@free.fr>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Romain NOËL.
+%% Contributors: Romain NOËL (2023-20**)
+%%
+\ProvidesExplPackage{beamerthemegotham}{2024/09/20}{1.1.0.b}{A modern, minimal-ish, versatile and extendable yet robust theme for Beamer}
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% PACKAGE %%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand\ifratio[3]{%
+\ifnum#1=169%
+\ifdim\beamer@paperwidth=16.00cm\relax%
+\ifdim\beamer@paperheight=9.00cm\relax%
+#2%
+\else%
+#3%
+\fi%
+\else%
+#3%
+\fi%
+\else%
+\ifnum#1=43%
+\ifdim\beamer@paperwidth=12.80cm\relax%
+\ifdim\beamer@paperheight=9.60cm\relax%
+#2%
+\else%
+#3%
+\fi%
+\else%
+#3%
+\fi%
+\fi%
+\fi%
+}
+\providecommand\ifscreenratio[2]{%
+\ifdim\beamer@paperwidth=16.00cm\relax%
+\ifdim\beamer@paperheight=9.00cm\relax%
+#1%
+\fi%
+\fi%
+\ifdim\beamer@paperwidth=12.80cm\relax%
+\ifdim\beamer@paperheight=9.60cm\relax%
+#2%
+\fi%
+\fi%
+}
+
+\usefonttheme{gotham}
+\usecolortheme{gotham}
+\useinnertheme{gotham}
+\useoutertheme{gotham}
+
+%%%%% Setting keys %%%%%
+
+\int_new:N \l_gotham_lookup_cnt
+\int_set:Nn \l_gotham_lookup_cnt {0}
+
+\seq_const_from_clist:Nn \c__gotham_load_submodules_seq { font, color, inner, outer }
+
+\cs_new_protected:Npn \__gotham_lookup_keymodules:nn #1#2
+{
+\int_incr:N \l_gotham_lookup_cnt
+
+\if_int_compare:w \l_gotham_lookup_cnt < 2
+\else:
+\seq_map_inline:Nn \c__gotham_load_submodules_seq
+{
+\keys_if_exist:nnT { gotham / ##1 } {#1}
+{
+\tl_if_empty:nTF {#2}
+{ \keys_set:nn { gotham / ##1 } { #1 } }
+{ \keys_set:nn { gotham / ##1 } { #1 = {#2} } }
+\prg_break:
+}
+}
+\msg_error:nnn { gotham } { unknown-key } {#1}
+\prg_break_point:
+\fi:
+}
+\cs_generate_variant:Nn \__gotham_lookup_keymodules:nn { Vn }
+\msg_new:nnn { gotham } { unknown-key } { Unknown~ key~ #1~ encountered. }
+
+\prop_new:N \l__gotham_all_all_user_keys_prop
+\prop_const_from_keyval:Nn \c__gotham_all_pkg_keys_prop {}
+
+\keys_define:nn { gotham / all / all }
+{
+unknown .code:n =
+{\__gotham_lookup_keymodules:Vn \l_keys_key_str {#1}}
+}
+
+\cs_new_protected:Npn \__gotham_set_default_from_keyval:nnn #1 #2 #3
+{ %%
+\tl_if_novalue:nTF {#2}
+{ % no user keys given so _user_keys_prop is taking pkg prop
+\prop_set_eq:cc { l__gotham_#3_#1_user_keys_prop } { c__gotham_#3_pkg_keys_prop }
+}{ % user key given and put it in prop
+\prop_put_from_keyval:cn { l__gotham_#3_#1_user_keys_prop } {#2}
+}% end if
+\__gotham_set_default_auxi:cnn { l__gotham_#3_#1_user_keys_prop } {#1} {#3}
+\keys_set:nn { gotham/#3/#1 } { default }
+}
+\cs_new_protected:Npn \__gotham_set_default_auxi:Nnn #1 #2 #3
+{
+\__gotham_set_default_auxii:fnn { \prop_to_keyval:N #1 } {#2} {#3}
+}
+\cs_generate_variant:Nn \__gotham_set_default_auxi:Nnn { c }
+\cs_new_protected:Npn \__gotham_set_default_auxii:nnn #1 #2 #3
+{
+\keys_define:nn { gotham/#3/#2 } { default .meta:n = {#1} }
+}
+\cs_generate_variant:Nn \__gotham_set_default_auxii:nnn { f }
+\DeclareDocumentCommand{\gothamset}{ m }
+{
+\__gotham_set_default_from_keyval:nnn { all } {#1} { all }
+\keys_set:nn { gotham/all/all } { default }
+}
+
+\def\gotham@plaintitleformat#1{#1}
+\newcommand{\mreducelistspacing}{\vspace{-\topsep}}
+
+\ProcessOptionsBeamer
+\keys_define:nn { gotham / font }
+{
+unknown .code:n =
+{\__gotham_lookup_keymodules:Vn \l_keys_key_str {#1}}
+}
+\keys_define:nn { gotham / color }
+{
+unknown .code:n =
+{\__gotham_lookup_keymodules:Vn \l_keys_key_str {#1}}
+}
+\keys_define:nn { gotham / inner }
+{
+unknown .code:n =
+{\__gotham_lookup_keymodules:Vn \l_keys_key_str {#1}}
+}
+\keys_define:nn { gotham / outer }
+{
+unknown .code:n =
+{\__gotham_lookup_keymodules:Vn \l_keys_key_str {#1}}
+}
+
+\ProcessKeyOptions[ gotham / font ]
+\ProcessKeyOptions[ gotham / color ]
+\ProcessKeyOptions[ gotham / inner ]
+\ProcessKeyOptions[ gotham / outer ]
+
+%%
+%% Adapted from classic "A model .dtx file" by Joseph Wright
+%% https://www.texdev.net/2009/10/06/a-model-dtx-file/
+%%
+%% End of file `beamerthemegotham.sty'.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-tcolorbox/beamerinnerthemetcolorbox.sty b/Master/texmf-dist/tex/latex/beamertheme-tcolorbox/beamerinnerthemetcolorbox.sty
index 9469f0591ef..1a2af1a6d84 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-tcolorbox/beamerinnerthemetcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-tcolorbox/beamerinnerthemetcolorbox.sty
@@ -1,4 +1,4 @@
-% !TeX root = test.tex
+% !TeX root = ./testing/test.tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% The tcolorbox inner theme
@@ -9,10 +9,10 @@
% https://github.com/samcarter/beamertheme-tcolorbox
%
% Released under the LaTeX Project Public License v1.3c or later
-% See http://www.latex-project.org/lppl.txt
+% See https://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{beamerinnerthemetcolorbox}[2024/04/29 version v0.7 Beamer blocks with tcolorboxes]
+\ProvidesPackage{beamerinnerthemetcolorbox}[2024/09/23 version v0.8 Beamer blocks with tcolorboxes]
\RequirePackage{tcolorbox}
\tcbuselibrary{skins,hooks}
@@ -197,11 +197,11 @@
\ifbeamer@tcb@blocks
\setbeamertemplate{block begin}{\begin{beamer@tcb@block}}
- \setbeamertemplate{block end}{\end{beamer@tcb@block}}
+ \setbeamertemplate{block end}{\onslide<1->\end{beamer@tcb@block}}
\setbeamertemplate{block alerted begin}{\begin{beamer@tcb@block}[ alerted]}
- \setbeamertemplate{block alerted end}{\end{beamer@tcb@block}}
+ \setbeamertemplate{block alerted end}{\onslide<1->\end{beamer@tcb@block}}
\setbeamertemplate{block example begin}{\begin{beamer@tcb@block}[ example]}
- \setbeamertemplate{block example end}{\end{beamer@tcb@block}}
+ \setbeamertemplate{block example end}{\onslide<1->\end{beamer@tcb@block}}
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/berenisadf/berenis.sty b/Master/texmf-dist/tex/latex/berenisadf/berenis.sty
index 7d855d25614..ff3c9d9471c 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/berenis.sty
+++ b/Master/texmf-dist/tex/latex/berenisadf/berenis.sty
@@ -1,161 +1,193 @@
-%% Copyright 2013 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `berenis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `sty')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{berenis}[2013/11/20 v2.0 berenis]
-\RequirePackage{xkeyval}
-\RequirePackage{nfssext-cfr}
-\newif\ifberenis@ly
-%:boolkeys for ligature/swash encoding as default
-\define@boolkey{berenis.sty}[berenis@]{lig}[true]{%
- \ifberenis@lig
- \def\berenis@lig{w}%
- \def\berenis@enc{LY1}%
- \berenis@lytrue
- \else
- \def\berenis@lig{}%
- \berenis@lyfalse
- \fi}
-%:boolkeys for roman osf/lf
-\define@boolkey{berenis.sty}[berenis@]{osf}[true]{%
- \ifberenis@osf
- \def\berenis@lfosf{j}%
- \else
- \def\berenis@lfosf{}%
- \fi}
-\define@boolkey{berenis.sty}[berenis@]{lf}[true]{%
- \ifberenis@lf
- \def\berenis@lfosf{}%
- \else
- \def\berenis@lfosf{j}%
- \fi}
-%:boolkeys for roman prop/tab
-\define@boolkey{berenis.sty}[berenis@]{prop}[true]{%
- \ifberenis@prop
- \def\berenis@tabprop{2}%
- \else
- \def\berenis@tabprop{}%
- \fi}
-\define@boolkey{berenis.sty}[berenis@]{tab}[true]{%
- \ifberenis@tab
- \def\berenis@tabprop{}%
- \else
- \def\berenis@tabprop{2}%
- \fi}
-\define@boolkey{berenis.sty}[berenis@]{lm}[true]{%
- \ifberenis@lm
- \relax
- \else
- \PackageWarning{berenis.sty}{%
- Default sf and tt families will not\MessageBreak
- be changed to Latin Modern.\MessageBreak
- If you use the LY1 font encoding, \MessageBreak
- you should change the defaults\MessageBreak
- yourself since Computer Modern\MessageBreak
- does not support LY1.\MessageBreak}%
- \fi}
-\define@choicekey*+{berenis.sty}{enc}[\benc\bencno]{ly1,t1}{%
- \ifcase\bencno\relax
- \def\berenis@enc{LY1}%
- \berenis@lytrue
- \or
- \def\berenis@enc{T1}%
- \def\berenis@lig{}%
- \berenis@lyfalse
- \fi}{%
- \PackageWarning{berenis.sty}{#1 is not a supported font encoding. Please see the package documentation for details.}%
- }%
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{lig=false,osf=true,prop=true,lm=true,enc=ly1}
-%:options override defaults
-\ProcessOptionsX
-\RequirePackage[\berenis@enc]{fontenc}
-%:make BerenisADFPro default roman font, implementing options for ligature/swash encoding and lf/osf as applicable
-\renewcommand{\rmdefault}{ybd\berenis@tabprop\berenis@lfosf\berenis@lig}
-\ifberenis@lm
- \renewcommand{\sfdefault}{lmss}
- \renewcommand{\ttdefault}{lmtt}
-\fi
-\newcommand*{\berenis@rhybudd}[2]{\PackageWarning{berenis.sty}{#1 unavailable.\MessageBreak #2 used instead.\MessageBreak}}%
-%:based on definition of \ss from afm2pl manual page
-\def\zeroslash{%
- \ifberenis@ly
- \setbox0\hbox{\char184}%
- \setbox1\hbox{\char24}%
- \ifnum\wd0=\wd1 \char48\berenis@rhybudd{slashed zero}{zero}\else\ifnum\wd0=0 \char48\berenis@rhybudd{slashed zero}{zero}\else\char184\fi\fi
- \else
- \char48\berenis@rhybudd{slashed zero}{zero}%
- \fi}
-%:experiment: even if this works, it is a horrible kludge
-%\gdef\berenis@ligswash{w}%
-%\def\berenis@Q{ Q}%
-%\def\berenis@get@vff#1#2#3#4\@nil{#1#2#3}%
-%\def\berenis@get@variants ybd#1\@nil{#1}%
-%\def\berenis@cyntaf@variant#1#2\@nil{#1}%
-%\def\berenis@ail@variant#1#2\@nil{#2}%
-%\newcommand*{\berenis@variants}[1]{%
-% \edef\tempz{#1}%
-% \def\tempe{}%
-% \ifx\tempz\tempe
-% \gdef\berenis@olaf{}%
-% \else
-% \edef\tempb{\expandafter\berenis@cyntaf@variant#1 Q\@nil}%
-% \edef\tempc{\expandafter\berenis@ail@variant#1 Q\@nil}%
-% \edef\tempd{\expandafter\berenis@ail@variant#1\@nil}%
-% \ifx\tempc\berenis@Q \gdef\berenis@olaf{\tempb}\else\berenis@variants{\tempd}\fi
-% \fi
-% }
-%\newcommand*{\berenis@teulu}{%
-% \edef\tempf{\expandafter\berenis@get@vff\f@family\@nil}%
-% \def\tempybd{ybd}%
-% \ifx\tempf\tempybd
-% \edef\tempa{\expandafter\berenis@get@variants\f@family\@nil}%
-% \berenis@variants{\tempa}%
-% \else
-% \gdef\berenis@olaf{}%
-% \fi}
-% Get proper tai bach for W, w, Y, y (Ideally would set further stuff but these are the most problematic.
-% In version 1.0, this only worked in the swash variants. In version 2.0, it works for any LY1 encoding.
-% The cost is some of the non-fancy non-standard ligatures and the boundary character in the non-swash variants.
-\ifberenis@ly
- \DeclareTextCompositeCommand{\^}{LY1}{W}{%
-% \berenis@teulu
-% \edef\tempx{\berenis@ligswash}%
-% \edef\tempy{\berenis@olaf}%
-% \ifx\tempx\tempy \char9 \else\accent94\char87\fi
- \char9}
- \DeclareTextCompositeCommand{\^}{LY1}{w}{%
-% \berenis@teulu
-% \edef\tempx{\berenis@ligswash}%
-% \edef\tempy{\berenis@olaf}%
-% \ifx\tempx\tempy \char3 \else\accent94\char119\fi
- \char3}
- \DeclareTextCompositeCommand{\^}{LY1}{Y}{%
-% \berenis@teulu
-% \edef\tempx{\berenis@ligswash}%
-% \edef\tempy{\berenis@olaf}%
-% \ifx\tempx\tempy \char10 \else\accent94\char89\fi
- \char10}
- \DeclareTextCompositeCommand{\^}{LY1}{y}{%
-% \berenis@teulu
-% \edef\tempx{\berenis@ligswash}%
-% \edef\tempy{\berenis@olaf}%
-% \ifx\tempx\tempy \char13 \else\accent94\char121\fi
- \char13}
-\else
- \RequirePackage{textcomp}
-\fi
-\endinput
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[berenis.sty]{$Id: berenisadf.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v2.1 \revinfo]
+\DefineFileInfoSVN[berenis]
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\ExplSyntaxOn
+\msg_new:nnn { berenis } { unknown-choice }
+{ % name of choice; valid choices; invalid choice given
+ berenis ~::~#1:~\msg_line_context:~#3~is~not~a~supported~font~encoding.~
+ Valid~choices~are~#2.~
+ Please~see~documentation~for~details.
+}
+\msg_new:nnn { berenis } { unavailable }% what; substitute
+{
+ berenis ~::~#1:~\msg_line_context:~#1~unavailable. ~
+ #2~used~instead.
+}
+\keys_define:nn { berenis }
+{
+ enc .choice:,
+ enc .choices:nn = { ly1, LY1, t1, T1 }
+ {
+ \int_case:nn { \l_keys_choice_int }
+ {
+ { 1 } { \tl_gset:Nn \g__berenis_enc_tl { LY1 } }
+ { 2 } { \tl_gset:Nn \g__berenis_enc_tl { LY1 } }
+ { 3 } { \tl_gset:Nn \g__berenis_enc_tl { T1 } }
+ { 4 } { \tl_gset:Nn \g__berenis_enc_tl { T1 } }
+ }
+ },
+ enc / unknown .code:n = {
+ \msg_error:nneee { berenis } { unknown-choice }
+ { enc }
+ { ly1 , LY1 , t1, T1 }
+ { \exp_not:n {#1} }
+ },
+ enc .initial:n = ly1,
+ lig .bool_gset:N = \g__berenis_lig_bool,
+ lig .default:n = true,
+ lig .initial:n = false,
+ lf .bool_gset_inverse:N = \g__berenis_osf_bool,
+ lf .default:n = true,
+ lining .bool_gset_inverse:N = \g__berenis_osf_bool,
+ lining .default:n = true,
+ lm .bool_gset:N = \g__berenis_lm_bool,
+ lm .default:n = true,
+ lm .initial:n = true,
+ osf .bool_gset:N = \g__berenis_osf_bool,
+ osf .default:n = true,
+ osf .initial:n = true,
+ prop .bool_gset:N = \g__berenis_prop_bool,
+ prop .default:n = true,
+ prop .initial:n = true,
+ scale .tl_gset:N = \ybd@scale,
+ scale .initial:V = \@empty,
+ tab .bool_gset_inverse:N = \g__berenis_prop_bool,
+ tab .default:n = true,
+}
+\ProcessKeyOptions[berenis]
+\bool_if:NT \g__berenis_lig_bool
+{
+ \tl_if_eq:NnF \g__berenis_enc_tl { LY1 }
+ {
+ \PackageWarning { berenis } {
+ Setting ~ font ~ encoding ~ to ~ LY1 ~ to ~ accommodate ~ ligatures
+ }
+ \tl_gset:Nn \g__berenis_enc_tl { LY1 }
+ }
+}
+\tl_if_eq:NnT \g__berenis_enc_tl { LY1 }
+{
+ \bool_if:NF \g__berenis_lm_bool
+ {
+ \PackageWarning{berenis.sty}
+ {
+ Default ~ sf ~ and ~ tt ~ families ~ will ~ not\MessageBreak
+ be ~ changed ~ to ~ Latin ~ Modern.\MessageBreak
+ Since ~ Computer ~ Modern ~ does ~ not ~ support ~ LY1,\MessageBreak
+ either ~ use ~ enc=t1 ~ to ~ use ~ T1 ~ or ~ set ~\MessageBreak
+ suitable ~ defaults ~ for ~ sans ~ (`sf') ~ and ~\MessageBreak
+ typewriter ~ (`tt') ~ yourself.\MessageBreak
+ }
+ }
+}
+\tl_new:N \g__berenis_rm_tl
+\tl_new:N \g__berenis_rm_subst_tl
+\tl_gset:Nn \g__berenis_rm_tl {ybd}
+\bool_if:NT \g__berenis_prop_bool
+{
+ \tl_gput_right:Nn \g__berenis_rm_tl {2}
+}
+\bool_if:NT \g__berenis_osf_bool
+{
+ \tl_gput_right:Nn \g__berenis_rm_tl {j}
+}
+\tl_gset_eq:NN \g__berenis_rm_subst_tl \g__berenis_rm_tl
+\bool_if:NT \g__berenis_lig_bool
+{
+ \tl_gput_right:Nn \g__berenis_rm_tl {w}
+}
+\renewcommand{\rmdefault}{\g__berenis_rm_tl}
+\RequirePackage[\g__berenis_enc_tl]{fontenc}
+\tl_if_eq:NnT \g__berenis_enc_tl { LY1 }
+{
+ \DeclareTextCompositeCommand{\^}{LY1}{W}{
+ \char9
+ }
+ \DeclareTextCompositeCommand{\^}{LY1}{w}{
+ \char3
+ }
+ \DeclareTextCompositeCommand{\^}{LY1}{Y}{
+ \char10
+ }
+ \DeclareTextCompositeCommand{\^}{LY1}{y}{
+ \char13
+ }
+}
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{ybd}{1}%
+ \DeclareEncodingSubset{TS1}{ybd2}{1}%
+ \DeclareEncodingSubset{TS1}{ybd2j}{1}%
+ \DeclareEncodingSubset{TS1}{ybdj}{1}%
+ \DeclareEncodingSubset{TS1}{ybd0}{1}%
+ \DeclareEncodingSubset{TS1}{ybd1}{1}%
+ \DeclareEncodingSubset{TS1}{ybdw}{1}%
+ \DeclareEncodingSubset{TS1}{ybd2w}{1}%
+ \DeclareEncodingSubset{TS1}{ybd2jw}{1}%
+ \DeclareEncodingSubset{TS1}{ybdjw}{1}%
+}{
+ \RequirePackage{textcomp}
+}
+\UndeclareTextCommand{\textperthousand}{T1}
+\bool_if:NT \g__berenis_lm_bool
+{
+ \renewcommand{\sfdefault}{lmss}
+ \renewcommand{\ttdefault}{lmtt}
+}
+\cs_new_nopar:Npn \zeroslash
+{
+ \tl_if_eq:NnTF \g__berenis_enc_tl { LY1 }
+ {
+ \setbox0\hbox{\char184}%
+ \setbox1\hbox{\char24}%
+ \ifnum\wd0=\wd1 \char48
+ \msg_warning:nnnn { berenis } { unavailable }
+ { slashed ~ zero } { zero }
+ \else
+ \ifnum\wd0=0 \char48
+ \msg_warning:nnnn { berenis } { unavailable }
+ { slashed ~ zero } { zero }
+ \else\char184
+ \fi
+ \fi
+ } {
+ \char48
+ \msg_warning:nnnn { berenis } { unavailable }
+ { slashed ~ zero } { zero }
+ }
+}
+\ExplSyntaxOff
%% end berenis.sty
+\endinput
+%%
+%% End of file `berenis.sty'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd.fd
index f6a20417d2e..9d91c7709c4 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd.fd}
- [2010/08/24 font definitions for LY1/ybd.]
+ [0000/00/00 font definitions for LY1/ybd.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd}{}
\DeclareFontShape{LY1}{ybd}{m}{n}{
- <-> ybdr8y
+ <-> \ybd@@scale ybdr8y
}{}
\DeclareFontShape{LY1}{ybd}{m}{sc}{
- <-> ybdrc8y
+ <-> \ybd@@scale ybdrc8y
}{}
\DeclareFontShape{LY1}{ybd}{m}{it}{
- <-> ybdri8y
+ <-> \ybd@@scale ybdri8y
}{}
-\DeclareFontShape{LY1}{ybd}{m}{si}{
- <-> ybdrci8y
+\DeclareFontShape{LY1}{ybd}{m}{scit}{
+ <-> \ybd@@scale ybdrci8y
}{}
\DeclareFontShape{LY1}{ybd}{b}{n}{
- <-> ybdb8y
+ <-> \ybd@@scale ybdb8y
}{}
\DeclareFontShape{LY1}{ybd}{b}{sc}{
- <-> ybdbc8y
+ <-> \ybd@@scale ybdbc8y
}{}
\DeclareFontShape{LY1}{ybd}{b}{it}{
- <-> ybdbi8y
+ <-> \ybd@@scale ybdbi8y
}{}
-\DeclareFontShape{LY1}{ybd}{b}{si}{
- <-> ybdbci8y
+\DeclareFontShape{LY1}{ybd}{b}{scit}{
+ <-> \ybd@@scale ybdbci8y
}{}
\DeclareFontShape{LY1}{ybd}{m}{sl}{<->ssub * ybd/m/it}{}
+\DeclareFontShape{LY1}{ybd}{m}{si}{<->ssub * ybd/m/scit}{}
\DeclareFontShape{LY1}{ybd}{b}{sl}{<->ssub * ybd/b/it}{}
\DeclareFontShape{LY1}{ybd}{bx}{n}{<->ssub * ybd/b/n}{}
\DeclareFontShape{LY1}{ybd}{bx}{sc}{<->ssub * ybd/b/sc}{}
\DeclareFontShape{LY1}{ybd}{bx}{it}{<->ssub * ybd/b/it}{}
\DeclareFontShape{LY1}{ybd}{bx}{sl}{<->ssub * ybd/b/sl}{}
+\DeclareFontShape{LY1}{ybd}{bx}{scit}{<->ssub * ybd/b/scit}{}
+\DeclareFontShape{LY1}{ybd}{b}{si}{<->ssub * ybd/bx/scit}{}
\DeclareFontShape{LY1}{ybd}{bx}{si}{<->ssub * ybd/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd0.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd0.fd
index d76698b5c0e..d51561e6951 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd0.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd0.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd0.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd0.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd0')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd0.fd}
- [2010/08/24 font definitions for LY1/ybd0.]
+ [0000/00/00 font definitions for LY1/ybd0.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd0}{}
\DeclareFontShape{LY1}{ybd0}{m}{n}{
- <-> ybdr08y
+ <-> \ybd@@scale ybdr08y
}{}
\DeclareFontShape{LY1}{ybd0}{m}{sc}{
- <-> ybdr0c8y
+ <-> \ybd@@scale ybdr0c8y
}{}
\DeclareFontShape{LY1}{ybd0}{m}{it}{
- <-> ybdr0i8y
+ <-> \ybd@@scale ybdr0i8y
}{}
-\DeclareFontShape{LY1}{ybd0}{m}{si}{
- <-> ybdr0ci8y
+\DeclareFontShape{LY1}{ybd0}{m}{scit}{
+ <-> \ybd@@scale ybdr0ci8y
}{}
\DeclareFontShape{LY1}{ybd0}{b}{n}{
- <-> ybdb08y
+ <-> \ybd@@scale ybdb08y
}{}
\DeclareFontShape{LY1}{ybd0}{b}{sc}{
- <-> ybdb0c8y
+ <-> \ybd@@scale ybdb0c8y
}{}
\DeclareFontShape{LY1}{ybd0}{b}{it}{
- <-> ybdb0i8y
+ <-> \ybd@@scale ybdb0i8y
}{}
-\DeclareFontShape{LY1}{ybd0}{b}{si}{
- <-> ybdb0ci8y
+\DeclareFontShape{LY1}{ybd0}{b}{scit}{
+ <-> \ybd@@scale ybdb0ci8y
}{}
\DeclareFontShape{LY1}{ybd0}{m}{sl}{<->ssub * ybd0/m/it}{}
+\DeclareFontShape{LY1}{ybd0}{m}{si}{<->ssub * ybd0/m/scit}{}
\DeclareFontShape{LY1}{ybd0}{b}{sl}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{LY1}{ybd0}{bx}{n}{<->ssub * ybd0/b/n}{}
\DeclareFontShape{LY1}{ybd0}{bx}{sc}{<->ssub * ybd0/b/sc}{}
\DeclareFontShape{LY1}{ybd0}{bx}{it}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{LY1}{ybd0}{bx}{sl}{<->ssub * ybd0/b/sl}{}
+\DeclareFontShape{LY1}{ybd0}{bx}{scit}{<->ssub * ybd0/b/scit}{}
+\DeclareFontShape{LY1}{ybd0}{b}{si}{<->ssub * ybd0/bx/scit}{}
\DeclareFontShape{LY1}{ybd0}{bx}{si}{<->ssub * ybd0/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd0.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd1.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd1.fd
index 3956d456b62..61a43bc974d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd1.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd1.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd1.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd1.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd1')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd1.fd}
- [2010/08/24 font definitions for LY1/ybd1.]
+ [0000/00/00 font definitions for LY1/ybd1.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd1}{}
\DeclareFontShape{LY1}{ybd1}{m}{n}{
- <-> ybdr18y
+ <-> \ybd@@scale ybdr18y
}{}
\DeclareFontShape{LY1}{ybd1}{m}{sc}{
- <-> ybdr1c8y
+ <-> \ybd@@scale ybdr1c8y
}{}
\DeclareFontShape{LY1}{ybd1}{m}{it}{
- <-> ybdr1i8y
+ <-> \ybd@@scale ybdr1i8y
}{}
-\DeclareFontShape{LY1}{ybd1}{m}{si}{
- <-> ybdr1ci8y
+\DeclareFontShape{LY1}{ybd1}{m}{scit}{
+ <-> \ybd@@scale ybdr1ci8y
}{}
\DeclareFontShape{LY1}{ybd1}{b}{n}{
- <-> ybdb18y
+ <-> \ybd@@scale ybdb18y
}{}
\DeclareFontShape{LY1}{ybd1}{b}{sc}{
- <-> ybdb1c8y
+ <-> \ybd@@scale ybdb1c8y
}{}
\DeclareFontShape{LY1}{ybd1}{b}{it}{
- <-> ybdb1i8y
+ <-> \ybd@@scale ybdb1i8y
}{}
-\DeclareFontShape{LY1}{ybd1}{b}{si}{
- <-> ybdb1ci8y
+\DeclareFontShape{LY1}{ybd1}{b}{scit}{
+ <-> \ybd@@scale ybdb1ci8y
}{}
\DeclareFontShape{LY1}{ybd1}{m}{sl}{<->ssub * ybd1/m/it}{}
+\DeclareFontShape{LY1}{ybd1}{m}{si}{<->ssub * ybd1/m/scit}{}
\DeclareFontShape{LY1}{ybd1}{b}{sl}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{LY1}{ybd1}{bx}{n}{<->ssub * ybd1/b/n}{}
\DeclareFontShape{LY1}{ybd1}{bx}{sc}{<->ssub * ybd1/b/sc}{}
\DeclareFontShape{LY1}{ybd1}{bx}{it}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{LY1}{ybd1}{bx}{sl}{<->ssub * ybd1/b/sl}{}
+\DeclareFontShape{LY1}{ybd1}{bx}{scit}{<->ssub * ybd1/b/scit}{}
+\DeclareFontShape{LY1}{ybd1}{b}{si}{<->ssub * ybd1/bx/scit}{}
\DeclareFontShape{LY1}{ybd1}{bx}{si}{<->ssub * ybd1/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd1.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2.fd
index 37379dee747..59b269cb46e 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd2.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd2.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd2')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd2.fd}
- [2010/08/24 font definitions for LY1/ybd2.]
+ [0000/00/00 font definitions for LY1/ybd2.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd2}{}
\DeclareFontShape{LY1}{ybd2}{m}{n}{
- <-> ybdr28y
+ <-> \ybd@@scale ybdr28y
}{}
\DeclareFontShape{LY1}{ybd2}{m}{sc}{
- <-> ybdr2c8y
+ <-> \ybd@@scale ybdr2c8y
}{}
\DeclareFontShape{LY1}{ybd2}{m}{it}{
- <-> ybdr2i8y
+ <-> \ybd@@scale ybdr2i8y
}{}
-\DeclareFontShape{LY1}{ybd2}{m}{si}{
- <-> ybdr2ci8y
+\DeclareFontShape{LY1}{ybd2}{m}{scit}{
+ <-> \ybd@@scale ybdr2ci8y
}{}
\DeclareFontShape{LY1}{ybd2}{b}{n}{
- <-> ybdb28y
+ <-> \ybd@@scale ybdb28y
}{}
\DeclareFontShape{LY1}{ybd2}{b}{sc}{
- <-> ybdb2c8y
+ <-> \ybd@@scale ybdb2c8y
}{}
\DeclareFontShape{LY1}{ybd2}{b}{it}{
- <-> ybdb2i8y
+ <-> \ybd@@scale ybdb2i8y
}{}
-\DeclareFontShape{LY1}{ybd2}{b}{si}{
- <-> ybdb2ci8y
+\DeclareFontShape{LY1}{ybd2}{b}{scit}{
+ <-> \ybd@@scale ybdb2ci8y
}{}
\DeclareFontShape{LY1}{ybd2}{m}{sl}{<->ssub * ybd2/m/it}{}
+\DeclareFontShape{LY1}{ybd2}{m}{si}{<->ssub * ybd2/m/scit}{}
\DeclareFontShape{LY1}{ybd2}{b}{sl}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{LY1}{ybd2}{bx}{n}{<->ssub * ybd2/b/n}{}
\DeclareFontShape{LY1}{ybd2}{bx}{sc}{<->ssub * ybd2/b/sc}{}
\DeclareFontShape{LY1}{ybd2}{bx}{it}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{LY1}{ybd2}{bx}{sl}{<->ssub * ybd2/b/sl}{}
+\DeclareFontShape{LY1}{ybd2}{bx}{scit}{<->ssub * ybd2/b/scit}{}
+\DeclareFontShape{LY1}{ybd2}{b}{si}{<->ssub * ybd2/bx/scit}{}
\DeclareFontShape{LY1}{ybd2}{bx}{si}{<->ssub * ybd2/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd2.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2j.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2j.fd
index 0f24452ef9d..95055b9794d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2j.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2j.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd2j.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd2j.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd2j')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd2j.fd}
- [2010/08/24 font definitions for LY1/ybd2j.]
+ [0000/00/00 font definitions for LY1/ybd2j.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd2j}{}
\DeclareFontShape{LY1}{ybd2j}{m}{n}{
- <-> ybdr2j8y
+ <-> \ybd@@scale ybdr2j8y
}{}
\DeclareFontShape{LY1}{ybd2j}{m}{sc}{
- <-> ybdr2cj8y
+ <-> \ybd@@scale ybdr2cj8y
}{}
\DeclareFontShape{LY1}{ybd2j}{m}{it}{
- <-> ybdr2ij8y
+ <-> \ybd@@scale ybdr2ij8y
}{}
-\DeclareFontShape{LY1}{ybd2j}{m}{si}{
- <-> ybdr2cij8y
+\DeclareFontShape{LY1}{ybd2j}{m}{scit}{
+ <-> \ybd@@scale ybdr2cij8y
}{}
\DeclareFontShape{LY1}{ybd2j}{b}{n}{
- <-> ybdb2j8y
+ <-> \ybd@@scale ybdb2j8y
}{}
\DeclareFontShape{LY1}{ybd2j}{b}{sc}{
- <-> ybdb2cj8y
+ <-> \ybd@@scale ybdb2cj8y
}{}
\DeclareFontShape{LY1}{ybd2j}{b}{it}{
- <-> ybdb2ij8y
+ <-> \ybd@@scale ybdb2ij8y
}{}
-\DeclareFontShape{LY1}{ybd2j}{b}{si}{
- <-> ybdb2cij8y
+\DeclareFontShape{LY1}{ybd2j}{b}{scit}{
+ <-> \ybd@@scale ybdb2cij8y
}{}
\DeclareFontShape{LY1}{ybd2j}{m}{sl}{<->ssub * ybd2j/m/it}{}
+\DeclareFontShape{LY1}{ybd2j}{m}{si}{<->ssub * ybd2j/m/scit}{}
\DeclareFontShape{LY1}{ybd2j}{b}{sl}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{LY1}{ybd2j}{bx}{n}{<->ssub * ybd2j/b/n}{}
\DeclareFontShape{LY1}{ybd2j}{bx}{sc}{<->ssub * ybd2j/b/sc}{}
\DeclareFontShape{LY1}{ybd2j}{bx}{it}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{LY1}{ybd2j}{bx}{sl}{<->ssub * ybd2j/b/sl}{}
+\DeclareFontShape{LY1}{ybd2j}{bx}{scit}{<->ssub * ybd2j/b/scit}{}
+\DeclareFontShape{LY1}{ybd2j}{b}{si}{<->ssub * ybd2j/bx/scit}{}
\DeclareFontShape{LY1}{ybd2j}{bx}{si}{<->ssub * ybd2j/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd2j.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2jw.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2jw.fd
index d38e44ea541..4a42481b024 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2jw.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2jw.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd2jw.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd2jw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd2jw')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd2jw.fd}
- [2010/08/24 font definitions for LY1/ybd2jw.]
+ [0000/00/00 font definitions for LY1/ybd2jw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd2jw}{}
\DeclareFontShape{LY1}{ybd2jw}{m}{n}{
- <-> ybdr2jw8y
+ <-> \ybd@@scale ybdr2jw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{m}{sc}{
- <-> ybdr2cjw8y
+ <-> \ybd@@scale ybdr2cjw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{m}{it}{
- <-> ybdr2ijw8y
+ <-> \ybd@@scale ybdr2ijw8y
}{}
-\DeclareFontShape{LY1}{ybd2jw}{m}{si}{
- <-> ybdr2cijw8y
+\DeclareFontShape{LY1}{ybd2jw}{m}{scit}{
+ <-> \ybd@@scale ybdr2cijw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{b}{n}{
- <-> ybdb2jw8y
+ <-> \ybd@@scale ybdb2jw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{b}{sc}{
- <-> ybdb2cjw8y
+ <-> \ybd@@scale ybdb2cjw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{b}{it}{
- <-> ybdb2ijw8y
+ <-> \ybd@@scale ybdb2ijw8y
}{}
-\DeclareFontShape{LY1}{ybd2jw}{b}{si}{
- <-> ybdb2cijw8y
+\DeclareFontShape{LY1}{ybd2jw}{b}{scit}{
+ <-> \ybd@@scale ybdb2cijw8y
}{}
\DeclareFontShape{LY1}{ybd2jw}{m}{sl}{<->ssub * ybd2jw/m/it}{}
+\DeclareFontShape{LY1}{ybd2jw}{m}{si}{<->ssub * ybd2jw/m/scit}{}
\DeclareFontShape{LY1}{ybd2jw}{b}{sl}{<->ssub * ybd2jw/b/it}{}
\DeclareFontShape{LY1}{ybd2jw}{bx}{n}{<->ssub * ybd2jw/b/n}{}
\DeclareFontShape{LY1}{ybd2jw}{bx}{sc}{<->ssub * ybd2jw/b/sc}{}
\DeclareFontShape{LY1}{ybd2jw}{bx}{it}{<->ssub * ybd2jw/b/it}{}
\DeclareFontShape{LY1}{ybd2jw}{bx}{sl}{<->ssub * ybd2jw/b/sl}{}
+\DeclareFontShape{LY1}{ybd2jw}{bx}{scit}{<->ssub * ybd2jw/b/scit}{}
+\DeclareFontShape{LY1}{ybd2jw}{b}{si}{<->ssub * ybd2jw/bx/scit}{}
\DeclareFontShape{LY1}{ybd2jw}{bx}{si}{<->ssub * ybd2jw/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd2jw.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2w.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2w.fd
index 11b0cc7b29f..819f604198f 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2w.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybd2w.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybd2w.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybd2w.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybd2w')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybd2w.fd}
- [2010/08/24 font definitions for LY1/ybd2w.]
+ [0000/00/00 font definitions for LY1/ybd2w.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybd2w}{}
\DeclareFontShape{LY1}{ybd2w}{m}{n}{
- <-> ybdr2w8y
+ <-> \ybd@@scale ybdr2w8y
}{}
\DeclareFontShape{LY1}{ybd2w}{m}{sc}{
- <-> ybdr2cw8y
+ <-> \ybd@@scale ybdr2cw8y
}{}
\DeclareFontShape{LY1}{ybd2w}{m}{it}{
- <-> ybdr2iw8y
+ <-> \ybd@@scale ybdr2iw8y
}{}
-\DeclareFontShape{LY1}{ybd2w}{m}{si}{
- <-> ybdr2ciw8y
+\DeclareFontShape{LY1}{ybd2w}{m}{scit}{
+ <-> \ybd@@scale ybdr2ciw8y
}{}
\DeclareFontShape{LY1}{ybd2w}{b}{n}{
- <-> ybdb2w8y
+ <-> \ybd@@scale ybdb2w8y
}{}
\DeclareFontShape{LY1}{ybd2w}{b}{sc}{
- <-> ybdb2cw8y
+ <-> \ybd@@scale ybdb2cw8y
}{}
\DeclareFontShape{LY1}{ybd2w}{b}{it}{
- <-> ybdb2iw8y
+ <-> \ybd@@scale ybdb2iw8y
}{}
-\DeclareFontShape{LY1}{ybd2w}{b}{si}{
- <-> ybdb2ciw8y
+\DeclareFontShape{LY1}{ybd2w}{b}{scit}{
+ <-> \ybd@@scale ybdb2ciw8y
}{}
\DeclareFontShape{LY1}{ybd2w}{m}{sl}{<->ssub * ybd2w/m/it}{}
+\DeclareFontShape{LY1}{ybd2w}{m}{si}{<->ssub * ybd2w/m/scit}{}
\DeclareFontShape{LY1}{ybd2w}{b}{sl}{<->ssub * ybd2w/b/it}{}
\DeclareFontShape{LY1}{ybd2w}{bx}{n}{<->ssub * ybd2w/b/n}{}
\DeclareFontShape{LY1}{ybd2w}{bx}{sc}{<->ssub * ybd2w/b/sc}{}
\DeclareFontShape{LY1}{ybd2w}{bx}{it}{<->ssub * ybd2w/b/it}{}
\DeclareFontShape{LY1}{ybd2w}{bx}{sl}{<->ssub * ybd2w/b/sl}{}
+\DeclareFontShape{LY1}{ybd2w}{bx}{scit}{<->ssub * ybd2w/b/scit}{}
+\DeclareFontShape{LY1}{ybd2w}{b}{si}{<->ssub * ybd2w/bx/scit}{}
\DeclareFontShape{LY1}{ybd2w}{bx}{si}{<->ssub * ybd2w/b/si}{}
\endinput
+%%
+%% End of file `ly1ybd2w.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdj.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdj.fd
index 30a0923cc3f..d5ec5a6e695 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdj.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdj.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybdj.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybdj.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybdj')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybdj.fd}
- [2010/08/24 font definitions for LY1/ybdj.]
+ [0000/00/00 font definitions for LY1/ybdj.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybdj}{}
\DeclareFontShape{LY1}{ybdj}{m}{n}{
- <-> ybdrj8y
+ <-> \ybd@@scale ybdrj8y
}{}
\DeclareFontShape{LY1}{ybdj}{m}{sc}{
- <-> ybdrcj8y
+ <-> \ybd@@scale ybdrcj8y
}{}
\DeclareFontShape{LY1}{ybdj}{m}{it}{
- <-> ybdrij8y
+ <-> \ybd@@scale ybdrij8y
}{}
-\DeclareFontShape{LY1}{ybdj}{m}{si}{
- <-> ybdrcij8y
+\DeclareFontShape{LY1}{ybdj}{m}{scit}{
+ <-> \ybd@@scale ybdrcij8y
}{}
\DeclareFontShape{LY1}{ybdj}{b}{n}{
- <-> ybdbj8y
+ <-> \ybd@@scale ybdbj8y
}{}
\DeclareFontShape{LY1}{ybdj}{b}{sc}{
- <-> ybdbcj8y
+ <-> \ybd@@scale ybdbcj8y
}{}
\DeclareFontShape{LY1}{ybdj}{b}{it}{
- <-> ybdbij8y
+ <-> \ybd@@scale ybdbij8y
}{}
-\DeclareFontShape{LY1}{ybdj}{b}{si}{
- <-> ybdbcij8y
+\DeclareFontShape{LY1}{ybdj}{b}{scit}{
+ <-> \ybd@@scale ybdbcij8y
}{}
\DeclareFontShape{LY1}{ybdj}{m}{sl}{<->ssub * ybdj/m/it}{}
+\DeclareFontShape{LY1}{ybdj}{m}{si}{<->ssub * ybdj/m/scit}{}
\DeclareFontShape{LY1}{ybdj}{b}{sl}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{LY1}{ybdj}{bx}{n}{<->ssub * ybdj/b/n}{}
\DeclareFontShape{LY1}{ybdj}{bx}{sc}{<->ssub * ybdj/b/sc}{}
\DeclareFontShape{LY1}{ybdj}{bx}{it}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{LY1}{ybdj}{bx}{sl}{<->ssub * ybdj/b/sl}{}
+\DeclareFontShape{LY1}{ybdj}{bx}{scit}{<->ssub * ybdj/b/scit}{}
+\DeclareFontShape{LY1}{ybdj}{b}{si}{<->ssub * ybdj/bx/scit}{}
\DeclareFontShape{LY1}{ybdj}{bx}{si}{<->ssub * ybdj/b/si}{}
\endinput
+%%
+%% End of file `ly1ybdj.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdjw.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdjw.fd
index 5a929471838..0f7567f9f29 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdjw.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdjw.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybdjw.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybdjw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybdjw')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybdjw.fd}
- [2010/08/24 font definitions for LY1/ybdjw.]
+ [0000/00/00 font definitions for LY1/ybdjw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybdjw}{}
\DeclareFontShape{LY1}{ybdjw}{m}{n}{
- <-> ybdrjw8y
+ <-> \ybd@@scale ybdrjw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{m}{sc}{
- <-> ybdrcjw8y
+ <-> \ybd@@scale ybdrcjw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{m}{it}{
- <-> ybdrijw8y
+ <-> \ybd@@scale ybdrijw8y
}{}
-\DeclareFontShape{LY1}{ybdjw}{m}{si}{
- <-> ybdrcijw8y
+\DeclareFontShape{LY1}{ybdjw}{m}{scit}{
+ <-> \ybd@@scale ybdrcijw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{b}{n}{
- <-> ybdbjw8y
+ <-> \ybd@@scale ybdbjw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{b}{sc}{
- <-> ybdbcjw8y
+ <-> \ybd@@scale ybdbcjw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{b}{it}{
- <-> ybdbijw8y
+ <-> \ybd@@scale ybdbijw8y
}{}
-\DeclareFontShape{LY1}{ybdjw}{b}{si}{
- <-> ybdbcijw8y
+\DeclareFontShape{LY1}{ybdjw}{b}{scit}{
+ <-> \ybd@@scale ybdbcijw8y
}{}
\DeclareFontShape{LY1}{ybdjw}{m}{sl}{<->ssub * ybdjw/m/it}{}
+\DeclareFontShape{LY1}{ybdjw}{m}{si}{<->ssub * ybdjw/m/scit}{}
\DeclareFontShape{LY1}{ybdjw}{b}{sl}{<->ssub * ybdjw/b/it}{}
\DeclareFontShape{LY1}{ybdjw}{bx}{n}{<->ssub * ybdjw/b/n}{}
\DeclareFontShape{LY1}{ybdjw}{bx}{sc}{<->ssub * ybdjw/b/sc}{}
\DeclareFontShape{LY1}{ybdjw}{bx}{it}{<->ssub * ybdjw/b/it}{}
\DeclareFontShape{LY1}{ybdjw}{bx}{sl}{<->ssub * ybdjw/b/sl}{}
+\DeclareFontShape{LY1}{ybdjw}{bx}{scit}{<->ssub * ybdjw/b/scit}{}
+\DeclareFontShape{LY1}{ybdjw}{b}{si}{<->ssub * ybdjw/bx/scit}{}
\DeclareFontShape{LY1}{ybdjw}{bx}{si}{<->ssub * ybdjw/b/si}{}
\endinput
+%%
+%% End of file `ly1ybdjw.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdw.fd b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdw.fd
index b82f92ca173..fb8b7b41ac9 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ly1ybdw.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ly1ybdw.fd
@@ -1,51 +1,87 @@
-%Filename: ly1ybdw.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ly1ybdw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ly1ybdw')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ly1ybdw.fd}
- [2010/08/24 font definitions for LY1/ybdw.]
+ [0000/00/00 font definitions for LY1/ybdw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{LY1}{ybdw}{}
\DeclareFontShape{LY1}{ybdw}{m}{n}{
- <-> ybdrw8y
+ <-> \ybd@@scale ybdrw8y
}{}
\DeclareFontShape{LY1}{ybdw}{m}{sc}{
- <-> ybdrcw8y
+ <-> \ybd@@scale ybdrcw8y
}{}
\DeclareFontShape{LY1}{ybdw}{m}{it}{
- <-> ybdriw8y
+ <-> \ybd@@scale ybdriw8y
}{}
-\DeclareFontShape{LY1}{ybdw}{m}{si}{
- <-> ybdrciw8y
+\DeclareFontShape{LY1}{ybdw}{m}{scit}{
+ <-> \ybd@@scale ybdrciw8y
}{}
\DeclareFontShape{LY1}{ybdw}{b}{n}{
- <-> ybdbw8y
+ <-> \ybd@@scale ybdbw8y
}{}
\DeclareFontShape{LY1}{ybdw}{b}{sc}{
- <-> ybdbcw8y
+ <-> \ybd@@scale ybdbcw8y
}{}
\DeclareFontShape{LY1}{ybdw}{b}{it}{
- <-> ybdbiw8y
+ <-> \ybd@@scale ybdbiw8y
}{}
-\DeclareFontShape{LY1}{ybdw}{b}{si}{
- <-> ybdbciw8y
+\DeclareFontShape{LY1}{ybdw}{b}{scit}{
+ <-> \ybd@@scale ybdbciw8y
}{}
\DeclareFontShape{LY1}{ybdw}{m}{sl}{<->ssub * ybdw/m/it}{}
+\DeclareFontShape{LY1}{ybdw}{m}{si}{<->ssub * ybdw/m/scit}{}
\DeclareFontShape{LY1}{ybdw}{b}{sl}{<->ssub * ybdw/b/it}{}
\DeclareFontShape{LY1}{ybdw}{bx}{n}{<->ssub * ybdw/b/n}{}
\DeclareFontShape{LY1}{ybdw}{bx}{sc}{<->ssub * ybdw/b/sc}{}
\DeclareFontShape{LY1}{ybdw}{bx}{it}{<->ssub * ybdw/b/it}{}
\DeclareFontShape{LY1}{ybdw}{bx}{sl}{<->ssub * ybdw/b/sl}{}
+\DeclareFontShape{LY1}{ybdw}{bx}{scit}{<->ssub * ybdw/b/scit}{}
+\DeclareFontShape{LY1}{ybdw}{b}{si}{<->ssub * ybdw/bx/scit}{}
\DeclareFontShape{LY1}{ybdw}{bx}{si}{<->ssub * ybdw/b/si}{}
\endinput
+%%
+%% End of file `ly1ybdw.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybd.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybd.fd
index 64f0b0e11bc..394494ca04d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybd.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybd.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybd.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybd.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybd')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybd.fd}
- [2013/11/19 font definitions for T1/ybd.]
+ [0000/00/00 font definitions for T1/ybd.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybd}{}
\DeclareFontShape{T1}{ybd}{m}{n}{
- <-> ybdr8t
+ <-> \ybd@@scale ybdr8t
}{}
\DeclareFontShape{T1}{ybd}{m}{sc}{
- <-> ybdrc8t
+ <-> \ybd@@scale ybdrc8t
}{}
\DeclareFontShape{T1}{ybd}{m}{it}{
- <-> ybdri8t
+ <-> \ybd@@scale ybdri8t
}{}
-\DeclareFontShape{T1}{ybd}{m}{si}{
- <-> ybdrci8t
+\DeclareFontShape{T1}{ybd}{m}{scit}{
+ <-> \ybd@@scale ybdrci8t
}{}
\DeclareFontShape{T1}{ybd}{b}{n}{
- <-> ybdb8t
+ <-> \ybd@@scale ybdb8t
}{}
\DeclareFontShape{T1}{ybd}{b}{sc}{
- <-> ybdbc8t
+ <-> \ybd@@scale ybdbc8t
}{}
\DeclareFontShape{T1}{ybd}{b}{it}{
- <-> ybdbi8t
+ <-> \ybd@@scale ybdbi8t
}{}
-\DeclareFontShape{T1}{ybd}{b}{si}{
- <-> ybdbci8t
+\DeclareFontShape{T1}{ybd}{b}{scit}{
+ <-> \ybd@@scale ybdbci8t
}{}
\DeclareFontShape{T1}{ybd}{m}{sl}{<->ssub * ybd/m/it}{}
+\DeclareFontShape{T1}{ybd}{m}{si}{<->ssub * ybd/m/scit}{}
\DeclareFontShape{T1}{ybd}{b}{sl}{<->ssub * ybd/b/it}{}
\DeclareFontShape{T1}{ybd}{bx}{n}{<->ssub * ybd/b/n}{}
\DeclareFontShape{T1}{ybd}{bx}{sc}{<->ssub * ybd/b/sc}{}
\DeclareFontShape{T1}{ybd}{bx}{it}{<->ssub * ybd/b/it}{}
\DeclareFontShape{T1}{ybd}{bx}{sl}{<->ssub * ybd/b/sl}{}
+\DeclareFontShape{T1}{ybd}{bx}{scit}{<->ssub * ybd/b/scit}{}
+\DeclareFontShape{T1}{ybd}{b}{si}{<->ssub * ybd/bx/scit}{}
\DeclareFontShape{T1}{ybd}{bx}{si}{<->ssub * ybd/b/si}{}
\endinput
+%%
+%% End of file `t1ybd.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybd0.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybd0.fd
index c4ca425f095..fd86727863d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybd0.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybd0.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybd0.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybd0.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybd0')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybd0.fd}
- [2013/11/19 font definitions for T1/ybd0.]
+ [0000/00/00 font definitions for T1/ybd0.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybd0}{}
\DeclareFontShape{T1}{ybd0}{m}{n}{
- <-> ybdr08t
+ <-> \ybd@@scale ybdr08t
}{}
\DeclareFontShape{T1}{ybd0}{m}{sc}{
- <-> ybdr0c8t
+ <-> \ybd@@scale ybdr0c8t
}{}
\DeclareFontShape{T1}{ybd0}{m}{it}{
- <-> ybdr0i8t
+ <-> \ybd@@scale ybdr0i8t
}{}
-\DeclareFontShape{T1}{ybd0}{m}{si}{
- <-> ybdr0ci8t
+\DeclareFontShape{T1}{ybd0}{m}{scit}{
+ <-> \ybd@@scale ybdr0ci8t
}{}
\DeclareFontShape{T1}{ybd0}{b}{n}{
- <-> ybdb08t
+ <-> \ybd@@scale ybdb08t
}{}
\DeclareFontShape{T1}{ybd0}{b}{sc}{
- <-> ybdb0c8t
+ <-> \ybd@@scale ybdb0c8t
}{}
\DeclareFontShape{T1}{ybd0}{b}{it}{
- <-> ybdb0i8t
+ <-> \ybd@@scale ybdb0i8t
}{}
-\DeclareFontShape{T1}{ybd0}{b}{si}{
- <-> ybdb0ci8t
+\DeclareFontShape{T1}{ybd0}{b}{scit}{
+ <-> \ybd@@scale ybdb0ci8t
}{}
\DeclareFontShape{T1}{ybd0}{m}{sl}{<->ssub * ybd0/m/it}{}
+\DeclareFontShape{T1}{ybd0}{m}{si}{<->ssub * ybd0/m/scit}{}
\DeclareFontShape{T1}{ybd0}{b}{sl}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{T1}{ybd0}{bx}{n}{<->ssub * ybd0/b/n}{}
\DeclareFontShape{T1}{ybd0}{bx}{sc}{<->ssub * ybd0/b/sc}{}
\DeclareFontShape{T1}{ybd0}{bx}{it}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{T1}{ybd0}{bx}{sl}{<->ssub * ybd0/b/sl}{}
+\DeclareFontShape{T1}{ybd0}{bx}{scit}{<->ssub * ybd0/b/scit}{}
+\DeclareFontShape{T1}{ybd0}{b}{si}{<->ssub * ybd0/bx/scit}{}
\DeclareFontShape{T1}{ybd0}{bx}{si}{<->ssub * ybd0/b/si}{}
\endinput
+%%
+%% End of file `t1ybd0.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybd1.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybd1.fd
index 4514d02586a..fdd304490d5 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybd1.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybd1.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybd1.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybd1.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybd1')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybd1.fd}
- [2013/11/19 font definitions for T1/ybd1.]
+ [0000/00/00 font definitions for T1/ybd1.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybd1}{}
\DeclareFontShape{T1}{ybd1}{m}{n}{
- <-> ybdr18t
+ <-> \ybd@@scale ybdr18t
}{}
\DeclareFontShape{T1}{ybd1}{m}{sc}{
- <-> ybdr1c8t
+ <-> \ybd@@scale ybdr1c8t
}{}
\DeclareFontShape{T1}{ybd1}{m}{it}{
- <-> ybdr1i8t
+ <-> \ybd@@scale ybdr1i8t
}{}
-\DeclareFontShape{T1}{ybd1}{m}{si}{
- <-> ybdr1ci8t
+\DeclareFontShape{T1}{ybd1}{m}{scit}{
+ <-> \ybd@@scale ybdr1ci8t
}{}
\DeclareFontShape{T1}{ybd1}{b}{n}{
- <-> ybdb18t
+ <-> \ybd@@scale ybdb18t
}{}
\DeclareFontShape{T1}{ybd1}{b}{sc}{
- <-> ybdb1c8t
+ <-> \ybd@@scale ybdb1c8t
}{}
\DeclareFontShape{T1}{ybd1}{b}{it}{
- <-> ybdb1i8t
+ <-> \ybd@@scale ybdb1i8t
}{}
-\DeclareFontShape{T1}{ybd1}{b}{si}{
- <-> ybdb1ci8t
+\DeclareFontShape{T1}{ybd1}{b}{scit}{
+ <-> \ybd@@scale ybdb1ci8t
}{}
\DeclareFontShape{T1}{ybd1}{m}{sl}{<->ssub * ybd1/m/it}{}
+\DeclareFontShape{T1}{ybd1}{m}{si}{<->ssub * ybd1/m/scit}{}
\DeclareFontShape{T1}{ybd1}{b}{sl}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{T1}{ybd1}{bx}{n}{<->ssub * ybd1/b/n}{}
\DeclareFontShape{T1}{ybd1}{bx}{sc}{<->ssub * ybd1/b/sc}{}
\DeclareFontShape{T1}{ybd1}{bx}{it}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{T1}{ybd1}{bx}{sl}{<->ssub * ybd1/b/sl}{}
+\DeclareFontShape{T1}{ybd1}{bx}{scit}{<->ssub * ybd1/b/scit}{}
+\DeclareFontShape{T1}{ybd1}{b}{si}{<->ssub * ybd1/bx/scit}{}
\DeclareFontShape{T1}{ybd1}{bx}{si}{<->ssub * ybd1/b/si}{}
\endinput
+%%
+%% End of file `t1ybd1.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybd2.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybd2.fd
index 0c8f4b5c6cd..b1dc0d01d1d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybd2.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybd2.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybd2.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybd2.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybd2')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybd2.fd}
- [2013/11/19 font definitions for T1/ybd2.]
+ [0000/00/00 font definitions for T1/ybd2.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybd2}{}
\DeclareFontShape{T1}{ybd2}{m}{n}{
- <-> ybdr28t
+ <-> \ybd@@scale ybdr28t
}{}
\DeclareFontShape{T1}{ybd2}{m}{sc}{
- <-> ybdr2c8t
+ <-> \ybd@@scale ybdr2c8t
}{}
\DeclareFontShape{T1}{ybd2}{m}{it}{
- <-> ybdr2i8t
+ <-> \ybd@@scale ybdr2i8t
}{}
-\DeclareFontShape{T1}{ybd2}{m}{si}{
- <-> ybdr2ci8t
+\DeclareFontShape{T1}{ybd2}{m}{scit}{
+ <-> \ybd@@scale ybdr2ci8t
}{}
\DeclareFontShape{T1}{ybd2}{b}{n}{
- <-> ybdb28t
+ <-> \ybd@@scale ybdb28t
}{}
\DeclareFontShape{T1}{ybd2}{b}{sc}{
- <-> ybdb2c8t
+ <-> \ybd@@scale ybdb2c8t
}{}
\DeclareFontShape{T1}{ybd2}{b}{it}{
- <-> ybdb2i8t
+ <-> \ybd@@scale ybdb2i8t
}{}
-\DeclareFontShape{T1}{ybd2}{b}{si}{
- <-> ybdb2ci8t
+\DeclareFontShape{T1}{ybd2}{b}{scit}{
+ <-> \ybd@@scale ybdb2ci8t
}{}
\DeclareFontShape{T1}{ybd2}{m}{sl}{<->ssub * ybd2/m/it}{}
+\DeclareFontShape{T1}{ybd2}{m}{si}{<->ssub * ybd2/m/scit}{}
\DeclareFontShape{T1}{ybd2}{b}{sl}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{T1}{ybd2}{bx}{n}{<->ssub * ybd2/b/n}{}
\DeclareFontShape{T1}{ybd2}{bx}{sc}{<->ssub * ybd2/b/sc}{}
\DeclareFontShape{T1}{ybd2}{bx}{it}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{T1}{ybd2}{bx}{sl}{<->ssub * ybd2/b/sl}{}
+\DeclareFontShape{T1}{ybd2}{bx}{scit}{<->ssub * ybd2/b/scit}{}
+\DeclareFontShape{T1}{ybd2}{b}{si}{<->ssub * ybd2/bx/scit}{}
\DeclareFontShape{T1}{ybd2}{bx}{si}{<->ssub * ybd2/b/si}{}
\endinput
+%%
+%% End of file `t1ybd2.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybd2j.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybd2j.fd
index 5a98d8c8174..ceee1fac453 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybd2j.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybd2j.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybd2j.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybd2j.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybd2j')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybd2j.fd}
- [2013/11/19 font definitions for T1/ybd2j.]
+ [0000/00/00 font definitions for T1/ybd2j.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybd2j}{}
\DeclareFontShape{T1}{ybd2j}{m}{n}{
- <-> ybdr2j8t
+ <-> \ybd@@scale ybdr2j8t
}{}
\DeclareFontShape{T1}{ybd2j}{m}{sc}{
- <-> ybdr2cj8t
+ <-> \ybd@@scale ybdr2cj8t
}{}
\DeclareFontShape{T1}{ybd2j}{m}{it}{
- <-> ybdr2ij8t
+ <-> \ybd@@scale ybdr2ij8t
}{}
-\DeclareFontShape{T1}{ybd2j}{m}{si}{
- <-> ybdr2cij8t
+\DeclareFontShape{T1}{ybd2j}{m}{scit}{
+ <-> \ybd@@scale ybdr2cij8t
}{}
\DeclareFontShape{T1}{ybd2j}{b}{n}{
- <-> ybdb2j8t
+ <-> \ybd@@scale ybdb2j8t
}{}
\DeclareFontShape{T1}{ybd2j}{b}{sc}{
- <-> ybdb2cj8t
+ <-> \ybd@@scale ybdb2cj8t
}{}
\DeclareFontShape{T1}{ybd2j}{b}{it}{
- <-> ybdb2ij8t
+ <-> \ybd@@scale ybdb2ij8t
}{}
-\DeclareFontShape{T1}{ybd2j}{b}{si}{
- <-> ybdb2cij8t
+\DeclareFontShape{T1}{ybd2j}{b}{scit}{
+ <-> \ybd@@scale ybdb2cij8t
}{}
\DeclareFontShape{T1}{ybd2j}{m}{sl}{<->ssub * ybd2j/m/it}{}
+\DeclareFontShape{T1}{ybd2j}{m}{si}{<->ssub * ybd2j/m/scit}{}
\DeclareFontShape{T1}{ybd2j}{b}{sl}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{T1}{ybd2j}{bx}{n}{<->ssub * ybd2j/b/n}{}
\DeclareFontShape{T1}{ybd2j}{bx}{sc}{<->ssub * ybd2j/b/sc}{}
\DeclareFontShape{T1}{ybd2j}{bx}{it}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{T1}{ybd2j}{bx}{sl}{<->ssub * ybd2j/b/sl}{}
+\DeclareFontShape{T1}{ybd2j}{bx}{scit}{<->ssub * ybd2j/b/scit}{}
+\DeclareFontShape{T1}{ybd2j}{b}{si}{<->ssub * ybd2j/bx/scit}{}
\DeclareFontShape{T1}{ybd2j}{bx}{si}{<->ssub * ybd2j/b/si}{}
\endinput
+%%
+%% End of file `t1ybd2j.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/t1ybdj.fd b/Master/texmf-dist/tex/latex/berenisadf/t1ybdj.fd
index 79d85a74d3b..177587fcc0e 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/t1ybdj.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/t1ybdj.fd
@@ -1,51 +1,87 @@
-%Filename: t1ybdj.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `t1ybdj.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-t1ybdj')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ybdj.fd}
- [2013/11/19 font definitions for T1/ybdj.]
+ [0000/00/00 font definitions for T1/ybdj.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{T1}{ybdj}{}
\DeclareFontShape{T1}{ybdj}{m}{n}{
- <-> ybdrj8t
+ <-> \ybd@@scale ybdrj8t
}{}
\DeclareFontShape{T1}{ybdj}{m}{sc}{
- <-> ybdrcj8t
+ <-> \ybd@@scale ybdrcj8t
}{}
\DeclareFontShape{T1}{ybdj}{m}{it}{
- <-> ybdrij8t
+ <-> \ybd@@scale ybdrij8t
}{}
-\DeclareFontShape{T1}{ybdj}{m}{si}{
- <-> ybdrcij8t
+\DeclareFontShape{T1}{ybdj}{m}{scit}{
+ <-> \ybd@@scale ybdrcij8t
}{}
\DeclareFontShape{T1}{ybdj}{b}{n}{
- <-> ybdbj8t
+ <-> \ybd@@scale ybdbj8t
}{}
\DeclareFontShape{T1}{ybdj}{b}{sc}{
- <-> ybdbcj8t
+ <-> \ybd@@scale ybdbcj8t
}{}
\DeclareFontShape{T1}{ybdj}{b}{it}{
- <-> ybdbij8t
+ <-> \ybd@@scale ybdbij8t
}{}
-\DeclareFontShape{T1}{ybdj}{b}{si}{
- <-> ybdbcij8t
+\DeclareFontShape{T1}{ybdj}{b}{scit}{
+ <-> \ybd@@scale ybdbcij8t
}{}
\DeclareFontShape{T1}{ybdj}{m}{sl}{<->ssub * ybdj/m/it}{}
+\DeclareFontShape{T1}{ybdj}{m}{si}{<->ssub * ybdj/m/scit}{}
\DeclareFontShape{T1}{ybdj}{b}{sl}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{T1}{ybdj}{bx}{n}{<->ssub * ybdj/b/n}{}
\DeclareFontShape{T1}{ybdj}{bx}{sc}{<->ssub * ybdj/b/sc}{}
\DeclareFontShape{T1}{ybdj}{bx}{it}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{T1}{ybdj}{bx}{sl}{<->ssub * ybdj/b/sl}{}
+\DeclareFontShape{T1}{ybdj}{bx}{scit}{<->ssub * ybdj/b/scit}{}
+\DeclareFontShape{T1}{ybdj}{b}{si}{<->ssub * ybdj/bx/scit}{}
\DeclareFontShape{T1}{ybdj}{bx}{si}{<->ssub * ybdj/b/si}{}
\endinput
+%%
+%% End of file `t1ybdj.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd.fd
index 98b8ae9b482..96ab3f0f514 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybd.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybd.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybd.fd}
- [2013/11/19 font definitions for TS1/ybd.]
+ [0000/00/00 font definitions for TS1/ybd.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybd}{}
\DeclareFontShape{TS1}{ybd}{m}{n}{
- <-> ybdr8c
+ <-> \ybd@@scale ybdr8c
}{}
\DeclareFontShape{TS1}{ybd}{m}{sc}{
- <-> ybdrc8c
+ <-> \ybd@@scale ybdrc8c
}{}
\DeclareFontShape{TS1}{ybd}{m}{it}{
- <-> ybdri8c
+ <-> \ybd@@scale ybdri8c
}{}
-\DeclareFontShape{TS1}{ybd}{m}{si}{
- <-> ybdrci8c
+\DeclareFontShape{TS1}{ybd}{m}{scit}{
+ <-> \ybd@@scale ybdrci8c
}{}
\DeclareFontShape{TS1}{ybd}{b}{n}{
- <-> ybdb8c
+ <-> \ybd@@scale ybdb8c
}{}
\DeclareFontShape{TS1}{ybd}{b}{sc}{
- <-> ybdbc8c
+ <-> \ybd@@scale ybdbc8c
}{}
\DeclareFontShape{TS1}{ybd}{b}{it}{
- <-> ybdbi8c
+ <-> \ybd@@scale ybdbi8c
}{}
-\DeclareFontShape{TS1}{ybd}{b}{si}{
- <-> ybdbci8c
+\DeclareFontShape{TS1}{ybd}{b}{scit}{
+ <-> \ybd@@scale ybdbci8c
}{}
\DeclareFontShape{TS1}{ybd}{m}{sl}{<->ssub * ybd/m/it}{}
+\DeclareFontShape{TS1}{ybd}{m}{si}{<->ssub * ybd/m/scit}{}
\DeclareFontShape{TS1}{ybd}{b}{sl}{<->ssub * ybd/b/it}{}
\DeclareFontShape{TS1}{ybd}{bx}{n}{<->ssub * ybd/b/n}{}
\DeclareFontShape{TS1}{ybd}{bx}{sc}{<->ssub * ybd/b/sc}{}
\DeclareFontShape{TS1}{ybd}{bx}{it}{<->ssub * ybd/b/it}{}
\DeclareFontShape{TS1}{ybd}{bx}{sl}{<->ssub * ybd/b/sl}{}
+\DeclareFontShape{TS1}{ybd}{bx}{scit}{<->ssub * ybd/b/scit}{}
+\DeclareFontShape{TS1}{ybd}{b}{si}{<->ssub * ybd/bx/scit}{}
\DeclareFontShape{TS1}{ybd}{bx}{si}{<->ssub * ybd/b/si}{}
\endinput
+%%
+%% End of file `ts1ybd.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd0.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd0.fd
index 9ccca6262a5..1fd2b97178a 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd0.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd0.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybd0.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybd0.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd0')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybd0.fd}
- [2013/11/19 font definitions for TS1/ybd0.]
+ [0000/00/00 font definitions for TS1/ybd0.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybd0}{}
\DeclareFontShape{TS1}{ybd0}{m}{n}{
- <-> ybdr08c
+ <-> \ybd@@scale ybdr08c
}{}
\DeclareFontShape{TS1}{ybd0}{m}{sc}{
- <-> ybdr0c8c
+ <-> \ybd@@scale ybdr0c8c
}{}
\DeclareFontShape{TS1}{ybd0}{m}{it}{
- <-> ybdr0i8c
+ <-> \ybd@@scale ybdr0i8c
}{}
-\DeclareFontShape{TS1}{ybd0}{m}{si}{
- <-> ybdr0ci8c
+\DeclareFontShape{TS1}{ybd0}{m}{scit}{
+ <-> \ybd@@scale ybdr0ci8c
}{}
\DeclareFontShape{TS1}{ybd0}{b}{n}{
- <-> ybdb08c
+ <-> \ybd@@scale ybdb08c
}{}
\DeclareFontShape{TS1}{ybd0}{b}{sc}{
- <-> ybdb0c8c
+ <-> \ybd@@scale ybdb0c8c
}{}
\DeclareFontShape{TS1}{ybd0}{b}{it}{
- <-> ybdb0i8c
+ <-> \ybd@@scale ybdb0i8c
}{}
-\DeclareFontShape{TS1}{ybd0}{b}{si}{
- <-> ybdb0ci8c
+\DeclareFontShape{TS1}{ybd0}{b}{scit}{
+ <-> \ybd@@scale ybdb0ci8c
}{}
\DeclareFontShape{TS1}{ybd0}{m}{sl}{<->ssub * ybd0/m/it}{}
+\DeclareFontShape{TS1}{ybd0}{m}{si}{<->ssub * ybd0/m/scit}{}
\DeclareFontShape{TS1}{ybd0}{b}{sl}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{TS1}{ybd0}{bx}{n}{<->ssub * ybd0/b/n}{}
\DeclareFontShape{TS1}{ybd0}{bx}{sc}{<->ssub * ybd0/b/sc}{}
\DeclareFontShape{TS1}{ybd0}{bx}{it}{<->ssub * ybd0/b/it}{}
\DeclareFontShape{TS1}{ybd0}{bx}{sl}{<->ssub * ybd0/b/sl}{}
+\DeclareFontShape{TS1}{ybd0}{bx}{scit}{<->ssub * ybd0/b/scit}{}
+\DeclareFontShape{TS1}{ybd0}{b}{si}{<->ssub * ybd0/bx/scit}{}
\DeclareFontShape{TS1}{ybd0}{bx}{si}{<->ssub * ybd0/b/si}{}
\endinput
+%%
+%% End of file `ts1ybd0.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd1.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd1.fd
index dc2fff6a1d5..fd7cc35deaf 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd1.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd1.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybd1.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybd1.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd1')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybd1.fd}
- [2013/11/19 font definitions for TS1/ybd1.]
+ [0000/00/00 font definitions for TS1/ybd1.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybd1}{}
\DeclareFontShape{TS1}{ybd1}{m}{n}{
- <-> ybdr18c
+ <-> \ybd@@scale ybdr18c
}{}
\DeclareFontShape{TS1}{ybd1}{m}{sc}{
- <-> ybdr1c8c
+ <-> \ybd@@scale ybdr1c8c
}{}
\DeclareFontShape{TS1}{ybd1}{m}{it}{
- <-> ybdr1i8c
+ <-> \ybd@@scale ybdr1i8c
}{}
-\DeclareFontShape{TS1}{ybd1}{m}{si}{
- <-> ybdr1ci8c
+\DeclareFontShape{TS1}{ybd1}{m}{scit}{
+ <-> \ybd@@scale ybdr1ci8c
}{}
\DeclareFontShape{TS1}{ybd1}{b}{n}{
- <-> ybdb18c
+ <-> \ybd@@scale ybdb18c
}{}
\DeclareFontShape{TS1}{ybd1}{b}{sc}{
- <-> ybdb1c8c
+ <-> \ybd@@scale ybdb1c8c
}{}
\DeclareFontShape{TS1}{ybd1}{b}{it}{
- <-> ybdb1i8c
+ <-> \ybd@@scale ybdb1i8c
}{}
-\DeclareFontShape{TS1}{ybd1}{b}{si}{
- <-> ybdb1ci8c
+\DeclareFontShape{TS1}{ybd1}{b}{scit}{
+ <-> \ybd@@scale ybdb1ci8c
}{}
\DeclareFontShape{TS1}{ybd1}{m}{sl}{<->ssub * ybd1/m/it}{}
+\DeclareFontShape{TS1}{ybd1}{m}{si}{<->ssub * ybd1/m/scit}{}
\DeclareFontShape{TS1}{ybd1}{b}{sl}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{TS1}{ybd1}{bx}{n}{<->ssub * ybd1/b/n}{}
\DeclareFontShape{TS1}{ybd1}{bx}{sc}{<->ssub * ybd1/b/sc}{}
\DeclareFontShape{TS1}{ybd1}{bx}{it}{<->ssub * ybd1/b/it}{}
\DeclareFontShape{TS1}{ybd1}{bx}{sl}{<->ssub * ybd1/b/sl}{}
+\DeclareFontShape{TS1}{ybd1}{bx}{scit}{<->ssub * ybd1/b/scit}{}
+\DeclareFontShape{TS1}{ybd1}{b}{si}{<->ssub * ybd1/bx/scit}{}
\DeclareFontShape{TS1}{ybd1}{bx}{si}{<->ssub * ybd1/b/si}{}
\endinput
+%%
+%% End of file `ts1ybd1.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2.fd
index be30aed66e0..046e1f0438d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybd2.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybd2.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd2')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybd2.fd}
- [2013/11/19 font definitions for TS1/ybd2.]
+ [0000/00/00 font definitions for TS1/ybd2.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybd2}{}
\DeclareFontShape{TS1}{ybd2}{m}{n}{
- <-> ybdr28c
+ <-> \ybd@@scale ybdr28c
}{}
\DeclareFontShape{TS1}{ybd2}{m}{sc}{
- <-> ybdr2c8c
+ <-> \ybd@@scale ybdr2c8c
}{}
\DeclareFontShape{TS1}{ybd2}{m}{it}{
- <-> ybdr2i8c
+ <-> \ybd@@scale ybdr2i8c
}{}
-\DeclareFontShape{TS1}{ybd2}{m}{si}{
- <-> ybdr2ci8c
+\DeclareFontShape{TS1}{ybd2}{m}{scit}{
+ <-> \ybd@@scale ybdr2ci8c
}{}
\DeclareFontShape{TS1}{ybd2}{b}{n}{
- <-> ybdb28c
+ <-> \ybd@@scale ybdb28c
}{}
\DeclareFontShape{TS1}{ybd2}{b}{sc}{
- <-> ybdb2c8c
+ <-> \ybd@@scale ybdb2c8c
}{}
\DeclareFontShape{TS1}{ybd2}{b}{it}{
- <-> ybdb2i8c
+ <-> \ybd@@scale ybdb2i8c
}{}
-\DeclareFontShape{TS1}{ybd2}{b}{si}{
- <-> ybdb2ci8c
+\DeclareFontShape{TS1}{ybd2}{b}{scit}{
+ <-> \ybd@@scale ybdb2ci8c
}{}
\DeclareFontShape{TS1}{ybd2}{m}{sl}{<->ssub * ybd2/m/it}{}
+\DeclareFontShape{TS1}{ybd2}{m}{si}{<->ssub * ybd2/m/scit}{}
\DeclareFontShape{TS1}{ybd2}{b}{sl}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{TS1}{ybd2}{bx}{n}{<->ssub * ybd2/b/n}{}
\DeclareFontShape{TS1}{ybd2}{bx}{sc}{<->ssub * ybd2/b/sc}{}
\DeclareFontShape{TS1}{ybd2}{bx}{it}{<->ssub * ybd2/b/it}{}
\DeclareFontShape{TS1}{ybd2}{bx}{sl}{<->ssub * ybd2/b/sl}{}
+\DeclareFontShape{TS1}{ybd2}{bx}{scit}{<->ssub * ybd2/b/scit}{}
+\DeclareFontShape{TS1}{ybd2}{b}{si}{<->ssub * ybd2/bx/scit}{}
\DeclareFontShape{TS1}{ybd2}{bx}{si}{<->ssub * ybd2/b/si}{}
\endinput
+%%
+%% End of file `ts1ybd2.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2j.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2j.fd
index 8bade82ba42..361a597cc9d 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2j.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2j.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybd2j.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybd2j.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd2j')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybd2j.fd}
- [2013/11/19 font definitions for TS1/ybd2j.]
+ [0000/00/00 font definitions for TS1/ybd2j.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybd2j}{}
\DeclareFontShape{TS1}{ybd2j}{m}{n}{
- <-> ybdr2j8c
+ <-> \ybd@@scale ybdr2j8c
}{}
\DeclareFontShape{TS1}{ybd2j}{m}{sc}{
- <-> ybdr2cj8c
+ <-> \ybd@@scale ybdr2cj8c
}{}
\DeclareFontShape{TS1}{ybd2j}{m}{it}{
- <-> ybdr2ij8c
+ <-> \ybd@@scale ybdr2ij8c
}{}
-\DeclareFontShape{TS1}{ybd2j}{m}{si}{
- <-> ybdr2cij8c
+\DeclareFontShape{TS1}{ybd2j}{m}{scit}{
+ <-> \ybd@@scale ybdr2cij8c
}{}
\DeclareFontShape{TS1}{ybd2j}{b}{n}{
- <-> ybdb2j8c
+ <-> \ybd@@scale ybdb2j8c
}{}
\DeclareFontShape{TS1}{ybd2j}{b}{sc}{
- <-> ybdb2cj8c
+ <-> \ybd@@scale ybdb2cj8c
}{}
\DeclareFontShape{TS1}{ybd2j}{b}{it}{
- <-> ybdb2ij8c
+ <-> \ybd@@scale ybdb2ij8c
}{}
-\DeclareFontShape{TS1}{ybd2j}{b}{si}{
- <-> ybdb2cij8c
+\DeclareFontShape{TS1}{ybd2j}{b}{scit}{
+ <-> \ybd@@scale ybdb2cij8c
}{}
\DeclareFontShape{TS1}{ybd2j}{m}{sl}{<->ssub * ybd2j/m/it}{}
+\DeclareFontShape{TS1}{ybd2j}{m}{si}{<->ssub * ybd2j/m/scit}{}
\DeclareFontShape{TS1}{ybd2j}{b}{sl}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{TS1}{ybd2j}{bx}{n}{<->ssub * ybd2j/b/n}{}
\DeclareFontShape{TS1}{ybd2j}{bx}{sc}{<->ssub * ybd2j/b/sc}{}
\DeclareFontShape{TS1}{ybd2j}{bx}{it}{<->ssub * ybd2j/b/it}{}
\DeclareFontShape{TS1}{ybd2j}{bx}{sl}{<->ssub * ybd2j/b/sl}{}
+\DeclareFontShape{TS1}{ybd2j}{bx}{scit}{<->ssub * ybd2j/b/scit}{}
+\DeclareFontShape{TS1}{ybd2j}{b}{si}{<->ssub * ybd2j/bx/scit}{}
\DeclareFontShape{TS1}{ybd2j}{bx}{si}{<->ssub * ybd2j/b/si}{}
\endinput
+%%
+%% End of file `ts1ybd2j.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2jw.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2jw.fd
new file mode 100644
index 00000000000..9c652412cb0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2jw.fd
@@ -0,0 +1,87 @@
+%%
+%% This is file `ts1ybd2jw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd2j')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
+
+
+\ProvidesFile{ts1ybd2jw.fd}
+ [0000/00/00 font definitions for TS1/ybd2jw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
+
+\DeclareFontFamily{TS1}{ybd2jw}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{m}{n}{
+ <-> \ybd@@scale ybdr2j8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{m}{sc}{
+ <-> \ybd@@scale ybdr2cj8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{m}{it}{
+ <-> \ybd@@scale ybdr2ij8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{m}{scit}{
+ <-> \ybd@@scale ybdr2cij8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{b}{n}{
+ <-> \ybd@@scale ybdb2j8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{b}{sc}{
+ <-> \ybd@@scale ybdb2cj8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{b}{it}{
+ <-> \ybd@@scale ybdb2ij8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{b}{scit}{
+ <-> \ybd@@scale ybdb2cij8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2jw}{m}{sl}{<->ssub * ybd2j/m/it}{}
+\DeclareFontShape{TS1}{ybd2jw}{m}{si}{<->ssub * ybd2j/m/scit}{}
+\DeclareFontShape{TS1}{ybd2jw}{b}{sl}{<->ssub * ybd2j/b/it}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{n}{<->ssub * ybd2j/b/n}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{sc}{<->ssub * ybd2j/b/sc}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{it}{<->ssub * ybd2j/b/it}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{sl}{<->ssub * ybd2j/b/sl}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{scit}{<->ssub * ybd2j/b/scit}{}
+\DeclareFontShape{TS1}{ybd2jw}{b}{si}{<->ssub * ybd2j/bx/scit}{}
+\DeclareFontShape{TS1}{ybd2jw}{bx}{si}{<->ssub * ybd2j/b/si}{}
+
+\endinput
+%%
+%% End of file `ts1ybd2jw.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2w.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2w.fd
new file mode 100644
index 00000000000..872ca9465ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybd2w.fd
@@ -0,0 +1,87 @@
+%%
+%% This is file `ts1ybd2w.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd2')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
+
+
+\ProvidesFile{ts1ybd2w.fd}
+ [0000/00/00 font definitions for TS1/ybd2w.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
+
+\DeclareFontFamily{TS1}{ybd2w}{}
+
+\DeclareFontShape{TS1}{ybd2w}{m}{n}{
+ <-> \ybd@@scale ybdr28c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{m}{sc}{
+ <-> \ybd@@scale ybdr2c8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{m}{it}{
+ <-> \ybd@@scale ybdr2i8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{m}{scit}{
+ <-> \ybd@@scale ybdr2ci8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{b}{n}{
+ <-> \ybd@@scale ybdb28c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{b}{sc}{
+ <-> \ybd@@scale ybdb2c8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{b}{it}{
+ <-> \ybd@@scale ybdb2i8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{b}{scit}{
+ <-> \ybd@@scale ybdb2ci8c
+}{}
+
+\DeclareFontShape{TS1}{ybd2w}{m}{sl}{<->ssub * ybd2/m/it}{}
+\DeclareFontShape{TS1}{ybd2w}{m}{si}{<->ssub * ybd2/m/scit}{}
+\DeclareFontShape{TS1}{ybd2w}{b}{sl}{<->ssub * ybd2/b/it}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{n}{<->ssub * ybd2/b/n}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{sc}{<->ssub * ybd2/b/sc}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{it}{<->ssub * ybd2/b/it}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{sl}{<->ssub * ybd2/b/sl}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{scit}{<->ssub * ybd2/b/scit}{}
+\DeclareFontShape{TS1}{ybd2w}{b}{si}{<->ssub * ybd2/bx/scit}{}
+\DeclareFontShape{TS1}{ybd2w}{bx}{si}{<->ssub * ybd2/b/si}{}
+
+\endinput
+%%
+%% End of file `ts1ybd2w.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybdj.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdj.fd
index e41025fc2cc..0f896e26da4 100644
--- a/Master/texmf-dist/tex/latex/berenisadf/ts1ybdj.fd
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdj.fd
@@ -1,51 +1,87 @@
-%Filename: ts1ybdj.fd
-%Based on a file created using fontinst v1.928
+%%
+%% This is file `ts1ybdj.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybdj')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ybdj.fd}
- [2013/11/19 font definitions for TS1/ybdj.]
+ [0000/00/00 font definitions for TS1/ybdj.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
\DeclareFontFamily{TS1}{ybdj}{}
\DeclareFontShape{TS1}{ybdj}{m}{n}{
- <-> ybdrj8c
+ <-> \ybd@@scale ybdrj8c
}{}
\DeclareFontShape{TS1}{ybdj}{m}{sc}{
- <-> ybdrcj8c
+ <-> \ybd@@scale ybdrcj8c
}{}
\DeclareFontShape{TS1}{ybdj}{m}{it}{
- <-> ybdrij8c
+ <-> \ybd@@scale ybdrij8c
}{}
-\DeclareFontShape{TS1}{ybdj}{m}{si}{
- <-> ybdrcij8c
+\DeclareFontShape{TS1}{ybdj}{m}{scit}{
+ <-> \ybd@@scale ybdrcij8c
}{}
\DeclareFontShape{TS1}{ybdj}{b}{n}{
- <-> ybdbj8c
+ <-> \ybd@@scale ybdbj8c
}{}
\DeclareFontShape{TS1}{ybdj}{b}{sc}{
- <-> ybdbcj8c
+ <-> \ybd@@scale ybdbcj8c
}{}
\DeclareFontShape{TS1}{ybdj}{b}{it}{
- <-> ybdbij8c
+ <-> \ybd@@scale ybdbij8c
}{}
-\DeclareFontShape{TS1}{ybdj}{b}{si}{
- <-> ybdbcij8c
+\DeclareFontShape{TS1}{ybdj}{b}{scit}{
+ <-> \ybd@@scale ybdbcij8c
}{}
\DeclareFontShape{TS1}{ybdj}{m}{sl}{<->ssub * ybdj/m/it}{}
+\DeclareFontShape{TS1}{ybdj}{m}{si}{<->ssub * ybdj/m/scit}{}
\DeclareFontShape{TS1}{ybdj}{b}{sl}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{TS1}{ybdj}{bx}{n}{<->ssub * ybdj/b/n}{}
\DeclareFontShape{TS1}{ybdj}{bx}{sc}{<->ssub * ybdj/b/sc}{}
\DeclareFontShape{TS1}{ybdj}{bx}{it}{<->ssub * ybdj/b/it}{}
\DeclareFontShape{TS1}{ybdj}{bx}{sl}{<->ssub * ybdj/b/sl}{}
+\DeclareFontShape{TS1}{ybdj}{bx}{scit}{<->ssub * ybdj/b/scit}{}
+\DeclareFontShape{TS1}{ybdj}{b}{si}{<->ssub * ybdj/bx/scit}{}
\DeclareFontShape{TS1}{ybdj}{bx}{si}{<->ssub * ybdj/b/si}{}
\endinput
+%%
+%% End of file `ts1ybdj.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybdjw.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdjw.fd
new file mode 100644
index 00000000000..1b253001756
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdjw.fd
@@ -0,0 +1,87 @@
+%%
+%% This is file `ts1ybdjw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybdj')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
+
+
+\ProvidesFile{ts1ybdjw.fd}
+ [0000/00/00 font definitions for TS1/ybdjw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
+
+\DeclareFontFamily{TS1}{ybdjw}{}
+
+\DeclareFontShape{TS1}{ybdjw}{m}{n}{
+ <-> \ybd@@scale ybdrj8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{m}{sc}{
+ <-> \ybd@@scale ybdrcj8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{m}{it}{
+ <-> \ybd@@scale ybdrij8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{m}{scit}{
+ <-> \ybd@@scale ybdrcij8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{b}{n}{
+ <-> \ybd@@scale ybdbj8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{b}{sc}{
+ <-> \ybd@@scale ybdbcj8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{b}{it}{
+ <-> \ybd@@scale ybdbij8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{b}{scit}{
+ <-> \ybd@@scale ybdbcij8c
+}{}
+
+\DeclareFontShape{TS1}{ybdjw}{m}{sl}{<->ssub * ybdj/m/it}{}
+\DeclareFontShape{TS1}{ybdjw}{m}{si}{<->ssub * ybdj/m/scit}{}
+\DeclareFontShape{TS1}{ybdjw}{b}{sl}{<->ssub * ybdj/b/it}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{n}{<->ssub * ybdj/b/n}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{sc}{<->ssub * ybdj/b/sc}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{it}{<->ssub * ybdj/b/it}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{sl}{<->ssub * ybdj/b/sl}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{scit}{<->ssub * ybdj/b/scit}{}
+\DeclareFontShape{TS1}{ybdjw}{b}{si}{<->ssub * ybdj/bx/scit}{}
+\DeclareFontShape{TS1}{ybdjw}{bx}{si}{<->ssub * ybdj/b/si}{}
+
+\endinput
+%%
+%% End of file `ts1ybdjw.fd'.
diff --git a/Master/texmf-dist/tex/latex/berenisadf/ts1ybdw.fd b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdw.fd
new file mode 100644
index 00000000000..c1c5777e688
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/berenisadf/ts1ybdw.fd
@@ -0,0 +1,87 @@
+%%
+%% This is file `ts1ybdw.fd',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% berenisadf.dtx (with options: `fd-ts1ybd')
+%%
+%% -------------------------------------------------
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% berenisadf. You may however distribute the package berenisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%% -------------------------------------------------
+
+
+\ProvidesFile{ts1ybdw.fd}
+ [0000/00/00 font definitions for TS1/ybdw.]
+ \expandafter\ifx\csname ybd@scale\endcsname\relax
+ \let\ybd@@scale\@empty
+ \else
+ \edef\ybd@@scale{s*[\csname ybd@scale\endcsname]}%
+ \fi
+
+\DeclareFontFamily{TS1}{ybdw}{}
+
+\DeclareFontShape{TS1}{ybdw}{m}{n}{
+ <-> \ybd@@scale ybdr8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{m}{sc}{
+ <-> \ybd@@scale ybdrc8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{m}{it}{
+ <-> \ybd@@scale ybdri8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{m}{scit}{
+ <-> \ybd@@scale ybdrci8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{b}{n}{
+ <-> \ybd@@scale ybdb8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{b}{sc}{
+ <-> \ybd@@scale ybdbc8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{b}{it}{
+ <-> \ybd@@scale ybdbi8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{b}{scit}{
+ <-> \ybd@@scale ybdbci8c
+}{}
+
+\DeclareFontShape{TS1}{ybdw}{m}{sl}{<->ssub * ybd/m/it}{}
+\DeclareFontShape{TS1}{ybdw}{m}{si}{<->ssub * ybd/m/scit}{}
+\DeclareFontShape{TS1}{ybdw}{b}{sl}{<->ssub * ybd/b/it}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{n}{<->ssub * ybd/b/n}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{sc}{<->ssub * ybd/b/sc}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{it}{<->ssub * ybd/b/it}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{sl}{<->ssub * ybd/b/sl}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{scit}{<->ssub * ybd/b/scit}{}
+\DeclareFontShape{TS1}{ybdw}{b}{si}{<->ssub * ybd/bx/scit}{}
+\DeclareFontShape{TS1}{ybdw}{bx}{si}{<->ssub * ybd/b/si}{}
+
+\endinput
+%%
+%% End of file `ts1ybdw.fd'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
index cb0c1aa4f5b..3a52993eb91 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{american-oxref.lbx}
[\Version\space American English conventions required by the biblatex-oxref styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
index f319e7d6397..05fe2abfc79 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{british-oxref.lbx}
[\Version\space British English conventions required by the biblatex-oxref styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
index 34619d7c2b9..52390c70e4d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
@@ -13,14 +13,14 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{english-oxref.lbx}
[\Version\space Generic English conventions required by the biblatex-oxref styles]
\InheritBibliographyExtras{english}
\DeclareBibliographyExtras{%
\def\finalandcomma{\addcomma}%
- \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}%
+ \def\blx@ox@langbibstring#1#2{#1\setunit*{\addspace}\bibstring{#2}}%
}
\UndeclareBibliographyExtras{%
\def\blx@ox@langbibstring#1#2{\bibstring{#2}}%
@@ -141,11 +141,11 @@
byreviser = {{revised by}{rev\adddot}},
byreviewer = {{reviewed by}{rev\adddot}},
bycollaborator = {{in collaboration with}{in collab\adddotspace with}},
- bytranslator = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang}},
+ bytranslator = {{translated by}{trans\adddot}},
bycommentator = {{commented by}{comm\adddot}},
byannotator = {{annotated by}{annot\adddot}},
- byeditortr = {{edited and translated \lbx@lfromlang\ by}%
- {ed\adddotspace and trans\adddot\ \lbx@sfromlang}},
+ byeditortr = {{edited and translated by}%
+ {ed\adddotspace and trans\adddot}},
byeditorco = {{edited and commented by}%
{ed\adddotspace and comm\adddot}},
byeditoran = {{edited and annotated by}%
@@ -156,16 +156,16 @@
{ed.\adddotspace with foreword}},
byeditoraf = {{edited, with an afterword, by}%
{ed.\adddotspace with afterword}},
- byeditortrco = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}},
- byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}%
- {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}},
- byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}%
- {with introduction, ed\adddotspace and trans\adddot\ \lbx@sfromlang}},
- byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}%
- {with foreword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}},
- byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}%
- {with afterword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}},
+ byeditortrco = {{edited, translated\finalandcomma\ and commented by}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
+ byeditortran = {{edited, translated\finalandcomma\ and annotated by}%
+ {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
+ byeditortrin = {{edited and translated, with an introduction, by}%
+ {with introduction, ed\adddotspace and trans\adddot}},
+ byeditortrfo = {{edited and translated, with a foreword, by}%
+ {with foreword, ed\adddotspace and trans\adddot}},
+ byeditortraf = {{edited and translated, with an afterword, by}%
+ {with afterword, ed\adddotspace and trans\adddot}},
byeditorcoin = {{edited and commented, with an introduction, by}%
{with introduction, ed\adddotspace and comm\adddot}},
byeditorcofo = {{edited and commented, with a foreword, by}%
@@ -178,41 +178,40 @@
{with foreword, ed\adddotspace and annot\adddot}},
byeditoranaf = {{edited and annotated, with an afterword, by}%
{with afterword, ed\adddotspace and annot\adddot}},
- byeditortrcoin = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}%
- {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}},
- byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}%
- {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}},
- byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}%
- {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}},
- byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}%
- {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}},
- byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}%
- {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}},
- byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}%
- {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}},
- bytranslatorco = {{translated \lbx@lfromlang\ and commented by}%
- {trans\adddot\ \lbx@sfromlang\ and comm\adddot}},
- bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}%
- {trans\adddot\ \lbx@sfromlang\ and annot\adddot}},
- bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}%
- {trans\adddot\ \lbx@sfromlang\ with introduction}},
- bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}%
- {trans\adddot\ \lbx@sfromlang\ with foreword}},
- bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}%
- {trans\adddot\ \lbx@sfromlang\ with afterword}},
- bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}%
- {with introduction, trans\adddot\ \lbx@sfromlang\ and comm\adddot}},
- bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}%
- {with foreword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}},
- bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}%
- {with afterword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}},
- bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}%
- {with introduction, trans\adddot\ \lbx@sfromlang\ and annot\adddot}},
- bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}%
- {with foreword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}},
- bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}%
- {with afterword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}},
- withintroduction = {{with an introduction by}{with an introduction by}},
+ byeditortrcoin = {{edited, translated\finalandcomma\ and commented, with an introduction, by}%
+ {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
+ byeditortrcofo = {{edited, translated\finalandcomma\ and commented, with a foreword, by}%
+ {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
+ byeditortrcoaf = {{edited, translated\finalandcomma\ and commented, with an afterword, by}%
+ {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}},
+ byeditortranin = {{edited, translated\finalandcomma\ and annotated, with an introduction, by}%
+ {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
+ byeditortranfo = {{edited, translated\finalandcomma\ and annotated, with a foreword, by}%
+ {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
+ byeditortranaf = {{edited, translated\finalandcomma\ and annotated, with an afterword, by}%
+ {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}},
+ bytranslatorco = {{translated and commented by}%
+ {trans\adddotspace and comm\adddot}},
+ bytranslatoran = {{translated and annotated by}%
+ {trans\adddotspace and annot\adddot}},
+ bytranslatorin = {{translated, with an introduction, by}%
+ {trans\adddotspace with introduction}},
+ bytranslatorfo = {{translated, with a foreword, by}%
+ {trans\adddotspace with foreword}},
+ bytranslatoraf = {{translated, with an afterword, by}%
+ {trans\adddotspace with afterword}},
+ bytranslatorcoin = {{translated and commented, with an introduction, by}%
+ {with introduction, trans\adddotspace and comm\adddot}},
+ bytranslatorcofo = {{translated and commented, with a foreword, by}%
+ {with foreword, trans\adddotspace and comm\adddot}},
+ bytranslatorcoaf = {{translated and commented, with an afterword, by}%
+ {with afterword, trans\adddotspace and comm\adddot}},
+ bytranslatoranin = {{translated and annotated, with an introduction, by}%
+ {with introduction, trans\adddotspace and annot\adddot}},
+ bytranslatoranfo = {{translated and annotated, with a foreword, by}%
+ {with foreword, trans\adddotspace and annot\adddot}},
+ bytranslatoranaf = {{translated and annotated, with an afterword, by}%
+ {with afterword, trans\adddotspace and annot\adddot}},
withcommentator = {{with a commentary by}{with a commentary by}},
withannotator = {{with annotations by}{with annotations by}},
withintroduction = {{with an introduction by}{with an introduction by}},
@@ -241,8 +240,10 @@
idempp = {{eidem}{eid\adddot}},
citedas = {{henceforth}{henceforth}},
thiscite = {{at}{at}},
- langamerican = {{English}{Eng\adddot}},
- langbrazilian = {{Brazilian}{Braz\adddot}},
+ langamerican = {{American English}{Amer\adddotspace Eng\adddot}},
+ langbasque = {{Basque}{Basq\adddot}},
+ langbrazilian = {{Brazilian Portuguese}{Braz\adddotspace Port\adddot}},
+ langbulgarian = {{Bulgarian}{Bulg\adddot}},
langcatalan = {{Catalan}{Catal\adddot}},
langcroatian = {{Croatian}{Croat\adddot}},
langczech = {{Czech}{Czech}},
@@ -252,17 +253,28 @@
langestonian = {{Estonian}{Eston\adddot}},
langfinnish = {{Finnish}{Finn\adddot}},
langfrench = {{French}{Fr\adddot}},
+ langgalician = {{Galician}{Galic\adddot}},
langgerman = {{German}{Ger\adddot}},
langgreek = {{Greek}{Gr\adddot}},
+ langhungarian = {{Hungarian}{Hung\adddot}},
langitalian = {{Italian}{It\adddot}},
+ langjapanese = {{Japanese}{Jap\adddot}},
langlatin = {{Latin}{Lat\adddot}},
+ langlatvian = {{Latvian}{Latv\adddot}},
+ langlithuanian = {{Lithuanian}{Lith\adddot}},
+ langmarathi = {{Marathi}{Mar\adddot}},
langnorwegian = {{Norwegian}{Norw\adddot}},
langpolish = {{Polish}{Pol\adddot}},
langportuguese = {{Portuguese}{Port\adddot}},
+ langromanian = {{Romanian}{Rom\adddot}},
langrussian = {{Russian}{Russ\adddot}},
+ langserbian = {{Serbian}{Serb\adddot}},
+ langslovak = {{Slovak}{Slovak}},
langslovene = {{Slovene}{Slov\adddot}},
langspanish = {{Spanish}{Sp\adddot}},
langswedish = {{Swedish}{Swed\adddot}},
+ langturkish = {{Turkish}{Turk\adddot}},
+ langukrainian = {{Ukrainian}{Ukr\adddot}},
}
%%
%% Copyright (C) 2016–2023 Alex Ball
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
index 473f6c42d16..c73fc2c95aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.bbx}
[\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
index f3541bff4a7..9c2a9ab2c46 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.cbx}
[\Version\space Alphabetic citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
index bd625202764..9045cf9d648 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
index 04b5c3b8406..ef1d0322c64 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
index 252b66b4f1b..848885d55e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
index 28562c9fbe6..d44e3a3a5a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
index d26e0a6d13e..e5f7d577ec8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
index 2f0cf8d67ef..40f4557fde4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
index 5b0e6eaa836..0e3d066ce73 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
index bb224734c16..0603f3fc93e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
index c2150b32312..e68736b15a7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
index a9f26d759c4..2f96f373283 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
index e5d42ab3991..760d14f8daa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
index f4e37274395..7609ff7ef85 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
index f7b6c3a0f9a..6674482e133 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
index 28c6f1c1f1f..1bb2b1ad334 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
index 7209c8cacaf..6b62164597b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
index 1df1385c14f..dcc6f60853b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
index e024aabcdf5..8dd8c41ce17 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
index 146c6c2afb8..1afe5861dc9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
index cf6bf1b8c2d..d0dcb90db08 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
index fad740be0cc..84c4da00d8e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
index 7302e4fb091..359ea4fd779 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
index fb723c3fc58..936e7428a30 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
index 6adedef4b24..7ff5c440a83 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.bbx}
[\Version\space Numeric bibliography style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
index d5d672b2ce9..c543e3adb7a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.cbx}
[\Version\space Numeric citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
index bc0a1e0cd0f..7f8955c4ae3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
index 8c904ae44ad..e761352b5f2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxref.bbx}
[\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style]
@@ -55,6 +55,7 @@
\newcommand*{\uscasetitlepunct}{\addcomma\space}
\renewcommand*{\relateddelim}{\addsemicolon\space}
\DeclareDelimFormat{revsdnamedelim}{\addcomma}
+\DeclareDelimFormat[pair]{revsdnamedelim}{}
\DeclareDelimFormat{authortypedelim}{\addspace}
\DeclareDelimFormat{editortypedelim}{\addspace}
\DeclareDelimFormat{translatortypedelim}{\addspace}
@@ -96,7 +97,7 @@
and
test {\ifdefvoid{#2}}%
}{}{%
- \printdelim{revsdnamedelim}}%
+ \printdelim{revsdnamepunct}}%
\ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}%
\ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
}{%
@@ -111,10 +112,22 @@
and
test {\ifdefvoid{#3}}%
}{}{%
- \printdelim{revsdnamedelim}}%
+ \printdelim{revsdnamepunct}}%
\ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}%
\ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
\ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
+\renewbibmacro*{name:revsdelim}{%
+ \ifboolexpr{
+ (
+ test {\ifnumequal{\value{liststop}}{1}}
+ and
+ test \ifmorenames
+ )
+ or
+ test {\ifnumequal{\value{liststop}}{2}}
+ }
+ {\printdelim{revsdnamedelim}}
+ {}}
\def\blx@ox@lasthash{}
\DeclareNameFormat{bib-family-given/cite-given-family}{%
\iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}%
@@ -159,13 +172,22 @@
\renewcommand*{\mkbibnametitle}[1]{##1}%
}{}%
\ifboolexpe{%
- test {\ifnumgreater{\value{listcount}}{1}}
- or (
+ test {\ifnumequal{\value{listcount}}{\@ne}}
+ and
+ (
+ test {\ifnumless{\value{listcount}}{\value{liststop}}}
+ or
+ test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}}
+ or
+ test {\ifandothers{\currentname}}
+ )
+ and not
+ (
test {\ifdefvoid\namepartgiven}
and
test {\ifdefvoid\namepartprefix}
)
- }{}{\usebibmacro{name:revsdelim}}%
+ }{\usebibmacro{name:revsdelim}}{}%
}{%
\ifgiveninits{%
\ifitemannotation{pseudo}{%
@@ -201,6 +223,10 @@
\savefield{hash}{\blx@ox@lasthash}%
}%
\ifitemannotation{inferred}{\bibclosebracket}{}%
+ \ifitemannotation{variant}{%
+ \global\settoggle{blx@ox@variantname}{true}%
+ }{%
+ \global\settoggle{blx@ox@variantname}{false}}%
\usebibmacro{name:andothers}%
\iffieldannotation{inferred}{%
\ifboolexpr{
@@ -256,13 +282,20 @@
}{%
\global\settoggle{blx@ox@variantname}{false}}%
\ifboolexpe{%
- test {\ifnumgreater{\value{listcount}}{1}}
- or (
+ (
+ test {\ifnumless{\value{listcount}}{\value{liststop}}}
+ or
+ test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}}
+ or
+ test {\ifandothers{\currentname}}
+ )
+ and not
+ (
test {\ifdefvoid\namepartgiven}
and
test {\ifdefvoid\namepartprefix}
)
- }{}{\usebibmacro{name:revsdelim}}%
+ }{\usebibmacro{name:revsdelim}}{}%
\usebibmacro{name:andothers}}
\xpatchbibmacro{name:given-family}%
{\bibnamedelimd\mkbibnamesuffix{#4}}%
@@ -274,9 +307,22 @@
{}{\wlog{WARNING: biblatex-oxref failed to patch name:family-given}}
\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}}
\DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}}
+\newbibmacro*{namepair:delim}[3]{%
+ \ifnumgreater{#2}{\@ne}{%
+ \ifnumless{#2}{#3}{%
+ \printdelim{multinamedelim}%
+ }{%
+ \ifnumgreater{#3}{\c@maxnames}{%
+ \c@liststop\c@minnames
+ }{%
+ \c@liststop#3}%
+ \lbx@finalnamedelim{#1}}%
+ }{}}
+\DeclareFieldFormat{expanded}{\mkbibparens{#1}}
\newcounter{namepairs}
\newsavebox{\blx@ox@namebox}
\newsavebox{\blx@ox@altnamebox}
+\newtoggle{blx@ox@thispairvariant}%
\newbibmacro*{namepairs}[2]{%
\setcounter{namepairs}{0}%
\savebibmacro{name:andothers}%
@@ -300,48 +346,58 @@
)
}{%
\stepcounter{namepairs}%
- \ifnumgreater{\value{namepairs}}{1}{%
- \ifnumequal{\value{#1}}{2}{%
- \setunit*{\addspace\bibstring{and}\addspace}%
- }{%
- \ifnumequal{\value{namepairs}}{\value{#1}}{%
- \setunit*{\addcomma\space\bibstring{and}\addspace}%
- }{%
- \setunit*{\addcomma\space}%
- }%
- }%
- }{}%
\savebox{\blx@ox@namebox}{%
\printnames[#1][\value{namepairs}-\value{namepairs}]{#1}%
}%
\let\blx@ox@firsthash=\blx@ox@lasthash
+ \savebox{\blx@ox@altnamebox}{%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}%
+ }%
+ \let\blx@ox@secondhash=\blx@ox@lasthash
+ \iftoggle{blx@ox@variantname}{%
+ \toggletrue{blx@ox@thispairvariant}%
+ }{%
+ \togglefalse{blx@ox@thispairvariant}%
+ }%
\IfEndWith{#2}{addon}{%
- \savebox{\blx@ox@altnamebox}{%
- \printnames[by#1][\value{namepairs}-\value{namepairs}]{#2}%
- }%
- \let\blx@ox@secondhash=\blx@ox@lasthash
+ \usebibmacro{namepair:delim}%
+ {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}%
\ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{%
- \unhbox\blx@ox@namebox
+ \hbox{}\unhbox\blx@ox@namebox
}{%
- \unhbox\blx@ox@namebox\addspace
- \iftoggle{blx@ox@variantname}{%
+ \iftoggle{blx@ox@thispairvariant}{%
\ifbibliography{%
- \printtext[namevariant]{\printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}%
- }{}%
+ \delimcontext{pair}%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}%
+ \setunit{\addspace}%
+ \printtext[namevariant]{%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}%
+ }{%
+ \hbox{}\unhbox\blx@ox@namebox
+ }%
}{%
- \printtext[nameaddon]{\unhbox\blx@ox@altnamebox}%
+ \delimcontext{pair}%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}%
+ \setunit{\addspace}%
+ \printtext[nameaddon]{%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}%
+ }%
}%
}%
}{%
- \savebox{\blx@ox@altnamebox}{%
- \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}%
- }%
- \let\blx@ox@secondhash=\blx@ox@lasthash
\ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{%
- \unhbox\blx@ox@namebox
+ \usebibmacro{namepair:delim}%
+ {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}%
+ \hbox{}\unhbox\blx@ox@namebox
}{%
- \unhbox\blx@ox@altnamebox
- \addspace\mkbibparens{\unhbox\blx@ox@namebox}%
+ \usebibmacro{namepair:delim}%
+ {\unhbox\blx@ox@altnamebox}{\value{namepairs}}{\value{#1}}%
+ \delimcontext{pair}%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}%
+ \setunit{\addspace}%
+ \printtext[expanded]{%
+ \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}%
+ }%
}%
}%
}%
@@ -724,12 +780,12 @@
\DeclareFieldFormat{pages}{%
\iffieldundef{bookpagination}%
{\mkcomprange{#1}}%
- {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}%
+ {\mkpageprefix[bookpagination][\mkcomprange]{#1}}%
}
\DeclareFieldFormat{postnote}{%
\iffieldundef{pagination}%
{\mkcomprange{#1}}%
- {\mkcomprange[{\mkpageprefix}]{#1}}%
+ {\mkpageprefix[pagination][\mkcomprange]{#1}}%
}
\DeclareBibliographyOption{nopublisher}[true]{%
@@ -1116,6 +1172,7 @@
}{%
\mkbibquote{#1\isdot}}}
\DeclareFieldFormat[inreference]{title}{\mkbibquote{#1\isdot}}
+\newcommand*{\mkvolroman}[1]{\Rn{#1}}
\DeclareFieldFormat[book,mvbook,bookinbook,inbook,suppbook,%
collection,mvcollection,incollection,suppcollection,%
proceedings,mvproceedings,inproceedings,%
@@ -1123,11 +1180,11 @@ reference,mvreference,inreference]{volume}{%
\IfSubStr{#1}{-}{%
\StrCount{#1}{-}[\blx@ox@dashnum]%
\StrBefore{#1}{-}[\blx@ox@volnum]%
- \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash
+ \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash
\StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]%
- \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}%
+ \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}%
}{%
- \ifinteger{#1}{\Rn{#1}}{#1}}}
+ \ifinteger{#1}{\mkvolroman{#1}}{#1}}}
\newbibmacro*{maintitle+volume}{%
\ifboolexpr{
test {\iffieldundef{maintitle}}
@@ -1162,7 +1219,21 @@ reference,mvreference,inreference]{volume}{%
\PackageError{biblatex-oxref}
{Invalid option 'bookseries=#1'}
{Valid values are 'in' and 'out'.}}}}
+\newbibmacro*{listpair:delim}[3]{%
+ \ifnumgreater{#2}{\@ne}{%
+ \ifnumless{#2}{#3}{%
+ \printdelim{multilistdelim}%
+ }{%
+ \c@liststop#3%
+ \lbx@finallistdelim{#1}}%
+ }{}}
\newcounter{locpubpairs}
+\DeclareListFormat{locpub}{%
+ \usebibmacro{listpair:delim}%
+ {#1}{\value{locpubpairs}}{\value{location}}%
+ #1\isdot
+}
+\newsavebox{\blx@ox@locbox}
\newbibmacro*{edition+publisher+location+date}{%
\printlist{origlocation}%
\iflistundef{origpublisher}%
@@ -1193,19 +1264,8 @@ reference,mvreference,inreference]{volume}{%
test {\ifnumcomp{\value{locpubpairs}}{<}{\value{publisher}}}
}{%
\stepcounter{locpubpairs}%
- \ifnumcomp{\value{locpubpairs}}{>}{1}{%
- \ifnumequal{\value{publisher}}{2}{%
- \setunit*{\addspace\bibstring{and}\addspace}%
- }{%
- \ifnumequal{\value{locpubpairs}}{\value{publisher}}{%
- \setunit*{\addcomma\space\bibstring{and}\addspace}%
- }{%
- \setunit*{\addcomma\space}%
- }%
- }%
- }{}%
- \printlist[][\value{locpubpairs}-\value{locpubpairs}]{location}%
- \setunit*{\addcolon\space}%
+ \printlist[locpub][\value{locpubpairs}-\value{locpubpairs}]{location}%
+ \setunit{\addcolon\space}%
\printlist[][\value{locpubpairs}-\value{locpubpairs}]{publisher}%
}%
\restorebibmacro{list:andothers}%
@@ -2750,7 +2810,11 @@ reference,mvreference,inreference]{volume}{%
\setcounter{blx@tmpcnt}{\value{listcount}}%
\addtocounter{blx@tmpcnt}{1}%
\ifnumequal{\value{blx@tmpcnt}}{\value{listtotal}}{%
- #1\space\bibstring{and}\addspace
+ \ifnumgreater{\value{listtotal}}{2}{%
+ #1\finalandcomma\space\bibstring{and}\addspace
+ }{%
+ #1\space\bibstring{and}\addspace
+ }
}{%
#1\addcomma\space}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
index 5456cee2974..c129b90113d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.bbx}
[\Version\space Author-year bibliography style inspired by the Oxford Guide to Style]
@@ -321,11 +321,6 @@
\setunit*{\addspace}%
\usebibmacro{date+extradate}%
}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (lasthash)}}%
-\xpatchbibmacro{namepairs}{%
- \printnames[by#1]%
-}{%
- \printnames[#1]%
-}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}}
\xpatchbibmacro{author+altauthor}{%
\printnames{author}%
}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
index 91413cd2cdf..b25b2d2aace 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.cbx}
[\Version\space Author-year citation style inspired by the Oxford Guide to Style]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
index 9f7891c9312..fdde6d5d8e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.dbx}
[\Version\space Data model for the Oxref family of styles]
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx
new file mode 100644
index 00000000000..d0747e2f058
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx
@@ -0,0 +1,311 @@
+%%
+%% This is file `polish-oxref.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% oxref.dtx (with options: `lbx,pl')
+%% ----------------------------------------------------------------
+%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style
+%% Author: Alex Ball
+%% E-mail: a.j.ball@bath.ac.uk
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See: http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\def\Version{2024/08/26 v3.3}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{polish-oxref.lbx}
+ [\Version\space Polish conventions required by the biblatex-oxref styles]
+\InheritBibliographyExtras{polish}
+\DeclareBibliographyExtras{%
+ \DeclareDelimFormat{revsdnamedelim}{}%
+ \savecommand\makebbx@dateii
+ \def\makebbx@dateii#1#2#3{%
+ \blx@imc@stripzeros{#3}~\lbx@pl@mkbibmonth{#2}%
+ \space
+ #1}%
+ \savecommand\mkvolroman
+ \renewcommand*{\mkvolroman}[1]{\RN{#1}}%
+ \savecommand\blx@ox@compyear
+ \renewcommand*{\blx@ox@compyear}[2]{#2}%
+ \savefieldformat{pages}%
+ \DeclareFieldFormat{pages}{%
+ \iffieldundef{bookpagination}%
+ {\mknormrange{#1}}%
+ {\mkpageprefix[bookpagination][\mknormrange]{#1}}%
+ }%
+ \savefieldformat{postnote}%
+ \DeclareFieldFormat{postnote}{%
+ \iffieldundef{pagination}%
+ {\mknormrange{#1}}%
+ {\mkpageprefix[pagination][\mknormrange]{#1}}%
+ }%
+ \savefieldformat{edition}%
+ \DeclareFieldFormat{edition}{%
+ \ifinteger{#1}
+ {\bibstring{edition}~\mkbibordedition{#1}}
+ {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}}%
+}
+\UndeclareBibliographyExtras{%
+ \DeclareDelimFormat{revsdnamedelim}{\addcomma}%
+ \restorecommand\makebbx@dateii
+ \restorecommand\mkvolroman
+ \restorecommand\blx@ox@compyear
+ \restorefieldformat{pages}%
+ \restorefieldformat{postnote}%
+ \restorefieldformat{edition}%
+}
+\DeclareBibliographyStrings{%
+ inherit = {polish},
+ director = {{re\.{z}yser}{re\.{z}\adddot}},
+ directors = {{re\.{z}yserzy}{re\.{z}\adddot}},
+ performer = {{wykonawca}{wyk\adddot}},
+ performers = {{wykonawcy}{wyk\adddot}},
+ reader = {{czytelnik}{czytelnik}},
+ readers = {{czytelnicy}{czytelnicy}},
+ conductor = {{dyrygent}{dyr\adddot}},
+ conductors = {{dyrygenci}{dyr\adddot}},
+ serieseditor = {{redaktor serii}{red\adddotspace serii}},
+ serieseditors = {{redaktor serii}{red\adddotspace serii}},
+ holder = {{w\l a\'{s}ciciel}{w\l a\'{s}ciciel}},
+ holders = {{w\l a\'{s}ciciele}{w\l a\'{s}ciciele}},
+ editorcm = {{redaktor i~kompilator}{red\adddotspace i~kompilator}},
+ editorcms = {{redaktorzy i~kompilatorzy}{red\adddotspace i~kompilatorzy}},
+ byperformer = {{wykonawca}{wyk\adddot}},
+ bydirector = {{re\.{z}yseria}{re\.{z}\adddot}},
+ byreader = {{czyta}{czyta}},
+ byconductor = {{kieruje}{kier\adddot}},
+ byserieseditor = {{redakcja}{red\adddot}},
+ byholder = {{w~posiadaniu}{w~posiadaniu}},
+ byeditorcm = {{redakcja i~opracowanie}{red\adddotspace i~oprac\adddot}},
+ facsimile = {{wydanie faksymile}{wyd\adddotspace faksymile}},
+ revised = {{wydanie poprawione}{wyd\adddotspace popr\adddot}},
+ revisedenlarged = {{wydanie poprawione i~rozszerzone}{wyd\adddotspace popr\addotspace i~rozszerz\adddot}},
+ revisedreprint = {{przedruk poprawiony}{przedr\adddotspace popr\adddot}},
+ suppto = {{dodatek do}{dod\adddotspace do}},
+ equals = {{=}{=}},
+ original = {{oryginalny}{oryg\adddot}},
+ amendedby = {{zmienione przez}{zmien\adddotspace przez}},
+ inpressin = {{z\l o\.{z}one do}{z\l o\.{z}one do}},
+ book = {{ksi\k{e}ga}{ks\adddot}},
+ books = {{ksi\k{e}gi}{ks\adddot}},
+ canto = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}},
+ cantos = {{pie\'{s}ni}{pie\'{s}ni}},
+ stanza = {{zwrotka}{zwr\adddot}},
+ stanzas = {{zwrotki}{zwr\adddot}},
+ act = {{akt}{a\adddot}},
+ acts = {{akty}{aa\adddot}},
+ scene = {{scena}{sc\adddot}},
+ scenes = {{sceny}{sc\adddot}},
+ folio = {{karta}{k\adddot}},
+ folios = {{karty}{kk\adddot}},
+ article = {{artyku\l }{art\adddot}},
+ articles = {{artyku\l y}{art\adddot}},
+ clause = {{klauzula}{klauz\adddot}},
+ clauses = {{klauzule}{klauz\adddot}},
+ regulation = {{rozporz\k{a}dzenie}{rozp\adddot}},
+ regulations = {{rozporz\k{a}dzenia}{rozp\adddot}},
+ rule = {{przepis}{przep\adddot}},
+ rules = {{przepisy}{przep\adddot}},
+ booktotal = {{ksi\k{e}ga}{ks\adddot}},
+ booktotals = {{ksi\k{e}gi}{ks\adddot}},
+ cantototal = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}},
+ cantototals = {{pie\'{s}ni}{pie\'{s}ni}},
+ stanzatotal = {{zwrotka}{zwr\adddot}},
+ stanzatotals = {{zwrotki}{zwr\adddot}},
+ acttotal = {{akt}{a\adddot}},
+ acttotals = {{akty}{aa\adddot}},
+ scenetotal = {{scena}{sc\adddot}},
+ scenetotals = {{sceny}{sc\adddot}},
+ foliototal = {{karta}{k\adddot}},
+ foliototals = {{karty}{kk\adddot}},
+ articletotal = {{artyku\l }{art\adddot}},
+ articletotals = {{artyku\l y}{art\adddot}},
+ clausetotal = {{klauzula}{klauz\adddot}},
+ clausetotals = {{klauzule}{klauz\adddot}},
+ regulationtotal = {{rozporz\k{a}dzenie}{rozp\adddot}},
+ regulationtotals = {{rozporz\k{a}dzenia}{rozp\adddot}},
+ ruletotal = {{przepis}{przep\adddot}},
+ ruletotals = {{przepisy}{przep\adddot}},
+ facebook = {{wpis na Facebooku}{wpis na Facebooku}},
+ tweet = {{wpis na Twitterze}{wpis na Twitterze}},
+ podcast = {{podcast}{podcast}},
+ clip = {{wideo}{wideo}},
+ webcast = {{webcast}{webcast}},
+ poster = {{plakat}{plakat}},
+ nolocation = {{bez miejsca}{b\adddot m\adddot}},
+ modified = {{ostatnio zmodyfikowany}{ostatnio zmodyf\adddot}},
+ recorded = {{nagrane}{nagr\adddot}},
+ uploaded = {{za\l adowane}{za\l ad\adddot}},
+ filed = {{wniesione}{wniesione}},
+ issued = {{wydany}{wyd\adddot}},
+ anon = {{Anonim}{Anon\adddot}},
+ pseudo = {{Pseudo-}{Ps\adddot-}},
+ urldown = {{pobrane}{pobrane}},
+ countryjp = {{Japonia}{JP}},
+ patentjp = {{japo\'{n}ski patent}{jap\adddotspace pat\adddot}},
+ patreqjp = {{japo\'{n}ski wniosek patentowy}{jap\adddotspace wniosek pat\adddot}},
+ 1column = {{jedna kolumna}{1\addnbspace kol\adddot}},
+ 2column = {{dwie kolumny}{2\addnbspace kol\adddot}},
+ inflayer = {{warstwa ni\.{z}sza}{warstwa ni\.{z}sza}},
+ suplayer = {{warstwa wy\.{z}sza}{warstwa wy\.{z}sza}},
+ paper = {{gazeta}{gazeta}},
+ papyrus = {{papirus}{papirus}},
+ parchment = {{pergamin}{pergamin}},
+ eucase = {{sprawa}{sprawa}},
+ eujoinedcases = {{po\l \k{a}czone sprawy}{po\l \k{a}czone sprawy}},
+ commissiondecision = {{decyzja komisji}{decyzja komisji}},
+ application = {{wniosek}{wniosek}},
+ order = {{polecenie}{polecenie}},
+ bill = {{rachunek}{rachunek}},
+ draft = {{projekt}{proj\adddot}},
+ opened = {{przed\l o\.{z}one do podpisu}{przed\l\adddotspace do podp\adddot}},
+ signed = {{podpisane}{podpisane}},
+ adopted = {{przyj\k{e}te}{przyj\k{e}te}},
+ inforce = {{wesz\l o w~\.{z}ycie}{wesz\l o w~\.{z}ycie}},
+ byeditor = {{redakcja}{red\adddot}},
+ bycompiler = {{opracowanie}{oprac\adddot}},
+ byfounder = {{za\l o\.{z}one przez}{za\l o\.{z}\adddotspace przez}},
+ bycontinuator = {{kontynuowane przez}{kont\adddotspace przez}},
+ byredactor = {{redakcja}{red\adddot}},
+ byreviser = {{poprawki}{popr\adddot}},
+ byreviewer = {{recenzja}{rec\adddot}},
+ bycollaborator = {{we wsp\'{o}\l pracy z}{we wsp\'{o}\l pr\adddotspace z}},
+ bytranslator = {{t\l umaczenie}{t\l um\adddot}},
+ bycommentator = {{komentarz}{kom\adddot}},
+ byannotator = {{obja\'{s}nienia}{obja\'{s}n\adddot}},
+ byeditortr = {{redakcja i~t\l umaczenie}%
+ {red\adddotspace i~t\l um\adddot}},
+ byeditorco = {{redakcja i~komentarz}%
+ {red\adddotspace i~kom\adddot}},
+ byeditoran = {{redakcja i~obja\'{s}nienia}%
+ {red\adddotspace i~obja\'{s}n\adddot}},
+ byeditorin = {{redakcja i~wst\k{e}p}%
+ {red\adddotspace i~wst\k{e}p}},
+ byeditorfo = {{redakcja i~przedmowa}%
+ {red\adddotspace i~przedm\adddot}},
+ byeditoraf = {{redakcja i~pos\l owie}%
+ {red\adddotspace i~pos\l \adddot}},
+ byeditortrco = {{redakcja, t\l umaczenie i~komentarz}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace kom\adddot}},
+ byeditortran = {{redakcja, t\l umaczenie i~obja\'{s}nienia}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n\adddot}},
+ byeditortrin = {{redakcja, t\l umaczenie, wst\k{e}p}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace wst\k{e}p}},
+ byeditortrfo = {{redakcja, t\l umaczenie, przedmowa}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace przedm\adddot}},
+ byeditortraf = {{redakcja, t\l umaczenie, pos\l \adddot}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace pos\l \adddot}},
+ byeditorcoin = {{redakcja, komentarz, wst\k{e}p}%
+ {red.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}},
+ byeditorcofo = {{redakcja, komentarz i~przedmowa}%
+ {red.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}},
+ byeditorcoaf = {{redakcja, komentarz, pos\l owie}%
+ {red.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}},
+ byeditoranin = {{redakcja, obja\'{s}nienia, wst\k{e}p}%
+ {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}},
+ byeditoranfo = {{redakcja, obja\'{s}nienia, przedmowa}%
+ {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}},
+ byeditoranaf = {{redakcja, obja\'{s}nienia, pos\l owie}%
+ {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}},
+ byeditortrcoin = {{redakcja, t\l umaczenie, komentarz, wst\k{e}p}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}},
+ byeditortrcofo = {{redakcja, t\l umaczenie, komentarz, przedmowa}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}},
+ byeditortrcoaf = {{redakcja, t\l umaczenie, komentarz, pos\l owie}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}},
+ byeditortranin = {{redakcja, t\l umaczenie, obja\'{s}nienia, wst\k{e}p}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}},
+ byeditortranfo = {{redakcja, t\l umaczenie, obja\'{s}nienia, przedmowa}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}},
+ byeditortranaf = {{redakcja, t\l umaczenie, obja\'{s}nienia, pos\l owie}%
+ {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}},
+ bytranslatorco = {{t\l umaczenie i~komentarz}%
+ {t\l um\adddotspace i~kom\adddot}},
+ bytranslatoran = {{t\l umaczenie i~obja\'{s}nienia}%
+ {t\l um\adddotspace i~obja\'{s}n\adddot}},
+ bytranslatorin = {{t\l umaczenie i~wst\k{e}p}%
+ {t\l um.,\addabbrvspace wst\k{e}p}},
+ bytranslatorfo = {{t\l umaczenie i~przedmowa}%
+ {t\l um.,\addabbrvspace przedm\adddot}},
+ bytranslatoraf = {{t\l umaczenie i~pos\l owie}%
+ {t\l um.,\addabbrvspace pos\l \adddot}},
+ bytranslatorcoin = {{t\l umaczenie, komentarz i~wst\k{e}p}%
+ {t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}},
+ bytranslatorcofo = {{t\l umaczenie, komentarz i~przedmowa}%
+ {t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}},
+ bytranslatorcoaf = {{t\l umaczenie, komentarz i~pos\l owie}%
+ {t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}},
+ bytranslatoranin = {{t\l umaczenie, obja\'{s}nienia i~wst\k{e}p}%
+ {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}},
+ bytranslatoranfo = {{t\l umaczenie, obja\'{s}nienia i~przedmowa}%
+ {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}},
+ bytranslatoranaf = {{t\l umaczenie, obja\'{s}nienia i~pos\l owie}%
+ {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}},
+ withcommentator = {{komentarz}{komentarz}},
+ withannotator = {{obja\'{s}nienia}{obja\'{s}nienia}},
+ withintroduction = {{wst\k{e}p}{wst\k{e}p}},
+ withforeword = {{przedmowa}{przedmowa}},
+ withafterword = {{pos\l owie}{pos\l owie}},
+ introduction = {{wst\k{e}p}{wst\k{e}p}},
+ newseries = {{nowa seria}{nowa seria}},
+ oldseries = {{dawna seria}{dawna seria}},
+ edition = {{wydanie}{wyd\adddot}},
+ reviewof = {{recenzja}{rec\adddot}},
+ reprintfrom = {{przedruk z}{przedr\adddotspace z}},
+ translationas = {{t\l umaczenie polskie}{t\l um\adddotspace pol\adddotspace}},
+ origpubin = {{pierwodruk w}{pierwodr\adddotspace w}},
+ paragraph = {{ust\k{e}p}{ust\adddot}},
+ paragraphs = {{ust\k{e}py}{ust\adddot}},
+ urlseen = {{dost\k{e}p}{dost\k{e}p}},
+ idem = {{idem}{id\adddot}},
+ idemsm = {{idem}{id\adddot}},
+ idemsf = {{eadem}{ead\adddot}},
+ idemsn = {{idem}{id\adddot}},
+ idempm = {{eidem}{eid\adddot}},
+ idempf = {{eaedem}{eaed\adddot}},
+ idempn = {{eadem}{ead\adddot}},
+ idempp = {{eidem}{eid\adddot}},
+ citedas = {{dalej}{dalej}},
+ thiscite = {{na}{na}},
+ langamerican = {{ameryka\'{n}ski angielski}{amer\adddotspace ang\adddot}},
+ langbasque = {{baskijski}{bask\adddot}},
+ langbrazilian = {{brazylijski portugalski}{braz\adddot port\adddot}},
+ langbulgarian = {{bu\l garski}{bu\l g\adddot}},
+ langcatalan = {{katalo\'{n}ski}{katal\adddot}},
+ langcroatian = {{chorwacki}{chorw\adddot}},
+ langczech = {{czeski}{czeski}},
+ langdanish = {{du\'{n}ski}{du\'{n}\adddot}},
+ langdutch = {{holenderski}{holend\adddot}},
+ langenglish = {{angielski}{ang\adddot}},
+ langestonian = {{esto\'{n}ski}{est\adddot}},
+ langfinnish = {{fi\'{n}ski}{fi\'{n}\adddot}},
+ langfrench = {{francuski}{fr\adddot}},
+ langgalician = {{galicyjski}{galic\adddot}},
+ langgerman = {{niemiecki}{niem\adddot}},
+ langgreek = {{grecki}{gr\adddot}},
+ langhungarian = {{w\k{e}gierski}{w\k{e}g\adddot}},
+ langitalian = {{w\l oski}{w\l \adddot}},
+ langjapanese = {{japo\'{n}ski}{jap\adddot}},
+ langlatin = {{\l aci\'{n}ski}{\l ac\adddot}},
+ langlatvian = {{\l otewski}{\l ot\adddot}},
+ langlithuanian = {{litewski}{lit\adddot}},
+ langmarathi = {{marathi}{mar\adddot}},
+ langnorwegian = {{norweski}{norw\adddot}},
+ langpolish = {{polski}{pol\adddot}},
+ langportuguese = {{portugalski}{port\adddot}},
+ langromanian = {{rumu\'{n}ski}{rum\adddot}},
+ langrussian = {{rosyjski}{ros\adddot}},
+ langserbian = {{serbski}{serb\adddot}},
+ langslovak = {{s\l owacki}{s\l c\adddot}},
+ langslovene = {{s\l owe\'{n}ski}{s\l owe\'{n}\adddot}},
+ langspanish = {{hiszpa\'{n}ski}{hiszp\adddot}},
+ langswedish = {{szwedzki}{szw\adddot}},
+ langturkish = {{turecki}{tur\adddot}},
+ langukrainian = {{ukrai\'{n}ski}{ukr\adddot}},
+}
+%%
+%% Copyright (C) 2016–2023 Alex Ball
+%%
+%% End of file `polish-oxref.lbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx
index d0f2a9e700f..6bf12a1ba55 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{spanish-oxref.lbx}
[\Version\space Spanish conventions required by the biblatex-oxref styles]
@@ -133,11 +133,11 @@
byfounder = {{fundado por}{fund\adddotspace}},
bycontinuator = {{continuado por}{cont\adddotspace}},
bycollaborator = {{colaboraci\'on de}{col\adddotspace de}},
- bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang}},
+ bytranslator = {{traducido por}{trad\adddotspace}},
bycommentator = {{comentado por}{com\adddotspace}},
byannotator = {{anotado por}{anot\adddotspace}},
- byeditortr = {{editado y traducido \lbx@lfromlang\ por}%
- {ed\adddotspace y trad\adddotspace \lbx@sfromlang}},
+ byeditortr = {{editado y traducido por}%
+ {ed\adddotspace y trad\adddotspace}},
byeditorco = {{editado y comentado por}%
{ed\adddotspace y com\adddotspace }},
byeditoran = {{edici\'on y notas de}%
@@ -148,16 +148,16 @@
{ed\adddotspace y pr\'ol\adddotspace}},
byeditoraf = {{edici\'on y ep\'ilogo de}%
{ed\adddotspace y ep\'il\adddotspace}},
- byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace}},
- byeditortran = {{edici\'on, traducci\'on \lbx@lfromlang\ y notas de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y not\adddotspace}},
- byeditortrin = {{edici\'on, traducci\'on \lbx@lfromlang\ e introducci\'on de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace}},
- byeditortrfo = {{edici\'on, traducci\'on \lbx@lfromlang\ y pr\'ologo de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}},
- byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}},
+ byeditortrco = {{editado, traducido y comentado por}%
+ {ed.,\addabbrvspace trad\adddotspace y com\adddotspace}},
+ byeditortran = {{edici\'on, traducci\'on y notas de}%
+ {ed.,\addabbrvspace trad\adddotspace y not\adddotspace}},
+ byeditortrin = {{edici\'on, traducci\'on e introducci\'on de}%
+ {ed.,\addabbrvspace trad\adddotspace e intr\adddotspace}},
+ byeditortrfo = {{edici\'on, traducci\'on y pr\'ologo de}%
+ {ed.,\addabbrvspace trad\adddotspace y pr\'ol\adddotspace}},
+ byeditortraf = {{editado, traducido y epilogado}%
+ {ed.,\addabbrvspace trad\adddotspace y ep\'il\adddotspace}},
byeditorcoin = {{editado, comentado e introducido}%
{ed.,\addabbrvspace com\adddotspace e intr\adddotspace}},
byeditorcofo = {{edici\'on, comentarios y pr\'ologo de}%
@@ -170,40 +170,40 @@
{ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}},
byeditoranaf = {{edici\'on, notas y ep\'ilogo de}%
{ed.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}},
- byeditortrcoin = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}},
- byeditortrcofo = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}},
- byeditortrcoaf = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}},
- byeditortranin = {{edici\'on, traducci\'on \lbx@lfromlang, notas e introducci\'on de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}},
- byeditortranfo = {{edici\'on, traducci\'on \lbx@lfromlang, notas y pr\'ologo de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}},
- byeditortranaf = {{edici\'on, traducci\'on \lbx@lfromlang, notas y ep\'ilogo de}%
- {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}},
- bytranslatorco = {{traducci\'on \lbx@lfromlang\ y comentarios de}%
- {trad\adddotspace \lbx@sfromlang\ y com\adddotspace}},
- bytranslatoran = {{traducci\'on \lbx@lfromlang\ y notas de}%
- {trad\adddotspace \lbx@sfromlang\ y not\adddotspace}},
- bytranslatorin = {{traducci\'on \lbx@lfromlang\ e introducci\'on de}%
- {trad\adddotspace \lbx@sfromlang\ e introd\adddotspace}},
- bytranslatorfo = {{traducci\'on \lbx@lfromlang\ y pr\'ologo de}%
- {trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}},
- bytranslatoraf = {{traducci\'on \lbx@lfromlang\ y ep\'ilogo de}%
- {trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}},
- bytranslatorcoin = {{traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}%
- {trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}},
- bytranslatorcofo = {{traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}%
- {trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}},
- bytranslatorcoaf = {{traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}%
- {trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}},
- bytranslatoranin = {{traducci\'on \lbx@lfromlang, notas e introducci\'on de}%
- {trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}},
- bytranslatoranfo = {{traducci\'on \lbx@lfromlang, notas y pr\'ologo}%
- {trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}},
- bytranslatoranaf = {{traducci\'on \lbx@lfromlang, notas y ep\'ilogo}%
- {trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}},
+ byeditortrcoin = {{edici\'on, traducci\'on, comentarios e introducci\'on de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace e intr\adddotspace}},
+ byeditortrcofo = {{edici\'on, traducci\'on, comentarios y pr\'ologo de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}},
+ byeditortrcoaf = {{edici\'on, traducci\'on, comentarios y ep\'ilogo de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}},
+ byeditortranin = {{edici\'on, traducci\'on, notas e introducci\'on de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}},
+ byeditortranfo = {{edici\'on, traducci\'on, notas y pr\'ologo de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}},
+ byeditortranaf = {{edici\'on, traducci\'on, notas y ep\'ilogo de}%
+ {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}},
+ bytranslatorco = {{traducci\'on y comentarios de}%
+ {trad\adddotspace y com\adddotspace}},
+ bytranslatoran = {{traducci\'on y notas de}%
+ {trad\adddotspace y not\adddotspace}},
+ bytranslatorin = {{traducci\'on e introducci\'on de}%
+ {trad\adddotspace e introd\adddotspace}},
+ bytranslatorfo = {{traducci\'on y pr\'ologo de}%
+ {trad\adddotspace y pr\'ol\adddotspace}},
+ bytranslatoraf = {{traducci\'on y ep\'ilogo de}%
+ {trad\adddotspace y ep\'il\adddotspace}},
+ bytranslatorcoin = {{traducci\'on, comentarios e introducci\'on de}%
+ {trad.,\addabbrvspace com\adddotspace e intr\adddotspace}},
+ bytranslatorcofo = {{traducci\'on, comentarios y pr\'ologo de}%
+ {trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}},
+ bytranslatorcoaf = {{traducci\'on, comentarios y ep\'ilogo de}%
+ {trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}},
+ bytranslatoranin = {{traducci\'on, notas e introducci\'on de}%
+ {trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}},
+ bytranslatoranfo = {{traducci\'on, notas y pr\'ologo}%
+ {trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}},
+ bytranslatoranaf = {{traducci\'on, notas y ep\'ilogo}%
+ {trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}},
withcommentator = {{con comentario de}{con comentario de}},
withannotator = {{con notas de}{con notas de}},
withintroduction = {{con introduci\'on de}{con introduci\'on de}},
@@ -217,38 +217,50 @@
translationas = {{traducido espa\~nol como}{trad\adddotspace espa\~nol como}},
origpubin = {{publicado originalmente en}{pub\adddot orig\adddotspace}},
urlseen = {{accedido}{accedido}},
+ idem = {{idem}{id\adddot}},
+ idemsm = {{idem}{id\adddot}},
+ idemsf = {{eadem}{ead\adddot}},
+ idemsn = {{idem}{id\adddot}},
+ idempm = {{eidem}{eid\adddot}},
+ idempf = {{eaedem}{eaed\adddot}},
+ idempn = {{eadem}{ead\adddot}},
+ idempp = {{eidem}{eid\adddot}},
citedas = {{en adelante}{en adelante}},
thiscite = {{en}{en}},
- langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddotspace}},
- langbrazilian = {{brasile\~no}{por\adddotspace bras\adddotspace}},
- langbulgarian = {{b\'ulgaro}{bul\adddotspace}},
- langcatalan = {{catal\'an}{cat\adddotspace}},
- langcroatian = {{croata}{hrv\adddotspace}},
- langczech = {{checo}{ces\adddotspace}},
- langdanish = {{dan\'es}{dan\adddotspace}},
- langdutch = {{neerland\'es}{nld\adddotspace}},
- langenglish = {{ingl\'es}{ing\adddotspace}},
- langestonian = {{estonio}{est\adddotspace}},
- langfinnish = {{fin\'es}{fin\adddotspace}},
- langfrench = {{franc\'es}{fra\adddotspace}},
- langgalician = {{gallego}{glg\adddotspace}},
- langgerman = {{alem\'an}{ale\adddotspace}},
- langgreek = {{griego}{gr\adddotspace}},
- langhungarian = {{h\'ungaro}{hun\adddotspace}},
- langitalian = {{italiano}{ita\adddotspace}},
- langjapanese = {{japon\'es}{jap\adddotspace}},
- langlatin = {{lat\'in}{lat\adddotspace}},
- langlatvian = {{lituano}{lit\adddotspace}},
- langnorwegian = {{noruego}{nor\adddotspace}},
- langpolish = {{polaco}{pol\adddotspace}},
- langportuguese = {{portugu\'es}{port\adddotspace}},
- langrussian = {{ruso}{rus\adddotspace}},
- langserbian = {{serbio}{srp\adddotspace}},
- langslovak = {{eslovaco}{slk\adddotspace}},
- langslovene = {{esloveno}{slv\adddotspace}},
- langspanish = {{espa\~nol}{esp\adddotspace}},
+ langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddot}},
+ langbasque = {{vasco}{vasc\adddot}},
+ langbrazilian = {{portugu\'es brasile\~no}{por\adddotspace bras\adddot}},
+ langbulgarian = {{b\'ulgaro}{bul\adddot}},
+ langcatalan = {{catal\'an}{cat\adddot}},
+ langcroatian = {{croata}{hrv\adddot}},
+ langczech = {{checo}{ces\adddot}},
+ langdanish = {{dan\'es}{dan\adddot}},
+ langdutch = {{neerland\'es}{nld\adddot}},
+ langenglish = {{ingl\'es}{ing\adddot}},
+ langestonian = {{estonio}{est\adddot}},
+ langfinnish = {{fin\'es}{fin\adddot}},
+ langfrench = {{franc\'es}{fra\adddot}},
+ langgalician = {{gallego}{glg\adddot}},
+ langgerman = {{alem\'an}{ale\adddot}},
+ langgreek = {{griego}{gr\adddot}},
+ langhungarian = {{h\'ungaro}{hun\adddot}},
+ langitalian = {{italiano}{ita\adddot}},
+ langjapanese = {{japon\'es}{jap\adddot}},
+ langlatin = {{lat\'in}{lat\adddot}},
+ langlatvian = {{let\'on}{let\adddot}},
+ langlithuanian = {{lituano}{lit\adddot}},
+ langmarathi = {{marathi}{mar\adddot}},
+ langnorwegian = {{noruego}{nor\adddot}},
+ langpolish = {{polaco}{pol\adddot}},
+ langportuguese = {{portugu\'es}{port\adddot}},
+ langrussian = {{ruso}{rus\adddot}},
+ langserbian = {{serbio}{srp\adddot}},
+ langslovak = {{eslovaco}{slk\adddot}},
+ langslovene = {{esloveno}{slv\adddot}},
+ langspanish = {{espa\~nol}{esp\adddot}},
langswedish = {{sueco}{sueco}},
- langukrainian = {{ucraniano}{ucr\adddotspace}},
+ langturkish = {{turco}{turco}},
+ langukrainian = {{ucraniano}{ucr\adddot}},
}
%%
%% Copyright (C) 2016–2023 Alex Ball
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls b/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls
index 17c168f9f21..ebd30e1991e 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{BMSTU-IU8}[2024/08/17 IU8 class]
+\ProvidesClass{BMSTU-IU8}[2024/09/09 IU8 class]
\LoadClass{article}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty
index c51f336b7cc..11533ec0e71 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-01-base}[2024/08/17 v1.3 Общие требования]
+\ProvidesPackage{IU8-01-base}[2024/09/09 v1.4 Общие требования]
% 6.1.1 Изложение текста и оформление отчета выполняют в соответствии с
% требованиями настоящего стандарта. Страницы текста отчета о НИР и включенные в
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty
index 0c684a57004..38250907292 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-02-construction}[2024/08/17 v1.3 Построение отчета]
+\ProvidesPackage{IU8-02-construction}[2024/09/09 v1.4 Построение отчета]
% 6.2.1 Наименования структурных элементов отчета:
% "СПИСОК ИСПОЛНИТЕЛЕЙ", % у нас не используется
@@ -25,10 +25,11 @@
\renewcommand{\thestructure}{} % Убрать появление счётчика в содержании
\titleclass{\structure}{straight}[\section]
\titleformat{\structure}[hang]{\clearpage\normalfont\bfseries\centering}{}{0em}{}
-\titlespacing*{\structure}{0pt}{0pt}{2\baselineskip}
+\titlespacing*{\structure}{0pt}{0pt}{1em}
\titlecontents{structure}{}{}{}{}
\renewcommand*\l@structure{\@dottedtocline{0}{0mm}{0em}}
+
\newcommand{\structurebreak}{\clearpage}
\newcommand{\sectionbreak}{\clearpage}
@@ -54,6 +55,14 @@
\titlespacing*{\paragraph}{0pt}{2ex}{2ex}[2ex]
\titlespacing*{\subparagraph}{0pt}{2ex}{2ex}[2ex]
+\makeatletter
+\renewcommand*\l@section{\@dottedtocline{0}{12.5mm}{2em}}
+\renewcommand*\l@structure{\@dottedtocline{0}{12.5mm}{0em}}
+\renewcommand*\l@subsection{\@dottedtocline{1}{12.5mm}{3em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{2}{12.5mm}{4em}}
+\renewcommand*\l@paragraph{\@dottedtocline{3}{12.5mm}{5em}}
+\makeatother
+
% 6.2.4 Если заголовок включает несколько предложений, их разделяют точками.
% Переносы слов в заголовках не допускаются.
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty
index 3d0bb94e9fe..7e0ed595e1d 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-03-numbering}[2024/08/17 v1.3 Нумерация страниц отчета]
+\ProvidesPackage{IU8-03-numbering}[2024/09/09 v1.4 Нумерация страниц отчета]
% 6.3.1 Страницы отчета следует нумеровать арабскими цифрами, соблюдая сквозную
% нумерацию по всему тексту отчета, включая приложения. Номер страницы
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty
index af812f58553..ec865d745be 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-04-section-numbering}[2024/08/17 v1.3 Нумерация разделов, подразделов, пунктов, подпунктов и книг отчета]
+\ProvidesPackage{IU8-04-section-numbering}[2024/09/09 v1.4 Нумерация разделов, подразделов, пунктов, подпунктов и книг отчета]
% 6.4.1 Разделы должны иметь порядковые номера в пределах всего отчета,
% обозначенные арабскими цифрами без точки и расположенные с абзацного отступа.
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty
index 4ccda32cdaa..f8536ffed1f 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-05-figures}[2024/08/17 v1.3 Иллюстрации]
+\ProvidesPackage{IU8-05-figures}[2024/09/09 v1.4 Иллюстрации]
% 6.5.1 Иллюстрации (чертежи, графики, схемы, компьютерные распечатки, диаграммы,
% фотоснимки) следует располагать в отчете непосредственно после текста отчета,
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty
index 705924bd99f..52e8358a392 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-06-tables}[2024/08/17 v1.3 Таблицы]
+\ProvidesPackage{IU8-06-tables}[2024/09/09 v1.4 Таблицы]
% Пакеты, которые скорее всего пригодятся
\RequirePackage{tabularx}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty
index 9efd173fb08..2dd2f6e42b0 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-07-footnotes}[2024/08/17 v1.3 Примечания и сноски]
+\ProvidesPackage{IU8-07-footnotes}[2024/09/09 v1.4 Примечания и сноски]
% 6.7.1 Примечания приводят в отчете, если необходимы пояснения или справочные
% данные к содержанию текста, таблиц или графического материала.
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty
index cfe0b98dbda..8e4c8ef43af 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty
@@ -1,5 +1,5 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-08-formulas}[2024/08/17 v1.3 Формулы]
+\ProvidesPackage{IU8-08-formulas}[2024/09/09 v1.4 Формулы]
% Настройки по умолчанию в целом соответствуют ГОСТ \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty
index 6d070074b3d..fb5d4f13cd3 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-09-cites}[2024/08/17 v1.3 Ссылки]
+\ProvidesPackage{IU8-09-cites}[2024/09/09 v1.4 Ссылки]
% 6.9.1 В отчете о НИР рекомендуется приводить ссылки на использованные
% источники. При нумерации ссылок на документы, использованные при составлении
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty
index 97fc11ecc55..fb5e8c949f2 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-10-titlepage}[2024/08/17 v1.3 Титульный лист]
+\ProvidesPackage{IU8-10-titlepage}[2024/09/09 v1.4 Титульный лист]
% Поля для заполнения для ВКР
\def\student#1{\gdef\@student{#1}}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty
index e628023df4d..20ba0e0c481 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty
@@ -1,5 +1,5 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-11-performers}[2024/08/17 v1.3 Список исполниетелей]
+\ProvidesPackage{IU8-11-performers}[2024/09/09 v1.4 Список исполниетелей]
% Т.к. у нас это не используется, я оставляю это пустымы \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty
index c1e1a6dc869..1c389e08f4e 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-12-abstract}[2024/08/17 v1.3 Реферат]
+\ProvidesPackage{IU8-12-abstract}[2024/09/09 v1.4 Реферат]
% 6.12.1 Сведения об общем объеме отчета, количестве книг отчета, иллюстраций,
% таблиц, использованных источников, приложений являются первой компонентой
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty
index 3bd4e677168..c19a7b41b1f 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-13-contents}[2024/08/17 v1.3 Содержание]
+\ProvidesPackage{IU8-13-contents}[2024/09/09 v1.4 Содержание]
% Каждую запись содержания оформляют как отдельный абзац, выровненный влево.
% Номера страниц указывают выровненными по правому краю поля и соединяют
@@ -17,13 +17,16 @@
% ГОСТ 7.32-2017. Пункт 5.4.1:
% Обозначения подразделов приводят после абзацного отступа,
% равного двум знакам, относительно обозначения разделов.
-\renewcommand*\l@subsection{\@dottedtocline{1}{5mm}{3em}}
+\renewcommand*\l@section{\@dottedtocline{1}{5mm}{3em}}
+\renewcommand*\l@subsection{\@dottedtocline{1}{10mm}{3em}}
% ГОСТ 7.32-2017. Пункт 5.4.1:
% Обозначения пунктов приводят после абзацного отступа,
% равного четырем знакам, относительно обозначения разделов.
-\renewcommand*\l@subsubsection{\@dottedtocline{2}{10mm}{4em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{2}{15mm}{4em}}
% Остальное - индуктивно
\renewcommand*\l@paragraph{\@dottedtocline{3}{15mm}{5em}}
+
\setcounter{secnumdepth}{5} % Глубина заголовков - до пятого уровня
\setcounter{tocdepth}{2} % Глубина содержания - до второго уровня
+
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty
index 8378ff28261..544d077a73f 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-14-terms-and-definitions}[2024/08/17 v1.3 Содержание]
+\ProvidesPackage{IU8-14-terms-and-definitions}[2024/09/09 v1.4 Содержание]
\RequirePackage[
acronym,
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty
index 49a5aeb8aa3..ff904e74eea 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-15-list-of-abbreviations}[2024/08/17 v1.3 Содержание]
+\ProvidesPackage{IU8-15-list-of-abbreviations}[2024/09/09 v1.4 Содержание]
\RequirePackage[abbreviations]{glossaries-extra}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty
index 7e7fd9d3475..6236003c9ba 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-16-references}[2024/08/17 v1.3 Список использованных источников]
+\ProvidesPackage{IU8-16-references}[2024/09/09 v1.4 Список использованных источников]
% Сведения об источниках следует располагать в порядке появления ссылок на
% источники в тексте отчета и нумеровать арабскими цифрами с точкой и печатать
@@ -12,10 +12,28 @@
% refsection=structure,
% sorting=ynt,
]{biblatex}
+
+\defbibenvironment{bibliography}
+ {\list
+ {}
+ {\setlength{\leftmargin}{1.25cm}
+ \setlength{\itemindent}{0em}
+ \setlength{\itemsep}{\bibitemsep}
+ \setlength{\parsep}{\bibparsep}}}
+ {\endlist}
+ {\item\printtext[labelnumberwidth]{\printfield{labelprefix}\printfield{labelnumber}}\addspace}
+
\defbibheading{bibliography}[СПИСОК~ИСПОЛЬЗОВАННЫХ~ИСТОЧНИКОВ]{\structure{#1}}
\addto{\captionsrussian}{%
\renewcommand{\contentsname}{СОДЕРЖАНИЕ}
}
+\DefineBibliographyStrings{russian}{%
+ urlseen = {дата обращения},
+}
+
% Специально изменим шрифт для URL, чтобы он соответсвовал ГОСТ и остальному тексту документа
\renewcommand{\UrlFont}{\normalfont}
+
+% Изменяем шрифт для авторов в списке литературы на обычный
+\renewcommand{\mkgostheading}[1]{\normalfont{#1}} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty
index e89c637ec60..9881ec6498d 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-17-appendices}[2024/08/17 v1.3 Приложения]
+\ProvidesPackage{IU8-17-appendices}[2024/09/09 v1.4 Приложения]
\newcommand{\appendixsection}[1]{
\stepcounter{apps}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty
index 44e932a3e9f..9999fd77df5 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{IU8-18-extra}[2024/08/17 v1.3 Разные улучшения]
+\ProvidesPackage{IU8-18-extra}[2024/09/09 v1.4 Разные улучшения]
\RequirePackage{graphicx}
@@ -23,3 +23,18 @@
} % Кликабельные ссылки в pdf
\hbadness=10000
+
+\setlist[enumerate]{
+ leftmargin=\parindent,
+ labelindent=\parindent,
+ align=left,
+ nosep,
+}
+
+\setlist[itemize]{
+ label=\textendash,
+ leftmargin=\parindent,
+ labelindent=\parindent,
+ align=left,
+ nosep,
+}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty
index c5e7d801363..b0c49532dca 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{IU8-19-counters}[2024/08/17 v1.3 Счётчики]
+\ProvidesPackage{IU8-19-counters}[2024/09/09 v1.4 Счётчики]
\RequirePackage{calc}
\RequirePackage{xassoccnt}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty
index 22dd68b97bf..85b7f9e2fa5 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{IU8-20-listing}[2024/08/17 v1.3 Листинги]
+\ProvidesPackage{IU8-20-listing}[2024/09/09 v1.4 Листинги]
\RequirePackage{listings}
\RequirePackage{xcolor}
@@ -10,7 +10,7 @@
\lstdefinestyle{IU8}{
frame=single,
- backgroundcolor=\color{seashell},
+ % backgroundcolor=\color{seashell},
commentstyle=\color{blue},
keywordstyle=\color{magenta},
basicstyle=\ttfamily\footnotesize,
@@ -36,3 +36,25 @@
\newcommand{\listing}[2][]{%
\lstinputlisting[caption={\texttt{\detokenize{#2}}},#1]{#2}%
}
+
+\lstnewenvironment{codelisting}[1][]
+{
+\lstset{
+ frame=single,
+ % backgroundcolor=\color{seashell},
+ commentstyle=\color{blue},
+ keywordstyle=\color{magenta},
+ basicstyle=\ttfamily\footnotesize,
+ breakatwhitespace=false,
+ breaklines=true,
+ captionpos=tl,
+ keepspaces=false,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ extendedchars=\true,
+ tabsize=2,
+ #1
+}
+}
+{} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty
index b72be1370ce..bda74f008c9 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{IU8-21-math}[2024/08/17 v1.3 Математика]
+\ProvidesPackage{IU8-21-math}[2024/09/09 v1.4 Математика]
\RequirePackage{amsthm}
\theoremstyle{definition}
diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty
index 5cf88314627..7232bccaaa6 100644
--- a/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty
+++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty
@@ -1,6 +1,6 @@
% Author: CatInCosmicSpace
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{IU8-22-algorithms}[2024/08/17 v1.3 Алгоритмы]
+\ProvidesPackage{IU8-22-algorithms}[2024/09/09 v1.4 Алгоритмы]
\RequirePackage[linesnumbered,boxruled]{algorithm2e}
\SetAlCapSty{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty b/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
index db98421f720..f4b718e9d45 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
+++ b/Master/texmf-dist/tex/latex/cfr-lm/cfr-lm.sty
@@ -1,182 +1,217 @@
-%% Copyright 2015 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
-%
-% Parts of this file are based on lmodern.sty which is included with
-% the Latin Modern fonts released by GUST and available from
-% http://www.gust.org.pl/projects/e-foundry/latin-modern.
-%
-% Improvements to this file in v1.2 (unpublished) and v1.3 owe almost
-% everything to Enrico Gregorio.
-%
-% v1.4 adds family-specific support for microtype. This draws also on the
-% documentation for the microtype package and MinionPro.sty. MinionPro.sty
-% is available as part of the minionpro package and can be obtain from
-% http://mirror.ctan.org/fonts/minionpro. MinionPro.sty is in the public
-% domain. The documentation for microtype is available in English and German
-% from http://ctan.org/pkg/microtype. It is part of the microtype package which
-% is itself licensed under the LPPL.
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cfr-lm}[2015/02/01 v1.5 cfr-lm for use with LatinModern v2.004]
-\RequirePackage{xkeyval}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
-
-%:boolkeys for roman osf/lf
-\define@boolkey[cfrlm]{rm}{oldstyle}[true]{%
- \ifcfrlm@rm@oldstyle
- \def\cfrlm@rmol{j}%
- \else
- \def\cfrlm@rmol{}%
- \fi}
-\define@boolkey[cfrlm]{rm}{lining}[true]{%
- \ifcfrlm@rm@lining
- \def\cfrlm@rmol{}%
- \else
- \def\cfrlm@rmol{j}%
- \fi}
-
-%:boolkeys for roman prop/tab figures
-\define@boolkey[cfrlm]{rm}{proportional}[true]{%
- \ifcfrlm@rm@proportional
- \def\cfrlm@rmpt{2}%
- \else
- \def\cfrlm@rmpt{}%
- \fi}
-\define@boolkey[cfrlm]{rm}{tabular}[true]{%
- \ifcfrlm@rm@tabular
- \def\cfrlm@rmpt{}%
- \else
- \def\cfrlm@rmpt{2}%
- \fi}
-
-%:boolkeys for sans osf/lf
-\define@boolkey[cfrlm]{sf}{oldstyle}[true]{%
- \ifcfrlm@sf@oldstyle
- \def\cfrlm@sfol{j}%
- \else
- \def\cfrlm@sfol{}%
- \fi}
-\define@boolkey[cfrlm]{sf}{lining}[true]{%
- \ifcfrlm@sf@lining
- \def\cfrlm@sfol{}%
- \else
- \def\cfrlm@sfol{j}%
- \fi}
-
-%:boolkeys for sans prop/tab figures
-\define@boolkey[cfrlm]{sf}{proportional}[true]{%
- \ifcfrlm@sf@proportional
- \def\cfrlm@sfpt{2}%
- \else
- \def\cfrlm@sfpt{}%
- \fi}
-\define@boolkey[cfrlm]{sf}{tabular}[true]{%
- \ifcfrlm@sf@tabular
- \def\cfrlm@sfpt{}%
- \else
- \def\cfrlm@sfpt{2}%
- \fi}
-
-%:boolkeys for typewriter osf/lf
-\define@boolkey[cfrlm]{tt}{oldstyle}[true]{%
- \ifcfrlm@tt@oldstyle
- \def\cfrlm@ttol{j}%
- \else
- \def\cfrlm@ttol{}%
- \fi}
-\define@boolkey[cfrlm]{tt}{lining}[true]{%
- \ifcfrlm@tt@lining
- \def\cfrlm@ttol{}%
- \else
- \def\cfrlm@ttol{j}%
- \fi}
-
-%:boolkeys for typewriter prop/tab figures
-\define@boolkey[cfrlm]{tt}{proportional}[true]{%
- \ifcfrlm@tt@proportional
- \def\cfrlm@ttpt{2}%
- \else
- \def\cfrlm@ttpt{}%
- \fi}
-\define@boolkey[cfrlm]{tt}{tabular}[true]{%
- \ifcfrlm@tt@tabular
- \def\cfrlm@ttpt{}%
- \else
- \def\cfrlm@ttpt{2}%
- \fi}
-
-%:boolkeys for typewriter mono/variable width
-\define@boolkey[cfrlm]{tt}{monowidth}[true]{%
- \ifcfrlm@tt@monowidth
- \def\cfrlm@ttmv{t}%
- \else
- \def\cfrlm@ttmv{v}%
- \fi}
-\define@boolkey[cfrlm]{tt}{variable}[true]{%
- \ifcfrlm@tt@variable
- \def\cfrlm@ttmv{v}%
- \else
- \def\cfrlm@ttmv{t}%
- \fi}
-
-%:options for roman
-\define@key{cfr-lm.sty}{rm}{%
- \setkeys[cfrlm]{rm}{#1}}
-
-%:options for sans
-\define@key{cfr-lm.sty}{sf}{%
- \setkeys[cfrlm]{sf}{#1}}
-
-%:options for typewriter
-\define@key{cfr-lm.sty}{tt}{%
- \setkeys[cfrlm]{tt}{#1}}
+%%
+%% This is file `cfr-lm.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% cfr-lm.dtx (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% cfr-lm. You may however distribute the package cfr-lm without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%:note that this option does nothing unless \qtfont is defined appropriately
-\define@boolkey{cfr-lm.sty}[cfrlm@]{qt}[true]{%
- \relax}
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{rm={oldstyle,proportional},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
-%\ExecuteOptionsX{rm={lining,tabular},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
-%:options override defaults
-\ProcessOptionsX
-
-%:make LM default for all families, implementing options for each
-\renewcommand{\rmdefault}{clm\cfrlm@rmpt\cfrlm@rmol}
-\renewcommand{\sfdefault}{clm\cfrlm@sfpt\cfrlm@sfol s}
-\renewcommand{\ttdefault}{clm\cfrlm@ttpt\cfrlm@ttol\cfrlm@ttmv}
-
-%:handle the qt option, failing gracefully if somebody has enabled the option without defining \qtfont appropriately
-\ifcfrlm@qt
- \@ifundefined{qtfont}{%
- \PackageWarning{cfr-lm}{Option 'qt' cannot be implemented unless\MessageBreak
- the command qtfont is defined appropriately. This is not\MessageBreak
- done automatically to maximise compatibility with other\MessageBreak
- classes and packages. The suggested use is to have qtfont\MessageBreak
- redefine a command such as quotefont which is initially\MessageBreak
- set to some reasonable default and is then used in the\MessageBreak
- definition of the quote and/or quotation environments.\MessageBreak
- Since these are class and package dependent, it cannot\MessageBreak
- be done by a font package and the option is ignored here.}}{%
- \qtfont{\qtstyle}}
-\fi
-
-%:based on lmodern.sty
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: cfr-lm.dtx 10371 2024-09-20 15:51:48Z cfrees $}[v1.7 \revinfo][Extended support for Latin Modern 2.004]
+\DefineFileInfoSVN[clm]
+\RequirePackage[T1]{fontenc}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{clm}{1}%
+ \DeclareEncodingSubset{TS1}{clm2}{1}%
+ \DeclareEncodingSubset{TS1}{clm2d}{1}%
+ \DeclareEncodingSubset{TS1}{clm2dj}{1}%
+ \DeclareEncodingSubset{TS1}{clm2j}{1}%
+ \DeclareEncodingSubset{TS1}{clm2jqs}{1}%
+ \DeclareEncodingSubset{TS1}{clm2js}{1}%
+ \DeclareEncodingSubset{TS1}{clm2jt}{1}%
+ \DeclareEncodingSubset{TS1}{clm2jv}{1}%
+ \DeclareEncodingSubset{TS1}{clm2qs}{1}%
+ \DeclareEncodingSubset{TS1}{clm2s}{1}%
+ \DeclareEncodingSubset{TS1}{clm2t}{1}%
+ \DeclareEncodingSubset{TS1}{clm2v}{1}%
+ \DeclareEncodingSubset{TS1}{clmd}{1}%
+ \DeclareEncodingSubset{TS1}{clmdj}{1}%
+ \DeclareEncodingSubset{TS1}{clmj}{1}%
+ \DeclareEncodingSubset{TS1}{clmjqs}{1}%
+ \DeclareEncodingSubset{TS1}{clmjs}{1}%
+ \DeclareEncodingSubset{TS1}{clmjt}{1}%
+ \DeclareEncodingSubset{TS1}{clmjv}{1}%
+ \DeclareEncodingSubset{TS1}{clmqs}{1}%
+ \DeclareEncodingSubset{TS1}{clms}{1}%
+ \DeclareEncodingSubset{TS1}{clmt}{1}%
+ \DeclareEncodingSubset{TS1}{clmv}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+%%
+\bool_new:N \l__clm_rm_osf_bool
+\bool_new:N \l__clm_rm_prop_bool
+\bool_new:N \l__clm_sf_osf_bool
+\bool_new:N \l__clm_sf_prop_bool
+\bool_new:N \l__clm_tt_osf_bool
+\bool_new:N \l__clm_tt_prop_bool
+\bool_new:N \l__clm_tt_mono_bool
+\bool_new:N \l__clm_qt_bool
+\keys_define:nn { clm }
+{
+ rm / oldstyle .bool_set:N = \l__clm_rm_osf_bool,
+ rm / oldstyle .default:n = true,
+ rm / oldstyle .initial:n = true,
+ rm / osf .bool_set:N = \l__clm_rm_osf_bool,
+ rm / osf .default:n = true,
+ rm / lining .bool_set_inverse:N = \l__clm_rm_osf_bool,
+ rm / lining .default:n = true,
+ rm / lf .bool_set_inverse:N = \l__clm_rm_osf_bool,
+ rm / lf .default:n = true,
+ rm / proportional .bool_set:N = \l__clm_rm_prop_bool,
+ rm / proportional .default:n = true,
+ rm / proportional .initial:n = true,
+ rm / prop .bool_set:N = \l__clm_rm_prop_bool,
+ rm / prop .default:n = true,
+ rm / tabular .bool_set_inverse:N = \l__clm_rm_prop_bool,
+ rm / tabular .default:n = true,
+ rm / tab .bool_set_inverse:N = \l__clm_rm_prop_bool,
+ rm / tab .default:n = true,
+ sf / oldstyle .bool_set:N = \l__clm_sf_osf_bool,
+ sf / oldstyle .default:n = true,
+ sf / oldstyle .initial:n = true,
+ sf / osf .bool_set:N = \l__clm_sf_osf_bool,
+ sf / osf .default:n = true,
+ sf / lining .bool_set_inverse:N = \l__clm_sf_osf_bool,
+ sf / lining .default:n = true,
+ sf / lf .bool_set_inverse:N = \l__clm_sf_osf_bool,
+ sf / lf .default:n = true,
+ sf / proportional .bool_set:N = \l__clm_sf_prop_bool,
+ sf / proportional .default:n = true,
+ sf / proportional .initial:n = true,
+ sf / prop .bool_set:N = \l__clm_sf_prop_bool,
+ sf / prop .default:n = true,
+ sf / tabular .bool_set_inverse:N = \l__clm_sf_prop_bool,
+ sf / tabular .default:n = true,
+ sf / tab .bool_set_inverse:N = \l__clm_sf_prop_bool,
+ sf / tab .default:n = true,
+ tt / oldstyle .bool_set:N = \l__clm_tt_osf_bool,
+ tt / oldstyle .default:n = true,
+ tt / oldstyle .initial:n = true,
+ tt / osf .bool_set:N = \l__clm_tt_osf_bool,
+ tt / osf .default:n = true,
+ tt / lining .bool_set_inverse:N = \l__clm_tt_osf_bool,
+ tt / lining .default:n = true,
+ tt / lf .bool_set_inverse:N = \l__clm_tt_osf_bool,
+ tt / lf .default:n = true,
+ tt / proportional .bool_set:N = \l__clm_tt_prop_bool,
+ tt / proportional .default:n = true,
+ tt / proportional .initial:n = true,
+ tt / prop .bool_set:N = \l__clm_tt_prop_bool,
+ tt / prop .default:n = true,
+ tt / tabular .bool_set_inverse:N = \l__clm_tt_prop_bool,
+ tt / tabular .default:n = true,
+ tt / tab .bool_set_inverse:N = \l__clm_tt_prop_bool,
+ tt / tab .default:n = true,
+ tt / monowidth .bool_set:N = \l__clm_tt_mono_bool,
+ tt / monowidth .default:n = true,
+ tt / monowidth .initial:n = false,
+ tt / mono .bool_set:N = \l__clm_tt_mono_bool,
+ tt / mono .default:n = true,
+ tt / variable .bool_set_inverse:N = \l__clm_tt_mono_bool,
+ tt / variable .default:n = true,
+ tt / var .bool_set_inverse:N = \l__clm_tt_mono_bool,
+ tt / var .default:n = true,
+ rm .code:n ={
+ \keys_set:nn { clm / rm } { #1 }
+ },
+ rm .value_required:n = true,
+ rm .usage:n = load,
+ sf .code:n ={
+ \keys_set:nn { clm / sf } { #1 }
+ },
+ sf .value_required:n = true,
+ sf .usage:n = load,
+ tt .code:n ={
+ \keys_set:nn { clm / tt } { #1 }
+ },
+ tt .value_required:n = true,
+ tt .usage:n = load,
+ qt .bool_set:N = \l__clm_qt_bool,
+ qt .default:n = true,
+ qt .initial:n = false,
+ qt .usage:n = load,
+}
+\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
+\IfFormatAtLeastTF { 2022-06-01 }
+{
+ \ProcessKeyOptions [ clm ]
+}{
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { clm }
+}
+\IfFormatAtLeastTF { 2020-10-01 }{
+}{
+ \RequirePackage { xparse }
+ \providecommand \ExpandArgs [1]
+ { \cs_if_exist_use:c { exp_args:N #1 } }
+}
+\tl_gset:Ne \rmdefault
+{
+ clm \bool_if:NT \l__clm_rm_prop_bool { 2 }
+ \bool_if:NT \l__clm_rm_osf_bool { j }
+}
+\tl_gset:Ne \sfdefault
+{
+ clm \bool_if:NT \l__clm_sf_prop_bool { 2 }
+ \bool_if:NT \l__clm_sf_osf_bool { j } s
+}
+\tl_gset:Ne \ttdefault
+{
+ clm \bool_if:NT \l__clm_tt_prop_bool { 2 }
+ \bool_if:NT \l__clm_tt_osf_bool { j }
+ \bool_if:NTF \l__clm_tt_mono_bool { t } { v }
+}
+\hook_gput_code:nnn { begindocument } { . }
+{
+ \bool_if:NT \l__clm_qt_bool
+ {
+ \cs_if_exist:NTF { \qtfont }
+ {
+ \qtfont{\qtstyle}
+ }{
+ \PackageWarning{cfr-lm}
+ {
+ Option ~ 'qt' ~ cannot ~ be ~ implemented ~ unless \MessageBreak
+ '\backslash qtfont' ~ is ~ defined ~ appropriately. ~ This ~ is ~ not \MessageBreak
+ done ~ automatically ~ to ~ maximise ~ compatibility ~ with ~ other \MessageBreak
+ classes ~ and ~ packages. ~ The ~ suggested ~ use ~ is ~ to ~ have ~ '\backslash qtfont' \MessageBreak
+ redefine ~ a command ~ such ~ as ~ '\backslash quotefont' ~ which ~ is ~ initially \MessageBreak
+ set ~ to ~ some ~ reasonable ~ default ~ and ~ used ~ in ~ the \MessageBreak
+ definition ~ of ~ the ~ quote ~ and/or ~ quotation ~ environments. \MessageBreak
+ A ~ font ~ package ~ has ~ no ~ business ~ meddling ~ in ~ such \MessageBreak
+ things ~ so ~ I'm ~ going ~ to ~ ignore ~ this ~ option
+ }
+ }
+ }
+}
+\ExplSyntaxOff
\SetSymbolFont{operators} {normal}{OT1}{lmr} {m}{n}
\SetSymbolFont{letters} {normal}{OML}{lmm} {m}{it}
\SetSymbolFont{symbols} {normal}{OMS}{lmsy}{m}{n}
@@ -185,12 +220,10 @@
\SetSymbolFont{letters} {bold} {OML}{lmm} {b}{it}
\SetSymbolFont{symbols} {bold} {OMS}{lmsy}{b}{n}
\SetSymbolFont{largesymbols}{bold} {OMX}{lmex}{m}{n}
-
\DeclareFontSubstitution{OT1}{lmr}{m}{n}
\DeclareFontSubstitution{OML}{lmm}{m}{it}
\DeclareFontSubstitution{OMS}{lmsy}{m}{n}
\DeclareFontSubstitution{OMX}{lmex}{m}{n}
-
\SetMathAlphabet{\mathbf}{normal}{OT1}{lmr}{bx}{n}
\SetMathAlphabet{\mathsf}{normal}{OT1}{lmss}{m}{n}
\SetMathAlphabet{\mathit}{normal}{OT1}{lmr}{m}{it}
@@ -199,44 +232,40 @@
\SetMathAlphabet{\mathsf}{bold} {OT1}{lmss}{bx}{n}
\SetMathAlphabet{\mathit}{bold} {OT1}{lmr}{bx}{it}
\SetMathAlphabet{\mathtt}{bold} {OT1}{lmtt}{m}{n}
-
\def\mathsterling{\mathit{\mathchar"70BF}}
-
-%:new in v1.1
\DeclareRobustCommand{\dotdigitenc}{%
\not@math@alphabet\dotdigitenc\relax
\fontencoding{U}\selectfont}
\DeclareTextFontCommand{\textdde}{\dotdigitenc}
\newcommand*{\zeroslash}{\textdde{\char 250}}
-
-%:Partly from microtype docs; partly from MinionPro package
-%
-% We need to set up aliases for the font families created by cfr-lm so that
-% microtype recognises them as similar to Computer Modern Roman.
-%
-% T1 families in cfr-lm: clm clm2 clm2d clm2dj clm2j clm2jqs clm2js clm2jt
-% clm2jv clm2qs clm2s clm2t clm2v clmd clmdj clmj clmjqs clmjs clmjt clmjv
-% clmqs clms clmt clmv
-%
-% See variants set in nfssext-cfr
-%
-% Ref: http://tex.stackexchange.com/a/75440/39222
-\newcommand{\cfr@ffs}{% alias to cmr
- clm,clm2,clm2j,clmj,% roman
- clms,clm2js,clm2s,clmjs,% sans
- clmqs,clm2jqs,clm2qs,clmjqs%
-% clm2d,clm2dj,clmd,clmdj,% leave unaliased?
-% clm2jv,clmjv,clm2v,clmv,% leave unaliased?
-% clmt,clm2t,clmjt,clm2jt% leave unaliased?
+\ExplSyntaxOn
+\cs_new_nopar:Nn \__clm_microtype_hook:
+{
+ \clist_map_inline:nn
+ {
+ clm,clm2,clm2j,clmj,% roman
+ clms,clm2js,clm2s,clmjs,% sans
+ clmqs,clm2jqs,clm2qs,clmjqs%
+ % clm2d,clm2dj,clmd,clmdj,% leave unaliased?
+ % clm2jv,clmjv,clm2v,clmv,% leave unaliased?
+ % clmt,clm2t,clmjt,clm2jt% leave unaliased?
+ }{
+ \DeclareMicrotypeAlias { ##1 } { cmr }
}
-\gdef\cfrlm@MicroType@Aliases{%
- \@for \xx:=\cfr@ffs \do {%
- \DeclareMicrotypeAlias{\xx}{cmr}}%
+}
+\@ifpackageloaded{microtype}
+{
+ \__clm_microtype_hook:
+}{
+ \cs_if_free:cTF { Microtype@Hook }
+ {% MinionPro has \global before this
+ \cs_new_eq:NN \Microtype@Hook \__clm_microtype_hook:
+ }{
+ \g@addto@macro\Microtype@Hook{\__clm_microtype_hook:}
}
-\def\cfrlm@MT@Hook{\cfrlm@MicroType@Aliases}
-\@ifpackageloaded{microtype}{%
- \cfrlm@MT@Hook}{%
- \@ifundefined{Microtype@Hook}{%
- \let\Microtype@Hook\cfrlm@MT@Hook}{% MinionPro has \global before this
- \g@addto@macro\Microtype@Hook{\cfrlm@MT@Hook}}}
+}
+\ExplSyntaxOff
+%% end cfr-lm.sty
\endinput
+%%
+%% End of file `cfr-lm.sty'.
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm.fd
index c3eebd8a758..6c08b949a34 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm.]
\DeclareFontFamily{T1}{clm}{}
@@ -74,7 +74,8 @@
<-> clmbo8t10
}{}
-\DeclareFontShape{T1}{clm}{m}{si}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{T1}{clm}{m}{scit}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{T1}{clm}{m}{si}{<->ssub * clm/m/scit}{}
\DeclareFontShape{T1}{clm}{b}{n}{<->ssub * clm/bx/n}{}
\DeclareFontShape{T1}{clm}{bx}{sc}{<->ssub * clm/bx/n}{}
\DeclareFontShape{T1}{clm}{b}{sc}{<->ssub * clm/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2.fd
index a76b70eefee..836285f979c 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2.]
\DeclareFontFamily{T1}{clm2}{}
@@ -74,7 +74,8 @@
<-> clmb2o8t10
}{}
-\DeclareFontShape{T1}{clm2}{m}{si}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{T1}{clm2}{m}{scit}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{T1}{clm2}{m}{si}{<->ssub * clm2/m/scit}{}
\DeclareFontShape{T1}{clm2}{b}{n}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{T1}{clm2}{bx}{sc}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{T1}{clm2}{b}{sc}{<->ssub * clm2/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2d.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2d.fd
index 0844ef48c85..d710b8d3b6f 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2d.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2d.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2d.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2d.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2d.]
\DeclareFontFamily{T1}{clm2d}{\hyphenchar\font=45}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2dj.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2dj.fd
index aa3101bc4cb..385194bdce3 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2dj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2dj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2dj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2dj.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2dj.]
\DeclareFontFamily{T1}{clm2dj}{\hyphenchar\font=45}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2j.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2j.fd
index 95be955b378..c77d15bda0b 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2j.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2j.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2j.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2j.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2j.]
\DeclareFontFamily{T1}{clm2j}{}
@@ -74,7 +74,8 @@
<-> clmb2jo8t10
}{}
-\DeclareFontShape{T1}{clm2j}{m}{si}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{T1}{clm2j}{m}{scit}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{T1}{clm2j}{m}{si}{<->ssub * clm2j/m/scit}{}
\DeclareFontShape{T1}{clm2j}{b}{n}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{T1}{clm2j}{bx}{sc}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{T1}{clm2j}{b}{sc}{<->ssub * clm2j/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jqs.fd
index ab6cc5c9db8..90651b73895 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2jqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2jqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2jqs.]
\DeclareFontFamily{T1}{clm2jqs}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2js.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2js.fd
index 92c96068d39..5c825ecd802 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2js.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2js.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2js.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2js.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2js.]
\DeclareFontFamily{T1}{clm2js}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jt.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jt.fd
index 689ad0ecfb7..63ca29588e9 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2jt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2jt.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2jt.]
\DeclareFontFamily{T1}{clm2jt}{\hyphenchar\font=\m@ne}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{T1}{clm2jt}{m}{ui}{<->ssub * clm2jt/m/it}{}
-\DeclareFontShape{T1}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{T1}{clm2jt}{m}{scit}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{T1}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scit}{}
\DeclareFontShape{T1}{clm2jt}{b}{n}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{T1}{clm2jt}{bx}{sc}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{T1}{clm2jt}{b}{sc}{<->ssub * clm2jt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jv.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jv.fd
index e42a220ab56..20a096facb8 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2jv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2jv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2jv.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2jv.]
\DeclareFontFamily{T1}{clm2jv}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2qs.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2qs.fd
index cdc5a16a22b..bb99afb9419 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2qs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2qs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2qs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2qs.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2qs.]
\DeclareFontFamily{T1}{clm2qs}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2s.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2s.fd
index 005af0cd00d..3b742536929 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2s.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2s.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2s.fd}
- [2015/02/01 Fontinst v1.933 font definitions for T1/clm2s.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2s.]
\DeclareFontFamily{T1}{clm2s}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2t.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2t.fd
index 58d106eb1f6..e8d92015ae5 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2t.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2t.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2t.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2t.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2t.]
\DeclareFontFamily{T1}{clm2t}{\hyphenchar\font=\m@ne}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{T1}{clm2t}{m}{ui}{<->ssub * clm2t/m/it}{}
-\DeclareFontShape{T1}{clm2t}{m}{si}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{T1}{clm2t}{m}{scit}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{T1}{clm2t}{m}{si}{<->ssub * clm2t/m/scit}{}
\DeclareFontShape{T1}{clm2t}{b}{n}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{T1}{clm2t}{bx}{sc}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{T1}{clm2t}{b}{sc}{<->ssub * clm2t/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2v.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2v.fd
index 0ff82e50d07..3971fdda528 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clm2v.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clm2v.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clm2v.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clm2v.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clm2v.]
\DeclareFontFamily{T1}{clm2v}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmd.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmd.fd
index 21f6c1c2337..1a7d91cf0d8 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmd.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmd.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmd.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmd.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmd.]
\DeclareFontFamily{T1}{clmd}{\hyphenchar\font=45}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmdj.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmdj.fd
index 649bb29224b..5c57dd32a80 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmdj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmdj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmdj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmdj.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmdj.]
\DeclareFontFamily{T1}{clmdj}{\hyphenchar\font=45}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmj.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmj.fd
index cd29597d90d..8bc6de61150 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmj.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmj.]
\DeclareFontFamily{T1}{clmj}{}
@@ -74,7 +74,8 @@
<-> clmbjo8t10
}{}
-\DeclareFontShape{T1}{clmj}{m}{si}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{T1}{clmj}{m}{scit}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{T1}{clmj}{m}{si}{<->ssub * clmj/m/scit}{}
\DeclareFontShape{T1}{clmj}{b}{n}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{T1}{clmj}{bx}{sc}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{T1}{clmj}{b}{sc}{<->ssub * clmj/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjqs.fd
index 7cd7b6f0776..2e6077662ab 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmjqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmjqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmjqs.]
\DeclareFontFamily{T1}{clmjqs}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjs.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjs.fd
index e66b4bf1611..2f1e4ff9532 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmjs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmjs.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmjs.]
\DeclareFontFamily{T1}{clmjs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjt.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjt.fd
index bf4efdac8c0..759910ff6f0 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmjt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmjt.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmjt.]
\DeclareFontFamily{T1}{clmjt}{\hyphenchar\font=\m@ne}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{T1}{clmjt}{m}{ui}{<->ssub * clmjt/m/it}{}
-\DeclareFontShape{T1}{clmjt}{m}{si}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{T1}{clmjt}{m}{scit}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{T1}{clmjt}{m}{si}{<->ssub * clmjt/m/scit}{}
\DeclareFontShape{T1}{clmjt}{b}{n}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{T1}{clmjt}{bx}{sc}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{T1}{clmjt}{b}{sc}{<->ssub * clmjt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjv.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjv.fd
index ac3c5ce8e83..607edf04e45 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmjv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmjv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmjv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmjv.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmjv.]
\DeclareFontFamily{T1}{clmjv}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmqs.fd
index 5695027b188..c703b82309a 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmqs.]
\DeclareFontFamily{T1}{clmqs}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clms.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clms.fd
index 5a0661c5309..3ea453b3a11 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clms.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clms.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clms.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clms.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clms.]
\DeclareFontFamily{T1}{clms}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmt.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmt.fd
index f46090b877c..ca2b309b1ac 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmt.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmt.]
\DeclareFontFamily{T1}{clmt}{\hyphenchar\font=\m@ne}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{T1}{clmt}{m}{ui}{<->ssub * clmt/m/it}{}
-\DeclareFontShape{T1}{clmt}{m}{si}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{T1}{clmt}{m}{scit}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{T1}{clmt}{m}{si}{<->ssub * clmt/m/scit}{}
\DeclareFontShape{T1}{clmt}{b}{n}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{T1}{clmt}{bx}{sc}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{T1}{clmt}{b}{sc}{<->ssub * clmt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/t1clmv.fd b/Master/texmf-dist/tex/latex/cfr-lm/t1clmv.fd
index ef3eb23ff20..cbbbf269298 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/t1clmv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/t1clmv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1clmv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for T1/clmv.]
+ [2024/09/19 Fontinst v1.933 font definitions for T1/clmv.]
\DeclareFontFamily{T1}{clmv}{\hyphenchar\font=\m@ne}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm.fd
index 257d4adf6fc..2f957e7a637 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm.]
\DeclareFontFamily{TS1}{clm}{}
@@ -74,7 +74,8 @@
<-> ts1-lmbo10
}{}
-\DeclareFontShape{TS1}{clm}{m}{si}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{TS1}{clm}{m}{scit}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{TS1}{clm}{m}{si}{<->ssub * clm/m/scit}{}
\DeclareFontShape{TS1}{clm}{b}{n}{<->ssub * clm/bx/n}{}
\DeclareFontShape{TS1}{clm}{bx}{sc}{<->ssub * clm/bx/n}{}
\DeclareFontShape{TS1}{clm}{b}{sc}{<->ssub * clm/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2.fd
index 53bfebf826d..505c786af09 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2.fd}
- [2015/02/01 Fontinst v1.928 font definitions for TS1/clm2.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2.]
\DeclareFontFamily{TS1}{clm2}{}
@@ -74,7 +74,8 @@
<-> ts1-lmbo10
}{}
-\DeclareFontShape{TS1}{clm2}{m}{si}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{TS1}{clm2}{m}{scit}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{TS1}{clm2}{m}{si}{<->ssub * clm2/m/scit}{}
\DeclareFontShape{TS1}{clm2}{b}{n}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{TS1}{clm2}{bx}{sc}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{TS1}{clm2}{b}{sc}{<->ssub * clm2/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2d.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2d.fd
index 1d120466eaf..675a07cd4a9 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2d.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2d.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2d.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2d.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2d.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2d.]
\DeclareFontFamily{TS1}{clm2d}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2dj.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2dj.fd
index bc0ef8e88b8..5f779c5c5ef 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2dj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2dj.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2dj.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2dj.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2dj.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2dj.]
\DeclareFontFamily{TS1}{clm2dj}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2j.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2j.fd
index 06c57ce74ce..27241a46e66 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2j.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2j.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2j.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2j.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2j.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2j.]
\DeclareFontFamily{TS1}{clm2j}{}
@@ -74,7 +74,8 @@
<-> ts1-lmbo10
}{}
-\DeclareFontShape{TS1}{clm2j}{m}{si}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{TS1}{clm2j}{m}{scit}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{TS1}{clm2j}{m}{si}{<->ssub * clm2j/m/scit}{}
\DeclareFontShape{TS1}{clm2j}{b}{n}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{TS1}{clm2j}{bx}{sc}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{TS1}{clm2j}{b}{sc}{<->ssub * clm2j/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jqs.fd
index 952f91fb035..85e6bf0bdc0 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jqs.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2jqs.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2jqs.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2jqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2jqs.]
\DeclareFontFamily{TS1}{clm2jqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2js.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2js.fd
index ec2c8eba0b5..206d9f1a4bf 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2js.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2js.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2js.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2js.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2js.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2js.]
\DeclareFontFamily{TS1}{clm2js}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jt.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jt.fd
index 9b2c5b172e2..5034aa1b034 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jt.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2jt.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2jt.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2jt.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2jt.]
\DeclareFontFamily{TS1}{clm2jt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{TS1}{clm2jt}{m}{ui}{<->ssub * clm2jt/m/it}{}
-\DeclareFontShape{TS1}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{TS1}{clm2jt}{m}{scit}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{TS1}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scit}{}
\DeclareFontShape{TS1}{clm2jt}{b}{n}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{TS1}{clm2jt}{bx}{sc}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{TS1}{clm2jt}{b}{sc}{<->ssub * clm2jt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jv.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jv.fd
index 804e68b4423..5bef745f8af 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2jv.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2jv.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2jv.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2jv.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2jv.]
\DeclareFontFamily{TS1}{clm2jv}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2qs.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2qs.fd
index 93f1e5ffc84..486e17f5996 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2qs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2qs.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2qs.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2qs.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2qs.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2qs.]
\DeclareFontFamily{TS1}{clm2qs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2s.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2s.fd
index 4f1d942bf8e..aebbbf0dc1c 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2s.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2s.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2s.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2s.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2s.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2s.]
\DeclareFontFamily{TS1}{clm2s}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2t.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2t.fd
index 8615e6430b9..876977bd152 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2t.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2t.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2t.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2t.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2t.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2t.]
\DeclareFontFamily{TS1}{clm2t}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{TS1}{clm2t}{m}{ui}{<->ssub * clm2t/m/it}{}
-\DeclareFontShape{TS1}{clm2t}{m}{si}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{TS1}{clm2t}{m}{scit}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{TS1}{clm2t}{m}{si}{<->ssub * clm2t/m/scit}{}
\DeclareFontShape{TS1}{clm2t}{b}{n}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{TS1}{clm2t}{bx}{sc}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{TS1}{clm2t}{b}{sc}{<->ssub * clm2t/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2v.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2v.fd
index 7688f834b0c..e451254fc70 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2v.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clm2v.fd
@@ -1,11 +1,11 @@
%Filename: ts1clm2v.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clm2v.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clm2v.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clm2v.]
\DeclareFontFamily{TS1}{clm2v}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmd.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmd.fd
index f19706d4570..f1e8165dc1a 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmd.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmd.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmd.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmd.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmd.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmd.]
\DeclareFontFamily{TS1}{clmd}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmdj.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmdj.fd
index ec209e52207..f9e80d2c66f 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmdj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmdj.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmdj.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmdj.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmdj.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmdj.]
\DeclareFontFamily{TS1}{clmdj}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmj.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmj.fd
index a6eb078e31b..f7e0ea7fcbf 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmj.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmj.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmj.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmj.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmj.]
\DeclareFontFamily{TS1}{clmj}{}
@@ -74,7 +74,8 @@
<-> ts1-lmbo10
}{}
-\DeclareFontShape{TS1}{clmj}{m}{si}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{TS1}{clmj}{m}{scit}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{TS1}{clmj}{m}{si}{<->ssub * clmj/m/scit}{}
\DeclareFontShape{TS1}{clmj}{b}{n}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{TS1}{clmj}{bx}{sc}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{TS1}{clmj}{b}{sc}{<->ssub * clmj/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjqs.fd
index ed16bf5ed60..ff0e81175fd 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjqs.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmjqs.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmjqs.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmjqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmjqs.]
\DeclareFontFamily{TS1}{clmjqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjs.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjs.fd
index 44a0fd54a12..e7a6e73f12b 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjs.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmjs.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmjs.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmjs.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmjs.]
\DeclareFontFamily{TS1}{clmjs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjt.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjt.fd
index f8b3f0ab33e..4b2ead9c271 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjt.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmjt.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmjt.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmjt.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmjt.]
\DeclareFontFamily{TS1}{clmjt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{TS1}{clmjt}{m}{ui}{<->ssub * clmjt/m/it}{}
-\DeclareFontShape{TS1}{clmjt}{m}{si}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{TS1}{clmjt}{m}{scit}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{TS1}{clmjt}{m}{si}{<->ssub * clmjt/m/scit}{}
\DeclareFontShape{TS1}{clmjt}{b}{n}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{TS1}{clmjt}{bx}{sc}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{TS1}{clmjt}{b}{sc}{<->ssub * clmjt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjv.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjv.fd
index 002b68cae40..66aa7f2da4d 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmjv.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmjv.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmjv.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmjv.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmjv.]
\DeclareFontFamily{TS1}{clmjv}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmqs.fd
index 8baed70737a..b3ff933fae6 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmqs.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmqs.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmqs.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmqs.]
\DeclareFontFamily{TS1}{clmqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clms.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clms.fd
index 3da7aea168a..e02646c99a3 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clms.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clms.fd
@@ -1,11 +1,11 @@
%Filename: ts1clms.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clms.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clms.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clms.]
\DeclareFontFamily{TS1}{clms}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmt.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmt.fd
index 4cc3e5243ae..9141d1ebc48 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmt.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmt.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmt.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmt.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmt.]
\DeclareFontFamily{TS1}{clmt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{TS1}{clmt}{m}{ui}{<->ssub * clmt/m/it}{}
-\DeclareFontShape{TS1}{clmt}{m}{si}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{TS1}{clmt}{m}{scit}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{TS1}{clmt}{m}{si}{<->ssub * clmt/m/scit}{}
\DeclareFontShape{TS1}{clmt}{b}{n}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{TS1}{clmt}{bx}{sc}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{TS1}{clmt}{b}{sc}{<->ssub * clmt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmv.fd b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmv.fd
index 1d74461b38f..3dd4fb8c8d0 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/ts1clmv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/ts1clmv.fd
@@ -1,11 +1,11 @@
%Filename: ts1clmv.fd
-%Created by: tex clm-drv
-%Created using fontinst v1.928
+%Created by: tex clm-ts1-drv
+%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1clmv.fd}
- [2008/02/13 Fontinst v1.928 font definitions for TS1/clmv.]
+ [2024/09/19 Fontinst v1.933 font definitions for TS1/clmv.]
\DeclareFontFamily{TS1}{clmv}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm.fd
index 61c48f7d680..54a0050120b 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm.]
\DeclareFontFamily{U}{clm}{}
@@ -74,7 +74,8 @@
<-> u-clmbo10
}{}
-\DeclareFontShape{U}{clm}{m}{si}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{U}{clm}{m}{scit}{<->ssub * clm/m/scsl}{}
+\DeclareFontShape{U}{clm}{m}{si}{<->ssub * clm/m/scit}{}
\DeclareFontShape{U}{clm}{b}{n}{<->ssub * clm/bx/n}{}
\DeclareFontShape{U}{clm}{bx}{sc}{<->ssub * clm/bx/n}{}
\DeclareFontShape{U}{clm}{b}{sc}{<->ssub * clm/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2.fd
index 320abfe0d7f..df61503d2e5 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2.]
\DeclareFontFamily{U}{clm2}{}
@@ -74,7 +74,8 @@
<-> u-clmbo10
}{}
-\DeclareFontShape{U}{clm2}{m}{si}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{U}{clm2}{m}{scit}{<->ssub * clm2/m/scsl}{}
+\DeclareFontShape{U}{clm2}{m}{si}{<->ssub * clm2/m/scit}{}
\DeclareFontShape{U}{clm2}{b}{n}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{U}{clm2}{bx}{sc}{<->ssub * clm2/bx/n}{}
\DeclareFontShape{U}{clm2}{b}{sc}{<->ssub * clm2/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2d.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2d.fd
index f1a333da2b0..fe56d5b784d 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2d.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2d.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2d.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2d.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2d.]
\DeclareFontFamily{U}{clm2d}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2dj.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2dj.fd
index 6d4d7ade219..4e80cb04310 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2dj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2dj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2dj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2dj.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2dj.]
\DeclareFontFamily{U}{clm2dj}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2j.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2j.fd
index cf16debfae9..842119949a7 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2j.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2j.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2j.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2j.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2j.]
\DeclareFontFamily{U}{clm2j}{}
@@ -74,7 +74,8 @@
<-> u-clmbo10
}{}
-\DeclareFontShape{U}{clm2j}{m}{si}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{U}{clm2j}{m}{scit}{<->ssub * clm2j/m/scsl}{}
+\DeclareFontShape{U}{clm2j}{m}{si}{<->ssub * clm2j/m/scit}{}
\DeclareFontShape{U}{clm2j}{b}{n}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{U}{clm2j}{bx}{sc}{<->ssub * clm2j/bx/n}{}
\DeclareFontShape{U}{clm2j}{b}{sc}{<->ssub * clm2j/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jqs.fd
index 6b8b5ccc2a8..3a8970ddcd1 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2jqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2jqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2jqs.]
\DeclareFontFamily{U}{clm2jqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2js.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2js.fd
index acd57a8803e..07089240650 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2js.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2js.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2js.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2js.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2js.]
\DeclareFontFamily{U}{clm2js}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jt.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jt.fd
index 065b52776f6..61f1abd7073 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2jt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2jt.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2jt.]
\DeclareFontFamily{U}{clm2jt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{U}{clm2jt}{m}{ui}{<->ssub * clm2jt/m/it}{}
-\DeclareFontShape{U}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{U}{clm2jt}{m}{scit}{<->ssub * clm2jt/m/scsl}{}
+\DeclareFontShape{U}{clm2jt}{m}{si}{<->ssub * clm2jt/m/scit}{}
\DeclareFontShape{U}{clm2jt}{b}{n}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{U}{clm2jt}{bx}{sc}{<->ssub * clm2jt/bx/n}{}
\DeclareFontShape{U}{clm2jt}{b}{sc}{<->ssub * clm2jt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jv.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jv.fd
index 8e9175f8b6d..e8ddcc42c32 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2jv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2jv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2jv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2jv.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2jv.]
\DeclareFontFamily{U}{clm2jv}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2qs.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2qs.fd
index d8c67797c92..db43cb583e1 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2qs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2qs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2qs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2qs.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2qs.]
\DeclareFontFamily{U}{clm2qs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2s.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2s.fd
index df081eed6bb..4e20ef2d03b 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2s.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2s.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2s.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2s.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2s.]
\DeclareFontFamily{U}{clm2s}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2t.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2t.fd
index ad5fafb4043..1ef982690a8 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2t.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2t.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2t.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2t.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2t.]
\DeclareFontFamily{U}{clm2t}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{U}{clm2t}{m}{ui}{<->ssub * clm2t/m/it}{}
-\DeclareFontShape{U}{clm2t}{m}{si}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{U}{clm2t}{m}{scit}{<->ssub * clm2t/m/scsl}{}
+\DeclareFontShape{U}{clm2t}{m}{si}{<->ssub * clm2t/m/scit}{}
\DeclareFontShape{U}{clm2t}{b}{n}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{U}{clm2t}{bx}{sc}{<->ssub * clm2t/bx/n}{}
\DeclareFontShape{U}{clm2t}{b}{sc}{<->ssub * clm2t/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclm2v.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclm2v.fd
index 0ab1a2b858b..87c7b72c5f2 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclm2v.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclm2v.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclm2v.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clm2v.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clm2v.]
\DeclareFontFamily{U}{clm2v}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmd.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmd.fd
index 22798578549..ba250f22e71 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmd.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmd.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmd.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmd.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmd.]
\DeclareFontFamily{U}{clmd}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmdj.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmdj.fd
index 9db7ac3a7ee..0e0687f2ba5 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmdj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmdj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmdj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmdj.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmdj.]
\DeclareFontFamily{U}{clmdj}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmj.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmj.fd
index bd1d0557f19..789578e18f6 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmj.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmj.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmj.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmj.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmj.]
\DeclareFontFamily{U}{clmj}{}
@@ -74,7 +74,8 @@
<-> u-clmbo10
}{}
-\DeclareFontShape{U}{clmj}{m}{si}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{U}{clmj}{m}{scit}{<->ssub * clmj/m/scsl}{}
+\DeclareFontShape{U}{clmj}{m}{si}{<->ssub * clmj/m/scit}{}
\DeclareFontShape{U}{clmj}{b}{n}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{U}{clmj}{bx}{sc}{<->ssub * clmj/bx/n}{}
\DeclareFontShape{U}{clmj}{b}{sc}{<->ssub * clmj/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmjqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmjqs.fd
index 7ff58254856..e2f4eb6aba5 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmjqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmjqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmjqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmjqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmjqs.]
\DeclareFontFamily{U}{clmjqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmjs.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmjs.fd
index 7a3e4ea5919..28c10f7ba8c 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmjs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmjs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmjs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmjs.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmjs.]
\DeclareFontFamily{U}{clmjs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmjt.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmjt.fd
index a07a76aed5c..79dff0ea513 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmjt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmjt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmjt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmjt.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmjt.]
\DeclareFontFamily{U}{clmjt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{U}{clmjt}{m}{ui}{<->ssub * clmjt/m/it}{}
-\DeclareFontShape{U}{clmjt}{m}{si}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{U}{clmjt}{m}{scit}{<->ssub * clmjt/m/scsl}{}
+\DeclareFontShape{U}{clmjt}{m}{si}{<->ssub * clmjt/m/scit}{}
\DeclareFontShape{U}{clmjt}{b}{n}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{U}{clmjt}{bx}{sc}{<->ssub * clmjt/bx/n}{}
\DeclareFontShape{U}{clmjt}{b}{sc}{<->ssub * clmjt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmjv.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmjv.fd
index b109d77cb2e..4ab80a632c2 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmjv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmjv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmjv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmjv.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmjv.]
\DeclareFontFamily{U}{clmjv}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmqs.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmqs.fd
index 032bbf95dc0..2577c9a046d 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmqs.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmqs.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmqs.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmqs.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmqs.]
\DeclareFontFamily{U}{clmqs}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclms.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclms.fd
index 4883781272d..69ac8937bf7 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclms.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclms.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclms.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clms.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clms.]
\DeclareFontFamily{U}{clms}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmt.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmt.fd
index 4f03f39e889..980b5f39b9d 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmt.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmt.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmt.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmt.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmt.]
\DeclareFontFamily{U}{clmt}{}
@@ -57,7 +57,8 @@
}{}
\DeclareFontShape{U}{clmt}{m}{ui}{<->ssub * clmt/m/it}{}
-\DeclareFontShape{U}{clmt}{m}{si}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{U}{clmt}{m}{scit}{<->ssub * clmt/m/scsl}{}
+\DeclareFontShape{U}{clmt}{m}{si}{<->ssub * clmt/m/scit}{}
\DeclareFontShape{U}{clmt}{b}{n}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{U}{clmt}{bx}{sc}{<->ssub * clmt/bx/n}{}
\DeclareFontShape{U}{clmt}{b}{sc}{<->ssub * clmt/bx/sc}{}
diff --git a/Master/texmf-dist/tex/latex/cfr-lm/uclmv.fd b/Master/texmf-dist/tex/latex/cfr-lm/uclmv.fd
index 8f2ed86f727..b5dd2698595 100644
--- a/Master/texmf-dist/tex/latex/cfr-lm/uclmv.fd
+++ b/Master/texmf-dist/tex/latex/cfr-lm/uclmv.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uclmv.fd}
- [2010/05/25 Fontinst v1.933 font definitions for U/clmv.]
+ [2024/09/19 Fontinst v1.933 font definitions for U/clmv.]
\DeclareFontFamily{U}{clmv}{}
diff --git a/Master/texmf-dist/tex/latex/changelog/changelog.sty b/Master/texmf-dist/tex/latex/changelog/changelog.sty
index 4c95edd8051..b58e33479a7 100644
--- a/Master/texmf-dist/tex/latex/changelog/changelog.sty
+++ b/Master/texmf-dist/tex/latex/changelog/changelog.sty
@@ -1,5 +1,5 @@
\RequirePackage{expl3}
-\ProvidesExplPackage{changelog}{2023/02/16}{2.5.0}{Typesetting changelogs}
+\ProvidesExplPackage{changelog}{2024/09/17}{2.5.1}{Typesetting changelogs}
% Description: Provides the changelog environment for typesetting changelogs
% License: LPPL 1.3c
% Homepage: https://github.com/9999years/latex-changelog
@@ -210,24 +210,28 @@
{}
}
-\cs_set:Npn \changelog__short_version_define_date
+% Display the current version, which may be a version number, a date, or "Unreleased".
+\cs_set:Npn \changelog__display_version
{
- \tl_if_empty:NT \g__changelog_version_tl
+ \tl_if_empty:NTF \g__changelog_version_tl
{
\tl_if_empty:NTF \g__changelog_date_tl
{
- \tl_set:Nn \g__changelog_version_tl { \GetTranslation{changelog-Unreleased} }
+ \GetTranslation{changelog-Unreleased}
\tl_set:Nn \g__changelog_date_tl { \today }
}
{
- \tl_set_eq:NN \g__changelog_version_tl \g__changelog_date_tl
+ \tl_use:N \g__changelog_date_tl
}
}
+ {
+ \tl_use:N \g__changelog_version_tl
+ }
}
\cs_set:Npn \changelog__short_version_item
{
- \tl_use:N \g__changelog_version_tl
+ \changelog__display_version
\bool_if:NT \g__changelog_yanked_bool
{
\ \changelogyanked
@@ -247,12 +251,21 @@
\cs_set:Npn \changelog__short_version_author_date
{
+ % This might output nothing if there's no author and the date is being used
+ % as a version number, so make sure to `\leavevmode` to avoid a weird
+ % indent at the start of the item.
+ \mode_leave_vertical:
\tl_use:N \g__changelog_author_tl
\tl_if_empty:NF \g__changelog_date_tl
{
- \tl_if_empty:NF \g__changelog_author_tl
- { ~ }
- (\tl_use:N \g__changelog_date_tl)
+ % If no version number is given, the date is used instead, so we don't
+ % want to show the date twice.
+ \tl_if_empty:NF \g__changelog_version_tl
+ {
+ \tl_if_empty:NF \g__changelog_author_tl
+ { ~ }
+ (\tl_use:N \g__changelog_date_tl)
+ }
}
}
@@ -308,7 +321,6 @@
% environment
\cs_set:Npn \changelog__short_version
{
- \changelog__short_version_define_date
\bool_gset_true:N \g__changelog_seen_version_bool
\item[\changelog__short_version_item]
diff --git a/Master/texmf-dist/tex/latex/circledtext/circledtext.sty b/Master/texmf-dist/tex/latex/circledtext/circledtext.sty
index f70b7168141..47c62817e77 100644
--- a/Master/texmf-dist/tex/latex/circledtext/circledtext.sty
+++ b/Master/texmf-dist/tex/latex/circledtext/circledtext.sty
@@ -19,7 +19,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{expl3}
-\ProvidesExplPackage{circledtext}{2022-04-28}{v1.1.0}
+\ProvidesExplPackage{circledtext}{2024-09-09}{v1.1.1}
{Typeset circled text with l3draw}
\RequirePackage { xtemplate, l3keys2e, l3draw, xparse }
@@ -187,18 +187,18 @@
% 正方形边长
\dim_compare:nNnTF \l_tmpa_dim > \l_tmpb_dim
{
- \dim_gset_eq:NN \l__circledtext_char_box_size_dim \l_tmpa_dim
+ \dim_set_eq:NN \l__circledtext_char_box_size_dim \l_tmpa_dim
}
{
- \dim_gset_eq:NN \l__circledtext_char_box_size_dim \l_tmpb_dim
+ \dim_set_eq:NN \l__circledtext_char_box_size_dim \l_tmpb_dim
}
% 设置基字符盒子正方形宽和高(相等)
- \dim_gset_eq:NN \charboxwd \l__circledtext_char_box_size_dim
- \dim_gset_eq:NN \charboxht \l__circledtext_char_box_size_dim
+ \dim_set_eq:NN \charboxwd \l__circledtext_char_box_size_dim
+ \dim_set_eq:NN \charboxht \l__circledtext_char_box_size_dim
% 外接圆半径
- \dim_gset:Nn \l__circledtext_char_box_radius_dim
+ \dim_set:Nn \l__circledtext_char_box_radius_dim
{
\fp_to_dim:n
{
@@ -244,6 +244,8 @@
% 类似\cs_new:cn __circledtext_char_box_construct_type_none:nnnnnn
\cs_new:cn { \__circledtext_char_box_type:n {#1} }
}
+\cs_generate_variant:Nn \__circledtext_new_char_box_construct:nn { V }
+\cs_generate_variant:Nn \__circledtext_new_char_box_construct:nn { x }
% 定义字符边框盒子类型
@@ -328,6 +330,105 @@
}
}
+% 无反色底层填充正方形
+\__circledtext_new_char_box_construct:nn { __lowerfilledsquare }
+ {
+ \draw_scope_begin:
+ \color_fill:n { lowerbgboxfill }
+ \draw_transform_shift:n { (#3-#3*#5)/2, (#4-#4*#6)/2 }
+ \draw_path_rectangle:nn { #1, #2 } { #3*#5, #4*#6 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色上层填充正方形
+\__circledtext_new_char_box_construct:nn { __upperfilledsquare }
+ {
+ \draw_scope_begin:
+ \color_fill:n { upperbgboxfill }
+ \draw_transform_shift:n { (#3-#3*#5)/2, (#4-#4*#6)/2 }
+ \draw_path_rectangle:nn { #1, #2 } { #3*#5, #4*#6 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色阴影填充正方形
+\__circledtext_new_char_box_construct:nn { __shadowfilledsquare }
+ {
+ \draw_scope_begin:
+ \color_fill:n { shadowboxfill }
+ \draw_transform_shift:n { (#3-#3*#5)/2 + \charboxwd * 0.1,
+ (#4-#4*#6)/2 - \charboxht * 0.1 }
+ \draw_path_rectangle:nn { #1, #2 } { #3*#5, #4*#6 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色底层填充内切圆
+\__circledtext_new_char_box_construct:nn { __innerlowerfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { lowerbgboxfill }
+ \draw_path_circle:nn { #3/2, #4/2 } { #3*#5/2 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色上层填充内切圆
+\__circledtext_new_char_box_construct:nn { __innerupperfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { upperbgboxfill }
+ \draw_path_circle:nn { #3/2, #4/2 } { #3*#5/2 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色阴影填充内切圆
+\__circledtext_new_char_box_construct:nn { __innershadowfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { shadowboxfill }
+ \draw_transform_shift:n { \charboxwd*0.1, -\charboxht*0.1 }
+ \draw_path_circle:nn { #3/2, #4/2 } { #3*#5/2 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色底层填充外接圆
+\__circledtext_new_char_box_construct:nn { __outerlowerfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { lowerbgboxfill }
+ \draw_path_circle:nn { #3/2, #4/2 }
+ { \l__circledtext_char_box_radius_dim*#5 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色上层填充外接圆
+\__circledtext_new_char_box_construct:nn { __outerupperfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { upperbgboxfill }
+ \draw_path_circle:nn { #3/2, #4/2 }
+ { \l__circledtext_char_box_radius_dim*#5 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
+% 无反色阴影填充外接圆
+\__circledtext_new_char_box_construct:nn { __outershadowfilledcircle }
+ {
+ \draw_scope_begin:
+ \color_fill:n { shadowboxfill }
+ \draw_transform_shift:n { \charboxwd*0.1, -\charboxht*0.1 }
+ \draw_path_circle:nn { #3/2, #4/2 }
+ { \l__circledtext_char_box_radius_dim*#5 }
+ \draw_path_use_clear:n { fill }
+ \draw_scope_end:
+ }
+
% 正方形边框
\__circledtext_new_char_box_construct:nn { __squarebox }
{
@@ -499,35 +600,47 @@
}
% 填充内切圆叠加正方形正十字线与内切圆边框
-\__circledtext_new_char_box_construct:nn { o+ }
+\clist_map_variable:nNn {o+,+o} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 填充内切圆叠加内切圆斜十字线与内切圆边框
-\__circledtext_new_char_box_construct:nn { ox }
+\clist_map_variable:nNn {ox,xo} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 填充内切圆叠加内切圆正斜十字线与内切圆边框
-\__circledtext_new_char_box_construct:nn { ox+ }
+\clist_map_variable:nNn {ox+,o+x,xo+,x+o,+ox,+xo} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innercirclebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 内切圆斜十字线叠加正十字线
-\__circledtext_new_char_box_construct:nn { x+ }
+\clist_map_variable:nNn {x+,+x} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __innerdcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 填充正方形叠加正方形边框
@@ -538,35 +651,47 @@
}
% 填充正方形叠加正方形正十字线与正方形边框
-\__circledtext_new_char_box_construct:nn { O+ }
+\clist_map_variable:nNn {O+,+O} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 填充正方形叠加正方形斜十字线与正方形边框
-\__circledtext_new_char_box_construct:nn { OX }
+\clist_map_variable:nNn {OX,XO} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 填充正方形叠加正方形斜正十字线与正方形边框
-\__circledtext_new_char_box_construct:nn { OX+ }
+\clist_map_variable:nNn {OX+,O+X,XO+,X+O,+OX,+XO} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __filledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 正方形斜十字线叠加正十字线
-\__circledtext_new_char_box_construct:nn { X+ }
+\clist_map_variable:nNn {X+,+X} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __dcross } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __scross } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 内切圆叠加同心82%内切圆边框
@@ -578,11 +703,14 @@
}
% 反色正方形叠加内切填充圆
-\__circledtext_new_char_box_construct:nn { Oo }
+\clist_map_variable:nNn {Oo,oO} \l_tmpa_tl
{
- \__circledtext_char_box_type_c:n { __negfilledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
- \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_new_char_box_construct:Vn \l_tmpa_tl
+ {
+ \__circledtext_char_box_type_c:n { __negfilledsquare } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __innerfilledcircle } {#1} {#2} {#3} {#4} {#5} {#6}
+ \__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
+ }
}
% 正方形叠加同心82%正方形边框
@@ -592,6 +720,53 @@
\__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {#5} {#6}
\__circledtext_char_box_type_c:n { __squarebox } {#1} {#2} {#3} {#4} {0.82} {0.82}
}
+
+% 3同心圆叠加(类似中国象棋棋子形状)
+\__circledtext_new_char_box_construct:nn { ooo }
+ {
+ % 绘制填充外接圆阴影
+ \__circledtext_char_box_type_c:n { __outershadowfilledcircle }
+ {#1} {#2} {#3} {#4} {1.0} {1.0}
+ % 绘制填充外接圆外圈背景
+ \__circledtext_char_box_type_c:n { __outerlowerfilledcircle }
+ {#1} {#2} {#3} {#4} {#5} {#6}
+ % 绘制填充外接边环背景
+ \__circledtext_char_box_type_c:n { __outerupperfilledcircle }
+ {#1} {#2} {#3} {#4} {0.88} {0.88}
+ % 绘制填充外接圆内圈背景
+ \__circledtext_char_box_type_c:n { __outerlowerfilledcircle }
+ {#1} {#2} {#3} {#4} {0.72} {0.72}
+ % 绘制双边刻环线
+ \__circledtext_char_box_type_c:n { __outercirclebox }
+ {#1} {#2} {#3} {#4} {0.88} {0.88}
+ \__circledtext_char_box_type_c:n { __outercirclebox }
+ {#1} {#2} {#3} {#4} {0.72} {0.72}
+
+ }
+
+% 3同心正方形叠加
+\__circledtext_new_char_box_construct:nn { OOO }
+ {
+ % 绘制填充正方形阴影
+ \__circledtext_char_box_type_c:n { __shadowfilledsquare }
+ {#1} {#2} {#3} {#4} {1.0} {1.0}
+ % 绘制填充正方形外圈背景
+ \__circledtext_char_box_type_c:n { __lowerfilledsquare}
+ {#1} {#2} {#3} {#4} {#5} {#6}
+ % 绘制填充正方形边环背景
+ \__circledtext_char_box_type_c:n { __upperfilledsquare}
+ {#1} {#2} {#3} {#4} {0.88} {0.88}
+ % 绘制填充正方形内圈背景
+ \__circledtext_char_box_type_c:n { __lowerfilledsquare}
+ {#1} {#2} {#3} {#4} {0.72} {0.72}
+ % 绘制双边刻环线
+ \__circledtext_char_box_type_c:n { __squarebox }
+ {#1} {#2} {#3} {#4} {0.88} {0.88}
+ \__circledtext_char_box_type_c:n { __squarebox }
+ {#1} {#2} {#3} {#4} {0.72} {0.72}
+
+ }
+
\msg_new:nnn { circledtext } { box-exists } { The~ box~ type~ `#1~ not~ exists. }
% 缩放类型名称生成函数
@@ -874,6 +1049,49 @@
\cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
{ \color_fill:nn #1 }
} ,
+
+ % 无反色时底层盒子背景填充颜色
+ lowerbgcolor .code:n = { \exp_args:Nx \tl_if_empty:nTF {#1}
+ {
+ \__circledtext_color_select:nn { lowerbgboxfill }
+ { yellow!70!red }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { yellow!70!red } }
+ }{ \__circledtext_color_select:nn { lowerbgboxfill } { #1 }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { #1 } }
+ }
+ } ,
+ lowerbgcolor .initial:n = {} ,
+
+ % 无反色时上层盒子背景填充颜色
+ upperbgcolor .code:n = { \exp_args:Nx \tl_if_empty:nTF {#1}
+ {
+ \__circledtext_color_select:nn { upperbgboxfill }
+ { yellow!80!black }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { yellow!80!black } }
+ }{ \__circledtext_color_select:nn { upperbgboxfill } { #1 }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { #1 } }
+ }
+ } ,
+ upperbgcolor .initial:n = {} ,
+
+ % 盒子阴影填充颜色
+ shadowcolor .code:n = { \exp_args:Nx \tl_if_empty:nTF {#1}
+ {
+ \__circledtext_color_select:nn { shadowboxfill }
+ { black!35!white }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { black!35!white } }
+ }{ \__circledtext_color_select:nn { shadowboxfill } { #1 }
+ \cs_set_nopar:Npn \__circledtext_aux_color_boxfill:
+ { \color_fill:n { #1 } }
+ }
+ } ,
+ shadowcolor .initial:n = {} ,
+
% 笔画参数
charstroke .choice:,
charstroke .value_required:n = true,
@@ -965,17 +1183,17 @@
% 复制盒子准备缩放与输出
\coffin_set_eq:NN \l__circledtext_box_coffin \l__circledtext_char_coffin
- % % 测量盒子容器总高度(用内切圆则不需要)
- % \dim_set:Nn \l_tmpa_dim
- % { \__circledtext_coffin_ht_plus_dp:N \l__circledtext_box_coffin }
- % % 缩放字符盒子容器到字符大小
- % \coffin_scale:Nnn \l__circledtext_box_coffin
- % {
- % \dim_ratio:nn { \charboxht } { \l_tmpa_dim }
- % }
- % {
- % \dim_ratio:nn { \charboxht } { \l_tmpa_dim }
- % }
+ % 测量盒子容器总高度(用内切圆则不需要)
+ \dim_set:Nn \l_tmpa_dim
+ { \__circledtext_coffin_ht_plus_dp:N \l__circledtext_box_coffin }
+ % 缩放字符盒子容器到字符大小
+ \coffin_scale:Nnn \l__circledtext_box_coffin
+ {
+ \dim_ratio:nn { \charboxht } { \l_tmpa_dim }
+ }
+ {
+ \dim_ratio:nn { \charboxht } { \l_tmpa_dim }
+ }
% 根据指定的方式缩放盒子
\__circledtext_resize_c:n { \l__circledtext_resize_method_tl }
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 d72cb1d1eb3..38128a99d82 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
@@ -76,17 +76,15 @@
\tl_if_blank:nTF {#3}
{ \__csl_print_undefined_citation:n {#3} }
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \prop_clear:N \l__csl_citation_properties_prop
- \__csl_process_cite_input:nnn {#1} {#2} {#3}
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
+ \__csl_cite_init:
+ \__csl_collect_citation_items:nnn {#1} {#2} {#3}
+ \__csl_process_citation_info:
\prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 }
\tl_if_empty:nF {#4}
{
\prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4}
}
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \__csl_make_citation:
}
}
@@ -101,16 +99,14 @@
\tl_if_blank:nTF {#3}
{ \__csl_print_undefined_citation:n {#3} }
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \prop_clear:N \l__csl_citation_properties_prop
- \__csl_process_cite_input:nnn {#1} {#2} {#3}
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
+ \__csl_cite_init:
+ \__csl_collect_citation_items:nnn {#1} {#2} {#3}
+ \__csl_process_citation_info:
\tl_if_empty:nF {#4}
{
\prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4}
}
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \__csl_make_citation:
}
}
{
@@ -119,16 +115,14 @@
\tl_if_blank:nTF {#3}
{ \__csl_print_undefined_citation:n {#3} }
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \prop_clear:N \l__csl_citation_properties_prop
- \__csl_process_cite_input:nnn {#1} {#2} {#3}
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
+ \__csl_cite_init:
+ \__csl_collect_citation_items:nnn {#1} {#2} {#3}
+ \__csl_process_citation_info:
\tl_if_empty:nF {#4}
{
\prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4}
}
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \__csl_make_citation:
}
}
}
@@ -158,11 +152,12 @@
}
+\bool_new:N \l__csl_multi_cite_bool
+
\cs_new:Npn \__csl_cites:
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \prop_clear:N \l__csl_citation_properties_prop
+ \__csl_cite_init:
+ \bool_set_true:N \l__csl_multi_cite_bool
\__csl_next_cites:nnn
}
@@ -174,27 +169,39 @@
{
\footnote
{
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \__csl_process_citation_info:
+ \__csl_make_citation:
}
}
{
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \__csl_process_citation_info:
+ \__csl_make_citation:
}
}
{
- \__csl_process_cite_input:nnn {#1} {#2} {#3}
+ \__csl_collect_citation_items:nnn {#1} {#2} {#3}
\__csl_next_cites:nnn
}
}
+\cs_new:Npn \__csl_cite_init:
+ {
+ \bool_set_false:N \l__csl_multi_cite_bool
+ \prop_clear:N \l__csl_citation_info_prop
+ \seq_clear:N \l__csl_cite_keys_seq
+ \seq_clear:N \l__csl_citation_items_seq
+ \prop_clear:N \l__csl_citation_properties_prop
+ \tl_clear:N \l__csl_cite_prefix_tl
+ \tl_clear:N \l__csl_cite_suffix_tl
+ }
+
+
% Appends the cite key into \l__csl_cite_keys_seq and cite-items into
% \l__csl_citation_items_seq
% #1, #2: prenote/postnote
% #3: keys
-\cs_new:Npn \__csl_process_cite_input:nnn #1#2#3
+\cs_new:Npn \__csl_collect_citation_items:nnn #1#2#3
{
\tl_if_novalue:nTF {#2}
{
@@ -222,12 +229,13 @@
\prop_new:N \l__csl_cite_item_prop
-\tl_new:N \l__csl_prefix_tl
-\tl_new:N \l__csl_suffix_tl
+% Collect citation items into \l__csl_citation_items_seq
+% Append "{id={ITEM},locator={42},label={page}}" into \l__csl_citation_items_seq
+% #1: prenote
+% #2: postnote
+% #3: key
\cs_new:Npn \__csl_process_cite_item:nnn #1#2#3
- % #1: prenote, #2: postnote, #3: key
- % Save "{id={ITEM},locator={42},label={page}}" into \l__csl_citation_items_seq
{
\prop_clear:N \l__csl_cite_item_prop
\prop_put:Nnn \l__csl_cite_item_prop { id } {#3}
@@ -235,11 +243,12 @@
% { \prop_put:Nnn \l__csl_cite_item_prop { suppress-author } { true } }
% \bool_if:T \l__csl_author_only_bool
% { \prop_put:Nnn \l__csl_cite_item_prop { author-only } { true } }
+ \tl_clear:N \l__csl_cite_prefix_tl
+ \tl_clear:N \l__csl_cite_suffix_tl
\tl_if_empty:nF {#1}
{
- \tl_set:Nn \l__csl_prefix_tl {#1}
- \tl_put_right:NV \l__csl_prefix_tl \l__csl_prefix_separator_tl
- \prop_put:NnV \l__csl_cite_item_prop { prefix } \l__csl_prefix_tl
+ \tl_set:Nn \l__csl_cite_prefix_tl {#1}
+ \tl_put_right:NV \l__csl_cite_prefix_tl \l__csl_prefix_separator_tl
}
\tl_if_empty:nF {#2}
{
@@ -249,12 +258,26 @@
\regex_match:nnTF { \d+ } {#2}
{ \__csl_set_locator:nn { page } {#2} }
{
- \tl_set:Nn \l__csl_suffix_tl {#2}
- \tl_put_left:NV \l__csl_suffix_tl \l__csl_suffix_separator_tl
- \prop_put:NnV \l__csl_cite_item_prop { suffix } \l__csl_suffix_tl
+ \tl_set:Nn \l__csl_cite_suffix_tl {#2}
+ \tl_put_left:NV \l__csl_cite_suffix_tl \l__csl_suffix_separator_tl
}
}
}
+ % The affixes are treated as cite item affixes in a multi-cite command
+ % (like `\cites`). Otherwise they are citation affixes.
+ \bool_if:NTF \l__csl_multi_cite_bool
+ {
+ \tl_if_empty:NF \l__csl_cite_prefix_tl
+ { \prop_put:NnV \l__csl_cite_item_prop { prefix } \l__csl_cite_prefix_tl }
+ \tl_if_empty:NF \l__csl_cite_suffix_tl
+ { \prop_put:NnV \l__csl_cite_item_prop { suffix } \l__csl_cite_suffix_tl }
+ }
+ {
+ \tl_if_empty:NF \l__csl_cite_prefix_tl
+ { \prop_put:NnV \l__csl_citation_properties_prop { prefix } \l__csl_cite_prefix_tl }
+ \tl_if_empty:NF \l__csl_cite_suffix_tl
+ { \prop_put:NnV \l__csl_citation_properties_prop { suffix } \l__csl_cite_suffix_tl }
+ }
\__csl_serialize_prop:NN \l__csl_cite_item_prop \l_tmpa_tl
\tl_put_left:NV \l_tmpa_tl { \c_left_brace_str }
\tl_put_right:NV \l_tmpa_tl { \c_right_brace_str }
@@ -274,10 +297,13 @@
\msg_new:nnn { citation-style-language } { empty-locator }
{ Empty~ '#1'~ locator. }
+\tl_new:N \l__csl_cite_prefix_tl
+\tl_new:N \l__csl_cite_suffix_tl
+
\keys_define:nn { csl / cite-item }
{
- prefix .prop_put:N = \l__csl_cite_item_prop,
- suffix .prop_put:N = \l__csl_cite_item_prop,
+ prefix .tl_set:N = \l__csl_cite_prefix_tl,
+ suffix .tl_set:N = \l__csl_cite_suffix_tl,
locator .prop_put:N = \l__csl_cite_item_prop,
label .prop_put:N = \l__csl_cite_item_prop,
suppress-author .prop_put:N = \l__csl_cite_item_prop,
@@ -325,13 +351,10 @@
% Load the cite keys and prepare:
% - \l__csl_citation_id_tl
% - \l__csl_citation_properties_prop
-%
-% #1: \l__csl_cite_keys_seq
-% #2: \l__csl_citation_items_seq
-\cs_new:Npn \__csl_process_citation_info:NN #1#2
+\cs_new:Npn \__csl_process_citation_info:
{
- \__csl_process_citation_id:NN \l__csl_citation_id_tl #1
- \__csl_get_note_index:N \l__csl_note_index_tl
+ \__csl_process_citation_id:
+ \__csl_get_note_index:
\prop_put:NnV \l__csl_citation_properties_prop { noteIndex } \l__csl_note_index_tl
\__csl_make_chapter_property:
\__csl_add_back_ref_info:
@@ -395,8 +418,7 @@
\tl_new:N \l__csl_citation_properties_tl
% Write citation info to aux and print the citation contents.
-% #1: \l__csl_citation_info_prop
-\cs_new:Npn \__csl_make_citation:N #1
+\cs_new:Npn \__csl_make_citation:
{
\prop_clear:N \l__csl_citation_info_prop
% citationID
@@ -416,7 +438,7 @@
% Print the citation string
\prop_get:NVNTF \g__csl_citations_prop \l__csl_citation_id_tl
\l__csl_citation_tl
- { \__csl_print_citation:N \l__csl_citation_tl }
+ { \__csl_print_citation: }
{
\bool_if:NTF \l__csl_engine_initialized_bool
{
@@ -427,7 +449,7 @@
\char_set_catcode_other:N \%
\char_set_catcode_other:N \#
\exp_args:NV \__csl_cite_aux:n \l__csl_citation_info_tl
- \__csl_print_citation:N \l__csl_citation_tl
+ \__csl_print_citation:
\group_end:
}
{
@@ -471,13 +493,12 @@
\int_new:N \l__csl_citation_count_int
\prop_new:N \g__csl_citations_count_prop
-\cs_new:Npn \__csl_process_citation_id:NN #1#2
- % #1: \l__csl_citation_id_tl
- % #2: \l__csl_cite_keys_seq
- % Set \l__csl_citation_id_tl = "ITEM-1,ITEM-2@4".
+% Load cite keys from `\l__csl_cite_keys_seq` and make `\l__csl_citation_id_tl`.
+% Set \l__csl_citation_id_tl = "ITEM-1,ITEM-2@4".
+\cs_new:Npn \__csl_process_citation_id:
{
\tl_set:Nx \l__csl_cite_keys_tl
- { \seq_use:Nn #2 { , } }
+ { \seq_use:Nn \l__csl_cite_keys_seq { , } }
% \prop_show:N \g__csl_citations_count_prop
% \tl_show:N \l__csl_cite_keys_tl
\prop_get:NVNTF \g__csl_citations_count_prop \l__csl_cite_keys_tl
@@ -489,7 +510,7 @@
{ \int_set_eq:NN \l__csl_citation_count_int \c_one_int }
\prop_gput:NVV \g__csl_citations_count_prop \l__csl_cite_keys_tl
\l__csl_citation_count_int
- \tl_set:Nx #1
+ \tl_set:Nx \l__csl_citation_id_tl
{ \l__csl_cite_keys_tl @ \int_use:N \l__csl_citation_count_int }
}
@@ -499,11 +520,11 @@
% Save the note number to \l__csl_note_index_tl
% TODO: multiple citations in a note
-\cs_new:Npn \__csl_get_note_index:N #1
+\cs_new:Npn \__csl_get_note_index:
% #1: \l__csl_note_index_tl
{
\bool_if:NTF \l__csl_note_bool
- { \tl_set:Nx #1 { \int_use:c { c@ \@mpfn } } }
+ { \tl_set:Nx \l__csl_note_index_tl { \int_use:c { c@ \@mpfn } } }
{
\tl_if_empty:NTF \l__csl_class_tl
{
@@ -511,9 +532,9 @@
\int_set_eq:Nc \l_tmpa_int { c@ \@mpfn }
\int_gincr:N \g__csl_pseudo_note_index_int
\int_add:Nn \l_tmpa_int { \g__csl_pseudo_note_index_int }
- \tl_set:Nx #1 { \int_use:N \l_tmpa_int }
+ \tl_set:Nx \l__csl_note_index_tl { \int_use:N \l_tmpa_int }
}
- { \tl_set:Nn #1 { 0 } }
+ { \tl_set:Nn \l__csl_note_index_tl { 0 } }
}
}
@@ -538,11 +559,11 @@
% #1: \l__csl_citation_tl
-\cs_new:Npn \__csl_print_citation:N #1
+\cs_new:Npn \__csl_print_citation:
{
\bool_if:NT \l__csl_regression_test_bool
- { \tl_show:N #1 }
- #1
+ { \tl_show:N \l__csl_citation_tl }
+ \l__csl_citation_tl
}
@@ -590,16 +611,19 @@
\cs_new:Npn \__csl_no_cite:n #1
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \__csl_process_cite_input:nnn { } { } {#1}
+ \__csl_cite_init:
+ \__csl_collect_citation_items:nnn { } { } {#1}
\tl_set:Nx \l__csl_cite_items_tl
{ \seq_use:Nn \l__csl_citation_items_seq { , } }
+ \prop_clear:N \l__csl_citation_properties_prop
+ \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 }
+ \__csl_make_chapter_property:
+ \__csl_serialize_prop:NN \l__csl_citation_properties_prop \l__csl_citation_properties_tl
\tl_set:Nx \l__csl_citation_info_tl
{
citationID = { @nocite } ,
- citationItems = { \l__csl_cite_items_tl } ,
- properties = { noteIndex = { 0 } }
+ citationItems = { \tl_use:N \l__csl_cite_items_tl } ,
+ properties = { \tl_use:N \l__csl_citation_properties_tl }
}
\bool_if:NT \l__csl_regression_test_bool
{ \tl_show:N \l__csl_citation_info_tl }
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 84da32c79b8..8de98b6a9c6 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
@@ -89,8 +89,8 @@
{
\BlockquoteDisable
{
- \cs_set_eq:NN \__csl_process_citation_info:NN \use_none:nn
- \cs_set_eq:NN \__csl_make_citation:N \use_none:n
+ \cs_set_eq:NN \__csl_process_citation_info: \relax
+ \cs_set_eq:NN \__csl_make_citation: \relax
}
}
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 de5b5bed4ce..9032b60fee8 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
@@ -83,6 +83,10 @@
\cs_new:Npn \__csl_initialize_lua_module:
{
+ \bool_if:NT \l__csl_regression_test_bool
+ {
+ \lua_now:n { csl_citation_manager.regression_test = true }
+ }
\tl_set:Nx \l_tmpa_tl { \clist_use:Nn \l__csl_bib_resources_clist { , } }
\lua_now:e
{
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 f54f8d0e85e..33ce246978a 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,7 +9,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {citation-style-language} {2024-08-21} {0.6.2}
+\ProvidesExplPackage {citation-style-language} {2024-09-15} {0.6.4}
{Citation Style Language for LaTeX}
\RequirePackage { l3keys2e }
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml
index 833ff58f768..2d27ec8635d 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml
@@ -20,7 +20,7 @@
<name>Frank Bennett</name>
</translator>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
- <updated>2024-03-09T15:20:54-05:00</updated>
+ <updated>2024-08-27T14:30:55-04:00</updated>
</info>
<style-options punctuation-in-quote="false"/>
<date form="text">
@@ -46,7 +46,7 @@
<term name="no-publisher" form="short">n.p.</term>
<term name="on">on</term>
<term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form -->
- <term name="original-work-published">original work published</term>
+ <term name="original-work-published">Ursprünglich erschienen</term>
<term name="personal-communication">persönliche Kommunikation</term>
<term name="podcast">podcast</term>
<term name="podcast-episode">podcast episode</term>
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml
index 47a13f2740f..9edebba8375 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml
@@ -14,7 +14,7 @@
<name>Sebastian Karcher</name>
</translator>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
- <updated>2024-03-09T15:20:54-05:00</updated>
+ <updated>2024-08-27T14:30:55-04:00</updated>
</info>
<style-options punctuation-in-quote="false"/>
<date form="text">
@@ -40,7 +40,7 @@
<term name="no-publisher" form="short">n.p.</term>
<term name="on">on</term>
<term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form -->
- <term name="original-work-published">original work published</term>
+ <term name="original-work-published">Ursprünglich erschienen</term>
<term name="personal-communication">persönliche Kommunikation</term>
<term name="podcast">podcast</term>
<term name="podcast-episode">podcast episode</term>
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml
index f7e25ad0f31..903378388a3 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml
@@ -17,7 +17,7 @@
<name>jakov</name>
</translator>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
- <updated>2024-03-09T15:20:54-05:00</updated>
+ <updated>2024-08-27T14:30:55-04:00</updated>
</info>
<style-options punctuation-in-quote="false"/>
<date form="text">
@@ -43,7 +43,7 @@
<term name="no-publisher" form="short">n.p.</term>
<term name="on">on</term>
<term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form -->
- <term name="original-work-published">original work published</term>
+ <term name="original-work-published">Ursprünglich erschienen</term>
<term name="personal-communication">persönliche Kommunikation</term>
<term name="podcast">podcast</term>
<term name="podcast-episode">podcast episode</term>
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 d59376693f0..97fc1afd6cf 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-08-06T11:26:59-04:00</updated>
+ <updated>2024-08-27T14:44: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">
@@ -832,7 +832,7 @@
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
- <text term="author" form="verb"/>
+ <text term="container-author" form="verb"/>
<names variable="interviewer">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
@@ -1619,9 +1619,6 @@
<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">
@@ -1660,17 +1657,21 @@
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
<text variable="archive"/>
+ <text variable="archive-place"/>
</if>
<else>
<group delimiter=" ">
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
+ <text variable="archive-place"/>
</else>
</choose>
</if>
+ <else>
+ <text variable="archive"/>
+ </else>
</choose>
- <text variable="archive-place"/>
</group>
</group>
</macro>
diff --git a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty
index 4e128bf80bb..4d24f770564 100644
--- a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty
+++ b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020/06/01]
\ProvidesPackage{coloredtheorem}
- [2024/04/03 v1.0.2 - A colorful boxed theorem environment]
+ [2024/09/15 v1.0.4 - A colorful boxed theorem environment]
\RequirePackage{tcolorbox}
\tcbuselibrary{breakable}
@@ -27,10 +27,11 @@
\expandafter\gdef\csname\tcbth list#1name\endcsname{List of #2s}%
\expandafter\gdef\csname#1autorefname\endcsname{#2}%
\AtEndPreamble{%
- \ifdefined\crefname\expandafter\crefname\csname\tcbth#1\endcsname{#2}{#2s}\fi}%
+ \ifdefined\crefname\expandafter\crefname\expandafter{\tcbth#1}{#2}{#2s}\fi}%
\expandafter\gdef\csname\tcbth listof#1s\endcsname
{%
- \section*{\csname\tcbth list#1name\endcsname}%
+ \ifdefined\chapter\chapter*{\csname\tcbth list#1name\endcsname}%
+ \else\section*{\csname\tcbth list#1name\endcsname}\fi%
\expandafter\@starttoc\expandafter{lo#1}%
}
\expandafter\NewDocumentEnvironment\expandafter{\tcbth#1} {O{} m O{}}%
@@ -53,6 +54,9 @@
~\csname the\tcbth#1\endcsname\fi}~~##2},
#3, ##3,
]%
+ \let\origpar=\par%
+ \def\par{\origpar\medskip}%
+ \ignorespaces%
}{% \end{tcb<SOMETHING>}
\end{tcolorbox}%
\end{center}%
diff --git a/Master/texmf-dist/tex/latex/commalists-tools/commalists-tools.sty b/Master/texmf-dist/tex/latex/commalists-tools/commalists-tools.sty
new file mode 100644
index 00000000000..7809c82721a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/commalists-tools/commalists-tools.sty
@@ -0,0 +1,188 @@
+% Author : C. Pierquet
+% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{commalists-tools}[2024/09/25 0.1.0 Basic operations for numeral comma separated lists]
+
+%------History
+% 0.1.0 Initial version
+
+%------Packages
+\RequirePackage{listofitems}
+\RequirePackage{xintexpr}
+\RequirePackage{xstring}
+
+%-----Macros (LaTeX3...) for sorting
+\ExplSyntaxOn
+\NewDocumentCommand\sortasclist{ s m }
+{
+ \clist_set:Nx \l_foo_clist {#2}
+ \clist_sort:Nn \l_foo_clist{
+ \int_compare:nNnTF { ##1 } > { ##2 }
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+ \IfBooleanTF{#1}%if star := just printing // if not, storing
+ {%
+ {\l_foo_clist}%
+ }%
+ {%
+ \xdef#2{\l_foo_clist}%
+ }%
+}
+
+\NewDocumentCommand\sortdeslist{ s m }
+{
+ \clist_set:Nx \l_foo_clist {#2}
+ \clist_sort:Nn \l_foo_clist{
+ \int_compare:nNnTF { ##1 } < { ##2 }
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+ \IfBooleanTF{#1}%if star := just printing // if not, storing
+ {%
+ {\l_foo_clist}%
+ }%
+ {%
+ \xdef#2{\l_foo_clist}%
+ }%
+}
+\ExplSyntaxOff
+
+%----Macros (LaTeX2)
+\NewDocumentCommand\addvalinlist{ s m m }{%
+ \IfBooleanTF{#1}%if star := just printing // if not, storing
+ {%
+ #3,#2%
+ }%
+ {%
+ \xdef#3{#3,#2}%
+ }%
+}
+
+\NewDocumentCommand\removevalinlist{ s m m }{%
+ \readlist*\tmplistread{#3}%
+ \xdef\tmpresremovelist{}%
+ \xintFor* ##1 in {\xintSeq{1}{\tmplistreadlen}}\do{%
+ \xintifboolexpr{ \tmplistread[##1] == #2}%
+ {}%
+ {%
+ \xintifboolexpr{ ##1 == 1 }%
+ {%
+ \xdef\tmpresremovelist{\tmplistread[##1]}%
+ }%
+ {%
+ \xdef\tmpresremovelist{\tmpresremovelist,\tmplistread[##1]}%
+ }%
+ }%
+ }%
+ \IfBooleanTF{#1}%if star := just printing // if not, storing
+ {%
+ \tmpresremovelist%
+ }%
+ {%
+ \xdef#3{\tmpresremovelist}%
+ }%
+}
+
+\NewDocumentCommand\boolvalinlist{ m m O{\resisinlist} }{%
+ \IfSubStr{,#2,}{,#1,}{\def#3{1}}{\def#3{0}}%
+}
+
+\NewDocumentCommand\xintifvalinlist{ m m m m }{%
+ \IfSubStr{,#2,}{,#1,}{\xdef\RESTMPVALUE{1}}{\xdef\RESTMPVALUE{0}}%
+ \xintifboolexpr{ \RESTMPVALUE == 1}{#3}{#4}%
+}
+
+\NewDocumentCommand\countvalinlist{ s m m O{\rescount} }{%
+ \readlist*\tmplistread{#3}%
+ \xdef#4{0}%
+ \xintFor* ##1 in {\xintSeq{1}{\tmplistreadlen}}\do{%
+ \xintifboolexpr{ \tmplistread[##1] == #2}%
+ {%
+ \xdef#4{\fpeval{#4+1}}%
+ }%
+ {}%
+ }%
+ \IfBooleanT{#1}%if star := just printing // if not, storing
+ {%
+ #4%
+ }%
+}
+
+\NewDocumentCommand\minoflist{ s m O{\resmin} }{%
+ \IfBooleanTF{#1}%
+ {%
+ \fpeval{min(#2)}%
+ }%
+ {%
+ \xdef#3{\fpeval{min(#2)}}%
+ }%
+}
+
+\NewDocumentCommand\maxoflist{ s m O{\resmax} }{%
+ \IfBooleanTF{#1}%
+ {%
+ \fpeval{max(#2)}%
+ }%
+ {%
+ \xdef#3{\fpeval{max(#2)}}%
+ }%
+}
+
+\NewDocumentCommand\meanoflist{ s m O{\resmean} }{%
+ \xdef#3{0}%
+ \readlist*\tmpmeanlist{#2}%
+ \xintFor* ##1 in {\xintSeq{1}{\tmpmeanlistlen}}\do{%
+ \xdef#3{\fpeval{#3+\tmpmeanlist[##1]}}%
+ }%
+ \xdef#3{\fpeval{(#3)/\tmpmeanlistlen}}%
+ \IfBooleanT{#1}%if star := just printing // if not, storing
+ {%
+ #3%
+ }%
+}
+
+\NewDocumentCommand\sumoflist{ s m O{\ressum} }{%
+ \xdef#3{0}%
+ \readlist*\tmpsumlist{#2}%
+ \xintFor* ##1 in {\xintSeq{1}{\tmpsumlistlen}}\do{%
+ \xdef#3{\fpeval{#3+\tmpsumlist[##1]}}%
+ }%
+ \IfBooleanT{#1}%if star := just printing // if not, storing
+ {%
+ #3%
+ }%
+}
+
+\NewDocumentCommand\prodoflist{ s m O{\resprod} }{%
+ \xdef#3{1}%
+ \readlist*\tmpprodlist{#2}%
+ \xintFor* ##1 in {\xintSeq{1}{\tmpprodlistlen}}\do{%
+ \xdef#3{\fpeval{(#3)*\tmpprodlist[##1]}}%
+ }%
+ \IfBooleanT{#1}%if star := just printing // if not, storing
+ {%
+ #3%
+ }%
+}
+
+\NewDocumentCommand\reverselist{ s m O{\resrevlist} }{%
+ \readlist*\tmpreverselist{#2}%
+ \xdef#3{\tmpreverselist[-1]}%
+ \xintFor* ##1 in {\xintSeq{2}{\tmpreverselistlen}}\do{%
+ \xdef#3{#3,\tmpreverselist[-##1]}%
+ }%
+ \IfBooleanT{#1}%if star := just printing // if not, storing
+ {%
+ #3%
+ }%
+}
+
+\NewDocumentCommand\getvaluefromlist{ s m m O{\resmyelt} }{%
+ \readlist*\tmpreadlist{#2}%
+ \xdef#4{\tmpreadlist[#3]}%
+ \IfBooleanT{#1}{#4}%
+}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cs-techrep/cs-techrep.cls b/Master/texmf-dist/tex/latex/cs-techrep/cs-techrep.cls
index d84b85a3bca..e76a83ba0cf 100644
--- a/Master/texmf-dist/tex/latex/cs-techrep/cs-techrep.cls
+++ b/Master/texmf-dist/tex/latex/cs-techrep/cs-techrep.cls
@@ -2,11 +2,23 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{cs-techrep}[2024/04/10 Technical Reports in Computer Science and Software Engineering v0.2]
+\ProvidesClass{cs-techrep}[2024/09/16 Technical Reports in Computer Science and Software Engineering v0.4]
+\newcounter{cstechrep@subfigtracker}
+\newcounter{cstechrep@subcaptiontracker}
\newcounter{cstechrep@pbalancetracker}
\newcounter{cstechrep@flushendtracker}
+
+\DeclareOption{subfig}{
+ \setcounter{cstechrep@subfigtracker}{1}
+ \typeout{cs-techrep class: subfig option is set (use subfloat command).}
+}
+\DeclareOption{subcaption}{
+ \setcounter{cstechrep@subcaptiontracker}{1}
+ \typeout{cs-techrep class: subcaption option is set (use subfigure command).}
+}
+
\DeclareOption{onecolumn}{\OptionNotUsed} % IEEE option onecolumn will be ignored
\DeclareOption{pbalance}{
@@ -39,7 +51,7 @@
\DefcstechrepVar{Department} % e.g., Department of Electrical Engineering, Media and Computer Science
\DefcstechrepVar{Institution} % e.g., Ostbayerische Technische Hochschule Amberg-Weiden
\DefcstechrepVar{Address} % e.g., Amberg, Germany
-\DefcstechrepVar{Series} % e.g., Technical Reports
+\DefcstechrepVar{Type} % e.g., Technical Report
\DefcstechrepVar{Year} % e.g., 2023
\DefcstechrepVar{Title}
\DefcstechrepVar{Month} % e.g., 6 (for June)
@@ -88,7 +100,7 @@
\RequirePackage[cmyk, table]{xcolor}
-\RequirePackage[nolist]{acronym}
+\RequirePackage[nolist,smaller]{acronym}
\RequirePackage{listings}
@@ -181,7 +193,7 @@
\RequirePackage{booktabs}
-\RequirePackage{paralist}
+\RequirePackage[alwaysadjust]{paralist}
\RequirePackage[
@@ -316,7 +328,7 @@
\RequirePackage{pdflscape}
\RequirePackage{afterpage}
-\RequirePackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
+\RequirePackage[hyperxmp=false,lang=English]{doclicense}
\makeatletter
\def\ps@IEEEtitlepagestyle{
@@ -328,7 +340,9 @@
\begin{minipage}{0.8\textwidth}
\centering
% Creative Commons / Open Access:
- \href{https://creativecommons.org/licenses/by/4.0/}{\ccby{} This work is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) License.}
+ %\href{https://creativecommons.org/licenses/by/4.0/}{\ccby{} This work is %licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0) %License.}
+ % License based on doclicense package:
+ \href{\doclicenseURL}{\doclicenseIcon{} This work is licensed under a \doclicenseLongNameRef{} (\doclicenseNameRef{}) license.}
% Citation advice:
\\Please cite as: \fullcite{selfref}.
\end{minipage}
@@ -358,7 +372,17 @@
\cstechrepAddress
}}
-\IEEEspecialpapernotice{\cstechrepSeries: \cstechrepNumber, \citemonth{selfref} \cstechrepYear}
+\IEEEspecialpapernotice{\cstechrepType: \cstechrepNumber, \citemonth{selfref} \cstechrepYear}
+
+\ifnum\value{cstechrep@subfigtracker}=1
+ \typeout{cs-techrep class: load subfig package (use subfloat command).}
+ \RequirePackage[caption=false,font=footnotesize]{subfig}
+\fi
+\ifnum\value{cstechrep@subcaptiontracker}=1
+ \typeout{cs-techrep class: load subcaption package (use subfigure command).}
+ \RequirePackage{subcaption}
+ \captionsetup[subfigure]{labelformat=parens,font=footnotesize}
+\fi
\ifnum\value{cstechrep@pbalancetracker}=1
\typeout{cs-techrep class: load pbalance package.}
@@ -369,6 +393,9 @@
\RequirePackage{flushend}
\fi
+
+\RequirePackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
+
\endinput
%%
%% End of file `cs-techrep.cls'.
diff --git a/Master/texmf-dist/tex/latex/csthm/csthm.sty b/Master/texmf-dist/tex/latex/csthm/csthm.sty
new file mode 100644
index 00000000000..e12fbdc192e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/csthm/csthm.sty
@@ -0,0 +1,146 @@
+%%
+%% This is file `csthm.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% csthm.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2024 by Agni Datta <agnidatta.org@gmail.com>
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{csthm}
+ [2024/08/31 v1.2 Theorem Environments for Computer Science]
+\newif\if@csthm@loadcleveref
+\DeclareOption{cleveref}{\@csthm@loadclevereftrue}
+\ProcessOptions\relax
+
+\RequirePackage{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{amsthm}
+\RequirePackage{enumitem}
+\RequirePackage{thmtools}
+
+\if@csthm@loadcleveref
+\AtBeginDocument{%
+\@ifpackageloaded{hyperref}{%
+\RequirePackage{cleveref}
+}{%
+\PackageWarning{csthm}{The 'cleveref' option was set, but 'hyperref' is not loaded. Skipping 'cleveref' loading.}
+}%
+}
+\fi
+
+\declaretheoremstyle[
+spaceabove=\topsep,
+spacebelow=\topsep,
+headfont=\scshape,
+notefont=\scshape,
+bodyfont=\normalfont,
+postheadspace=5pt,
+numberwithin=section,
+qed=$\scriptstyle\star$,
+headpunct={.}
+]{thmstyle}
+
+\declaretheoremstyle[
+spaceabove=\topsep,
+spacebelow=\topsep,
+headfont=\bfseries,
+notefont=\bfseries,
+bodyfont=\normalfont,
+postheadspace=5pt,
+numberwithin=section,
+qed=$\scriptstyle\maltese$,
+headpunct={.}
+]{defstyle}
+
+\declaretheoremstyle[
+spaceabove=\topsep,
+spacebelow=\topsep,
+headfont=\itshape,
+notefont=\itshape,
+bodyfont=\normalfont,
+postheadspace=5pt,
+numberwithin=section,
+qed=$\scriptstyle\maltese$,
+headpunct={.}
+]{remarkstyle}
+
+\declaretheoremstyle[
+spaceabove=\topsep,
+spacebelow=\topsep,
+headfont=\sffamily\scshape,
+notefont=\sffamily\scshape,
+bodyfont=\normalfont\sffamily,
+postheadspace=5pt,
+numberwithin=section,
+qed=$\scriptstyle\maltese$,
+headpunct={.}
+]{hltstyle}
+
+\declaretheorem[style=thmstyle,name=Theorem]{theorem}
+\declaretheorem[style=defstyle,sibling=theorem]{fact}
+\declaretheorem[style=thmstyle,sibling=theorem]{assumption}
+\declaretheorem[style=thmstyle,sibling=theorem]{claim}
+\declaretheorem[style=thmstyle,sibling=theorem]{conjecture}
+\declaretheorem[style=thmstyle,sibling=theorem]{corollary}
+\declaretheorem[style=thmstyle,sibling=theorem]{lemma}
+\declaretheorem[style=thmstyle,sibling=theorem]{property}
+\declaretheorem[style=thmstyle,sibling=theorem]{proposition}
+
+\declaretheorem[style=defstyle,sibling=theorem]{definition}
+\declaretheorem[style=defstyle,sibling=theorem]{example}
+\declaretheorem[style=defstyle,sibling=theorem]{exercise}
+\declaretheorem[style=defstyle,sibling=theorem]{problem}
+\declaretheorem[style=defstyle,sibling=theorem]{question}
+
+\declaretheorem[style=remarkstyle,sibling=theorem]{note}
+\declaretheorem[style=remarkstyle,sibling=theorem]{remark}
+\declaretheorem[style=remarkstyle,sibling=theorem]{solution}
+
+\declaretheorem[style=hltstyle,name=Important]{important}
+\declaretheorem[style=hltstyle]{highlight}
+\declaretheorem[style=hltstyle]{keypoint}
+
+\newlist{caseList}{enumerate}{1}
+\setlist[caseList]{label=\textbf{Case~\arabic*:},leftmargin=*}
+
+\NewDocumentEnvironment{case}{O{}}{%
+\begin{caseList}[#1]%
+}{%
+\end{caseList}%
+}
+
+\newlist{axiomList}{enumerate}{1}
+\setlist[axiomList]{label=\textbf{Axiom~\Alph*:}, leftmargin=*}
+
+\NewDocumentEnvironment{axiom}{O{}}{%
+\begin{axiomList}[#1]%
+}{%
+\end{axiomList}%
+}
+
+\renewcommand\qedsymbol{$\scriptstyle\blacksquare$}
+
+\providecommand{\accentcolor}{black}
+
+\providecommand{\csthmpkg}{\textsf{csthm}}
+\providecommand{\email}[1]{\href{mailto:#1}{\texttt{#1}}}
+
+\newcommand{\setaccentcolor}[1]{\renewcommand{\accentcolor}{#1}}
+\endinput
+%%
+%% End of file `csthm.sty'.
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
index 849aa79aece..3d8d1484b66 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple-l3.sty: Simple LaTeX CSV file processing (LaTeX3)
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README.md
%%
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
-\ProvidesExplPackage{csvsimple-l3}{2024/05/16}{2.6.1}
+\ProvidesExplPackage{csvsimple-l3}{2024/09/27}{2.7.0}
{LaTeX3 CSV file processing}
@@ -148,9 +148,6 @@
Therefore,~the~macro~#2 is~not~defined.
}
-\msg_new:nnn { csvsimple }{ empty-head }
- { File~'#1'~starts~with~an~empty~line~(empty~head)!.}
-
\msg_new:nnn { csvsimple }{ file-error }
{ File~'#1'~not~existent,~not~readable,~or~empty!}
@@ -167,6 +164,8 @@
{ Call~of~CSV-Sorter~failed! }
{ See~log~file~'\l__csvsim_csvsorter_log_str'. }
+\msg_new:nnn { csvsimple }{ data-missing }
+ { File~'#1'~does~not~contain~(accepted)~data~lines!~The~result~may~be~unpleasant.}
%---- core loop processing
@@ -227,18 +226,18 @@
\cs_new_protected_nopar:Npn \__csvsim_read_head:
{
- \__csvsim_read_line:
- \tl_if_eq:NNTF \csvline \c__csvsim_par_tl
+ \bool_do_while:nn
{
- \msg_error:nne { csvsimple }{ empty-head }{ \g__csvsim_filename_str }
+ \bool_lazy_or_p:nn { \tl_if_eq_p:NN \csvline \c__csvsim_par_tl }{ \tl_if_blank_p:o \csvline }
}
{
- \int_gzero:N \g_csvsim_columncount_int
- \__csvsim_scan_line:
- \bool_if:NT \g__csvsim_colnames_detection_bool
- {
- \int_step_function:nN \g_csvsim_columncount_int \__csvsim_process_head_name:n
- }
+ \__csvsim_read_line:
+ }
+ \int_gzero:N \g_csvsim_columncount_int
+ \__csvsim_scan_line:
+ \bool_if:NT \g__csvsim_colnames_detection_bool
+ {
+ \int_step_function:nN \g_csvsim_columncount_int \__csvsim_process_head_name:n
}
}
@@ -395,10 +394,15 @@
}
\__csvsim_set_colnames:
\seq_gclear:N \g__csvsim_colname_seq
- \bool_if:NF \g__csvsim_line_firstline_bool
+ \bool_if:NT \g__csvsim_line_firstline_bool
{
- \g__csvsim_hook_late_after_last_line_tl
+ \msg_warning:nne { csvsimple }{ data-missing }{ \g__csvsim_filename_str }
+ \bool_if:NT \g__csvsim_head_bool
+ {
+ \g__csvsim_hook_late_after_head_tl
+ }
}
+ \g__csvsim_hook_late_after_last_line_tl
\g__csvsim_hook_table_end_tl
\g__csvsim_hook_after_reading_tl
\bool_if:NT \g__csvsim_collect_data_bool
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
index ecaba4a7b06..7db0c82117c 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple-legacy.sty: Simple LaTeX CSV file processing (LaTeX2e)
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README.md
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple-legacy}[2024/05/16 version 2.6.1 LaTeX2e CSV file processing]
+\ProvidesPackage{csvsimple-legacy}[2024/09/27 version 2.7.0 LaTeX2e CSV file processing]
%---- check package
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
index 01ccbb3f721..a9d549f76d8 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple.sty: Simple LaTeX CSV file processing
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README.md
%%
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\ProvidesExplPackage{csvsimple}{2024/05/16}{2.6.1}
+\ProvidesExplPackage{csvsimple}{2024/09/27}{2.7.0}
{LaTeX CSV file processing}
\cs_if_exist:NT \c__csvsim_package_expl_bool
diff --git a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
index 535baa0f186..a54da462ab5 100644
--- a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
+++ b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty
@@ -3,9 +3,13 @@
% 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/08/20 0.1.9 Custom classic environments]
+\ProvidesPackage{customenvs}[2024/09/14 0.2.3 Custom classic environments]
%====HISTORIQUE
+% v 0.2.3 Panneau autoroutier + Panneau Soldes
+% v 0.2.2 Flèche évasée, en TikZ
+% v 0.2.1 Modification mineure de la gestion des étoiles tikz (baseline) + grille auto tikzpicture
+% v 0.2.0 Ajout d'étoiles pour les difficultés d'exercices (2 versions)
% v 0.1.9 tkzBanner + tkzBannerTri + includegraphicsfill
% v 0.1.8 Nutriscore
% v 0.1.7 Style perso pour les vignettes
@@ -678,7 +682,155 @@
}
%====EXERCICE PERSO
+\newlength{\largstarsempty}
+\newlength{\largstarsmid}
+\newlength{\largstarfull}
+\newlength{\largmaxstars}
+
+%commande annexe tkzlevelstars [en] + [fr]
+\usetikzlibrary{shapes.geometric}
+
+\newlength{\tmphauteuretoiles}
+\newlength{\tmpprofondeuretoiles}
+\newlength{\tmpoffsetetoiles}\setlength{\tmpoffsetetoiles}{0.25pt}
+
+\defKV[levelstars]{%
+ colframe=\def\tkzLevelStarsColor{#1},
+ colback=\def\tkzLevelStarsColorBg{#1},
+ offset=\setlength{\tmpoffsetetoiles}{#1},
+ maxlevel=\def\tkzLevelStarsMaxLevel{#1}
+}
+
+\setKVdefault[levelstars]{%
+ colframe=black,
+ colback=gray,
+ offset={0.025em},
+ maxlevel=3,
+ valign=true
+}
+
+\NewDocumentCommand{\tkzLevelStars}{ O{} m }{%
+ %lectures des clés
+ \restoreKV[levelstars]%
+ \setKV[levelstars]{#1}%
+ %dimensions
+ \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}%
+ \setlength{\tmphauteuretoiles}{0.95\tmphauteuretoiles}%
+ \ifboolKV[levelstars]{valign}%
+ {%
+ \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}%
+ \begin{tikzpicture}[baseline={-1.25\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}]
+ }%
+ {%
+ \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}]
+ }%
+ \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{%
+ \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}%
+ %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))}
+ \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{};
+ }
+ \end{tikzpicture}%
+}
+
+\defKV[tkznivetoiles]{%
+ Couleur=\def\tkzLevelStarsColor{#1},
+ CouleurFond=\def\tkzLevelStarsColorBg{#1},
+ Offset=\setlength{\tmpoffsetetoiles}{#1},
+ NiveauMax=\def\tkzLevelStarsMaxLevel{#1}
+}
+
+\setKVdefault[tkznivetoiles]{%
+ Couleur=black,
+ CouleurFond=gray,
+ Offset={0.025em},
+ NiveauMax=3,
+ AlignV=true
+}
+
+\NewDocumentCommand{\tkzEtoiles}{ O{} m }{%
+ %lectures des clés
+ \restoreKV[tkznivetoiles]%
+ \setKV[tkznivetoiles]{#1}%
+ %dimensions
+ \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}%
+ \setlength{\tmphauteuretoiles}{0.95\tmphauteuretoiles}%
+ \ifboolKV[tkznivetoiles]{AlignV}%
+ {%
+ \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}%
+ \begin{tikzpicture}[baseline={-1.25\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}]
+ }%
+ {%
+ \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}]
+ }%
+ \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{%
+ \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}%
+ %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))}
+ \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{};
+ }
+ \end{tikzpicture}%
+}
+
+%commande annexe ;-)
+\NewDocumentCommand\NiveauDiffExos{ O{3} m }{%avec des demis ??
+ %les tailles de boîtes
+ \settowidth{\largstarsempty}{{\faStar[regular]}}%
+ \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}%
+ \settowidth{\largstarfull}{{\faStar}}%
+ \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}%
+ %les calculs intermédiaires
+ \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide
+ \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide
+ %
+ \xintifboolexpr{isint(\tmpstars) == 1}%
+ {%
+ \xdef\tmpstarsexosfull{\tmpstars}%
+ \xdef\tmpstarsexosmid{0}%
+ \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}%
+ }%
+ {%
+ \xdef\tmpstarsexosmid{1}%
+ \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}%
+ \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}%
+ }%
+ %affichage des full
+ \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}%
+ %affichage des mid
+ \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}%
+ %affichage des vides
+ \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}%
+}
+
+%commande annexe [en] ;-)
+\NewDocumentCommand\DiffLevelStars{ O{3} m }{%avec des demis ??
+ %les tailles de boîtes
+ \settowidth{\largstarsempty}{{\faStar[regular]}}%
+ \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}%
+ \settowidth{\largstarfull}{{\faStar}}%
+ \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}%
+ %les calculs intermédiaires
+ \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide
+ \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide
+ %
+ \xintifboolexpr{isint(\tmpstars) == 1}%
+ {%
+ \xdef\tmpstarsexosfull{\tmpstars}%
+ \xdef\tmpstarsexosmid{0}%
+ \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}%
+ }%
+ {%
+ \xdef\tmpstarsexosmid{1}%
+ \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}%
+ \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}%
+ }%
+ %affichage des full
+ \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}%
+ %affichage des mid
+ \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}%
+ %affichage des vides
+ \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}%
+}
+%code ppal
\newcounter{numeroexo}
\setcounter{numeroexo}{0}
\newlength{\eptraitexo}
@@ -689,6 +841,8 @@
\newlength{\tmp@image@profondeur}
\colorlet{macouleurexo}{blue!50!black}
+\colorlet{macouleurexodeco}{blue!50!black}
+\colorlet{macouleurexodecofond}{blue!50!black}
\newcommand\tmpstyleexo{\bfseries\LARGE\sffamily}%
\newcommand\tmplabelexo{Exercice~}%
@@ -696,15 +850,21 @@
\defKV[globalstyleexo]{%
Libelle=\renewcommand\tmplabelexo{#1},%
Couleur=\colorlet{macouleurexo}{#1},%
+ CouleurDeco=\colorlet{macouleurexodeco}{#1},%
+ CouleurFondDeco=\colorlet{macouleurexodecofond}{#1},%
Police=\renewcommand\tmpstyleexo{#1},%
- EpTrait=\setlength{\eptraitexo}{#1}
+ EpTrait=\setlength{\eptraitexo}{#1},%
+ EchelleEtoiles=\def\tmpscalestarsexos{#1}
}
\setKVdefault[globalstyleexo]{%
Libelle={Exercice~},%
Couleur={blue!50!black},%
+ CouleurDeco={blue!50!black},%
+ CouleurFondDeco={macouleurexodeco!50},%
Police={\bfseries\LARGE\sffamily},%
- EpTrait={1.1pt}
+ EpTrait={1.1pt},%
+ EchelleEtoiles=0.85
}
\NewDocumentCommand\StyleEnvtExo{ O{} }{%
@@ -719,20 +879,20 @@
Type=\def\EnvtExoType{#1},%
ComplementTitre=\def\EnvtExoCpltTitre{#1},%
CodeDebut=\def\EnvtExoCodeAvant{#1},%
- %Couleur=\def\EnvtExoCouleur{#1},%
EchelleImage=\def\EnvtExoScaleImg{#1},%
Decoration=\def\EnvtExoDeco{#1},%
- Trait=\def\EnvtExoTrait{#1}
+ Trait=\def\EnvtExoTrait{#1},%
+ Etoiles=\def\EnvtExoEtoiles{#1}
}
\setKVdefault[EnvtExercice]{
Type=Classique,%
ComplementTitre={},%
CodeDebut={},%
- %Couleur=macouleurexo,%
EchelleImage=1.15,%
Compteur=true,%
Decoration={},%
- Trait=plein
+ Trait=plein,%
+ Etoiles={}
}
\NewDocumentEnvironment{EnvtExo}{ !O{} }%
@@ -747,18 +907,32 @@
{%
%label avec numéro et complément
\tmpstyleexo\tmplabelexo\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre%
+ %étoiles eventuelles
+ \IfStrEq{\EnvtExoEtoiles}{}{}%
+ {%
+ \,(\IfSubStr{\EnvtExoEtoiles}{§}%
+ {%
+ \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}%
+ }%
+ )%
+ }%
%trait éventuel
\IfStrEqCase{\EnvtExoTrait}{%
{plein}{\,\hrulefill}%
{pointilles}{\,\dotfill}%
{dashilles}{\,\hdashrule{\fill}{\eptraitexo}{\eptraitexospace}}%
{non}{\hfill}%
+ {aucun}{~}%
}%
%décoration éventuelle
\IfSubStr{\EnvtExoDeco}{Icone}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]%
- \,\scalebox{0.85}[0.85]{\EnvtExoIcon}%
+ \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}%
}{}%
\IfSubStr{\EnvtExoDeco}{Ceinture}%
{%
@@ -768,13 +942,13 @@
\IfSubStr{\EnvtExoDeco}{Chrono}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]%
- \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}%
+ \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}%
}{}%
\IfSubStr{\EnvtExoDeco}{Points}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]%
\IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}%
- \,(\EnvtExoPts\ \pts)%
+ \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}%
}{}%
\IfSubStr{\EnvtExoDeco}{Image}%
{%
@@ -782,12 +956,49 @@
\settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}%
\,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$%
}{}%
+ \IfSubStr{\EnvtExoDeco}{faEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSubStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}%
+ }%
+ {%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}%
+ }%
+ }{}%
+ \IfSubStr{\EnvtExoDeco}{tkzEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSubStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}%
+ }%
+ }{}%
}{}%
\IfSubStr{\EnvtExoType}{Perso}%OK perso____déco
{%
\StrBehind{\EnvtExoType}{/}[\EnvtExoLabel]%
%label avec numéro et complément
\tmpstyleexo\EnvtExoLabel\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre%
+ %étoiles eventuelles
+ \IfStrEq{\EnvtExoEtoiles}{}{}%
+ {%
+ \,(\IfSubStr{\EnvtExoEtoiles}{§}%
+ {%
+ \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}%
+ }%
+ )%
+ }%
%trait éventuel
\IfStrEqCase{\EnvtExoTrait}{%
{plein}{\,\hrulefill}%
@@ -799,7 +1010,7 @@
\IfSubStr{\EnvtExoDeco}{Icone}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]%
- \,\scalebox{0.85}[0.85]{\EnvtExoIcon}%
+ \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}%
}{}%
\IfSubStr{\EnvtExoDeco}{Ceinture}%
{%
@@ -809,13 +1020,13 @@
\IfSubStr{\EnvtExoDeco}{Chrono}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]%
- \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}%
+ \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}%
}{}%
\IfSubStr{\EnvtExoDeco}{Points}%
{%
\StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]%
\IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}%
- \,(\EnvtExoPts\ \pts)%
+ \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}%
}{}%
\IfSubStr{\EnvtExoDeco}{Image}%
{%
@@ -823,6 +1034,30 @@
\settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}%
\,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$%
}{}%
+ \IfSubStr{\EnvtExoDeco}{faEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSuStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}%
+ }%
+ {%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}%
+ }%
+ }{}%
+ \IfSubStr{\EnvtExoDeco}{tkzEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSubStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}%
+ }%
+ }{}%
}{}%
\endgroup%
\def\hrulefill{\leavevmode\leaders\hrule height 0.4pt\hfill\kern\z@}%
@@ -842,6 +1077,19 @@
{%
%label avec numéro et complément
\tmpstyleexo\tmplabelexo\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre%
+ %étoiles eventuelles
+ \IfStrEq{\EnvtExoEtoiles}{}{}%
+ {%
+ \,(\IfSubStr{\EnvtExoEtoiles}{§}%
+ {%
+ \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}%
+ }%
+ )%
+ }%
%trait éventuel
\IfStrEqCase{\EnvtExoTrait}{%
{plein}{\,\hrulefill}%
@@ -877,12 +1125,49 @@
\settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}%
\,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$%
}{}%
+ \IfSubStr{\EnvtExoDeco}{faEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSuStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}%
+ }%
+ {%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}%
+ }%
+ }{}%
+ \IfSubStr{\EnvtExoDeco}{tkzEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSubStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}%
+ }%
+ }{}%
}{}%
\IfSubStr{\EnvtExoType}{Perso}%OK perso____déco
{%
\StrBehind{\EnvtExoType}{/}[\EnvtExoLabel]%
%label avec numéro et complément
\tmpstyleexo\EnvtExoLabel\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre%
+ %étoiles eventuelles
+ \IfStrEq{\EnvtExoEtoiles}{}{}%
+ {%
+ \,(\IfSubStr{\EnvtExoEtoiles}{§}%
+ {%
+ \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}%
+ }%
+ )%
+ }%
%trait éventuel
\IfStrEqCase{\EnvtExoTrait}{%
{plein}{\,\hrulefill}%
@@ -918,6 +1203,30 @@
\settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}%
\,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$%
}{}%
+ \IfSubStr{\EnvtExoDeco}{faEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSuStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}%
+ }%
+ {%
+ \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}%
+ }%
+ }{}%
+ \IfSubStr{\EnvtExoDeco}{tkzEtoiles}%
+ {%
+ \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]%
+ \IfSubStr{\EnvtExoStars}{§}%
+ {%
+ \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}%
+ }%
+ {%
+ \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}%
+ }%
+ }{}%
}{}%
\endgroup%
\def\hrulefill{\leavevmode\leaders\hrule height 0.4pt\hfill\kern\z@}%
@@ -2237,7 +2546,7 @@
\setKVdefault[tkzBannerpartKeys]{%
height=2.5em,%
- width=\linewidth,%
+ width={\linewidth-0.5pt},%
blockwidth=2.75em,%
collight=darkgray!25,%
colmedium=darkgray!50,%
@@ -2260,10 +2569,10 @@
\noindent%
\restoreKV[tkzBannerpartKeys]%
\setKV[tkzBannerpartKeys]{#1}%
- \pgfmathsetmacro{\tkzBannertriscale}{0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}%
- \pgfmathsetmacro{\scaletypedoctribanner}{1.05*0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}%
- \pgfmathsetmacro{\scaletypedoctribannernum}{2.5*0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}%
- \pgfmathsetmacro{\tkzBannertriangle}{0.10*\useKV[tkzBannerpartKeys]{height}/\useKV[tkzBannerpartKeys]{width}}%
+ \pgfmathsetmacro{\tkzBannertriscale}{0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}%
+ \pgfmathsetmacro{\scaletypedoctribanner}{1.05*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}%
+ \pgfmathsetmacro{\scaletypedoctribannernum}{2.5*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}%
+ \pgfmathsetmacro{\tkzBannertriangle}{0.10*(\useKV[tkzBannerpartKeys]{height})/(\useKV[tkzBannerpartKeys]{width})}%
\IfEq{\tkzBannermaintriblockwidth}{auto}%
{%
\settowidth{\tmp@tkzbanner@autowidthtype}{\scalebox{\scaletypedoctribanner}[\scaletypedoctribanner]{\sffamily\bfseries\vphantom{qÉ}\tkzBannermaintritype}}%
@@ -2309,34 +2618,34 @@
\begin{scope}
\clip ($(tkzBannerTri-SW)!0.0375!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1375!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ;
%light
- \fill[tkzbannertrilight] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ;
+ \fill[tkzbannertrilight] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ;
\end{scope}
\begin{scope}
\clip ($(tkzBannerTri-SW)!0.025!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ;
%medium
- \fill[tkzbannertrimedium] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ;
+ \fill[tkzbannertrimedium] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ;
\end{scope}
\begin{scope}
\clip ($(tkzBannerTri-SW)!0.0125!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ;
%dark
- \fill[tkzbannertridark] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth},0) -- ({\tmp@tkzbanner@autowidth+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth},0) -- (tkzBannerTri-SW) -- cycle ;
+ \fill[tkzbannertridark] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth},0) -- ({\tmp@tkzbanner@autowidth+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth},0) -- (tkzBannerTri-SW) -- cycle ;
\IfEq{\tkzBannermaintritypelibre}{}%
{%
\ifboolKV[tkzBannerpartKeys]{num}%
{%
\IfEq{\tkzBannermaintritype}{}%
{%
- \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#2};
+ \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2};
}%
{%
\node[inner sep=2pt,below=1pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={1.05*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintritype};
- \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.425*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#2};
+ \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.425*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2};
}%
}%
{}%
}%
{%
- \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintritypelibre};
+ \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintritypelibre};
}%
\end{scope}
}%
@@ -2346,26 +2655,417 @@
\clip (tkzBannerTri-SWd) -- (tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ;
\ifboolKV[tkzBannerpartKeys]{swap}%
{%
- \node[inner sep=2pt,right,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#3};
+ \node[inner sep=2pt,right,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3};
%logo
\IfEq{\tkzBannermaintrilogo}{}%
{}%
{%
- \node[inner sep=2pt,left,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintrilogo};
+ \node[inner sep=2pt,left,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo};
}%
}%
{%
- \node[inner sep=2pt,right,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#3};
+ \node[inner sep=2pt,right,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3};
%logo
\IfEq{\tkzBannermaintrilogo}{}%
{}%
{%
- \node[inner sep=2pt,left,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintrilogo};
+ \node[inner sep=2pt,left,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo};
}%
}%
\end{scope}
\end{tikzpicture}%
}
+%====grille automatique tikz ?
+\NewDocumentCommand\tkzGrilleAuto{ s O{thin,lightgray} m }{%
+ \IfBooleanT{#1}{\filldraw (0,0) circle[radius=2pt] ;}
+ \StrCut{#3}{§}{\tkzautogridx}{\tkzautogridy}%
+ \draw[xstep=\tkzautogridx,ystep=\tkzautogridy,#2] (current bounding box.south west) grid (current bounding box.north east) ;
+}
+\NewDocumentCommand\tkzAutoGrid{ s O{thin,lightgray} m }{%
+ \IfBooleanT{#1}{\filldraw (0,0) circle[radius=2pt] ;}
+ \StrCut{#3}{§}{\tkzautogridx}{\tkzautogridy}%
+ \draw[xstep=\tkzautogridx,ystep=\tkzautogridy,#2] (current bounding box.south west) grid (current bounding box.north east) ;
+}
+
+\tikzset{grilleauto/.store in=\tkzautogrid,grilleauto/.default={},grilleauto={}}
+\tikzset{autogrid/.store in=\tkzautogrid,autogrid/.default={},autogrid={}}
+
+\NewDocumentCommand\tkzAutoGridActivate{ s }{%
+ \@ifundefined{tkzautogrid}%
+ {}%
+ {%
+ \tikzset{every picture/.style={%
+ execute at end picture={%
+ \IfEq{\tkzautogrid}{}{}{\IfBooleanTF{#1}{\tkzGrilleAuto*{\tkzautogrid}}{\tkzGrilleAuto{\tkzautogrid}}}%
+ },
+ },
+ }%
+ }%
+}
+
+\NewDocumentCommand\tkzAutoGridLocal{ s }{%
+ \@ifundefined{tkzautogrid}%
+ {}%
+ {%
+ \tikzset{execute at end picture={%
+ \IfEq{\tkzautogrid}{}{}{\IfBooleanTF{#1}{\tkzGrilleAuto*{\tkzautogrid}}{\tkzGrilleAuto{\tkzautogrid}}}%
+ },
+ },
+ }%
+}
+
+%====FLÈCHE ÉVASÉE [FR]
+\usetikzlibrary{arrows,arrows.meta}
+
+\defKV[FlecheEvasee]{%
+ Couleur=\def\FlecheEvaseeCouleur{#1},%
+ TailleFleche=\def\FlecheEvaseeFleche{#1},%
+ Direction=\def\FlecheEvaseeDirectionAngle{#1},%
+ Coeff=\def\FlecheEvaseeCoeff{#1},%
+ TypeFleche=\def\FlecheEvaseeType{#1},%
+ Epaisseur=\def\FlecheEvaseeEpaisseur{#1},%
+ LineCap=\def\FlecheEvaseeLineCap{#1}
+}
+\setKVdefault[FlecheEvasee]{%
+ Couleur=black,%
+ TailleFleche=auto,%
+ Direction={},%
+ Coeff=4,%
+ TypeFleche=Latex,%
+ Deplacement=false,%
+ Epaisseur=0.5mm,%
+ LineCap=butt
+}
+
+\NewDocumentCommand\tkzFlecheEvasee{ O{} m m }{%1=options,2=début,3=fin
+ \restoreKV[FlecheEvasee]%
+ \setKV[FlecheEvasee]{#1}%
+ \begin{scope}[line width=0.05mm]
+ \IfStrEq{\FlecheEvaseeFleche}{auto}%
+ {%
+ \xdef\FlecheEvaseeH{2*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur}%
+ \xdef\FlecheEvaseeW{2.1*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur}%
+ }%
+ {%
+ \StrCut{\FlecheEvaseeFleche}{/}{\FlecheEvaseeH}{\FlecheEvaseeW}%
+ }%
+ \IfEq{\FlecheEvaseeDirectionAngle}{}%
+ {%
+ \xdef\FlecheEvaseeDirection{}\xdef\FlecheEvaseeAngle{0}%
+ }%
+ {%
+ \StrCut{\FlecheEvaseeDirectionAngle}{/}{\FlecheEvaseeDirection}{\FlecheEvaseeAngle}%
+ }%
+ %coordonnées
+ \coordinate (TMPDEPART) at (#2) ;
+ \ifboolKV[FlecheEvasee]{Deplacement}%
+ {%
+ \coordinate (TMPARRIVEE) at ($(TMPDEPART)+(#3)$) ;
+ }%
+ {%
+ \coordinate (TMPARRIVEE) at (#3) ;
+ }
+ \pgfmathanglebetweenpoints{\pgfpointanchor{TMPDEPART}{center}}{\pgfpointanchor{TMPARRIVEE}{center}}%
+ \edef\tmpangle{\pgfmathresult}%
+ %nœuds
+ \IfEq{\FlecheEvaseeDirection}{right}%
+ {%
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)+({\FlecheEvaseeAngle+\tmpangle-90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)+({\FlecheEvaseeAngle+\tmpangle+90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDD) to[bend right=\FlecheEvaseeAngle] (TMPFG) -- (TMPFD) to[bend left=\FlecheEvaseeAngle] (TMPDG) --cycle ;
+ }%
+ {}%
+ \IfEq{\FlecheEvaseeDirection}{left}%
+ {%
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle+\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle+\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({180+\tmpangle-\FlecheEvaseeAngle+90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({180+\tmpangle-\FlecheEvaseeAngle-90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDD) to[bend left=\FlecheEvaseeAngle] (TMPFG) -- (TMPFD) to[bend right=\FlecheEvaseeAngle] (TMPDG) --cycle ;
+ }%
+ {}%
+ \IfEq{\FlecheEvaseeDirection}{}%
+ {%
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({-90+\tmpangle-\FlecheEvaseeAngle}:{-0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDG) to (TMPFG) -- (TMPFD) to (TMPDD) --cycle ;
+ }%
+ {}%
+ \end{scope}
+}
+
+%====FLÈCHE ÉVASÉE [EN]
+\defKV[flaredarrow]{%
+ color=\def\FlecheEvaseeCouleur{#1},%
+ arrowsize=\def\FlecheEvaseeFleche{#1},%
+ bend=\def\FlecheEvaseeDirectionAngle{#1},%
+ factor=\def\FlecheEvaseeCoeff{#1},%
+ arrowstyle=\def\FlecheEvaseeType{#1},%
+ thickness=\def\FlecheEvaseeEpaisseur{#1},%
+ linecap=\def\FlecheEvaseeLineCap{#1}
+}
+\setKVdefault[flaredarrow]{%
+ color=black,%
+ arrowsize=auto,%
+ bend={},%
+ factor=4,%
+ arrowstyle=Latex,%
+ move=false,%
+ thickness=0.5mm,%
+ linecap=butt
+}
+
+\NewDocumentCommand\tkzFlaredArrow{ O{} m m }{%1=options,2=début,3=fin
+ \restoreKV[flaredarrow]%
+ \setKV[flaredarrow]{#1}%
+ \begin{scope}[line width=0.05mm]
+ \IfStrEq{\FlecheEvaseeFleche}{auto}%
+ {%
+ \xdef\FlecheEvaseeH{2*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur}%
+ \xdef\FlecheEvaseeW{2.1*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur}%
+ }%
+ {%
+ \StrCut{\FlecheEvaseeFleche}{/}{\FlecheEvaseeH}{\FlecheEvaseeW}%
+ }%
+ \IfEq{\FlecheEvaseeDirectionAngle}{}%
+ {%
+ \xdef\FlecheEvaseeDirection{}\xdef\FlecheEvaseeAngle{0}%
+ }%
+ {%
+ \StrCut{\FlecheEvaseeDirectionAngle}{/}{\FlecheEvaseeDirection}{\FlecheEvaseeAngle}%
+ }%
+ %coordonnées
+ \coordinate (TMPDEPART) at (#2) ;
+ \ifboolKV[flaredarrow]{move}%
+ {%
+ \coordinate (TMPARRIVEE) at ($(TMPDEPART)+(#3)$) ;
+ }%
+ {%
+ \coordinate (TMPARRIVEE) at (#3) ;
+ }
+ \pgfmathanglebetweenpoints{\pgfpointanchor{TMPDEPART}{center}}{\pgfpointanchor{TMPARRIVEE}{center}}%
+ \edef\tmpangle{\pgfmathresult}%
+ %nœuds
+ \IfEq{\FlecheEvaseeDirection}{right}%
+ {%
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)+({\FlecheEvaseeAngle+\tmpangle-90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({\FlecheEvaseeAngle+\tmpangle+180}:\FlecheEvaseeH)+({\FlecheEvaseeAngle+\tmpangle+90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDD) to[bend right=\FlecheEvaseeAngle] (TMPFG) -- (TMPFD) to[bend left=\FlecheEvaseeAngle] (TMPDG) --cycle ;
+ }%
+ {}%
+ \IfEq{\FlecheEvaseeDirection}{left}%
+ {%
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle+\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle+\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({180+\tmpangle-\FlecheEvaseeAngle+90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({180+\tmpangle-\FlecheEvaseeAngle-90}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDD) to[bend left=\FlecheEvaseeAngle] (TMPFG) -- (TMPFD) to[bend right=\FlecheEvaseeAngle] (TMPDG) --cycle ;
+ }%
+ {}%
+ \IfEq{\FlecheEvaseeDirection}{}%
+ {%
+ \coordinate (TMPF) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)$) ;
+ \coordinate (TMPDG) at ([shift={({90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \coordinate (TMPFG) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({-90+\tmpangle-\FlecheEvaseeAngle}:{-0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPFD) at ($(TMPARRIVEE)+({180+\tmpangle-\FlecheEvaseeAngle}:\FlecheEvaseeH)+({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeCoeff*\FlecheEvaseeEpaisseur})$) ;
+ \coordinate (TMPDD) at ([shift={({-90+\tmpangle-\FlecheEvaseeAngle}:{0.5*\FlecheEvaseeEpaisseur})}]TMPDEPART) ;
+ \IfStrEq{\FlecheEvaseeType}{Stealth}%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length={1.5*\FlecheEvaseeH},width={1.1*\FlecheEvaseeW}]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ {%
+ \draw[\FlecheEvaseeCouleur,->,-{\FlecheEvaseeType[length=\FlecheEvaseeH,width=\FlecheEvaseeW]}] (TMPF)--(TMPARRIVEE) ;
+ }%
+ \filldraw[line cap=\FlecheEvaseeLineCap,\FlecheEvaseeCouleur] (TMPDG) to (TMPFG) -- (TMPFD) to (TMPDD) --cycle ;
+ }%
+ {}%
+ \end{scope}
+}
+
+%====PANO AUTOROUTE
+\newlength{\PanoTorouteStretch}
+\newlength{\PanoTorouteOffsetArrow}
+
+\defKV[PanoAutoroute]{%
+ Fleches=\def\PanoTorouteArrow{#1},%
+ CouleurFond=\def\PanoTorouteCoul{#1},%
+ CouleurTitre=\def\PanoTorouteCoulTitre{#1},%
+ Police=\def\PanoTorouteFonte{#1},%
+ PoliceCartouche=\def\PanoTorouteFonteTitre{#1},%
+ TypeFleche=\def\PanoTorouteStyleArrow{#1},%
+ EspacementV=\setlength{\PanoTorouteStretch}{#1},%
+ OffsetFleches=\setlength{\PanoTorouteOffsetArrow}{#1}
+}
+
+\setKVdefault[PanoAutoroute]{%
+ Fleches=0,%
+ CouleurFond=blue,%
+ CouleurTitre=red,%
+ Largeur=10cm,%
+ Police=\LARGE\bfseries\sffamily,%
+ PoliceCartouche=\Large\bfseries\sffamily,%
+ TypeFleche={\scalebox{1.33}[1.25]{\faArrowDown}},%
+ EspacementV={2.5mm},%
+ OffsetFleches={5mm},%
+ Dernier=true
+}
+
+\NewDocumentEnvironment{PanneauAutoroute}{ O{} D<>{} m }%
+{%
+ \restoreKV[PanoAutoroute]%
+ \setKV[PanoAutoroute]{#1}
+ \IfEq{#3}{}%
+ {%
+ \tcolorbox[enhanced,width={\useKV[PanoAutoroute]{Largeur}},fontupper=\PanoTorouteFonte,colback=\PanoTorouteCoul,colframe=\PanoTorouteCoul!5!white,coltext=white,sharp corners,boxsep=1mm,left=1mm,right=1mm,top=1mm,bottom=1mm,#2]
+ }%
+ {%
+ \tcolorbox[enhanced,width={\useKV[PanoAutoroute]{Largeur}},fontupper=\PanoTorouteFonte,colback=\PanoTorouteCoul,colframe=\PanoTorouteCoul!5!white,coltext=white,sharp corners,boxsep=1mm,left=1mm,right=1mm,top=1mm,bottom=1mm,attach boxed title to top center,fonttitle=\PanoTorouteFonteTitre,coltitle=white,boxed title style={colback=\PanoTorouteCoulTitre,size=small,sharp corners,left=0mm,right=0mm,colframe=\PanoTorouteCoulTitre!5!white},title={#3},#2]
+ }%
+ \baselineskip=-1000pt\lineskip=\PanoTorouteStretch\lineskiplimit=\maxdimen%
+}%
+{%
+ \ifnum\PanoTorouteArrow>0
+
+ \medskip
+ \hspace*{\PanoTorouteOffsetArrow}\foreach \i in {1,...,\PanoTorouteArrow}{\hfill\PanoTorouteStyleArrow}\hfill\hspace*{\PanoTorouteOffsetArrow}
+ \fi%
+ \endtcolorbox%
+ %
+ \ifboolKV[PanoAutoroute]{Dernier}{}{\vspace*{\dimexpr-\baselineskip-0.5mm\relax}}%
+}
+
+\NewDocumentCommand\VilleDist{ s m m }{%
+ \IfBooleanTF{#1}%
+ {%
+ #2\hfill~#3
+ }%
+ {%
+ #2\hfill~#3\\
+ }%
+}
+
+%====PANOSOLDES
+\newlength{\tmphautbannsold}
+\newlength{\tmphautbannsoldextra}
+\newlength{\tmplargbannsold}
+\newlength{\tmplargasold}
+\newlength{\tmplargbsold}
+\newlength{\tmplargtotsold}
+\newlength{\tmpoffsetbannsold}
+\newlength{\tmphautlignesol}
+\newlength{\tmphautsoles}
+
+\def\labelancienprix{Ancien Prix~:~}
+\def\labelnouveauprix{Nouveau Prix~:~}
+\def\labelreduction{SOLDES~:~}
+
+\defKV[PanoSoldes]{%
+ Couleur=\def\panosoldescolor{#1},%
+ Largeur=\def\panosoldeswidth{#1},%
+ PoliceEntete=\def\panosoldesfonthaut{#1},%
+ PolicePrix=\def\panosoldesfontprix{#1},%
+ PoliceReduc=\def\panosoldesfontreduc{#1},%
+ OffsetReduc=\setlength{\tmpoffsetbannsold}{#1},%
+ Titre=\def\panosoldestitre{#1},%
+ AgrandirReduc=\setlength{\tmphautbannsoldextra}{#1}
+}
+
+\setKVdefault[PanoSoldes]{%
+ Couleur=gray,
+ Largeur=auto,
+ PoliceEntete=\large\bfseries,%
+ PolicePrix=\footnotesize,%
+ PoliceReduc=\large\bfseries,%
+ Titre=GRANDE DÉMARQUE,%
+ OffsetReduc=1.25cm,%
+ AgrandirReduc=0mm
+}
+
+\NewDocumentCommand\AfficheSoldes{ O{} m m m }{%
+ \restoreKV[PanoSoldes]%
+ \setKV[PanoSoldes]{#1}%
+ %calcul de la largeur
+ \IfEq{\panosoldeswidth}{auto}%
+ {%
+ \settowidth{\tmplargbannsold}{{\panosoldesfontreduc\labelreduction-999X}}%largeur avec un peu de marge dûe à la rotation
+ \settowidth{\tmplargasold}{{\panosoldesfontprix\labelancienprix99999X}}%largeur avec un peu de marge dûe au prix "élastique"
+ \settowidth{\tmplargbsold}{{\panosoldesfontprix\labelnouveauprix99999X}}%largeur avec un peu de marge dûe au prix "élastique"
+ \pgfmathsetlength{\tmplargtotsold}{max(\tmplargbannsold,\tmplargasold,\tmplargbsold)+1mm}%on rajoute encore un peu de marge pour être sûr
+ }%
+ {%
+ \setlength{\tmplargtotsold}{\panosoldeswidth}%
+ }%
+ %calcul de la hauteur
+ \settototalheight{\tmphautlignesol}{\panosoldesfontprix\labelancienprix\labelnouveauprix0,123456789X}%
+ \settototalheight{\tmphautbannsold}{\panosoldesfontreduc\labelreduction-0,123456789X}%
+ \addtolength{\tmphautbannsold}{6mm+\tmphautbannsoldextra}%
+ \setlength{\tmphautsoles}{2\tmphautlignesol}%
+ \addtolength{\tmphautsoles}{\tmpoffsetbannsold+2mm}%
+ \addtolength{\tmphautsoles}{\tmphautbannsold}%
+ %boîte
+ \tcolorbox[%
+ enhanced,nobeforeafter,width=\tmplargtotsold,text height=\tmphautsoles,boxrule=0.5mm,boxsep=0.5mm,title={\panosoldestitre},halign title=flush center,colframe=\panosoldescolor,colback=white,top=1.25mm,bottom=1.25mm,left=1.25mm,right=1.25mm,fonttitle=\panosoldesfonthaut,%
+ overlay={%
+ \begin{tcbclipframe}
+ \draw ([shift={(1.25mm,-2mm)}]interior.north west) node[anchor=north west,font=\panosoldesfontprix,inner sep=0pt] {Ancien prix : {#2}} ;
+ \draw ([shift={(-1.25mm,2.5mm)}]interior.south east) node[anchor=south east,left,font=\panosoldesfontprix,inner sep=0pt] {Nouveau prix : {#3}} ;
+ %bannière (cf Séb Lozano)
+ \fill[line cap=rect,\panosoldescolor] ([shift={(0,2.5mm+\tmphautlignesol)}]interior.south west)--([shift={(0,2.5mm+\tmphautlignesol+\tmpoffsetbannsold)}]interior.south east)--++(0,\tmphautbannsold)--([shift={(0,2.5mm+\tmphautlignesol+\tmphautbannsold)}]interior.south west) ;
+ %petit filet
+ \draw[white,semithick] ([shift={(0,2.5mm+\tmphautlignesol+1pt)}]interior.south west)--([shift={(0,2.5mm+\tmphautlignesol+\tmpoffsetbannsold+1pt)}]interior.south east)--++(0,\tmphautbannsold-2pt)--([shift={(0,2.5mm+\tmphautlignesol+\tmphautbannsold-1pt)}]interior.south west)--cycle ;
+ %label
+ \draw[draw=none] ([shift={(0,2.5mm+\tmphautlignesol+0.5\tmphautbannsold)}]interior.south west) -- ([shift={(0,2.5mm+\tmphautlignesol+\tmpoffsetbannsold+0.5\tmphautbannsold)}]interior.south east) node[midway,sloped,font=\panosoldesfontreduc,text=white] {SOLDES : {#4}} ;
+ \end{tcbclipframe}%
+ }%
+ ]%
+ \endtcolorbox%
+}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
index 5e2af203063..3a5f08ca8c5 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
+++ b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/08/11 v2.4}
+\def\Version{2024/08/23 v2.5}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{dccpaper-base}
[\Version\space Common class code for IJDC and IDCC papers.]
@@ -818,7 +818,7 @@
}
\endgroup
%%
-%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh
%% <info@dcc.ac.uk>
%%
%% End of file `dccpaper-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
index 0e8345f25cb..bbc5329095b 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
+++ b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/08/11 v2.4}
+\def\Version{2024/08/23 v2.5}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{idcc}
[\Version\space Class for submissions to the International Digital Curation Conference.]
@@ -109,9 +109,15 @@
\DeclareOption{24}{%
\def\dccp@publ@short{IDCC}
\def\dccp@publ@msg{The 18th \dccp@publ@long\ takes place on 19--21 February
- 2024 in Edinburgh, Scotland.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/18th-international-digital-curation-conference}}
+ 2024 in Edinburgh, Scotland.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/idcc24}}
\def\dccp@subject{18th \dccp@publ@long, 2024}
}
+\DeclareOption{25}{%
+ \def\dccp@publ@short{IDCC25}
+ \def\dccp@publ@msg{The 19th \dccp@publ@long\ takes place on 17--19 February
+ 2025 in The Hague, Netherlands.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/idcc25}}
+ \def\dccp@subject{19th \dccp@publ@long, 2025}
+}
\ProcessOptions\relax
\def\@clearglobaloption#1{%
@@ -135,7 +141,7 @@
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh
%% <info@dcc.ac.uk>
%%
%% End of file `idcc.cls'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls
index 1d88c3e3bfb..bccd3b5f7a9 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls
+++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/08/11 v2.4}
+\def\Version{2024/08/23 v2.5}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ijdc-v14}
[\Version\space Class for submissions to the International Journal of Digital Curation, volume 14 onwards.]
@@ -58,7 +58,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh
%% <info@dcc.ac.uk>
%%
%% End of file `ijdc-v14.cls'.
diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
index 8f4d08311bd..4c60ec50b0d 100644
--- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
+++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/08/11 v2.4}
+\def\Version{2024/08/23 v2.5}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ijdc-v9}
[\Version\space Class for submissions to the International Journal of Digital Curation, volumes 9--13 inclusive.]
@@ -58,7 +58,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh
%% <info@dcc.ac.uk>
%%
%% End of file `ijdc-v9.cls'.
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 5f18e679586..f2f52c41495 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,19 +20,16 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/08/14}{2024dj}
+\ProvidesExplPackage{easybase}{2024/09/28}{2024ea}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
\cs_generate_variant:Nn \dim_sign:n { V }
\cs_generate_variant:Nn \int_to_arabic:n { v }
\cs_generate_variant:Nn \msg_warning:nnn { nnV }
-\cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
\cs_generate_variant:Nn \skip_set:Nn { NV }
-\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 { o }
\cs_generate_variant:Nn \tl_if_novalue:nF { V }
\cs_set_protected:Npn \ctex_define:nn #1
@@ -46,11 +43,6 @@
{ \AddToHook{cmd/#1/before}{#2} }
\cs_new_protected:Npn \eb_appto_cmd:nn #1#2
{ \AddToHook{cmd/#1/after}{#2} }
-\cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
- {
- \clist_map_inline:nn {#1}
- { \AtBeginEnvironment{##1}{#2} }
- }
\cs_set_protected:Npn \ctex_before_end_preamble:n
{ \BeforeBeginEnvironment{document} }
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
@@ -124,9 +116,13 @@
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
floatpage .initial:n = false,
- theorem .bool_set:N = \l__eb_theorem_support_bool,
- theorem .default:n = true,
- theorem .initial:n = true,
+ theorem .choices:nn =
+ { thmtools,keytheorems,false }
+ { \tl_set:Nn \l__eb_theorem_support_tl {#1} },
+ theorem .value_required:n = true,
+ theorem/true .meta:n = { theorem = thmtools },
+ theorem .default:n = thmtools,
+ theorem .initial:n = thmtools,
paper .code:n = \eb_put_geometry:n {#1},
paper .initial:n = a4paper,
class .choice:,
@@ -135,13 +131,15 @@
{
\bool_set_true:N \l__eb_class_mode_book_bool
\eb_put_geometry:n { twoside }
+ \booltrue{@titlepage}
},
class/article .code:n =
{
\bool_set_false:N \l__eb_class_mode_book_bool
\eb_put_geometry:n { twoside = false }
+ \boolfalse{@titlepage}
},
- class .initial:n = book,
+ class .initial:x = \ifbool{@titlepage}{book}{article},
book .meta:n = { class = book },
article .meta:n = { class = article },
unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption
@@ -421,18 +419,18 @@
}
\cs_set:Npn \markdouble #1 { \markboth{#1}{\ifbool{@twoside}{#1}{}} }
-\cs_new:Npn \eb@level@markdouble #1#2
+\cs_new_protected:Npn \eb@level@markdouble #1#2
{ \markdouble{\use:c { eb@mark@#1@whole }{#2}} }
-\cs_new:Npn \eb@level@markright #1#2
+\cs_new_protected:Npn \eb@level@markright #1#2
{ \markright{\use:c { eb@mark@#1@whole }{#2}} }
\cs_gset:Npn \chaptermark #1 { \eb@level@markdouble{chapter}{#1} }
-\cs_gset:Npn \sectionmark #1
+\cs_gset:Npx \sectionmark #1
{
\bool_if:NTF \l__eb_class_mode_book_bool
{ \eb@level@markright{section}{#1} }
{ \eb@level@markdouble{section}{#1} }
}
-\cs_gset:Npn \subsectionmark #1
+\cs_gset:Npx \subsectionmark #1
{
\bool_if:NF \l__eb_class_mode_book_bool
{ \eb@level@markright{subsection}{#1} }
@@ -683,7 +681,11 @@
\str_case:VnT \l__eb_fnt_parent_counter_tl
{
{ part } { \counterwithin*{footnote}{part} }
- { page } { \counterwithin*{footnote}{page} }
+ { page }
+ {
+ \RequirePackage{zref-perpage}
+ \zmakeperpage{footnote}
+ }
}
{ \counterwithout*{footnote}{chapter} }
}
@@ -826,13 +828,12 @@
\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
{ \reset@font }
{
- \setspread{\eb@spread@footnote}
+ \usestretch{\eb@spread@footnote}
\eb@font@footnote
}
}
@@ -1568,8 +1569,6 @@
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 }
}
@@ -1590,21 +1589,13 @@
\group_begin:
\makeatletter
\file_if_exist_input:n { \jobname.#1 }
- \UseHookWithArguments{starttoc/after}{1}{#1}
+ \AddToHook{enddocument/afterlastpage}
+ {\UseHookWithArguments{starttoc/after}{1}{#1}}
\boolfalse{@nobreak}
\group_end:
}
{ \eb@starttoc{#1} }
}
-\AddToHook{enddocument/afterlastpage}
- {
- \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 \AssignPartialExt #1#2
{
\tl_if_exist:cTF { ttl@partial#1 }
@@ -1788,19 +1779,46 @@
}
\cs_set_eq:NN \addtosubfont \ebaddtofont
+\cs_new_protected:Npn \usestretch #1
+ {
+ \edef\baselinestretch{#1}
+ \@currsize
+ }
+\cs_set_eq:NN \setspread \usestretch
+\cs_new_protected:Npn \restore@usespace
+ {
+ \par
+ \vskip\parskip
+ \vskip\baselineskip
+ \endgroup
+ \vskip -\parskip
+ \vskip -\baselineskip
+ }
+\NewDocumentEnvironment{usespace}{m+b}
+ {
+ \par
+ \begingroup
+ \usestretch{#1}#2
+ \restore@usespace
+ }{}
+\msg_new:nnn { easybase } { invalid-spread }
+ {
+ The~line~spacing~factor~option~'#1'~is~invalid. \\
+ Please~use~the~'usespace'~environment~to~set~the~line~spacing.
+ }
+\cs_new_protected:Npn \eb_invalid_spread_warning:
+ { \msg_warning:nnV { easybase } { invalid-spread } \l_keys_key_str }
\ctex_define:nn { space }
{
- linespread .code:n = \setspread{#1},
- tabspread .fp_set:N = \l__eb_spread_table_fp,
- tabspread .initial:n = 1.2,
- mathspread .tl_set:N = \eb@spread@math,
- mathspread .initial:n = 1.2,
+ linespread .code:n = \usestretch{#1},
+ tabspread .code:n = \eb_invalid_spread_warning:,
+ mathspread .code:n = \eb_invalid_spread_warning:,
fntspread .code:n =
{
\tl_set:Nn \eb@spread@footnote {#1}
\group_begin:
\footnotesize
- \setspread{\eb@spread@footnote}
+ \usestretch{\eb@spread@footnote}
\exp_args:NNNo \group_end:
\dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
},
@@ -1816,8 +1834,8 @@
caption-spread .initial:n = 1.2,
everyspread .meta:n =
{
- linespread = {#1},tabspread = {#1},mathspread = {#1},
- caption-spread = {#1},fntspread = {#1}
+ linespread = {#1},caption-spread = {#1},
+ fntspread = {#1}
},
abovedisplayskip .code:n =
{ \AfterPreamble{\skip_set:Nn \abovedisplayskip {#1}} },
@@ -1836,14 +1854,8 @@
\tl_if_eq:NnT \l__ctex_scheme_tl { chinese }
{
\fp_compare:nNnTF { \l__ctex_line_spread_fp } = { 1.3 }
- {
- \ctex_set:nn { space }
- { linespread = 1.354,tabspread = 1.354 }
- }
- {
- \ctex_set:nn { space }
- { linespread = \fp_use:N \l__ctex_line_spread_fp }
- }
+ { \usestretch{1.354} }
+ { \usestretch{\fp_use:N \l__ctex_line_spread_fp} }
}
\AfterPreamble{\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }}
@@ -1874,7 +1886,7 @@
{
\DeclareCaptionFont{eb@#1@font}
{
- \setspread{\fp_use:c { l__eb_spread_caption_#1_fp }}
+ \usestretch{\fp_use:c { l__eb_spread_caption_#1_fp }}
\tl_use:c { l__eb_font_caption_#1_tl }
}
}
@@ -1894,9 +1906,6 @@
\captionsetup[figure][bi-second]{name = Figure}
\captionsetup[table][bi-second]{name = Table}
}
-\eb_at_begin_environment:nn
- { tabular,tabularx,longtable }
- { \setspread{\fp_use:N \l__eb_spread_table_fp} }
\UseTblrLibrary{booktabs}
\bool_if:NF \l__eb_float_page_bool
@@ -2047,24 +2056,24 @@
\tl_clear:N \l__eb_eqsymb_intro_tl
\ignorespaces
}
-\bool_if:NT \l__eb_theorem_support_bool
+\cs_new_protected:Npn \eb_theorem_load_thmtools:
{
\RequirePackage{amsthm,thmtools}
\cs_set_eq:NN \eb@declaretheoremstyle@save \declaretheoremstyle
\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\RenewDocumentCommand{\declaretheoremstyle}{+O{}m+O{}}
- {\eb@declaretheoremstyle@save[#1,#3]{#2}}
+ {\eb@declaretheoremstyle@save[##1,##3]{##2}}
\RenewDocumentCommand{\declaretheorem}{+O{}m+O{}}
{
- \eb@declaretheorem@save[style = default,#1,#3]{#2}
- \settheoremtocline{#2}
+ \eb@declaretheorem@save[style = default,##1,##3]{##2}
+ \settheoremtocline{##2}
{
- \listnumberline{#2}
+ \listnumberline{##2}
\thmtname\thmtifnote{~(\thmtnote)}{}
}
- \cs_gset:cpn { thmt@contentsline@#2 }
+ \cs_gset:cpn { thmt@contentsline@##2 }
{ \thmt@contentslineIfNamed }
- \exp_args:Nc \providecommand { p@#2 }[1]{##1}
+ \exp_args:Nc \providecommand { p@##2 }[1]{####1}
}
\ctex_define:nn { thmt }
{
@@ -2082,14 +2091,14 @@
bodyfont = \normalfont,
postheadspace = 1em
]
- \theoremstyle{default}
\cs_undefine:N \proof
\DeclareFloatList{theorem}{loe}
\AssignPartialExt{loe}{ple}
\eb_preto_cmd:nn { listoftheorems }
{
\group_begin:
- \def\contentsline #1 {\use:c { thmt@contentsline@#1 }{#1}}
+ \let\thmt@contentsline\contentsline
+ \def\contentsline ##1 {\use:c { thmt@contentsline@##1 }{##1}}
}
\eb_appto_cmd:nn { listoftheorems } { \group_end: }
\eb_preto_cmd:nn { @chapter }
@@ -2101,21 +2110,29 @@
\def\thmtname{\thmt@thmname}
\def\thmtenvname{\thmt@envname}
\def\thmtnote{\thmt@shortoptarg}
- \def\thmtformatoptarg #1 {#1}
- \def\thmtifname #1#2 {\ifbool{thmt@isstarred}{#2}{#1}}
- \def\thmtifnote #1#2
+ \def\thmtformatoptarg ##1 {##1}
+ \def\thmtifname ##1##2 {\ifbool{thmt@isstarred}{##2}{##1}}
+ \def\thmtifnote ##1##2
{
\tl_if_empty:NTF \thmt@shortoptarg
- {#2}
- { \protect\thmtformatoptarg{#1} }
+ {##2}
+ { \protect\thmtformatoptarg{##1} }
}
\NewDocumentCommand{\settheoremtocline}{smm}
{
- \IfBooleanT{#1}{\def\thmt@contentslineIgnore{\thmt@contentsline}}
- \cs_set:cpn { ll@#2 } { \@bsphack #3\@esphack }
+ \IfBooleanT{##1}{\def\thmt@contentslineIgnore{\thmt@contentsline}}
+ \cs_set:cpn { ll@##2 } { \@bsphack ##3\@esphack }
}
}
-
+\cs_new_protected:Npn \eb_theorem_load_keytheorems:
+ { \RequirePackage{keytheorems} }
+\str_case:Vn \l__eb_theorem_support_tl
+ {
+ { thmtools }
+ { \eb_theorem_load_thmtools: }
+ { keytheorems }
+ { \eb_theorem_load_keytheorems: }
+ }
\setchemformula
{
math-scripts = false,
@@ -2134,30 +2151,6 @@
group-digits = none
}
}{}
-\eb_at_begin_environment:nn
- {
- array,matrix,pmatrix,bmatrix,Bmatrix,vmatrix,Vmatrix,
- matrix*,pmatrix*,bmatrix*,Bmatrix*,vmatrix*,Vmatrix*,
- cases,cases*,dcases,dcases*,rcases,rcases*,drcases,drcases*,
- aligned,alignedat,gathered,multlined,lgathered,rgathered
- }
- { \setspread{\eb@spread@math} }
-\clist_map_inline:nn
- { \start@gather,\start@align,\start@multline }
- {
- \eb_patch_cmd:Nnn #1
- { \collect@body }
- {
- \setspread{\eb@spread@math}
- \collect@body
- }
- }
-\eb_patch_cmd:Nnn \gather@split
- { \spread@equation }
- {
- \setspread{\eb@spread@math}
- \spread@equation
- }
\ctex_at_end_package:nn { unicode-math }
{ \msg_redirect_module:nnn { unicode-math } { warning } { info } }
\ctex_at_end_package:nn { tcolorbox }
@@ -2178,7 +2171,6 @@
bititle .initial:n = Bibliography,
unknown .code:n = \eb_msg_deprecated_option:n { bib }
}
-
\cs_new_protected:Npn \eb_bibtex_natbib_set:
{
\RequirePackage[sort&compress]{natbib}
@@ -2461,6 +2453,8 @@
lstlistingname = 代码,
listtheoremname = 定理清单
}
+ \ctex_at_end_package:nn { keytheorems }
+ { \keytheoremlistset{title = 定理清单} }
}
{
\keys_set_known:nn { ctex }
@@ -2513,15 +2507,18 @@
{
\renewcommand{\theupfootnote}{\@fnsymbol\c@footnote}
\renewcommand{\thefootnote}{\@fnsymbol\c@footnote}
+ \let\footnote\thanks
}
{}
- \LARGE\@title\par\vskip 3em
- \large
+ \bgroup\LARGE\@title\par\egroup
+ \notbool{@titlepage}{\vskip 1.5em}{\vskip 3em}
+ \bgroup\large
\begin{tabular}[t]{c}
\@author
- \end{tabular}\par\vskip 1.5em
- \@date
- \notbool{@titlepage}{\par\vskip 1.5em}{}
+ \end{tabular}\par\egroup
+ \notbool{@titlepage}{\vskip 0.75em}{\vskip 1.5em}
+ \bgroup\large\@date\par\egroup
+ \notbool{@titlepage}{\vskip 1.5em}{}
\@thanks
},
beforecode =
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 119b932f507..988fe9b63c1 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/08/14}{2024dj}
+\ProvidesExplClass{easybook}{2024/09/28}{2024ea}
{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 8cd8c256c88..138274dfcec 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -18,15 +18,13 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/14}{2024dj}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/09/28}{2024ea}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
{ \tcbset{#1/.append~style = {#2}} }
\cs_set_protected:Npn \deftcbstyle #1#2
{ \tcbset{#1/.style = {#2}} }
-\cs_new_protected:Npn \tcbappstyle
- { \@ifstar{\deftcbstyle}{\addtotcbstyle} }
\deftcbstyle{tc-easyboxi}
{
diff --git a/Master/texmf-dist/tex/latex/edmaths/edmaths.sty b/Master/texmf-dist/tex/latex/edmaths/edmaths.sty
index e11c5153448..cbfd89a5bed 100644
--- a/Master/texmf-dist/tex/latex/edmaths/edmaths.sty
+++ b/Master/texmf-dist/tex/latex/edmaths/edmaths.sty
@@ -1,4 +1,4 @@
-%% Package `edmaths' v0.98
+%% Package `edmaths' v0.99
%% File edmaths.sty
%% Copyright 2024 Josh Fogg
%%
@@ -22,7 +22,7 @@
%% This work consists of the file edmaths.sty.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{edmaths}[2024-08-09 Edinburgh maths thesis/report style v0.98]
+\ProvidesPackage{edmaths}[2024-08-30 Edinburgh maths thesis/report style v0.99]
\RequirePackage{calc,ifthen,setspace,amsmath,amsthm,amscd,amssymb}
@@ -98,7 +98,7 @@
% If with-cmbright selected, use the (sans-serif) Computer Modern Bright font.
\ifthenelse{\boolean{with-cmbright}}{
- % NOTE must be compiled with xelatex or luatex
+ % NOTE if it doesn't compile, make sure you have CM Bright installed!
\RequirePackage{cmap}
\RequirePackage{cmbright}
\RequirePackage[T1]{fontenc}
@@ -255,4 +255,4 @@
\begin{center}
\Large\it #1
\end{center}
-}
+} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/electrum/electrum.sty b/Master/texmf-dist/tex/latex/electrum/electrum.sty
deleted file mode 100644
index ff9086e8021..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/electrum.sty
+++ /dev/null
@@ -1,35 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{electrum}[2010/07/17 v1.0 electrum]
-\RequirePackage{xkeyval}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\UndeclareTextCommand{\textperthousand}{T1}
-\RequirePackage{nfssext-cfr}
-%:boolkeys for ligature/swash encoding as default
-\define@boolkey{electrum.sty}[electrum@]{lig}[true]{%
- \ifelectrum@lig
- \def\electrum@lig{w}%
- \else
- \def\electrum@lig{}%
- \fi}
-%:boolkeys for roman osf/lf
-\define@boolkey{electrum.sty}[electrum@]{osf}[true]{%
- \ifelectrum@osf
- \def\electrum@lfosf{j}%
- \else
- \def\electrum@lfosf{}%
- \fi}
-\define@boolkey{electrum.sty}[electrum@]{lf}[true]{%
- \ifelectrum@lf
- \def\electrum@lfosf{}%
- \else
- \def\electrum@lfosf{j}%
- \fi}
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{lig=false,osf=true}
-%:options override defaults
-\ProcessOptionsX
-%:make ElectrumADF default roman font, implementing options for ligature/swash encoding and lf/osf as applicable
-\renewcommand{\rmdefault}{yes\electrum@lfosf\electrum@lig}%
-\endinput
-%% end electrum.sty
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yes.fd b/Master/texmf-dist/tex/latex/electrum/t1yes.fd
deleted file mode 100644
index f238e30ea39..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/t1yes.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%Filename: t1yes.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yes.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yes.]
-
-\DeclareFontFamily{T1}{yes}{}
-
-\DeclareFontShape{T1}{yes}{m}{n}{
- <-> yesr8t
-}{}
-
-\DeclareFontShape{T1}{yes}{m}{sc}{
- <-> yesrc8t
-}{}
-
-\DeclareFontShape{T1}{yes}{m}{sl}{
- <-> yesro8t
-}{}
-
-\DeclareFontShape{T1}{yes}{m}{scsl}{
- <-> yesrco8t
-}{}
-
-\DeclareFontShape{T1}{yes}{b}{n}{
- <-> yesb8t
-}{}
-
-\DeclareFontShape{T1}{yes}{b}{sc}{
- <-> yesbc8t
-}{}
-
-\DeclareFontShape{T1}{yes}{b}{sl}{
- <-> yesbo8t
-}{}
-
-\DeclareFontShape{T1}{yes}{b}{scsl}{
- <-> yesbco8t
-}{}
-
-\DeclareFontShape{T1}{yes}{l}{n}{
- <-> yesl8t
-}{}
-
-\DeclareFontShape{T1}{yes}{l}{sc}{
- <-> yeslc8t
-}{}
-
-\DeclareFontShape{T1}{yes}{l}{sl}{
- <-> yeslo8t
-}{}
-
-\DeclareFontShape{T1}{yes}{l}{scsl}{
- <-> yeslco8t
-}{}
-
-\DeclareFontShape{T1}{yes}{sb}{n}{
- <-> yess8t
-}{}
-
-\DeclareFontShape{T1}{yes}{sb}{sc}{
- <-> yessc8t
-}{}
-
-\DeclareFontShape{T1}{yes}{sb}{sl}{
- <-> yesso8t
-}{}
-
-\DeclareFontShape{T1}{yes}{sb}{scsl}{
- <-> yessco8t
-}{}
-
-\DeclareFontShape{T1}{yes}{m}{it}{<->ssub * yes/m/sl}{}
-\DeclareFontShape{T1}{yes}{m}{si}{<->ssub * yes/m/scsl}{}
-\DeclareFontShape{T1}{yes}{bx}{n}{<->ssub * yes/b/n}{}
-\DeclareFontShape{T1}{yes}{bx}{sc}{<->ssub * yes/b/sc}{}
-\DeclareFontShape{T1}{yes}{bx}{sl}{<->ssub * yes/b/sl}{}
-\DeclareFontShape{T1}{yes}{b}{it}{<->ssub * yes/b/sl}{}
-\DeclareFontShape{T1}{yes}{bx}{it}{<->ssub * yes/b/it}{}
-\DeclareFontShape{T1}{yes}{bx}{scsl}{<->ssub * yes/b/scsl}{}
-\DeclareFontShape{T1}{yes}{b}{si}{<->ssub * yes/b/scsl}{}
-\DeclareFontShape{T1}{yes}{bx}{si}{<->ssub * yes/b/si}{}
-\DeclareFontShape{T1}{yes}{l}{it}{<->ssub * yes/l/sl}{}
-\DeclareFontShape{T1}{yes}{l}{si}{<->ssub * yes/l/scsl}{}
-\DeclareFontShape{T1}{yes}{sb}{it}{<->ssub * yes/sb/sl}{}
-\DeclareFontShape{T1}{yes}{sb}{si}{<->ssub * yes/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yesj.fd b/Master/texmf-dist/tex/latex/electrum/t1yesj.fd
deleted file mode 100644
index edaf2aa6fcd..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/t1yesj.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%Filename: t1yesj.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yesj.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yesj.]
-
-\DeclareFontFamily{T1}{yesj}{}
-
-\DeclareFontShape{T1}{yesj}{m}{n}{
- <-> yesrj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{m}{sc}{
- <-> yesrcj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{m}{sl}{
- <-> yesrjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{m}{scsl}{
- <-> yesrcjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{b}{n}{
- <-> yesbj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{b}{sc}{
- <-> yesbcj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{b}{sl}{
- <-> yesbjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{b}{scsl}{
- <-> yesbcjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{l}{n}{
- <-> yeslj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{l}{sc}{
- <-> yeslcj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{l}{sl}{
- <-> yesljo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{l}{scsl}{
- <-> yeslcjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{sb}{n}{
- <-> yessj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{sb}{sc}{
- <-> yesscj8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{sb}{sl}{
- <-> yessjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{sb}{scsl}{
- <-> yesscjo8t
-}{}
-
-\DeclareFontShape{T1}{yesj}{m}{it}{<->ssub * yesj/m/sl}{}
-\DeclareFontShape{T1}{yesj}{m}{si}{<->ssub * yesj/m/scsl}{}
-\DeclareFontShape{T1}{yesj}{bx}{n}{<->ssub * yesj/b/n}{}
-\DeclareFontShape{T1}{yesj}{bx}{sc}{<->ssub * yesj/b/sc}{}
-\DeclareFontShape{T1}{yesj}{bx}{sl}{<->ssub * yesj/b/sl}{}
-\DeclareFontShape{T1}{yesj}{b}{it}{<->ssub * yesj/b/sl}{}
-\DeclareFontShape{T1}{yesj}{bx}{it}{<->ssub * yesj/b/it}{}
-\DeclareFontShape{T1}{yesj}{bx}{scsl}{<->ssub * yesj/b/scsl}{}
-\DeclareFontShape{T1}{yesj}{b}{si}{<->ssub * yesj/b/scsl}{}
-\DeclareFontShape{T1}{yesj}{bx}{si}{<->ssub * yesj/b/si}{}
-\DeclareFontShape{T1}{yesj}{l}{it}{<->ssub * yesj/l/sl}{}
-\DeclareFontShape{T1}{yesj}{l}{si}{<->ssub * yesj/l/scsl}{}
-\DeclareFontShape{T1}{yesj}{sb}{it}{<->ssub * yesj/sb/sl}{}
-\DeclareFontShape{T1}{yesj}{sb}{si}{<->ssub * yesj/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yesjw.fd b/Master/texmf-dist/tex/latex/electrum/t1yesjw.fd
deleted file mode 100644
index f06daea32ee..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/t1yesjw.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%Filename: t1yesjw.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yesjw.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yesjw.]
-
-\DeclareFontFamily{T1}{yesjw}{}
-
-\DeclareFontShape{T1}{yesjw}{m}{n}{
- <-> yesrjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{m}{sc}{
- <-> yesrcjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{m}{sl}{
- <-> yesrjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{m}{scsl}{
- <-> yesrcjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{b}{n}{
- <-> yesbjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{b}{sc}{
- <-> yesbcjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{b}{sl}{
- <-> yesbjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{b}{scsl}{
- <-> yesbcjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{l}{n}{
- <-> yesljw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{l}{sc}{
- <-> yeslcjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{l}{sl}{
- <-> yesljow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{l}{scsl}{
- <-> yeslcjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{sb}{n}{
- <-> yessjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{sb}{sc}{
- <-> yesscjw8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{sb}{sl}{
- <-> yessjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{sb}{scsl}{
- <-> yesscjow8t
-}{}
-
-\DeclareFontShape{T1}{yesjw}{m}{it}{<->ssub * yesjw/m/sl}{}
-\DeclareFontShape{T1}{yesjw}{m}{si}{<->ssub * yesjw/m/scsl}{}
-\DeclareFontShape{T1}{yesjw}{bx}{n}{<->ssub * yesjw/b/n}{}
-\DeclareFontShape{T1}{yesjw}{bx}{sc}{<->ssub * yesjw/b/sc}{}
-\DeclareFontShape{T1}{yesjw}{bx}{sl}{<->ssub * yesjw/b/sl}{}
-\DeclareFontShape{T1}{yesjw}{b}{it}{<->ssub * yesjw/b/sl}{}
-\DeclareFontShape{T1}{yesjw}{bx}{it}{<->ssub * yesjw/b/it}{}
-\DeclareFontShape{T1}{yesjw}{bx}{scsl}{<->ssub * yesjw/b/scsl}{}
-\DeclareFontShape{T1}{yesjw}{b}{si}{<->ssub * yesjw/b/scsl}{}
-\DeclareFontShape{T1}{yesjw}{bx}{si}{<->ssub * yesjw/b/si}{}
-\DeclareFontShape{T1}{yesjw}{l}{it}{<->ssub * yesjw/l/sl}{}
-\DeclareFontShape{T1}{yesjw}{l}{si}{<->ssub * yesjw/l/scsl}{}
-\DeclareFontShape{T1}{yesjw}{sb}{it}{<->ssub * yesjw/sb/sl}{}
-\DeclareFontShape{T1}{yesjw}{sb}{si}{<->ssub * yesjw/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yesw.fd b/Master/texmf-dist/tex/latex/electrum/t1yesw.fd
deleted file mode 100644
index ebfa31488f5..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/t1yesw.fd
+++ /dev/null
@@ -1,91 +0,0 @@
-%Filename: t1yesw.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yesw.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yesw.]
-
-\DeclareFontFamily{T1}{yesw}{}
-
-\DeclareFontShape{T1}{yesw}{m}{n}{
- <-> yesrw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{m}{sc}{
- <-> yesrcw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{m}{sl}{
- <-> yesrow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{m}{scsl}{
- <-> yesrcow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{b}{n}{
- <-> yesbw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{b}{sc}{
- <-> yesbcw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{b}{sl}{
- <-> yesbow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{b}{scsl}{
- <-> yesbcow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{l}{n}{
- <-> yeslw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{l}{sc}{
- <-> yeslcw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{l}{sl}{
- <-> yeslow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{l}{scsl}{
- <-> yeslcow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{sb}{n}{
- <-> yessw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{sb}{sc}{
- <-> yesscw8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{sb}{sl}{
- <-> yessow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{sb}{scsl}{
- <-> yesscow8t
-}{}
-
-\DeclareFontShape{T1}{yesw}{m}{it}{<->ssub * yesw/m/sl}{}
-\DeclareFontShape{T1}{yesw}{m}{si}{<->ssub * yesw/m/scsl}{}
-\DeclareFontShape{T1}{yesw}{bx}{n}{<->ssub * yesw/b/n}{}
-\DeclareFontShape{T1}{yesw}{bx}{sc}{<->ssub * yesw/b/sc}{}
-\DeclareFontShape{T1}{yesw}{bx}{sl}{<->ssub * yesw/b/sl}{}
-\DeclareFontShape{T1}{yesw}{b}{it}{<->ssub * yesw/b/sl}{}
-\DeclareFontShape{T1}{yesw}{bx}{it}{<->ssub * yesw/b/it}{}
-\DeclareFontShape{T1}{yesw}{bx}{scsl}{<->ssub * yesw/b/scsl}{}
-\DeclareFontShape{T1}{yesw}{b}{si}{<->ssub * yesw/b/scsl}{}
-\DeclareFontShape{T1}{yesw}{bx}{si}{<->ssub * yesw/b/si}{}
-\DeclareFontShape{T1}{yesw}{l}{it}{<->ssub * yesw/l/sl}{}
-\DeclareFontShape{T1}{yesw}{l}{si}{<->ssub * yesw/l/scsl}{}
-\DeclareFontShape{T1}{yesw}{sb}{it}{<->ssub * yesw/sb/sl}{}
-\DeclareFontShape{T1}{yesw}{sb}{si}{<->ssub * yesw/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yes.fd b/Master/texmf-dist/tex/latex/electrum/ts1yes.fd
deleted file mode 100644
index fa1ba42cb4d..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/ts1yes.fd
+++ /dev/null
@@ -1,67 +0,0 @@
-%Filename: ts1yes.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yes.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yes.]
-
-\DeclareFontFamily{TS1}{yes}{}
-
-\DeclareFontShape{TS1}{yes}{m}{n}{
- <-> yesr8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{m}{sl}{
- <-> yesro8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{b}{n}{
- <-> yesb8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{b}{sl}{
- <-> yesbo8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{l}{n}{
- <-> yesl8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{l}{sl}{
- <-> yeslo8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{sb}{n}{
- <-> yess8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{sb}{sl}{
- <-> yesso8c
-}{}
-
-\DeclareFontShape{TS1}{yes}{m}{sc}{<->ssub * yes/m/n}{}
-\DeclareFontShape{TS1}{yes}{m}{it}{<->ssub * yes/m/sl}{}
-\DeclareFontShape{TS1}{yes}{m}{scsl}{<->ssub * yes/m/it}{}
-\DeclareFontShape{TS1}{yes}{m}{si}{<->ssub * yes/m/scsl}{}
-\DeclareFontShape{TS1}{yes}{bx}{n}{<->ssub * yes/b/n}{}
-\DeclareFontShape{TS1}{yes}{b}{sc}{<->ssub * yes/b/n}{}
-\DeclareFontShape{TS1}{yes}{bx}{sc}{<->ssub * yes/b/sc}{}
-\DeclareFontShape{TS1}{yes}{bx}{sl}{<->ssub * yes/b/sl}{}
-\DeclareFontShape{TS1}{yes}{b}{it}{<->ssub * yes/b/sl}{}
-\DeclareFontShape{TS1}{yes}{bx}{it}{<->ssub * yes/b/it}{}
-\DeclareFontShape{TS1}{yes}{b}{scsl}{<->ssub * yes/b/it}{}
-\DeclareFontShape{TS1}{yes}{bx}{scsl}{<->ssub * yes/b/scsl}{}
-\DeclareFontShape{TS1}{yes}{b}{si}{<->ssub * yes/b/scsl}{}
-\DeclareFontShape{TS1}{yes}{bx}{si}{<->ssub * yes/b/si}{}
-\DeclareFontShape{TS1}{yes}{l}{sc}{<->ssub * yes/l/n}{}
-\DeclareFontShape{TS1}{yes}{l}{it}{<->ssub * yes/l/sl}{}
-\DeclareFontShape{TS1}{yes}{l}{scsl}{<->ssub * yes/l/it}{}
-\DeclareFontShape{TS1}{yes}{l}{si}{<->ssub * yes/l/scsl}{}
-\DeclareFontShape{TS1}{yes}{sb}{sc}{<->ssub * yes/sb/n}{}
-\DeclareFontShape{TS1}{yes}{sb}{it}{<->ssub * yes/sb/sl}{}
-\DeclareFontShape{TS1}{yes}{sb}{scsl}{<->ssub * yes/sb/it}{}
-\DeclareFontShape{TS1}{yes}{sb}{si}{<->ssub * yes/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yesj.fd b/Master/texmf-dist/tex/latex/electrum/ts1yesj.fd
deleted file mode 100644
index a8e052c56dd..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/ts1yesj.fd
+++ /dev/null
@@ -1,67 +0,0 @@
-%Filename: ts1yesj.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yesj.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yesj.]
-
-\DeclareFontFamily{TS1}{yesj}{}
-
-\DeclareFontShape{TS1}{yesj}{m}{n}{
- <-> yesrj8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{m}{sl}{
- <-> yesrjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{b}{n}{
- <-> yesbj8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{b}{sl}{
- <-> yesbjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{l}{n}{
- <-> yeslj8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{l}{sl}{
- <-> yesljo8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{sb}{n}{
- <-> yessj8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{sb}{sl}{
- <-> yessjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesj}{m}{sc}{<->ssub * yesj/m/n}{}
-\DeclareFontShape{TS1}{yesj}{m}{it}{<->ssub * yesj/m/sl}{}
-\DeclareFontShape{TS1}{yesj}{m}{scsl}{<->ssub * yesj/m/it}{}
-\DeclareFontShape{TS1}{yesj}{m}{si}{<->ssub * yesj/m/scsl}{}
-\DeclareFontShape{TS1}{yesj}{bx}{n}{<->ssub * yesj/b/n}{}
-\DeclareFontShape{TS1}{yesj}{b}{sc}{<->ssub * yesj/b/n}{}
-\DeclareFontShape{TS1}{yesj}{bx}{sc}{<->ssub * yesj/b/sc}{}
-\DeclareFontShape{TS1}{yesj}{bx}{sl}{<->ssub * yesj/b/sl}{}
-\DeclareFontShape{TS1}{yesj}{b}{it}{<->ssub * yesj/b/sl}{}
-\DeclareFontShape{TS1}{yesj}{bx}{it}{<->ssub * yesj/b/it}{}
-\DeclareFontShape{TS1}{yesj}{b}{scsl}{<->ssub * yesj/b/it}{}
-\DeclareFontShape{TS1}{yesj}{bx}{scsl}{<->ssub * yesj/b/scsl}{}
-\DeclareFontShape{TS1}{yesj}{b}{si}{<->ssub * yesj/b/scsl}{}
-\DeclareFontShape{TS1}{yesj}{bx}{si}{<->ssub * yesj/b/si}{}
-\DeclareFontShape{TS1}{yesj}{l}{sc}{<->ssub * yesj/l/n}{}
-\DeclareFontShape{TS1}{yesj}{l}{it}{<->ssub * yesj/l/sl}{}
-\DeclareFontShape{TS1}{yesj}{l}{scsl}{<->ssub * yesj/l/it}{}
-\DeclareFontShape{TS1}{yesj}{l}{si}{<->ssub * yesj/l/scsl}{}
-\DeclareFontShape{TS1}{yesj}{sb}{sc}{<->ssub * yesj/sb/n}{}
-\DeclareFontShape{TS1}{yesj}{sb}{it}{<->ssub * yesj/sb/sl}{}
-\DeclareFontShape{TS1}{yesj}{sb}{scsl}{<->ssub * yesj/sb/it}{}
-\DeclareFontShape{TS1}{yesj}{sb}{si}{<->ssub * yesj/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yesjw.fd b/Master/texmf-dist/tex/latex/electrum/ts1yesjw.fd
deleted file mode 100644
index 1596cf734e2..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/ts1yesjw.fd
+++ /dev/null
@@ -1,67 +0,0 @@
-%Filename: ts1yesjw.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yesjw.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yesjw.]
-
-\DeclareFontFamily{TS1}{yesjw}{}
-
-\DeclareFontShape{TS1}{yesjw}{m}{n}{
- <-> yesrj8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{m}{sl}{
- <-> yesrjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{b}{n}{
- <-> yesbj8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{b}{sl}{
- <-> yesbjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{l}{n}{
- <-> yeslj8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{l}{sl}{
- <-> yesljo8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{sb}{n}{
- <-> yessj8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{sb}{sl}{
- <-> yessjo8c
-}{}
-
-\DeclareFontShape{TS1}{yesjw}{m}{sc}{<->ssub * yesjw/m/n}{}
-\DeclareFontShape{TS1}{yesjw}{m}{it}{<->ssub * yesjw/m/sl}{}
-\DeclareFontShape{TS1}{yesjw}{m}{scsl}{<->ssub * yesjw/m/it}{}
-\DeclareFontShape{TS1}{yesjw}{m}{si}{<->ssub * yesjw/m/scsl}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{n}{<->ssub * yesjw/b/n}{}
-\DeclareFontShape{TS1}{yesjw}{b}{sc}{<->ssub * yesjw/b/n}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{sc}{<->ssub * yesjw/b/sc}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{sl}{<->ssub * yesjw/b/sl}{}
-\DeclareFontShape{TS1}{yesjw}{b}{it}{<->ssub * yesjw/b/sl}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{it}{<->ssub * yesjw/b/it}{}
-\DeclareFontShape{TS1}{yesjw}{b}{scsl}{<->ssub * yesjw/b/it}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{scsl}{<->ssub * yesjw/b/scsl}{}
-\DeclareFontShape{TS1}{yesjw}{b}{si}{<->ssub * yesjw/b/scsl}{}
-\DeclareFontShape{TS1}{yesjw}{bx}{si}{<->ssub * yesjw/b/si}{}
-\DeclareFontShape{TS1}{yesjw}{l}{sc}{<->ssub * yesjw/l/n}{}
-\DeclareFontShape{TS1}{yesjw}{l}{it}{<->ssub * yesjw/l/sl}{}
-\DeclareFontShape{TS1}{yesjw}{l}{scsl}{<->ssub * yesjw/l/it}{}
-\DeclareFontShape{TS1}{yesjw}{l}{si}{<->ssub * yesjw/l/scsl}{}
-\DeclareFontShape{TS1}{yesjw}{sb}{sc}{<->ssub * yesjw/sb/n}{}
-\DeclareFontShape{TS1}{yesjw}{sb}{it}{<->ssub * yesjw/sb/sl}{}
-\DeclareFontShape{TS1}{yesjw}{sb}{scsl}{<->ssub * yesjw/sb/it}{}
-\DeclareFontShape{TS1}{yesjw}{sb}{si}{<->ssub * yesjw/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yesw.fd b/Master/texmf-dist/tex/latex/electrum/ts1yesw.fd
deleted file mode 100644
index 451ae08250e..00000000000
--- a/Master/texmf-dist/tex/latex/electrum/ts1yesw.fd
+++ /dev/null
@@ -1,67 +0,0 @@
-%Filename: ts1yesw.fd
-%Created by: tex yes-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yesw.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yesw.]
-
-\DeclareFontFamily{TS1}{yesw}{}
-
-\DeclareFontShape{TS1}{yesw}{m}{n}{
- <-> yesr8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{m}{sl}{
- <-> yesro8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{b}{n}{
- <-> yesb8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{b}{sl}{
- <-> yesbo8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{l}{n}{
- <-> yesl8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{l}{sl}{
- <-> yeslo8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{sb}{n}{
- <-> yess8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{sb}{sl}{
- <-> yesso8c
-}{}
-
-\DeclareFontShape{TS1}{yesw}{m}{sc}{<->ssub * yesw/m/n}{}
-\DeclareFontShape{TS1}{yesw}{m}{it}{<->ssub * yesw/m/sl}{}
-\DeclareFontShape{TS1}{yesw}{m}{scsl}{<->ssub * yesw/m/it}{}
-\DeclareFontShape{TS1}{yesw}{m}{si}{<->ssub * yesw/m/scsl}{}
-\DeclareFontShape{TS1}{yesw}{bx}{n}{<->ssub * yesw/b/n}{}
-\DeclareFontShape{TS1}{yesw}{b}{sc}{<->ssub * yesw/b/n}{}
-\DeclareFontShape{TS1}{yesw}{bx}{sc}{<->ssub * yesw/b/sc}{}
-\DeclareFontShape{TS1}{yesw}{bx}{sl}{<->ssub * yesw/b/sl}{}
-\DeclareFontShape{TS1}{yesw}{b}{it}{<->ssub * yesw/b/sl}{}
-\DeclareFontShape{TS1}{yesw}{bx}{it}{<->ssub * yesw/b/it}{}
-\DeclareFontShape{TS1}{yesw}{b}{scsl}{<->ssub * yesw/b/it}{}
-\DeclareFontShape{TS1}{yesw}{bx}{scsl}{<->ssub * yesw/b/scsl}{}
-\DeclareFontShape{TS1}{yesw}{b}{si}{<->ssub * yesw/b/scsl}{}
-\DeclareFontShape{TS1}{yesw}{bx}{si}{<->ssub * yesw/b/si}{}
-\DeclareFontShape{TS1}{yesw}{l}{sc}{<->ssub * yesw/l/n}{}
-\DeclareFontShape{TS1}{yesw}{l}{it}{<->ssub * yesw/l/sl}{}
-\DeclareFontShape{TS1}{yesw}{l}{scsl}{<->ssub * yesw/l/it}{}
-\DeclareFontShape{TS1}{yesw}{l}{si}{<->ssub * yesw/l/scsl}{}
-\DeclareFontShape{TS1}{yesw}{sb}{sc}{<->ssub * yesw/sb/n}{}
-\DeclareFontShape{TS1}{yesw}{sb}{it}{<->ssub * yesw/sb/sl}{}
-\DeclareFontShape{TS1}{yesw}{sb}{scsl}{<->ssub * yesw/sb/it}{}
-\DeclareFontShape{TS1}{yesw}{sb}{si}{<->ssub * yesw/sb/scsl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/electrum.sty b/Master/texmf-dist/tex/latex/electrumadf/electrum.sty
new file mode 100644
index 00000000000..c6e89eb01d0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/electrum.sty
@@ -0,0 +1,100 @@
+%%
+%% This is file `electrum.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% electrumadf.dtx (with options: `sty')
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% electrumadf. You may however distribute the package electrumadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% ateb Heiko Oberdiek: https://tex.stackexchange.com/a/172896/
+%% dyw hwn ddim yn gweithio tu mewn i arg macro!
+%% (*wrth gwrs* dyw e ddim yn weithio! wyt ti'n *hollol* dwp?)
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[electrum.sty]{$Id: electrumadf.dtx 10402 2024-09-27 02:35:48Z cfrees $}[v1.1 \revinfo]
+\DefineFileInfoSVN[electrum]
+\RequirePackage[T1]{fontenc}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yes}{1}%
+ \DeclareEncodingSubset{TS1}{yesj}{1}%
+ \DeclareEncodingSubset{TS1}{yesw}{1}%
+ \DeclareEncodingSubset{TS1}{yesjw}{1}%
+ \DeclareEncodingSubset{TS1}{yes0}{1}%
+ \DeclareEncodingSubset{TS1}{yes1}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { electrum }
+{
+ lig .bool_set:N = \g__electrum_lig_bool,
+ lig .default:n = true,
+ lig .initial:n = false,
+ lf .bool_set_inverse:N = \g__electrum_osf_bool,
+ lf .default:n = true,
+ osf .bool_set:N = \g__electrum_osf_bool,
+ osf .default:n = true,
+ osf .initial:n = true,
+ scale .tl_set:N = \yes@scale,
+ scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[electrum]
+\tl_new:N \g__electrum_rm_tl
+\tl_gset:Nn \g__electrum_rm_tl {yes}
+\bool_if:NT \g__electrum_osf_bool
+{
+ \tl_gput_right:Nn \g__electrum_rm_tl {j}
+}
+\bool_if:NT \g__electrum_lig_bool
+{
+ \tl_gput_right:Nn \g__electrum_rm_tl {w}
+}
+\renewcommand{\rmdefault}{\g__electrum_rm_tl}
+\cs_if_exist:NF \infstyle
+{
+ \hook_gput_code:nnn { begindocument } { . }
+ {
+ \PackageWarning{electrum}
+ {electrum ~ requires ~ updated ~ nfssext-cfr ~ for ~ compatibility ~ with ~ hyperref}
+ \@ifpackageloaded{hyperref}{
+ \hook_gput_code:nnn { cmd/textin/before } { . }
+ {
+ \PackageWarning{electrum}{Note ~ that ~ '\protect\textin' ~ is ~ defined ~ by ~ hyperref.\MessageBreak
+ Use ~ for ~ inferior ~ digits ~ will ~ yield ~ an\MessageBreak
+ undefined ~ command ~ error ~ with ~ document ~ font ~ encodings.\MessageBreak
+ Use ~ '\protect\textinf' ~ to ~ access ~ inferior ~ digits}
+ }
+ \let\infstyle\instyle
+ \DeclareTextFontCommand{\textinf}{\infstyle}
+ }{}
+ }
+}
+\ExplSyntaxOff
+%% paid â chynnwys \endinput - docstrip yn chwilio amddo fe yn arbennigol
+%% & bydd doctrip yn ei ychwanegu fe beth bynnag
+%% (Martin Scharrer: https://tex.stackexchange.com/a/28997/)
+%% end electrum.sty
+\endinput
+%%
+%% End of file `electrum.sty'.
diff --git a/Master/texmf-dist/tex/latex/electrumadf/t1yes.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yes.fd
new file mode 100644
index 00000000000..042409f642e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yes.fd
@@ -0,0 +1,103 @@
+%Filename: t1yes.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yes.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yes.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yes}{}
+
+\DeclareFontShape{T1}{yes}{m}{n}{
+ <-> \yes@@scale yesr8t
+}{}
+
+\DeclareFontShape{T1}{yes}{m}{sc}{
+ <-> \yes@@scale yesrc8t
+}{}
+
+\DeclareFontShape{T1}{yes}{m}{sl}{
+ <-> \yes@@scale yesro8t
+}{}
+
+\DeclareFontShape{T1}{yes}{m}{scit}{
+ <-> \yes@@scale yesrco8t
+}{}
+
+\DeclareFontShape{T1}{yes}{b}{n}{
+ <-> \yes@@scale yesb8t
+}{}
+
+\DeclareFontShape{T1}{yes}{b}{sc}{
+ <-> \yes@@scale yesbc8t
+}{}
+
+\DeclareFontShape{T1}{yes}{b}{sl}{
+ <-> \yes@@scale yesbo8t
+}{}
+
+\DeclareFontShape{T1}{yes}{b}{scit}{
+ <-> \yes@@scale yesbco8t
+}{}
+
+\DeclareFontShape{T1}{yes}{l}{n}{
+ <-> \yes@@scale yesl8t
+}{}
+
+\DeclareFontShape{T1}{yes}{l}{sc}{
+ <-> \yes@@scale yeslc8t
+}{}
+
+\DeclareFontShape{T1}{yes}{l}{sl}{
+ <-> \yes@@scale yeslo8t
+}{}
+
+\DeclareFontShape{T1}{yes}{l}{scit}{
+ <-> \yes@@scale yeslco8t
+}{}
+
+\DeclareFontShape{T1}{yes}{sb}{n}{
+ <-> \yes@@scale yess8t
+}{}
+
+\DeclareFontShape{T1}{yes}{sb}{sc}{
+ <-> \yes@@scale yessc8t
+}{}
+
+\DeclareFontShape{T1}{yes}{sb}{sl}{
+ <-> \yes@@scale yesso8t
+}{}
+
+\DeclareFontShape{T1}{yes}{sb}{scit}{
+ <-> \yes@@scale yessco8t
+}{}
+
+\DeclareFontShape{T1}{yes}{m}{it}{<->ssub * yes/m/sl}{}
+\DeclareFontShape{T1}{yes}{m}{si}{<->ssub * yes/m/scit}{}
+\DeclareFontShape{T1}{yes}{m}{scsl}{<->ssub * yes/m/si}{}
+\DeclareFontShape{T1}{yes}{bx}{n}{<->ssub * yes/b/n}{}
+\DeclareFontShape{T1}{yes}{bx}{sc}{<->ssub * yes/b/sc}{}
+\DeclareFontShape{T1}{yes}{bx}{sl}{<->ssub * yes/b/sl}{}
+\DeclareFontShape{T1}{yes}{b}{it}{<->ssub * yes/b/sl}{}
+\DeclareFontShape{T1}{yes}{bx}{it}{<->ssub * yes/b/it}{}
+\DeclareFontShape{T1}{yes}{bx}{scit}{<->ssub * yes/b/scit}{}
+\DeclareFontShape{T1}{yes}{b}{si}{<->ssub * yes/b/scit}{}
+\DeclareFontShape{T1}{yes}{bx}{si}{<->ssub * yes/b/si}{}
+\DeclareFontShape{T1}{yes}{b}{scsl}{<->ssub * yes/b/si}{}
+\DeclareFontShape{T1}{yes}{bx}{scsl}{<->ssub * yes/b/scsl}{}
+\DeclareFontShape{T1}{yes}{l}{it}{<->ssub * yes/l/sl}{}
+\DeclareFontShape{T1}{yes}{l}{si}{<->ssub * yes/l/scit}{}
+\DeclareFontShape{T1}{yes}{l}{scsl}{<->ssub * yes/l/si}{}
+\DeclareFontShape{T1}{yes}{sb}{it}{<->ssub * yes/sb/sl}{}
+\DeclareFontShape{T1}{yes}{sb}{si}{<->ssub * yes/sb/scit}{}
+\DeclareFontShape{T1}{yes}{sb}{scsl}{<->ssub * yes/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yes0.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yes0.fd
index a94370d0267..161fa06ceac 100644
--- a/Master/texmf-dist/tex/latex/electrum/t1yes0.fd
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yes0.fd
@@ -5,63 +5,60 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yes0.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yes0.]
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yes0.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yes0}{}
\DeclareFontShape{T1}{yes0}{m}{n}{
- <-> yesr08t
+ <-> \yes@@scale yesr08t
}{}
\DeclareFontShape{T1}{yes0}{m}{sl}{
- <-> yesr0o8t
+ <-> \yes@@scale yesr0o8t
}{}
\DeclareFontShape{T1}{yes0}{b}{n}{
- <-> yesb08t
+ <-> \yes@@scale yesb08t
}{}
\DeclareFontShape{T1}{yes0}{b}{sl}{
- <-> yesb0o8t
+ <-> \yes@@scale yesb0o8t
}{}
\DeclareFontShape{T1}{yes0}{l}{n}{
- <-> yesl08t
+ <-> \yes@@scale yesl08t
}{}
\DeclareFontShape{T1}{yes0}{l}{sl}{
- <-> yesl0o8t
+ <-> \yes@@scale yesl0o8t
}{}
\DeclareFontShape{T1}{yes0}{sb}{n}{
- <-> yess08t
+ <-> \yes@@scale yess08t
}{}
\DeclareFontShape{T1}{yes0}{sb}{sl}{
- <-> yess0o8t
+ <-> \yes@@scale yess0o8t
}{}
\DeclareFontShape{T1}{yes0}{m}{sc}{<->ssub * yes0/m/n}{}
\DeclareFontShape{T1}{yes0}{m}{it}{<->ssub * yes0/m/sl}{}
-\DeclareFontShape{T1}{yes0}{m}{scsl}{<->ssub * yes0/m/it}{}
-\DeclareFontShape{T1}{yes0}{m}{si}{<->ssub * yes0/m/scsl}{}
\DeclareFontShape{T1}{yes0}{bx}{n}{<->ssub * yes0/b/n}{}
\DeclareFontShape{T1}{yes0}{b}{sc}{<->ssub * yes0/b/n}{}
\DeclareFontShape{T1}{yes0}{bx}{sc}{<->ssub * yes0/b/sc}{}
\DeclareFontShape{T1}{yes0}{bx}{sl}{<->ssub * yes0/b/sl}{}
\DeclareFontShape{T1}{yes0}{b}{it}{<->ssub * yes0/b/sl}{}
\DeclareFontShape{T1}{yes0}{bx}{it}{<->ssub * yes0/b/it}{}
-\DeclareFontShape{T1}{yes0}{b}{scsl}{<->ssub * yes0/b/it}{}
-\DeclareFontShape{T1}{yes0}{bx}{scsl}{<->ssub * yes0/b/scsl}{}
-\DeclareFontShape{T1}{yes0}{b}{si}{<->ssub * yes0/b/scsl}{}
-\DeclareFontShape{T1}{yes0}{bx}{si}{<->ssub * yes0/b/si}{}
\DeclareFontShape{T1}{yes0}{l}{sc}{<->ssub * yes0/l/n}{}
\DeclareFontShape{T1}{yes0}{l}{it}{<->ssub * yes0/l/sl}{}
-\DeclareFontShape{T1}{yes0}{l}{scsl}{<->ssub * yes0/l/it}{}
-\DeclareFontShape{T1}{yes0}{l}{si}{<->ssub * yes0/l/scsl}{}
\DeclareFontShape{T1}{yes0}{sb}{sc}{<->ssub * yes0/sb/n}{}
\DeclareFontShape{T1}{yes0}{sb}{it}{<->ssub * yes0/sb/sl}{}
-\DeclareFontShape{T1}{yes0}{sb}{scsl}{<->ssub * yes0/sb/it}{}
-\DeclareFontShape{T1}{yes0}{sb}{si}{<->ssub * yes0/sb/scsl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/t1yes1.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yes1.fd
index 004c444799d..db7e7617b7d 100644
--- a/Master/texmf-dist/tex/latex/electrum/t1yes1.fd
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yes1.fd
@@ -5,63 +5,60 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yes1.fd}
- [2010/07/19 Fontinst v1.933 font definitions for T1/yes1.]
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yes1.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yes1}{}
\DeclareFontShape{T1}{yes1}{m}{n}{
- <-> yesr18t
+ <-> \yes@@scale yesr18t
}{}
\DeclareFontShape{T1}{yes1}{m}{sl}{
- <-> yesr1o8t
+ <-> \yes@@scale yesr1o8t
}{}
\DeclareFontShape{T1}{yes1}{b}{n}{
- <-> yesb18t
+ <-> \yes@@scale yesb18t
}{}
\DeclareFontShape{T1}{yes1}{b}{sl}{
- <-> yesb1o8t
+ <-> \yes@@scale yesb1o8t
}{}
\DeclareFontShape{T1}{yes1}{l}{n}{
- <-> yesl18t
+ <-> \yes@@scale yesl18t
}{}
\DeclareFontShape{T1}{yes1}{l}{sl}{
- <-> yesl1o8t
+ <-> \yes@@scale yesl1o8t
}{}
\DeclareFontShape{T1}{yes1}{sb}{n}{
- <-> yess18t
+ <-> \yes@@scale yess18t
}{}
\DeclareFontShape{T1}{yes1}{sb}{sl}{
- <-> yess1o8t
+ <-> \yes@@scale yess1o8t
}{}
\DeclareFontShape{T1}{yes1}{m}{sc}{<->ssub * yes1/m/n}{}
\DeclareFontShape{T1}{yes1}{m}{it}{<->ssub * yes1/m/sl}{}
-\DeclareFontShape{T1}{yes1}{m}{scsl}{<->ssub * yes1/m/it}{}
-\DeclareFontShape{T1}{yes1}{m}{si}{<->ssub * yes1/m/scsl}{}
\DeclareFontShape{T1}{yes1}{bx}{n}{<->ssub * yes1/b/n}{}
\DeclareFontShape{T1}{yes1}{b}{sc}{<->ssub * yes1/b/n}{}
\DeclareFontShape{T1}{yes1}{bx}{sc}{<->ssub * yes1/b/sc}{}
\DeclareFontShape{T1}{yes1}{bx}{sl}{<->ssub * yes1/b/sl}{}
\DeclareFontShape{T1}{yes1}{b}{it}{<->ssub * yes1/b/sl}{}
\DeclareFontShape{T1}{yes1}{bx}{it}{<->ssub * yes1/b/it}{}
-\DeclareFontShape{T1}{yes1}{b}{scsl}{<->ssub * yes1/b/it}{}
-\DeclareFontShape{T1}{yes1}{bx}{scsl}{<->ssub * yes1/b/scsl}{}
-\DeclareFontShape{T1}{yes1}{b}{si}{<->ssub * yes1/b/scsl}{}
-\DeclareFontShape{T1}{yes1}{bx}{si}{<->ssub * yes1/b/si}{}
\DeclareFontShape{T1}{yes1}{l}{sc}{<->ssub * yes1/l/n}{}
\DeclareFontShape{T1}{yes1}{l}{it}{<->ssub * yes1/l/sl}{}
-\DeclareFontShape{T1}{yes1}{l}{scsl}{<->ssub * yes1/l/it}{}
-\DeclareFontShape{T1}{yes1}{l}{si}{<->ssub * yes1/l/scsl}{}
\DeclareFontShape{T1}{yes1}{sb}{sc}{<->ssub * yes1/sb/n}{}
\DeclareFontShape{T1}{yes1}{sb}{it}{<->ssub * yes1/sb/sl}{}
-\DeclareFontShape{T1}{yes1}{sb}{scsl}{<->ssub * yes1/sb/it}{}
-\DeclareFontShape{T1}{yes1}{sb}{si}{<->ssub * yes1/sb/scsl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/t1yesj.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yesj.fd
new file mode 100644
index 00000000000..05552e2a270
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yesj.fd
@@ -0,0 +1,103 @@
+%Filename: t1yesj.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yesj.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yesj.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yesj}{}
+
+\DeclareFontShape{T1}{yesj}{m}{n}{
+ <-> \yes@@scale yesrj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{m}{sc}{
+ <-> \yes@@scale yesrcj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{m}{sl}{
+ <-> \yes@@scale yesrjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{m}{scit}{
+ <-> \yes@@scale yesrcjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{b}{n}{
+ <-> \yes@@scale yesbj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{b}{sc}{
+ <-> \yes@@scale yesbcj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{b}{sl}{
+ <-> \yes@@scale yesbjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{b}{scit}{
+ <-> \yes@@scale yesbcjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{l}{n}{
+ <-> \yes@@scale yeslj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{l}{sc}{
+ <-> \yes@@scale yeslcj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{l}{sl}{
+ <-> \yes@@scale yesljo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{l}{scit}{
+ <-> \yes@@scale yeslcjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{sb}{n}{
+ <-> \yes@@scale yessj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{sb}{sc}{
+ <-> \yes@@scale yesscj8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{sb}{sl}{
+ <-> \yes@@scale yessjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{sb}{scit}{
+ <-> \yes@@scale yesscjo8t
+}{}
+
+\DeclareFontShape{T1}{yesj}{m}{it}{<->ssub * yesj/m/sl}{}
+\DeclareFontShape{T1}{yesj}{m}{si}{<->ssub * yesj/m/scit}{}
+\DeclareFontShape{T1}{yesj}{m}{scsl}{<->ssub * yesj/m/si}{}
+\DeclareFontShape{T1}{yesj}{bx}{n}{<->ssub * yesj/b/n}{}
+\DeclareFontShape{T1}{yesj}{bx}{sc}{<->ssub * yesj/b/sc}{}
+\DeclareFontShape{T1}{yesj}{bx}{sl}{<->ssub * yesj/b/sl}{}
+\DeclareFontShape{T1}{yesj}{b}{it}{<->ssub * yesj/b/sl}{}
+\DeclareFontShape{T1}{yesj}{bx}{it}{<->ssub * yesj/b/it}{}
+\DeclareFontShape{T1}{yesj}{bx}{scit}{<->ssub * yesj/b/scit}{}
+\DeclareFontShape{T1}{yesj}{b}{si}{<->ssub * yesj/b/scit}{}
+\DeclareFontShape{T1}{yesj}{bx}{si}{<->ssub * yesj/b/si}{}
+\DeclareFontShape{T1}{yesj}{b}{scsl}{<->ssub * yesj/b/si}{}
+\DeclareFontShape{T1}{yesj}{bx}{scsl}{<->ssub * yesj/b/scsl}{}
+\DeclareFontShape{T1}{yesj}{l}{it}{<->ssub * yesj/l/sl}{}
+\DeclareFontShape{T1}{yesj}{l}{si}{<->ssub * yesj/l/scit}{}
+\DeclareFontShape{T1}{yesj}{l}{scsl}{<->ssub * yesj/l/si}{}
+\DeclareFontShape{T1}{yesj}{sb}{it}{<->ssub * yesj/sb/sl}{}
+\DeclareFontShape{T1}{yesj}{sb}{si}{<->ssub * yesj/sb/scit}{}
+\DeclareFontShape{T1}{yesj}{sb}{scsl}{<->ssub * yesj/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/t1yesjw.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yesjw.fd
new file mode 100644
index 00000000000..ee84ee500d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yesjw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yesjw.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yesjw.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yesjw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yesjw}{}
+
+\DeclareFontShape{T1}{yesjw}{m}{n}{
+ <-> \yes@@scale yesrjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{m}{sc}{
+ <-> \yes@@scale yesrcjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{m}{sl}{
+ <-> \yes@@scale yesrjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{m}{scit}{
+ <-> \yes@@scale yesrcjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{b}{n}{
+ <-> \yes@@scale yesbjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{b}{sc}{
+ <-> \yes@@scale yesbcjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{b}{sl}{
+ <-> \yes@@scale yesbjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{b}{scit}{
+ <-> \yes@@scale yesbcjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{l}{n}{
+ <-> \yes@@scale yesljw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{l}{sc}{
+ <-> \yes@@scale yeslcjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{l}{sl}{
+ <-> \yes@@scale yesljow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{l}{scit}{
+ <-> \yes@@scale yeslcjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{sb}{n}{
+ <-> \yes@@scale yessjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{sb}{sc}{
+ <-> \yes@@scale yesscjw8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{sb}{sl}{
+ <-> \yes@@scale yessjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{sb}{scit}{
+ <-> \yes@@scale yesscjow8t
+}{}
+
+\DeclareFontShape{T1}{yesjw}{m}{it}{<->ssub * yesjw/m/sl}{}
+\DeclareFontShape{T1}{yesjw}{m}{si}{<->ssub * yesjw/m/scit}{}
+\DeclareFontShape{T1}{yesjw}{m}{scsl}{<->ssub * yesjw/m/si}{}
+\DeclareFontShape{T1}{yesjw}{bx}{n}{<->ssub * yesjw/b/n}{}
+\DeclareFontShape{T1}{yesjw}{bx}{sc}{<->ssub * yesjw/b/sc}{}
+\DeclareFontShape{T1}{yesjw}{bx}{sl}{<->ssub * yesjw/b/sl}{}
+\DeclareFontShape{T1}{yesjw}{b}{it}{<->ssub * yesjw/b/sl}{}
+\DeclareFontShape{T1}{yesjw}{bx}{it}{<->ssub * yesjw/b/it}{}
+\DeclareFontShape{T1}{yesjw}{bx}{scit}{<->ssub * yesjw/b/scit}{}
+\DeclareFontShape{T1}{yesjw}{b}{si}{<->ssub * yesjw/b/scit}{}
+\DeclareFontShape{T1}{yesjw}{bx}{si}{<->ssub * yesjw/b/si}{}
+\DeclareFontShape{T1}{yesjw}{b}{scsl}{<->ssub * yesjw/b/si}{}
+\DeclareFontShape{T1}{yesjw}{bx}{scsl}{<->ssub * yesjw/b/scsl}{}
+\DeclareFontShape{T1}{yesjw}{l}{it}{<->ssub * yesjw/l/sl}{}
+\DeclareFontShape{T1}{yesjw}{l}{si}{<->ssub * yesjw/l/scit}{}
+\DeclareFontShape{T1}{yesjw}{l}{scsl}{<->ssub * yesjw/l/si}{}
+\DeclareFontShape{T1}{yesjw}{sb}{it}{<->ssub * yesjw/sb/sl}{}
+\DeclareFontShape{T1}{yesjw}{sb}{si}{<->ssub * yesjw/sb/scit}{}
+\DeclareFontShape{T1}{yesjw}{sb}{scsl}{<->ssub * yesjw/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/t1yesw.fd b/Master/texmf-dist/tex/latex/electrumadf/t1yesw.fd
new file mode 100644
index 00000000000..a82a7498bf3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/t1yesw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yesw.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yesw.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for T1/yesw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yesw}{}
+
+\DeclareFontShape{T1}{yesw}{m}{n}{
+ <-> \yes@@scale yesrw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{m}{sc}{
+ <-> \yes@@scale yesrcw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{m}{sl}{
+ <-> \yes@@scale yesrow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{m}{scit}{
+ <-> \yes@@scale yesrcow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{b}{n}{
+ <-> \yes@@scale yesbw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{b}{sc}{
+ <-> \yes@@scale yesbcw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{b}{sl}{
+ <-> \yes@@scale yesbow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{b}{scit}{
+ <-> \yes@@scale yesbcow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{l}{n}{
+ <-> \yes@@scale yeslw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{l}{sc}{
+ <-> \yes@@scale yeslcw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{l}{sl}{
+ <-> \yes@@scale yeslow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{l}{scit}{
+ <-> \yes@@scale yeslcow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{sb}{n}{
+ <-> \yes@@scale yessw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{sb}{sc}{
+ <-> \yes@@scale yesscw8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{sb}{sl}{
+ <-> \yes@@scale yessow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{sb}{scit}{
+ <-> \yes@@scale yesscow8t
+}{}
+
+\DeclareFontShape{T1}{yesw}{m}{it}{<->ssub * yesw/m/sl}{}
+\DeclareFontShape{T1}{yesw}{m}{si}{<->ssub * yesw/m/scit}{}
+\DeclareFontShape{T1}{yesw}{m}{scsl}{<->ssub * yesw/m/si}{}
+\DeclareFontShape{T1}{yesw}{bx}{n}{<->ssub * yesw/b/n}{}
+\DeclareFontShape{T1}{yesw}{bx}{sc}{<->ssub * yesw/b/sc}{}
+\DeclareFontShape{T1}{yesw}{bx}{sl}{<->ssub * yesw/b/sl}{}
+\DeclareFontShape{T1}{yesw}{b}{it}{<->ssub * yesw/b/sl}{}
+\DeclareFontShape{T1}{yesw}{bx}{it}{<->ssub * yesw/b/it}{}
+\DeclareFontShape{T1}{yesw}{bx}{scit}{<->ssub * yesw/b/scit}{}
+\DeclareFontShape{T1}{yesw}{b}{si}{<->ssub * yesw/b/scit}{}
+\DeclareFontShape{T1}{yesw}{bx}{si}{<->ssub * yesw/b/si}{}
+\DeclareFontShape{T1}{yesw}{b}{scsl}{<->ssub * yesw/b/si}{}
+\DeclareFontShape{T1}{yesw}{bx}{scsl}{<->ssub * yesw/b/scsl}{}
+\DeclareFontShape{T1}{yesw}{l}{it}{<->ssub * yesw/l/sl}{}
+\DeclareFontShape{T1}{yesw}{l}{si}{<->ssub * yesw/l/scit}{}
+\DeclareFontShape{T1}{yesw}{l}{scsl}{<->ssub * yesw/l/si}{}
+\DeclareFontShape{T1}{yesw}{sb}{it}{<->ssub * yesw/sb/sl}{}
+\DeclareFontShape{T1}{yesw}{sb}{si}{<->ssub * yesw/sb/scit}{}
+\DeclareFontShape{T1}{yesw}{sb}{scsl}{<->ssub * yesw/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/ts1yes.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yes.fd
new file mode 100644
index 00000000000..c5a06367371
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yes.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yes.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yes.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yes.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yes}{}
+
+\DeclareFontShape{TS1}{yes}{m}{n}{
+ <-> \yes@@scale yesr8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{m}{sl}{
+ <-> \yes@@scale yesro8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{b}{n}{
+ <-> \yes@@scale yesb8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{b}{sl}{
+ <-> \yes@@scale yesbo8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{l}{n}{
+ <-> \yes@@scale yesl8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{l}{sl}{
+ <-> \yes@@scale yeslo8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{sb}{n}{
+ <-> \yes@@scale yess8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{sb}{sl}{
+ <-> \yes@@scale yesso8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{m}{sc}{
+ <-> \yes@@scale yesr8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{m}{scit}{
+ <-> \yes@@scale yesro8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{b}{sc}{
+ <-> \yes@@scale yesb8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{b}{scit}{
+ <-> \yes@@scale yesbo8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{l}{sc}{
+ <-> \yes@@scale yesl8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{l}{scit}{
+ <-> \yes@@scale yeslo8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{sb}{sc}{
+ <-> \yes@@scale yess8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{sb}{scit}{
+ <-> \yes@@scale yesso8c
+}{}
+
+\DeclareFontShape{TS1}{yes}{m}{it}{<->ssub * yes/m/sl}{}
+\DeclareFontShape{TS1}{yes}{bx}{n}{<->ssub * yes/b/n}{}
+\DeclareFontShape{TS1}{yes}{bx}{sl}{<->ssub * yes/b/sl}{}
+\DeclareFontShape{TS1}{yes}{b}{it}{<->ssub * yes/b/sl}{}
+\DeclareFontShape{TS1}{yes}{bx}{it}{<->ssub * yes/b/it}{}
+\DeclareFontShape{TS1}{yes}{l}{it}{<->ssub * yes/l/sl}{}
+\DeclareFontShape{TS1}{yes}{sb}{it}{<->ssub * yes/sb/sl}{}
+\DeclareFontShape{TS1}{yes}{m}{si}{<->ssub * yes/m/scit}{}
+\DeclareFontShape{TS1}{yes}{m}{scsl}{<->ssub * yes/m/si}{}
+\DeclareFontShape{TS1}{yes}{bx}{sc}{<->ssub * yes/b/sc}{}
+\DeclareFontShape{TS1}{yes}{bx}{scit}{<->ssub * yes/b/scit}{}
+\DeclareFontShape{TS1}{yes}{b}{si}{<->ssub * yes/b/scit}{}
+\DeclareFontShape{TS1}{yes}{bx}{si}{<->ssub * yes/b/si}{}
+\DeclareFontShape{TS1}{yes}{b}{scsl}{<->ssub * yes/b/si}{}
+\DeclareFontShape{TS1}{yes}{bx}{scsl}{<->ssub * yes/b/scsl}{}
+\DeclareFontShape{TS1}{yes}{l}{si}{<->ssub * yes/l/scit}{}
+\DeclareFontShape{TS1}{yes}{l}{scsl}{<->ssub * yes/l/si}{}
+\DeclareFontShape{TS1}{yes}{sb}{si}{<->ssub * yes/sb/scit}{}
+\DeclareFontShape{TS1}{yes}{sb}{scsl}{<->ssub * yes/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yes0.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yes0.fd
index 6c3a2aa41d1..76ce5271571 100644
--- a/Master/texmf-dist/tex/latex/electrum/ts1yes0.fd
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yes0.fd
@@ -5,63 +5,60 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yes0.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yes0.]
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yes0.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yes0}{}
\DeclareFontShape{TS1}{yes0}{m}{n}{
- <-> yesr08c
+ <-> \yes@@scale yesr08c
}{}
\DeclareFontShape{TS1}{yes0}{m}{sl}{
- <-> yesr0o8c
+ <-> \yes@@scale yesr0o8c
}{}
\DeclareFontShape{TS1}{yes0}{b}{n}{
- <-> yesb08c
+ <-> \yes@@scale yesb08c
}{}
\DeclareFontShape{TS1}{yes0}{b}{sl}{
- <-> yesb0o8c
+ <-> \yes@@scale yesb0o8c
}{}
\DeclareFontShape{TS1}{yes0}{l}{n}{
- <-> yesl08c
+ <-> \yes@@scale yesl08c
}{}
\DeclareFontShape{TS1}{yes0}{l}{sl}{
- <-> yesl0o8c
+ <-> \yes@@scale yesl0o8c
}{}
\DeclareFontShape{TS1}{yes0}{sb}{n}{
- <-> yess08c
+ <-> \yes@@scale yess08c
}{}
\DeclareFontShape{TS1}{yes0}{sb}{sl}{
- <-> yess0o8c
+ <-> \yes@@scale yess0o8c
}{}
\DeclareFontShape{TS1}{yes0}{m}{sc}{<->ssub * yes0/m/n}{}
\DeclareFontShape{TS1}{yes0}{m}{it}{<->ssub * yes0/m/sl}{}
-\DeclareFontShape{TS1}{yes0}{m}{scsl}{<->ssub * yes0/m/it}{}
-\DeclareFontShape{TS1}{yes0}{m}{si}{<->ssub * yes0/m/scsl}{}
\DeclareFontShape{TS1}{yes0}{bx}{n}{<->ssub * yes0/b/n}{}
\DeclareFontShape{TS1}{yes0}{b}{sc}{<->ssub * yes0/b/n}{}
\DeclareFontShape{TS1}{yes0}{bx}{sc}{<->ssub * yes0/b/sc}{}
\DeclareFontShape{TS1}{yes0}{bx}{sl}{<->ssub * yes0/b/sl}{}
\DeclareFontShape{TS1}{yes0}{b}{it}{<->ssub * yes0/b/sl}{}
\DeclareFontShape{TS1}{yes0}{bx}{it}{<->ssub * yes0/b/it}{}
-\DeclareFontShape{TS1}{yes0}{b}{scsl}{<->ssub * yes0/b/it}{}
-\DeclareFontShape{TS1}{yes0}{bx}{scsl}{<->ssub * yes0/b/scsl}{}
-\DeclareFontShape{TS1}{yes0}{b}{si}{<->ssub * yes0/b/scsl}{}
-\DeclareFontShape{TS1}{yes0}{bx}{si}{<->ssub * yes0/b/si}{}
\DeclareFontShape{TS1}{yes0}{l}{sc}{<->ssub * yes0/l/n}{}
\DeclareFontShape{TS1}{yes0}{l}{it}{<->ssub * yes0/l/sl}{}
-\DeclareFontShape{TS1}{yes0}{l}{scsl}{<->ssub * yes0/l/it}{}
-\DeclareFontShape{TS1}{yes0}{l}{si}{<->ssub * yes0/l/scsl}{}
\DeclareFontShape{TS1}{yes0}{sb}{sc}{<->ssub * yes0/sb/n}{}
\DeclareFontShape{TS1}{yes0}{sb}{it}{<->ssub * yes0/sb/sl}{}
-\DeclareFontShape{TS1}{yes0}{sb}{scsl}{<->ssub * yes0/sb/it}{}
-\DeclareFontShape{TS1}{yes0}{sb}{si}{<->ssub * yes0/sb/scsl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/electrum/ts1yes1.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yes1.fd
index d8f82655e76..334594349d1 100644
--- a/Master/texmf-dist/tex/latex/electrum/ts1yes1.fd
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yes1.fd
@@ -5,63 +5,60 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yes1.fd}
- [2010/07/19 Fontinst v1.933 font definitions for TS1/yes1.]
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yes1.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yes1}{}
\DeclareFontShape{TS1}{yes1}{m}{n}{
- <-> yesr18c
+ <-> \yes@@scale yesr18c
}{}
\DeclareFontShape{TS1}{yes1}{m}{sl}{
- <-> yesr1o8c
+ <-> \yes@@scale yesr1o8c
}{}
\DeclareFontShape{TS1}{yes1}{b}{n}{
- <-> yesb18c
+ <-> \yes@@scale yesb18c
}{}
\DeclareFontShape{TS1}{yes1}{b}{sl}{
- <-> yesb1o8c
+ <-> \yes@@scale yesb1o8c
}{}
\DeclareFontShape{TS1}{yes1}{l}{n}{
- <-> yesl18c
+ <-> \yes@@scale yesl18c
}{}
\DeclareFontShape{TS1}{yes1}{l}{sl}{
- <-> yesl1o8c
+ <-> \yes@@scale yesl1o8c
}{}
\DeclareFontShape{TS1}{yes1}{sb}{n}{
- <-> yess18c
+ <-> \yes@@scale yess18c
}{}
\DeclareFontShape{TS1}{yes1}{sb}{sl}{
- <-> yess1o8c
+ <-> \yes@@scale yess1o8c
}{}
\DeclareFontShape{TS1}{yes1}{m}{sc}{<->ssub * yes1/m/n}{}
\DeclareFontShape{TS1}{yes1}{m}{it}{<->ssub * yes1/m/sl}{}
-\DeclareFontShape{TS1}{yes1}{m}{scsl}{<->ssub * yes1/m/it}{}
-\DeclareFontShape{TS1}{yes1}{m}{si}{<->ssub * yes1/m/scsl}{}
\DeclareFontShape{TS1}{yes1}{bx}{n}{<->ssub * yes1/b/n}{}
\DeclareFontShape{TS1}{yes1}{b}{sc}{<->ssub * yes1/b/n}{}
\DeclareFontShape{TS1}{yes1}{bx}{sc}{<->ssub * yes1/b/sc}{}
\DeclareFontShape{TS1}{yes1}{bx}{sl}{<->ssub * yes1/b/sl}{}
\DeclareFontShape{TS1}{yes1}{b}{it}{<->ssub * yes1/b/sl}{}
\DeclareFontShape{TS1}{yes1}{bx}{it}{<->ssub * yes1/b/it}{}
-\DeclareFontShape{TS1}{yes1}{b}{scsl}{<->ssub * yes1/b/it}{}
-\DeclareFontShape{TS1}{yes1}{bx}{scsl}{<->ssub * yes1/b/scsl}{}
-\DeclareFontShape{TS1}{yes1}{b}{si}{<->ssub * yes1/b/scsl}{}
-\DeclareFontShape{TS1}{yes1}{bx}{si}{<->ssub * yes1/b/si}{}
\DeclareFontShape{TS1}{yes1}{l}{sc}{<->ssub * yes1/l/n}{}
\DeclareFontShape{TS1}{yes1}{l}{it}{<->ssub * yes1/l/sl}{}
-\DeclareFontShape{TS1}{yes1}{l}{scsl}{<->ssub * yes1/l/it}{}
-\DeclareFontShape{TS1}{yes1}{l}{si}{<->ssub * yes1/l/scsl}{}
\DeclareFontShape{TS1}{yes1}{sb}{sc}{<->ssub * yes1/sb/n}{}
\DeclareFontShape{TS1}{yes1}{sb}{it}{<->ssub * yes1/sb/sl}{}
-\DeclareFontShape{TS1}{yes1}{sb}{scsl}{<->ssub * yes1/sb/it}{}
-\DeclareFontShape{TS1}{yes1}{sb}{si}{<->ssub * yes1/sb/scsl}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/ts1yesj.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yesj.fd
new file mode 100644
index 00000000000..7b6254b37f0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yesj.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yesj.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yesj.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yesj.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yesj}{}
+
+\DeclareFontShape{TS1}{yesj}{m}{n}{
+ <-> \yes@@scale yesrj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{m}{sl}{
+ <-> \yes@@scale yesrjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{b}{n}{
+ <-> \yes@@scale yesbj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{b}{sl}{
+ <-> \yes@@scale yesbjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{l}{n}{
+ <-> \yes@@scale yeslj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{l}{sl}{
+ <-> \yes@@scale yesljo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{sb}{n}{
+ <-> \yes@@scale yessj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{sb}{sl}{
+ <-> \yes@@scale yessjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{m}{sc}{
+ <-> \yes@@scale yesrj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{m}{scit}{
+ <-> \yes@@scale yesrjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{b}{sc}{
+ <-> \yes@@scale yesbj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{b}{scit}{
+ <-> \yes@@scale yesbjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{l}{sc}{
+ <-> \yes@@scale yeslj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{l}{scit}{
+ <-> \yes@@scale yesljo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{sb}{sc}{
+ <-> \yes@@scale yessj8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{sb}{scit}{
+ <-> \yes@@scale yessjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesj}{m}{it}{<->ssub * yesj/m/sl}{}
+\DeclareFontShape{TS1}{yesj}{bx}{n}{<->ssub * yesj/b/n}{}
+\DeclareFontShape{TS1}{yesj}{bx}{sl}{<->ssub * yesj/b/sl}{}
+\DeclareFontShape{TS1}{yesj}{b}{it}{<->ssub * yesj/b/sl}{}
+\DeclareFontShape{TS1}{yesj}{bx}{it}{<->ssub * yesj/b/it}{}
+\DeclareFontShape{TS1}{yesj}{l}{it}{<->ssub * yesj/l/sl}{}
+\DeclareFontShape{TS1}{yesj}{sb}{it}{<->ssub * yesj/sb/sl}{}
+\DeclareFontShape{TS1}{yesj}{m}{si}{<->ssub * yesj/m/scit}{}
+\DeclareFontShape{TS1}{yesj}{m}{scsl}{<->ssub * yesj/m/si}{}
+\DeclareFontShape{TS1}{yesj}{bx}{sc}{<->ssub * yesj/b/sc}{}
+\DeclareFontShape{TS1}{yesj}{bx}{scit}{<->ssub * yesj/b/scit}{}
+\DeclareFontShape{TS1}{yesj}{b}{si}{<->ssub * yesj/b/scit}{}
+\DeclareFontShape{TS1}{yesj}{bx}{si}{<->ssub * yesj/b/si}{}
+\DeclareFontShape{TS1}{yesj}{b}{scsl}{<->ssub * yesj/b/si}{}
+\DeclareFontShape{TS1}{yesj}{bx}{scsl}{<->ssub * yesj/b/scsl}{}
+\DeclareFontShape{TS1}{yesj}{l}{si}{<->ssub * yesj/l/scit}{}
+\DeclareFontShape{TS1}{yesj}{l}{scsl}{<->ssub * yesj/l/si}{}
+\DeclareFontShape{TS1}{yesj}{sb}{si}{<->ssub * yesj/sb/scit}{}
+\DeclareFontShape{TS1}{yesj}{sb}{scsl}{<->ssub * yesj/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/ts1yesjw.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yesjw.fd
new file mode 100644
index 00000000000..1acc1b2714c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yesjw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yesjw.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yesjw.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yesjw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yesjw}{}
+
+\DeclareFontShape{TS1}{yesjw}{m}{n}{
+ <-> \yes@@scale yesrj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{m}{sl}{
+ <-> \yes@@scale yesrjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{b}{n}{
+ <-> \yes@@scale yesbj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{b}{sl}{
+ <-> \yes@@scale yesbjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{l}{n}{
+ <-> \yes@@scale yeslj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{l}{sl}{
+ <-> \yes@@scale yesljo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{sb}{n}{
+ <-> \yes@@scale yessj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{sb}{sl}{
+ <-> \yes@@scale yessjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{m}{sc}{
+ <-> \yes@@scale yesrj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{m}{scit}{
+ <-> \yes@@scale yesrjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{b}{sc}{
+ <-> \yes@@scale yesbj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{b}{scit}{
+ <-> \yes@@scale yesbjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{l}{sc}{
+ <-> \yes@@scale yeslj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{l}{scit}{
+ <-> \yes@@scale yesljo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{sb}{sc}{
+ <-> \yes@@scale yessj8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{sb}{scit}{
+ <-> \yes@@scale yessjo8c
+}{}
+
+\DeclareFontShape{TS1}{yesjw}{m}{it}{<->ssub * yesjw/m/sl}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{n}{<->ssub * yesjw/b/n}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{sl}{<->ssub * yesjw/b/sl}{}
+\DeclareFontShape{TS1}{yesjw}{b}{it}{<->ssub * yesjw/b/sl}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{it}{<->ssub * yesjw/b/it}{}
+\DeclareFontShape{TS1}{yesjw}{l}{it}{<->ssub * yesjw/l/sl}{}
+\DeclareFontShape{TS1}{yesjw}{sb}{it}{<->ssub * yesjw/sb/sl}{}
+\DeclareFontShape{TS1}{yesjw}{m}{si}{<->ssub * yesjw/m/scit}{}
+\DeclareFontShape{TS1}{yesjw}{m}{scsl}{<->ssub * yesjw/m/si}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{sc}{<->ssub * yesjw/b/sc}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{scit}{<->ssub * yesjw/b/scit}{}
+\DeclareFontShape{TS1}{yesjw}{b}{si}{<->ssub * yesjw/b/scit}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{si}{<->ssub * yesjw/b/si}{}
+\DeclareFontShape{TS1}{yesjw}{b}{scsl}{<->ssub * yesjw/b/si}{}
+\DeclareFontShape{TS1}{yesjw}{bx}{scsl}{<->ssub * yesjw/b/scsl}{}
+\DeclareFontShape{TS1}{yesjw}{l}{si}{<->ssub * yesjw/l/scit}{}
+\DeclareFontShape{TS1}{yesjw}{l}{scsl}{<->ssub * yesjw/l/si}{}
+\DeclareFontShape{TS1}{yesjw}{sb}{si}{<->ssub * yesjw/sb/scit}{}
+\DeclareFontShape{TS1}{yesjw}{sb}{scsl}{<->ssub * yesjw/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/electrumadf/ts1yesw.fd b/Master/texmf-dist/tex/latex/electrumadf/ts1yesw.fd
new file mode 100644
index 00000000000..4bce6e67d32
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/electrumadf/ts1yesw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yesw.fd
+%Created by: tex yes-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yesw.fd}
+ [2024/07/21 Fontinst v1.933 font definitions for TS1/yesw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yes@scale\endcsname\relax
+ \let\yes@@scale\@empty
+\else
+ \edef\yes@@scale{s*[\csname yes@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yesw}{}
+
+\DeclareFontShape{TS1}{yesw}{m}{n}{
+ <-> \yes@@scale yesr8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{m}{sl}{
+ <-> \yes@@scale yesro8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{b}{n}{
+ <-> \yes@@scale yesb8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{b}{sl}{
+ <-> \yes@@scale yesbo8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{l}{n}{
+ <-> \yes@@scale yesl8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{l}{sl}{
+ <-> \yes@@scale yeslo8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{sb}{n}{
+ <-> \yes@@scale yess8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{sb}{sl}{
+ <-> \yes@@scale yesso8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{m}{sc}{
+ <-> \yes@@scale yesr8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{m}{scit}{
+ <-> \yes@@scale yesro8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{b}{sc}{
+ <-> \yes@@scale yesb8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{b}{scit}{
+ <-> \yes@@scale yesbo8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{l}{sc}{
+ <-> \yes@@scale yesl8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{l}{scit}{
+ <-> \yes@@scale yeslo8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{sb}{sc}{
+ <-> \yes@@scale yess8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{sb}{scit}{
+ <-> \yes@@scale yesso8c
+}{}
+
+\DeclareFontShape{TS1}{yesw}{m}{it}{<->ssub * yesw/m/sl}{}
+\DeclareFontShape{TS1}{yesw}{bx}{n}{<->ssub * yesw/b/n}{}
+\DeclareFontShape{TS1}{yesw}{bx}{sl}{<->ssub * yesw/b/sl}{}
+\DeclareFontShape{TS1}{yesw}{b}{it}{<->ssub * yesw/b/sl}{}
+\DeclareFontShape{TS1}{yesw}{bx}{it}{<->ssub * yesw/b/it}{}
+\DeclareFontShape{TS1}{yesw}{l}{it}{<->ssub * yesw/l/sl}{}
+\DeclareFontShape{TS1}{yesw}{sb}{it}{<->ssub * yesw/sb/sl}{}
+\DeclareFontShape{TS1}{yesw}{m}{si}{<->ssub * yesw/m/scit}{}
+\DeclareFontShape{TS1}{yesw}{m}{scsl}{<->ssub * yesw/m/si}{}
+\DeclareFontShape{TS1}{yesw}{bx}{sc}{<->ssub * yesw/b/sc}{}
+\DeclareFontShape{TS1}{yesw}{bx}{scit}{<->ssub * yesw/b/scit}{}
+\DeclareFontShape{TS1}{yesw}{b}{si}{<->ssub * yesw/b/scit}{}
+\DeclareFontShape{TS1}{yesw}{bx}{si}{<->ssub * yesw/b/si}{}
+\DeclareFontShape{TS1}{yesw}{b}{scsl}{<->ssub * yesw/b/si}{}
+\DeclareFontShape{TS1}{yesw}{bx}{scsl}{<->ssub * yesw/b/scsl}{}
+\DeclareFontShape{TS1}{yesw}{l}{si}{<->ssub * yesw/l/scit}{}
+\DeclareFontShape{TS1}{yesw}{l}{scsl}{<->ssub * yesw/l/si}{}
+\DeclareFontShape{TS1}{yesw}{sb}{si}{<->ssub * yesw/sb/scit}{}
+\DeclareFontShape{TS1}{yesw}{sb}{scsl}{<->ssub * yesw/sb/si}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/enverb/enverb.sty b/Master/texmf-dist/tex/latex/enverb/enverb.sty
new file mode 100644
index 00000000000..bb15d3fec61
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/enverb/enverb.sty
@@ -0,0 +1,380 @@
+%%
+%% This is file `enverb.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% enverb.dtx (with options: `pkg')
+%%
+%% --------------------------------------------------------------
+%% enverb -- read an environment verbatim
+%% E-mail: jspratte@yahoo.de
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% --------------------------------------------------------------
+%%
+%% Copyright (C) 2023-2024 Jonathan P. Spratte
+%%
+%% This work may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
+%% (at your option) any later version. The latest version of this license is in
+%% the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Jonathan P. Spratte.
+%%
+%% This work consists of the files enverb.dtx
+%% enverb-doc.tex
+%% and the derived files enverb-doc.pdf
+%% enverb.sty
+%%
+\newcommand*\enverb@date{2024-08-28}
+\newcommand*\enverb@version{1.0}
+\ProvidesPackage{enverb}
+ [\enverb@date\space v\enverb@version\space read an environment verbatim]
+\providecommand\@thirdofthree[3]{#3}
+\providecommand\@firstofnine[9]{#1}
+\ExplSyntaxOn
+\cs_new_eq:NN \enverb@count \tl_count:n
+\cs_new_eq:NN \enverb@ifxTF \token_if_eq_meaning:NNTF
+\cs_new_eq:NN \enverb@chargen \char_generate:nn
+\cs_set:Npx \enverb@othercr { \char_generate:nn {13} {12} }
+\ExplSyntaxOff
+\RequirePackage{expkv-def}
+\ekvdefinekeys{enverb}
+ {
+ protect code ignore = \let\enverb@ifautoignore\@secondoftwo
+ ,also eint ignore = \enverb@ignore
+ ,boolTF auto-ignore = \enverb@ifautoignore
+ ,initial auto-ignore
+ ,eint more-ignore = \enverb@moreignore
+ ,initial more-ignore = 2
+ ,long store bol = \enverb@bol@content
+ ,long code bol+ = \enverb@add\enverb@bol@content{#1}
+ ,long code +bol = \enverb@pre\enverb@bol@content{#1}
+ ,long store eol = \enverb@eol@content
+ ,einitial eol = \enverb@othercr
+ ,long code eol+ = \enverb@add\enverb@eol@content{#1}
+ ,long code +eol = \enverb@pre\enverb@eol@content{#1}
+ ,protect code key-handler = \protected\long\def\enverb@keyhandler##1{#1}
+ ,protect code key-set = \protected\long\ekvsetdef\enverb@keyhandler{#1}
+ ,unknown code = \enverb@add\enverb@unknown@kv{, {#3} = {#2} }
+ ,unknown noval = \enverb@add\enverb@unknown@kv{, {#2} }
+ ,boolTF oarg-not-enverb = \enverb@ifoargtokeyhandler
+ }
+\protected\long\ekvsetdef\enverbsetup{enverb}
+\let\enverb@unknown@kv\@empty
+\long\def\enverb@stop#1\enverb@stop{}
+\protected\def\enverb@error{\PackageError{enverb}}
+\protected\def\enverb@misused
+ {%
+ \enverb@error
+ {Misused \string\enverb. Input already tokenised}%
+ {%
+ It seems you used the \string\enverb\space based environment
+ {\@currenvir} inside another\MessageBreak
+ macro's or a primitive's argument; that doesn't work.%
+ }%
+ }
+\protected\long\def\enverb@keyhandler#1%
+ {%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@gobbletwo
+ \fi
+ \@firstofone
+ {%
+ \enverb@error
+ {%
+ Unknown keys encountered:
+ \expanded
+ {%
+ \ekvparse
+ {\MessageBreak\@spaces\unexpanded}%
+ {\MessageBreak\@spaces\enverb@keyhandler@}%
+ {#1}%
+ }%
+ \@gobble
+ }%
+ {%
+ Perhaps you misspelled some key names? Or you forgot to set up
+ custom key\MessageBreak
+ parsing.%
+ }%
+ }%
+ }
+\long\def\enverb@keyhandler@#1{\unexpanded{#1} = \unexpanded}
+\begingroup
+\lccode`\~=`\^^M
+\catcode`\:=13
+\lccode`\:=`\ % <- space
+\catcode`\;=13
+\lccode`\;=`\^^I % <- tab
+\lowercase{\endgroup
+\def\enverb@body@space{}
+\def\enverb@body@tab{}
+\def\enverb@body@newline{\enverb@collect}
+\def\enverb@collect#1~%
+ {\enverb@ifnotend{#1}{\enverb@bol\unexpanded{#1}\enverb@eol\enverb@collect}}
+\protected\def\enverb@body@setup
+ {%
+ \let\enverbBody\@empty
+ \let\do\@makeother\dospecials
+ \endlinechar=`\^^M
+ \catcode`\^^M=13 \let~\enverb@body@newline
+ \catcode`\ =13 \let:\enverb@body@space
+ \catcode`\^^I=13 \let;\enverb@body@tab
+ \let\enverb@bol\relax
+ \let\enverb@eol\relax
+ }
+\long\def\enverb@ifxanyTF#1#2%
+ {\enverb@ifxanyTF@#1#2\enverb@ifxanyTF@}
+\long\def\enverb@ifxanyTF@#1#2%
+ {%
+ \enverb@ifxanyTF@ifdone#2\enverb@ifxanyTF@F\enverb@ifxanyTF@
+ \enverb@ifxTF#1#2\enverb@ifxanyTF@T{\enverb@ifxanyTF@#1}%
+ }
+\long\def\enverb@ifxanyTF@ifdone#1\enverb@ifxanyTF@{}
+\long\def\enverb@ifxanyTF@F
+ \enverb@ifxanyTF@\enverb@ifxTF#1\enverb@ifxanyTF@T#2#3#4%
+ {#4}
+\long\def\enverb@ifxanyTF@T#1\enverb@ifxanyTF@#2#3{#2}
+\def\enverb@search@oarg@ifx#1#2%
+ {%
+ \enverb@ifxTF#1\@let@token
+ {%
+ \ifenverb@firsteol#2\else\enverb@body@add{#1}\fi
+ \enverb@search@oarg@b
+ }%
+ }
+\protected\def\enverb@search@oarg@a
+ {%
+ \enverb@search@oarg@ifx:{}%
+ {%
+ \enverb@search@oarg@ifx;{}%
+ {%
+ \enverb@search@oarg@ifx~\enverb@firsteolfalse
+ {%
+ \enverb@ifxTF{[}\@let@token
+ {\enverb@oarg}%
+ {%
+ \enverb@ifxanyTF\@let@token
+ {%
+ \@sptoken\par\bgroup\egroup$&##^_% $
+ }
+ {%
+ \enverb@misused
+ \endgroup
+ }%
+ {%
+ \ifenverb@firsteol
+ \expandafter\enverb@body@after@begin
+ \else
+ \expandafter\enverb@body
+ \fi
+ }%
+ }%
+ }%
+ }%
+ }%
+ }
+\protected\def\enverb@body
+ {\edef\enverbBody{\iffalse}\fi\expandafter\enverb@collect\enverbBody}
+\def\enverb@body@after@oarg#1~%
+ {\enverb@ensure@blank{#1}{closing bracket}\enverb@body}
+\def\enverb@body@after@begin#1~%
+ {\enverb@ensure@blank{#1}{\string\begin}\enverb@body}
+}
+\newcommand\enverb@ensure@blank[2]
+ {%
+ \expandafter\enverb@ifempty\expanded{{#1}}{}%
+ {%
+ \expanded
+ {%
+ \noexpand\enverb@error
+ {%
+ Line after #2 not empty.\noexpand\MessageBreak
+ Contains: \detokenize\expandafter{\romannumeral`\^^@#1}%
+ }%
+ {%
+ \noexpand\enverb will try to ignore this. You should clean up
+ your input.%
+ }%
+ }%
+ }%
+ }
+\newcommand\enverb@ifempty[1]
+ {%
+ \enverb@ifempty@\enverb@ifempty@A#1\enverb@ifempty@B.\enverb@ifempty@true
+ \enverb@ifempty@A\enverb@ifempty@B
+ }
+\def\enverb@ifempty@#1\enverb@ifempty@A\enverb@ifempty@B#2#3{#3}
+\def\enverb@ifempty@true\enverb@ifempty@A\enverb@ifempty@B#1#2{#1}
+\protected\long\def\enverb@add#1#2{\edef#1{\unexpanded\expandafter{#1#2}}}
+\protected\long\def\enverb@pre#1#2%
+ {\edef#1{\unexpanded{#2}\unexpanded\expandafter{#1}}}
+\protected\def\enverb@body@add{\enverb@add\enverbBody}
+\NewDocumentCommand \enverb { s +m }
+ {%
+ \expandafter\enverb@ifnotend@setup@perhaps\expanded
+ {{\string{\@currenvir\string}}}%
+ \let\enverb@collected@oarg\@empty
+ \edef\enverb@collected@marg{\unexpanded{#2}}%
+ \begingroup
+ \enverb@body@setup
+ \IfBooleanTF{#1}%
+ {\enverb@body@after@begin}%
+ {%
+ \enverb@firsteoltrue
+ \enverb@search@oarg
+ }%
+ }
+\newif\ifenverb@firsteol
+\protected\def\enverb@search@oarg{\futurelet\@let@token\enverb@search@oarg@a}
+\protected\def\enverb@search@oarg@b{\expandafter\enverb@search@oarg\@gobble}
+\protected\def\enverb@oarg{\endgroup\enverb@oarg@}
+\NewDocumentCommand\enverb@oarg@{+O{}}
+ {%
+ \enverb@add\enverb@collected@oarg{#1}%
+ \begingroup
+ \enverb@body@setup
+ \enverb@body@after@oarg
+ }
+\newcommand\enverb@ifnotend[1]%
+ {%
+ \def\enverb@ifnotend##1%
+ {%
+ \enverb@ifnotend@
+ ##1\enverb@mark\enverb@ifnotend@maybe
+ #1\enverb@mark\@thirdofthree
+ \enverb@stop
+ }%
+ \def\enverb@ifnotend@##1#1##2\enverb@mark##3##4\enverb@stop{##3{##1}{##2}}%
+ }
+\expandafter\enverb@ifnotend\expanded{{\expandafter\@gobble\string\\end}}
+\newcommand\enverb@ifnotend@maybe[2]
+ {\expandafter\enverb@ifnotend@perhaps\expandafter{\romannumeral`\^^@#2}{#1}}
+\protected\def\enverb@ifnotend@setup@perhaps#1%
+ {%
+ \def\enverb@ifnotend@perhaps##1%
+ {%
+ \enverb@ifnotend@perhaps@\enverb@mark##1\enverb@mark\enverb@ifnotend@end
+ \enverb@mark#1\enverb@mark\@thirdofthree
+ \enverb@stop
+ }%
+ \def\enverb@ifnotend@perhaps@
+ ##1\enverb@mark#1##2\enverb@mark##3##4\enverb@stop
+ {##3{##2}}%
+ }
+\def\enverb@ifnotend@end#1#2#3%
+ {%
+ \iffalse{\fi}%
+ \enverb@ensure@blank{#1}{\string\end}%
+ \expandafter\enverb@finalise\expandafter{\enverbBody}{#2}%
+ }
+\protected\def\enverb@finalise#1#2%
+ {%
+ \endgroup
+ \expandafter\enverbsetup\expandafter{\enverb@collected@marg}%
+ \enverb@ifoargtokeyhandler
+ {%
+ \expandafter\enverb@keyhandler\expanded
+ {{%
+ \unexpanded\expandafter{\enverb@unknown@kv},%
+ \unexpanded\expandafter{\enverb@collected@oarg}%
+ }}%
+ }%
+ {%
+ \expandafter\enverbsetup\expandafter{\enverb@collected@oarg}%
+ \expandafter\enverb@keyhandler\expandafter{\enverb@unknown@kv}%
+ }%
+ \enverb@ifautoignore
+ {\enverb@setup@ignore{\enverb@count{#2}+\enverb@moreignore}}%
+ {\enverb@setup@ignore\enverb@ignore}%
+ \edef\enverb@line##1\enverb@eol
+ {%
+ \noexpand\unexpanded{##1}%
+ %\noexpand\detokenize{##1}% % TODO
+ \noexpand\unexpanded{\unexpanded\expandafter{\enverb@eol@content}}%
+ }%
+ \edef\enverbBody{#1}%
+ \expandafter\end\expandafter{\@currenvir}%
+ }
+\protected\def\enverb@setup@ignore#1%
+ {\expandafter\enverb@setup@ignore@\the\numexpr#1\relax;\enverb@line}
+\protected\def\enverb@setup@ignore@#1;#2%
+ {%
+ \ifnum#1>9
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\expandafter\enverb@setup@ignore@\the\numexpr#1-8;{\@firstofnine{#2}}}%
+ {%
+ \let\enverb@bol@gobble\@empty
+ \expanded
+ {%
+ \unexpanded{\renewcommand\enverb@bol@gobble}\ifnum#1>\z@[#1]\fi
+ {\unexpanded{#2}}%
+ \unexpanded{\def\enverb@bol##1\enverb@eol}%
+ {%
+ \noexpand\unexpanded
+ {\unexpanded\expandafter{\enverb@bol@content}}%
+ \unexpanded{\expandafter\enverb@ifempty\expanded}{{##1}}%
+ {\noexpand\enverb@line}%
+ {\noexpand\enverb@bol@gobble}%
+ ##1\noexpand\enverb@eol
+ }%
+ }%
+ }%
+ }
+\def\enverb@rmeol
+ {%
+ \ifnum\catcode`\%=14
+ \enverb@chargen{`\%}{12}%
+ \expandafter\enverb@stop
+ \fi
+ \enverb@rmeol@0;%
+ \enverb@stop
+ }
+\def\enverb@rmeol@#1;%
+ {%
+ \ifnum#1=128
+ \string\relax
+ \expandafter\enverb@stop
+ \fi
+ \@firstofone
+ {%
+ \ifnum\catcode`\%=14
+ \enverb@chargen{#1}{12}%
+ \expandafter\enverb@stop
+ \fi
+ \expandafter\enverb@rmeol@\the\numexpr#1+1;%
+ }%
+ }
+\NewDocumentCommand\enverbExecute{}
+ {%
+ \begingroup
+ \newlinechar=`\^^M
+ \expandafter
+ \endgroup
+ \scantokens\expanded
+ {{%
+ \detokenize\expandafter{\enverbBody}%
+ \enverb@rmeol
+ }}%
+ }
+\NewDocumentCommand \enverbListing { m m }
+ {%
+ \scantokens\expanded
+ {{%
+ \string\begin{#1}\detokenize{#2}\enverb@othercr
+ \detokenize\expandafter{\enverbBody}%
+ \string\end{#1}\enverb@othercr
+ \enverb@rmeol
+ }}%
+ }
+%%
+%%
+%% End of file `enverb.sty'.
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-100euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-100euro.pdf
new file mode 100644
index 00000000000..6899f2b2d37
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-100euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimple.pdf
new file mode 100644
index 00000000000..b021e90c2b0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimplebw.pdf
new file mode 100644
index 00000000000..e3777a5c9d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-100eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10cent.pdf
new file mode 100644
index 00000000000..ddeac2a07f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimple.pdf
new file mode 100644
index 00000000000..8fad414db21
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimplebw.pdf
new file mode 100644
index 00000000000..46bfac9dbcd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10euro.pdf
new file mode 100644
index 00000000000..0c67ef49821
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimple.pdf
new file mode 100644
index 00000000000..b07568d6fb1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimplebw.pdf
new file mode 100644
index 00000000000..24928b831b9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-10eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1cent.pdf
new file mode 100644
index 00000000000..bb9d01c1d49
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimple.pdf
new file mode 100644
index 00000000000..1b32b897836
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimplebw.pdf
new file mode 100644
index 00000000000..5db25de626d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1euro.pdf
new file mode 100644
index 00000000000..48f184fa19f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimple.pdf
new file mode 100644
index 00000000000..8c34a155355
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimplebw.pdf
new file mode 100644
index 00000000000..d5346534b47
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-1eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-200euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-200euro.pdf
new file mode 100644
index 00000000000..dc2c56bfb0f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-200euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimple.pdf
new file mode 100644
index 00000000000..dde3d6f2bb9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimplebw.pdf
new file mode 100644
index 00000000000..78f052bd57e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-200eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20cent.pdf
new file mode 100644
index 00000000000..28f5f255a40
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimple.pdf
new file mode 100644
index 00000000000..c101540707d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimplebw.pdf
new file mode 100644
index 00000000000..38b77e36715
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20euro.pdf
new file mode 100644
index 00000000000..2e3f409943b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimple.pdf
new file mode 100644
index 00000000000..4aadb8a293e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimplebw.pdf
new file mode 100644
index 00000000000..a855a3128cc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-20eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2cent.pdf
new file mode 100644
index 00000000000..cee0ca1ffa1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimple.pdf
new file mode 100644
index 00000000000..e68cc465607
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimplebw.pdf
new file mode 100644
index 00000000000..2857426e694
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2euro.pdf
new file mode 100644
index 00000000000..02ad7cd0e54
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimple.pdf
new file mode 100644
index 00000000000..85ee0ccdbad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimplebw.pdf
new file mode 100644
index 00000000000..bc3d2d84474
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-2eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-500euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-500euro.pdf
new file mode 100644
index 00000000000..7c2c721a4e8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-500euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimple.pdf
new file mode 100644
index 00000000000..719d51c8e70
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimplebw.pdf
new file mode 100644
index 00000000000..0d1bba9565a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-500eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50cent.pdf
new file mode 100644
index 00000000000..12d3a85bd96
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimple.pdf
new file mode 100644
index 00000000000..6fee6a828a0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimplebw.pdf
new file mode 100644
index 00000000000..65776d5d24d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50euro.pdf
new file mode 100644
index 00000000000..9d262592879
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimple.pdf
new file mode 100644
index 00000000000..08b128d03f0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimplebw.pdf
new file mode 100644
index 00000000000..dc2c5acbcf7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-50eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5cent.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5cent.pdf
new file mode 100644
index 00000000000..dfd4c98914b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5cent.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimple.pdf
new file mode 100644
index 00000000000..c8c4fa6dafa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimplebw.pdf
new file mode 100644
index 00000000000..f108cf065f6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5centsimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5euro.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5euro.pdf
new file mode 100644
index 00000000000..9fdb0301b27
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5euro.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimple.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimple.pdf
new file mode 100644
index 00000000000..5608fd30856
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimplebw.pdf b/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimplebw.pdf
new file mode 100644
index 00000000000..a670f2ac2fb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney-5eurosimplebw.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/euromoney/euromoney.sty b/Master/texmf-dist/tex/latex/euromoney/euromoney.sty
new file mode 100644
index 00000000000..b49337f4129
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euromoney/euromoney.sty
@@ -0,0 +1,549 @@
+% Author : C. Pierquet
+% licence : Released under the LaTeX Project Public License v1.3c
+% or later, see http://www.latex-project.org/lppl.txtf
+% pdf from domain public svg (user frankes in openclipart), see https://openclipart.org/artist/frankes
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{euromoney}[2024/09/07 0.1.1 Insert Euro coins and banknotes]
+
+%------History
+% 0.1.1 New filenames, according to TL rules
+% 0.1.0 Initial version
+
+%------Packages
+\RequirePackage{xstring}
+\RequirePackage{simplekv}
+\RequirePackage{graphicx}
+\RequirePackage{tikz}
+\usetikzlibrary{calc}
+\RequirePackage{listofitems}
+
+%------Lengths
+\newlength{\tmphautmonnaies}
+\setlength{\tmphautmonnaies}{1em}
+\newlength{\tmpoffsethmonnaies}
+\setlength{\tmpoffsethmonnaies}{0pt}
+\newlength{\tmpoffsetvmonnaies}
+\setlength{\tmpoffsetvmonnaies}{5mm}
+
+%------Keys [fr]
+\defKV[Monnaies]{%
+ HauteurRef=\setlength{\tmphautmonnaies}{#1},%
+ Style=\def\piecebilletstyle{#1},%
+ DecalH=\setlength{\tmpoffsethmonnaies}{#1},%
+ DecalV=\setlength{\tmpoffsetvmonnaies}{#1},%
+ Empilage=\def\piecebilletempilage{#1},%
+ Angle=\def\piecebilletrotation{#1}
+}
+
+\setKVdefault[Monnaies]{%
+ HauteurRef=2cm,%
+ Style=simple,%
+ HauteurAuto=false,%
+ DecalH=0pt,%
+ DecalV=5mm,%
+ Empilage=H,%
+ Angle=10
+}
+
+%------Keys [en]
+\defKV[Moneys]{%
+ RefHeight=\setlength{\tmphautmonnaies}{#1},%
+ Style=\def\piecebilletstyle{#1},%
+ OffsetH=\setlength{\tmpoffsethmonnaies}{#1},%
+ OffsetV=\setlength{\tmpoffsetvmonnaies}{#1},%
+ Stack=\def\piecebilletempilage{#1},%
+ Angle=\def\piecebilletrotation{#1}
+}
+
+\setKVdefault[Moneys]{%
+ RefHeight=2cm,%
+ Style=simple,%
+ AutoHeight=false,%
+ OffsetH=0pt,%
+ OffsetV=5mm,%
+ Stack=H,%
+ Angle=10
+}
+
+%-----Macros billet(s) [fr]
+\NewDocumentCommand\BilletEuro{ D<>{} O{} m }{%
+ \restoreKV[Monnaies]%
+ \setKV[Monnaies]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {nb}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ \includegraphics[#2]{euromoney-#3euro\monnaiessuffixe}%
+}
+
+\NewDocumentCommand\BilletsEuro{ O{} m }{%
+ \restoreKV[Monnaies]%
+ \setKV[Monnaies]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {nb}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ %affichage
+ \IfStrEq{\piecebilletempilage}{H}%empilage vertical
+ {%
+ \setsepchar{+}%
+ \readlist*\listetmppieces{#2}%
+ \xdef\nbempilagespieces{\listetmppieceslen}%
+ \ifdim\tmpoffsethmonnaies=0pt\relax%
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmpnbpieces{1}%
+ \xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Monnaies]{HauteurAuto}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\tmpnbpieces}{%
+ \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ \else%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmpnbpieces{1}\xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Monnaies]{HauteurAuto}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \foreach \ii in {1,...,\tmpnbpieces}{%
+ \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ }%
+ \end{tikzpicture}%
+ \fi%
+ }%
+ {}%
+ \IfStrEq{\piecebilletempilage}{eventail}%empilage eventail
+ {%
+ \setsepchar{+}%
+ \readlist*\listbilletseventail{#2}%
+ \xdef\nbeventailbillets{\listbilletseventaillen}%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\nbeventailbillets}{%
+ \itemtomacro\listbilletseventail[\i]{\tmpempilpieces}%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Monnaies]{HauteurAuto}%
+ {%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ {}%
+}
+
+%-----Macros billet(s) [en]
+\NewDocumentCommand\EuroBanknote{ D<>{} O{} m }{%
+ \restoreKV[Moneys]%
+ \setKV[Moneys]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {bw}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ \includegraphics[#2]{#3euro\monnaiessuffixe}%
+}
+
+\NewDocumentCommand\EuroBanknotes{ O{} m }{%
+ \restoreKV[Moneys]%
+ \setKV[Moneys]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {bw}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ %affichage
+ \IfStrEq{\piecebilletempilage}{H}%empilage vertical
+ {%
+ \setsepchar{+}%
+ \readlist*\listetmppieces{#2}%
+ \xdef\nbempilagespieces{\listetmppieceslen}%
+ \ifdim\tmpoffsethmonnaies=0pt\relax%
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmpnbpieces{1}%
+ \xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Moneys]{AutoHeight}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\tmpnbpieces}{%
+ \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ \else%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmpnbpieces{1}\xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Moneys]{AutoHeight}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \foreach \ii in {1,...,\tmpnbpieces}{%
+ \draw ({(\i-1)*\tmpoffsethmonnaies},{(\ii-1)*\tmpoffsetvmonnaies}) node[anchor=south west,inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ }%
+ \end{tikzpicture}%
+ \fi%
+ }%
+ {}%
+ \IfStrEq{\piecebilletempilage}{fan}%empilage eventail
+ {%
+ \setsepchar{+}%
+ \readlist*\listbilletseventail{#2}%
+ \xdef\nbeventailbillets{\listbilletseventaillen}%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\nbeventailbillets}{%
+ \itemtomacro\listbilletseventail[\i]{\tmpempilpieces}%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiessomme{500euro}}%
+ {200}{\def\monnaiessomme{200euro}}%
+ {100}{\def\monnaiessomme{100euro}}%
+ {50}{\def\monnaiessomme{50euro}}%
+ {20}{\def\monnaiessomme{20euro}}%
+ {10}{\def\monnaiessomme{10euro}}%
+ {5}{\def\monnaiessomme{5euro}}%
+ }%
+ \ifboolKV[Moneys]{AutoHeight}%
+ {%
+ \IfStrEqCase{\tmpempilpieces}{%
+ {500}{\def\monnaiesechellerelative{1}}%
+ {200}{\def\monnaiesechellerelative{1}}%
+ {100}{\def\monnaiesechellerelative{1}}%
+ {50}{\def\monnaiesechellerelative{0.9390}}%
+ {20}{\def\monnaiesechellerelative{0.8780}}%
+ {10}{\def\monnaiesechellerelative{0.8171}}%
+ {5}{\def\monnaiesechellerelative{0.7561}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ \draw ({-\i*\tmpoffsethmonnaies},{-\i*\tmpoffsetvmonnaies}) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate={\fpeval{90-0.5*\piecebilletrotation*\nbeventailbillets+(\i-1)*\piecebilletrotation}}] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ {}%
+}
+
+%-----Macro pièces [fr]
+\NewDocumentCommand\PiecesEuro{ O{} m }{%
+ \restoreKV[Monnaies]%
+ \setKV[Monnaies]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {nb}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ %boucle
+ \setsepchar{+}%
+ \readlist*\listetmppieces{#2}%
+ \xdef\nbempilagespieces{\listetmppieceslen}%
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {2}{\def\monnaiessomme{2euro}}%
+ {1}{\def\monnaiessomme{1euro}}%
+ {0.5}{\def\monnaiessomme{50cent}}%
+ {0.2}{\def\monnaiessomme{20cent}}%
+ {0.1}{\def\monnaiessomme{10cent}}%
+ {0.05}{\def\monnaiessomme{5cent}}%
+ {0.02}{\def\monnaiessomme{2cent}}%
+ {0.01}{\def\monnaiessomme{1cent}}%
+ }%
+ \ifboolKV[Monnaies]{HauteurAuto}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {2}{\def\monnaiesechellerelative{1}}%
+ {1}{\def\monnaiesechellerelative{0.9029}}%
+ {0.5}{\def\monnaiesechellerelative{0.9417}}%
+ {0.2}{\def\monnaiesechellerelative{0.8641}}%
+ {0.1}{\def\monnaiesechellerelative{0.7670}}%
+ {0.05}{\def\monnaiesechellerelative{0.8252}}%
+ {0.02}{\def\monnaiesechellerelative{0.7282}}%
+ {0.01}{\def\monnaiesechellerelative{0.6311}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ %affichage
+ \IfStrEq{\piecebilletempilage}{H}%
+ {%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ \ifnum\tmpnbpieces=1\else%
+ \foreach \i in {1,...,\inteval{\tmpnbpieces-1}}{%
+ \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}\fi%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ }%
+ \fi%
+ }%
+ {%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ }%
+ \ifnum\i<\listetmppieceslen%
+ \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}%
+ \fi%
+ \fi%
+ }%
+ {%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\tmpnbpieces}{%
+ \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ }%
+}
+
+%-----Macro pièces [en]
+\NewDocumentCommand\EuroCoins{ O{} m }{%
+ \restoreKV[Moneys]%
+ \setKV[Moneys]{#1}%
+ \IfStrEqCase{\piecebilletstyle}{%
+ {simple}{\def\monnaiessuffixe{simple}}%
+ {full}{\def\monnaiessuffixe{}}%
+ {bw}{\def\monnaiessuffixe{simplebw}}%
+ }%
+ %boucle
+ \setsepchar{+}%
+ \readlist*\listetmppieces{#2}%
+ \xdef\nbempilagespieces{\listetmppieceslen}%
+ \foreach \i in {1,...,\listetmppieceslen}{%
+ %on découpe l'empilage
+ \itemtomacro\listetmppieces[\i]{\tmpempilpieces}%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \StrCut{\tmpempilpieces}{*}{\tmpnbpieces}{\tmptypepieces}%
+ }%
+ {%
+ \xdef\tmptypepieces{\tmpempilpieces}%
+ }%
+ \IfStrEqCase{\tmptypepieces}{%
+ {2}{\def\monnaiessomme{2euro}}%
+ {1}{\def\monnaiessomme{1euro}}%
+ {0.5}{\def\monnaiessomme{50cent}}%
+ {0.2}{\def\monnaiessomme{20cent}}%
+ {0.1}{\def\monnaiessomme{10cent}}%
+ {0.05}{\def\monnaiessomme{5cent}}%
+ {0.02}{\def\monnaiessomme{2cent}}%
+ {0.01}{\def\monnaiessomme{1cent}}%
+ }%
+ \ifboolKV[Moneys]{AutoHeight}%
+ {%
+ \IfStrEqCase{\tmptypepieces}{%
+ {2}{\def\monnaiesechellerelative{1}}%
+ {1}{\def\monnaiesechellerelative{0.9029}}%
+ {0.5}{\def\monnaiesechellerelative{0.9417}}%
+ {0.2}{\def\monnaiesechellerelative{0.8641}}%
+ {0.1}{\def\monnaiesechellerelative{0.7670}}%
+ {0.05}{\def\monnaiesechellerelative{0.8252}}%
+ {0.02}{\def\monnaiesechellerelative{0.7282}}%
+ {0.01}{\def\monnaiesechellerelative{0.6311}}%
+ }%
+ }%
+ {%
+ \def\monnaiesechellerelative{1}%
+ }%
+ %affichage
+ \IfStrEq{\piecebilletempilage}{H}%
+ {%
+ \IfSubStr{\tmpempilpieces}{*}%
+ {%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ \ifnum\tmpnbpieces=1\else%
+ \foreach \i in {1,...,\inteval{\tmpnbpieces-1}}{%
+ \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}\fi%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ }%
+ \fi%
+ }%
+ {%
+ \includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}%
+ }%
+ \ifnum\i<\listetmppieceslen%
+ \ifdim\tmpoffsethmonnaies>0pt\relax\hspace*{\dimexpr\tmpoffsethmonnaies-\monnaiesechellerelative\tmphautmonnaies\relax}%
+ \fi%
+ \fi%
+ }%
+ {%
+ \begin{tikzpicture}
+ \foreach \i in {1,...,\tmpnbpieces}{%
+ \draw (0,{(\i-1)*\tmpoffsetvmonnaies}) node[inner sep=0pt] {\includegraphics[height=\dimexpr\monnaiesechellerelative\tmphautmonnaies\relax]{euromoney-\monnaiessomme\monnaiessuffixe}} ;%
+ }%
+ \end{tikzpicture}%
+ }%
+ }%
+}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/ezedits/ezedits.sty b/Master/texmf-dist/tex/latex/ezedits/ezedits.sty
new file mode 100644
index 00000000000..94a7b3bd5c5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ezedits/ezedits.sty
@@ -0,0 +1,221 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% ezedits.sty
+%% Copyright 2024 J. A. Smiga
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is J. A. Smiga.
+%
+% This work consists of the file ezedits.sty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This package was written by Joseph A. Smiga <joseph.smiga@rochester.edu>
+%% Originally developed ca. 2018, this has been refined over the years.
+%%
+%% Some useful commands: (not up to date, see documentation)
+%% Included are a set of commands to generate comments for a LaTeX file.
+%%
+%% This package requires the following standard packages:
+%% ulem: for \sout
+%% xcolor: for coloring text.
+%% pdfcomment: if pdfcomment option is used
+%%
+%% Options are:
+%% arrows: add arrows pointing to edits in margins (in captions, a pair of arrows are added, instead).
+%% accept: accept all edits (arrows still appear).
+%% pdfcomments: write edits as pdf annotations (arrows still appear).
+
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ezedits}[2024/09/12]
+
+% \RequirePackage{xcolor}
+
+\newif\if@accept\@acceptfalse % accept all comments (does not suppress package warnings)
+\newif\if@pdfcomm\@pdfcommfalse % write pdf comments
+\newif\if@showarrows\@showarrowsfalse
+\newif\if@importulem\@importulemtrue
+
+\DeclareOption{accept}{
+ \@accepttrue
+}
+\DeclareOption{pdfcomment}{ % add pdf comments
+ \@pdfcommtrue
+ \AtEndOfPackage{\RequirePackage{pdfcomment}}
+}
+\DeclareOption{arrows}{ % point to edits with arrows in the margin
+ \@showarrowstrue
+ \AtEndOfPackage{\RequirePackage{marginnote}}
+}
+\DeclareOption{nosout}{ % do not crossout deleted text
+ \@importulemfalse
+}
+
+\ProcessOptions\relax
+
+\if@importulem
+ \RequirePackage[normalem]{ulem}% import ulem (for sout)
+ % update \sout to work better with \cite
+ \let\old@cite\cite% remember original
+ \def\new@cite#1{\mbox{\old@cite{#1}}}% put cite in mbox
+ \def\new@sout#1{\let\cite\new@cite\sout{#1}\let\cite\old@cite}% redefine sout
+\else
+ \def\new@sout{}% do nothing
+\fi
+
+%% edit record
+\newcounter{ez@editcount}
+\newcounter{ez@totalcount}
+\gdef\ez@editrecord{}
+\newcommand{\ez@addeditpage}{%
+ \ifx\ez@lastpage\undefined% first edit
+ \xdef\ez@lastpage{\thepage}% initialize "last page" variable
+ % counter starts at 0, so it does not need to be updated
+ \else% 2nd+ edit
+ \if\ez@lastpage\thepage% same page as last edit
+ \relax% handled after if
+ \else% new page
+ % add record
+ \xdef\ez@editrecord{\ez@editrecord \ez@lastpage & \arabic{ez@editcount} \\}%
+ % reset counter/page number
+ \setcounter{ez@editcount}{0}%
+ \xdef\ez@lastpage{\thepage}%
+ \fi%
+ \fi%
+ % Note stepping needs to be "protected" (counters do not always like being changed, since this can mess up, e.g., TOC)
+ \protect\stepcounter{ez@editcount}% update counter
+ \protect\stepcounter{ez@totalcount}%
+}
+%TODO there is an issue with \thepage not always being accurate
+% Possible solution: use \label{} (with generated unique labels) and \pageref{} instead of \thepage.
+% -> This solution may cause out-of-order problems with floating images.
+
+\newcommand{\makeeditreport}{%
+ \begin{tabular}{l|r}
+ %\hline\hline
+ Page & \# edits/notes \\
+ \hline
+ \ifx\ez@lastpage\undefined
+ \relax% no edits
+ \else%
+ \ez@editrecord
+ \ez@lastpage & \arabic{ez@editcount}% current state
+ \fi \\
+ \hline
+ Total & \arabic{ez@totalcount}
+ %\hline\hline
+ \end{tabular}
+}
+
+% Style of \draftnote (may be a better way to write this)
+\newcommand{\@draftstyle}[1]{
+ {\ttfamily%
+ \ifx\textcolor\undefined%
+ #1%
+ \else%
+ \textcolor{red}{#1}%
+ \fi}%
+}
+% let user change the style
+\newcommand{\setnotestyle}[1]{\let\@draftstyle#1}
+
+%% Editing commands
+\newcommand{\draftnote}[1]{%
+ \PackageWarning{ezedits}{Unresolved note: #1}%
+ \ez@addeditpage{}% update record
+ \if@showarrows%
+ \@ifundefined{@captype}%
+ {\marginnote{\@draftstyle{$\Longleftarrow$}}}%
+ {\@draftstyle{$\Longrightarrow$}}%
+ \fi%
+ \if@accept{}\relax\else%
+ \if@pdfcomm%
+ \pdfmargincomment{#1}%
+ \else%
+ \@draftstyle{[#1]}%
+ \fi%
+ \fi%
+ \if@showarrows% if in caption, draw end arrow
+ \@ifundefined{@captype}{}{\@draftstyle{$\Longleftarrow$}}%
+ \fi%
+}
+
+\newcommand{\defineEdit}[3]{%
+ % "\###Edit" for removing and adding text
+ \expandafter\newcommand\csname #1Edit\endcsname[2]{%
+ \PackageWarning{ezedits}{Unresolved modifications by #1: "##1" ---> "##2"}%
+ \ez@addeditpage{}% update record
+ \if@showarrows%
+ \@ifundefined{@captype}%
+ {\marginnote{{#3{$\Longleftarrow$}}}}%
+ {{#3{$\Longrightarrow$}}}%
+ \fi%
+ \if@accept% Display as if accepted
+ ##2%
+ \else%
+ \if@pdfcomm%
+ \pdfmarkupcomment[author=#1,markup=StrikeOut]{##1{$_\wedge$}}{##2}%
+ \else%
+ {#2{\new@sout{##1}}}{#3{##2}}%
+ \fi%
+ \fi%
+ \if@showarrows% if in caption, draw end arrow
+ \@ifundefined{@captype}{}{{#3{$\Longleftarrow$}}}%
+ \fi%
+ }%
+ % "\###Ins" for adding text
+ \expandafter\newcommand\csname #1Ins\endcsname[1]{%
+ \ez@addeditpage{}% update record
+ \PackageWarning{ezedits}{Unresolved modifications by #1: "##1" inserted.}%
+ \if@showarrows%
+ \@ifundefined{@captype}%
+ {\marginnote{{#3{$\Longleftarrow$}}}}%
+ {{#3{$\Longrightarrow$}}}%
+ \fi%
+ \if@accept% Display as if accepted
+ ##1%
+ \else%
+ \if@pdfcomm%
+ % \pdfcomment[author=#1,icon=Insert]{##1}%
+ \pdfmarkupcomment[author=#1,markup=Underline]{$_\wedge$}{##1}%
+ \else%
+ {#3{##1}}%
+ \fi%
+ \fi%
+ \if@showarrows% if in caption, draw end arrow
+ \@ifundefined{@captype}{}{{#3{$\Longleftarrow$}}}%
+ \fi%
+ }%
+ % "\###Del" for removing text
+ \expandafter\newcommand\csname #1Del\endcsname[1]{%
+ \PackageWarning{ezedits}{Unresolved modifications by #1: "##1" removed.}%
+ \ez@addeditpage{}% update record
+ \if@showarrows%
+ \@ifundefined{@captype}%
+ {\marginnote{{#3{$\Longleftarrow$}}}}%
+ {{#3{$\Longrightarrow$}}}%
+ \fi%
+ \if@accept% Display as if accepted
+ {}%
+ \else%
+ \if@pdfcomm%
+ \pdfmarkupcomment[author=#1,markup=StrikeOut,color=red]{##1}{}%
+ \else%
+ {#2{\new@sout{##1}}}%
+ \fi%
+ \fi%
+ \if@showarrows% if in caption, draw end arrow
+ \@ifundefined{@captype}{}{{#3{$\Longleftarrow$}}}%
+ \fi%
+ }%
+}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
index f5b00b73e6c..0684f24160c 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-UKenglish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
index 70c269f6d33..44adcd24081 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-USenglish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
index 7b42aac4fe4..7110cffe419 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-american.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def
index 5f0706a0885..160168c5b82 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-brazilian.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
index 7aaaa6afa0a..8cd55dce78a 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-british.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def b/Master/texmf-dist/tex/latex/fmtcount/fc-dutch.def
index ee86d49a48c..78560f50401 100644
--- a/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-dutch.def
@@ -1,25 +1,57 @@
-%% fc-dutch.def
-%% Copyright 2024 E. Nijenhuis
-%
-% 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 E. Nijenhuis.
-%
-% This work consists of the files regulatory.tex,
-% regulatory-preamble.tex, regulatory-nl.tex, regulatory-en.tex,
-% example1.bib, example2.bib,
-% example1-nl.tex, example2-nl.tex,
-% example1-en.tex, example2-en.tex,
-% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+%%
+%% This is file `fc-dutch.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fmtcount.dtx (with options: `fc-dutch.def,package')
+%%
+%% fmtcount.dtx
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
+%%
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%%
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%\subsection{Prefixes}
+%%\label{sec:latin-prefixes}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstring}]
+%%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options}
+%%\end{definition}
+%%
+%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}]
+%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options}
+%%\end{definition}
+%% Local Variables:
+%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
+%% End:
\ProvidesFCLanguage{dutch}[2024/01/27]%
\newcommand{\@ordinalMdutch}[2]{\edef#2{\number#1\relax.}}%
\global\let\@ordinalMdutch\@ordinalMdutch
@@ -28,7 +60,7 @@
\newcommand*\@@unitstringdutch[1]{%
\ifcase#1%
nul%
- \or een%
+ \or een% één and \'e\'en not working atm
\or twee%
\or drie%
\or vier%
@@ -117,7 +149,7 @@
\def#2{null}%
\else
\ifnum\@strctr=1\relax
- \appto#2{een}%
+ \appto#2{een}% één and \'e\'en not working atm
\else
\@@numberunderhundreddutch{\@strctr}{#2}%
\fi
@@ -129,7 +161,6 @@
\let\@teenstring=\@@teenstringdutch%
\let\@tenstring=\@@tenstringdutch%
\def\@hundred{honderd}\def\@thousand{duizend}%
- \def\@andname{en}%
\@@numberstringdutch{#1}{#2}%
}%
\global\let\@numberstringMdutch\@numberstringMdutch
@@ -145,7 +176,7 @@
\newcommand*\@@unitthstringdutch[1]{%
\ifcase#1%
nulde%
- \or eerste%
+ \or eerste% éérste and \'e\'erste not working atm
\or tweede%
\or derde%
\or vierde%
@@ -269,7 +300,6 @@
\global\let\@ordinalstringNdutch=\@ordinalstringMdutch
\newcommand*{\@OrdinalstringMdutch}[2]{%
\@ordinalstringMdutch{#1}{\@@num@str}%
- \def\@andname{en}%
\def\@hundred{Honderd}\def\@thousand{Duizend}%
\def\@hundredth{Honderdste}\def\@thousandth{Duizendste}%
\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
@@ -290,7 +320,11 @@
\else
\ifnum\@tmpstrctr=0\relax
\else
- \eappto#2{\@unitstring{\@tmpstrctr}en}%
+ \ifnum\@tmpstrctr=2\relax\def\@andname{ën}%
+ \else\ifnum\@tmpstrctr=3\relax\def\@andname{ën}%
+ \else\def\@andname{en}%
+ \fi\fi%
+ \eappto#2{\@unitstring{\@tmpstrctr}\@andname}%
\fi
\@tmpstrctr=#1\relax
\divide\@tmpstrctr by 10\relax
@@ -310,7 +344,11 @@
\else
\ifnum\@tmpstrctr=0\relax
\else
- \eappto#2{\@unitstring{\@tmpstrctr}-en-}%
+ \ifnum\@tmpstrctr=2\relax\def\@andname{ën}%
+ \else\ifnum\@tmpstrctr=3\relax\def\@andname{ën}%
+ \else\def\@andname{en}%
+ \fi\fi%
+ \eappto#2{\@unitstring{\@tmpstrctr}\@andname}%
\fi
\@tmpstrctr=#1\relax
\divide\@tmpstrctr by 10\relax
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
index d6bd6a80a4f..cfd2c710e83 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-english.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
index 2e0cbb2eb8b..e7ade01d59d 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-francais.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
index 3247cd15851..ea963b6b57a 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-french.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -52,7 +52,7 @@
%% coding: utf-8
%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
-\ProvidesFCLanguage{french}[2020/02/24]%
+\ProvidesFCLanguage{french}[2017/06/15]%
\ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command
\protect\fc@gl@let\space already defined.}}
\ifcsundef{fc@gl@def}{\global\let\fc@gl@def\def}{\PackageError{fmtcount}{Command already defined}{Command
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
index 3eb9c340033..7f10f3a1aac 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-frenchb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
index 3a44772de68..e0fa469a7df 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-german.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -72,7 +72,7 @@
\or zwei%
\or drei%
\or vier%
- \or f\"unf%
+ \or fünf%
\or sechs%
\or sieben%
\or acht%
@@ -84,9 +84,9 @@
\ifcase#1%
\or zehn%
\or zwanzig%
- \or drei{\ss}ig%
+ \or dreißig%
\or vierzig%
- \or f\"unfzig%
+ \or fünfzig%
\or sechzig%
\or siebzig%
\or achtzig%
@@ -103,10 +103,10 @@
\ifcase#1%
zehn%
\or elf%
- \or zw\"olf%
+ \or zwölf%
\or dreizehn%
\or vierzehn%
- \or f\"unfzehn%
+ \or fünfzehn%
\or sechzehn%
\or siebzehn%
\or achtzehn%
@@ -188,7 +188,7 @@
\or zweiter%
\or dritter%
\or vierter%
- \or f\"unfter%
+ \or fünfter%
\or sechster%
\or siebter%
\or achter%
@@ -200,9 +200,9 @@
\ifcase#1%
\or zehnter%
\or zwanzigster%
- \or drei{\ss}igster%
+ \or dreißigster%
\or vierzigster%
- \or f\"unfzigster%
+ \or fünfzigster%
\or sechzigster%
\or siebzigster%
\or achtzigster%
@@ -214,10 +214,10 @@
\ifcase#1%
zehnter%
\or elfter%
- \or zw\"olfter%
+ \or zwölfter%
\or dreizehnter%
\or vierzehnter%
- \or f\"unfzehnter%
+ \or fünfzehnter%
\or sechzehnter%
\or siebzehnter%
\or achtzehnter%
@@ -232,7 +232,7 @@
\or zweite%
\or dritte%
\or vierte%
- \or f\"unfte%
+ \or fünfte%
\or sechste%
\or siebte%
\or achte%
@@ -244,9 +244,9 @@
\ifcase#1%
\or zehnte%
\or zwanzigste%
- \or drei{\ss}igste%
+ \or dreißigste%
\or vierzigste%
- \or f\"unfzigste%
+ \or fünfzigste%
\or sechzigste%
\or siebzigste%
\or achtzigste%
@@ -258,10 +258,10 @@
\ifcase#1%
zehnte%
\or elfte%
- \or zw\"olfte%
+ \or zwölfte%
\or dreizehnte%
\or vierzehnte%
- \or f\"unfzehnte%
+ \or fünfzehnte%
\or sechzehnte%
\or siebzehnte%
\or achtzehnte%
@@ -276,7 +276,7 @@
\or zweites%
\or drittes%
\or viertes%
- \or f\"unftes%
+ \or fünftes%
\or sechstes%
\or siebtes%
\or achtes%
@@ -288,9 +288,9 @@
\ifcase#1%
\or zehntes%
\or zwanzigstes%
- \or drei{\ss}igstes%
+ \or dreißigstes%
\or vierzigstes%
- \or f\"unfzigstes%
+ \or fünfzigstes%
\or sechzigstes%
\or siebzigstes%
\or achtzigstes%
@@ -302,10 +302,10 @@
\ifcase#1%
zehntes%
\or elftes%
- \or zw\"olftes%
+ \or zwölftes%
\or dreizehntes%
\or vierzehntes%
- \or f\"unfzehntes%
+ \or fünfzehntes%
\or sechzehntes%
\or siebzehntes%
\or achtzehntes%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
index 45a5602b3a1..9d3c339e61d 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-germanb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
index 16fe43e5eac..1b43776faf4 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-italian.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -57,42 +57,79 @@
\RequirePackage{itnumpar}
\newcommand{\@numberstringMitalian}[2]{%
- \edef#2{\noexpand\printnumeroinparole{#1}}%
+ \begingroup
+ \def\np@oa{o}%
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@numberstringMitalian\@numberstringMitalian
\newcommand{\@numberstringFitalian}[2]{%
- \edef#2{\noexpand\printnumeroinparole{#1}}}
+ \begingroup
+ \def\np@oa{a}%
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
+}
\global\let\@numberstringFitalian\@numberstringFitalian
\newcommand{\@NumberstringMitalian}[2]{%
- \edef#2{\noexpand\printNumeroinparole{#1}}%
+ \begingroup
+ \def\np@oa{o}%
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@NumberstringMitalian\@NumberstringMitalian
\newcommand{\@NumberstringFitalian}[2]{%
- \edef#2{\noexpand\printNumeroinparole{#1}}%
+ \begingroup
+ \def\np@oa{a}%
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@NumberstringFitalian\@NumberstringFitalian
\newcommand{\@ordinalstringMitalian}[2]{%
- \edef#2{\noexpand\printordinalem{#1}}%
+ \begingroup
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@ordinalem{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@ordinalstringMitalian\@ordinalstringMitalian
\newcommand{\@ordinalstringFitalian}[2]{%
- \edef#2{\noexpand\printordinalef{#1}}%
+ \begingroup
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@ordinalef{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@ordinalstringFitalian\@ordinalstringFitalian
\newcommand{\@OrdinalstringMitalian}[2]{%
- \edef#2{\noexpand\printOrdinalem{#1}}%
+ \begingroup
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@Ordinalem{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@OrdinalstringMitalian\@OrdinalstringMitalian
\newcommand{\@OrdinalstringFitalian}[2]{%
- \edef#2{\noexpand\printOrdinalef{#1}}%
+ \begingroup
+ \count@=#1
+ \edef\@tempa{\def\noexpand#2{\@Ordinalef{\count@}}}%
+ \expandafter
+ \endgroup\@tempa
}
\global\let\@OrdinalstringFitalian\@OrdinalstringFitalian
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
index 27a65543963..a25ce620709 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngerman.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
index c6797d56884..dc2048c7960 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngermanb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
index 0a5e7fa968b..ec3bc746268 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuges.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
index 480bf186075..864bf58ad2c 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuguese.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
index 4ac3cf1f359..78887dd24d8 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-spanish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -115,7 +115,7 @@
\or trece%
\or catorce%
\or quince%
- \or diecis\'eis%
+ \or dieciséis%
\or diecisiete%
\or dieciocho%
\or diecinueve%
@@ -126,11 +126,11 @@
\ifcase#1\relax
veinte%
\or veintiuno%
- \or veintid\'os%
- \or veintitr\'es%
+ \or veintidós%
+ \or veintitrés%
\or veinticuatro%
\or veinticinco%
- \or veintis\'eis%
+ \or veintiséis%
\or veintisiete%
\or veintiocho%
\or veintinueve%
@@ -141,11 +141,11 @@
\ifcase#1\relax
veinte%
\or veintiuna%
- \or veintid\'os%
- \or veintitr\'es%
+ \or veintidós%
+ \or veintitrés%
\or veinticuatro%
\or veinticinco%
- \or veintis\'eis%
+ \or veintiséis%
\or veintisiete%
\or veintiocho%
\or veintinueve%
@@ -233,7 +233,7 @@
\or Trece%
\or Catorce%
\or Quince%
- \or Diecis\'eis%
+ \or Dieciséis%
\or Diecisiete%
\or Dieciocho%
\or Diecinueve%
@@ -244,11 +244,11 @@
\ifcase#1\relax
Veinte%
\or Veintiuno%
- \or Veintid\'os%
- \or Veintitr\'es%
+ \or Veintidós%
+ \or Veintitrés%
\or Veinticuatro%
\or Veinticinco%
- \or Veintis\'eis%
+ \or Veintiséis%
\or Veintisiete%
\or Veintiocho%
\or Veintinueve%
@@ -259,11 +259,11 @@
\ifcase#1\relax
Veinte%
\or Veintiuna%
- \or Veintid\'os%
- \or Veintitr\'es%
+ \or Veintidós%
+ \or Veintitrés%
\or Veinticuatro%
\or Veinticinco%
- \or Veintis\'eis%
+ \or Veintiséis%
\or Veintisiete%
\or Veintiocho%
\or Veintinueve%
@@ -350,7 +350,7 @@
\let\@teenthstring=\@@teenthstringspanish
\let\@tenthstring=\@@tenthstringspanish
\let\@hundredthstring=\@@hundredthstringspanish
- \def\@thousandth{mil\'esimo}%
+ \def\@thousandth{milésimo}%
\@@ordinalstringspanish{#1}{#2}%
}%
\global\let\@ordinalstringMspanish\@ordinalstringMspanish
@@ -360,7 +360,7 @@
\let\@teenthstring=\@@teenthstringFspanish
\let\@tenthstring=\@@tenthstringFspanish
\let\@hundredthstring=\@@hundredthstringFspanish
- \def\@thousandth{mil\'esima}%
+ \def\@thousandth{milésima}%
\@@ordinalstringspanish{#1}{#2}%
}%
\global\let\@ordinalstringFspanish\@ordinalstringFspanish
@@ -371,7 +371,7 @@
\let\@teenthstring=\@@Teenthstringspanish
\let\@tenthstring=\@@Tenthstringspanish
\let\@hundredthstring=\@@Hundredthstringspanish
- \def\@thousandth{Mil\'esimo}%
+ \def\@thousandth{Milésimo}%
\@@ordinalstringspanish{#1}{#2}%
}
\global\let\@OrdinalstringMspanish\@OrdinalstringMspanish
@@ -381,7 +381,7 @@
\let\@teenthstring=\@@TeenthstringFspanish
\let\@tenthstring=\@@TenthstringFspanish
\let\@hundredthstring=\@@HundredthstringFspanish
- \def\@thousandth{Mil\'esima}%
+ \def\@thousandth{Milésima}%
\@@ordinalstringspanish{#1}{#2}%
}%
\global\let\@OrdinalstringFspanish\@OrdinalstringFspanish
@@ -395,7 +395,7 @@
\or cuarto%
\or quinto%
\or sexto%
- \or s\'eptimo%
+ \or séptimo%
\or octavo%
\or noveno%
\fi
@@ -403,28 +403,28 @@
\global\let\@@unitthstringspanish\@@unitthstringspanish
\newcommand*\@@tenthstringspanish[1]{%
\ifcase#1\relax
- \or d\'ecimo%
- \or vig\'esimo%
- \or trig\'esimo%
- \or cuadrag\'esimo%
- \or quincuag\'esimo%
- \or sexag\'esimo%
- \or septuag\'esimo%
- \or octog\'esimo%
- \or nonag\'esimo%
+ \or décimo%
+ \or vigésimo%
+ \or trigésimo%
+ \or cuadragésimo%
+ \or quincuagésimo%
+ \or sexagésimo%
+ \or septuagésimo%
+ \or octogésimo%
+ \or nonagésimo%
\fi
}%
\global\let\@@tenthstringspanish\@@tenthstringspanish
\newcommand*\@@teenthstringspanish[1]{%
\ifcase#1\relax
- d\'ecimo%
- \or und\'ecimo%
- \or duod\'ecimo%
+ décimo%
+ \or undécimo%
+ \or duodécimo%
\or decimotercero%
\or decimocuarto%
\or decimoquinto%
\or decimosexto%
- \or decimos\'eptimo%
+ \or decimoséptimo%
\or decimoctavo%
\or decimonoveno%
\fi
@@ -432,15 +432,15 @@
\global\let\@@teenthstringspanish\@@teenthstringspanish
\newcommand*\@@hundredthstringspanish[1]{%
\ifcase#1\relax
- \or cent\'esimo%
- \or ducent\'esimo%
- \or tricent\'esimo%
- \or cuadringent\'esimo%
- \or quingent\'esimo%
- \or sexcent\'esimo%
- \or septing\'esimo%
- \or octingent\'esimo%
- \or noningent\'esimo%
+ \or centésimo%
+ \or ducentésimo%
+ \or tricentésimo%
+ \or cuadringentésimo%
+ \or quingentésimo%
+ \or sexcentésimo%
+ \or septingésimo%
+ \or octingentésimo%
+ \or noningentésimo%
\fi
}%
\global\let\@@hundredthstringspanish\@@hundredthstringspanish
@@ -453,7 +453,7 @@
\or cuarta%
\or quinta%
\or sexta%
- \or s\'eptima%
+ \or séptima%
\or octava%
\or novena%
\fi
@@ -461,28 +461,28 @@
\global\let\@@unitthstringFspanish\@@unitthstringFspanish
\newcommand*\@@tenthstringFspanish[1]{%
\ifcase#1\relax
- \or d\'ecima%
- \or vig\'esima%
- \or trig\'esima%
- \or cuadrag\'esima%
- \or quincuag\'esima%
- \or sexag\'esima%
- \or septuag\'esima%
- \or octog\'esima%
- \or nonag\'esima%
+ \or décima%
+ \or vigésima%
+ \or trigésima%
+ \or cuadragésima%
+ \or quincuagésima%
+ \or sexagésima%
+ \or septuagésima%
+ \or octogésima%
+ \or nonagésima%
\fi
}%
\global\let\@@tenthstringFspanish\@@tenthstringFspanish
\newcommand*\@@teenthstringFspanish[1]{%
\ifcase#1\relax
- d\'ecima%
- \or und\'ecima%
- \or duod\'ecima%
+ décima%
+ \or undécima%
+ \or duodécima%
\or decimotercera%
\or decimocuarta%
\or decimoquinta%
\or decimosexta%
- \or decimos\'eptima%
+ \or decimoséptima%
\or decimoctava%
\or decimonovena%
\fi
@@ -490,15 +490,15 @@
\global\let\@@teenthstringFspanish\@@teenthstringFspanish
\newcommand*\@@hundredthstringFspanish[1]{%
\ifcase#1\relax
- \or cent\'esima%
- \or ducent\'esima%
- \or tricent\'esima%
- \or cuadringent\'esima%
- \or quingent\'esima%
- \or sexcent\'esima%
- \or septing\'esima%
- \or octingent\'esima%
- \or noningent\'esima%
+ \or centésima%
+ \or ducentésima%
+ \or tricentésima%
+ \or cuadringentésima%
+ \or quingentésima%
+ \or sexcentésima%
+ \or septingésima%
+ \or octingentésima%
+ \or noningentésima%
\fi
}%
\global\let\@@hundredthstringFspanish\@@hundredthstringFspanish
@@ -511,7 +511,7 @@
\or Cuarto%
\or Quinto%
\or Sexto%
- \or S\'eptimo%
+ \or Séptimo%
\or Octavo%
\or Noveno%
\fi
@@ -519,28 +519,28 @@
\global\let\@@Unitthstringspanish\@@Unitthstringspanish
\newcommand*\@@Tenthstringspanish[1]{%
\ifcase#1\relax
- \or D\'ecimo%
- \or Vig\'esimo%
- \or Trig\'esimo%
- \or Cuadrag\'esimo%
- \or Quincuag\'esimo%
- \or Sexag\'esimo%
- \or Septuag\'esimo%
- \or Octog\'esimo%
- \or Nonag\'esimo%
+ \or Décimo%
+ \or Vigésimo%
+ \or Trigésimo%
+ \or Cuadragésimo%
+ \or Quincuagésimo%
+ \or Sexagésimo%
+ \or Septuagésimo%
+ \or Octogésimo%
+ \or Nonagésimo%
\fi
}%
\global\let\@@Tenthstringspanish\@@Tenthstringspanish
\newcommand*\@@Teenthstringspanish[1]{%
\ifcase#1\relax
- D\'ecimo%
- \or Und\'ecimo%
- \or Duod\'ecimo%
+ Décimo%
+ \or Undécimo%
+ \or Duodécimo%
\or Decimotercero%
\or Decimocuarto%
\or Decimoquinto%
\or Decimosexto%
- \or Decimos\'eptimo%
+ \or Decimoséptimo%
\or Decimoctavo%
\or Decimonoveno%
\fi
@@ -548,15 +548,15 @@
\global\let\@@Teenthstringspanish\@@Teenthstringspanish
\newcommand*\@@Hundredthstringspanish[1]{%
\ifcase#1\relax
- \or Cent\'esimo%
- \or Ducent\'esimo%
- \or Tricent\'esimo%
- \or Cuadringent\'esimo%
- \or Quingent\'esimo%
- \or Sexcent\'esimo%
- \or Septing\'esimo%
- \or Octingent\'esimo%
- \or Noningent\'esimo%
+ \or Centésimo%
+ \or Ducentésimo%
+ \or Tricentésimo%
+ \or Cuadringentésimo%
+ \or Quingentésimo%
+ \or Sexcentésimo%
+ \or Septingésimo%
+ \or Octingentésimo%
+ \or Noningentésimo%
\fi
}%
\global\let\@@Hundredthstringspanish\@@Hundredthstringspanish
@@ -569,7 +569,7 @@
\or Cuarta%
\or Quinta%
\or Sexta%
- \or S\'eptima%
+ \or Séptima%
\or Octava%
\or Novena%
\fi
@@ -577,28 +577,28 @@
\global\let\@@UnitthstringFspanish\@@UnitthstringFspanish
\newcommand*\@@TenthstringFspanish[1]{%
\ifcase#1\relax
- \or D\'ecima%
- \or Vig\'esima%
- \or Trig\'esima%
- \or Cuadrag\'esima%
- \or Quincuag\'esima%
- \or Sexag\'esima%
- \or Septuag\'esima%
- \or Octog\'esima%
- \or Nonag\'esima%
+ \or Décima%
+ \or Vigésima%
+ \or Trigésima%
+ \or Cuadragésima%
+ \or Quincuagésima%
+ \or Sexagésima%
+ \or Septuagésima%
+ \or Octogésima%
+ \or Nonagésima%
\fi
}%
\global\let\@@TenthstringFspanish\@@TenthstringFspanish
\newcommand*\@@TeenthstringFspanish[1]{%
\ifcase#1\relax
- D\'ecima%
- \or Und\'ecima%
- \or Duod\'ecima%
+ Décima%
+ \or Undécima%
+ \or Duodécima%
\or Decimotercera%
\or Decimocuarta%
\or Decimoquinta%
\or Decimosexta%
- \or Decimos\'eptima%
+ \or Decimoséptima%
\or Decimoctava%
\or Decimonovena%
\fi
@@ -606,15 +606,15 @@
\global\let\@@TeenthstringFspanish\@@TeenthstringFspanish
\newcommand*\@@HundredthstringFspanish[1]{%
\ifcase#1\relax
- \or Cent\'esima%
- \or Ducent\'esima%
- \or Tricent\'esima%
- \or Cuadringent\'esima%
- \or Quingent\'esima%
- \or Sexcent\'esima%
- \or Septing\'esima%
- \or Octingent\'esima%
- \or Noningent\'esima%
+ \or Centésima%
+ \or Ducentésima%
+ \or Tricentésima%
+ \or Cuadringentésima%
+ \or Quingentésima%
+ \or Sexcentésima%
+ \or Septingésima%
+ \or Octingentésima%
+ \or Noningentésima%
\fi
}%
\global\let\@@HundredthstringFspanish\@@HundredthstringFspanish
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
index f18155fb4c5..654a74c1ec7 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcnumparser.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
index 880e570cb76..1685bcfa21e 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcprefix.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
index c60688b1004..4d43137dcae 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fmtcount.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2020 Nicola Talbot and Vincent Belache
+%% Copyright 2024 Nicola Talbot and Vincent Belaïche
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,9 +19,9 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache.
+%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche.
%%
-%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
+%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty.
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -54,7 +54,7 @@
%% End:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2020/01/30 v3.07]
+\ProvidesPackage{fmtcount}[2024/08/31 v3.08]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
@@ -119,7 +119,8 @@ german,%
germanb,%
ngerman,%
ngermanb,%
-italian}
+italian,%
+dutch}
\newcommand*\fc@iterate@on@languages[1]{%
\ifx\fc@supported@language@list\@empty
\PackageError{fmtcount}{Macro `\protect\@fc@iterate@on@languages' is empty}{You should never get here:
@@ -937,7 +938,7 @@ italian}
\protect\@numberstringM{#1}{\@fc@numstr}%
}%
}%
- \MakeUppercase{\@fc@numstr}%
+ \protect\MakeUppercase{\@fc@numstr}%
}%
}
\providecommand*{\binary}[1]{%
diff --git a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
index 70bfae6026c..01c9c8e8e42 100644
--- a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
+++ b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
@@ -8,8 +8,8 @@
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplPackage
{fontscale}
- {2024-08-12}
- {2.1.0}
+ {2024-09-10}
+ {2.4.0}
{A flexible interface for setting font sizes}
% l3kernel version 2023-10-10 added many 'e'-variants.
@@ -116,40 +116,45 @@
\fp_new:N \l__fontscale_musical_notes_fp
% Scratch variables
-\tl_new:N \l__fontscale_tmp_tl
-\str_new:N \l__fontscale_tmp_str
-\dim_new:N \l__fontscale_tmp_dim
-\fp_new:N \l__fontscale_tmp_fp
+\tl_new:N \l__fontscale_tmp_tl
+\str_new:N \l__fontscale_tmp_str
+\dim_new:N \l__fontscale_tmp_dim
+\skip_new:N \l__fontscale_tmp_skip
+\fp_new:N \l__fontscale_tmp_fp
-% SOME HELPER FUNCTIONS
+% SOME FUNCTIONS
+% Variants of l3kernel functions
+\cs_generate_variant:Nn \msg_error:nnnn { nnv , nne }
% Sets a dimen/skip variable from a dimen/skip expression, appending a default
-% unit of pt.
+% unit of pt. This also removes extra tokens.
\cs_new_protected:Npn \__fontscale_dim_set_default_pt:Nn #1#2
- { \@defaultunits #1 = \dimexpr #2 pt \relax \relax \@nnil }
+ {
+ \afterassignment \use_none_delimit_by_q_stop:w
+ #1 = \dimexpr #2 pt \relax \relax
+ \q_stop
+ }
\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 }
+ {
+ \afterassignment \use_none_delimit_by_q_stop:w
+ #1 = \glueexpr #2 pt \relax
+ \q_stop
+ }
\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.
+% Used to define \tiny to \Huge. Sets \@currsize only for compatibility. Need
+% \dim_use:N only 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
- }
+ \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.
+% (3) Issues a user-friendly error message if the font size is not a positive
+% length.
\dim_new:N \l__fontscale_fontsize_dim
\skip_new:N \l__fontscale_fontsize_skip
\cs_new_protected:Npn \__fontscale_fontsize:nn #1#2
@@ -158,15 +163,13 @@
\__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 <
+ \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip
+ \selectfont
+ }
+ {
+ \msg_error:nnV { fontscale } { font-size-out-of-bounds }
\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.
@@ -185,116 +188,72 @@
}
\selectfont
}
- { \msg_error:nn { fontscale } { font-size-out-of-bounds } }
+ {
+ \msg_error:nnV { fontscale } { font-size-out-of-bounds }
+ \l__fontscale_fontsize_dim
+ }
}
% MESSAGES
-\msg_new:nnn { fontscale } { key-baselineskip-size-ratio-out-of-bounds }
- {
- The~ value~ of~ the~ key~ 'baselineskip-size-ratio'~
- \msg_line_context: \c_space_tl
- must~ be~ at~ least~ 1.
- }
\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds }
{
+ Invalid~ value~ '#1'~ \msg_line_context:. \\
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 }
{
+ Invalid~ value~ '#1'~ \msg_line_context:. \\
The~ value~ of~ the~ key~ 'musical / ratio'~
- \msg_line_context: \c_space_tl
must~ be~ greater~ than~ 1.
}
\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds }
{
+ Invalid~ value~ '#1'~ \msg_line_context:. \\
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-out-of-bounds }
{
- The~ value~ of~ the~ key~ '#1 / scale'~
- \msg_line_context: \c_space_tl
+ Invalid~ value~ '#1'~ \msg_line_context:. \\
+ The~ value~ of~ the~ key~ '#2 / scale'~
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
+ Invalid~ value~ '#1'~ \msg_line_context:. \\
+ The~ value~ of~ the~ key~ '#2 / size'~
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'.
+ has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:.
}
\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~ 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~ lengths~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~
- '\iow_char:N \\tiny'~ to~ '\iow_char:N \\Huge'.
+ The~ font~ sizes~ are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\
+ The~ lengths~ of~ the~ font~ sizes~
+ 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.
- }
+ { '#1'~ does~ nothing~ if~ used~ in~ math~ mode~ \msg_line_context:. }
\msg_new:nnn { fontscale } { math-mode-error }
- {
- '#1'~
- \msg_line_context: \c_space_tl
- cannot~ be~ used~ in~ math~ mode.
- }
+ { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. }
\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.
- }
+ { The~ font~ size~ '#1'~ must~ be~ a~ positive~ length~ \msg_line_context:. }
\msg_new:nnn { fontscale } { font-step-out-of-bounds }
{
- The~ font~ step~
- \msg_line_context: \c_space_tl
- must~ equal~ an~ integer~ from~ -4~ to~ 5,~
- unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'.~
- \msg_see_documentation_text:n { fontscale }
+ Invalid~ font~ step~ '#1'~ \msg_line_context:. \\
+ The~ font~ step~ 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.~
- \msg_see_documentation_text:n { fontscale }
+ '\iow_char:N \\SetFontStep*'~ could~ not~ calculate~ the~ new~ font~ step~
+ because~ the~ current~ font~ step~ is~ undefined~ \msg_line_context:.
}
% DEFINE KEYS
@@ -349,6 +308,14 @@
, notes .int_set:N = \l__fontscale_musical_notes_int
, notes .value_required:n = true
}
+\keys_define:nn { fontscale / normalsize }
+ {
+ size .tl_set:N = \l__fontscale_normalsize_size_tl
+ , size .value_required:n = true
+
+ , baselineskip .tl_set:N = \l__fontscale_normalsize_baselineskip_tl
+ , baselineskip .value_required:n = true
+ }
\keys_define:nn { fontscale / tiny }
{
scale .tl_set:N = \l__fontscale_tiny_scale_tl
@@ -393,14 +360,6 @@
, baselineskip .tl_set:N = \l__fontscale_small_baselineskip_tl
, baselineskip .value_required:n = true
}
-\keys_define:nn { fontscale / normalsize }
- {
- size .tl_set:N = \l__fontscale_normalsize_size_tl
- , size .value_required:n = true
-
- , baselineskip .tl_set:N = \l__fontscale_normalsize_baselineskip_tl
- , baselineskip .value_required:n = true
- }
\keys_define:nn { fontscale / large }
{
scale .tl_set:N = \l__fontscale_large_scale_tl
@@ -492,7 +451,8 @@
% 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.
+% their initial values. This is significantly faster than using .initial:n and
+% \keys_precompile:nnN.
\cs_new_protected:Npn \__fontscale_keys_set_initial:
{
\fp_set:Nn \l__fontscale_baselineskip_size_ratio_fp { 1.2 }
@@ -501,37 +461,41 @@
\fp_set:Nn \l__fontscale_musical_ratio_fp { 2 }
\int_set:Nn \l__fontscale_musical_notes_int { 5 }
- \tl_set:Nn \l__fontscale_tiny_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_scriptsize_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_footnotesize_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_small_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_large_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Large_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_LARGE_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_huge_scale_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Huge_scale_tl { \q_no_value }
-
- \tl_set:Nn \l__fontscale_tiny_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_scriptsize_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_footnotesize_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_small_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_normalsize_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_large_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Large_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_LARGE_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_huge_size_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Huge_size_tl { \q_no_value }
-
- \tl_set:Nn \l__fontscale_tiny_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_scriptsize_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_footnotesize_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_small_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_normalsize_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_large_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Large_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_LARGE_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_huge_baselineskip_tl { \q_no_value }
- \tl_set:Nn \l__fontscale_Huge_baselineskip_tl { \q_no_value }
+ \tl_map_inline:nn
+ {
+ \l__fontscale_tiny_scale_tl
+ \l__fontscale_scriptsize_scale_tl
+ \l__fontscale_footnotesize_scale_tl
+ \l__fontscale_small_scale_tl
+ \l__fontscale_large_scale_tl
+ \l__fontscale_Large_scale_tl
+ \l__fontscale_LARGE_scale_tl
+ \l__fontscale_huge_scale_tl
+ \l__fontscale_Huge_scale_tl
+
+ \l__fontscale_tiny_size_tl
+ \l__fontscale_scriptsize_size_tl
+ \l__fontscale_footnotesize_size_tl
+ \l__fontscale_small_size_tl
+ \l__fontscale_normalsize_size_tl
+ \l__fontscale_large_size_tl
+ \l__fontscale_Large_size_tl
+ \l__fontscale_LARGE_size_tl
+ \l__fontscale_huge_size_tl
+ \l__fontscale_Huge_size_tl
+
+ \l__fontscale_tiny_baselineskip_tl
+ \l__fontscale_scriptsize_baselineskip_tl
+ \l__fontscale_footnotesize_baselineskip_tl
+ \l__fontscale_small_baselineskip_tl
+ \l__fontscale_normalsize_baselineskip_tl
+ \l__fontscale_large_baselineskip_tl
+ \l__fontscale_Large_baselineskip_tl
+ \l__fontscale_LARGE_baselineskip_tl
+ \l__fontscale_huge_baselineskip_tl
+ \l__fontscale_Huge_baselineskip_tl
+ }
+ { \tl_set:Nn ##1 { \q_no_value } }
}
\__fontscale_keys_set_initial:
@@ -569,25 +533,22 @@
}
\cs_new_protected:Npn \__fontscale_keys_process_start:
{
- \fp_compare:nNnT \l__fontscale_baselineskip_size_ratio_fp < \c_one_fp
- {
- \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 }
+ \msg_error:nnV { fontscale } { key-musical-base-out-of-bounds }
+ \l__fontscale_musical_base_dim
\prg_break:
}
\fp_compare:nNnF \l__fontscale_musical_ratio_fp > \c_one_fp
{
- \msg_error:nn { fontscale } { key-musical-ratio-out-of-bounds }
+ \msg_error:nne { fontscale } { key-musical-ratio-out-of-bounds }
+ { \fp_use:N \l__fontscale_musical_ratio_fp }
\prg_break:
}
\int_compare:nNnF \l__fontscale_musical_notes_int > 0
{
- \msg_error:nn { fontscale } { key-musical-notes-out-of-bounds }
+ \msg_error:nnV { fontscale } { key-musical-notes-out-of-bounds }
+ \l__fontscale_musical_notes_int
\prg_break:
}
}
@@ -612,8 +573,8 @@
{ \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 }
+ \msg_error:nnVn { fontscale } { key-font-size-out-of-bounds }
+ \l_fontscale_normalsize_size_dim { normalsize }
\prg_break:
}
}
@@ -634,13 +595,6 @@
\__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:
- }
}
}
% Auxiliary functions that expand to the font size depending on the name of the
@@ -753,8 +707,8 @@
{
\tl_map_break:n
{
- \msg_error:nnn { fontscale } { key-font-scale-out-of-bounds }
- {#1}
+ \msg_error:nnen { fontscale } { key-font-scale-out-of-bounds }
+ { \fp_eval:n { \use:c { l__fontscale_#1_scale_tl } } } {#1}
\prg_break:
}
}
@@ -768,8 +722,8 @@
{
\tl_map_break:n
{
- \msg_error:nnn { fontscale } { key-font-size-out-of-bounds }
- {#1}
+ \msg_error:nnvn { fontscale } { key-font-size-out-of-bounds }
+ { l_fontscale_#1_size_dim } {#1}
\prg_break:
}
}
@@ -800,20 +754,9 @@
\__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:
- }
- }
}
}
-% Issues a warning if the font sizes or font baselineskips (ignoring the
-% stretch and shrink components) are not in the correct order.
+% Issues a warning if the font sizes are not in the correct order.
\cs_new_protected:Npn \__fontscale_keys_process_check_order:
{
\dim_compare:nF
@@ -830,73 +773,151 @@
< \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
% Defines the standard LaTeX font size commands from \tiny to \Huge and
-% initializes to \normalsize.
+% initializes to \normalsize. The corresponding internal functions are not used
+% elsewhere in the code for compatibility with hooks such as
+% \AddToHook{cmd/<font size command>/after}{<code>}.
\DeclareDocumentCommand \tiny { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \tiny }
+ }
+ { \__fontscale_tiny: }
+ }
+\cs_new_protected:Npn \__fontscale_tiny:
+ {
\__fontscale_fontsize:NNN \tiny \l_fontscale_tiny_size_dim
\l_fontscale_tiny_baselineskip_skip
}
\DeclareDocumentCommand \scriptsize { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \scriptsize }
+ }
+ { \__fontscale_scriptsize: }
+ }
+\cs_new_protected:Npn \__fontscale_scriptsize:
+ {
\__fontscale_fontsize:NNN \scriptsize \l_fontscale_scriptsize_size_dim
\l_fontscale_scriptsize_baselineskip_skip
}
\DeclareDocumentCommand \footnotesize { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \footnotesize }
+ }
+ { \__fontscale_footnotesize: }
+ }
+\cs_new_protected:Npn \__fontscale_footnotesize:
+ {
\__fontscale_fontsize:NNN \footnotesize \l_fontscale_footnotesize_size_dim
\l_fontscale_footnotesize_baselineskip_skip
}
\DeclareDocumentCommand \small { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \small }
+ }
+ { \__fontscale_small: }
+ }
+\cs_new_protected:Npn \__fontscale_small:
+ {
\__fontscale_fontsize:NNN \small \l_fontscale_small_size_dim
\l_fontscale_small_baselineskip_skip
}
\DeclareDocumentCommand \normalsize { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \normalsize }
+ }
+ { \__fontscale_normalsize: }
+ }
+\cs_new_protected:Npn \__fontscale_normalsize:
+ {
\__fontscale_fontsize:NNN \normalsize \l_fontscale_normalsize_size_dim
\l_fontscale_normalsize_baselineskip_skip
}
\DeclareDocumentCommand \large { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \large }
+ }
+ { \__fontscale_large: }
+ }
+\cs_new_protected:Npn \__fontscale_large:
+ {
\__fontscale_fontsize:NNN \large \l_fontscale_large_size_dim
\l_fontscale_large_baselineskip_skip
}
\DeclareDocumentCommand \Large { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \Large }
+ }
+ { \__fontscale_Large: }
+ }
+\cs_new_protected:Npn \__fontscale_Large:
+ {
\__fontscale_fontsize:NNN \Large \l_fontscale_Large_size_dim
\l_fontscale_Large_baselineskip_skip
}
\DeclareDocumentCommand \LARGE { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \LARGE }
+ }
+ { \__fontscale_LARGE: }
+ }
+\cs_new_protected:Npn \__fontscale_LARGE:
+ {
\__fontscale_fontsize:NNN \LARGE \l_fontscale_LARGE_size_dim
\l_fontscale_LARGE_baselineskip_skip
}
\DeclareDocumentCommand \huge { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \huge }
+ }
+ { \__fontscale_huge: }
+ }
+\cs_new_protected:Npn \__fontscale_huge:
+ {
\__fontscale_fontsize:NNN \huge \l_fontscale_huge_size_dim
\l_fontscale_huge_baselineskip_skip
}
\DeclareDocumentCommand \Huge { }
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \Huge }
+ }
+ { \__fontscale_Huge: }
+ }
+\cs_new_protected:Npn \__fontscale_Huge:
+ {
\__fontscale_fontsize:NNN \Huge \l_fontscale_Huge_size_dim
\l_fontscale_Huge_baselineskip_skip
}
@@ -1044,7 +1065,10 @@
}
}
}
- { \msg_error:nn { fontscale } { font-step-out-of-bounds } }
+ {
+ \msg_error:nne { fontscale } { font-step-out-of-bounds }
+ { \fp_eval:n {#1} }
+ }
}
}
\cs_new_protected:Npn \__fontscale_add_font_step:n #1
@@ -1132,6 +1156,28 @@
\cs_new_eq:NN \__fontscale_set_font_size_baselineskip:nn
\__fontscale_fontsize:nn
+\NewDocumentCommand \SetFontBaselineskip { s m }
+ {
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \SetFontBaselineskip }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_add_font_baselineskip:n {#2} }
+ { \__fontscale_set_font_baselineskip:n {#2} }
+ }
+ }
+\cs_new_protected:Npn \__fontscale_set_font_baselineskip:n
+ { \__fontscale_fontsize:nn { \f@size pt } }
+\cs_new_protected:Npn \__fontscale_add_font_baselineskip:n #1
+ {
+ \__fontscale_skip_set_default_pt:Nn \l__fontscale_tmp_skip {#1}
+ \__fontscale_fontsize:nn { \f@size pt }
+ { \l__fontscale_tmp_skip + \f@baselineskip }
+ }
+
\NewDocumentCommand \PrintFontSizeParameters { }
{ \__fontscale_print_font_size_parameters: }
\cs_new_protected:Npn \__fontscale_print_font_size_parameters:
@@ -1153,65 +1199,20 @@
}
\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
+ \tl_map_inline:nn
+ {
+ {tiny} {scriptsize} {footnotesize} {small} {normalsize}
+ {large} {Large} {LARGE} {huge} {Huge}
+ }
+ {
+ \token_to_str:c {##1} \@ \c_colon_str \c_space_tl
+ step~ =~ \fp_use:c { c_fontscale_##1_step_fp } ,~
+ scale~ =~ \str_if_eq:nnTF {##1} { normalsize }
+ { 1 } { \fp_use:c { l_fontscale_##1_scale_fp } } ,~
+ 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 }
+ }
}
\NewDocumentCommand \PrintSampleText { s +m }
@@ -1222,36 +1223,30 @@
{ \token_to_str:N \PrintSampleText }
}
{
- \IfBooleanTF #1
- { \__fontscale_print_sample_text_descending_order:n {#2} }
- { \__fontscale_print_sample_text_ascending_order:n {#2} }
+ \group_begin:
+ \IfBooleanTF #1
+ { \__fontscale_print_sample_text_descending_order:n {#2} }
+ { \__fontscale_print_sample_text_ascending_order:n {#2} }
+ \group_end:
}
}
\cs_new_protected:Npn \__fontscale_print_sample_text_ascending_order:n #1
{
- { \tiny #1 \par }
- { \scriptsize #1 \par }
- { \footnotesize #1 \par }
- { \small #1 \par }
- { \normalsize #1 \par }
- { \large #1 \par }
- { \Large #1 \par }
- { \LARGE #1 \par }
- { \huge #1 \par }
- { \Huge #1 \par }
+ \tl_map_inline:nn
+ {
+ \tiny \scriptsize \footnotesize \small \normalsize
+ \large \Large \LARGE \huge \Huge
+ }
+ { ##1 #1 \par }
}
\cs_new_protected:Npn \__fontscale_print_sample_text_descending_order:n #1
{
- { \Huge #1 \par }
- { \huge #1 \par }
- { \LARGE #1 \par }
- { \Large #1 \par }
- { \large #1 \par }
- { \normalsize #1 \par }
- { \small #1 \par }
- { \footnotesize #1 \par }
- { \scriptsize #1 \par }
- { \tiny #1 \par }
+ \tl_map_inline:nn
+ {
+ \Huge \huge \LARGE \Large \large
+ \normalsize \small \footnotesize \scriptsize \tiny
+ }
+ { ##1 #1 \par }
}
\NewDocumentCommand \PrintFontSizeCommand { }
@@ -1273,23 +1268,12 @@
% TEXT PURIFY
-\cs_new:Npn \__fontscale_remove_arg_spec_sm:n #1
+\NewExpandableDocumentCommand \__fontscale_use_none_sm:w { s m } { }
+\tl_map_inline:nn
{
- \bool_lazy_all:nT
- {
- { \tl_if_single_p:n {#1} }
- { \tl_if_single_token_p:n #1 }
- { \token_if_eq_meaning_p:NN #1 * }
- }
- { \use_none:n }
- }
-\text_declare_purify_equivalent:Nn \fontscalesetup
- { \__fontscale_remove_arg_spec_sm:n }
-\text_declare_purify_equivalent:Nn \SetFontStep
- { \__fontscale_remove_arg_spec_sm:n }
-\text_declare_purify_equivalent:Nn \SetFontScale
- { \__fontscale_remove_arg_spec_sm:n }
-\text_declare_purify_equivalent:Nn \SetFontSize
- { \__fontscale_remove_arg_spec_sm:n }
+ \fontscalesetup \SetFontStep \SetFontScale \SetFontSize
+ \SetFontBaselineskip
+ }
+ { \text_declare_purify_equivalent:Nn #1 { \__fontscale_use_none_sm:w } }
\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/fontsetup/fontsetup.sty b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
index 6656d2a95ff..659263a5291 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
+++ b/Master/texmf-dist/tex/latex/fontsetup/fontsetup.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{fontsetup}[2024/2/24 v2.1.1 For easily using font families with mathematics]
+\ProvidesPackage{fontsetup}[2024/9/11 v2.2.1 For easily using font families with mathematics]
\RequirePackage{iflang}
\RequirePackage{iftex}
% Provide a test to know if a 16bits TeX is used.
@@ -46,28 +46,36 @@
\if@varnothing
\if@newcmbb
\setmathfont[StylisticSet=2,StylisticSet=3,CharacterVariant=1]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=2,StylisticSet=3,CharacterVariant=1]{NewCMMath-Bold.otf}%
\else
\setmathfont[StylisticSet=2,CharacterVariant=1]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=2,CharacterVariant=1]{NewCMMath-Bold.otf}%
\fi
\else
\if@newcmbb
\setmathfont[StylisticSet=2,StylisticSet=3]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=2,StylisticSet=3]{NewCMMath-Bold.otf}%
\else
\setmathfont[StylisticSet=2]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=2]{NewCMMath-Bold.otf}%
\fi
\fi
\else
\if@varnothing
\if@newcmbb
\setmathfont[StylisticSet=3,CharacterVariant=1]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=3,CharacterVariant=1]{NewCMMath-Bold.otf}%
\else
\setmathfont[CharacterVariant=1]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,CharacterVariant=1]{NewCMMath-Bold.otf}%
\fi
\else
\if@newcmbb
\setmathfont[StylisticSet=3]{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold,StylisticSet=3]{NewCMMath-Bold.otf}%
\else
\setmathfont{NewCMMath-\regularorbook.otf}%
+ \setmathfont[version=bold]{NewCMMath-Bold.otf}%
\fi
\fi
\fi
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
index 05a40a7f019..7b72ba65e4a 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspdefault.tex
@@ -95,6 +95,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
\newcommand{\textuncial}[1]{{\uncial #1}}
\setmathfont{NewCMMath-Book.otf}
\setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Book.otf}
+\setmathfont{NewCMMath-Bold.otf}[version=bold]
\newcommand{\tttextsc}[1]{{\ttscshape#1}}
%
\let\prosgegrammeni=\undefined
@@ -299,6 +300,12 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
% some math symbols
\DeclareRobustCommand*\nrightrightarrows{\mathrel{\char"E033}}
\DeclareRobustCommand*\nleftleftarrows{\mathrel{\char"E032}}
+\DeclareRobustCommand*\twoheadhookrightarrow{\mathrel{\char"E034}}
+\DeclareRobustCommand*\twoheadhookleftarrow{\mathrel{\char"E035}}
+%
+%%% declare the convolution operator %%%%%%%%%%%%%%%
+\DeclareMathOperator*{\convolution}{\mathchoice{\char"E037}{\char"E036}{\char"E038}{\char"E039}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% select ss02 lookup table for IPA symbols
%\newfontfamily{\ipatext}[StylisticSet=5,%
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
index 8d8802fbd66..7961849540b 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspebgaramondot.tex
@@ -2,4 +2,13 @@
\setmainfont[ItalicFont=EBGaramond-Italic.otf,
BoldFont=EBGaramond-Bold.otf,
BoldItalicFont=EBGaramond-BoldItalic.otf,SmallCapsFeatures={Numbers=OldStyle}]{EBGaramond-Regular.otf}
-\setmathfont{Garamond-Math.otf} \ No newline at end of file
+\setsansfont[ItalicFont=Ysabeau-Italic.otf,
+BoldFont=Ysabeau-Bold.otf,BoldItalicFont=Ysabeau-BoldItalic.otf,Scale=MatchLowercase,
+SmallCapsFeatures={Numbers=OldStyle}]{Ysabeau-Regular.otf}
+
+%\newfontfamily{\greekfont}[ItalicFont=EBGaramond-Italic.otf,
+%BoldFont=EBGaramond-Bold.otf,
+%BoldItalicFont=EBGaramond-BoldItalic.otf,SmallCapsFeatures={Numbers=OldStyle}]{EBGaramond-Regular.otf}
+%
+\setmathfont{Garamond-Math.otf}
+
diff --git a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
index 48f3bd948a7..4b27d42e45a 100644
--- a/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
+++ b/Master/texmf-dist/tex/latex/fontsetup/fspolddefault.tex
@@ -99,6 +99,7 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
\newcommand{\textuncial}[1]{{\uncial #1}}
\setmathfont{NewCMMath-Regular.otf}
\setmathfont[range={\mathscr,\mathbfscr},StylisticSet=1]{NewCMMath-Regular.otf}
+\setmathfont{NewCMMath-Bold.otf}[version=bold]
\newcommand{\tttextsc}[1]{{\ttscshape#1}}
%
@@ -304,6 +305,12 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf}
% some math symbols
\DeclareRobustCommand*\nrightrightarrows{\mathrel{\char"E033}}
\DeclareRobustCommand*\nleftleftarrows{\mathrel{\char"E032}}
+\DeclareRobustCommand*\twoheadhookrightarrow{\mathrel{\char"E034}}
+\DeclareRobustCommand*\twoheadhookleftarrow{\mathrel{\char"E035}}
+%
+%%% declare the convolution operator %%%%%%%%%%%%%%%
+\DeclareMathOperator*{\convolution}{\mathchoice{\char"E037}{\char"E036}{\char"E038}{\char"E039}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% select ss02 lookup table for IPA symbols
%\newfontfamily{\ipatext}[StylisticSet=5,%
diff --git a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
index 265b33a70e7..e94e4de773a 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier-orns.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.3}
-\def\filedate{2022/02/05}
+\def\fileversion{2.4}
+\def\filedate{2024/09/08}
\ProvidesPackage{fourier-orns}%
[\filedate\space\fileversion\space fourier-ornaments package]
@@ -66,11 +66,21 @@
\newcommand*{\starredbullet}{\texorpdfstring{{\FourierOrns X}}{\textdagger}}
\newcommand*{\grimace}{\texorpdfstring{{\FourierOrns Y}}{\textdagger}}
\newcommand*{\textthing}{\texorpdfstring{{\FourierOrns Z}}{\textdagger}}
+\newcommand*{\aldinesmallup}{\texorpdfstring{{\FourierOrns c}}{\textdagger}}
+\newcommand*{\aldinesmallrevert}{\texorpdfstring{{\FourierOrns d}}{\textdagger}}
+\newcommand*{\leftblackhand}{\texorpdfstring{{\FourierOrns m}}{\textdagger}}
+\newcommand*{\rightblackhand}{\texorpdfstring{{\FourierOrns n}}{\textdagger}}
%
\newcommand*{\danger}{\PackageWarning{fourier-orns}{%
Command \protect\danger\space is deprecated.\MessageBreak
Use \protect\warning\space instead; reported}%
\warning}
%
+\ifFourier@TU
+\newcommand*{\grappe}{\texorpdfstring{{\FourierOrns \char"2766}}{\textdagger}}
+\newcommand*{\leftgrappe}{\texorpdfstring{{\FourierOrns \char"2619}}{\textdagger}}
+\newcommand*{\rightgrappe}{\texorpdfstring{{\FourierOrns \char"2767}}{\textdagger}}
+\fi
+%
%
\endinput
diff --git a/Master/texmf-dist/tex/latex/fourier/fourier.sty b/Master/texmf-dist/tex/latex/fourier/fourier.sty
index e29a07d07d9..2ebb35c77cb 100644
--- a/Master/texmf-dist/tex/latex/fourier/fourier.sty
+++ b/Master/texmf-dist/tex/latex/fourier/fourier.sty
@@ -1,5 +1,6 @@
-\def\fileversion{2.3}%
-\def\filedate{2022/02/05}%
+\def\fileversion{2.4}%
+\def\filedate{2024/09/08}%
+%new version number, but inchanged file : only fourier-orns have been updated.
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{fourier}%
[\filedate\space\fileversion\space fourier-GUTenberg package]%
diff --git a/Master/texmf-dist/tex/latex/fourier/ufuts.fd b/Master/texmf-dist/tex/latex/fourier/ufuts.fd
index 533bbf61e14..71bcdf23059 100644
--- a/Master/texmf-dist/tex/latex/fourier/ufuts.fd
+++ b/Master/texmf-dist/tex/latex/fourier/ufuts.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ufuts.fd}
- [2021/11/24 Fontinst v1.933 font definitions for U/futs.]
+ [2024/07/22 Fontinst v1.933 font definitions for U/futs.]
\DeclareFontFamily{U}{futs}{}
@@ -39,7 +39,7 @@
\DeclareFontShape{U}{futs}{m}{it}{<->ssub * futs/m/sl}{}
\DeclareFontShape{U}{futs}{sb}{it}{<->ssub * futs/sb/sl}{}
-\DeclareFontShape{U}{futs}{b}{it}{<->ssub * futs/sb/it}{}
+\DeclareFontShape{U}{futs}{b}{it}{<->ssub * futs/b/sl}{}
\DeclareFontShape{U}{futs}{bx}{it}{<->ssub * futs/b/it}{}
\DeclareFontShape{U}{futs}{bx}{n}{<->ssub * futs/b/n}{}
\DeclareFontShape{U}{futs}{bx}{sl}{<->ssub * futs/b/sl}{}
diff --git a/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty b/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty
new file mode 100644
index 00000000000..42aed89ce90
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty
@@ -0,0 +1,257 @@
+%%
+%% This is file `FramedSyntax.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% FramedSyntax.dtx (with options: `package')
+%%
+%% Copyright (C) 2024 Claudio Beccari all rights reserved.
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+\NeedsTeXFormat{LaTeX2e}[2019/01/01]
+\ProvidesPackage{FramedSyntax}%
+ [2024-09-04 v.0.2.8 Typeset command syntax within a special frame]
+\IfPackageLoadedF{pict2e}{\RequirePackage{pict2e}}
+\IfPackageLoadedF{etoolbox}{\RequirePackage{etoolbox}}
+\IfPackageLoadedF{xkeyval}{\RequirePackage{xkeyval}}
+\IfPackageLoadedF{xcolor}{\RequirePackage{xcolor}}
+\providecommand*\FSmeta[1]{\textnormal{$\langle$\textit{#1}$\rangle$}}
+\providecommand*\FSmarg[1]%
+ {\textnormal{\texttt{\char123}\FSmeta{#1}\texttt{\char125}}}
+\providecommand*\FSoarg[1]{\textnormal{\texttt{[}\FSmeta{#1}\texttt{]}}}
+\providecommand*\FSArg[1]{\textnormal{\texttt{\{#1\}}}}
+\let\FSMarg\FSArg
+\providecommand*\FSOarg[1]{\textnormal{\texttt{[#1]}}}
+\def\GT@splitargs#1,#2!{\def\@tempA{#1}\def\@tempB{#2}}
+\providecommand\FSgarg[1]{\textnormal{\GT@splitargs#1!\%
+ \texttt{(}\FSmeta{\@tempA}\texttt{,}\FSmeta{\@tempB}\texttt{)}}}
+\providecommand*\FScomando[1]{\textnormal{\texttt{\string#1}}}
+\providecommand*{\FScs}[1]%
+{\textnormal{\texttt{\char92#1}\index{#1@\texttt{\char92#1}|textsc}}}
+\let\FScsindex\FScs
+\providecommand*\SFSambiente[2]{%
+\FScomando{\begin}\FSmarg{#1}\FSoarg{#2}\,\dots
+ \FScomando{\end}\FSmarg{#1}}
+\providecommand*\DFSambiente[3]{%
+ \FScomando{\begin}\FSmarg{#1}\FSoarg{#2}\FSoarg{#3}\,\dots
+ \FScomando{\end}\FSmarg{#1}}
+\providecommand*\BFSambiente[1]{\FScomando{\begin}\FSmarg{#1}}
+\providecommand*\EFSambiente[1]{\FScomando{\end}\FSmarg{#1}}
+\IfPackageLoadedF{cfr-lm}{\let\texttm\texttt \let\texttv\texttt}
+\DeclareRobustCommand*\FSambstyle[1]{%
+ {\normalfont\textsf{\slshape#1}}}
+\DeclareRobustCommand*\FSclassstyle[1]{%
+ {\normalfont\texttv{\itshape#1}}}
+\DeclareRobustCommand*\FSfilestyle[1]{%
+ {\normalfont\texttm{\texttt{#1}}}}
+\DeclareRobustCommand*\FSpackstyle[1]{%
+ {\normalfont\texttm{\ifbool{PDFTeX}{\textit}{\itshape}{#1}}}}%
+\DeclareRobustCommand*\FSprogstyle[1]{{\normalfont\textsf{#1}}}
+\DeclareRobustCommand*\FSprog[1]{\FSprogstyle{#1}%
+\iflanguage{english}{\index{program!#1@\FSprogstyle{#1}|textsc}}%
+ {\index{programma!#1@\FSprogstyle{#1}|textsc}}}%
+\DeclareRobustCommand*\FSpack[1]{\FSpackstyle{#1}%
+\iflanguage{english}{\index{package!#1@\FSpackstyle{#1}|textsc}}%
+ {\index{pacchetto!#1@\FSpackstyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSclass[1]{\FSclassstyle{#1}%
+ \iflanguage{english}{\index{class!#1@\FSclassstyle{#1}|textsc}}%
+ {\index{classe!#1@\FSclassstyle{#1}|textsc}}}%
+\DeclareRobustCommand*\file[1]{\FSfilestyle{#1}%
+ \index{file!#1@\FSfilestyle{#1}|textsc}}%
+\DeclareRobustCommand*\FSamb[1]{\FSambstyle{#1}%
+ \iflanguage{english}%
+ {\index{environment!#1@\FSambstyle{#1}|textsc}}%
+ {\index{ambiente!#1@\FSambstyle{#1}|textsc}}}%
+\DeclareRobustCommand*\FSopzstyle[1]{%
+ {\normalfont\textsf{\slshape{#1}}}}%
+\DeclareRobustCommand*\FScontastyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSstilestyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSnumeristyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSumisurastyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSchiavestyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSdescrittorestyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSposizionestyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSallineamentostyle[1]{{\normalfont\texttm{#1}}}
+\DeclareRobustCommand*\FSopz[1]{\opzstyle{#1}%
+ \iflanguage{english}{\index{option!#1@\FSopzstyle{#1}|textsc}}%
+ {\index{opzione!#1@\opzstyle{#1}|textsc}}}%
+\DeclareRobustCommand*\FSconta[1]{\Fcontastyle{#1}%
+ \iflanguage{english}{\index{counter!#1@\FScontastyle{#1}|textsc}}%
+ {\index{contatore!#1@\FScontastyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSstile[1]{\FSstilestyle{#1}%
+ \iflanguage{english}{\index{page style!#1@\FSstilestyle{#1}|textsc}}%
+ {\index{stile della pagina!#1@\FSstilestyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSnumeri[1]{\FSnumeristyle{#1}%
+ \iflanguage{english}{\index{numbering!#1@\FSnumeristyle{#1}|textsc}}%
+ {\index{numerazione!#1@\FSnumeristyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSumisura[1]{\FSumisurastyle{#1}%
+ \iflanguage{english}{measuring unit!#1@\FSumisurastyle{#1}|textsc}%
+ {\index{unità di misura!#1@\FSumisurastyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSchiave[1]{\FSchiavestyle{#1}%
+ \iflanguage{english}{\index{key!#1@\FSchiavestyle{#1}|textsc}}%
+ {\index{chiave!#1@\chiavestyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSdescrittore[1]{\FSdescrittorestyle{#1}%
+ \iflanguage{english}%
+ {\index{column descriptor!#1@\FSdescrittorestyle{#1}|textsc}}%
+ {\index{descrittore di colonna!#1@\FSdescrittorestyle{#1}|textsc}}}
+\DeclareRobustCommand*\FSposizione[1]{\FSposizionestyle{#1}%
+ \iflanguage{english}%
+ {\index{floating object position!#1@\FSposizionestyle{#1}|textsc}}%
+ {\index{posizione degli oggetti flottanti!#1@\FSposizionestyle{#1}|textsc}}}%
+\DeclareRobustCommand*\FSallineamento[1]{FS\allineamentostyle{#1}%
+ \iflanguage{english}%
+ {\index{allignment code!#1@\FSallineamentostyle{#1}|textsc}}%
+ {\index{codice di allineamento!#1@\FSallineamentostyle{#1}|textsc}}}
+\newlength\SIfrthick
+\newlength\SIfrgap
+\newlength\SIfrwidth
+\newlength\SIfrheight
+\ifcsdef{insertwidth}{}{\newlength\insertwidth}
+\newlength\SIXR \newlength\SIYD
+\newlength\SIXL \newlength\SIYU
+\newdimen\radius
+\newdimen\framewidth
+
+\definecolor{SIbackground}{rgb}{0.95,0.95,0.95}
+\definecolor{SIframe}{rgb}{0.1,0.1,0.1}
+\definecolor{SItext}{rgb}{0,0,0}
+
+\def\SetSIbgd#1{\colorlet{SIbackground}{#1}}
+\def\SetSIfrm#1{\colorlet{SIframe}{#1}}
+\def\SetSItxt#1{\colorlet{SItext}{#1}}
+
+\DeclareOptionX<sintassi>{fboxrule}[1pt]{\fboxrule=#1}
+\DeclareOptionX<sintassi>{fboxsep}[1ex]{\fboxsep=#1}
+\DeclareOptionX<sintassi>{framecolor}[SIframe]{\SetSIfrm{#1}}
+\DeclareOptionX<sintassi>{backgroundcolor}[SIbackground]{\SetSIbgd{#1}}
+\DeclareOptionX<sintassi>{fontstyle}[\normalfont]{#1}
+\DeclareOptionX<sintassi>{radius}[\fboxsep]{\radius=#1}
+\DeclareOptionX<sintassi>{insertionwidth}[\linewidth]{\insertwidth=#1}
+
+\DeclareOptionX*{%
+ \packageWarning{FramedSyntax}{`\CurrentOption' ignored}%
+}
+
+\ExecuteOptionsX<sintassi>{%
+ fboxrule,
+ fboxsep,
+ framecolor,
+ backgroundcolor,
+ fontstyle,
+ radius,
+ insertionwidth
+}
+\ProcessOptionsX*\relax
+
+\providecommand\setfontsize{}
+\RenewDocumentCommand\setfontsize{O{1.2} m O{#1}}{%
+ \fontsize{#2}{\fpeval{#1*#2}}\selectfont}
+
+\providecommand\strippt{}
+\renewcommand\strippt[1]{\csuse{strip@pt}#1}
+
+\providecommand\framedbox{}
+\RenewDocumentCommand\framedbox{m m m O{#3} m}{%
+\bgroup
+ \dimen2=#1\relax
+ \dimen0=\dimexpr#1-(#2+#3)*2\relax
+ \setbox0\hbox{\parbox{\dimen0}{#5}}%
+ \SIfrthick=#2\relax
+ \SIXR=\dimexpr\wd0/2\relax \SIXL=-\SIXR\relax
+ \SIYU=\dimexpr(\ht0+\dp0)/2\relax \SIYD=-\SIYU\relax
+ \dimen4=#1\relax % box total width
+ \dimen6=\dimexpr\ht0+\dp0+(#2+#3)*2\relax% box total height
+ \dimen8=#4\relax % corner arc radius
+ \edef\SIbase{\strippt{\dimen4}}
+ \edef\SIalt{\strippt{\dimen6}}
+ \edef\SIxoff{\strippt{\dimexpr0.5\dimen4}}
+ \edef\SIyoff{\strippt{\dimexpr0.5\dimen6}}
+ \unitlength=1pt
+ \begin{picture}(\SIbase,\SIalt)(-\SIxoff,-\SIyoff)
+ \Frame*{\dimen4}{\dimen6}{\dimen8}%
+ \ifdim\SIfrthick>0pt\Frame{\dimen4}{\dimen6}{\dimen8}\fi
+ \put(0,0){\makebox(0,0){\box0}}%
+ \end{picture}
+\egroup
+\ignorespaces}
+
+ \providecommand\Frame{}
+ \RenewDocumentCommand\Frame{s m m m}{%
+ \bgroup
+ \SIXR=\dimexpr#2/2\relax \SIXL=-\SIXR%
+ \SIYU=\dimexpr#3/2\relax \SIYD=-\SIYU%
+ \IfBooleanTF{#1}{\linethickness{0pt}\color{SIbackground}}%
+ {\linethickness{\SIfrthick}\color{SIframe}}%
+ \moveto(\SIXR,\SIYD+#4)%
+ \circlearc{\SIXR-#4}{\SIYU-#4}{#4}{0}{90}%
+ \circlearc{\SIXL+#4}{\SIYU-#4}{#4}{90}{180}%
+ \circlearc{\SIXL+#4}{\SIYD+#4}{#4}{180}{270}%
+ \circlearc{\SIXR-#4}{\SIYD+#4}{#4}{270}{360}%
+ \closepath
+ \IfBooleanTF{#1}{\fillpath}{\strokepath}%
+ \egroup\ignorespaces}
+
+
+\providecommand\includeframedtext{}
+\RenewDocumentCommand\includeframedtext{O{\insertwidth} m O{}}%
+{\bgroup
+ \ExecuteOptionsX<sintassi>{#3}%
+ \ifdimgreater{\insertwidth}{\linewidth}{\insertwidth=\linewidth}{}%
+ \framedbox{\insertwidth}{\fboxrule}{\fboxsep}[\radius]{#2}%
+\egroup}
+
+\ProvideDocumentEnvironment{FramedSyntax}{}{}{}
+\RenewDocumentEnvironment{FramedSyntax}{o D(){}}
+{% environment opening commands
+\IfValueT{#1}{\setfontsize{#1}}% font size setting
+\ExecuteOptionsX<sintassi>{#2}% key = value options
+ \ifdimgreater{\insertwidth}{\linewidth}% width corrrection
+ {\insertwidth=\linewidth}{}%
+\framewidth=\insertwidth
+\let\meta\FSmeta \let\marg\FSmarg \let\oarg\FSoarg
+\let\Arg\FSArg \let\Marg\FSMarg \let\Oarg\FSOarg
+\let\garg\FSgarg \let\comando\FScomando \let\cs\FScs
+\let\csindex\FScs \let\Sambiente\SFSambiente
+\let\Dambiente\DFSambiente
+\let\Bambiente\BFSambiente \let\Eambiente\EFSambiente
+\let\amb\FSamb \let\ambstyle\FSambstyle
+\let\class\FSclass \let\classstyle\FSclassstyle
+\let\file\FSfile \let\filestyle\FSfilestyle
+\let\pack\FSpack \let\packstyle\FSpackstyle
+\let\prog\FSprog \let\progstyle\FSprogstyle
+\let\opz\FSopz \let\opzstyle\FSopzstyle
+\let\conta\FSconta \let\contastyle\FScontastyle
+\let\stile\FSstile \let\stilestyle\FSstilestyle
+\let\numeri\FSnumeri \let\numerystyle\FSnumeristyle
+\let\umisura\FSumisura \let\umisurastyle\FSumisurastyle
+\let\chiave\FSchiave \let\chiavestyle\FSchiavestyle
+\let\descrittore\FSdescrittore
+\let\descrittorestyle\FSDescrittorestyle
+\let\posizione\FSposizione \let\posizionestyle\FSposizionestyle
+\let\allineamento\FSallineamento
+ \let\allineamentostyle\FSallineamentostyle
+
+\begin{lrbox}{2}% open the necessary boxes
+\begin{minipage}{%
+ \dimexpr\framewidth-2\fboxrule-2\fboxsep}\obeylines
+}{% environment closing commands
+\end{minipage}\end{lrbox}% close the above boxes
+\begin{flushleft}% set the syntax thext flush left
+\includeframedtext{\box2}[#2]
+\end{flushleft}}%
+
+\NewDocumentEnvironment{Sintassi}{o D(){}}%
+ {\begin{FramedSyntax}[#1](#2)}{\end{FramedSyntax}}
+
+%% This Work has the status of `maintained'
+%%
+%% The Current Maintainer is Claudio Beccari
+%%
+%% This work consists of this file FramedSyntax.dtx,
+%% and the derived files FramedSyntax.sty and FramedSyntax.pdf.
+%%
+%% End of file `FramedSyntax.sty'.
diff --git a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty
index 03eb1dc27e3..13c76f1f483 100644
--- a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty
+++ b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{fvextra}
- [2024/05/16 v1.7.0 fvextra - extensions and patches for fancyvrb]
+ [2024/09/14 v1.8.0 fvextra - extensions and patches for fancyvrb]
\RequirePackage{etoolbox}
\RequirePackage{fancyvrb}
\RequirePackage{upquote}
@@ -197,6 +197,34 @@
\FV@OuterDefSTXEmpty
\catcode`\^^C=\active
\FV@OuterDefETXEmpty
+ \begingroup
+ \catcode`\ =\FV@TmpSpaceCat\relax
+ \catcode`\{=1
+ \catcode`\}=2
+ \@ifnextchar\bgroup
+ {\endgroup
+ \catcode`\{=1
+ \catcode`\}=2
+ \catcode`\ =\active
+ \catcode`\^^I=\active
+ \FV@ReadVArg@Group{#1}}%
+ {\endgroup
+ \catcode`\ =\active
+ \catcode`\^^I=\active
+ \FV@ReadVArg@Char{#1}}}
+\def\FVExtraReadVArgSingleLine#1{%
+ \begingroup
+ \ifFV@pdfTeXinputenc
+ \ifdefstring{\inputencodingname}{utf8}%
+ {\let\FV@ReadVArg@Char\FV@ReadVArg@Char@UTF}%
+ {}%
+ \fi
+ \edef\FV@TmpSpaceCat{\the\catcode` }%
+ \let\do\@makeother\FVExtraDoSpecials
+ \catcode`\^^B=\active
+ \FV@OuterDefSTXEmpty
+ \catcode`\^^C=\active
+ \FV@OuterDefETXEmpty
\catcode`\^^M=\active
\FV@OuterDefEOLEmpty
\begingroup
@@ -209,17 +237,17 @@
\catcode`\}=2
\catcode`\ =\active
\catcode`\^^I=\active
- \FV@ReadVArg@Group{#1}\FV@EOL}%
+ \FV@ReadVArg@Group{#1}}%
{\endgroup
\catcode`\ =\active
\catcode`\^^I=\active
- \FV@ReadVArg@Char{#1}\FV@EOL}}
-\def\FV@ReadVArg@Group#1#2#3{%
+ \FV@ReadVArg@Char{#1}}}
+\def\FV@ReadVArg@Group#1#2{%
\endgroup
- #1{#3}}
-\def\FV@ReadVArg@Char#1#2#3{%
+ #1{#2}}
+\def\FV@ReadVArg@Char#1#2{%
\expandafter\expandafter\expandafter
- \if\expandafter\expandafter\expandafter\relax\expandafter\@gobble\detokenize{#3}\relax
+ \if\expandafter\expandafter\expandafter\relax\expandafter\@gobble\detokenize{#2}\relax
\expandafter\@gobble
\else
\expandafter\@firstofone
@@ -227,14 +255,14 @@
{\PackageError{fvextra}%
{Verbatim delimiters must be single characters, not commands}%
{Try a different delimiter}}%
- \def\FV@ReadVArg@Char@i##1##2##3#3{%
+ \def\FV@ReadVArg@Char@i##1##2#2{%
\endgroup
- ##1{##3}}%
- \FV@ReadVArg@Char@i{#1}\FV@EOL}%
+ ##1{##2}}%
+ \FV@ReadVArg@Char@i{#1}}%
\ifFV@pdfTeXinputenc
-\def\FV@ReadVArg@Char@UTF#1#2#3{%
+\def\FV@ReadVArg@Char@UTF#1#2{%
\expandafter\expandafter\expandafter
- \if\expandafter\expandafter\expandafter\relax\expandafter\@gobble\detokenize{#3}\relax
+ \if\expandafter\expandafter\expandafter\relax\expandafter\@gobble\detokenize{#2}\relax
\expandafter\@gobble
\else
\expandafter\@firstofone
@@ -242,20 +270,25 @@
{\PackageError{fvextra}%
{Verbatim delimiters must be single characters, not commands}%
{Try a different delimiter}}%
- \ifcsname FV@U8:\detokenize{#3}\endcsname
+ \ifcsname FV@U8:\detokenize{#2}\endcsname
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
\fi
{\def\FV@UTF@octets@after##1{\FV@ReadVArg@Char@UTF@i{#1}{##1}}%
- \csname FV@U8:\detokenize{#3}\endcsname#3}%
- {\FV@ReadVArg@Char@UTF@i{#1}{#3}}}
+ \csname FV@U8:\detokenize{#2}\endcsname#2}%
+ {\FV@ReadVArg@Char@UTF@i{#1}{#2}}}
\def\FV@ReadVArg@Char@UTF@i#1#2{%
- \def\FV@ReadVArg@Char@i##1##2##3#2{%
+ \def\FV@ReadVArg@Char@i##1##2#2{%
\endgroup
- ##1{##3}}%
- \FV@ReadVArg@Char@i{#1}\FV@EOL}%
+ ##1{##2}}%
+ \FV@ReadVArg@Char@i{#1}}%
\fi
+\newbool{FV@vargsingleline}
+\define@booleankey{FV}{vargsingleline}%
+ {\booltrue{FV@vargsingleline}}
+ {\boolfalse{FV@vargsingleline}}
+\fvset{vargsingleline=false}
\def\FVExtrapdfstringdef#1#2{%
\AfterPreamble{%
\ifcsname pdfstringdef\endcsname
@@ -962,7 +995,8 @@
\FV@InlineKeyValues#1,}}
\def\FV@UseInlineKeyValues{%
- \expandafter\fvset\expandafter{\FV@InlineKeyValues}}
+ \expandafter\fvset\expandafter{\FV@InlineKeyValues}%
+ \FV@ApplyBreakAnywhereInlineStretch}
\newbool{FV@extra}
\define@booleankey{FV}{extra}%
{\booltrue{FV@extra}}%
@@ -993,18 +1027,31 @@
{\FVC@Verb@Extra@i}}
\def\FVC@Verb@Extra@i{%
\begingroup
- \FVExtraReadVArg{%
+ \ifbool{FV@vargsingleline}%
+ {\let\FV@Reader\FVExtraReadVArgSingleLine}%
+ {\let\FV@Reader\FVExtraReadVArg}%
+ \FV@Reader{%
\FV@UseInlineKeyValues\FV@UseKeyValues\FV@FormattingPrep
\FVExtraDetokenizeVArg{%
\FVExtraRetokenizeVArg{\FVC@Verb@Extra@ii}{\FV@CatCodes}}}}
\def\FVC@Verb@Extra@ii#1{%
- \ifFV@breaklines
+ \ifx\FancyVerbBackgroundColor\relax
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
\fi
- {\FV@InsertBreaks{\FancyVerbFormatInline}{#1}}%
- {\mbox{#1}}%
+ {\ifbool{FV@breaklines}%
+ {\FV@InsertBreaks{\FancyVerbFormatInline}{#1}}%
+ {\mbox{\FancyVerbFormatInline{#1}}}}%
+ {\setlength{\FV@TmpLength}{\fboxsep}%
+ \ifx\FancyVerbBackgroundColorPadding\relax
+ \setlength{\fboxsep}{0pt}%
+ \else
+ \setlength{\fboxsep}{\FancyVerbBackgroundColorPadding}%
+ \fi
+ \colorbox{\FancyVerbBackgroundColor}{%
+ \setlength{\fboxsep}{\FV@TmpLength}%
+ \FancyVerbBackgroundColorVPhantom\FancyVerbFormatInline{#1}}}%
\endgroup}
\let\FVC@SaveVerb@FV\FVC@SaveVerb
\def\FVC@SaveVerb{%
@@ -1019,7 +1066,10 @@
\@namedef{FV@SV@#1}{}%
\@namedef{FV@SVRaw@#1}{}%
\begingroup
- \FVExtraReadVArg{%
+ \ifbool{FV@vargsingleline}%
+ {\let\FV@Reader\FVExtraReadVArgSingleLine}%
+ {\let\FV@Reader\FVExtraReadVArg}%
+ \FV@Reader{%
\FVC@SaveVerb@Extra@i{#1}}}
\def\FVC@SaveVerb@Extra@i#1#2{%
\FV@UseInlineKeyValues\FV@UseKeyValues\FV@FormattingPrep
@@ -1061,15 +1111,7 @@
\def\FV@UseVerb@Extra@Retok#1{%
\FVExtraDetokenizeVArg{%
\FVExtraRetokenizeVArg{\FV@UseVerb@Extra}{\FV@CatCodes}}{#1}}
-\def\FV@UseVerb@Extra#1{%
- \ifFV@breaklines
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- {\FV@InsertBreaks{\FancyVerbFormatInline}{#1}}%
- {\mbox{#1}}%
- \endgroup}
+\let\FV@UseVerb@Extra\FVC@Verb@Extra@ii
\def\EscVerb{%
\FVExtraRobustCommand\RobustEscVerb\FVExtraUnexpandedReadStarOArgBEscVArg}
\protected\def\RobustEscVerb{\FV@Command{}{EscVerb}}
@@ -1086,15 +1128,7 @@
\FV@UseInlineKeyValues\FV@UseKeyValues\FV@FormattingPrep
\FVExtraDetokenizeREscVArg{%
\FVExtraRetokenizeVArg{\FVC@EscVerb@ii}{\FV@CatCodes}}{#1}}
-\def\FVC@EscVerb@ii#1{%
- \ifFV@breaklines
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- {\FV@InsertBreaks{\FancyVerbFormatInline}{#1}}%
- {\mbox{#1}}%
- \endgroup}
+\let\FVC@EscVerb@ii\FVC@Verb@Extra@ii
\def\VerbEnv{%
\ifcsname @currenvir\endcsname
\ifx\@currenvir\@empty
@@ -1320,50 +1354,68 @@
\global\let\FV@bufferlengthname@tmp\relax
\global\let\FancyVerbBufferLineName@tmp\relax}}
\def\endVerbatimBuffer{\FVE@VerbatimBuffer}
-\newcommand{\VerbatimInsertBuffer}[1][]{%
- \begingroup
+\define@key{FV}{insertenvname}{%
+ \def\FV@VerbatimInsertEnvName{#1}}
+\fvset{insertenvname=Verbatim}
+\def\FV@Environment@InsertBuffer#1#2{%
\def\FV@KeyValues{#1}%
- \def\FV@Scan{%
- \FV@CatCodes
- \xdef\FV@EnvironName{Verbatim}%
- \ifnum\expandafter\value\expandafter{\FV@bufferlengthname}=\z@\relax
- \PackageError{fvextra}%
- {Buffer length counter \FV@bufferlengthname\space is invalid or zero}%
- {}%
- \let\FV@GetLine\relax
+ \FV@GetKeyValues{\@nameuse{FVB@#2}}}
+\def\FV@Scan@InsertBuffer{%
+ \FV@CatCodes
+ \xdef\FV@EnvironName{\FV@VerbatimInsertEnvName}%
+ \ifnum\expandafter\value\expandafter{\FV@bufferlengthname}=\z@\relax
+ \PackageError{fvextra}%
+ {Buffer length counter \FV@bufferlengthname\space is invalid or zero}%
+ {}%
+ \let\FV@GetLine\relax
+ \fi
+ \FV@BeginScanning}%
+\def\VerbatimInsertBuffer@def@FV@Line#1{%
+ \FVExtraRetokenizeVArg{\def\FV@Line}{}{#1}}
+\def\FancyVerbGetLine@VerbatimInsertBuffer{%
+ \ifnum\value{FancyVerbBufferIndex}>%
+ \expandafter\value\expandafter{\FV@bufferlengthname}\relax
+ \global\let\FV@EnvironName\relax
+ \let\next\relax
+ \else
+ \ifcsname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname
+ \expandafter\let\expandafter\FV@Line@Buffer
+ \csname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname
+ \expandafter\VerbatimInsertBuffer@def@FV@Line\expandafter{\FV@Line@Buffer}%
+ \def\next{\FV@PreProcessLine\FV@GetLine}%
+ \stepcounter{FancyVerbBufferIndex}%
+ \else
+ \def\next{%
+ \PackageError{fvextra}%
+ {Buffer with line macro named
+ "\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}" does not exist}%
+ {Check bufferlinename, bufferlengthname, and globalbuffer settings}%
+ }%
\fi
- \FV@GetLine}%
+ \fi
+ \next}
+\newcommand{\VerbatimInsertBuffer}[1][]{%
+ \begingroup
+ \let\FV@Scan\FV@Scan@InsertBuffer
\let\FV@CheckScan\relax
+ \let\FV@Environment\FV@Environment@InsertBuffer
+ \let\FancyVerbGetLine\FancyVerbGetLine@VerbatimInsertBuffer
\setcounter{FancyVerbBufferIndex}{1}%
- \def\VerbatimInsertBuffer@def@FV@Line##1{%
- \FVExtraRetokenizeVArg{\def\FV@Line}{}{##1}}
- \def\FancyVerbGetLine{%
- \ifnum\value{FancyVerbBufferIndex}>%
- \expandafter\value\expandafter{\FV@bufferlengthname}\relax
- \global\let\FV@EnvironName\relax
- \let\next\relax
- \else
- \ifcsname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname
- \expandafter\let\expandafter\FV@Line@Buffer
- \csname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname
- \expandafter\VerbatimInsertBuffer@def@FV@Line\expandafter{\FV@Line@Buffer}%
- \def\next{\FV@PreProcessLine\FV@GetLine}%
- \stepcounter{FancyVerbBufferIndex}%
- \else
- \def\next{%
- \PackageError{fvextra}%
- {Buffer with line macro named
- "\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}" does not exist}%
- {Check bufferlinename, bufferlengthname, and globalbuffer settings}%
- }%
- \fi
- \fi
- \next}%
- \FVB@Verbatim
- \FVE@Verbatim
+ \VerbatimInsertBuffer@i{#1}%
\setcounter{FancyVerbBufferIndex}{0}%
\endgroup
\@doendpe}
+\begingroup
+\catcode`\^^M=\active
+\gdef\VerbatimInsertBuffer@i#1{%
+ \begingroup%
+ \fvset{#1}%
+ \global\let\FV@CurrentVerbatimInsertEnvName\FV@VerbatimInsertEnvName%
+ \endgroup%
+ \csname \FV@CurrentVerbatimInsertEnvName\endcsname[#1]^^M%
+ \csname end\FV@CurrentVerbatimInsertEnvName\endcsname%
+ \global\let\FV@CurrentVerbatimInsertEnvName\FV@Undefined}%
+\endgroup
\newcommand{\VerbatimClearBuffer}[1][]{%
\begingroup
\def\FV@KeyValues{#1}%
@@ -1673,14 +1725,19 @@
\hbox to \linewidth{%
\FV@LeftListNumber
\FV@LeftListFrame
- \FancyVerbFormatLine{%
- \FancyVerbHighlightLine{%
- \FV@ObeyTabs{\FancyVerbFormatText{#1}}}}\hss
+ \FV@BGColor@List{%
+ \FancyVerbFormatLine{%
+ \FancyVerbHighlightLine{%
+ \FV@ObeyTabs{\FancyVerbFormatText{#1}}}}}\hss
\FV@RightListFrame
\FV@RightListNumber}%
\hss}}
\def\FV@BProcessLine#1{%
\hbox{\FancyVerbFormatLine{%
+ \ifx\FancyVerbBackgroundColor\relax
+ \else
+ \expandafter\FancyVerbBackgroundColorVPhantom
+ \fi
\FancyVerbHighlightLine{%
\FV@ObeyTabs{\FancyVerbFormatText{#1}}}}}}
\newbool{FV@NumberFirstLine}
@@ -1846,6 +1903,153 @@
\fi}{}%
\fi}%
}
+\define@key{FV}{backgroundcolor}{%
+ \def\FancyVerbBackgroundColor{#1}%
+ \ifx\FancyVerbBackgroundColor\FV@None
+ \let\FancyVerbBackgroundColor\relax
+ \else\ifx\FancyVerbBackgroundColor\@empty
+ \let\FancyVerbBackgroundColor\relax
+ \fi\fi}%
+\fvset{backgroundcolor=none}
+\define@key{FV}{bgcolor}{%
+ \fvset{backgroundcolor=#1}}
+\define@key{FV}{backgroundcolorvphantom}{%
+ \def\FancyVerbBackgroundColorVPhantom{#1}%
+ \ifx\FancyVerbBackgroundColorVPhantom\FV@None
+ \let\FancyVerbBackgroundColorVPhantom\relax
+ \else\ifx\FancyVerbBackgroundColorVPhantom\@empty
+ \let\FancyVerbBackgroundColorVPhantom\relax
+ \fi\fi}
+\fvset{backgroundcolorvphantom=\vphantom{\"Apgjy}}
+\define@key{FV}{bgcolorvphantom}{%
+ \fvset{backgroundcolorvphantom=#1}}
+\let\FancyVerbBackgroundColorPadding\relax
+\def\FV@backgroundcolorpadding@none@framenotsingle{%
+ \fvset{frame=none,framerule,rulecolor=none}}
+\def\FV@backgroundcolorpadding@dim@framenotsingle{%
+ \fvset{frame=single,framerule=0pt,rulecolor=\FancyVerbBackgroundColor}}
+\define@key{FV}{backgroundcolorpadding}{%
+ \def\FancyVerbBackgroundColorPadding{#1}%
+ \ifx\FancyVerbBackgroundColorPadding\FV@None
+ \let\FancyVerbBackgroundColorPadding\relax
+ \else\ifx\FancyVerbBackgroundColorPadding\@empty
+ \let\FancyVerbBackgroundColorPadding\relax
+ \fi\fi
+ \let\FV@Next\relax
+ \ifx\FancyVerbBackgroundColorPadding\relax
+ \ifx\FV@BeginListFrame\FV@BeginListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@none@framenotsingle
+ \fi
+ \ifx\FV@LeftListFrame\FV@LeftListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@none@framenotsingle
+ \fi
+ \ifx\FV@RightListFrame\FV@RightListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@none@framenotsingle
+ \fi
+ \ifx\FV@EndListFrame\FV@EndListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@none@framenotsingle
+ \fi
+ \FV@Next
+ \fvset{framesep,fillcolor=none}%
+ \else
+ \ifx\FV@BeginListFrame\FV@BeginListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@dim@framenotsingle
+ \fi
+ \ifx\FV@LeftListFrame\FV@LeftListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@dim@framenotsingle
+ \fi
+ \ifx\FV@RightListFrame\FV@RightListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@dim@framenotsingle
+ \fi
+ \ifx\FV@EndListFrame\FV@EndListFrame@Single
+ \else
+ \let\FV@Next\FV@backgroundcolorpadding@dim@framenotsingle
+ \fi
+ \FV@Next
+ \fvset{framesep=#1,fillcolor=\FancyVerbBackgroundColor}%
+ \fi}
+\define@key{FV}{bgcolorpadding}{\fvset{backgroundcolorpadding=#1}}
+\def\FV@BGColor@List#1{%
+ \ifx\FancyVerbBackgroundColor\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#1}%
+ {\setlength{\FV@TmpLength}{\fboxsep}%
+ \setlength{\fboxsep}{0pt}%
+ \colorbox{\FancyVerbBackgroundColor}{%
+ \setlength{\fboxsep}{\FV@TmpLength}%
+ \rlap{\FancyVerbBackgroundColorVPhantom\strut#1}%
+ \hspace{\linewidth}%
+ \ifx\FV@RightListFrame\relax\else
+ \hspace{-\FV@FrameSep}%
+ \hspace{-\FV@FrameRule}%
+ \fi
+ \ifx\FV@LeftListFrame\relax\else
+ \hspace{-\FV@FrameSep}%
+ \hspace{-\FV@FrameRule}%
+ \fi}%
+ \hss}}
+\let\FV@BVerbatimBegin@NoBGColor\FV@BVerbatimBegin
+\let\FV@BVerbatimEnd@NoBGColor\FV@BVerbatimEnd
+\def\FV@BVerbatimBegin{%
+ \begingroup
+ \FV@UseKeyValues
+ \FV@FormattingPrep
+ \let\FV@FormattingPrep\relax
+ \FV@ObeyTabsInit
+ \let\FV@ObeyTabsInit\relax
+ \ifx\FancyVerbBackgroundColor\relax
+ \expandafter\FV@BVerbatimBegin@NoBGColor
+ \else
+ \expandafter\FV@BVerbatimBegin@BGColor
+ \fi}
+\def\FV@BVerbatimEnd{%
+ \ifx\FancyVerbBackgroundColor\relax
+ \expandafter\FV@BVerbatimEnd@NoBGColor
+ \else
+ \expandafter\FV@BVerbatimEnd@BGColor
+ \fi
+ \endgroup}
+\def\FV@BVerbatimBegin@BGColor{%
+ \gdef\FV@TheVerbatim{}%
+ \ifx\FV@boxwidth\relax
+ \gdef\FV@boxwidth@tmp{0pt}%
+ \def\FV@ProcessLine##1{%
+ \sbox{\FV@LineBox}{\FV@BProcessLine{##1}}%
+ \ifdim\wd\FV@LineBox>\FV@boxwidth@tmp\relax
+ \xdef\FV@boxwidth@tmp{\the\wd\FV@LineBox}%
+ \fi
+ \expandafter\gdef\expandafter\FV@TheVerbatim\expandafter{%
+ \FV@TheVerbatim\FV@ProcessLine{##1}}}%
+ \else
+ \def\FV@ProcessLine##1{%
+ \expandafter\gdef\expandafter\FV@TheVerbatim\expandafter{%
+ \FV@TheVerbatim\FV@ProcessLine{##1}}}%
+ \fi}
+\def\FV@BVerbatimEnd@BGColor{%
+ \ifx\FV@boxwidth\relax
+ \let\FV@boxwidth\FV@boxwidth@tmp
+ \global\let\FV@boxwidth@tmp\FV@Undefined
+ \fi
+ \setlength{\FV@TmpLength}{\fboxsep}%
+ \ifx\FancyVerbBackgroundColorPadding\relax
+ \setlength{\fboxsep}{0pt}%
+ \else
+ \setlength{\fboxsep}{\FancyVerbBackgroundColorPadding}%
+ \fi
+ \colorbox{\FancyVerbBackgroundColor}{%
+ \setlength{\fboxsep}{\FV@TmpLength}%
+ \FV@BVerbatimBegin@NoBGColor\FV@TheVerbatim\FV@BVerbatimEnd@NoBGColor}%
+ \gdef\FV@TheVerbatim{}}
\define@key{FV}{highlightlines}{\def\FV@HighlightLinesList{#1}}%
\fvset{highlightlines=}
\define@key{FV}{highlightcolor}{\def\FancyVerbHighlightColor{#1}}%
@@ -1944,6 +2148,25 @@
\expandafter\FV@HighlightLinesParse@Range@Loop
\fi}
\g@addto@macro\FV@FormattingPrep@PreHook{\FV@HighlightLinesPrep}
+\def\FV@StepLineNo@Patch@HighlightLine{%
+ \ifcsname FV@HighlightLine:\number\c@FancyVerbLine\endcsname
+ \@tempcnta=\c@FancyVerbLine
+ \advance\@tempcnta\@ne
+ \ifcsname FV@HighlightLine:\number\@tempcnta\endcsname
+ \else
+ \expandafter\let
+ \csname FV@HighlightLine:\number\c@FancyVerbLine\endcsname\FV@Undefined
+ \fi
+ \fi}
+\patchcmd{\FV@StepLineNo}%
+ {\ifx\FV@Line\empty}%
+ {\ifx\FV@Line\empty\FV@StepLineNo@Patch@HighlightLine}%
+ {}%
+ {\PackageError{fvextra}%
+ {Failed to patch \string\FV@StepLineNo\ to make highlightlines
+ compatible with numberblanklines}%
+ {Failed to patch \string\FV@StepLineNo\ to make highlightlines
+ compatible with numberblanklines}}
\newcount\FV@LoopCount
\newbox\FV@NCharsBox
\def\FV@SetToWidthNChars#1#2{%
@@ -2073,6 +2296,22 @@
\let\FancyVerbBreakStop\relax
\let\FV@Break@DefaultToken\FV@Break@NBToken}
\fvset{breakanywhere=false}
+\define@key{FV}{breakanywhereinlinestretch}{%
+ \def\FV@breakanywhereinlinestretch{#1}%
+ \ifx\FV@breakanywhereinlinestretch\FV@None
+ \let\FV@breakanywhereinlinestretch\relax
+ \else\ifx\FV@breakanywhereinlinestretch\@empty
+ \let\FV@breakanywhereinlinestretch\relax
+ \fi\fi}
+\fvset{breakanywhereinlinestretch=none}
+\def\FV@ApplyBreakAnywhereInlineStretch{%
+ \ifx\FV@breakanywhereinlinestretch\relax
+ \else
+ \let\FancyVerbBreakAnywhereBreak@Orig\FancyVerbBreakAnywhereBreak
+ \def\FancyVerbBreakAnywhereBreak{%
+ \nobreak\hspace{0pt plus \FV@breakanywhereinlinestretch}%
+ \FancyVerbBreakAnywhereBreak@Orig}%
+ \fi}
\define@key{FV}{breakbefore}{%
\ifstrempty{#1}%
{\let\FV@BreakBefore\@empty
@@ -2220,6 +2459,15 @@
{\booltrue{FV@breaknonspaceingroup}}%
{\boolfalse{FV@breaknonspaceingroup}}
\fvset{breaknonspaceingroup=false}
+\newbool{FV@breakpreferspaces}
+\booltrue{FV@breakpreferspaces}
+\define@booleankey{FV}{breakpreferspaces}%
+ {\booltrue{FV@breakpreferspaces}}%
+ {\boolfalse{FV@breakpreferspaces}}
+\def\FV@BreakHyphenation{%
+ \finalhyphendemerits=0\relax
+ \ifbool{FV@breakpreferspaces}{}{\linepenalty=\@M\relax}}
+\g@addto@macro\FV@FormattingPrep@PreHook{\FV@BreakHyphenation}
\newsavebox{\FV@LineBox}
\newsavebox{\FV@LineIndentBox}
\let\FV@LineIndentChars\@empty
@@ -2857,8 +3105,9 @@
\FV@SaveLineBox{#1}}%
\FV@LeftListNumber
\FV@LeftListFrame
- \FancyVerbFormatLine{%
- \FancyVerbHighlightLine{\usebox{\FV@LineBox}}}%
+ \FV@BGColor@List{%
+ \FancyVerbFormatLine{%
+ \FancyVerbHighlightLine{\usebox{\FV@LineBox}}}}%
\FV@RightListFrame
\FV@RightListNumber
\ifx\FV@Tab\FV@TrueTab@UseWidth
@@ -2869,10 +3118,11 @@
\let\FancyVerbBreakStop\relax
\FV@LeftListNumber
\FV@LeftListFrame
- \FancyVerbFormatLine{%
- \FancyVerbHighlightLine{%
- \parbox[t]{\FV@LineWidth}{%
- \noindent\strut\FV@ObeyTabs{\FancyVerbFormatText{#1}}\strut}}}%
+ \FV@BGColor@List{%
+ \FancyVerbFormatLine{%
+ \FancyVerbHighlightLine{%
+ \parbox[t]{\FV@LineWidth}{%
+ \noindent\strut\FV@ObeyTabs{\FancyVerbFormatText{#1}}\strut}}}}%
\FV@RightListFrame
\FV@RightListNumber
\fi}%
diff --git a/Master/texmf-dist/tex/latex/heria/heria.cls b/Master/texmf-dist/tex/latex/heria/heria.cls
index 9a52b811408..6853ae99d15 100644
--- a/Master/texmf-dist/tex/latex/heria/heria.cls
+++ b/Master/texmf-dist/tex/latex/heria/heria.cls
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{heria}
-[2024-08-14 v3.4.1.1 Class for Horizon Europe (R)IA proposals]
+[2024-09-03 v3.4.1.3 Class for Horizon Europe (R)IA proposals]
\LoadClass[11pt,a4paper]{article}
\RequirePackage[T1]{fontenc} % T1 font encoding
\RequirePackage[left=15mm,
@@ -137,7 +137,7 @@
& #2 & \getPnum{#3} & #3 & %
\@ifundefined{@wpTotalPersonMonths\arabic{@wp#1num}}%
{\textbf{??}}%
- {\disptoken{@wpTotalPersonMonths\arabic{@wp#1num}}}%
+ {\fpeval{\disptoken{@wpTotalPersonMonths\arabic{@wp#1num}}/2}}%
& #4 & #5}}%
\@esphack
\ifthenelse{\arabic{@wp#1num}=1}{}{\bigskip}
@@ -432,7 +432,7 @@
\whiledo{\value{@secolumn}<\value{@wpcount}}{%
\stepcounter{@secolumn}%
\edef\serowtemp{\serowtemp&\fpeval{round(\csname %
- @wpPersonMonths\arabic{@secolumn}\endcsname,0)}}%
+ @wpPersonMonths\arabic{@secolumn}\endcsname/2,0)}}%
\@bsphack
\protected@write\@auxout{}%
{\string\expandafter\string\expandafter\string\expandafter%
@@ -441,7 +441,7 @@
\arabic{@secolumn}},0)}}}%
\@esphack
}
- \serowtemp & \fpeval{round(\setotalpm,0)} \\
+ \serowtemp & \fpeval{round(\setotalpm/2,0)} \\
\hline
\end{xltabular}
\end{center}
diff --git a/Master/texmf-dist/tex/latex/iaria-lite/iaria-lite.cls b/Master/texmf-dist/tex/latex/iaria-lite/iaria-lite.cls
index 8d868395cc7..d92d3b07a27 100644
--- a/Master/texmf-dist/tex/latex/iaria-lite/iaria-lite.cls
+++ b/Master/texmf-dist/tex/latex/iaria-lite/iaria-lite.cls
@@ -2,11 +2,23 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{iaria-lite}[2024/04/10 unofficial IARIA-lite conference template v0.2]
+\ProvidesClass{iaria-lite}[2024/09/16 unofficial IARIA-lite conference template v0.4]
+\newcounter{iaria@subfigtracker}
+\newcounter{iaria@subcaptiontracker}
\newcounter{iaria@pbalancetracker}
\newcounter{iaria@flushendtracker}
+
+\DeclareOption{subfig}{
+ \setcounter{iaria@subfigtracker}{1}
+ \typeout{iaria class: subfig option is set (use subfloat command).}
+}
+\DeclareOption{subcaption}{
+ \setcounter{iaria@subcaptiontracker}{1}
+ \typeout{iaria class: subcaption option is set (use subfigure command).}
+}
+
\DeclareOption{onecolumn}{\OptionNotUsed} % IEEE option onecolumn will be ignored
\DeclareOption{pbalance}{
@@ -66,8 +78,6 @@
\crcr}
\makeatother
-\RequirePackage[caption=false,font=footnotesize]{subfig}
-
\usepackage{etoolbox}
\makeatletter
\patchcmd{\@makecaption}
@@ -77,6 +87,16 @@
{}
\makeatother
+\ifnum\value{iaria@subfigtracker}=1
+ \typeout{iaria class: load subfig package (use subfloat command).}
+ \RequirePackage[caption=false,font=footnotesize]{subfig}
+\fi
+\ifnum\value{iaria@subcaptiontracker}=1
+ \typeout{iaria class: load subcaption package (use subfigure command).}
+ \RequirePackage{subcaption}
+ \captionsetup[subfigure]{labelformat=parens,font=footnotesize}
+\fi
+
\ifnum\value{iaria@pbalancetracker}=1
\typeout{iaria class: load pbalance package.}
\RequirePackage{pbalance}
diff --git a/Master/texmf-dist/tex/latex/iaria/iaria.cls b/Master/texmf-dist/tex/latex/iaria/iaria.cls
index a8e4a472a67..daa56b37cf8 100644
--- a/Master/texmf-dist/tex/latex/iaria/iaria.cls
+++ b/Master/texmf-dist/tex/latex/iaria/iaria.cls
@@ -3,11 +3,23 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{iaria}[2024/04/10 unofficial IARIA conference template v0.2]
+\ProvidesClass{iaria}[2024/09/16 unofficial IARIA conference template v0.4]
+\newcounter{iaria@subfigtracker}
+\newcounter{iaria@subcaptiontracker}
\newcounter{iaria@pbalancetracker}
\newcounter{iaria@flushendtracker}
+
+\DeclareOption{subfig}{
+ \setcounter{iaria@subfigtracker}{1}
+ \typeout{iaria class: subfig option is set (use subfloat command).}
+}
+\DeclareOption{subcaption}{
+ \setcounter{iaria@subcaptiontracker}{1}
+ \typeout{iaria class: subcaption option is set (use subfigure command).}
+}
+
\DeclareOption{onecolumn}{\OptionNotUsed} % IEEE option onecolumn will be ignored
\DeclareOption{pbalance}{
@@ -42,7 +54,12 @@
\RequirePackage{hyperref}
\hypersetup{hidelinks,unicode}
-\RequirePackage[style=ieee, backend=biber, url=false, hyperref, maxnames=5, minnames=1, maxcitenames=2, mincitenames=1]{biblatex}
+\RequirePackage[defernumbers=true,style=ieee, backend=biber, url=false, hyperref, maxnames=5, minnames=1, maxcitenames=2, mincitenames=1]{biblatex}
+
+\makeatletter
+\let\blx@rerun@biber\relax
+\makeatother
+
\renewcommand*{\bibfont}{\small}
\DeclareBibliographyDriver{online}{%
@@ -107,8 +124,6 @@
\crcr}
\makeatother
-\RequirePackage[caption=false,font=footnotesize]{subfig}
-
\usepackage{etoolbox}
\makeatletter
\patchcmd{\@makecaption}
@@ -118,7 +133,15 @@
{}
\makeatother
-\RequirePackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
+\ifnum\value{iaria@subfigtracker}=1
+ \typeout{iaria class: load subfig package (use subfloat command).}
+ \RequirePackage[caption=false,font=footnotesize]{subfig}
+\fi
+\ifnum\value{iaria@subcaptiontracker}=1
+ \typeout{iaria class: load subcaption package (use subfigure command).}
+ \RequirePackage{subcaption}
+ \captionsetup[subfigure]{labelformat=parens,font=footnotesize}
+\fi
\ifnum\value{iaria@pbalancetracker}=1
\typeout{iaria class: load pbalance package.}
@@ -129,6 +152,9 @@
\RequirePackage{flushend}
\fi
+
+\RequirePackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
+
\endinput
%%
%% End of file `iaria.cls'.
diff --git a/Master/texmf-dist/tex/latex/interlinear/interlinear.sty b/Master/texmf-dist/tex/latex/interlinear/interlinear.sty
new file mode 100644
index 00000000000..dd881b83dbc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/interlinear/interlinear.sty
@@ -0,0 +1,1176 @@
+% ^package_name="lingwrit-interlinear"_version="1.0"_container="lingwrit"
+% ^markup-language="WRIML"
+% ^purpose
+% This package processes interlinear gloss text, providing tools for handling and formatting glosses in linguistic documents.
+% It is based on the cgloss4e.sty package, but with significant modifications to avoid conflicts with other packages and to extend functionality.
+% As part of the lingwrit package, lingwrit-interlinear should not be loaded alongside it.
+% _purpose
+% ^base-program cgloss4e.sty _base-program
+
+% ^rem General Information
+% ^- lingwrit-interlinear is a modified version of cgloss4e.sty _-
+% ^- It primarily renames commands according to a customized syntax to prevent conflicts with other similar packages. _-
+% ^- Additional modifications include new commands and a new interlinear environment. _-
+% ^- Code added to the original has been marked with % ^added and % _added _-
+% _rem
+
+% ^module_name="interlinear"_container="lingwrit"
+% ^desc
+% This module is a modified version of the cgloss4e.sty.
+%
+% Modifications include:
+% - Command renaming: Commands have been renamed to avoid potential conflicts with other packages using similar names.
+% - Commands for processing four-lines interlinearization
+% - interlinear environment with its options
+% - markup commands and other functionalities
+%
+% Below is the list of new command names and their counterparts in cgloss:
+
+% ^list
+% ^cat Functions _cat
+
+% \more ^_becomes \lw_iln_process:words_queue
+% \lastword ^_becomes \lw_iln_fun_get:last_word
+% \testdone ^_becomes \lw_iln_check:queue_emptyness
+% \getwords ^_becomes \lw_iln_fun_get:line_words
+% \donewords ^_becomes \lw_iln_fun_exit:word_extraction
+% \twosent ^_becomes \lw_iln_fun_align:two_lines_words
+% \threesent ^_becomes \lw_iln_fun_align:three_lines_words
+% \glossglue ^_becomes \lw_iln_glue:inter_word_space
+% \gll ^_becomes \lw_iln_fun_enter:two_lines_interlinearization
+% \glll ^_becomes \lw_iln_fun_enter:three_lines_interlinearization
+% \glt ^_becomes \lw_iln_fun_insert:free_translation
+% \glend ^_becomes \lw_iln_fun_exit:interlinearization
+% \gl@stop ^_becomes \lw_iln_fun_exit:words_alignment
+
+% ^cat Boxes variables _cat
+
+% \lineone ^_becomes \lw_iln_var_box:line_one
+% \linetwo ^_becomes \lw_iln_var_box:line_two
+% \linethree ^_becomes \lw_iln_var_box:line_three
+% \linefour ^_becomes \lw_iln_var_box:line_four
+% \wordone ^_becomes \lw_iln_var_box:word_one
+% \wordtwo ^_becomes \lw_iln_var_box:word_two
+% \wordthree ^_becomes \lw_iln_var_box:word_three
+% \wordfour ^_becomes \lw_iln_var_box:word_four
+% \gline ^_becomes \lw_iln_var_box:iln_text_lines
+
+% ^cat Setting Appearence _cat
+
+% \eachwordone ^_becomes \lw_iln_fun_set:line_one_words_format
+% \eachwordtwo ^_becomes \lw_iln_fun_set:line_two_words_format
+% \eachwordthree ^_becomes \lw_iln_fun_set:line_three_words_format
+% \eachwordfour ^_becomes \lw_iln_fun_set:line_four_words_format
+% _list
+
+% The naming of the commands follows the following schema:
+
+% \<container>_<package>_<type>_<subtype>:<name/description>
+
+% <container> code is: lw (for lingwrit)
+% <package> code is: iln (for interlinear)
+% <type> code includes: "var" (for variables) and "fun" (for functions)
+
+% Variable Subtypes
+% box: for boxes
+
+% Function Subtypes
+% enter: initialize a process
+% exit: terminates a process
+% get: extract information
+% check: test if some condition is met
+% insert: inserts some stuff (i.e. the translation)
+% process: process given elements
+% calc: calculates the value of some variable
+% set: sets (manually) the values of some variable
+% _desc
+
+% ^code
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{lingwrit-interlinear}[2024/08/22 v1.0 (Linguistic Writing) Interlinear gloss text processing]
+
+% todo Required Packages
+\RequirePackage{marginnote} % ^rem for marginnotes _rem
+\RequirePackage{xifthen}
+\RequirePackage{xkeyval} % ^rem For key=val options
+\RequirePackage{xparse,etoolbox,enumitem}
+
+% todo 0. Utilities
+
+% todo a. LW Syntax Related Commands
+% Shortcut for some conditional statements
+\DeclareDocumentCommand{\IfValueArgTF}{mmmm}{\ifthenelse{\equal{#1}{#2}}{#3}{#4}}
+% Enabling the package syntax
+\providecommand{\switchlwsyntaxon}{\makeatletter\catcode `:=11 \catcode `_=11}
+\providecommand{\switchlwsyntaxoff}{\makeatother \catcode `:=12 \catcode `_=8}
+% if you want to modify some internal commands, check if your code is
+% surrounded by \switchlwsyntaxon and \switchlwsyntaxoff (LW Syntax enables "@", ":" and "_" to be used in csnames. So you need not using \makeatletter and \makeatother when you are using lwsyntax))
+
+
+% ^action_name="Enabling LingWrit Syntax"
+\switchlwsyntaxon
+% _action
+
+% todo b. Renaming of some TeX primitives
+\let\enter:group\bgroup\relax
+\let\exit:group\egroup\relax
+
+% todo c. Defining some helpers
+\def\lw_fun_helper:store#1{\expandafter\let\csname call:stored_#1\endcsname\expandafter\csname #1\endcsname}
+\def\lw_fun_helper:call#1{#1}
+\def\lw_fun_helper:clear#1{\RenewDocumentCommand{#1}{}{\relax}}%
+
+% todo d. Usefull Commands That are not used
+% The following commands are not used actually but may be usefull in some contexts
+% Fixing bugs with setspace package
+% If you encounter an error message using \singlespacing, \onehalfspacing or \doublespacing, use either of the following commands, according to your needs.
+
+\def\usedoublespacing{\lw_fun_helper:store{doublespacing}
+ \renewcommand\doublespacing{%
+ \call:stored_doublespacing%
+ \def\baselinestretch{1.69}}%
+}
+%
+\def\useonehalfspacing{%
+ \lw_fun_helper:store{onehalfspacing}
+ \renewcommand\onehalfspacing{%
+ \call:stored_onehalfspacing%
+ \def\baselinestretch{1.24}}%
+ }
+\def\usesinglespacing{%
+ \lw_fun_helper:store{singlespacing}
+ \renewcommand\singlespacing{%
+ \call:stored_singlespacing%
+ \def\baselinestretch{1}}%
+ }
+
+% Line Stretch Size Calculator
+
+% Enable LW Syntax
+%\switchlwsyntaxon
+%\newcounter{currentsize}
+%\setcounter{currentsize}{10}
+%\addtocounter{currentsize}{\@ptsize}
+%\newlength{\lw_iln_length:line_stretch_size}
+%\setlength{\lw_iln_length:line_stretch_size}{\dimexpr\baselinestretch pt * \thecurrentsize}
+%Current size: \thecurrentsize
+%Current interline size:
+%\the\lw_iln_length:line_stretch_size
+% Disable LW Syntax
+% \switchlwsyntaxoff
+
+% todo enter:cgloss4e modifications *
+
+% todo 1. Borrowings from covington
+
+% Forcing and disabling single spacing
+\let\@gsingle=1
+\def\lw_iln_fun_enable:force_single_spacing{\let\@gsingle=1}
+\def\lw_iln_fun_disable:force_single_spacing{\let\@gsingle=0}
+\@ifundefined{new@fontshape}%
+{\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}}
+{\def\@selfnt{\selectfont}}
+
+% todo a. 2-lines global interlinearization processing commands
+% ^modif_action="\begin{flushleft} removed"
+% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem
+
+\def\lw_iln_fun_enter:two_lines_interlinearization% % Introduces 2-line text-and-gloss.
+{%\begin{flushleft}
+ \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
+ \vskip\baselineskip\def\baselinestretch{1}%
+ \@selfnt\vskip-\baselineskip\fi%
+ \enter:group%
+ \lw_iln_fun_align:two_lines_words%
+ }
+% _modif
+
+% todo b. 3-lines global interlinearization processing commands
+% ^modif_action="\begin{flushleft} removed"
+% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem
+ \def\lw_iln_fun_enter:three_lines_interlinearization% % Introduces 3-line text-and-gloss.
+ {%\begin{flushleft}
+ \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
+ \vskip\baselineskip\def\baselinestretch{1}%
+ \@selfnt\vskip-\baselineskip\fi%
+ \enter:group
+ \lw_iln_fun_align:three_lines_words
+ }
+% _modif
+
+% todo c. 4-lines global interlinearization processing commands
+% ^added_action="\lw_iln_fun_enter:four_lines_interlinearization defined for initiating 4-lines interlinearization"
+ % ^rem inspired by Alexis Dimitriadis cgloss.sty _rem
+ \def\lw_iln_fun_enter:four_lines_interlinearization% % Introduces 3-line text-and-gloss.
+ {%\begin{flushleft}
+ \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
+ \vskip\baselineskip\def\baselinestretch{1}%
+ \@selfnt\vskip-\baselineskip\fi%
+ \enter:group
+ \lw_iln_fun_align:four_lines_words
+ }
+ % _modif
+
+% todo d. Translation and interlinear end
+% ^modif_action="Is now obsolete"
+% \def\lw_iln_fun_insert:free_translation{} ^rem obsolete _rem
+% _modif
+% ^modif_action="Definition modified"
+ % Introduces a translation
+ \let\trans\relax% ^rem obsolete _rem
+% _modif
+
+ \def\lw_iln_fun_exit:interlinearization{%
+ \lw_iln_fun_insert:interlinear_bottom_skip%
+ }
+ % Ends the gloss environment.
+% _modif
+
+% todo 2. Adaptation of gloss.tex
+
+ % The following TeX code is adapted, with permission, from:
+ % gloss.tex: Macros for vertically aligning words in consecutive sentences.
+ % Version: 1.0 release: 26 November 1990
+ % Copyright (c) 1991 Marcel R. van der Goot (marcel@cs.caltech.edu).
+ % Original Midnight/gloss.tex and Midnight/gloss.doc are available from
+ % csvax.cs.caltech.edu [131.215.131.131] in pub/tex
+ % and many other anonymous ftp archives.
+
+% todo a. Box Variables Declaration
+ \newbox\lw_iln_var_box:line_one% boxes with words from first line
+ \newbox\lw_iln_var_box:line_two%
+ \newbox\lw_iln_var_box:line_three%
+ \newbox\lw_iln_var_box:line_four% ^rem ADDED _rem
+ \newbox\lw_iln_var_box:word_one% a word from the first line (hbox)
+ \newbox\lw_iln_var_box:word_two%
+ \newbox\lw_iln_var_box:word_three%
+ \newbox\lw_iln_var_box:word_four% ^rem ADDED _rem
+ \newbox\lw_iln_var_box:iln_text_lines% the constructed double line (hbox)
+
+% todo b. Skip Variable Declaration and setting
+ \newskip\lw_iln_glue:inter_word_space% extra glue between glossed pairs or triples
+ \lw_iln_glue:inter_word_space = 0pt plus 2pt minus 1pt % allow stretch/shrink between words
+ %\lw_iln_glue:inter_word_space = 5pt plus 2pt minus 1pt % allow stretch/shrink between words
+ \newlength{\lw_iln_length:base_line_stretch}
+ \setlength{\lw_iln_length:base_line_stretch}{.61ex}
+
+ \AtBeginDocument{%
+ \def\lw_iln_fun_calc:line_stretch_factor{%
+ \ifdim\baselinestretch\p@=1\p@%
+ \def\lw_iln_multiplier:line_stretch_factor{.5}
+ \else%
+ \ifdim\baselinestretch\p@<1.26\p@%
+ \def\lw_iln_multiplier:line_stretch_factor{.5}
+ \else%
+ \ifdim\baselinestretch\p@<1.6\p@
+ \def\lw_iln_multiplier:line_stretch_factor{1.6}
+ \else%
+ \ifdim\baselinestretch\p@>1.6\p@
+ \def\lw_iln_multiplier:line_stretch_factor{2.23}
+ \else%
+ \ifdim\baselinestretch\p@=1.6\p@
+ \def\lw_iln_multiplier:line_stretch_factor{2.23}
+ \else%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ }
+ \lw_iln_fun_calc:line_stretch_factor%
+ %
+ \newlength{\lw_iln_length:line_spread}
+ \setlength{\lw_iln_length:line_spread}{0ex}
+ \addtolength{\lw_iln_length:line_spread}{\lw_iln_multiplier:line_stretch_factor\lw_iln_length:base_line_stretch}
+ \addtolength{\lw_iln_length:line_spread}{.16\lw_iln_length:base_line_stretch}
+ }
+ %\addtolength{\lw_iln_length:line_spread}{\lw_iln_multiplier:line_stretch_factor\lw_iln_length:base_line_stretch}
+
+
+% todo c. Boolean Declaration
+ \newif\ifnotdone
+
+% todo d. \rmfamily font declaraton (for backward compatibility)
+ % For any REALLY old distributions without \rmfamily
+ \@ifundefined{rmfamily}{\let\rmfamily=\rm}
+
+% todo e. Définition functions controlling the appearance of words in each line of the interlinearized text
+% ^modified_action="Adding low level commands to format different aspects of the appearence of words"
+\@ifundefined{lw_iln_fun_set:line_one_words_format}%
+ {\newcommand\lw_iln_fun_set:line_one_words_format{%
+ \lw_iln_fun_set:line_one_words_font_size%
+ \lw_iln_fun_set:line_one_words_font_series%
+ \lw_iln_fun_set:line_one_words_font_shape%
+ \lw_iln_fun_set:line_one_words_font_color%
+ }
+ }{\relax}
+ % ^added
+ \let\lw_iln_fun_set:line_one_words_font_size=\normalsize
+ \let\lw_iln_fun_set:line_one_words_font_series=\mdseries%
+ \let\lw_iln_fun_set:line_one_words_font_shape=\upshape%
+ \let\lw_iln_fun_set:line_one_words_font_color=\normalcolor%
+ % _added
+ %
+\@ifundefined{lw_iln_fun_set:line_two_words_format}%
+ {\newcommand\lw_iln_fun_set:line_two_words_format{%
+ \lw_iln_fun_set:line_two_words_font_size%
+ \lw_iln_fun_set:line_two_words_font_series%
+ \lw_iln_fun_set:line_two_words_font_shape%
+ \lw_iln_fun_set:line_two_words_font_color}
+ }%
+ {\relax}
+%
+ % ^added
+ \let\lw_iln_fun_set:line_two_words_font_size=\normalsize
+ \let\lw_iln_fun_set:line_two_words_font_series=\mdseries%
+ \let\lw_iln_fun_set:line_two_words_font_shape=\upshape%
+ \let\lw_iln_fun_set:line_two_words_font_color=\normalcolor%
+ % _added
+ %
+\@ifundefined{lw_iln_fun_set:line_three_words_format}{%
+ \newcommand\lw_iln_fun_set:line_three_words_format{%
+ \lw_iln_fun_set:line_three_words_font_size%
+ \lw_iln_fun_set:line_three_words_font_series%
+ \lw_iln_fun_set:line_three_words_font_shape%
+ \lw_iln_fun_set:line_three_words_font_color}
+ }{\relax}
+ % ^added
+ \let\lw_iln_fun_set:line_three_words_font_size=\normalsize
+ \let\lw_iln_fun_set:line_three_words_font_series=\mdseries%
+ \let\lw_iln_fun_set:line_three_words_font_shape=\upshape%
+ \let\lw_iln_fun_set:line_three_words_font_color=\normalcolor%
+ % _added
+ %
+%
+\@ifundefined{lw_iln_fun_set:line_four_words_format}{%
+ \newcommand\lw_iln_fun_set:line_four_words_format{%
+ \lw_iln_fun_set:line_four_words_font_size%
+ \lw_iln_fun_set:line_four_words_font_series%
+ \lw_iln_fun_set:line_four_words_font_shape%
+ \lw_iln_fun_set:line_four_words_font_color}
+ }{\relax}% ^rem ADDED _rem
+ % ^added
+ \let\lw_iln_fun_set:line_four_words_font_size=\normalsize
+ \let\lw_iln_fun_set:line_four_words_font_series=\mdseries%
+ \let\lw_iln_fun_set:line_four_words_font_shape=\upshape%
+ \let\lw_iln_fun_set:line_four_words_font_color=\normalcolor%
+ % _added
+ %
+% _modified
+% todo f. General Interlinearization Functions Definition
+ \def\lw_iln_fun_get:last_word#1#2#3% #1 = \each, #2 = line box, #3 = word box
+ {\setbox#2=\vbox{\unvbox#2%
+ \global\setbox#3=\lastbox%
+ }%
+ \ifvoid#3\global\setbox#3=\hbox{#1\strut{} }\fi
+ % extra space following \strut in case #1 needs a space
+ }
+
+ \def\lw_iln_check:words_queue_emptyness
+ {\ifdim\ht\lw_iln_var_box:line_one=0pt
+ \ifdim\ht\lw_iln_var_box:line_two=0pt \notdonefalse % tricky space after pt
+ \else\notdonetrue
+ \fi
+ \else\notdonetrue
+ \fi
+ }
+
+ \gdef\lw_iln_fun_get:line_words(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder
+ {\setbox#1=\vbox{\hbox{#2{\strut#3} }% adds space
+ \unvbox#1%
+ }%
+ \def\lw_iln_process:words_queue{#4}%
+ \ifx\lw_iln_process:words_queue\empty\let\lw_iln_process:words_queue=\lw_iln_fun_exit:word_extraction
+ \else\let\lw_iln_process:words_queue=\lw_iln_fun_get:line_words
+ \fi
+ \lw_iln_process:words_queue(#1,#2)#4\\%
+ }
+
+ \gdef\lw_iln_fun_exit:word_extraction(#1,#2)\\{}%
+
+% todo g. Processing of 2-lines interlinear texts
+% ^modif_action"Rename \twosent into original twosent"
+ \gdef\lw_iln_fun_align:two_lines_words#1\\ #2\\{% #1 = first line, #2 = second line
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\%
+ \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}%
+ \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines
+ \hskip\lw_iln_glue:inter_word_space
+ \vtop{\box\lw_iln_var_box:word_one % vtop was vbox
+ \nointerlineskip
+ \box\lw_iln_var_box:word_two
+ }%
+ }%
+ \lw_iln_check:words_queue_emptyness
+ \ifnotdone
+ \repeat
+ \exit:group % matches \enter:group in \gloss
+ \lw_iln_fun_exit:words_alignment}
+% _modif
+
+
+% todo h. Processing of 3-lines interlinear texts
+ \gdef\lw_iln_fun_align:three_lines_words#1\\ #2\\ #3\\{% #1 = first line, #2 = second line, #3 = third
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_three,\lw_iln_fun_set:line_three_words_format)#3 \\%
+ \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_three_words_format}{\lw_iln_var_box:line_three}{\lw_iln_var_box:word_three}%
+ \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines
+ \hskip\lw_iln_glue:inter_word_space
+ \vtop{\box\lw_iln_var_box:word_one % vtop was vbox
+ \nointerlineskip
+ \box\lw_iln_var_box:word_two
+ \nointerlineskip
+ \box\lw_iln_var_box:word_three
+ }%
+ }%
+ \lw_iln_check:words_queue_emptyness
+ \ifnotdone
+ \repeat
+ \exit:group % matches \enter:group in \gloss
+ \lw_iln_fun_exit:words_alignment}
+
+
+% todo i. Processing of 4-lines interlinear texts
+% ^added_action"Four lines interlinear processor, equivalent to an hypothetic \foursent for gloss.tex based interlinearization packages"
+\gdef\lw_iln_fun_align:four_lines_words#1\\ #2\\ #3\\ #4\\{% #1 = first line, #2 = second line, #3 = third
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_three,\lw_iln_fun_set:line_three_words_format)#3 \\%
+ \lw_iln_fun_get:line_words(\lw_iln_var_box:line_four,\lw_iln_fun_set:line_four_words_format)#4 \\%
+ \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_three_words_format}{\lw_iln_var_box:line_three}{\lw_iln_var_box:word_three}%
+ \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_four_words_format}{\lw_iln_var_box:line_four}{\lw_iln_var_box:word_four}%
+ \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines
+ \hskip\lw_iln_glue:inter_word_space
+ \vtop{\box\lw_iln_var_box:word_one % vtop was vbox
+ \nointerlineskip
+ \box\lw_iln_var_box:word_two
+ \nointerlineskip
+ \box\lw_iln_var_box:word_three
+ \nointerlineskip
+ \box\lw_iln_var_box:word_four
+ }%
+ }%
+ \lw_iln_check:words_queue_emptyness
+ \ifnotdone
+ \repeat
+ \exit:group % matches \enter:group in \gloss
+ \lw_iln_fun_exit:words_alignment}
+
+% _added
+
+
+% todo j. Ending interlinearization
+% ^modif_action="\end{flushleft} removed"
+% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem
+ \def\lw_iln_fun_exit:words_alignment{{\hskip -\lw_iln_glue:inter_word_space}\unhbox\lw_iln_var_box:iln_text_lines}
+% _modif
+% todo * exit:cgloss4e modifications
+
+% todo 1. Other added features
+% todo a. Managing line spacing after interlinearization
+\def\baselinestretch{1}
+\def\lw_iln_fun_insert:interlinear_bottom_skip{\vskip \lw_iln_length:line_spread}%
+
+% todo b. Configuring ex-parts boxes
+
+% ^rem Examples will now be placed within boxes, alongside glosses lines (old genericx.tex's \mb and \gl lines), and hanging bracketed language informations (like LangSci jamboxes) _rem
+% todo i. Setting Lengths
+% ===============
+% Setting Lengths
+% ===============
+%
+
+\newlength{\lw_iln_var_dim:ex_box_width}
+\newlength{\lw_iln_var_dim:ex_box_right_margin}
+%\newlength{\lw_iln_var_dim:ex_box_bottom_sep}
+%\newlength{\lw_iln_var_dim:ex_box_top_sep}
+\newlength{\lw_iln_var_dim:iln_box_width}
+\newlength{\lw_iln_var_dim:iln_box_right_margin}
+%\newlength{\lw_iln_var_dim:iln_box_bottom_sep}
+%\newlength{\lw_iln_var_dim:iln_box_top_sep}
+\newlength{\lw_iln_var_dim:trans_box_width}
+\newlength{\lw_iln_var_dim:trans_box_right_margin}
+\newlength{\lw_iln_var_dim:gramjudg_len}
+\newlength{\lw_iln_var_dim:gramjudg_reserved_space}
+\newlength{\lw_iln_var_dim:langinfo_box_width}
+\newlength{\lw_iln_var_dim:langinfo_box_left_sep}
+\newlength{\lw_iln_var_dim:langinfo_box_right_sep}
+\newlength{\lw_iln_var_dim:langinfo_reserved_space}
+%\newlength{\lw_iln_var_dim:langinfo_left_margin}
+\newlength{\lw_iln_var_dim:extranote_box_width}
+\newlength{\lw_iln_var_dim:extranote_box_left_sep}
+\newlength{\lw_iln_var_dim:extranote_box_right_sep}
+\newlength{\lw_iln_var_dim:extranote_reserved_space}
+%\newlength{\lw_iln_var_dim:extranote_left_margin}
+
+% Initializing lengths
+\setlength{\lw_iln_var_dim:ex_box_width}{\linewidth}
+\setlength{\lw_iln_var_dim:ex_box_right_margin}{0ex}
+\setlength{\lw_iln_var_dim:iln_box_width}{\linewidth}
+\setlength{\lw_iln_var_dim:iln_box_right_margin}{0ex}
+\setlength{\lw_iln_var_dim:trans_box_width}{\linewidth}
+\setlength{\lw_iln_var_dim:trans_box_right_margin}{0ex}
+\addtolength{\lw_iln_var_dim:trans_box_width}{-\lw_iln_var_dim:trans_box_right_margin}
+\setlength{\lw_iln_var_dim:gramjudg_len}{0ex}% ^rem default value _rem
+\setlength{\lw_iln_var_dim:langinfo_box_width}{0ex}% ^rem default value _rem
+\setlength{\lw_iln_var_dim:langinfo_reserved_space}{0ex}
+\setlength{\lw_iln_var_dim:langinfo_box_left_sep}{3.4ex}
+\setlength{\lw_iln_var_dim:langinfo_box_right_sep}{3.4ex}
+\setlength{\lw_iln_var_dim:extranote_box_width}{0ex}% ^rem default value _rem
+\setlength{\lw_iln_var_dim:extranote_reserved_space}{0ex}
+\setlength{\lw_iln_var_dim:extranote_box_left_sep}{0pt}
+\setlength{\lw_iln_var_dim:extranote_box_right_sep}{0pt}
+
+% ===========================
+% Defining Booleans for Boxes
+% Opennings
+% ===========================
+\newif\ifnoglosslines%
+\noglosslinestrue
+% todo ii. Defining Opening CS for Boxes
+% =============================
+% Defining Opening CS for Boxes
+% =============================
+\NewDocumentCommand{\lw_iln_fun_open:ex_box}{}{%
+ % ^rem example box opening code _rem
+ % ^rem \lw_iln_fun_open:ex_box should be called after \label{key} to avoid linebreak _rem
+ % ^rem no_op command _rem
+ }
+\NewDocumentCommand{\lw_iln_fun_open:iln_box}{}{%
+ % ^rem interlinear text box opening code _rem
+ \addtolength{\lw_iln_var_dim:iln_box_width}{-1.15\lw_iln_var_dim:langinfo_reserved_space}%
+ \begin{itemize}[%
+ align=left,%
+ labelwidth=\lw_iln_var_dim:gramjudg_len,%
+ leftmargin=\lw_iln_var_dim:gramjudg_reserved_space]%
+ \item[\lw_iln_fun_print:gramjudg]%
+ \begin{minipage}[t]{\lw_iln_var_dim:iln_box_width}%
+}
+\NewDocumentCommand{\lw_iln_fun_open:langinfo_box}{}{%
+ % ^rem language info box opening code _rem
+ \begin{minipage}[t]{\lw_iln_var_dim:langinfo_box_width}
+}
+\NewDocumentCommand{\lw_iln_fun_open:trans_box}{}{%
+ \setlength{\lw_iln_var_dim:trans_box_width}{\linewidth}
+ \addtolength{\lw_iln_var_dim:trans_box_width}{-1.069\lw_iln_var_dim:extranote_reserved_space}%
+ \trans \begin{minipage}[b]{\lw_iln_var_dim:trans_box_width}
+}
+\NewDocumentCommand{\lw_iln_fun_open:extra_note_box}{}{%
+ \begin{minipage}[t]{\lw_iln_var_dim:extranote_box_width}%
+ \raggedright%
+ }
+
+% todo iii. Defining Closing CS for Boxes
+% =============================
+% Defining Closing CS for Boxes
+% =============================
+\def\lw_iln_fun_format:ex_text{\normalfont}%
+\NewDocumentCommand{\lw_iln_fun_close:ex_box}{}{%
+ % ^rem example box closing code _rem
+ \setlength{\lw_iln_var_dim:trans_box_width}{\linewidth}
+ \addtolength{\lw_iln_var_dim:trans_box_width}{-\lw_iln_var_dim:gramjudg_reserved_space}
+ \addtolength{\lw_iln_var_dim:trans_box_width}{-1.0618\lw_iln_var_dim:extranote_reserved_space}%
+ \IfValueArgTF{\lw_iln_var_stored:gramjudg_text}{}{\relax}%
+ {\begin{minipage}[t]{\lw_iln_var_dim:gramjudg_len}
+ \lw_iln_fun_print:gramjudg%
+ \end{minipage}}
+ \begin{minipage}[t]{\lw_iln_var_dim:trans_box_width}
+ \lw_iln_fun_format:ex_text%
+ \lw_iln_var_stored:free_trans_text\space%
+ \normalfont%
+ \IfValueArgTF{\lw_iln_var_stored:reference_text}{}{\relax}{\lw_iln_fun_print:reference}%
+ \end{minipage}
+ \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}{\relax}%
+ {\vskip -2.6ex
+ \hfill%
+ \begin{minipage}[t]{\lw_iln_var_dim:extranote_box_width}
+ (\lw_iln_var_stored:extranote_text)%
+ \end{minipage}}%
+}
+\NewDocumentCommand{\lw_iln_fun_close:iln_box}{}{%
+ % ^rem interlinear text box closing code _rem
+ \lw_iln_fun_exit:interlinearization
+ \end{minipage}\lw_iln_fun_print:langinfo%
+ \end{itemize}
+}
+\NewDocumentCommand{\lw_iln_fun_close:langinfo_box}{}{%
+ % ^rem language info box closing code _rem
+ \end{minipage}%
+}
+\NewDocumentCommand{\lw_iln_fun_close:extranote_box}{}{%
+ \end{minipage}%
+}
+\NewDocumentCommand{\lw_iln_fun_close:trans_box}{}{%
+ \end{minipage}\hfill%
+}
+
+% todo iv. Defining CS for setting or inserting example parts or metadata
+\def\lw_iln_var_stored:langinfo_text{}
+% the * and : versions print the language name as a title.
+% If \lw_iln_fun_set:langinfo if followed by an ex_box, use the * version
+% If there is some text -- e.g. specifying the context for the data -- before the ex_box, use the : version
+% To print the language information as a margin note, use the "bear" version
+\NewDocumentCommand{\langinfo}{s t/ m }{%
+ \IfBooleanTF{#1}%
+ {{\normalfont #3}}%
+ {%
+ \IfBooleanTF{#2}%
+ {{\normalfont #3}\\}%
+ {\def\lw_iln_var_stored:langinfo_text{#3}
+ \settowidth{\lw_iln_var_dim:langinfo_box_width}{#3}
+ \setlength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_width}
+ \addtolength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_left_sep}
+ \addtolength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_right_sep}
+ }%
+ }%
+}%
+
+\NewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo{#1}}
+\NewDocumentCommand{\lw_iln_fun_make:langinfo_box}{}{%
+ \ifthenelse{\equal{\lw_iln_var_stored:langinfo_text}{}}{}{%
+ \marginnote{\hskip -\lw_iln_var_dim:langinfo_reserved_space\lw_iln_fun_open:langinfo_box%
+ {\normalfont(\lw_iln_var_stored:langinfo_text)}%
+ \lw_iln_fun_close:langinfo_box}[0cm]%
+ }%
+}
+\NewCommandCopy{\lw_iln_fun_print:langinfo}{\lw_iln_fun_make:langinfo_box}
+
+\def\lw_iln_var_stored:gramjudg_text{}
+\NewDocumentCommand{\lw_iln_fun_set:gramjudg}{m}{%
+ \def\lw_iln_var_stored:gramjudg_text{#1}%
+ \settowidth{\lw_iln_var_dim:gramjudg_len}{#1}%
+ \setlength{\lw_iln_var_dim:gramjudg_reserved_space}{\lw_iln_var_dim:gramjudg_len}%
+ \addtolength{\lw_iln_var_dim:gramjudg_reserved_space}{1ex}%
+}
+\NewDocumentCommand{\lw_iln_fun_print:gramjudg}{}{%
+ \ifthenelse{\equal{\lw_iln_var_stored:gramjudg_text}{}}{}{%
+ {\normalfont\lw_iln_var_stored:gramjudg_text}%
+ }%
+}
+\def\lw_iln_var_stored:extranote_text{}
+\def\lw_iln_var_token:extranote_left_punct{{(}}%
+\def\lw_iln_fun_format:extranote{\normalfont}
+\def\lw_iln_var_token:extranote_right_punct{{)}}%
+\NewDocumentCommand{\lw_iln_fun_add:extranote}{m}{%
+ \def\lw_iln_var_stored:extranote_text{#1}%
+ \settowidth{\lw_iln_var_dim:extranote_box_width}{#1}
+ \ifdimgreater{\lw_iln_var_dim:extranote_box_width}{113.2pt}%
+ {\setlength{\lw_iln_var_dim:extranote_box_width}{113.2pt}}%
+ {\settowidth{\lw_iln_var_dim:extranote_box_width}{#1}}%
+ \setlength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_width}%
+ \addtolength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_left_sep}
+ \addtolength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_right_sep}%
+}
+\NewDocumentCommand{\lw_iln_fun_make:extranote_box}{}{%
+ \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}%
+ {}%
+ {\lw_iln_fun_open:extra_note_box%
+ \lw_iln_var_token:extranote_left_punct%
+ \lw_iln_fun_format:extranote%
+ \lw_iln_var_stored:extranote_text%
+ \normalfont%
+ \lw_iln_var_token:extranote_right_punct%
+ \lw_iln_fun_close:extranote_box}
+}
+
+\def\lw_iln_var_stored:free_trans_text{}
+\NewDocumentCommand{\lw_iln_fun_set:free_translation}{m}{%
+ \def\lw_iln_var_stored:free_trans_text{#1}
+}
+\def\lw_iln_var_stored:literal_trans_text{}
+\NewDocumentCommand{\lw_iln_fun_set:literal_trans_text}{m}{%
+ \def\lw_iln_var_stored:literal_trans_text{#1}
+}
+\def\lw_iln_var_stored:reference_text{}
+\NewDocumentCommand{\lw_iln_fun_set:reference}{m}{%
+ \def\lw_iln_var_stored:reference_text{#1}
+}
+\NewDocumentCommand{\lw_iln_fun_print:free_trans}{}{%
+ \IfValueArgTF{\lw_iln_var_stored:free_trans_text}{}{}%
+ {`\lw_iln_var_stored:free_trans_text'}}
+\NewDocumentCommand{\lw_iln_fun_print:literal_trans}{}{%
+ \IfValueArgTF{\lw_iln_var_stored:literal_trans_text}{}{}%
+ {(Lit.: `\lw_iln_var_stored:literal_trans_text')}}
+\NewDocumentCommand{\lw_iln_fun_print:reference}{}{%
+ \IfValueArgTF{\lw_iln_var_stored:reference_text}{}{}%
+ {{[}\lw_iln_var_stored:reference_text{]}}}
+%
+\NewDocumentCommand{\lw_iln_fun_make:trans_box}{}{%
+ \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}%
+ {\lw_iln_fun_open:trans_box%
+ \lw_iln_fun_print:free_trans\space %
+ \lw_iln_fun_print:literal_trans\space %
+ \lw_iln_fun_print:reference\space %
+ \lw_iln_fun_close:trans_box}%
+ {\lw_iln_fun_open:trans_box%
+ \raggedright
+ \lw_iln_fun_print:free_trans\space %
+ \lw_iln_fun_print:literal_trans\space %
+ \lw_iln_fun_print:reference\space %
+ \lw_iln_fun_close:trans_box}
+}
+
+\def\lw_iln_fun_format:context_label{\normalfont}
+\def\lw_iln_var_name:context{Context:}
+\def\lw_iln_fun_insert:context#1{%
+ \IfValueArgTF{#1}{}{}%
+ {\lw_iln_fun_format:context_label\lw_iln_var_name:context\normalfont~#1\\[-1.3\baselineskip]}
+}
+
+\def\lw_iln_fun_reinitialize:markers_value{%
+ \def\lw_iln_var_stored:extranote_text{}
+ \def\lw_iln_var_stored:free_trans_text{}
+ \def\lw_iln_var_stored:gramjudg_text{}
+ \def\lw_iln_var_stored:langinfo_text{}
+ \def\lw_iln_var_stored:literal_trans_text{}
+ \def\lw_iln_var_stored:reference_text{}
+}
+
+% todo v. Defining long (internal commands)
+\def\lw_iln_var_num:interlinear_lines{2}
+
+\def\lw_iln_tag:line_one_marker{% LEV version
+ \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{2}%
+ {\lw_iln_fun_open:iln_box
+ \lw_iln_fun_enter:two_lines_interlinearization}{}%
+ \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{3}%
+ {\lw_iln_fun_open:iln_box
+ \lw_iln_fun_enter:three_lines_interlinearization}{}%
+ \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{4}%
+ {\lw_iln_fun_open:iln_box
+ \lw_iln_fun_enter:four_lines_interlinearization}{}%
+}%
+
+\let\lw_iln_tag:Text_marker\lw_iln_tag:line_one_marker% ^rem is typeset in italics by default. The starred version introduces a two-line interlinear gloss text. ^caution Do not use it together with \lw_iln_MorphBreak_marker : they mean the same thing. So you will get error messages. _caution _rem
+%
+\def\lw_iln_tag:Morpheme_Break_marker% ^rem typeset in roman -- by default -- (intended to host API translations). Introduces a 2-line interlinear gloss text. _rem
+{\IfValueArgTF{\lw_iln_var_num:interlinear_lines}{2}%
+ {\lw_iln_tag:line_one_marker}%
+ {\relax}%
+}%
+
+\def\lw_iln_tag:Gloss_marker% ^rem \ge is already defined in LaTeX. \lw_iln_tag:Gloss_marker introduces a two-line interlinear gloss text. _rem
+{\relax}%
+%
+\def\lw_iln_tag:Part_of_speech_marker{\relax}
+
+% LEV Syntax sensitive CS
+\def\lw_iln_tag:Free_translation_marker#1\\%
+ {\IfValueArgTF{\lw_iln_var_num:interlinear_lines}{0}
+ {\lw_iln_fun_set:free_translation{#1}}
+ {\lw_iln_fun_close:iln_box%
+ \lw_iln_fun_set:free_translation{#1}}}% ^rem CAUTION: The Free Translation marker should be present even if there is actually no free translation provided. _rem
+%
+\def\lw_iln_tag:Literal_translation_marker#1\\%
+{\lw_iln_fun_set:literal_trans_text{#1}}
+\def\lw_iln_tag:Reference_marker#1\\%
+{\lw_iln_fun_set:reference{#1}}
+\def\lw_iln_tag:Language_information_marker#1\\%
+{\lw_iln_fun_set:langinfo{#1}}
+\def\lw_iln_tag:Grammaticality_Judgment_marker#1\\%
+{\lw_iln_fun_set:gramjudg{#1}}
+\newlength{\lw_iln_var_dim:context_voffset}
+\setlength{\lw_iln_var_dim:context_voffset}{-1em}
+\def\lw_iln_tag:Context_marker#1\\%
+{\lw_iln_fun_insert:context{#1}\\[\lw_iln_var_dim:context_voffset]}
+\def\lw_iln_tag:Extra_note_marker#1\\%
+ {\lw_iln_fun_add:extranote{#1}}
+
+
+% _cs-definitions
+
+% todo vi. Low-level commands
+
+% ^section_title="User Commands and Envs to Typeset Interlinear Gloss Texts"
+% DEFINE: interlinear environment
+% DEFINE: Text tagging cs
+% The cs are named after the standard tags used in Linguist's Field's Toolbox by SIL (see Interlinear macro in ToolboxInterlinearMacroText.docm)
+% ^important Please use the short versions (in brackets). The long versions are internal commands to be use for later eventual modifications _important
+% \lw_iln_tag:Text_marker (\tx) ^rem is typeset in italic either in tri-gloss or in di-gloss envs. In di-gloss env, \tx and \mb mean the same thing. _rem
+%\lw_iln_tag:MorphBreak_marker (\mb) ^rem typeset in roman -- by default -- (intended to host API translations) _rem
+%\lw_iln_tag:Gloss_marker (\gl) % \ge is already defined in LaTeX
+%\lw_iln_tag:FreeTranslation_marker (\ft)
+% \lw_iln_tag:Reference_marker (\rf) ^rem \ref is a primitive _rem
+% --------------------------------
+% Markers not present in Toolbox defaults
+% --------------------------------
+% \lw_iln_tag:Language_information_marker (\li)
+% \lw_iln_tag:Grammaticality_Judgment_marker (\gj)
+% \lw_iln_tag:Context_marker (\ct)
+%
+% \lw_iln_tag:Literal_translation_marker (\lt)
+% \lw_iln_tag:Extra_note_marker (\nt)
+%
+% ^cs-definitions
+%\let\tx\lw_iln_tag:Text_marker% ^rem is typeset in italic either in tri-gloss or in di-gloss envs. In di-gloss env, \tx and \mb mean the same thing. _rem
+\let\mb\lw_iln_tag:Morpheme_Break_marker% ^rem typeset in roman -- by default -- (intended to host API translations) _rem
+\let\gl\lw_iln_tag:Gloss_marker% ^rem \ge is already defined in LaTeX _rem
+%\let\ft\lw_iln_tag:Free_translation_marker%
+\let\ps\lw_iln_tag:Part_of_speech_marker
+%
+\NewCommandCopy{\li}%
+{\lw_iln_tag:Language_information_marker}%
+\NewCommandCopy{\rf}%
+{\lw_iln_tag:Reference_marker}%
+\NewCommandCopy{\gj}%
+{\lw_iln_tag:Grammaticality_Judgment_marker}
+\NewCommandCopy{\ct}%
+{\lw_iln_tag:Context_marker}
+\NewCommandCopy{\lt}%
+{\lw_iln_tag:Literal_translation_marker}%
+\NewCommandCopy{\nt}%
+ {\lw_iln_tag:Extra_note_marker}
+
+% todo c. Defining Interlinear Env. Options
+% ----------------------
+% | Describing options |
+% ----------------------
+
+% # Options:
+
+% - argendchar: (not available for the moment) return, par, lineend
+% return : takes the current line as argument, do not put anything else (e.g. {}, or \\)
+% lineend : idem
+% par : argument is ended by "\\" like e.g. in cgloss4e
+% (NOTE: this option scopes over all the markers, not only interlinear text markers \tx, \mb, \gl, \ps)
+
+% - linesnumber: full, 2, 3
+% full : 4-lines (By default it is disabled in the main text)
+% 2 : Only one gloss line is printed (\gl); \mb and \tx are then treated are incompatible to each other so
+% that only of them should be used. If this option is used, you should specifiy the first-line of the
+% interlinear text via first-line option
+% 3 : only \ps is not printedand all the other lines \tx, \mb and \gl should be non-empty
+
+% * Setting markers *
+
+% Sets the marker used for the different parts. Actually tells lingwrit-interlinear to define the corresponding command so as to fit the definition of the
+% default marker (e.g. text_marker=\ot tells lingwrit-interlinear to add the following: \let\ot\tx)
+% - textmarker=
+% - morphbreakmarker=
+% - glossmarker= (You shouldn't set it to \ge. But if this happens, note that lingwrit-interlinear will redefine \ge to equal to \gl, define a new
+% command \gteq to replace \ge and issue a warning message)
+% - partofspeechmarker=
+% - freetranslationmarker=
+% - literaltranslationmarker=
+% - grammaticalityjudgmentmarker=
+% - contextmarker=
+% - extranotemarker=
+% - languageinfomarker=
+% - referencemarker=
+
+% * Format specifications *
+
+% (May include font size, shape, series and color. If color command is used (e.g. \color{blue}), then make sure to have xcolor loaded)
+% - lineoneformat={}
+% - linetwoformat={}
+% - linethreeformat={}
+% - linefourformat={}
+% - extranoteformat={}
+% - contextnameformat={}
+
+% * Other specifications *
+
+% - contextname={} ^rem The displayed label for context. default value is "Context:" _rem
+% - extranoteleftpunct= ^rem the punctuation preceding the extra note. Default value: ( _rem
+% - extranoterightpunct= ^rem the punctuation following the extra note. Default value: ) _rem
+
+% todo i. Declaring Options
+\NewCommandCopy{\lw_iln_var_opt:textmarker}{\lw_iln_tag:Text_marker}
+\NewCommandCopy{\lw_iln_var_opt:morphbreakmarker}{\lw_iln_tag:Morpheme_Break_marker}
+\NewCommandCopy{\lw_iln_var_opt:glossmarker}{\lw_iln_tag:Gloss_marker}
+\NewCommandCopy{\lw_iln_var_opt:partofspeechmarker}{\lw_iln_tag:Part_of_speech_marker}
+\NewCommandCopy{\lw_iln_var_opt:freetranslationmarker}{\lw_iln_tag:Free_translation_marker}
+\NewCommandCopy{\lw_iln_var_opt:literaltranslationmarker}{\lw_iln_tag:Literal_translation_marker}
+\NewCommandCopy{\lw_iln_var_opt:extranotemarker}{\lw_iln_tag:Extra_note_marker}
+\NewCommandCopy{\lw_iln_var_opt:languageinfomarker}{\lw_iln_tag:Language_information_marker}
+\NewCommandCopy{\lw_iln_var_opt:gramjudgmarker}{\lw_iln_tag:Grammaticality_Judgment_marker}
+\NewCommandCopy{\lw_iln_var_opt:referencemarker}{\lw_iln_tag:Reference_marker}
+\NewCommandCopy{\lw_iln_var_opt:contextmarker}{\lw_iln_tag:Context_marker}
+
+\NewDocumentCommand{\lw_iln_var_opt:languageinfopos}{m}{%
+ \IfValueArgTF{#1}{head}{\RenewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo/{##1}}}{}
+ \IfValueArgTF{#1}{margin}{\RenewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo{##1}}}{}
+}
+
+\NewDocumentCommand{\lw_iln_var_opt:nointerlinear}{m}{%
+ \IfValueArgTF{#1}{true}%
+ {\def\lw_iln_var_num:interlinear_lines{0}}%
+ {\IfValueArgTF{#1}{false}%
+ {\relax}%
+ {\PackageWarning{interlinear}{nointerlinear option possible values: true, false}}%
+ }
+}
+\NewDocumentCommand{\lw_iln_var_opt:contextvoffset}{m}{\setlength{\lw_iln_var_dim:context_voffset}{#1}}
+
+% todo ii. Defining Default values
+
+%\def\lw_iln_var_opt:endchar{par}% possible values: par, lineend, return
+\def\lw_iln_var_opt:linesnumber{2}% possible values: 2, 3, full
+\def\lw_iln_var_num:interlinear_lines{\lw_iln_var_opt:linesnumber}
+% Setting markers
+\let\li\lw_iln_var_opt:languageinfomarker
+\let\rf\lw_iln_var_opt:referencemarker
+\let\gj\lw_iln_var_opt:gramjudgmarker
+\let\tx\lw_iln_var_opt:textmarker
+\let\mb\lw_iln_var_opt:morphbreakmarker
+\let\gl\lw_iln_var_opt:glossmarker
+\let\ps\lw_iln_var_opt:partofspeechmarker
+\let\ft\lw_iln_var_opt:freetranslationmarker
+\let\lt\lw_iln_var_opt:literaltranslationmarker
+\let\nt\lw_iln_var_opt:extranotemarker
+\def\lw_iln_var_opt:extranoteleftpunct#1{\def\lw_iln_var_token:extranote_left_punct{#1}}
+\def\lw_iln_var_opt:extranoterightpunct#1{\def\lw_iln_var_token:extranote_right_punct{#1}}
+
+% Setting formats (only available for interlinear/gloss lines, context name and extra notes)
+\def\lw_iln_var_opt:lineoneformat#1{\renewcommand{\lw_iln_fun_set:line_one_words_format}{#1}}
+\def\lw_iln_var_opt:linetwoformat#1{\renewcommand{\lw_iln_fun_set:line_two_words_format}{#1}}
+\def\lw_iln_var_opt:linethreeformat#1{\renewcommand{\lw_iln_fun_set:line_three_words_format}{#1}}
+\def\lw_iln_var_opt:linefourformat#1{\renewcommand{\lw_iln_fun_set:line_four_words_format}{#1}}
+\def\lw_iln_var_opt:exformat#1{\renewcommand{\lw_iln_fun_format:ex_text}{#1}}
+\def\lw_iln_var_opt:extranoteformat#1{\def\lw_iln_fun_format:extranote{#1}}
+\def\lw_iln_var_opt:contextnameformat#1{\def\lw_iln_fun_format:context_label{#1}}
+% Context label/name
+\def\lw_iln_var_opt:contextname#1{\def\lw_iln_var_name:context{#1}}
+
+% Defining CS for resetting default options (to be called at the begining of interlinear env)% ^rem the \setinterlinearstyle is meant to set globally the options for interlinear env. So don't use optional argument of interlinear env anymore since it will overwrite the values set up with this commands and the new values be considered the default ones. _rem
+\def\lw_iln_fun_reinitialize:interlinear_options{%
+ %\def\lw_iln_var_opt:endchar{par}% possible values: par, lineend, return
+ \def\lw_iln_var_opt:linesnumber{2}% possible values: 2, 3, full
+ % Setting markers
+ \let\li\lw_iln_var_opt:languageinfomarker%
+ \let\rf\lw_iln_var_opt:referencemarker%
+ \let\gj\lw_iln_var_opt:gramjudgmarker%
+ \let\tx\lw_iln_var_opt:textmarker
+ \let\mb\lw_iln_var_opt:morphbreakmarker%
+ \let\gl\lw_iln_var_opt:glossmarker%
+ \let\ps\lw_iln_var_opt:partofspeechmarker%
+ \let\ft\lw_iln_var_opt:freetranslationmarker%
+ \let\lt\lw_iln_var_opt:literaltranslationmarker%
+ \let\nt\lw_iln_var_opt:extranotemarker%
+ % Setting formats (only available for interlinear/gloss lines, context name and extra notes)
+ \lw_iln_var_opt:lineoneformat{\normalfont}%
+ \lw_iln_var_opt:linetwoformat{\normalfont}%
+ \lw_iln_var_opt:linethreeformat{\normalfont}%
+ \lw_iln_var_opt:linefourformat{\normalfont}%
+ \lw_iln_var_opt:exformat{\normalfont}
+ \lw_iln_var_opt:extranoteformat{\normalfont}%
+ \lw_iln_var_opt:contextnameformat{\normalfont}%
+ % Context label/name
+ \lw_iln_var_opt:contextname{Context:}%
+ \lw_iln_var_opt:extranoteleftpunct{{(}}%
+ \lw_iln_var_opt:extranoterightpunct{{)}}%
+ \lw_iln_var_opt:languageinfopos{margin}%
+ \lw_iln_var_opt:nointerlinear{false}%
+ \lw_iln_var_opt:contextvoffset{-1em}
+}
+
+% todo iii. Setting Options
+
+% Setting Ending Character for arguments (not yet available)
+%\define@key{interlinear}{endchar}{%
+ % ^action_name="Setting the value"
+% \def\lw_iln_var_opt:endchar{#1}
+ % _action
+ % ^action_name="Processing the option"
+ %
+ % _action
+%}
+
+% Setting the numbers of interlinear/gloss lines
+\define@key{interlinear}{linesnumber}{%
+ % ^action_name="Setting the value"
+ \def\lw_iln_var_opt:linesnumber{#1}
+ % _action
+}
+\define@key{interlinear}{nointerlinear}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:nointerlinear{#1}
+ % _action
+}
+
+% Setting the markers
+\define@key{interlinear}{textmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:textmarker}}
+\define@key{interlinear}{morphbreakmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:morphbreakmarker}}
+\define@key{interlinear}{glossmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:glossmarker}}
+
+\define@key{interlinear}{partofspeechmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:partofspeechmarker}}
+
+\define@key{interlinear}{freetranslationmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:freetranslationmarker}}
+
+\define@key{interlinear}{literaltranslationmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:literaltranslationmarker}}
+
+\define@key{interlinear}{extranotemarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:extranotemarker}}
+
+\define@key{interlinear}{languageinfomarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:languageinfomarker}}
+
+\define@key{interlinear}{gramjudgmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:gramjudgmarker}}
+
+\define@key{interlinear}{referencemarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:referencemarker}}
+
+\define@key{interlinear}{contextmarker}{%
+ \NewCommandCopy{#1}{\lw_iln_var_opt:contextmarker}}
+
+
+% Setting formats
+\define@key{interlinear}{lineoneformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:lineoneformat{#1}
+ % _action
+}
+\define@key{interlinear}{linetwoformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:linetwoformat{#1}
+ % _action
+}
+\define@key{interlinear}{linethreeformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:linethreeformat{#1}
+ % _action
+}
+\define@key{interlinear}{linefourformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:linefourformat{#1}
+ % _action
+}
+\define@key{interlinear}{exformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:exformat{#1}
+ % _action
+}
+\define@key{interlinear}{extranoteformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:extranoteformat{#1}
+ % _action
+}
+\define@key{interlinear}{contextnameformat}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:contextnameformat{#1}
+ % _action
+}
+
+% Other specifications
+\define@key{interlinear}{contextname}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:contextname{#1}
+ % _action
+}
+\define@key{interlinear}{contextvoffset}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:contextvoffset{#1}
+ % _action
+}
+\define@key{interlinear}{extranoteleftpunct}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:extranoteleftpunct{#1}
+ % _action
+}
+\define@key{interlinear}{extranoterightpunct}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:extranoterightpunct{#1}
+ % _action
+}
+\define@key{interlinear}{languageinfopos}{%
+ % ^action_name="Setting the value"
+ \lw_iln_var_opt:languageinfopos{#1}
+ % _action
+}
+
+\newcommand{\interlinearstyle}[1]{%
+ \setkeys{interlinear}{#1}%
+ \lw_fun_helper:clear{\lw_iln_fun_reinitialize:interlinear_options}
+}
+\def\DeclareInterlinearStyle#1#2{%
+ \expandafter\def\csname lw_iln_var_sty:#1\endcsname{\interlinearstyle{#2}}}
+\def\UseInterlinearStyle#1{%
+ \expandafter\csname lw_iln_var_sty:#1\endcsname}
+\DeclareInterlinearStyle{default}{%
+ linesnumber=2,%
+ lineoneformat=\upshape,%
+ linetwoformat=\normalfont,%
+ linethreeformat=\normalfont,%
+ linefourformat=\normalfont,%
+ contextnameformat=\normalfont,%
+ extranoteformat=\normalfont,%
+ contextname={Context:},%
+ extranoteleftpunct={(},%
+ extranoterightpunct={)}%
+}
+\DeclareInterlinearStyle{nointerlinear}{%
+ nointerlinear=true,%
+ languageinfopos=head,%
+ freetranslationmarker=\ot,%
+ contextvoffset=.5em%
+}
+\DeclareInterlinearStyle{gsr}{%
+ linesnumber=2,%
+ lineoneformat=\itshape,%
+ linetwoformat=\normalfont,%
+ linethreeformat=\normalfont%
+}
+\DeclareInterlinearStyle{gsrnointerlinear}{%
+ nointerlinear=true,%
+ exformat=\itshape,%
+ languageinfopos=head,%
+ freetranslationmarker=\ot,%
+ contextvoffset=.5em%
+}
+
+\UseInterlinearStyle{gsr}% ^rem setting the default style to fit the GSR _rem
+
+\define@key{interlinear}{style}{%
+ % ^action_name="Setting the value"
+ \UseInterlinearStyle{#1}
+ % _action
+}
+
+
+% todo d. Defining Interlinear Env.
+\NewDocumentCommand{\lw_iln_fun_enter:interlinear}{}{\relax}% ^rem no_op command _rem
+\NewDocumentCommand{\lw_iln_fun_exit:interlinear}{}{%
+ \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{0}%
+ {\lw_iln_fun_close:ex_box}%
+ {\lw_iln_fun_make:trans_box%
+ \lw_iln_fun_make:extranote_box%
+ \lw_iln_fun_reinitialize:markers_value}%
+ }
+
+\NewDocumentEnvironment{interlinear}{O{}}%
+ {% ^rem Beginning of the internlinear env _rem
+ \lw_iln_fun_enter:interlinear%
+ \lw_iln_fun_reinitialize:interlinear_options%
+ \setkeys{interlinear}{#1}
+ }%
+ {% ^rem End of the interlinear env _rem
+ \lw_iln_fun_exit:interlinear%
+ }
+
+\makeatother%
+
+% ^action_name="Disabling LingWrit Syntax"
+\switchlwsyntaxoff
+% _action
+% ^action_name="Ending the code"
+\endinput%
+% _action
+
+% _code
+
+% ^_*
+
+% _package
diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf
index 21dfafc605d..4863d6ec073 100644
--- a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf
+++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf
index 56aaa821248..d3f23bd6625 100644
--- a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf
+++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf
index fed0023c081..6edd5cce7c2 100644
--- a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf
+++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety.sty b/Master/texmf-dist/tex/latex/isosafety/isosafety.sty
index 852aed35ea6..40cf3076281 100644
--- a/Master/texmf-dist/tex/latex/isosafety/isosafety.sty
+++ b/Master/texmf-dist/tex/latex/isosafety/isosafety.sty
@@ -12,7 +12,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{isosafety}
-[2024/08/20 v1.2 ISO Safety Colors And Safety Signs]
+[2024/08/31 v1.4 ISO Safety Colors And Safety Signs]
\RequirePackage{graphicx}
\RequirePackage{xcolor}
@@ -35,14 +35,12 @@
\DeclareOptionX{fullpath}{\renewcommand{\isosafetypath}{#1}}
\ProcessOptionsX\relax
-\ifthenelse{\equal{\isosafetypath}{false}}
-{\PackageError{isosafety}{Missing key-value option 'fullpath' in usepackage-statement, please see documentation.}{Please provide the full path to this package, usually /texlive/2024/texmf-dist/tex/latex/isosafety}}
-{}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\Isosign}[1]{\isosafetypath /isosafety-pdfs/ISO_7010_#1.pdf}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifthenelse{\equal{\isosafetypath}{false}}
+{\newcommand{\Isosign}[1]{/isosafety-pdfs/ISO_7010_#1.pdf}}
+{\newcommand{\Isosign}[1]{\isosafetypath /isosafety-pdfs/ISO_7010_#1.pdf}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
index 80ab6206501..1dc817a1976 100644
--- a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
+++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty
@@ -1,7 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-complements}[2022/11/28 jlreq-complements]
-\RequirePackage{jlreq-helpers}[2022/11/28]
-\RequirePackage{l3keys2e}
+\ProvidesPackage{jlreq-complements}[2024/08/23 jlreq-complements]
+\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
@@ -9,7 +8,7 @@
\str_new:N \g__jlreq_complements_engine_str
\tl_new:N \g__jlreq_complements_finally
-\keys_define:nn { jlreq-complements } {
+\DeclareKeys [jlreq-complements] {
setupname .code:n = {
\str_set:Nn \g__jlreq_complements_setupname_str {#1}
},
@@ -20,8 +19,8 @@
lualatex .code:n = { \str_set:Nn \g__jlreq_complements_engine_str { lualatex } },
lualatex .value_forbidden:n = true,
}
-\keys_set:nn { jlreq-complements } { setupname = jlreqcomplementssetup }
-\ProcessKeysOptions { jlreq-complements }
+\SetKeys [jlreq-complements] { setupname = jlreqcomplementssetup }
+\ProcessKeyOptions [jlreq-complements]
\str_if_empty:NT \g__jlreq_complements_engine_str {
\jlreq@helper@guessengine
@@ -37,7 +36,8 @@
\str_if_eq:VnTF \g__jlreq_complements_engine_str { lualatex } {
\prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} {
- \int_compare_p:n { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 }
+ \int_compare:nTF { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 }
+ { \prg_return_true: } { \prg_return_false: }
}
}{
\prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \iftdir \prg_return_true: \else \prg_return_false: \fi }
diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
index ec65cabae91..1cded80d8cb 100644
--- a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
+++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
@@ -1,6 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2024/02/13 jlreq-trimmarks]
-\RequirePackage{l3keys2e}
+\ProvidesPackage{jlreq-trimmarks}[2024/08/23 jlreq-trimmarks]
\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
@@ -42,13 +41,13 @@
}
% dvipdfmx=f,dvips=s,dviout = o, lualatex = l
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
dvipdfmx .code:n = {\let\jlreq@trimmarks@driver=f}, .value_forbidden:n = true,
dvips .code:n = {\let\jlreq@trimmarks@driver=s}, .value_forbidden:n = true,
dviout .code:n = {\let\jlreq@trimmarks@driver=o}, .value_forbidden:n = true
}
\let\jlreq@trimmarks@engine=\jlreq@engine
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
lualatex .code:n = {\let\jlreq@trimmarks@engine=l}, .value_forbidden:n = true,
uplatex .code:n = {\let\jlreq@trimmarks@engine=u}, .value_forbidden:n = true,
platex .code:n = {\let\jlreq@trimmarks@engine=p}, .value_forbidden:n = true
@@ -156,7 +155,7 @@
}
\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@analyzepapersize
-\keys_define:nn { jlreq-trimmarks } { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize }
+\DeclareKeys [jlreq-trimmarks] { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize }
\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@option@papersize
\newif\ifjlreq@trimmarks@digital \jlreq@trimmarks@digitaltrue
@@ -166,7 +165,7 @@
% flag: `show` is specified or not
\newif\ifjlreq@trimmarks@option@show \jlreq@trimmarks@option@showfalse
-\keys_define:nn { jlreq-trimmarks } {
+\DeclareKeys [jlreq-trimmarks] {
show .code:n = {
\jlreq@trimmarks@option@showtrue
\jlreq@ifempty{#1}{
@@ -214,14 +213,14 @@
}
\newif\ifjlreq@trimmarks@landscape \jlreq@trimmarks@landscapefalse
-\keys_define:nn { jlreq-trimmarks } { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true }
+\DeclareKeys [jlreq-trimmarks] { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true }
\__jlreq_trimmarks_afterpkg_addtodeleteif:N \ifjlreq@trimmarks@landscape
-\keys_set:nn { jlreq-trimmarks } {
+\SetKeys [jlreq-trimmarks] {
trimmarks_paper = {+2in},
bleed_margin = { top = 3mm, bottom = 3mm, gutter = 3mm, fore-edge = 3mm },
}
-\ProcessKeysOptions { jlreq-trimmarks }
+\ProcessKeyOptions [jlreq-trimmarks]
\ifjlreq@trimmarks@option@show\else
\ifx o\jlreq@trimmarks@driver
diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
index b8e5c3dbcb1..8f14372b389 100644
--- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
+++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
@@ -5,28 +5,39 @@
%%
% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2024/02/16 jlreq]
-\RequirePackage{l3keys2e}
+\ProvidesClass{jlreq}[2024/08/23 jlreq]
\RequirePackage{etoolbox}
\RequirePackage{jlreq-helpers}[2024/02/13]
\ExplSyntaxOn
+\cs_new:Nn \l_jlreq_do: {}
\int_new:N \l__jlreq_tmpa_int
+\int_new:N \l__jlreq_tmpb_int
+\int_new:N \l__jlreq_tmpc_int
\tl_new:N \l__jlreq_tmpa_tl
\tl_new:N \l__jlreq_tmpb_tl
\tl_new:N \l__jlreq_tmpc_tl
-\cs_new:Nn \l_jlreq_do: {}
\str_new:N \l__jlreq_tmpa_str
\str_new:N \l__jlreq_tmpb_str
\str_new:N \l__jlreq_tmpc_str
-\bool_new:N \l_jlreq_tmpa_bool
-\clist_new:N \l_jlreq_tmpa_clist
+\bool_new:N \l__jlreq_tmpa_bool
+\bool_new:N \l__jlreq_tmpb_bool
+\bool_new:N \l__jlreq_tmpc_bool
+\clist_new:N \l__jlreq_tmpa_clist
+\clist_new:N \l__jlreq_tmpb_clist
+\clist_new:N \l__jlreq_tmpc_clist
\seq_new:N \l__jlreq_tmpa_seq
+\seq_new:N \l__jlreq_tmpb_seq
+\seq_new:N \l__jlreq_tmpc_seq
\dim_new:N \l__jlreq_tmpa_dim
-\skip_new:N \l_jlreq_tmpa_skip
-\box_new:N \l_jlreq_tmpa_box
-\box_new:N \l_jlreq_tmpb_box
-\box_new:N \l_jlreq_tmpc_box
+\dim_new:N \l__jlreq_tmpb_dim
+\dim_new:N \l__jlreq_tmpc_dim
+\skip_new:N \l__jlreq_tmpa_skip
+\skip_new:N \l__jlreq_tmpb_skip
+\skip_new:N \l__jlreq_tmpc_skip
+\box_new:N \l__jlreq_tmpa_box
+\box_new:N \l__jlreq_tmpb_box
+\box_new:N \l__jlreq_tmpc_box
\prop_new:N \l__jlreq_tmpa_prop
\prop_new:N \l__jlreq_tmpb_prop
\prop_new:N \l__jlreq_tmpc_prop
@@ -91,7 +102,8 @@
% ものは\jlreq@option@<key>に格納する.
% _とかは@に変換する.
% エンジン類
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
+ name.usage = load,
uplatex .code:n = { \let\jlreq@engine=u }, uplatex .value_forbidden:n = true,
platex .code:n = { \let\jlreq@engine=p }, platex .value_forbidden:n = true,
lualatex .code:n = { \let\jlreq@engine=l }, lualatex .value_forbidden:n = true,
@@ -115,13 +127,13 @@
\tl_gput_right:Nn \g__jlreq_papersizelist_tl { { ##1 } { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } }
}
\clist_map_inline:nn {#2} {
- \keys_define:nn { jlreq } {
+ \DeclareKeys [jlreq] {
##1 .code:n = { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} },
##1 .value_forbidden:n = true
}
}
}
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
paper .code:n = {
\str_case:nVF {#1} \g__jlreq_papersizelist_tl {
\jlreq@helper@dividebycomma{#1}%
@@ -153,7 +165,7 @@
}
\clist_map_inline:nn {#2} {
\cs_set:Nx \l__jlreq_do: {
- \exp_not:N \keys_define:nn { jlreq } {
+ \exp_not:N \DeclareKeys [jlreq] {
##1 .code:n = {
\exp_not:o { \l__jlreq_tmpa:n {##1} }
\exp_not:n { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} }
@@ -276,7 +288,7 @@
%.. フォントサイズ,行長,1ページあたりの行数で基本版面のサイズを決める(2.4.1.a)
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@fontsize
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
fontsize .tl_set:N = \jlreq@option@fontsize,
10pt .code:n = {\def\jlreq@option@fontsize{10pt}}, 10pt .value_forbidden:n = true,
11pt .code:n = {\def\jlreq@option@fontsize{11pt}}, 11pt .value_forbidden:n = true,
@@ -287,69 +299,68 @@
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontsize
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontscale
%.. 行の長さ
-\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq@option@line@length }
+\DeclareKeys [jlreq] { line_length .tl_set:N = \jlreq@option@line@length }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@line@length
%.. 1ページあたりの行数
-\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq@option@number@of@lines }
+\DeclareKeys [jlreq] { number_of_lines .tl_set:N = \jlreq@option@number@of@lines }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@number@of@lines
% 地の空き量,のどの空き量で配置位置を決める(2.4.1.b)省略されたら中央配置.
%.. 天
-\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq@option@head@space }
+\DeclareKeys [jlreq] { head_space .tl_set:N = \jlreq@option@head@space }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@head@space
%.. 地
-\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq@option@foot@space }
+\DeclareKeys [jlreq] { foot_space .tl_set:N = \jlreq@option@foot@space }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@foot@space
%.. のど
-\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq@option@gutter }
+\DeclareKeys [jlreq] { gutter .tl_set:N = \jlreq@option@gutter }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@gutter
%.. 小口
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@fore@edge
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
fore_edge .tl_set:N = \jlreq@option@fore@edge,
fore-edge .tl_set:N = \jlreq@option@fore@edge
}
%.. 柱とノンブル
% 本文とヘッダ/フッタの間の空き
-\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos }
+\DeclareKeys [jlreq] { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@headfoot@verticalpos
% 柱やノンブルの左右の空き
-\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin }
+\DeclareKeys [jlreq] { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin }
%.. 段間
-\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap }
+\DeclareKeys [jlreq] { column_gap .tl_set:N = \jlreq@option@column@gap }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@column@gap
%.. 行送り,指定無しの場合は文字サイズの1.7倍とする.(1.5から2倍が好ましい:2.4.2.d 注3)
-\keys_define:nn { jlreq } {
- baselineskip .tl_set:N = \jlreq@option@baselineskip,
- linegap .code:n = { \def\jlreq@option@baselineskip{1zw + #1} }
+\DeclareKeys [jlreq] {
+ baselineskip .tl_set:N = \jlreqbaselineskip,
+ linegap .code:n = { \def\jlreqbaselineskip{1zw + #1} }
}
-\__jlreq_aftercls_addtodeletecs:N \jlreq@option@baselineskip
%.. 組み方系
% 行頭に括弧が来たときの配置:3.1.5
% 段落頭指定_折り返し行頭指定 で与える.
-\keys_define:nn { jlreq } { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq@open@bracket@pos{#1}} }
+\DeclareKeys [jlreq] { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq@open@bracket@pos{#1}} }
% ぶら下げ組みをするか:3.8.2 注1
\newif\ifjlreq@burasage\jlreq@burasagefalse
-\keys_define:nn { jlreq } { hanging_punctuation .code:n = {\jlreq@burasagetrue}, hanging_punctuation .value_forbidden:n = true}
+\DeclareKeys [jlreq] { hanging_punctuation .code:n = {\jlreq@burasagetrue}, hanging_punctuation .value_forbidden:n = true}
% jsarticleと同じkanjiskipを使う
\newif\ifjlreq@narrow@kanjiskip\jlreq@narrow@kanjiskipfalse
-\keys_define:nn { jlreq } { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
+\DeclareKeys [jlreq] { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@narrow@kanjiskip
%.. 注
% 傍注のタイプ
-\keys_define:nn { jlreq } { sidenote_length .tl_set:N = \jlreq@option@sidenote@length }
+\DeclareKeys [jlreq] { sidenote_length .tl_set:N = \jlreq@option@sidenote@length }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@sidenote@length
%.. 逆ノンブル
\newif\ifjlreq@option@use@reverse@pagination
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@use@reverse@pagination
\jlreq@option@use@reverse@paginationfalse
-\keys_define:nn { jlreq } { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
+\DeclareKeys [jlreq] { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
%.. もろもろ
\newif\if@restonecol\@restonecolfalse
@@ -358,7 +369,7 @@
\newif\if@tate \@tatefalse
\newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepageかnotitlepageかが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@titlepage
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true,
tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
@@ -368,7 +379,7 @@
\newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % onesideかtwosideが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@twoside
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue }, oneside .value_forbidden:n = true,
twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue }, twoside .value_forbidden:n = true,
onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true,
@@ -381,7 +392,7 @@
\newif\if@openright
\newif\ifjlreq@option@open \jlreq@option@openfalse % openrightかopenanyが指定された
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@open
-\keys_define:nn { jlreq } {
+\DeclareKeys [jlreq] {
openright .code:n = { \@openrighttrue\jlreq@option@opentrue }, openright .value_forbidden:n = true,
openany .code:n = { \@openrightfalse\jlreq@option@opentrue }, openany .value_forbidden:n = true,
leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true,
@@ -389,12 +400,12 @@
}
\newif\ifjlreq@option@enablejfam \jlreq@option@enablejfamtrue
\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@enablejfam
-\keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
+\DeclareKeys [jlreq] { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
\def\jlreq@note#1{}
-\keys_define:nn { jlreq } { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
+\DeclareKeys [jlreq] { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
-\keys_set:nn { jlreq } {
+\SetKeys [jlreq] {
article_type=article,paper=a4,
number_of_lines={},line_length = {},
head_space={},foot_space={},gutter={},fore_edge={},
@@ -402,8 +413,9 @@
sidenote_length=0pt,column_gap={2zw},
headfoot_verticalposition = {},headfoot_sidemargin={0pt},
open_bracket_pos=zenkaku_tentsuki,
- onecolumn,final }
-\ProcessKeysOptions { jlreq }
+ onecolumn,final
+}
+\ProcessKeyOptions [jlreq]
\legacy_if:nF { jlreq@option@titlepage } {
\str_if_eq:VnTF \jlreq@article@type { article } { \@titlepagefalse } { \@titlepagetrue }
@@ -1189,23 +1201,22 @@
% \baselineskipの計算
% いったん文字サイズを変更((u)platexの際にzh/zwをきちんとするため)
\@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@fontsize}%
-\newdimen\jlreq@baselineskip
+% 現在の\baselineskipを計算し#1に入れる
\ifx l\jlreq@engine
- \setlength{\jlreq@baselineskip}{%
- \dimexpr\directlua{
+ \edef\jlreqbaselineskip{
+ \directlua{
local~act = string.char(92)~
- local~s = [[\jlreq@option@baselineskip]]~
+ local~s = [[\jlreqbaselineskip]]~
s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")~
- tex.print(s)~
- }\relax
- }%
-\else
- \setlength{\jlreq@baselineskip}{\dimexpr\jlreq@option@baselineskip\relax}
+ tex.print(act .. "unexpanded{" .. s .. "}")~
+ }
+ }
\fi
-\ifdim\jlreq@fontsize>\jlreq@baselineskip
+\dim_set:Nn \l__jlreq_tmpa_dim {\jlreqbaselineskip}
+\ifdim\jlreq@fontsize>\l__jlreq_tmpa_dim
\ClassError{jlreq}{The~baselineskip~is~less~than~fontsize}{\@ehc}%
\fi
-\bool_if:nT { \dim_compare_p:n { \jlreq@baselineskip < 1.5\zw } || \dim_compare_p:n { \jlreq@baselineskip > 2\zw } } {
+\bool_if:nT { \dim_compare_p:n { \l__jlreq_tmpa_dim < 1.5\zw } || \dim_compare_p:n { \l__jlreq_tmpa_dim > 2\zw } } {
\jlreq@note { 行間は二分以上全角以下が望ましい (2.4.2.d~注3).}
}
@@ -1266,7 +1277,7 @@
\fi
\renewcommand{\normalsize}{%
- \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@baselineskip}%
+ \@setfontsize\normalsize{\jlreq@fontsize}{\dimexpr\jlreqbaselineskip\relax}%
\abovedisplayskip 1.1\jlreq@fontsize \@plus .3\jlreq@fontsize \@minus .4\jlreq@fontsize
\abovedisplayshortskip \z@ \@plus .3\jlreq@fontsize
\belowdisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize
@@ -1286,26 +1297,49 @@
% 2.5.2 \baselineskipは一定の方がよい?
% \@listiは再定義しないようにした.(\normalsizeと共用でJLReq通りだと思う.)
\newcommand{\footnotesize}{%
- \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@tempdima/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e
\abovedisplayskip .6\jlreq@fontsize \@plus.2\jlreq@fontsize \@minus.4\jlreq@fontsize
\abovedisplayshortskip \z@ \@plus.1\jlreq@fontsize
\belowdisplayshortskip .3\jlreq@fontsize \@plus.1\jlreq@fontsize \@minus.2\jlreq@fontsize
\belowdisplayskip \abovedisplayskip}
-% tsize10.cloの引数を,そのまま\jlreq@fontsize/\jlreq@baselineskipでスケーリングしているだけ.
+% tsize10.cloの引数を,そのまま\jlreq@fontsize/\jlreqbaselineskipでスケーリングしているだけ.
\newcommand{\small}{%
% jsarticleのもの
- \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@baselineskip/17\relax}%
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@tempdima/17\relax}%
\abovedisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize
\abovedisplayshortskip \z@ \@plus.3\jlreq@fontsize
\belowdisplayshortskip \abovedisplayshortskip
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@baselineskip/17\relax}}
-\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@baselineskip/17\relax}}
-\newcommand{\large}{\@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@baselineskip}}
-\newcommand{\Large}{\@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@baselineskip/17\relax}}
-\newcommand{\LARGE}{\@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@baselineskip/17\relax}}
-\newcommand{\huge}{\@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@baselineskip/17\relax}}
-\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@baselineskip/17\relax}}
+\newcommand{\scriptsize}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@tempdima/17\relax}
+}
+\newcommand{\tiny}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@tempdima/17\relax}
+}
+\newcommand{\large}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@tempdima}
+}
+\newcommand{\Large}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@tempdima/17\relax}
+}
+\newcommand{\LARGE}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@tempdima/17\relax}
+}
+\newcommand{\huge}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@tempdima/17\relax}
+}
+\newcommand{\Huge}{
+ \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax}
+ \@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@tempdima/17\relax}
+}
%. plextから拝借
\def\jlreq@Kanji#1{\expandafter\kansuji\csname c@#1\endcsname}
@@ -1833,42 +1867,32 @@
%.. 別行見出し
% \jlreq@BlockHeading@start:別行見出しを出力する命令.
-% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}{5 = フォーマット関連}{6 = 全体フォーマット}*{見出し}[副題]
+% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}*[running head]{見出し}[副題]
% カウンタ関連=-,*,無し:-はカウンタ関連を処理しない.*はさらに目次に追加しない(星付き命令と同様).星付きで呼び出された時は常に*同等.
% スペース関連={配置:lcr(左中央右)}{字下げ(寸法)}{字上げ(寸法)}{前空き}{後空き}{行取りの行数}{空か*か,偶数ページでも改ページを許可するならば空}
% 前/後空きはprefixにa:/s:/r:が入る.r:は空きがその値そのものになる.a:/s:は行取りに加えて入る.a:で指定された空きはページ行頭では入らない
% 後空きの時はs:は指定できない.
-% フォーマット関連:
-% フォーマット関連={{ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット(ラベル無し)}{副題フォーマット}{副題フォーマット(ラベル無し)}}{{前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし}}
+% フォーマット関連:あらかじめマクロに入れておく
+% \jlreq@BlockHeading@start@eachformat: {ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット(ラベル無し)}{副題フォーマット}{副題フォーマット(ラベル無し)}
+% \jlreq@BlockHeading@start@format: {前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし}
+% \jlreq@BlockHeading@start@totalformat: 全体フォーマット
% 見出しそのものは「全体フォーマット」に従い出力される.パラメータトークン#1を含み,#1=見出し本体:スペース関連と上の「見出し全体のフォーマット」に基づいて整形される.
% 見出し全体のフォーマット内では#1=ラベル,#2=見出し文字列,#3=副題,それぞれ各々のフォーマットに基づき整形される.
% ラベルフォーマットでは#1=カウンタ名,見出し文字列フォーマットでは#1=見出し文字列,副題フォーマットでは#1=副題
% ラベルのみのフォーマットは目次に使われる.
-\long\def\jlreq@BlockHeading@start#1#2#3#4#5#6{%
- \if@noskipsec\leavevmode\fi
- % #5と#6は\parを含むかもしれないので引数渡しはしない(後の\@ifstarで詰まる)
- \edef\jlreq@BlockHeading@start@eachformat{\exp_not:o {\@firstoftwo#5}}%
- \edef\jlreq@BlockHeading@start@format{\exp_not:o {\@secondoftwo#5}}%
- \edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#6}}%
- \jlreq@BlockHeading@start@{#1}{#2}{#3}{#4}%
-}
-% {1 = 命令}{2 = レベル}{3 = スペース関連}
-\long\def\jlreq@BlockHeading@start@#1#2#3#4{%
- \@ifstar{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{#4}}}%
-}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出し}
-\long\def\jlreq@BlockHeading@start@@#1#2#3#4[#5]#6{%
- \@ifnextchar[{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}[]}%
+\long\def\jlreq@BlockHeading@start#1#2#3#4[#5]#6{%
+ \@ifnextchar[{\jlreq@BlockHeading@start@i{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@i{#1}{#2}{#3}{#4}{#5}{#6}[]}%
}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題]
-\long\def\jlreq@BlockHeading@start@@@#1#2#3#4#5#6[#7]{%
- \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\exp_not:o {\jlreq@BlockHeading@start@totalformat}}}%
+\long\def\jlreq@BlockHeading@start@i#1#2#3#4#5#6[#7]{%
+ \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@ii{#1}{#2}{#3}}{\exp_not:o {\jlreq@BlockHeading@start@totalformat}}}%
\jlreq@do{#4}{#5}{#6}{#7}%
}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = 全フォーマット}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題}
-\long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8{%
+\long\def\jlreq@BlockHeading@start@ii#1#2#3#4#5#6#7#8{%
\global\advance\jlreq@BlockHeading@spaces@current@count by 1
\tl_gput_right:Nn \jlreq@BlockHeading@spaces@current@sequence {_#1}%
\edef\jlreq@tempa##1##2##3##4##5##6##7{%
@@ -2200,18 +2224,12 @@
\jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}%
\edef\jlreq@do{%
\dim_compare:nF { \parskip=0pt } {
-% \exp_not:N \cs_set:Nn \exp_not:N \g__jlreq_gyodori_hook_par: {
-% \noexpand\parskip=\the\parskip\noexpand\relax
-% \exp_not:n { \cs_set:Nn \g__jlreq_gyodori_hook_par: {} }
-% }
\exp_not:N \AddToHook { para/before } { \noexpand\parskip=\the\parskip\noexpand\relax }
\noexpand\parskip=0pt
}
}%
\expandafter}\jlreq@do
}
-%\cs_set:Nn \g__jlreq_gyodori_hook_par: {}
-%\PushPostHook{par}{\g__jlreq_gyodori_hook_par:}
% 行取り情報をゲットだぜ
@@ -2498,34 +2516,46 @@
\def\jlreq@totalformat@after{}%
}%
\fi
+ % フォーマットを指定のマクロに入れる命令群
+ \tl_set:Nx \l__jlreq_tmpa_tl {
+ \exp_not:n {\edef\jlreq@BlockHeading@start@eachformat}{\exp_not:N \unexpanded{%
+ {\exp_not:o {\jlreq@label@format}}{\exp_not:o {\jlreq@label@format@modified}}%
+ {\exp_not:o {\jlreq@heading@text@format@wlabel}}{\exp_not:o {\jlreq@heading@text@format@wolabel}}%
+ {\exp_not:o {\jlreq@subtitle@format@wlabel}}{\exp_not:o {\jlreq@subtitle@format@wolabel}}%
+ }}%
+ \exp_not:n {\edef\jlreq@BlockHeading@start@format}{\exp_not:N \unexpanded{%
+ {\exp_not:o {\jlreq@pre@format@wlabel}}{\exp_not:o {\jlreq@pre@format@wolabel}}%
+ {\exp_not:o {\jlreq@format}}%
+ {}{}%
+ }}%
+ \exp_not:n {\edef\jlreq@BlockHeading@start@totalformat}{\exp_not:N \unexpanded{%
+ {\exp_not:n {
+ \par
+ \addpenalty\@secpenalty
+ \addvspace{0pt}\relax % 改ページ関係(#54,#100),よくわかっていない
+ }}
+ {\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}%
+ }}%
+ }
+ % \jlreq@BlockHeading@startの第四引数
+ \tl_set:Nx \l__jlreq_tmpb_tl {
+ {\exp_not:o {\jlreq@align}}{\exp_not:o {\jlreq@indent}}{\exp_not:o {\jlreq@end@indent}}\exp_not:o {\jlreq@spaceset}{\exp_not:o {\jlreq@allowbreak@evenpage}}
+ }
\edef\jlreq@do{%
\exp_not:o {\jlreq@do}%
\noexpand\edef\exp_not:c {jlreq@headingcs@#1}{\noexpand\unexpanded{%
\exp_not:N \g__jlreq_hook_beforeheading:n {#1}
\exp_not:o {\jlreq@pagebreak}%
\tl_if_empty:NF \l__jlreq_pagestyle_tl { \exp_not:N \thispagestyle {\exp_not:o { \l__jlreq_pagestyle_tl } } }
- \unexpanded{\jlreq@BlockHeading@start{#1}{#2}}%
- {{\exp_not:o {\jlreq@align}}{\exp_not:o {\jlreq@indent}}{\exp_not:o {\jlreq@end@indent}}\exp_not:o {\jlreq@spaceset}{\exp_not:o {\jlreq@allowbreak@evenpage}}}%
- {\ifjlreq@number\else -\fi}%
- {%
- {%
- {\exp_not:o {\jlreq@label@format}}{\exp_not:o {\jlreq@label@format@modified}}%
- {\exp_not:o {\jlreq@heading@text@format@wlabel}}{\exp_not:o {\jlreq@heading@text@format@wolabel}}%
- {\exp_not:o {\jlreq@subtitle@format@wlabel}}{\exp_not:o {\jlreq@subtitle@format@wolabel}}%
- }%
- {%
- {\exp_not:o {\jlreq@pre@format@wlabel}}{\exp_not:o {\jlreq@pre@format@wolabel}}%
- {\exp_not:o {\jlreq@format}}%
- {}{}%
- }%
- }%
- {{\exp_not:n {
- \par
- \addpenalty\@secpenalty
- \addvspace{0pt}\relax % 改ページ関係(#54,#100),よくわかっていない
- }}{\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}}%
- }}%
- \noexpand\def\exp_not:c {#1}{\exp_not:c {jlreq@headingcs@#1}}%
+ \exp_not:o \l__jlreq_tmpa_tl
+ \exp_not:N \@ifstar
+ {\exp_not:N \@dblarg{\exp_not:N \jlreq@BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{*}}}%
+ {\exp_not:N \@dblarg{\exp_not:N \jlreq@BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{\ifjlreq@number\else -\fi}}}%
+ }
+ }%
+ \noexpand\def\exp_not:c {#1}{
+ \exp_not:c {jlreq@headingcs@#1}
+ }%
}%
\expandafter\endgroup
\jlreq@do
@@ -3027,8 +3057,8 @@
\cs_set:Nn \__jlreq_CutinHeading_start_aux:nnnnnn{%
% 一行で処理したときの見出し長さを計測
\group_begin:
- \hbox_set:Nn \l_jlreq_tmpa_box {#1#6}
- \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l_jlreq_tmpa_box}
+ \hbox_set:Nn \l__jlreq_tmpa_box {#1#6}
+ \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l__jlreq_tmpa_box}
% 何行必要かを\l__jlreq_cutinheading_linecount_tlに入れる
\dim_compare:nTF { \l__jlreq_tmpa_dim > #5} {
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
@@ -3038,31 +3068,31 @@
} { \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {1} } }
% \l__jlreq_tmpa_dimが実際の一行の長さに近い
\dim_set:Nn \l__jlreq_tmpa_dim { \l__jlreq_tmpa_dim / \l__jlreq_cutinheading_linecount_tl }
- % \l_jlreq_tmpb_boxに見出し部分を,\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる
+ % \l__jlreq_tmpb_boxに見出し部分を,\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる
\int_compare:nTF { \l__jlreq_cutinheading_linecount_tl = 1 }{
- \vbox_set:Nn \l_jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l_jlreq_tmpa_box}
+ \vbox_set:Nn \l__jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l__jlreq_tmpa_box}
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {2}
}{
\jlreq@inlinenote@determinelength{#6}{#1}{}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_tmpa_dim}{\linewidth}%
- \box_set_eq:NN \l_jlreq_tmpb_box \jlreq@resultbox
+ \box_set_eq:NN \l__jlreq_tmpb_box \jlreq@resultbox
\tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
}
% 普通の一行の高さ/深さに合わせて見出しのボックスを作る
- \setbox\l_jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq@zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l_jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}%
+ \setbox\l__jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq@zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l__jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}%
% 高さを通常の一行のそれにする
- \hbox_set:Nn \l_jlreq_tmpc_box {阿}
- \box_set_dp:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpa_box + \box_dp:N \l_jlreq_tmpa_box - \box_ht:N \l_jlreq_tmpc_box }
- \box_set_ht:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpc_box }
+ \hbox_set:Nn \l__jlreq_tmpc_box {阿}
+ \box_set_dp:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpa_box + \box_dp:N \l__jlreq_tmpa_box - \box_ht:N \l__jlreq_tmpc_box }
+ \box_set_ht:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpc_box }
\noindent
\hspace*{#2}%
- \box_use:N \l_jlreq_tmpa_box
+ \box_use:N \l__jlreq_tmpa_box
\hspace*{#3}%
% でかい見出しボックスの分をキャンセルする空きを入れる
- % \baselineskip - box_ht:N \l_jlreq_tmpc_boxはTeXが挿入するスキップの分
+ % \baselineskip - box_ht:N \l__jlreq_tmpc_boxはTeXが挿入するスキップの分
\cs_set:Nx \l__jlreq_do:{
\exp_not:N \par
- \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l_jlreq_tmpa_box - \box_dp:N \l_jlreq_tmpa_box - \baselineskip + \box_ht:N \l_jlreq_tmpc_box}}
- \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l_jlreq_tmpa_box + #3} \exp_not:N \relax
+ \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l__jlreq_tmpa_box - \box_dp:N \l__jlreq_tmpa_box - \baselineskip + \box_ht:N \l__jlreq_tmpc_box}}
+ \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l__jlreq_tmpa_box + #3} \exp_not:N \relax
\exp_not:N\hangafter=-\l__jlreq_cutinheading_linecount_tl\relax
}%
\exp_after:wN \group_end:
@@ -3136,14 +3166,14 @@
\str_set:Nn \l__jlreq_tmpa_str {#2}
\str_case_e:nn { \jlreq@HeadingType {#1} } {
{ BlockHeading } {
- \bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} }
- \bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}}
+ \bool_set_false:N \l__jlreq_tmpa_bool
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} }
+ \bool_set_false:N \l__jlreq_tmpa_bool
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool }
+ \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}}
}
}
\cs_set:Nx \l_jlreq_do: {
@@ -3998,7 +4028,7 @@
% \jlreq@resultboxに整形結果を返す(垂直ボックス).見つからなかったらvoid.\globalに設定する.
\long\def\jlreq@inlinenote@determinelength#1#2#3#4#5#6#7{%
\begingroup
- % \message{#1 の試行開始,行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relaxまで}%
+% \message{#1 の試行開始,行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relax まで(長さ\the\dimexpr #7 - #6\relax )}%
\@tempcnta=1\relax
\def\@tempa{}%
% 調整に使う行の\parshape指定を\@tempaに入れる.長さは\jlreq@tempdima.
@@ -4019,12 +4049,12 @@
\parindent=0pt\leftskip=0pt\rightskip=0pt
\parshape #5~#3~\@tempa 0pt~\the\maxdimen
#1\par\global\@tempcntb=\prevgraf}%
- % \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行,行数は\the\@tempcntb , 書式 #5 #3 \@tempa 0pt \the\maxdimen}%
+% \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行,行数は\the\@tempcntb , 書式~#5~#3~\@tempa~0pt~\the\maxdimen}%
\fi
\jlreq@getlastbox{\@tempboxa}%
\setbox\jlreq@tempboxa=\box\jlreq@resultbox
\ifnum\@tempcntb<#5\relax% 行数が達していないならOK
- % \message{行数 = \the\@tempcntb により確定}
+% \message{行数 = \the\@tempcntb により確定}
% #5行になるまで空の水平ボックスを加えていく.
\global\setbox\jlreq@resultbox=\vbox{#2%
\unvbox\@tempboxa\hbox{\unhbox\jlreq@tempboxa\unskip\unskip\unpenalty}%
@@ -4034,7 +4064,7 @@
% そうでない場合は最後の二行の長さを比較する
\jlreq@getlastbox{\@tempboxa}%
\setbox\jlreq@tempboxb=\box\jlreq@resultbox
- % \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}%
+% \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}%
\ifdim\wd\jlreq@tempboxa>\wd\jlreq@tempboxb
\advance\jlreq@tempdima by 0.3pt\relax% 0.3ptに意味はない
\else
@@ -6194,17 +6224,17 @@
\ltj@setpar@global
\cs_set:Nn \l_jlreq_do: {}
\tl_if_empty:nF {#1} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #1 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \ltjsetkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+ \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \ltjsetkanjiskip \skip_use:N \l__jlreq_tmpa_skip
}
}
\tl_if_empty:nF {#2} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #2 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \ltjsetxkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+ \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \ltjsetxkanjiskip \skip_use:N \l__jlreq_tmpa_skip
}
}
\exp_after:wN \group_end:
@@ -6215,17 +6245,17 @@
\group_begin:
\cs_set:Nn \l_jlreq_do: {}
\tl_if_empty:nF {#1} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #1 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+ \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
}
}
\tl_if_empty:nF {#2} {
- \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+ \skip_set:Nn \l__jlreq_tmpa_skip { #2 }
\cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
- \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
- \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+ \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
+ \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l__jlreq_tmpa_skip }
}
}
\exp_after:wN \group_end:
diff --git a/Master/texmf-dist/tex/latex/joinbox/joinbox.sty b/Master/texmf-dist/tex/latex/joinbox/joinbox.sty
index 06077c23f12..68e54c3a204 100644
--- a/Master/texmf-dist/tex/latex/joinbox/joinbox.sty
+++ b/Master/texmf-dist/tex/latex/joinbox/joinbox.sty
@@ -7,7 +7,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{joinbox}{2023-08-21}{v1.0.2}
+\ProvidesExplPackage{joinbox}{2024-09-09}{v1.0.3}
{Join figures to same height or width with LaTeX3}
\RequirePackage{xparse}
@@ -42,7 +42,6 @@
% 函数变体
\cs_generate_variant:Nn \hcoffin_set:Nn { Nx }
-
% 定义变量
\bool_new:N \l__joinbox_vertical_bool
\bool_new:N \l__joinbox_out_scale_bool
@@ -77,7 +76,8 @@
baseline .value_required:n = true,
baseline .choices:nn = { t, vc, H, b }
{
- \int_set_eq:NN \l__joinbox_baseline_int \l_keys_choice_int
+ \int_set_eq:NN \l__joinbox_baseline_int
+ \l_keys_choice_int
},
baseline .default:n = vc,
baseline .initial:n = b,
@@ -92,19 +92,19 @@
\bool_set_false:N \l__joinbox_out_scale_bool
}{
\bool_set_true:N \l__joinbox_out_scale_bool
- \dim_set:Nn \l__joinbox_out_length_dim { \dim_eval:n{ #1 } }
+ \dim_set:Nn \l__joinbox_out_length_dim
+ { \dim_eval:n{ #1 } }
}
}
},
outlen .default:n = 0pt,
outlen .initial:n = 0pt,
- % 拼音间距
+ % 拼接间距
sep .dim_set:N = \l__joinbox_sep_dim,
sep .default:n = 0pt,
sep .initial:n = 0pt,
- % unknown .code:n = { \__joinbox_error:n { unknown-option } }
unknown .code:n = \__joinbox_unknown_key:V \l_keys_key_str,
}
@@ -116,8 +116,7 @@
{ vc } { \int_set:Nn \l__joinbox_baseline_int { 2 } }
{ H } { \int_set:Nn \l__joinbox_baseline_int { 3 } }
{ b } { \int_set:Nn \l__joinbox_baseline_int { 4 } }
- }
- {
+ }{
% 转换为token
\tl_set_rescan:Nnn \l_tmpa_tl {} {#1}
% 计算尺寸
@@ -138,12 +137,9 @@
}
\cs_generate_variant:Nn \__joinbox_unknown_key:n { V }
-% \msg_new:nnn { joinbox } { unknown-option }
-% { package~ option~ "\l_keys_key_tl"~ is~ unknown. }
-
%% 参数设置用户接口
\NewDocumentCommand \joinset { m }
- { \keys_set:nn { joinset } {#1} }
+ { \keys_set:nn { joinbox } {#1} }
% 计算box盒子的总高度
% #1---盒子变量
@@ -208,7 +204,8 @@
\dim_set_eq:NN \l__joinbox_min_height_dim \l_tmpb_dim
}
- \bool_if:nT { !(\l__joinbox_only_first_bool) && !(\l__joinbox_only_second_bool) }
+ \bool_if:nT { !(\l__joinbox_only_first_bool) &&
+ !(\l__joinbox_only_second_bool) }
{
% 比较并记录最小宽度
\dim_set:Nn \l__joinbox_min_width_dim
@@ -274,10 +271,12 @@
{
\coffin_scale:Nnn \l__joinbox_out_coffin
{
- \dim_ratio:nn { \l__joinbox_min_width_dim }{ \coffin_wd:N \l__joinbox_out_coffin }
+ \dim_ratio:nn { \l__joinbox_min_width_dim }
+ { \coffin_wd:N \l__joinbox_out_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_min_width_dim }{ \coffin_wd:N \l__joinbox_out_coffin }
+ \dim_ratio:nn { \l__joinbox_min_width_dim }
+ { \coffin_wd:N \l__joinbox_out_coffin }
}
}
@@ -286,10 +285,12 @@
{
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_min_width_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_min_width_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_min_width_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_min_width_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
}
@@ -298,11 +299,13 @@
\coffin_set_eq:NN \l__joinbox_out_coffin \l__joinbox_tmpa_coffin
}
- \bool_if:nT { !(\l__joinbox_only_first_bool) && !(\l__joinbox_only_second_bool) }
+ \bool_if:nT { !(\l__joinbox_only_first_bool) &&
+ !(\l__joinbox_only_second_bool) }
{
% 将第2个盒子拼接到第一个盒子
\coffin_join:NnnNnnnn \l__joinbox_out_coffin
- { hc } { b } \l__joinbox_tmpa_coffin { hc } { t } { 0pt } { -\l__joinbox_sep_dim }
+ { hc } { b } \l__joinbox_tmpa_coffin { hc } { t }
+ { 0pt } { -\l__joinbox_sep_dim }
}
% 按指定输出宽度缩放输出盒子
@@ -310,10 +313,12 @@
{
\coffin_scale:Nnn \l__joinbox_out_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \l__joinbox_min_width_dim }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \l__joinbox_min_width_dim }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \l__joinbox_min_width_dim }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \l__joinbox_min_width_dim }
}
}
@@ -329,10 +334,12 @@
% 按最小高度缩放第1个盒子
\coffin_scale:Nnn \l__joinbox_out_coffin
{
- \dim_ratio:nn { \l__joinbox_min_height_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_out_coffin }
+ \dim_ratio:nn { \l__joinbox_min_height_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_out_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_min_height_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_out_coffin }
+ \dim_ratio:nn { \l__joinbox_min_height_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_out_coffin }
}
% 处理第2个盒子
@@ -344,25 +351,30 @@
% 按最小高度缩放第2个盒子
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_min_height_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_min_height_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_min_height_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_min_height_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
% 将第2个盒子拼接到第1个盒子
\coffin_join:NnnNnnnn \l__joinbox_out_coffin
- { vc } { r } \l__joinbox_tmpa_coffin { vc } { l } { \l__joinbox_sep_dim } { 0pt }
+ { vc } { r } \l__joinbox_tmpa_coffin { vc } { l }
+ { \l__joinbox_sep_dim } { 0pt }
% 按指定输出高度缩放输出盒子
\bool_if:NT \l__joinbox_out_scale_bool
{
\coffin_scale:Nnn \l__joinbox_out_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \l__joinbox_min_height_dim }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \l__joinbox_min_height_dim }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \l__joinbox_min_height_dim }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \l__joinbox_min_height_dim }
}
}
@@ -425,19 +437,23 @@
{
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
}
{
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
}
}
@@ -491,19 +507,23 @@
{
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \coffin_wd:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \coffin_wd:N \l__joinbox_tmpa_coffin }
}
}
{
\coffin_scale:Nnn \l__joinbox_tmpa_coffin
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
{
- \dim_ratio:nn { \l__joinbox_out_length_dim }{ \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
+ \dim_ratio:nn { \l__joinbox_out_length_dim }
+ { \__joinbox_coffin_ht_plus_dp:N \l__joinbox_tmpa_coffin }
}
}
}
@@ -595,7 +615,7 @@
% 被拼接对象同时为空,无需拼接
\msg_new:nnn { joinbox } { empty-objs }
- { The~two~objects~which~was~joined~are~empty. }
+ { The~two~objects~which~were~joined~are~empty. }
% 图像拼接用户接口
% 将指定文件名列表中的图像拼接成一个盒子
diff --git a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
index 514064d92a1..7905c53d790 100644
--- a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
+++ b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
@@ -10,7 +10,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-\ProvidesExplPackage {jsonparse} {2024-08-08} {0.8.7}
+\ProvidesExplPackage {jsonparse} {2024-08-27} {0.9.0}
{JSON Parse}
\bool_new:N \l__jsonparse_debug_mode_bool
@@ -652,6 +652,7 @@
\cs_set:Npn \t { \exp_not:N \t }
\cs_set:Npn \u { \exp_not:N \u }
\__json_nested_construct_cs:Noo \x \c_left_brace_str \c_right_brace_str
+ \tl_set:Nn \obeyedline { ~ }
\tl_gset_rescan:Nne \g__jsonparse_json_tl { \cctab_select:N \c__jsonparse_json_escape_cctab } {#3}
\exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl }
\group_end:
diff --git a/Master/texmf-dist/tex/latex/jupynotex/jupynotex.py b/Master/texmf-dist/tex/latex/jupynotex/jupynotex.py
index 036be088ce5..53f27dec913 100644
--- a/Master/texmf-dist/tex/latex/jupynotex/jupynotex.py
+++ b/Master/texmf-dist/tex/latex/jupynotex/jupynotex.py
@@ -1,64 +1,202 @@
-# Copyright 2020 Facundo Batista
+# Copyright 2020-2024 Facundo Batista
# All Rights Reserved
# Licensed under Apache 2.0
-"""USAGE: jupynote.py notebook.ipynb cells
-
- cells is a string with which cells to include, separate groups
- with comma, ranges with dash (with defaults to start and end.
-"""
+"""Convert a jupyter notebook into latex for inclusion in documents."""
+import argparse
import base64
import json
+import pathlib
+import re
+import subprocess
import sys
import tempfile
+import textwrap
import traceback
+# message to help people to report potential problems
+REPORT_MSG = """
+
+Please report the issue in
+https://github.com/facundobatista/jupynotex/issues/new
+including the latex log. Thanks!
+"""
+
+# basic verbatim start/end
+VERBATIM_BEGIN = [r"\begin{footnotesize}", r"\begin{verbatim}"]
+VERBATIM_END = [r"\end{verbatim}", r"\end{footnotesize}"]
+
+# highlighers for different languages (block beginning and ending)
+HIGHLIGHTERS = {
+ 'python': ([r'\begin{minted}[fontsize=\footnotesize]{python}'], [r'\end{minted}']),
+ None: (VERBATIM_BEGIN, VERBATIM_END),
+}
+
+# the different formats to be used when error or all ok
+FORMAT_ERROR = r"colback=red!5!white,colframe=red!75!"
+FORMAT_OK = (
+ r"coltitle=red!75!black, colbacktitle=black!10!white, "
+ r"halign title=right, fonttitle=\sffamily\mdseries\scshape\footnotesize")
+
+# a little mark to put in the continuation line(s) when text is wrapped
+WRAP_MARK = "↳"
+
+# the options available for command line
+CMDLINE_OPTION_NAMES = {
+ "output-text-limit": "The column limit for the output text of a cell",
+}
+
+
+def _validator_positive_int(value):
+ """Validate value is a positive integer."""
+ value = value.strip()
+ if not value:
+ return
-def _verbatimize(lines):
+ value = int(value)
+ if value <= 0:
+ raise ValueError("Value must be greater than zero.")
+ return value
+
+
+def _process_plain_text(lines, config_options=None):
"""Wrap a series of lines around a verbatim indication."""
- result = [r"\begin{verbatim}"]
+ if config_options is None:
+ config_options = {}
+
+ result = []
+ result.extend(VERBATIM_BEGIN)
for line in lines:
- result.append(line.rstrip())
- result.append(r"\end{verbatim}")
+ line = line.rstrip()
+
+ # clean color escape codes (\u001b plus \[Nm where N are one or more digits)
+ line = re.sub(r"\x1b\[[\d;]+m", "", line)
+
+ # split too long lines
+ limit = config_options.get("output-text-limit")
+ if limit and line:
+ firstline, *restlines = textwrap.wrap(line, limit)
+ lines = [firstline]
+ for line in restlines:
+ lines.append(f" {WRAP_MARK} {line}")
+ else:
+ lines = [line]
+
+ result.extend(lines)
+ result.extend(VERBATIM_END)
return result
-def _save_content(data):
- """Save the received b64encoded data to a temp file."""
- _, fname = tempfile.mkstemp(suffix='.png')
- with open(fname, 'wb') as fh:
- fh.write(base64.b64decode(data))
- return fname
+class ItemProcessor:
+ """Process each item according to its type with a (series of) function(s)."""
+
+ def __init__(self, cell_options, config_options):
+ self.cell_options = cell_options
+ self.config_options = config_options
+
+ def get_item_data(self, item):
+ """Extract item information using different processors."""
+
+ data = item['data']
+ for mimetype, *functions in self.PROCESSORS:
+ if mimetype in data:
+ content = data[mimetype]
+ break
+ else:
+ raise ValueError("Image type not supported: {}".format(data.keys()))
+
+ for func in functions:
+ content = func(self, content)
+
+ return content
+
+ def process_plain_text(self, lines):
+ """Process plain text."""
+ return _process_plain_text(lines, self.config_options)
+
+ def process_png(self, image_data):
+ """Process a PNG: just save the received b64encoded data to a temp file."""
+ _, fname = tempfile.mkstemp(suffix='.png')
+ with open(fname, 'wb') as fh:
+ fh.write(base64.b64decode(image_data))
+ return fname
+
+ def process_svg(self, image_data):
+ """Process a SVG: save the data, transform to PDF, and then use that."""
+ _, svg_fname = tempfile.mkstemp(suffix='.svg')
+ _, pdf_fname = tempfile.mkstemp(suffix='.pdf')
+ raw_svg = ''.join(image_data).encode('utf8')
+ with open(svg_fname, 'wb') as fh:
+ fh.write(raw_svg)
+
+ cmd = ['inkscape', '--export-text-to-path', '--export-pdf={}'.format(pdf_fname), svg_fname]
+ subprocess.run(cmd)
+
+ return pdf_fname
+
+ def include_graphics(self, fname):
+ """Wrap a filename in an includegraphics structure."""
+ fname_no_backslashes = fname.replace("\\", "/") # do not leave backslashes in Windows
+ width = self.cell_options.get("output-image-size", r"1\textwidth")
+ return r"\includegraphics[width={}]{{{}}}".format(width, fname_no_backslashes)
+
+ def listwrap(self, item):
+ """Wrap an item in a list for processors that return that single item."""
+ return [item]
+
+ # mimetype and list of functions to apply; order is important here as we want to
+ # prioritize getting some mimetypes over others when multiple are present
+ PROCESSORS = [
+ ('text/latex',),
+ ('image/svg+xml', process_svg, include_graphics, listwrap),
+ ('image/png', process_png, include_graphics, listwrap),
+ ('text/plain', process_plain_text),
+ ]
class Notebook:
"""The notebook converter to latex."""
- def __init__(self, path):
- with open(path, 'rt', encoding='utf8') as fh:
- nb_data = json.load(fh)
+ GLOBAL_CONFIGS = {
+ "output-text-limit": _validator_positive_int,
+ }
+
+ def __init__(self, notebook_path, config_options):
+ self.config_options = self._validate_config(config_options)
+ self.cell_options = {}
+ nb_data = json.loads(notebook_path.read_text())
- self._cells = nb_data['cells']
+ # get the languaje, to highlight
+ lang = nb_data['metadata']['language_info']['name']
+ self._highlight_delimiters = HIGHLIGHTERS.get(lang, HIGHLIGHTERS[None])
- def __len__(self):
- return len(self._cells)
+ # get all cells excluding markdown ones
+ self._cells = [x for x in nb_data['cells'] if x['cell_type'] != 'markdown']
+
+ def _validate_config(self, config):
+ """Validate received configuration."""
+ for key, value in list(config.items()):
+ validator = self.GLOBAL_CONFIGS[key]
+ new_value = validator(value)
+ config[key] = new_value
+ return config
def _proc_src(self, content):
"""Process the source of a cell."""
source = content['source']
result = []
if content['cell_type'] == 'code':
- result.extend(_verbatimize(source))
- elif content['cell_type'] == 'markdown':
- # XXX: maybe we could parse this?
- result.extend(_verbatimize(source))
+ begin, end = self._highlight_delimiters
+ result.extend(begin)
+ result.extend(line.rstrip() for line in source)
+ result.extend(end)
else:
raise ValueError(
"Cell type not supported when processing source: {!r}".format(
content['cell_type']))
- return '\n'.join(result) + '\n'
+ return '\n'.join(result)
def _proc_out(self, content):
"""Process the output of a cell."""
@@ -67,27 +205,30 @@ class Notebook:
return
result = []
+ processor = ItemProcessor(self.cell_options, self.config_options)
for item in outputs:
output_type = item['output_type']
- if output_type == 'execute_result':
- data = item['data']
- if 'image/png' in data:
- fname = _save_content(data['image/png'])
- result.append(r"\includegraphics{{{}}}".format(fname))
- elif 'text/latex' in data:
- result.extend(data["text/latex"])
- else:
- result.extend(_verbatimize(data["text/plain"]))
+ if output_type in ('execute_result', 'display_data'):
+ more_content = processor.get_item_data(item)
elif output_type == 'stream':
- result.extend(_verbatimize(x.rstrip() for x in item["text"]))
- elif output_type == 'display_data':
- data = item['data']
- fname = _save_content(data['image/png'])
- result.append(r"\includegraphics{{{}}}".format(fname))
+ more_content = processor.process_plain_text(item["text"])
+ elif output_type == 'error':
+ raw_traceback = item['traceback']
+ tback_lines = []
+ for raw_line in raw_traceback:
+ internal_lines = raw_line.split('\n')
+ for line in internal_lines:
+ line = re.sub(r"\x1b\[\d.*?m", "", line) # sanitize
+ if set(line) == {'-'}:
+ # ignore separator, as our graphical box already has one
+ continue
+ tback_lines.append(line)
+ more_content = processor.process_plain_text(tback_lines)
else:
raise ValueError("Output type not supported in item {!r}".format(item))
+ result.extend(more_content)
- return '\n'.join(result) + '\n'
+ return '\n'.join(result)
def get(self, cell_idx):
"""Return the content from a specific cell in the notebook.
@@ -99,58 +240,71 @@ class Notebook:
output = self._proc_out(content)
return source, output
+ def parse_cells(self, spec):
+ """Convert the cells spec to a range of ints."""
+ if not spec:
+ raise ValueError("Empty cells spec not allowed")
+
+ maxlen = len(self._cells)
+
+ cells = set()
+ options = {}
+ groups = [x.strip() for x in spec.split(',')]
+ valid_chars = set('0123456789-,')
+ for group in groups:
+ if '=' in group:
+ k, v = group.split("=", maxsplit=1)
+ options[k] = v
+ continue
-def _parse_cells(spec, maxlen):
- """Convert the cells spec to a range of ints."""
- if not spec:
- raise ValueError("Empty cells spec not allowed")
- if set(spec) - set('0123456789-,'):
- raise ValueError(
- "Found forbidden characters in cells definition (allowed digits, '-' and ',')")
-
- cells = set()
- groups = spec.split(',')
- for group in groups:
- if '-' in group:
- cfrom, cto = group.split('-')
- cfrom = 1 if cfrom == '' else int(cfrom)
- cto = maxlen if cto == '' else int(cto)
- if cfrom >= cto:
+ if set(group) - valid_chars:
raise ValueError(
- "Range 'from' need to be smaller than 'to' (got {!r})".format(group))
- cells.update(range(cfrom, cto + 1))
- else:
- cells.add(int(group))
- cells = sorted(cells)
+ "Found forbidden characters in cells definition (allowed digits, '-' and ',')")
+
+ if '-' in group:
+ cfrom, cto = group.split('-')
+ cfrom = 1 if cfrom == '' else int(cfrom)
+ cto = maxlen if cto == '' else int(cto)
+ if cfrom >= cto:
+ raise ValueError(
+ "Range 'from' need to be smaller than 'to' (got {!r})".format(group))
+ cells.update(range(cfrom, cto + 1))
+ else:
+ cells.add(int(group))
+ cells = sorted(cells)
- if any(x < 1 for x in cells):
- raise ValueError("Cells need to be >=1")
- if maxlen < cells[-1]:
- raise ValueError(
- "Notebook loaded of len {}, smaller than requested cells: {}".format(maxlen, cells))
+ if any(x < 1 for x in cells):
+ raise ValueError("Cells need to be >=1")
+ if maxlen < cells[-1]:
+ raise ValueError(
+ f"Notebook loaded of len {maxlen}, smaller than requested cells: {cells}")
- return cells
+ self.cell_options = options
+ return cells
-def main(notebook_path, cells_spec):
+def main(notebook_path, cells_spec, config_options):
"""Main entry point."""
- nb = Notebook(notebook_path)
- cells = _parse_cells(cells_spec, len(nb))
+ nb = Notebook(notebook_path, config_options)
+ cells = nb.parse_cells(cells_spec)
for cell in cells:
try:
src, out = nb.get(cell)
- except Exception:
+ except Exception as exc:
title = "ERROR when parsing cell {}".format(cell)
- print(
- r"\begin{{tcolorbox}}"
- r"[colback=red!5!white,colframe=red!75!,title={{{}}}]".format(title))
- tb = traceback.format_exc()
- print('\n'.join(_verbatimize(tb.split('\n'))))
+ print(r"\begin{{tcolorbox}}[{}, title={{{}}}]".format(FORMAT_ERROR, title))
+ print(exc)
+ _parts = _process_plain_text(REPORT_MSG.split('\n'))
+ print('\n'.join(_parts))
print(r"\end{tcolorbox}")
+
+ # send title and traceback to stderr, which will appear in compilation log
+ tb = traceback.format_exc()
+ print(tb, file=sys.stderr)
continue
- print(r"\begin{{tcolorbox}}[title=Cell {{{:02d}}}]".format(cell))
+ print(r"\begin{{tcolorbox}}[{}, title=Cell {{{:02d}}}]".format(FORMAT_OK, cell))
print(src)
if out:
print(r"\tcblower")
@@ -159,8 +313,19 @@ def main(notebook_path, cells_spec):
if __name__ == "__main__":
- if len(sys.argv) != 3:
- print(__doc__)
- exit()
+ parser = argparse.ArgumentParser()
+ parser.add_argument("notebook_path", type=pathlib.Path, help="The path to the notebook.")
+ parser.add_argument(
+ "cells_spec",
+ type=str,
+ help=(
+ "A string specifying which cells to include; use comma to separate groups, "
+ "dash for ranges (with defaults to start and end)"
+ )
+ )
+ for option, explanation in CMDLINE_OPTION_NAMES.items():
+ parser.add_argument(option, type=str, help=explanation)
+ args = parser.parse_args()
- main(*sys.argv[1:3])
+ config_options = {option: getattr(args, option) for option in CMDLINE_OPTION_NAMES}
+ main(args.notebook_path, args.cells_spec, config_options)
diff --git a/Master/texmf-dist/tex/latex/jupynotex/jupynotex.sty b/Master/texmf-dist/tex/latex/jupynotex/jupynotex.sty
index 205343d0974..b79f622af60 100644
--- a/Master/texmf-dist/tex/latex/jupynotex/jupynotex.sty
+++ b/Master/texmf-dist/tex/latex/jupynotex/jupynotex.sty
@@ -1,7 +1,21 @@
-\ProvidesPackage{jupynotex}[0.1]
+\ProvidesPackage{jupynotex}[1.0]
\usepackage{tcolorbox}
+\usepackage{pgfopts}
+
+\newcommand*\jupynotex@outputtextlimit@value{}
+
+
+\pgfkeys{
+ /jupynotex/.cd ,
+ output-text-limit/.store in=\jupynotex@outputtextlimit@value
+}
+
+\ProcessPgfPackageOptions{/jupynotex}
\newcommand{\jupynotex}[2][-]{
- \input|"python3 jupynotex.py #2 #1"
+ \input|"python3 jupynotex.py '#2' '#1' '\jupynotex@outputtextlimit@value'"
}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
index 3b968ce12e7..3e84c935ba2 100644
--- a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
+++ b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls
@@ -1,6 +1,6 @@
%%
-%% Copyright (C) 2023 by Jinwen XU
-%% -------------------------------
+%% Copyright (C) 2023-2024 by Jinwen XU
+%% ------------------------------------
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{jwjournal}
- {2023/12/19} {}
+ {2024/09/01} {}
{JW's journal class}
\keys_define:nn { jwjournal }
@@ -33,11 +33,11 @@
\sys_if_engine_pdftex:TF
{
- \PassOptionsToClass { use indent = false } { minimart }
+ % \PassOptionsToClass { use indent = false } { minimart }
\LoadClass { minimart }
}
{
- \PassOptionsToClass { use indent = false } { einfart }
+ % \PassOptionsToClass { use indent = false } { einfart }
\LoadClass { einfart }
}
@@ -554,14 +554,14 @@
}
\regex_replace_once:nnN { ❄️ (.*) ❄️ } { ❄️ \1 } \l_jwjournal_tmp_tl
- \regex_replace_once:nnN
- { ❄️ (\ *)? (\d{4}-\d{1,2}-\d{1,2}) (\ *)? (.*) }
- { \c{JWJournalEntry} {\2} {\4} }
- \l_jwjournal_tmp_tl
- \regex_replace_once:nnN
- { ❄️ (\ *)? (\d{1,2}-\d{1,2}-\d{4}) (\ *)? (.*) }
- { \c{JWJournalEntry} {\2} {\4} }
- \l_jwjournal_tmp_tl
+ % \regex_replace_once:nnN
+ % { ❄️ (\ *)? (\d{4}-\d{1,2}-\d{1,2}) (\ *)? (.*) }
+ % { \c{JWJournalEntry} {\2} {\4} }
+ % \l_jwjournal_tmp_tl
+ % \regex_replace_once:nnN
+ % { ❄️ (\ *)? (\d{1,2}-\d{1,2}-\d{4}) (\ *)? (.*) }
+ % { \c{JWJournalEntry} {\2} {\4} }
+ % \l_jwjournal_tmp_tl
\regex_replace_once:nnN
{ ❄️ (\ *)? (\d{4} \D \d{1,2} \D \d{1,2}) (\ *)? (.*) }
{ \c{JWJournalEntry} {\2} {\4} }
diff --git a/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsart-support.tex b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsart-support.tex
new file mode 100644
index 00000000000..d8fb5f7b40e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsart-support.tex
@@ -0,0 +1,64 @@
+% Maintained by Matthew Bertucci, 2024-present
+% Please report all issues and feature requests at https://github.com/mbertucci47/keytheorems
+% This work is licensed under the LPPL version 1.3c or later: https://www.latex-project.org/lppl.txt
+\ProvidesExplFile{keythms-amsart-support}{2024-09-22}{0.1.4}
+ {keytheorems~support~for~the~amsart~class}
+
+\__keythms_support_AMSshared_code:
+
+\IfClassLoadedTF { acmart }
+ { % acmart loads amsart
+ \keytheoremset{overload} % since acmart predefines several theorems
+ \keythms_thmstyle_setdefaultkeys:n
+ {
+ spaceabove = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ spacebelow = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ bodyfont = \@acmplainbodyfont,
+ headindent = \@acmplainindent,
+ headfont = \@acmplainheadfont,
+ headpunct = {.},
+ postheadspace = .5em,
+ numberfont = \upshape,
+ notefont = \@acmplainnotefont,
+ notebraces = {(}{)},
+ noteseparator = {~},
+ headstyle = \keythms_thmstyle_headcmd_default:nnn{#1}{#2}{#3},
+ }
+ \keys_define:nn { keytheorems/thmstyle }
+ {
+ inherit-style / acmplain .meta:n = {},
+ inherit-style / acmdefinition .meta:n =
+ {
+ bodyfont = \@acmdefinitionbodyfont,
+ headindent = \@acmdefinitionindent,
+ headfont = \@acmdefinitionheadfont,
+ notefont = \@acmdefinitionnotefont,
+ },
+ }
+ % TODO: define inherit-style=acmdefinition/acmplain
+ }
+ {
+ \keythms_thmstyle_setdefaultkeys:n
+ {
+ spaceabove = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ spacebelow = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ bodyfont = \itshape,
+ headindent = 0pt,
+ headfont = \bfseries,
+ headpunct = {.},
+ postheadspace = 5pt plus 1pt minus 1pt,
+ notefont = \fontseries\mddefault\upshape,
+ notebraces = {(}{)},
+ noteseparator = {~},
+ headstyle = \keythms_thmstyle_headcmd_default:nnn{#1}{#2}{#3},
+ }
+ }
+
+\keys_define:nn { keytheorems/thmstyle }
+ {
+ inherit-style / remark .meta:n =
+ {
+ headfont = \itshape,
+ bodyfont = \normalfont,
+ }
+ } \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsbook-support.tex b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsbook-support.tex
new file mode 100644
index 00000000000..69add3f1fed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsbook-support.tex
@@ -0,0 +1,31 @@
+% Maintained by Matthew Bertucci, 2024-present
+% Please report all issues and feature requests at https://github.com/mbertucci47/keytheorems
+% This work is licensed under the LPPL version 1.3c or later: https://www.latex-project.org/lppl.txt
+\ProvidesExplFile{keythms-amsbook-support}{2024-09-22}{0.1.4}
+ {keytheorems~support~for~the~amsbook~class}
+
+\__keythms_support_AMSshared_code:
+
+\keythms_thmstyle_setdefaultkeys:n
+ {
+ spaceabove = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ spacebelow = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ bodyfont = \itshape,
+ headindent = \parindent,
+ headfont = \scshape,
+ headpunct = {.},
+ postheadspace = 5pt plus 1pt minus 1pt,
+ numberfont = \upshape,
+ notefont = \fontseries\mddefault\upshape,
+ notebraces = {(}{)},
+ noteseparator = {~},
+ headstyle = \keythms_thmstyle_headcmd_default:nnn{#1}{#2}{#3},
+ }
+
+\keys_define:nn { keytheorems/thmstyle }
+ {
+ inherit-style / remark .meta:n =
+ {
+ bodyfont = \normalfont,
+ },
+ } \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsproc-support.tex b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsproc-support.tex
new file mode 100644
index 00000000000..d9f02caddc8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-amsproc-support.tex
@@ -0,0 +1,31 @@
+% Maintained by Matthew Bertucci, 2024-present
+% Please report all issues and feature requests at https://github.com/mbertucci47/keytheorems
+% This work is licensed under the LPPL version 1.3c or later: https://www.latex-project.org/lppl.txt
+\ProvidesExplFile{keythms-amsproc-support}{2024-09-22}{0.1.4}
+ {keytheorems~support~for~the~amsproc~class}
+
+\__keythms_support_AMSshared_code:
+
+\keythms_thmstyle_setdefaultkeys:n
+ {
+ spaceabove = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ spacebelow = .5\baselineskip plus .2\baselineskip minus .2\baselineskip,
+ bodyfont = \itshape,
+ headindent = \parindent,
+ headfont = \scshape,
+ headpunct = {.},
+ postheadspace = 5pt plus 1pt minus 1pt,
+ numberfont = \upshape,
+ notefont = \fontseries\mddefault\upshape,
+ notebraces = {(}{)},
+ noteseparator = {~},
+ headstyle = \keythms_thmstyle_headcmd_default:nnn{#1}{#2}{#3},
+ }
+
+\keys_define:nn { keytheorems/thmstyle }
+ {
+ inherit-style / remark .meta:n =
+ {
+ bodyfont = \normalfont,
+ },
+ } \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-memoir-support.tex b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-memoir-support.tex
new file mode 100644
index 00000000000..6098daa7304
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/keytheorems/class-support/keythms-memoir-support.tex
@@ -0,0 +1,48 @@
+% Maintained by Matthew Bertucci, 2024-present
+% Please report all issues and feature requests at https://github.com/mbertucci47/keytheorems
+% This work is licensed under the LPPL version 1.3c or later: https://www.latex-project.org/lppl.txt
+\ProvidesExplFile{keythms-memoir-support}{2024-09-22}{0.1.4}
+ {keytheorems~support~for~the~memoir~class}
+
+\bool_new:N \l__keythms_support_titlecode_bool
+
+\keys_define:nn { keytheorems/listof }
+ {
+ indent .initial:n = 0pt,
+ title-code .code:n =
+ {
+ \bool_set_true:N \l__keythms_support_titlecode_bool
+ \cs_set:Npn \__keythms_listof_titlecmd:n ##1 { #1 }
+ },
+ }
+
+% use memoir's list function; not using \newlistentry, though
+\newlistof{ keythms_support_memoir_listof:w }{ thlist }
+ { \l__keythms_listof_title_tl }
+
+\RenewDocumentCommand \listofkeytheorems { O{} }
+ {
+ \bool_gset_true:N \g__keythms_listof_writefile_bool
+ \group_begin:
+ \keys_set:nn { keytheorems/listof } { #1 }
+ \bool_if:NT \l__keythms_listof_nochapskip_bool
+ {
+ \cs_set_eq:NN \KeyThmsAddvspace \use_none:n
+ }
+ \bool_if:NTF \l__keythms_listof_notitle_bool
+ {
+ \cs_set:Npn \@thlistmaketitle {}
+ \keythms_support_memoir_listof:w*
+ }
+ {
+ \bool_if:NT \l__keythms_support_titlecode_bool
+ {
+ \cs_set:Npn \@thlistmaketitle
+ { \__keythms_listof_titlecmd:n { \l__keythms_listof_title_tl } }
+ }
+ \bool_if:NTF \l__keythms_listof_notoc_bool
+ { \keythms_support_memoir_listof:w* }
+ { \keythms_support_memoir_listof:w }
+ }
+ \group_end:
+ } \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/keytheorems/keytheorems.sty b/Master/texmf-dist/tex/latex/keytheorems/keytheorems.sty
new file mode 100644
index 00000000000..efea2364277
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/keytheorems/keytheorems.sty
@@ -0,0 +1,2396 @@
+% Maintained by Matthew Bertucci, 2024-present
+% Please report all issues and feature requests at https://github.com/mbertucci47/keytheorems
+% This work is licensed under the LPPL version 1.3c or later: https://www.latex-project.org/lppl.txt
+\NeedsTeXFormat{LaTeX2e}[2023-06-01]
+\ProvidesExplPackage{keytheorems}{2024-09-22}{0.1.4}{l3keys interface to amsthm}
+
+\IfFormatAtLeastTF { 2024-06-01 } { }
+ {
+ \RequirePackage{nameref} % to avoid ltproperties in code below
+ \cs_generate_variant:Nn \cs_set:Npn { Npe }
+ \cs_generate_variant:Nn \iow_shipout:Nn { Ne }
+ \cs_generate_variant:Nn \keys_set:nn { ne }
+ \cs_generate_variant:Nn \msg_warning:nnn { nne }
+ \cs_generate_variant:Nn \tl_put_right:Nn { Ne }
+ \ProvideDocumentCommand \IfPackageLoadedT { m m }
+ { \IfPackageLoadedTF{#1}{#2}{ } }
+ \ProvideDocumentCommand \IfPackageLoadedF { m m }
+ { \IfPackageLoadedTF{#1}{ }{#2} }
+ \ProvideDocumentCommand \IfClassLoadedT { m m }
+ { \IfClassLoadedTF{#1}{#2}{ } }
+ }
+\RequirePackage{aliascnt} % for sibling theorems
+\RequirePackage{amsthm}
+% ^ ams classes have way of ignoring this so don't need to check if they're loaded
+\RequirePackage{refcount} % for \getrefnumber
+\RequirePackage{translations} % for translating "List of Theorems"
+
+%%%%%%%%%%%%%%%%%%%%%%
+%%% Error Messages %%%
+%%%%%%%%%%%%%%%%%%%%%%
+
+\msg_new:nnn { keytheorems } { thmtools-before }
+ {
+ keytheorems~is~not~compatible~with~thmtools.~
+ Try~replacing~\protect\usepackage{thmtools}~with~
+ \protect\usepackage[thmtools-compat]{keytheorems}.
+ }
+\msg_new:nnn { keytheorems } { thmtools-after }
+ {
+ keytheorems~is~not~compatible~with~thmtools.~
+ This~will~not~work~as~you~think!~
+ Try~replacing~\protect\usepackage{thmtools}~with~
+ \protect\usepackage[thmtools-compat]{keytheorems}.
+ }
+\msg_new:nnn { keytheorems } { no-stored-theorem }
+ {
+ No~stored~theorem~'#1'~found!~
+ Try~compiling~again.~If~that~doesn't~work,~
+ check~the~spelling~of~'#1'.
+ }
+\msg_new:nnn { keytheorems } { no-prop-for-stored-theorem }
+ {
+ No~property~'#1'~found~for~stored~theorem~'#2'.
+ }
+\msg_new:nnn { keytheorems } { store-reversed-not-got }
+ {
+ 'store*=#1'~only~makes~sense~if~you've~called~\protect\getkeytheorem{#1}.~
+ Check~that~\protect\getkeytheorem{#1}~is~called~and~compile~again.
+ }
+\msg_new:nnn { keytheorems } { restate-body-never-got }
+ {
+ With~'store*=#1',~\protect\getkeytheorem[body]{#1}~only~makes~sense~if~
+ \protect\getkeytheorem{#1}~has~been~called.~
+ Check~that~\protect\getkeytheorem{#1}~is~called~and~compile~again.
+ }
+\msg_new:nnn { keytheorems } { store-reversed-called-twice }
+ {
+ With~'store*=#1',~\protect\getkeytheorem{#1}~can~be~called~only~once.
+ }
+\msg_new:nnn { keytheorems } { undefined-thm-hook }
+ {
+ No~theorem~hook~'#1'.~Check~the~spelling.~
+ Should~be~one~of~'prehead',~'posthead',~'prefoot',~'postfoot',~or'restated'.
+ }
+\msg_new:nnn { keytheorems } { hyperref-Autoref }
+ {
+ You~have~not~loaded~hyperref.~The~\protect\Autoref\space command~needs~
+ hyperref~to~work.
+ }
+\msg_new:nnn { keytheorems } { no-Autorefname }
+ {
+ No~Autoref~name~for~'#1'.~
+ Please~define~\c_backslash_str #1Autorefname.
+ }
+\msg_new:nnn { keytheorems } { thmstyle-undefined }
+ {
+ Theorem~style~'#1'~undefined.~
+ Use~\protect\newkeytheoremstyle\space instead.
+ }
+\msg_new:nnn { keytheorems } { thmstyle-defined }
+ {
+ Theorem~style~'#1'~already~defined.~
+ Use~\protect\renewkeytheoremstyle\space instead.
+ }
+\msg_new:nnn { keytheorems } { title-code-with-AMS }
+ {
+ The~'title-code'~key~has~no~effect~with~an~AMS~class.
+ }
+
+% Error if thmtools loaded since compilation hangs.
+% If thmtools loaded after, produce warning.
+\IfPackageLoadedTF { thmtools }
+ {
+ \msg_fatal:nn { keytheorems } { thmtools-before }
+ }
+ {
+ \hook_gput_code:nnn { package/thmtools/before } { . }
+ {
+ \msg_warning:nn { keytheorems } { thmtools-after }
+ }
+ }
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Declare Variables %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\tl_new:N \l__keythms_tmpa_tl
+
+\bool_new:N \g__keythms_listof_writefile_bool
+\bool_gset_false:N \g__keythms_listof_writefile_bool
+\bool_new:N \g__keythms_thmtoolscompat_bool
+\bool_gset_false:N \g__keythms_thmtoolscompat_bool
+\bool_new:N \l__keythms_listofheading_storereversed_bool
+\bool_new:N \l__keythms_thm_numbered_bool
+\bool_new:N \l__keythms_thm_unlessunique_bool
+\bool_new:N \l__keythms_thmuse_listhack_bool
+\bool_new:N \l__keythms_thmuse_restating_bool
+\clist_new:N \g__keythms_restatecounters_clist
+\clist_new:N \l__keythms_thmstyle_savedkeys_clist
+\iow_new:N \g__keythms_listof_stream
+\prop_new:N \g__keythms_thmnames_prop
+\prop_new:N \g__keythms_thmuse_othercounters_prop
+\prop_new:N \l__keythms_restate_counters_prop
+\tl_new:N \l__keythms_thm_currentthmstyle_tl
+\tl_new:N \l__keythms_thm_defaultkeys_tl
+\tl_new:N \l__keythms_thm_envname_tl
+\tl_new:N \l__keythms_thmstyle_defaultkeys_tl
+\tl_new:N \l__keythms_thmstyle_lnotebrace_tl
+\tl_new:N \l__keythms_thmstyle_rnotebrace_tl
+\tl_new:N \l_keythms_thmuse_envname_tl
+\tl_new:N \g__keythms_thmuse_temprestatedata_tl
+\tl_new:N \g__keythms_thmuse_temprestatedatareversed_tl
+
+\newcounter{keythms_restate_dummyctr}
+\cs_gset:Npn \theHkeythms_restate_dummyctr
+ { restate.\arabic{keythms_restate_dummyctr} }
+\cs_gset:Npn \thekeythms_restate_dummyctr { }
+\newcounter{keythms_continues_dummyctr}
+\cs_gset:Npn \theHkeythms_continues_dummyctr
+ { continues.\arabic{keythms_continues_dummyctr} }
+\cs_gset:Npn \thekeythms_continues_dummyctr { }
+\newcounter{keythms_unnumbered_dummyctr}
+\cs_gset:Npn \theHkeythms_unnumbered_dummyctr
+ { unnumbered.\arabic{keythms_unnumbered_dummyctr} }
+\cs_gset:Npn \thekeythms_unnumbered_dummyctr { }
+
+\cs_generate_variant:Nn \hook_gput_code:nnn { nnV }
+\cs_generate_variant:Nn \keys_precompile:nnN { nv, nVc }
+
+%%%%%%%%%%%%%%
+%%% Styles %%%
+%%%%%%%%%%%%%%
+
+% \__keythms_thmstyle_setbraces:nn { <left brace> } { <right brace> }
+\cs_new_protected:Npn \__keythms_thmstyle_setbraces:nn #1#2
+ {
+ \tl_set:Nn \l__keythms_thmstyle_lnotebrace_tl { #1 }
+ \tl_set:Nn \l__keythms_thmstyle_rnotebrace_tl { #2 }
+ }
+\cs_new_protected:Npn \keythms_thmstyle_savethmkey_reqval:n #1
+ {
+ \clist_put_right:No \l__keythms_thmstyle_savedkeys_clist
+ { \l_keys_key_str = { #1 } }
+ }
+\cs_new_protected:Npn \keythms_thmstyle_savethmkey_optval:n #1
+ {
+ \tl_if_empty:NTF \l_keys_value_tl
+ {
+ \clist_put_right:No \l__keythms_thmstyle_savedkeys_clist
+ { \l_keys_key_str }
+ }
+ {
+ \clist_put_right:No \l__keythms_thmstyle_savedkeys_clist
+ { \l_keys_key_str = { #1 } }
+ }
+ }
+
+\keys_define:nn { keytheorems/thmstyle }
+ {
+ spaceabove .tl_set:N = \l__keythms_thmstyle_spaceabove_tl,
+ spacebelow .tl_set:N = \l__keythms_thmstyle_spacebelow_tl,
+ bodyfont .tl_set:N = \l__keythms_thmstyle_bodyfont_tl,
+ headindent .tl_set:N = \l__keythms_thmstyle_headindent_tl,
+ headfont .tl_set:N = \l__keythms_thmstyle_headfont_tl,
+ headpunct .tl_set:N = \l__keythms_thmstyle_headpunct_tl,
+ postheadspace .tl_set:N = \l__keythms_thmstyle_postheadspace_tl,
+ break .meta:n = { postheadspace = \newline }, % add error if postheadspace set
+ break .value_forbidden:n = true,
+ numberfont .tl_set:N = \l__keythms_thmstyle_numberfont_tl,
+ notefont .tl_set:N = \l__keythms_thmstyle_notefont_tl,
+ notebraces .code:n = \exp_after:wN \__keythms_thmstyle_setbraces:nn #1,
+ noteseparator .tl_set:N = \l__keythms_thmstyle_noteseparator_tl,
+ headstyle .choice:,
+ headstyle / margin .code:n =
+ {
+ \cs_set:Nn \keythms_thmstyle_headcmd:nnn
+ { \makebox[0pt][r]{\NUMBER\ }\NAME\NOTE }
+ },
+ headstyle / swapnumber .code:n =
+ {
+ \cs_set:Nn \keythms_thmstyle_headcmd:nnn { \NUMBER\ \NAME\NOTE }
+ },
+ headstyle / unknown .cs_set:Np = \keythms_thmstyle_headcmd:nnn #1#2#3,
+ headformat .meta:n = { headstyle = #1 },
+ inherit-style .choice:,
+ inherit-style / plain .meta:n = {},
+ inherit-style / definition .meta:n = { bodyfont = \normalfont },
+ inherit-style / remark .meta:n =
+ {
+ headfont = \itshape,
+ bodyfont = \normalfont,
+ spaceabove = 0.5\topsep,
+ spacebelow = 0.5\topsep,
+ },
+ % thm keys that are saved for later
+ numbered .code:n = \keythms_thmstyle_savethmkey_optval:n { #1 },
+ parent .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ numberwithin .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ within .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ sibling .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ numberlike .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ sharenumber .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ preheadhook .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ postheadhook .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ prefoothook .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ postfoothook .code:n = \keythms_thmstyle_savethmkey_reqval:n { #1 },
+ qed .code:n = \keythms_thmstyle_savethmkey_optval:n { #1 },
+ tcolorbox .code:n = \keythms_thmstyle_savethmkey_optval:n { #1 },
+ tcolorbox-no-titlebar .code:n = \keythms_thmstyle_savethmkey_optval:n { #1 },
+ }
+
+\cs_new_protected:Nn \keythms_thmstyle_thmname:n { \thmname{#1} }
+\cs_new_protected:Nn \keythms_thmstyle_thmnumber:n { \thmnumber{#1} }
+\cs_new_protected:Nn \keythms_thmstyle_thmnote:n { \thmnote{#1} }
+
+%% NOTE: if these are used, user is in charge of spacing with \NAME and \NUMBER
+%% QUESTION: should these be moved into def of \newkeytheoremstyle?
+\cs_new:Npn \NAME { \keythms_thmstyle_thmname:n { ##1 } }
+\cs_new:Npn \NUMBER
+ {
+ \keythms_thmstyle_thmnumber:n
+ {
+ \group_begin:
+ \exp_not:V \l__keythms_thmstyle_numberfont_tl
+ ##2
+ \group_end:
+ }
+ }
+\cs_new:Npn \NOTE
+ {
+ \keythms_thmstyle_thmnote:n
+ { \exp_not:V \l__keythms_thmstyle_noteseparator_tl
+ \group_begin: % group so notefont doesn't affect headpunct
+ \exp_not:V \l__keythms_thmstyle_notefont_tl
+ \l__keythms_thmstyle_lnotebrace_tl ##3 \l__keythms_thmstyle_rnotebrace_tl
+ \group_end:
+ }
+ }
+
+\cs_new:Npn \keythms_thmstyle_headcmd_default:nnn #1#2#3
+ {
+ \keythms_thmstyle_thmname:n { #1 }
+ \keythms_thmstyle_thmnumber:n
+ { ~
+ \group_begin:
+ \exp_not:V \l__keythms_thmstyle_numberfont_tl
+ #2
+ \group_end:
+ }
+ \keythms_thmstyle_thmnote:n
+ { \exp_not:V \l__keythms_thmstyle_noteseparator_tl
+ \group_begin: % group so notefont doesn't affect headpunct
+ \exp_not:V \l__keythms_thmstyle_notefont_tl
+ \l__keythms_thmstyle_lnotebrace_tl #3 \l__keythms_thmstyle_rnotebrace_tl
+ \group_end:
+ }
+ }
+
+\cs_new_protected:Npn \keythms_thmstyle_setdefaultkeys:n #1
+ {
+ \keys_precompile:nnN { keytheorems/thmstyle }
+ { #1 }
+ \l__keythms_thmstyle_defaultkeys_tl
+ }
+\keythms_thmstyle_setdefaultkeys:n
+ { % support files may overwrite these defaults
+ spaceabove = \topsep,
+ spacebelow = \topsep,
+ bodyfont = \itshape,
+ headindent = 0pt,
+ headfont = \bfseries,
+ headpunct = {.},
+ postheadspace = 5pt plus 1pt minus 1pt,
+ numberfont = \upshape,
+ notefont = \fontseries\mddefault\upshape,
+ notebraces = {(}{)},
+ noteseparator = {~},
+ headstyle = \keythms_thmstyle_headcmd_default:nnn{#1}{#2}{#3},
+ }
+
+\NewDocumentCommand \newkeytheoremstyle { m m }
+ {
+ \cs_if_free:cTF { th@ #1 }
+ { \keythms_thmstyle_declarestyle:nn { #1 } { #2 } }
+ { \msg_error:nnn { keytheorems } { thmstyle-defined } { #1 } }
+ }
+\NewDocumentCommand \renewkeytheoremstyle { m m }
+ {
+ \cs_if_free:cTF { th@ #1 }
+ { \msg_error:nnn { keytheorems } { thmstyle-undefined } { #1 } }
+ { \keythms_thmstyle_declarestyle:nn { #1 } { #2 } }
+ }
+\NewDocumentCommand \providekeytheoremstyle { m m }
+ {
+ \cs_if_free:cT { th@ #1 }
+ { \keythms_thmstyle_declarestyle:nn { #1 } { #2 } }
+ }
+\NewDocumentCommand \declarekeytheoremstyle { m m }
+ {
+ \keythms_thmstyle_declarestyle:nn { #1 } { #2 }
+ }
+
+\@onlypreamble \newkeytheoremstyle
+\@onlypreamble \renewkeytheoremstyle
+\@onlypreamble \providekeytheoremstyle
+\@onlypreamble \declarekeytheoremstyle
+
+\cs_new_eq:NN \keythms_thmstyle_new:nnnnnnnnn \newtheoremstyle
+\cs_generate_variant:Nn \keythms_thmstyle_new:nnnnnnnnn { nVVVVVVVe }
+
+\cs_new_protected:Npn \keythms_thmstyle_declarestyle:nn #1#2
+ {
+ \clist_clear:N \l__keythms_thmstyle_savedkeys_clist
+ \tl_use:N \l__keythms_thmstyle_defaultkeys_tl
+ \keys_set:nn { keytheorems/thmstyle } { #2 }
+ \keythms_thmstyle_new:nVVVVVVVe { #1 }
+ \l__keythms_thmstyle_spaceabove_tl
+ \l__keythms_thmstyle_spacebelow_tl
+ \l__keythms_thmstyle_bodyfont_tl
+ \l__keythms_thmstyle_headindent_tl
+ \l__keythms_thmstyle_headfont_tl
+ \l__keythms_thmstyle_headpunct_tl
+ \l__keythms_thmstyle_postheadspace_tl
+ { \text_expand:n { \keythms_thmstyle_headcmd:nnn{##1}{##2}{##3} } }
+ % Define new inherit-style key
+ \keys_define:nn { keytheorems/thmstyle }
+ { inherit-style / #1 .meta:n = { #2 } }
+ \tl_if_exist:cF { l__keythms_thmstyle_ #1 _savedkeys_tl }
+ { \tl_new:c { l__keythms_thmstyle_ #1 _savedkeys_tl } }
+ \keys_precompile:nVc { keytheorems/thm }
+ \l__keythms_thmstyle_savedkeys_clist
+ { l__keythms_thmstyle_ #1 _savedkeys_tl }
+ }
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Defining Theorems %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% FIX: reimplement these without \NewDocumentCommand and \SplitArgument
+
+% \keythms_thm_setrefnames:n { <envname> } { <refname> or <sing,plural> }
+\NewDocumentCommand \keythms_thm_setrefnames:nn
+ { m >{\SplitArgument{1}{,}} m }
+ { \__keythms_thm_setrefnames_aux:nnn{#1}#2 }
+\cs_new_protected:Npn \__keythms_thm_setrefnames_aux:nnn #1#2#3
+ {
+ \cs_set:cpn { #1 autorefname } { #2 }
+ \IfPackageLoadedT { cleveref }
+ {
+ \tl_if_novalue:nTF { #3 }
+ { \crefname{#1}{#2}{\textbf{??~(pl.~#2)}} }
+ { \crefname{#1}{#2}{#3} }
+ }
+ }
+\cs_generate_variant:Nn \keythms_thm_setrefnames:nn { nV }
+
+% \keythms_thm_setRefnames:n { <envname> } { <refname> or <sing,plural> }
+\NewDocumentCommand \keythms_thm_setRefnames:nn
+ { m >{\SplitArgument{1}{,}} m }
+ { \__keythms_thm_setRefnames_aux:nnn{#1}#2 }
+\cs_new_protected:Npn \__keythms_thm_setRefnames_aux:nnn #1#2#3
+ {
+ \cs_set:cpn { #1 Autorefname } { #2 }
+ \IfPackageLoadedT { cleveref }
+ {
+ \tl_if_novalue:nTF { #3 }
+ { \Crefname{#1}{#2}{\textbf{??~(pl.~#2)}} }
+ { \Crefname{#1}{#2}{#3} }
+ }
+ }
+\cs_generate_variant:Nn \keythms_thm_setRefnames:nn { nV }
+
+\keys_define:nn { keytheorems/thm }
+ {
+ name .tl_set:N = \l__keythms_thm_name_tl,
+ title .meta:n = { name = #1 },
+ heading .meta:n = { name = #1 },
+ refname .tl_set:N = \l__keythms_thm_refname_tl,
+ Refname .tl_set:N = \l__keythms_thm_Refname_tl,
+ numbered .choice:,
+ numbered / true .code:n = \bool_set_true:N \l__keythms_thm_numbered_bool,
+ numbered / false .code:n = \bool_set_false:N \l__keythms_thm_numbered_bool,
+ numbered / yes .meta:n = { numbered = true },
+ numbered / no .meta:n = { numbered = false },
+ numbered / unless-unique .code:n =
+ {
+ \bool_set_true:N \l__keythms_thm_unlessunique_bool
+ },
+ numbered / unless~unique .meta:n = { numbered = unless-unique },
+ numbered .default:n = true,
+ parent .tl_set:N = \l__keythms_thm_parent_tl,
+ numberwithin .meta:n = { parent = #1 },
+ within .meta:n = { parent = #1 },
+ sibling .tl_set:N = \l__keythms_thm_sibling_tl,
+ numberlike .meta:n = { sibling = #1 },
+ sharenumber .meta:n = { sibling = #1 },
+ style .tl_set:N = \l__keythms_thm_style_tl,
+ style .groups:n = { style-comes-first },
+ preheadhook .tl_set:N = \l__keythms_thm_preheadhook_tl,
+ postheadhook .tl_set:N = \l__keythms_thm_postheadhook_tl,
+ prefoothook .tl_set:N = \l__keythms_thm_prefoothook_tl,
+ postfoothook .tl_set:N = \l__keythms_thm_postfoothook_tl,
+ qed .tl_set:N = \l__keythms_thm_qed_tl,
+ qed .default:n = \c_novalue_tl,
+ % ^ distinguish between 'qed' and 'qed={}'
+ tcolorbox .tl_set:N = \l__keythms_thm_tcbkeys_tl,
+ tcolorbox .default:n = {},
+ tcolorbox-no-titlebar .meta:n =
+ {
+ tcolorbox={
+ notitle,
+ before~upper={
+ \group_begin:
+ \__keythms_thm_tcboxtemphead:
+ \group_end:
+ },
+ #1
+ }
+ },
+ tcolorbox-no-titlebar .default:n = {},
+ }
+
+% what below is unnecessary? I really don't understand this code.
+\cs_new_protected:Npn \__keythms_thm_storedeferredthmhead:n #1
+ {
+ \if@inlabel \indent \par \fi % eject a section head if one is pending
+ \if@nobreak
+ \adjust@parskip@nobreak
+ \else
+ \addpenalty\@beginparpenalty
+ \addvspace\@topsep
+ \addvspace{-\parskip}
+ \fi
+ % \global\@inlabeltrue % MY COMMENT: if this is uncommented then spacing after sections is wrong
+ \everypar\dth@everypar
+ \cs_set:Npn \__keythms_thm_tcboxtemphead: { \normalfont #1 }
+ \ignorespaces
+ }
+
+\keys_precompile:nnN { keytheorems/thm }
+ {
+ name = \q_no_value,
+ refname = \q_no_value,
+ Refname = \q_no_value,
+ numbered = true,
+ parent = {},
+ sibling = {},
+ style = {},
+ preheadhook = {},
+ postheadhook = {},
+ prefoothook = {},
+ postfoothook = {},
+ qed = \q_no_value,
+ tcolorbox = \q_no_value,
+ }
+ \l__keythms_thm_defaultkeys_tl
+
+\cs_new_protected:Npn \__keythms_thm_makethmhooks:n #1
+ {
+ \hook_new:n { keytheorems/#1/prehead }
+ \hook_new:n { keytheorems/#1/posthead }
+ \hook_new_reversed:n { keytheorems/#1/prefoot }
+ \hook_new_reversed:n { keytheorems/#1/postfoot }
+ \hook_new:n { keytheorems/#1/restated }
+ }
+
+% Make generic theorem hooks
+\__keythms_thm_makethmhooks:n { allthms }
+
+% \newkeytheorem{<name>}{<keys>}
+\NewDocumentCommand \newkeytheorem { m O{} }
+ {
+ \clist_map_inline:nn { #1 } % define multiple theorems at once
+ { \keythms_thm_newkeythm:nn { ##1 } { #2 } }
+ }
+
+\@onlypreamble \newkeytheorem
+
+% to prevent error when plain, remark, or definition style used
+\tl_new:N \l__keythms_thmstyle_plain_savedkeys_tl
+\tl_new:N \l__keythms_thmstyle_remark_savedkeys_tl
+\tl_new:N \l__keythms_thmstyle_definition_savedkeys_tl
+
+% \keythms_thm_newkeythm:nn { <envname> } { <keys> }
+\cs_new_protected:Npn \keythms_thm_newkeythm:nn #1#2
+ {
+ % Store envname
+ \tl_set:Nn \l__keythms_thm_envname_tl { #1 }
+ % Make unless-unique false by default (can't precompile this)
+ \bool_set_false:N \l__keythms_thm_unlessunique_bool
+ % Set default keys
+ \tl_use:N \l__keythms_thm_defaultkeys_tl
+ % First set style so we can pick up additional thm keys, then overwrite if necessary
+ \keys_set_groups:nnn { keytheorems/thm } { style-comes-first } { #2 }
+ % Store theorem style
+ \tl_set:Ne \l__keythms_thm_currentthmstyle_tl { \the\thm@style }
+ \tl_if_empty:NTF \l__keythms_thm_style_tl
+ { % if \theoremstyle set, also use saved thm keys
+ \tl_if_exist:cT {l__keythms_thmstyle_ \l__keythms_thm_currentthmstyle_tl _savedkeys_tl}
+ { \tl_use:c {l__keythms_thmstyle_ \l__keythms_thm_currentthmstyle_tl _savedkeys_tl} }
+ }
+ {
+ % Temporarily set theorem style
+ \__keythms_theoremstyle:n { \l__keythms_thm_style_tl }
+ % If thm keys given in style, call now (possibly overwritten in next step)
+ % but don't error if user uses a style defined with just \newtheoremstyle
+ \tl_if_exist:cT { l__keythms_thmstyle_ \l__keythms_thm_style_tl _savedkeys_tl }
+ { \tl_use:c { l__keythms_thmstyle_ \l__keythms_thm_style_tl _savedkeys_tl } }
+ }
+ % Set env-specific keys
+ \keys_set:nn { keytheorems/thm } { #2 }
+ % Set up env-specific hooks
+ \__keythms_thm_makethmhooks:n { #1 }
+ % Add to env-specific hooks (use label so code given in keys is outermost)
+ % NOTE: faster to check if empty than add empty code to hook
+ \tl_if_empty:NF \l__keythms_thm_preheadhook_tl
+ {
+ \hook_gput_code:nnV { keytheorems/#1/prehead }
+ { keythms_hook_keys } \l__keythms_thm_preheadhook_tl
+ }
+ \tl_if_empty:NF \l__keythms_thm_postheadhook_tl
+ {
+ \hook_gput_code:nnV { keytheorems/#1/posthead }
+ { keythms_hook_keys } \l__keythms_thm_postheadhook_tl
+ }
+ \tl_if_empty:NF \l__keythms_thm_prefoothook_tl
+ {
+ \hook_gput_code:nnV { keytheorems/#1/prefoot }
+ { keythms_hook_keys } \l__keythms_thm_prefoothook_tl
+ }
+ \tl_if_empty:NF \l__keythms_thm_postfoothook_tl
+ {
+ \hook_gput_code:nnV { keytheorems/#1/postfoot }
+ { keythms_hook_keys } \l__keythms_thm_postfoothook_tl
+ }
+ % Set name if none given
+ \quark_if_no_value:NT \l__keythms_thm_name_tl % use quark so name={} is valid
+ {
+ % use e so \text_titlecase called only once per theorem definition,
+ % not each time the theorem is used
+ \tl_set:Ne \l__keythms_thm_name_tl
+ { \text_titlecase_first:n { #1 } }
+ }
+ % associate formatted name with envname in prop list
+ \prop_gput:NnV \g__keythms_thmnames_prop { #1 } \l__keythms_thm_name_tl
+ % Call correct \newtheorem variant
+ \bool_if:NTF \l__keythms_thm_unlessunique_bool
+ {
+ % [unq] is required since aux is read at begindocument
+ % (technically right before) which is after theorem is defined
+ \RequirePackage[unq]{unique}
+ \tl_if_empty:NTF \l__keythms_thm_parent_tl
+ {
+ \hook_gput_code:nnn { keytheorems/#1/prehead }
+ { keythms_hook_keys } { \setuniqmark { #1 } }
+ \ifuniq{ #1 }
+ { \bool_set_false:N \l__keythms_thm_numbered_bool }
+ { \bool_set_true:N \l__keythms_thm_numbered_bool }
+ \bool_if:NTF \l__keythms_thm_numbered_bool
+ {
+ \tl_if_empty:NTF \l__keythms_thm_sibling_tl
+ {
+ \__keythms_thm_new_numbered:nV { #1 } \l__keythms_thm_name_tl
+ }
+ {
+ \exp_args:NnV \newaliascnt { #1 } \l__keythms_thm_sibling_tl
+ \__keythms_thm_new_sibling:nVn { #1 }
+ \l__keythms_thm_name_tl { #1 }
+ \aliascntresetthe { #1 }
+ }
+ }
+ {
+ \__keythms_thm_new_unnumbered:nV { #1 } \l__keythms_thm_name_tl
+ \hook_gput_code:nnn { keytheorems/#1/prehead } { keythms_hook_keys }
+ {
+ \keythms_if_restating:F
+ { \refstepcounter{ keythms_unnumbered_dummyctr } }
+ }
+ }
+ }
+ {
+ \__keythms_thm_new_uuwithparent:nVV { #1 }
+ \l__keythms_thm_name_tl \l__keythms_thm_parent_tl
+ }
+ }
+ {
+ \bool_if:NTF \l__keythms_thm_numbered_bool
+ {
+ \tl_if_empty:NTF \l__keythms_thm_parent_tl
+ {
+ \tl_if_empty:NTF \l__keythms_thm_sibling_tl
+ {
+ \__keythms_thm_new_numbered:nV { #1 } \l__keythms_thm_name_tl
+ }
+ {
+ \exp_args:NnV \newaliascnt { #1 } \l__keythms_thm_sibling_tl
+ \__keythms_thm_new_sibling:nVn { #1 }
+ \l__keythms_thm_name_tl { #1 }
+ \aliascntresetthe { #1 }
+ }
+ }
+ {
+ \__keythms_thm_new_parent:nVV { #1 }
+ \l__keythms_thm_name_tl \l__keythms_thm_parent_tl
+ }
+ }
+ {
+ \__keythms_thm_new_unnumbered:nV { #1 } \l__keythms_thm_name_tl
+ \hook_gput_code:nnn { keytheorems/#1/prehead } { keythms_hook_keys }
+ {
+ \keythms_if_restating:F
+ { \refstepcounter{ keythms_unnumbered_dummyctr } }
+ }
+ }
+ }
+ % Store theorem def and redefine it with keys
+ \keythms_keyify_theorem:n { #1 }
+ % define \<env>autorefname and \<env>Autorefname, might be redefined next
+ \exp_args:NnV \cs_set:cpn { #1 autorefname } \l__keythms_thm_name_tl
+ \exp_args:NnV \cs_set:cpn { #1 Autorefname } \l__keythms_thm_name_tl
+ % Set ref names
+ \quark_if_no_value:NF \l__keythms_thm_refname_tl
+ { \keythms_thm_setrefnames:nV { #1 } \l__keythms_thm_refname_tl }
+ \quark_if_no_value:NF \l__keythms_thm_Refname_tl
+ { \keythms_thm_setRefnames:nV { #1 } \l__keythms_thm_Refname_tl }
+ % Set up qed if needed
+ \quark_if_no_value:NF \l__keythms_thm_qed_tl
+ {
+ \exp_args:Nno \__keythms_thm_qedcode:nn { #1 } { \l__keythms_thm_qed_tl }
+ }
+ % Set up tcolorbox if needed
+ \quark_if_no_value:NF \l__keythms_thm_tcbkeys_tl
+ {
+ \exp_args:Nno \__keythms_thm_tcboxcode:nn { #1 }
+ { \l__keythms_thm_tcbkeys_tl }
+ }
+ % Set up list-of definition
+ \cs_set_eq:cN { l@ #1 } \keythms_listof_tocline:
+ % Set default list-of display command
+ \__keythms_listof_show_aux:n { #1 }
+ % Set theorem style back to original state if needed
+ \tl_if_empty:NF \l__keythms_thm_style_tl
+ {
+ \__keythms_theoremstyle:V \l__keythms_thm_currentthmstyle_tl
+ }
+ }
+
+\cs_new_protected:Npn \__keythms_thm_tcboxcode:nn #1#2
+ {
+ \RequirePackage{tcolorbox}
+ \hook_gput_code:nnn { keytheorems/#1/prehead }
+ { keythms_tcbox }
+ {
+ \cs_set_eq:NN \deferred@thm@head \__keythms_thm_storedeferredthmhead:n
+ \cs_set_eq:NN \Hy@theorem@makelinktarget \use_none:n
+ % ^ don't like playing with hyperref internals... but don't see around
+ % it because hyperref tries to add to para hook which doesn't work
+ % when title set up the way we do it
+ \cs_set_protected:Npn \thm@space@setup { \thm@preskip=0pt \thm@postskip=0pt }
+ % ^ to match tcolorbox defaults; shouldn't interfere with user styles
+ }
+ \hook_gset_rule:nnnn { keytheorems/#1/posthead }
+ { keythms_tcbox } { before } { keythms_hook_keys }
+ \hook_gset_rule:nnnn { keytheorems/#1/prefoot }
+ { keythms_tcbox } { after } { keythms_hook_keys }
+ \hook_gset_rule:nnnn { keytheorems/#1/prefoot }
+ { keythms_tcbox } { after } { keythms_qed }
+ \tcbset
+ {
+ keythms_tcbox_#1/.style =
+ {
+ savedelimiter=#1,
+ title={ \__keythms_thm_tcboxtemphead: },
+ }
+ }
+ \bool_if:NT \l__keythms_thm_numbered_bool
+ {
+ \hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedF{cleveref}
+ { % hyperref doesn't patch \@thm if cleveref loaded
+ \tcbset
+ {
+ keythms_tcbox_#1/.append~style = % fix hyperlinking
+ { phantom={ \MakeLinkTarget*{\@currentHref} } }
+ }
+ }
+ }
+ }
+ \hook_gput_code:nnn { keytheorems/#1/posthead } { keythms_tcbox }
+ { \begin{tcolorbox}[keythms_tcbox_#1,#2] }
+ \hook_gput_code:nnn { keytheorems/#1/prefoot } { keythms_tcbox }
+ { \end{tcolorbox} }
+ }
+\cs_new_protected:Npn \__keythms_thm_qedcode:nn #1#2
+ {
+ \hook_gput_code:nnn { keytheorems/#1/posthead }
+ { keythms_qed }
+ {
+ \exp_args:No \tl_if_novalue:nF { #2 } { \protected@edef\qedsymbol{#2} }
+ \pushQED{\qed}
+ }
+ \hook_gput_code:nnn { keytheorems/#1/prefoot }
+ { keythms_qed }
+ {
+ \exp_args:No \tl_if_novalue:nF { #2 } { \protected@edef\qedsymbol{#2} }
+ \popQED
+ }
+ }
+
+\cs_new_eq:NN \__keythms_theoremstyle:n \theoremstyle
+\cs_generate_variant:Nn \__keythms_theoremstyle:n { V }
+
+% \newtheorem variants
+\cs_new_eq:NN \__keythms_thm_new:w \newtheorem
+
+\cs_new_protected:Npn \__keythms_thm_new_numbered:nn #1#2
+ { \__keythms_thm_new:w { #1 } { #2 } }
+\cs_generate_variant:Nn \__keythms_thm_new_numbered:nn { nV }
+
+\cs_new_protected:Npn \__keythms_thm_new_unnumbered:nn #1#2
+ { \__keythms_thm_new:w* { #1 } { #2 } }
+\cs_generate_variant:Nn \__keythms_thm_new_unnumbered:nn { nV }
+
+\cs_new_protected:Npn \__keythms_thm_new_parent:nnn #1#2#3
+ { \__keythms_thm_new:w { #1 } { #2 } [ #3 ] }
+\cs_generate_variant:Nn \__keythms_thm_new_parent:nnn { nVV }
+
+\cs_new_protected:Npn \__keythms_thm_new_sibling:nnn #1#2#3
+ { \__keythms_thm_new:w { #1 } [ #3 ] { #2 } }
+\cs_generate_variant:Nn \__keythms_thm_new_sibling:nnn { nV }
+
+\cs_new_protected:Npn \__keythms_thm_new_uuwithparent:nnn #1#2#3
+ {
+ \cs_undefine:c { keythms_orig_nonumber_#1 } % for renew, declare
+ \__keythms_thm_new_unnumbered:nn { keythms_orig_nonumber_#1 } { #2 }
+ \__keythms_thm_new_parent:nnn { #1 } { #2 } { #3 }
+ \DeclareEnvironmentCopy { keythms_orig_withparent_#1 } { #1 }
+ \renewenvironment { #1 } % opt arg is implicit
+ {
+ \setuniqmark{ #1. \use:c {the #3} }
+ \ifuniq{ #1. \use:c {the #3} }
+ {
+ \keythms_if_restating:F
+ { \refstepcounter{ keythms_unnumbered_dummyctr } }
+ \begin{keythms_orig_nonumber_#1}
+ }
+ {
+ \begin{keythms_orig_withparent_#1}
+ }
+ }
+ {
+ \ifuniq{ #1. \use:c {the #3} }
+ { \end{keythms_orig_nonumber_#1} }
+ { \end{keythms_orig_withparent_#1} }
+ }
+ }
+\cs_generate_variant:Nn \__keythms_thm_new_uuwithparent:nnn { nVV }
+
+% for getting notes with continues*, use nameref if available, otherwise ltproperties
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedTF { nameref }
+ {
+ \cs_new:Npn \__keythms_thmuse_recordnote: { } % nameref takes care of this
+ \cs_new:Npn \__keythms_getrecordednote:n #1
+ {
+ \getrefbykeydefault{ #1 }{ name }{ }
+ }
+ }
+ {
+ \property_new:nnnn { keytheorems/recordednote } { now } { }
+ { \l__keythms_thmuse_note_tl }
+ \cs_new:Npn \__keythms_getrecordednote:n #1
+ {
+ \property_ref:nn { keythms_recordednote_#1 }
+ { keytheorems/recordednote }
+ }
+ \cs_new:Npn \__keythms_thmuse_recordnote:
+ {
+ \tl_if_empty:NF \l__keythms_thmuse_note_tl
+ {
+ \RecordProperties
+ { keythms_recordednote_\l__keythms_thmuse_label_tl }
+ { keytheorems/recordednote }
+ }
+ }
+ }
+ }
+
+\keys_define:nn { keytheorems/thmuse }
+ {
+ label .tl_set:N = \l__keythms_thmuse_label_tl,
+ note .tl_set:N = \l__keythms_thmuse_note_tl,
+ note .initial:n = {},
+ name .meta:n = { note = #1 },
+ % ^ for compatibility. "name" is ambiguous and doesn't match amsthm language
+ short-note .code:n = {}, % these do nothing at point of use
+ short-name .code:n = {},
+ continues .tl_set:N = \l__keythms_thmuse_contlabel_tl,
+ continues* .code:n =
+ {
+ \keys_set:nn { keytheorems/thmuse } { continues = #1 }
+ \protected@edef \l__keythms_tmpa_tl { \__keythms_getrecordednote:n{#1} }
+ \tl_if_empty:NF \l__keythms_tmpa_tl
+ {
+ \keys_set:nn { keytheorems/thmuse }
+ { note = \l__keythms_tmpa_tl }
+ }
+ },
+ store .tl_set:N = \l__keythms_thmuse_store_tl, % should this be .tl_set_e:N ?
+ %store .default:n = \q_no_value, % ={name} causes issues
+ restate .meta:n = { store = #1 }, % thmtools compatibility
+ store* .tl_set:N = \l__keythms_thmuse_storereversed_tl,
+ restate* .meta:n = { store* = #1 },
+ restate-keys .clist_set:N = \l__keythms_thmuse_restatekeys_clist,
+ listhack .choice:, % need equals sign
+ listhack / true .code:n = \bool_set_true:N \l__keythms_thmuse_listhack_bool,
+ listhack / false .code:n = \bool_set_false:N \l__keythms_thmuse_listhack_bool,
+ listhack .initial:n = false,
+ seq .code:n = {},
+ }
+
+\cs_new_protected:Npn \keythms_keyify_theorem:n #1
+ { % #1 = theorem name
+ \DeclareEnvironmentCopy { keythms_orig_#1 } { #1 }
+ \DeclareDocumentEnvironment { keythms_grab_#1 } { m m +b }
+ { % ##1 = keys, ##2 = note, ##3 = theorem body
+ \__keythms_thm_prehead_code:n { #1 }
+ \begin{keythms_orig_#1}[{##2}]
+ \clist_map_inline:Nn \g__keythms_restatecounters_clist
+ {
+ \prop_gput:Nne \g__keythms_thmuse_othercounters_prop { ####1 }
+ { \the\value{####1} }
+ }
+ \__keythms_thm_posthead_code:n { #1 }
+ % below needs to come after posthead so that correct \@currentHref
+ % is stored for tcolorbox theorems
+ \__keythms_thm_addcontentsdata:nnnn { #1 }
+ { \prop_to_keyval:N \g__keythms_thmuse_othercounters_prop }
+ { ##1 } { ##3 }
+ \__keythms_thm_tempstorerestatedata:nnn { #1 } { ##1 } { ##3 }
+ ##3
+ \__keythms_thm_prefoot_code:n { #1 }
+ \end{keythms_orig_#1}
+ \__keythms_thm_postfoot_code:n { #1 }
+ }
+ {}
+ \DeclareDocumentEnvironment { keythms_grabreversed_#1 } { m m +b }
+ { % ##1 = keys, ##2 = note, ##3 = theorem body
+ \tl_if_exist:cTF
+ { c__keythms_storeatbegin_ \l__keythms_thmuse_storereversed_tl _restatecounters_tl }
+ {
+ \bool_set_true:N \l__keythms_thmuse_restating_bool
+ \exp_args:NNe \prop_set_from_keyval:Nn \l__keythms_restate_counters_prop
+ { \tl_use:c { c__keythms_storeatbegin_ \l__keythms_thmuse_storereversed_tl _restatecounters_tl } }
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \tl_set:ce { l_keythms_restate_current_####1_tl }
+ { \the\value{####1} }
+ \setcounter { ####1 } { ####2 }
+ % ^ FIX: what if eq's numbered by section, theorem, etc.? The
+ % thmtools code is opaque.... Or maybe should be up to the
+ % user to say "restate-counters={section,chapter,...}".
+ \cs_set:cpn { theH ####1 }
+ { \use:c { the ####1 } . \theHkeythms_restate_dummyctr }
+ }
+ \tl_if_empty:cTF
+ { c__keythms_storeatbegin_ \l__keythms_thmuse_storereversed_tl _label_tl }
+ { \refstepcounter{keythms_restate_dummyctr} } % for unnumbered theorems
+ {
+ \cs_set:cpn { the #1 }
+ { \tl_use:c { c__keythms_storeatbegin_ \l__keythms_thmuse_storereversed_tl _label_tl } }
+ \cs_set_eq:cN { c@ #1 } \c@keythms_restate_dummyctr
+ \cs_set_eq:cN { theH #1 } \theHkeythms_restate_dummyctr
+ % ^ why are the last two lines here? We shouldn't be referencing
+ % restated theorems. Think it's a remnant of thmtools
+ % WRONG: needed to make numbering correct after restated theorem.
+ % not sure about theH. <- this is needed to prevent duplicate anchors
+ }
+ }
+ {
+ \msg_warning:nne { keytheorems } { store-reversed-not-got }
+ { \l__keythms_thmuse_storereversed_tl }
+ }
+ \renewcommand\label[2][]{} % disable \label (opt arg in case cleveref loaded)
+ \cs_set_eq:NN \ltx@label \use_none:n % disable \ltx@label
+ \cs_set_eq:NN \property_record:nn \use_none:nn % disable \RecordProperties
+ \cs_set_eq:NN \setuniqmark \use_none:n % work with numbered=unless-unique
+ % QUESTION: also disable \hyper@@anchor? \MakeLinkTarget?
+ \hook_use:n { keytheorems/#1/restated }
+ \hook_use:n { keytheorems/allthms/restated }
+ \__keythms_thm_prehead_code:n { #1 }
+ \begin{keythms_orig_#1}[{##2}]
+ \__keythms_thm_posthead_code:n { #1 }
+ % below needs to come after posthead so that correct \@currentHref
+ % is stored for tcolorbox theorems
+ \__keythms_thm_addstoredreverseddata:nnn { #1 } { ##1 } { ##3 }
+ \__keythms_thm_tempstorerestatedatareversed:nnn { #1 } { ##1 } { ##3 }
+ ##3
+ \__keythms_thm_prefoot_code:n { #1 }
+ \end{keythms_orig_#1}
+ \__keythms_thm_postfoot_code:n { #1 }
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \exp_args:Nnc \setcounter { ####1 }
+ { l_keythms_restate_current_####1_tl }
+ }
+ }
+ { }
+ % NOTE: have to do a lot of shenanigans to make sure the begin/end of grabbed
+ % theorem env captures only the body and no package code.
+ % This is the price of on-the-fly redefining the env to grab body
+ \RenewDocumentEnvironment { #1 } { ={note} O{} }
+ {
+ \keys_set:nn { keytheorems/thmuse } { ##1 }
+ \tl_if_empty:NF \l__keythms_thmuse_store_tl
+ {
+ \bool_gset_true:N \g__keythms_listof_writefile_bool
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnn \__keythms_grab_begin:nnn
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnV \__keythms_grab_begin:nnV
+ \cs_set_eq:NN \__keythms_withhooks_end:n \__keythms_grab_end:n
+ }
+ \tl_if_empty:NF \l__keythms_thmuse_storereversed_tl
+ {
+ \bool_gset_true:N \g__keythms_listof_writefile_bool
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnn \__keythms_grabreversed_begin:nnn
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnV \__keythms_grabreversed_begin:nnV
+ \cs_set_eq:NN \__keythms_withhooks_end:n \__keythms_grabreversed_end:n
+ }
+ \__keythms_thm_prehead_continues_code:n { #1 }
+ \__keythms_withhooks_begin:nnV { #1 } { ##1 } \l__keythms_thmuse_note_tl
+ }
+ {
+ \__keythms_withhooks_end:n { #1 }
+ \tl_if_empty:NF \l__keythms_thmuse_store_tl
+ {
+ \cs_if_exist:cF
+ { __keythms_getthm_ \l__keythms_thmuse_store_tl _theorem }
+ {
+ \cs_new:cpe
+ { __keythms_getthm_ \l__keythms_thmuse_store_tl _theorem }
+ {
+ \exp_not:N \__keythms_getthm_theorem:nnnnn
+ \exp_not:o { \g__keythms_thmuse_temprestatedata_tl }
+ }
+ \cs_new:cpe
+ { __keythms_getthm_ \l__keythms_thmuse_store_tl _body }
+ {
+ \exp_not:N \__keythms_getthm_body:nn
+ \exp_args:No \exp_not:o
+ {
+ \exp_after:wN \__keythms_use_iii_v_braced:nnnnn
+ \g__keythms_thmuse_temprestatedata_tl
+ }
+ }
+ }
+ }
+ \tl_if_empty:NF \l__keythms_thmuse_storereversed_tl
+ {
+ \cs_if_exist:cF
+ { __keythms_getthm_ \l__keythms_thmuse_storereversed_tl _theorem }
+ {
+ \cs_new:cpe
+ { __keythms_getthm_ \l__keythms_thmuse_storereversed_tl _theorem }
+ {
+ \exp_not:N \__keythms_getthmreversed_theorem:nnn
+ \exp_not:o { \g__keythms_thmuse_temprestatedatareversed_tl }
+ }
+ \cs_new:cpn
+ { __keythms_getthm_ \l__keythms_thmuse_storereversed_tl _body }
+ {
+ \textbf{??}
+ \msg_warning:nnn { keytheorems } { restate-body-never-got }
+ { #1 }
+ }
+ }
+ }
+ }
+ }
+\cs_new:Npn \__keythms_use_iii_v_braced:nnnnn #1#2#3#4#5 { {#3}{#5} }
+
+\cs_new_protected:Npn \__keythms_withhooks_begin:nnn #1#2#3
+ { % #1 = theorem name, #2 = keys, #3 = note
+ \__keythms_thm_prehead_code:n { #1 }
+ \begin{keythms_orig_#1}[{#3}]
+ \__keythms_thm_posthead_code:n { #1 }
+ \__keythms_thm_addcontentsdata:nnnn { #1 } { } { #2 } { }
+ \ignorespaces % I hope this is alright
+ }
+\cs_generate_variant:Nn \__keythms_withhooks_begin:nnn { nnV }
+\cs_new_protected:Npn \__keythms_withhooks_end:n #1
+ {
+ \__keythms_thm_prefoot_code:n { #1 }
+ \end{keythms_orig_#1}
+ \__keythms_thm_postfoot_code:n { #1 }
+ }
+\cs_new_protected:Npn \__keythms_grab_begin:nnn #1#2#3
+ { % #1 = theorem name, #2 = keys, #3 = note
+ \begin{keythms_grab_#1}{#2}{#3}
+ }
+\cs_generate_variant:Nn \__keythms_grab_begin:nnn { nnV }
+\cs_new_protected:Npn \__keythms_grab_end:n #1 { \end{keythms_grab_#1} }
+
+\cs_new_protected:Npn \__keythms_grabreversed_begin:nnn #1#2#3
+ { % #1 = theorem name, #2 = keys, #3 = note
+ \begin{keythms_grabreversed_#1}{#2}{#3}
+ }
+\cs_generate_variant:Nn \__keythms_grabreversed_begin:nnn { nnV }
+\cs_new_protected:Npn \__keythms_grabreversed_end:n #1
+ { \end{keythms_grabreversed_#1} }
+
+\cs_new_protected:Npn \__keythms_orig_begin:nn #1#2
+ { \begin{keythms_orig_#1}[{#2}] }
+\cs_generate_variant:Nn \__keythms_orig_begin:nn { nV }
+\cs_new_protected:Npn \__keythms_orig_end:n #1 { \end{keythms_orig_#1} }
+
+\cs_new_protected:Npn \__keythms_thm_prehead_code:n #1
+ { % #1 = theorem name
+ \tl_set:Nn \l_keythms_thmuse_envname_tl { #1 }
+ \hook_use:n { keytheorems/#1/prehead }
+ \hook_use:n { keytheorems/allthms/prehead }
+ }
+%% this below has to be separate from prehead_code above since we need to add
+%% continues-code to note before retrieving it in \__keythms_withhooks_begin:nnV
+\cs_new_protected:Npn \__keythms_thm_prehead_continues_code:n #1
+ { % #1 = theorem name
+ \tl_if_empty:NF \l__keythms_thmuse_contlabel_tl
+ {
+ \tl_if_empty:NF \l__keythms_thmuse_note_tl
+ { \tl_put_right:Nn \l__keythms_thmuse_note_tl { , ~ } }
+ \tl_put_right:Ne \l__keythms_thmuse_note_tl
+ { \__keythms_thmuse_continues:V \l__keythms_thmuse_contlabel_tl }
+ \cs_set:cpn { the #1 }
+ {
+ \getrefnumber { \l__keythms_thmuse_contlabel_tl }
+ }
+ \cs_set_eq:cN { c@ #1 } \c@keythms_continues_dummyctr
+ \cs_set_eq:cN { theH #1 } \theHkeythms_continues_dummyctr
+ %\cs_set_eq:NN \setuniqmark \use_none:n % not the right fix
+ }
+ }
+\cs_new_protected:Npn \__keythms_thm_posthead_code:n #1
+ { % #1 = theorem name
+ \hook_use:n { keytheorems/#1/posthead }
+ \hook_use:n { keytheorems/allthms/posthead }
+ \tl_if_empty:NF \l__keythms_thmuse_label_tl
+ {
+ \label{ \l__keythms_thmuse_label_tl }
+ \__keythms_thmuse_recordnote:
+ }
+ \bool_if:NT \l__keythms_thmuse_listhack_bool
+ { % straight from thm-amsthm.sty
+ \leavevmode
+ \vspace{-\baselineskip}%
+ \par
+ \everypar{\setbox\z@\lastbox\everypar{}}%
+ }
+ }
+\cs_new_protected:Npn \__keythms_thm_prefoot_code:n #1
+ { % #1 = theorem name
+ \hook_use:n { keytheorems/allthms/prefoot }
+ \hook_use:n { keytheorems/#1/prefoot }
+ }
+\cs_new_protected:Npn \__keythms_thm_postfoot_code:n #1
+ { % #1 = theorem name
+ \hook_use:n { keytheorems/allthms/postfoot }
+ \hook_use:n { keytheorems/#1/postfoot }
+ }
+\cs_new_protected:Npn \__keythms_thm_addcontentsdata:nnnn #1#2#3#4
+ { % #1 = theorem name, #2 = stored counters, #3 = keys, #4 = body
+ \keythms_listof_chaptervspacehack:
+ \iow_shipout:Ne \@auxout
+ {
+ \exp_not:N \@writefile { thlist }
+ {
+ \KeyThmsSavedTheorem{ #1 }
+ { \@currentlabel }
+ { \@currentHref }
+ { \thepage }
+ { #2 }
+ { \exp_not:n { #3 } } % do we want any expansion here, perhaps
+ { \exp_not:n { #4 } } % with \text_expand:n ?
+ }
+ }
+ }
+\cs_new_protected:Npn \__keythms_thm_addstoredreverseddata:nnn #1#2#3
+ {
+ \iow_shipout:Ne \@auxout
+ {
+ \exp_not:N \@writefile { thlist }
+ {
+ \KeyThmsSavedTheoremReversed { \l__keythms_thmuse_storereversed_tl }
+ { #1 }
+ { \exp_not:n { #2 } }
+ { \exp_not:n { #3 } }
+ }
+ }
+ }
+\cs_new_protected:Npn \__keythms_thm_tempstorerestatedata:nnn #1#2#3
+ { % #1 = theorem name, #2 = keys, #3 = body
+ \tl_gset:Ne \g__keythms_thmuse_temprestatedata_tl % needs to be global to get out of env
+ {
+ { #1 }
+ { \@currentlabel }
+ { \prop_to_keyval:N \g__keythms_thmuse_othercounters_prop }
+ { \exp_not:n { #2 } } % do we want any expansion here, perhaps
+ { \exp_not:n { #3 } } % with \text_expand:n ?
+ }
+ }
+\cs_new_protected:Npn \__keythms_thm_tempstorerestatedatareversed:nnn #1#2#3
+ {
+ \tl_gset:Ne \g__keythms_thmuse_temprestatedatareversed_tl % needs to be global to get out of env
+ {
+ { #1 }
+ { \exp_not:n { #2 } }
+ { \exp_not:n { #3 } }
+ }
+ }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Retrieving Theorem Data %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\cs_new_protected:Npn \KeyThmsSavedTheorem #1#2#3#4#5#6#7 % 7th arg is body
+ { \use:c { __keythms_thmitem_#1:nnnnnn } {#2}{#3}{#4}{#5}{#6}{#7} }
+\cs_new_protected:Npn \KeyThmsSavedTheoremReversed #1#2#3#4 { } % gobble by default
+
+\keys_define:nn { keytheorems/storeatbegin }
+ {
+ store .tl_set:N = \l__keythms_storeatbegin_store_tl,
+ restate .meta:n = { store=#1 },
+ store* .tl_set:N = \l__keythms_storeatbegin_storereversed_tl,
+ restate* .meta:n = { store*=#1 },
+ unknown .code:n = { } % do nothing with unknown keys
+ }
+
+\cs_new_protected:Npn \KeyThmsContentsLine #1 { #1 }
+\NewDocumentCommand \addtheoremcontentsline { m m }
+ {
+ \addtocontents { thlist }
+ {
+ \KeyThmsContentsLine
+ { % copied from def of \addcontentsline
+ \protect\contentsline{#1}{#2}{\thepage}{}
+ \protected@file@percent
+ }
+ }
+ }
+\NewDocumentCommand \addtotheoremcontents { m }
+ {
+ \addtocontents { thlist }
+ {
+ \KeyThmsContentsLine { #1 }
+ }
+ }
+
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \group_begin:
+ \cs_set_eq:NN \KeyThmsContentsLine \use_none:n
+ \cs_set_eq:NN \KeyThmsAddvspace \use_none:n
+ \cs_set_protected:Npn \KeyThmsSavedTheorem #1#2#3#4#5#6#7
+ {
+ \group_begin:
+ \keys_set:nn { keytheorems/storeatbegin } { #6 }
+ \tl_if_empty:NF \l__keythms_storeatbegin_store_tl
+ {
+ \cs_new_protected:cpn
+ { __keythms_getthm_ \l__keythms_storeatbegin_store_tl _theorem }
+ {
+ \__keythms_getthm_theorem:nnnnn
+ {#1}{#2}{#5}{#6}{#7}
+ }
+ \cs_new_protected:cpn
+ { __keythms_getthm_ \l__keythms_storeatbegin_store_tl _body }
+ {
+ \__keythms_getthm_body:nn {#5}{#7}
+ }
+ }
+ \tl_if_empty:NF \l__keythms_storeatbegin_storereversed_tl
+ {
+ \tl_const:cn
+ { c__keythms_storeatbegin_ \l__keythms_storeatbegin_storereversed_tl _label_tl }
+ { #2 }
+ \tl_const:cn
+ { c__keythms_storeatbegin_ \l__keythms_storeatbegin_storereversed_tl _restatecounters_tl }
+ { #5 }
+ \cs_new_protected:cpn
+ { __keythms_getthm_ \l__keythms_storeatbegin_storereversed_tl _body }
+ {
+ \__keythms_getthm_body:nn {#5}{#7}
+ }
+ }
+ \group_end:
+ }
+ \cs_set_protected:Npn \KeyThmsSavedTheoremReversed #1#2#3#4
+ {
+ \bool_new:c { g__keythms_restate_#1_called_bool }
+ \cs_gset:cpn { __keythms_getthm_ #1 _theorem }
+ { \__keythms_getthmreversed_theorem:nnn { #2 } { #3 } { #4 } }
+ \hook_gput_code:nnn { begindocument/end } { . }
+ {
+ \cs_if_exist:cF { __keythms_getthm_ #1 _body }
+ {
+ \cs_new_protected:cpn { __keythms_getthm_ #1 _body }
+ {
+ \textbf{??}
+ \msg_warning:nnn { keytheorems } { restate-body-never-got } { #1 }
+ }
+ }
+ }
+ }
+ \file_if_exist_input:n { \c_sys_jobname_str.thlist }
+ \group_end:
+ }
+
+\prg_new_conditional:Npnn \keythms_if_restating: { T, F, TF }
+ {
+ \bool_if:NTF \l__keythms_thmuse_restating_bool
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+\NewDocumentCommand \IfRestatingTF { } { \keythms_if_restating:TF }
+\NewDocumentCommand \IfRestatingT { } { \keythms_if_restating:T }
+\NewDocumentCommand \IfRestatingF { } { \keythms_if_restating:F }
+
+\cs_new_protected:Npn \__keythms_getthm_theorem:nnnnn #1#2#3#4#5
+ { % #1 = name, #2 = number, #3 = restate counters, #4 = keys, #5 = theorem body
+ \group_begin:
+ \bool_set_true:N \l__keythms_thmuse_restating_bool
+ \prop_set_from_keyval:Nn \l__keythms_restate_counters_prop { #3 }
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \tl_set:ce { l_keythms_restate_current_##1_tl } { \the\value{##1} }
+ \setcounter { ##1 } { ##2 }
+ % ^ FIX: what if eq's numbered by section, theorem, etc.? The
+ % thmtools code is opaque.... Or maybe should be up to the
+ % user to say "restate-counters={section,chapter,...}".
+ \cs_set:cpn { theH ##1 }
+ { \use:c { the ##1 } . \theHkeythms_restate_dummyctr }
+ }
+ \tl_if_empty:nTF { #2 }
+ { \refstepcounter{keythms_restate_dummyctr} } % for unnumbered theorems
+ {
+ \cs_set:cpn { the #1 } { #2 }
+ \cs_set_eq:cN { c@ #1 } \c@keythms_restate_dummyctr
+ \cs_set_eq:cN { theH #1 } \theHkeythms_restate_dummyctr
+ % ^ why are the last two lines here? We shouldn't be referencing
+ % restated theorems. Think it's a remnant of thmtools
+ % WRONG: needed to make numbering correct after restated theorem.
+ % not sure about theH. <- this is needed to prevent duplicate anchors
+ }
+ \renewcommand\label[2][]{} % disable \label (opt arg in case cleveref loaded)
+ \cs_set_eq:NN \ltx@label \use_none:n % disable \ltx@label
+ \cs_set_eq:NN \property_record:nn \use_none:nn % disable \RecordProperties
+ \cs_set_eq:NN \setuniqmark \use_none:n % work with numbered=unless-unique
+ % QUESTION: also disable \hyper@@anchor? \MakeLinkTarget?
+ \keys_set:nn { keytheorems/thmuse } { #4 }
+ \keys_set:no { keytheorems/thmuse } { \l__keythms_thmuse_restatekeys_clist }
+ \hook_use:n { keytheorems/#1/restated }
+ \hook_use:n { keytheorems/allthms/restated }
+ \__keythms_thm_prehead_continues_code:n { #1 }
+ \__keythms_thm_prehead_code:n { #1 }
+ \__keythms_orig_begin:nV { #1 } \l__keythms_thmuse_note_tl
+ \__keythms_thm_posthead_code:n { #1 }
+ #5
+ \__keythms_thm_prefoot_code:n { #1 }
+ \__keythms_orig_end:n { #1 }
+ \__keythms_thm_postfoot_code:n { #1 }
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \exp_args:Nnc \setcounter { ##1 }
+ { l_keythms_restate_current_##1_tl }
+ }
+ \group_end:
+ }
+
+\cs_new_protected:Npn \__keythms_getthm_body:nn #1#2
+ { % #1 = restate counters, #2 = theorem body
+ \group_begin:
+ \bool_set_true:N \l__keythms_thmuse_restating_bool
+ \prop_set_from_keyval:Nn \l__keythms_restate_counters_prop { #1 }
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \tl_set:ce { l_keythms_restate_current_##1_tl } { \the\value{##1} }
+ \setcounter { ##1 } { ##2 }
+ % ^ FIX: what if eq's numbered by section, theorem, etc.? The
+ % thmtools code is opaque.... Or maybe should be up to the
+ % user to say "restate-counters={section,chapter,...}".
+ \cs_set:cpn { theH ##1 }
+ { \use:c { the ##1 } . \theHkeythms_restate_dummyctr }
+ }
+ \refstepcounter{keythms_restate_dummyctr}
+ \renewcommand\label[2][]{} % disable \label (opt arg in case cleveref loaded)
+ \cs_set_eq:NN \ltx@label \use_none:n % disable \ltx@label
+ \cs_set_eq:NN \property_record:nn \use_none:nn % disable \RecordProperties
+ \hook_use:n { keytheorems/#1/restated }
+ \hook_use:n { keytheorems/allthms/restated }
+ #2
+ \prop_map_inline:Nn \l__keythms_restate_counters_prop
+ {
+ \exp_args:Nnc \setcounter { ##1 }
+ { l_keythms_restate_current_##1_tl }
+ }
+ \group_end:
+ }
+
+\cs_new_protected:Npn \__keythms_getthmreversed_theorem:nnn #1#2#3
+ { % #1 = envname, #2 = keys, #3 = theorem body
+ \group_begin:
+ \bool_set_false:N \l__keythms_thmuse_restating_bool
+ \keys_set:nn { keytheorems/thmuse } { #2 }
+ \keys_set:no { keytheorems/thmuse } { \l__keythms_thmuse_restatekeys_clist }
+ \__keythms_thm_prehead_continues_code:n { #1 }
+ \__keythms_thm_prehead_code:n { #1 }
+ \__keythms_orig_begin:nV { #1 } \l__keythms_thmuse_note_tl
+ \clist_map_inline:Nn \g__keythms_restatecounters_clist
+ {
+ \prop_gput:Nne \g__keythms_thmuse_othercounters_prop { ##1 }
+ { \the\value{##1} }
+ }
+ \__keythms_thm_posthead_code:n { #1 }
+ \__keythms_thm_addcontentsdata:nnnn { #1 }
+ { \prop_to_keyval:N \g__keythms_thmuse_othercounters_prop }
+ { #2 } { #3 }
+ \__keythms_thm_tempstorerestatedata:nnn { #1 } { #2 } { #3 } % for defining getthm_body
+ #3
+ \__keythms_thm_prefoot_code:n { #1 }
+ \__keythms_orig_end:n { #1 }
+ \__keythms_thm_postfoot_code:n { #1 }
+ % While we're here, define getthm_body
+ \cs_if_exist:cF
+ { __keythms_getthm_ \l__keythms_thmuse_storereversed_tl _body }
+ {
+ \cs_new:cpe
+ { __keythms_getthm_ \l__keythms_thmuse_storereversed_tl _body }
+ {
+ \exp_not:N \__keythms_getthm_body:nn
+ \exp_args:No \exp_not:o
+ {
+ \exp_after:wN \__keythms_use_iii_v_braced:nnnnn
+ \g__keythms_thmuse_temprestatedata_tl
+ }
+ }
+ }
+ \bool_gset_true:c
+ { g__keythms_restate_ \l__keythms_thmuse_storereversed_tl _called_bool }
+ \group_end:
+ }
+
+% \getkeytheorem[<property>]{<tag>}
+\NewDocumentCommand \getkeytheorem { O{theorem} m }
+ {
+ \cs_if_exist:cTF { __keythms_getthm_#2_#1 }
+ {
+ \bool_if_exist:cTF { g__keythms_restate_#2_called_bool }
+ {
+ \str_if_eq:nnTF { #1 } { theorem }
+ {
+ \bool_if:cTF
+ { g__keythms_restate_#2_called_bool }
+ {
+ \msg_error:nnn { keytheorems }
+ { store-reversed-called-twice } { #2 }
+ }
+ { \use:c { __keythms_getthm_#2_#1 } }
+ }
+ { \use:c { __keythms_getthm_#2_#1 } }
+ }
+ { \use:c { __keythms_getthm_#2_#1 } }
+ }
+ {
+ \textbf{??}
+ \cs_if_exist:cTF { __keythms_getthm_#2_theorem }
+ {
+ \msg_warning:nnnn { keytheorems } { no-prop-for-stored-theorem }
+ { #1 } { #2 } % should this be an error?
+ }
+ { \msg_warning:nnn { keytheorems } { no-stored-theorem } { #2 } }
+ }
+ }
+
+%%%%%%%%%%%%%%%%%%%%%
+%%% Theorem Hooks %%%
+%%%%%%%%%%%%%%%%%%%%%
+
+%%% \addtotheoremhook[<envname>]{<hook>}{<code>}
+\NewDocumentCommand \addtotheoremhook { O{allthms} m +m }
+ {
+ \__hook_if_declared:nTF { keytheorems/allthms/#2 }
+ {
+ \hook_gput_code:nnn { keytheorems/#1/#2 } { . } { #3 }
+ }
+ {
+ \msg_error:nnn { keytheorems } { undefined-thm-hook } { #2 }
+ }
+ }
+
+% NOTE: I think it's OK we use the internal \__hook_if_declared:nTF above
+% since we don't need to worry about the user creating new theorem hooks
+% so, as we're only checking the existence of hooks created by us, it's OK.
+
+%%%%%%%%%%%%%%%%%%%%%%%%
+%%% List of Theorems %%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+\keys_define:nn { keytheorems/listof }
+ {
+ numwidth .dim_set:N = \l__keythms_listof_numwidth_dim,
+ numwidth .initial:n = 2.3em,
+ indent .dim_set:N = \l__keythms_listof_indent_dim,
+ indent .initial:n = 1.5em,
+ ignore .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems }
+ { \keythms_listof_ignore:n { #1 } }
+ },
+ show .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems }
+ { \keythms_listof_show:n { #1 } }
+ },
+ onlynamed .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems }
+ { \keythms_listof_onlynamed:n { #1 } }
+ },
+ onlynamed .default:n = \q_no_value,
+ onlynumbered .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems }
+ { \keythms_listof_onlynumbered:n { #1 } }
+ },
+ onlynumbered .default:n = \q_no_value,
+ ignoreall .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems } % in case called before theorem defined
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_ignore_aux:n { ##1 } }
+ }
+ },
+ showall .code:n =
+ {
+ \hook_gput_code:nnn { begindocument/before } { keytheorems } % in case called before theorem defined
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_show_aux:n { ##1 } }
+ }
+ },
+ title .tl_set:N = \l__keythms_listof_title_tl,
+ title .initial:n = \GetTranslation{keythms_listof_title},
+ swapnumber .bool_set:N = \l__keythms_listof_swapnumber_bool,
+ swapnumber .initial:n = false,
+ title-code .cs_set:Np = \__keythms_listof_titlecmd:n #1,
+ no-title .bool_set:N = \l__keythms_listof_notitle_bool,
+ no-title .initial:n = false,
+ print-body .code:n =
+ {
+ \cs_set_protected:Nn \keythms_listof_listcmd:nnnnnnn
+ {
+ \tl_if_empty:nF { ##7 }
+ {
+ \__keythms_getthm_theorem:nnnnn
+ {##1}{##2}{##5}{##6}{##7}
+ }
+ }
+ \cs_set_eq:NN \KeyThmsContentsLine \use_none:n
+ % ^ I assume we want this?
+ \cs_set_eq:NN \KeyThmsAddvspace \use_none:n
+ },
+ note-code .cs_set:Np = \__keythms_listof_notecmd:n #1,
+ note-code .initial:n = { ~ (#1) },
+ no-continues .bool_set:N = \l__keythms_listof_nocont_bool,
+ no-continues .initial:n = false,
+ no-chapter-skip .bool_set:N = \l__keythms_listof_nochapskip_bool,
+ no-chapter-skip .initial:n = false,
+ chapter-skip-length .dim_set:N = \keythms@listof@chaptervspace@dim,
+ chapter-skip-length .initial:n = 10pt,
+ no-toc .bool_set:N = \l__keythms_listof_notoc_bool,
+ no-toc .initial:n = false, % false does not mean "to-toc" for standard classes
+ }
+
+\hook_gput_code:nnn { begindocument } { . } % redefine these keys at begindocument
+ {
+ \keys_define:nn { keytheorems/listof }
+ {
+ ignore .code:n = \keythms_listof_ignore:n { #1 },
+ show .code:n = \keythms_listof_show:n { #1 },
+ onlynamed .code:n = \keythms_listof_onlynamed:n { #1 },
+ onlynamed .default:n = \q_no_value,
+ onlynumbered .code:n = \keythms_listof_onlynumbered:n { #1 },
+ onlynumbered .default:n = \q_no_value,
+ ignoreall .code:n =
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_ignore_aux:n { ##1 } }
+ },
+ showall .code:n =
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_show_aux:n { ##1 } }
+ },
+ seq .code:n = \keythms_listof_showseq:n { #1 },
+ }
+ }
+
+\NewDocumentCommand \keytheoremlistset { m }
+ {
+ \keys_set:nn { keytheorems/listof } { #1 }
+ }
+
+\cs_new_protected:Npn \keythms_listof_ignore:n #1
+ {
+ \clist_map_inline:nn { #1 } { \__keythms_listof_ignore_aux:n { ##1 } }
+ }
+\cs_new_protected:Npn \__keythms_listof_ignore_aux:n #1
+ {
+ \cs_set_protected:cpn { __keythms_thmitem_#1:nnnnnn } ##1##2##3##4##5##6
+ { }
+ }
+
+\cs_new_protected:Npn \keythms_listof_show:n #1
+ {
+ \clist_map_inline:nn { #1 } { \__keythms_listof_show_aux:n { ##1 } }
+ }
+\cs_new_protected:Npn \__keythms_listof_show_aux:n #1
+ {
+ \cs_set_protected:cpn { __keythms_thmitem_#1:nnnnnn } ##1##2##3##4##5##6
+ {
+ \__keythms_listof_listcmd_setup:nn { ##5 }
+ {
+ \keythms_listof_listcmd:nnnnnnn
+ {#1}{##1}{##2}{##3}{##4}{##5}{##6}
+ }
+ }
+ }
+
+\cs_new_protected:Npn \keythms_listof_onlynamed:n #1
+ {
+ \quark_if_no_value:nTF { #1 }
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_onlynamed_aux:n { ##1 } }
+ }
+ {
+ \clist_map_inline:nn { #1 }
+ { \__keythms_listof_onlynamed_aux:n { ##1 } }
+ }
+ }
+\cs_new_protected:Npn \__keythms_listof_onlynamed_aux:n #1
+ {
+ \cs_set_protected:cpn { __keythms_thmitem_#1:nnnnnn } ##1##2##3##4##5##6
+ {
+ \__keythms_listof_listcmd_setup:nn { ##5 }
+ {
+ \tl_if_empty:NF \l__keythms_listofheading_note_tl
+ {
+ \keythms_listof_listcmd:nnnnnnn
+ {#1}{##1}{##2}{##3}{##4}{##5}{##6}
+ }
+ }
+ }
+ }
+
+\cs_new_protected:Npn \keythms_listof_onlynumbered:n #1
+ {
+ \quark_if_no_value:nTF { #1 }
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_onlynumbered_aux:n { ##1 } }
+ }
+ {
+ \clist_map_inline:nn { #1 }
+ { \__keythms_listof_onlynumbered_aux:n { ##1 } }
+ }
+ }
+\cs_new_protected:Npn \__keythms_listof_onlynumbered_aux:n #1
+ {
+ \cs_set_protected:cpn { __keythms_thmitem_#1:nnnnnn } ##1##2##3##4##5##6
+ {
+ \__keythms_listof_listcmd_setup:nn { ##5 }
+ {
+ \tl_if_empty:nF { ##1 }
+ {
+ \keythms_listof_listcmd:nnnnnnn
+ {#1}{##1}{##2}{##3}{##4}{##5}{##6}
+ }
+ }
+ }
+ }
+
+\cs_new_protected:Npn \keythms_listof_showseq:n #1
+ {
+ \prop_map_inline:Nn \g__keythms_thmnames_prop
+ { \__keythms_listof_showseq_aux:nn { #1 } { ##1 } }
+ }
+\cs_new_protected:Npn \__keythms_listof_showseq_aux:nn #1#2
+ { % #1 = seq name, #2 = theorem name
+ \cs_set_protected:cpn { __keythms_thmitem_#2:nnnnnn } ##1##2##3##4##5##6
+ {
+ \__keythms_listof_listcmd_setup:nn { ##5 }
+ {
+ \tl_if_eq:NnT \l__keythms_listofheading_seq_tl { #1 }
+ {
+ \keythms_listof_listcmd:nnnnnnn
+ {#2}{##1}{##2}{##3}{##4}{##5}{##6}
+ }
+ }
+ }
+ }
+
+% Seems unnecessary to repeat all this for reading the keyvals from seq.
+% In thmtools they just hook the "thmitem" definition into the theorem declaration.
+%% NOTE ON ABOVE: this gives more flexibility to define different kinds of lists.
+%% See acro.sty for template idea.
+\keys_define:nn { keytheorems/listofheading }
+ {
+ note .tl_set:N = \l__keythms_listofheading_note_tl,
+ name .meta:n = { note = #1 },
+ short-note .tl_set:N = \l__keythms_listofheading_shortnote_tl,
+ short-name .meta:n = { short-note = #1 },
+ continues .tl_set:N = \l__keythms_listofheading_contlabel_tl,
+ continues* .code:n =
+ {
+ \keys_set:nn { keytheorems/listofheading } { continues = #1 }
+ \protected@edef \l__keythms_tmpa_tl { \__keythms_getrecordednote:n{#1} }
+ \tl_if_empty:NF \l__keythms_tmpa_tl
+ {
+ \keys_set:nn { keytheorems/listofheading }
+ { note = \l__keythms_tmpa_tl }
+ }
+ },
+ seq .tl_set:N = \l__keythms_listofheading_seq_tl,
+ store* .code:n = \bool_set_true:N \l__keythms_listofheading_storereversed_bool,
+ restate* .meta:n = { store*=#1 },
+ restate-keys .clist_set:N = \l__keythms_listofheading_restatekeys_clist,
+ unknown .code:n = { } % do nothing with unknown keys
+ % ^ this is OK because we have total control over possible keys; if invalid
+ % key is given to theorem then an error will be raised there
+ }
+
+\cs_new:Npn \__keythms_listof_printheading:
+ {
+ \tl_if_empty:NTF \l__keythms_listofheading_shortnote_tl
+ {
+ \tl_if_empty:NF \l__keythms_listofheading_note_tl
+ { \__keythms_listof_notecmd:n { \l__keythms_listofheading_note_tl } }
+ }
+ {
+ \__keythms_listof_notecmd:n { \l__keythms_listofheading_shortnote_tl }
+ }
+ }
+
+\cs_new:Npn \__keythms_listof_default_listcmd:nnnnnnn #1#2#3#4#5#6#7
+ {
+ \contentsline{ #1 }
+ {
+ \bool_if:NTF \l__keythms_listof_swapnumber_bool
+ {
+ \prop_item:Nn \g__keythms_thmnames_prop { #1 } ~ #2
+ }
+ {
+ \numberline{ #2 }
+ \prop_item:Nn \g__keythms_thmnames_prop { #1 }
+ }
+ \__keythms_listof_printheading:
+ }
+ { #4 }{ #3 }
+ }
+
+% NOTE: We still need to do this setup for [print-body] so that onlynamed works
+\cs_new_protected:Npn \__keythms_listof_listcmd_setup:nn #1#2
+ { % #1 = keys, #2 = list command
+ \group_begin:
+ \keys_set:nn { keytheorems/listofheading } { #1 }
+ \bool_if:NT \l__keythms_listofheading_storereversed_bool
+ {
+ \keys_set:no { keytheorems/listofheading }
+ { \l__keythms_listofheading_restatekeys_clist }
+ }
+ \tl_if_empty:NTF \l__keythms_listofheading_contlabel_tl
+ { #2 }
+ {
+ \bool_if:NF \l__keythms_listof_nocont_bool
+ {
+ \tl_if_empty:NF \l__keythms_listofheading_note_tl
+ {
+ \tl_put_right:Nn \l__keythms_listofheading_note_tl { , ~ }
+ }
+ \tl_put_right:Nn \l__keythms_listofheading_note_tl
+ {
+ \__keythms_thmuse_continues:V \l__keythms_listofheading_contlabel_tl
+ }
+ #2
+ }
+ }
+ \group_end:
+ }
+
+% set default listcmd
+\cs_new_eq:NN \keythms_listof_listcmd:nnnnnnn
+ \__keythms_listof_default_listcmd:nnnnnnn
+
+\cs_if_exist:NTF \chapter
+ { \cs_set_protected:Npn \__keythms_listof_titlecmd:n #1 { \chapter*{#1} } }
+ { \cs_set_protected:Npn \__keythms_listof_titlecmd:n #1 { \section*{#1} } }
+
+\cs_new_protected:Npn \__keythms_listof_default_tocline:
+ {
+ \@dottedtocline{ 1 }{ \l__keythms_listof_indent_dim }
+ { \l__keythms_listof_numwidth_dim }
+ }
+\cs_new_eq:NN \keythms_listof_tocline: \__keythms_listof_default_tocline:
+
+\NewDocumentCommand \listofkeytheorems { O{} }
+ {
+ \bool_gset_true:N \g__keythms_listof_writefile_bool
+ \group_begin:
+ \keys_set:nn { keytheorems/listof } { #1 }
+ \bool_if:NT \l__keythms_listof_nochapskip_bool
+ {
+ \cs_set_eq:NN \KeyThmsAddvspace \use_none:n
+ }
+ \bool_if:NF \l__keythms_listof_notitle_bool
+ {
+ \__keythms_listof_titlecmd:n { \l__keythms_listof_title_tl }
+ \@mkboth % QUESTION: should this go in titlecmd ?
+ { \MakeUppercase \l__keythms_listof_title_tl }
+ { \MakeUppercase \l__keythms_listof_title_tl }
+ }
+ \legacy_if_set_false:n { @filesw }
+ \@starttoc{ thlist }
+ \group_end:
+ }
+% ^ unlike thmtools we don't use the class's style of \listoffigures because
+% we want control over title-code, no-title, etc. But this means we have to guess
+% things like marks, sectioning command, etc.
+
+\hook_gput_code:nnn { enddocument } { . }
+ {
+ \bool_if:NTF \g__keythms_listof_writefile_bool
+ {
+ \legacy_if:nT { @filesw }
+ {
+ \iow_new:N \tf@thlist
+ \iow_open:Nn \tf@thlist { \c_sys_jobname_str.thlist }
+ }
+ }
+ { % if .thlist file left over from previous run but not needed, clear it
+ \file_if_exist:nT { \c_sys_jobname_str.thlist }
+ {
+ \iow_open:Nn \g_tmpa_iow { \c_sys_jobname_str.thlist }
+ \iow_close:N \g_tmpa_iow
+ }
+ }
+ }
+
+% chaptervspacehack (code translated from thmtools)
+\cs_new_eq:NN \KeyThmsAddvspace \addvspace
+\int_new:N \g_keythms_listof_prevchapter_int
+\int_gset:Nn \g_keythms_listof_prevchapter_int { 1 }
+% ^ if this is zero, bad things happen if title-code is changed; anyways don't
+% need addvspace at top
+\cs_new_protected:Npn \keythms_listof_chaptervspacehack: { }
+\cs_if_exist:cT { c@chapter }
+ {
+ \cs_if_eq:NNF \c@chapter \relax
+ {
+ \cs_set_protected:Npn \keythms_listof_chaptervspacehack:
+ {
+ \int_compare:nNnF
+ { \value{chapter} } = { \g_keythms_listof_prevchapter_int }
+ {
+ \addtocontents{ thlist }
+ {
+ \protect\KeyThmsAddvspace
+ { \keythms@listof@chaptervspace@dim }
+ }
+ \int_gset:Nn \g_keythms_listof_prevchapter_int { \value{chapter} }
+ }
+ }
+ }
+ }
+
+%%%%%%%%%%%%%%%%
+%%% \Autoref %%%
+%%%%%%%%%%%%%%%%
+
+\ProvideDocumentCommand { \Autoref } { s m }
+ {
+ \IfPackageLoadedTF { hyperref }
+ {
+ \group_begin:
+ \cs_set_eq:NN \HyRef@testreftype \__keythms_Autoref_testreftype:w
+ \IfBooleanTF { #1 } { \autoref*{#2} } { \autoref{#2} }
+ \group_end:
+ }
+ { \msg_error:nn { keytheorems } { hyperref-Autoref } }
+ }
+
+\cs_new_protected:Npn \__keythms_Autoref_testreftype:w #1.#2\\
+ {
+ \cs_if_exist:cTF { #1 Autorefname }
+ {
+ \cs_set:Npe \HyRef@currentHtag
+ {
+ \exp_not:N \use:c { #1 Autorefname }
+ \exp_not:N \c_space_token
+ }
+ }
+ { \msg_warning:nnn { keytheorems } { no-Autorefname } { #1 } }
+ }
+
+%%%%%%%%%%%%%%%%%%%
+%%% Global Keys %%%
+%%%%%%%%%%%%%%%%%%%
+
+\keys_define:nn { keytheorems }
+ {
+ restate-counters .code:n =
+ {
+ \clist_map_inline:nn { #1 }
+ { \tl_new:c { l_keythms_restate_current_##1_tl } }
+ \clist_gput_right:Nn \g__keythms_restatecounters_clist { #1 }
+ },
+ restate-counters .initial:n = equation,
+ continues-code .cs_set:Np = \__keythms_thmuse_continues:n #1,
+ continues-code .initial:n =
+ { % not sure how best to handle this translation
+ \GetTranslation{keythms_continues}\pageref{#1}
+ },
+ qed-symbol .cs_set_protected:Np = \qedsymbol,
+ overload .code:n = \__keythms_overload_code:,
+ overload .value_forbidden:n = true,
+ overload .usage:n = preamble,
+ thmtools-compat .code:n =
+ { % prevent loading the code again if key called twice
+ \bool_if:NF \g__keythms_thmtoolscompat_bool
+ { \__keythms_thmtoolscompat_code: }
+ },
+ thmtools-compat .value_forbidden:n = true,
+ thmtools-compat .usage:n = preamble,
+ store-all .code:n = \__keythms_storeall_code:,
+ store-all .value_forbidden:n = true,
+ store-all .usage:n = preamble,
+ auto-translate .bool_gset:N = \g__keythms_autotranslate_bool,
+ auto-translate .initial:n = true,
+ store-sets-label .code:n =
+ {
+ \keys_define:nn { keytheorems/thmuse }
+ {
+ store .code:n =
+ {
+ \tl_set:Nn \l__keythms_thmuse_label_tl { ##1 }
+ \tl_set:Nn \l__keythms_thmuse_store_tl { ##1 }
+ },
+ store* .code:n =
+ {
+ \tl_set:Nn \l__keythms_thmuse_label_tl { ##1 }
+ \tl_set:Nn \l__keythms_thmuse_storereversed_tl { ##1 }
+ },
+ }
+ },
+ }
+
+\cs_generate_variant:Nn \__keythms_thmuse_continues:n { V }
+
+% \keytheoremset{<options>}
+\NewDocumentCommand \keytheoremset { m }
+ {
+ \keys_set:nn { keytheorems } { #1 }
+ }
+
+\cs_new_protected:Npn \__keythms_overload_code:
+ {
+ \RenewDocumentCommand { \newtheorem } { s m o m o }
+ {
+ \IfBooleanTF { ##1 }
+ { \keythms_thm_newkeythm:nn { ##2 } { name=##4, numbered=no } }
+ {
+ \IfNoValueTF { ##3 }
+ {
+ \IfNoValueTF { ##5 }
+ { \keythms_thm_newkeythm:nn { ##2 } { name=##4 } }
+ { \keythms_thm_newkeythm:nn { ##2 } { name=##4, parent=##5 } }
+ }
+ { \keythms_thm_newkeythm:nn { ##2 } { name=##4, sibling=##3 } }
+ }
+ }
+ }
+
+\cs_new_protected:Npn \__keythms_thmtoolscompat_code:
+ {
+ \bool_gset_true:N \g__keythms_thmtoolscompat_bool
+ \__keythms_overload_code: % since thmtools overwrites \newtheorem
+ \ProvideDocumentCommand { \declaretheoremstyle } { O{} m }
+ {
+ \declarekeytheoremstyle { ##2 } { ##1 }
+ }
+ \ProvideDocumentCommand { \declaretheorem } { O{} m }
+ {
+ \newkeytheorem { ##2 } [ ##1 ]
+ }
+ \ProvideDocumentEnvironment { restatable } { O{} m m }
+ { % need to redefine this to add store to thlist since we set it outside env
+ \cs_set_protected:Npn \__keythms_thm_addcontentsdata:nnnn ####1####2####3####4
+ { % #1 = theorem name, #2 = stored counters, #3 = keys, #4 = body
+ \keythms_listof_chaptervspacehack:
+ \iow_shipout:Ne \@auxout
+ {
+ \exp_not:N \@writefile { thlist }
+ {
+ \KeyThmsSavedTheorem{ ####1 }
+ { \@currentlabel }
+ { \@currentHref }
+ { \thepage }
+ { ####2 }
+ { store=\l__keythms_thmuse_store_tl,\exp_not:n { ####3 } } % this line is changed
+ { \exp_not:n { ####4 } }
+ }
+ }
+ }
+ % set store outside [] so keyless note is recognized
+ \keys_set:nn { keytheorems/thmuse } { store=##3 }
+ \begin{##2}[##1]
+ }
+ {
+ \end{##2}
+ \cs_new_protected:cpn { ##3 }
+ { % make \foo and \foo* identical
+ \peek_meaning_remove:NTF *
+ { \getkeytheorem{ ##3 } }
+ { \getkeytheorem{ ##3 } }
+ }
+ }
+ \ProvideDocumentEnvironment { restatable* } { O{} m m }
+ { % need to redefine this to add store* to thlist since we set it outside env
+ \cs_set_protected:Npn \__keythms_thm_addstoredreverseddata:nnn ####1####2####3
+ {
+ \iow_shipout:Ne \@auxout
+ {
+ \exp_not:N \@writefile { thlist }
+ {
+ \KeyThmsSavedTheoremReversed { \l__keythms_thmuse_storereversed_tl }
+ { ####1 }
+ { store*=\l__keythms_thmuse_storereversed_tl,\exp_not:n { ####2 } } % this line is changed
+ { \exp_not:n { ####3 } }
+ }
+ }
+ }
+ % set store* outside [] so keyless note is recognized
+ \keys_set:nn { keytheorems/thmuse } { store*=##3 }
+ \begin{##2}[##1]
+ }
+ {
+ \end{##2}
+ \cs_new_protected:cpn { ##3 }
+ { % make \foo and \foo* identical
+ \peek_meaning_remove:NTF *
+ { \getkeytheorem{ ##3 } }
+ { \getkeytheorem{ ##3 } }
+ }
+ }
+ \ProvideDocumentCommand { \listoftheorems } { } { \listofkeytheorems }
+ \ProvideDocumentCommand { \addtotheorempreheadhook } { O{allthms} m }
+ {
+ \addtotheoremhook [ ##1 ] { prehead } { ##2 }
+ }
+ \ProvideDocumentCommand { \addtotheorempostheadhook } { O{allthms} m }
+ {
+ \addtotheoremhook [ ##1 ] { posthead } { ##2 }
+ }
+ \ProvideDocumentCommand { \addtotheoremprefoothook } { O{allthms} m }
+ {
+ \addtotheoremhook [ ##1 ] { prefoot } { ##2 }
+ }
+ \ProvideDocumentCommand { \addtotheorempostfoothook } { O{allthms} m }
+ {
+ \addtotheoremhook [ ##1 ] { postfoot } { ##2 }
+ }
+ \clist_new:N \l__keythms_tcbshaded_keys_clist
+ \clist_new:N \l__keythms_tcbthmbox_keys_clist
+ \keys_define:nn { keytheorems/thm/shaded }
+ {
+ textwidth .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { width=##1 },
+ bgcolor .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { colback=##1 },
+ rulewidth .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { boxrule=##1 },
+ rulecolor .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { colframe=##1 },
+ margin .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { boxsep=##1 },
+ padding .meta:n = { margin=##1 },
+ leftmargin .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { left~skip=##1 },
+ rightmargin .code:n =
+ \clist_put_right:Nn \l__keythms_tcbshaded_keys_clist { right~skip=##1 },
+ }
+ \keys_define:nn { keytheorems/thm/thmbox }
+ {
+ L .code:n =
+ {
+ \clist_put_right:Nn \l__keythms_tcbthmbox_keys_clist
+ { keythms_tcbthmbox_L }
+ },
+ M .code:n =
+ {
+ \clist_put_right:Nn \l__keythms_tcbthmbox_keys_clist
+ { keythms_tcbthmbox_M }
+ },
+ S .code:n =
+ {
+ \clist_put_right:Nn \l__keythms_tcbthmbox_keys_clist
+ { keythms_tcbthmbox_S }
+ },
+ underline .choice:,
+ underline / true .code:n = {},
+ underline / false .code:n =
+ {
+ \clist_put_right:Nn \l__keythms_tcbthmbox_keys_clist
+ { boxed~title~style={bottomrule=0pt} }
+ },
+ underline .default:n = true,
+ nounderline .meta:n = { underline=false },
+ cut .choice:,
+ cut / true .code:n = {},
+ cut / false .code:n =
+ {
+ \clist_put_right:Nn \l__keythms_tcbthmbox_keys_clist { unbreakable }
+ },
+ cut .default:n = true,
+ nocut .meta:n = { cut=false },
+ thickness .code:n = % could also add keys to clist with changed dimens; which is better?
+ {
+ \hook_gput_code:nnn { keytheorems/\l__keythms_thm_envname_tl/prehead }
+ { keythms_tcbox }
+ { \dim_set:Nn \l_keythms_tcbthmbox_thickness_dim { ##1 } }
+ },
+ leftmargin .code:n =
+ {
+ \hook_gput_code:nnn { keytheorems/\l__keythms_thm_envname_tl/prehead }
+ { keythms_tcbox }
+ { \dim_set:Nn \l_keythms_tcbthmbox_leftmargin_dim { ##1 } }
+ },
+ rightmargin .code:n =
+ {
+ \hook_gput_code:nnn { keytheorems/\l__keythms_thm_envname_tl/prehead }
+ { keythms_tcbox }
+ { \dim_set:Nn \l_keythms_tcbthmbox_rightmargin_dim { ##1 } }
+ },
+ hskip .code:n =
+ {
+ \hook_gput_code:nnn { keytheorems/\l__keythms_thm_envname_tl/prehead }
+ { keythms_tcbox }
+ { \dim_set:Nn \l_keythms_tcbthmbox_hskip_dim { ##1 } }
+ },
+ vskip .code:n =
+ {
+ \hook_gput_code:nnn { keytheorems/\l__keythms_thm_envname_tl/prehead }
+ { keythms_tcbox }
+ { \dim_set:Nn \l_keythms_tcbthmbox_vskip_dim { ##1 } }
+ },
+ }
+ \dim_new:N \l_keythms_tcbthmbox_thickness_dim
+ \dim_set:Nn \l_keythms_tcbthmbox_thickness_dim { 0.6pt }
+ \dim_new:N \l_keythms_tcbthmbox_leftmargin_dim
+ \dim_set:Nn \l_keythms_tcbthmbox_leftmargin_dim { 0.7\parindent } % use \parindent? thmbox does
+ \dim_new:N \l_keythms_tcbthmbox_rightmargin_dim
+ \dim_set:Nn \l_keythms_tcbthmbox_rightmargin_dim { 0pt }
+ \dim_new:N \l_keythms_tcbthmbox_hskip_dim
+ \dim_set:Nn \l_keythms_tcbthmbox_hskip_dim { 0.2em }
+ \dim_new:N \l_keythms_tcbthmbox_vskip_dim
+ \dim_set:Nn \l_keythms_tcbthmbox_vskip_dim { 0.2em }
+ \msg_new:nnn { keytheorems } { mdframed-undefined }
+ {
+ keytheorems~does~not~define~the~'mdframed'~key.~
+ Consider~using~the~'tcolorbox'~key~instead.
+ }
+ \keys_define:nn { keytheorems/thm }
+ {
+ shaded .code:n =
+ {
+ \clist_clear:N \l__keythms_tcbshaded_keys_clist
+ \keys_set:nn { keytheorems/thm/shaded } { ##1 }
+ % FIX: surely a better way to do this
+ \RequirePackage{tcolorbox}
+ \pgfkeysifdefined{/tcb/keythms_tcbshaded_default/.@cmd} % even worth it?
+ {}
+ {
+ \tcbset % wish I could do this outside of key but can't assume tcb loaded
+ {
+ keythms_tcbshaded_default/.style=
+ {
+ sharp~corners = all,
+ boxrule = 0pt,
+ left = 0pt, right = 0pt,
+ top = 0pt, bottom = 0pt,
+ parbox = false,
+ }
+ }
+ }
+ \keys_set:ne { keytheorems/thm }
+ {
+ tcolorbox-no-titlebar =
+ {
+ keythms_tcbshaded_default,
+ \l__keythms_tcbshaded_keys_clist
+ }
+ }
+ },
+ thmbox .code:n = % adapted from https://tex.stackexchange.com/a/236230/208544
+ {
+ \clist_clear:N \l__keythms_tcbthmbox_keys_clist
+ \keys_set:nn { keytheorems/thm/thmbox } { ##1 }
+ % FIX: surely a better way to do this
+ \RequirePackage{tcolorbox}
+ \tcbuselibrary{skins,breakable}
+ \pgfkeysifdefined{/tcb/keythms_tcbthmbox_default/.@cmd} % even worth it?
+ {}
+ {
+ \tcbset{
+ keythms_tcbthmbox_default/.style={
+ enhanced,
+ breakable,
+ sharp~corners=all,
+ right=\l_keythms_tcbthmbox_hskip_dim,
+ left=\l_keythms_tcbthmbox_hskip_dim,
+ top=\l_keythms_tcbthmbox_vskip_dim,
+ bottom=\l_keythms_tcbthmbox_vskip_dim,
+ coltitle=black,
+ frame~engine=empty,
+ interior~titled~engine=empty,
+ interior~engine=empty,
+ extras~broken={
+ frame~engine=empty,
+ interior~titled~engine=empty,
+ interior~engine=empty
+ },
+ parbox=false,
+ % even though frame isn't drawn, makes spacing correct
+ boxrule=0.5\l_keythms_tcbthmbox_thickness_dim,
+ attach~boxed~title~to~top~left={
+ xshift=-\l_keythms_tcbthmbox_leftmargin_dim,
+ },
+ boxed~title~style={
+ empty,
+ size=minimal,
+ bottom=0.3ex,
+ top=0ex,
+ % ditto
+ bottomrule=0.5\l_keythms_tcbthmbox_thickness_dim,
+ },
+ left~skip=\l_keythms_tcbthmbox_leftmargin_dim,
+ right~skip=\l_keythms_tcbthmbox_rightmargin_dim,
+ overlay~unbroken={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (title.south~west)
+ --
+ (title.south~east);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ |-
+ ([xshift=10mm]frame.south~west);
+ },
+ overlay~first={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (title.south~west)
+ --
+ (title.south~east);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ },
+ overlay~middle={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ },
+ overlay~last={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ |-
+ ([xshift=10mm]frame.south~west);
+ }
+ },
+ keythms_tcbthmbox_L/.style={
+ overlay~unbroken={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (title.south~west)
+ --
+ (title.south~east);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ |-
+ (frame.south~east)
+ -|
+ (frame.north~east);
+ },
+ overlay~first={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (title.south~west)
+ --
+ (title.south~east);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~east)
+ --
+ (frame.south~east);
+ },
+ overlay~middle={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~east)
+ --
+ (frame.south~east);
+ },
+ overlay~last={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ |-
+ (frame.south~east)
+ -|
+ (frame.north~east);
+ }
+ },
+ keythms_tcbthmbox_M/.style={},
+ keythms_tcbthmbox_S/.style={ % first and middle same as M
+ overlay~unbroken={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (title.south~west)
+ --
+ (title.south~east);
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ },
+ overlay~last={
+ \draw[line~width=\l_keythms_tcbthmbox_thickness_dim]
+ (frame.north~west)
+ --
+ (frame.south~west);
+ }
+ },
+ }
+ }
+ \keys_set:ne { keytheorems/thm }
+ {
+ tcolorbox =
+ {
+ keythms_tcbthmbox_default,
+ \l__keythms_tcbthmbox_keys_clist
+ }
+ }
+ },
+ thmbox .default:n = M,
+ mdframed .code:n = \msg_error:nn { keytheorems } { mdframed-undefined },
+ }
+ \keys_define:nn { keytheorems/thmstyle }
+ {
+ shaded .code:n = \keythms_thmstyle_savethmkey_optval:n { ##1 },
+ thmbox .code:n = \keythms_thmstyle_savethmkey_optval:n { ##1 },
+ }
+ }
+
+\cs_new_protected:Npn \__keythms_storeall_code:
+ {
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnn \__keythms_grab_begin:nnn
+ \cs_set_eq:NN \__keythms_withhooks_begin:nnV \__keythms_grab_begin:nnV
+ \cs_set_eq:NN \__keythms_withhooks_end:n \__keythms_grab_end:n
+ }
+
+\hook_gput_code:nnn { begindocument/before } { . }
+ { % use 'provide' in case user defines their own translation in preamble
+ \ProvideTranslationFallback { keythms_listof_title } { List~of~Theorems }
+ \ProvideTranslationFallback { keythms_continues } { continuing~from~p.\, }
+ \bool_if:NT \g__keythms_autotranslate_bool
+ {
+ \ProvideTranslation { English } { keythms_listof_title } { List~of~Theorems }
+ \ProvideTranslation { English } { keythms_continues } { continuing~from~p.\, }
+ % from DeepL; I don't know these languages!
+ \ProvideTranslation { French } { keythms_listof_title } { Liste~des~théorèmes }
+ \ProvideTranslation { French } { keythms_continues } { suite~de~la~p.\, }
+ \ProvideTranslation { German } { keythms_listof_title } { Liste~der~Theoreme }
+ \ProvideTranslation { German } { keythms_continues } { weiter~von~Seite~ }
+ \ProvideTranslation { Italian } { keythms_listof_title } { Elenco~dei~teoremi }
+ \ProvideTranslation { Italian } { keythms_continues } { continua~da~p.\, }
+ \ProvideTranslation { Spanish } { keythms_listof_title } { Lista~de~teoremas }
+ \ProvideTranslation { Spanish } { keythms_continues } { continúa~de~la~p.\, }
+ \ProvideTranslation { Portuguese } { keythms_listof_title } { Lista~de~teoremas }
+ \ProvideTranslation { Portuguese } { keythms_continues } { continua~da~p.\, }
+ }
+ }
+
+\ProcessKeyOptions[keytheorems]
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Support for non-default classes %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\cs_new_protected:Npn \__keythms_support_AMSshared_code:
+ {
+ \keys_define:nn { keytheorems/listof } % adjust to AMS classes
+ {
+ numwidth .initial:n = 1.5pc,
+ indent .initial:n = 0pt,
+ title-code .code:n =
+ { % warn but set titlecmd just in case
+ \msg_warning:nn { keytheorems } { title-code-with-AMS }
+ \cs_set_protected:Npn \__keythms_listof_titlecmd:n ####1 { ##1 }
+ },
+ }
+ \RenewDocumentCommand \listofkeytheorems { O{} }
+ { % title command not customizable here
+ \bool_gset_true:N \g__keythms_listof_writefile_bool
+ \group_begin:
+ \keys_set:nn { keytheorems/listof } { ##1 }
+ \bool_if:NT \l__keythms_listof_nochapskip_bool
+ {
+ \cs_set_eq:NN \KeyThmsAddvspace \use_none:n
+ }
+ \legacy_if_set_false:n { @filesw }
+ \bool_if:NTF \l__keythms_listof_notitle_bool
+ { % hacky!
+ \cs_set_eq:NN \@startsection \use_none:nnnnnnn
+ \@starttoc{ thlist }{ }
+ }
+ { % ams classes don't expand title enough
+ \protected@edef \l__keythms_tmpa_tl { \l__keythms_listof_title_tl }
+ \bool_if:NT \l__keythms_listof_notoc_bool
+ { \cs_set_eq:NN \addcontentsline \use_none:nnn } % hacky!
+ \@starttoc{ thlist }{ \l__keythms_tmpa_tl }
+ }
+ \group_end:
+ }
+ \cs_new:Npn \__keythms_listof_ams_tocline:
+ {
+ \@tocline{ 0 }{ 3pt plus 2pt }{ \l__keythms_listof_indent_dim }
+ { \l__keythms_listof_numwidth_dim }{ }
+ }
+ \cs_set_eq:NN \keythms_listof_tocline: \__keythms_listof_ams_tocline:
+ }
+
+\cs_new_protected:Npn \keythms_support_check:n #1
+ {
+ \IfClassLoadedT { #1 } { \file_input:n { class-support/keythms-#1-support } }
+ }
+
+% acmart defaults also handled in amsart support file
+\keythms_support_check:n { amsart }
+\keythms_support_check:n { amsbook }
+\keythms_support_check:n { amsproc }
+\keythms_support_check:n { memoir }
+
+\file_input_stop: \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 54aa898cc98..95f3f5f447d 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-07-20}%
+\def\ExplFileDate{2024-09-10}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -6138,6 +6138,7 @@ Type H <return> for immediate help}\def~{\errmessage{%
\exp_after:wN \__seq_map_pairwise_function:wNw #2 \s__seq_stop #3
#1 { ? \prg_break: } { }
\prg_break_point:
+ \prg_break_point:Nn \seq_map_break: { }
}
\cs_new:Npn \__seq_map_pairwise_function:wNw \s__seq #1 \s__seq_stop #2
{
@@ -33740,15 +33741,17 @@ Type H <return> for immediate help}\def~{\errmessage{%
\tl_set:ce { l__codepoint_ #1 _block_tl }
{ \int_eval:n { \tl_use:c { l__codepoint_ #1 _block_tl } + 1 } }
}
- \prg_replicate:nn {#2}
+ \int_step_inline:nnn
+ { \tl_use:c { l__codepoint_ #1 _pos_tl } + 1 }
+ { \tl_use:c { l__codepoint_ #1 _pos_tl } + #2 }
{
- \tl_set:ce { l__codepoint_ #1 _pos_tl }
- { \int_eval:n { \tl_use:c { l__codepoint_ #1 _pos_tl } + 1 } }
\exp_args:Nc \__kernel_intarray_gset:Nnn
{ g__codepoint_ #1 _index_intarray }
- { \tl_use:c { l__codepoint_ #1 _pos_tl } }
+ {##1}
\l__codepoint_matched_block_tl
}
+ \tl_set:ce { l__codepoint_ #1 _pos_tl }
+ { \int_eval:n { \tl_use:c { l__codepoint_ #1 _pos_tl } + #2 } }
\clist_clear:c { l__codepoint_ #1 _block_clist }
}
\cs_set_protected:Npn \__codepoint_finalise_blocks:
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 6f417c325c5..30e80a05182 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-07-20}%
+\def\ExplFileDate{2024-09-10}%
\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 512497e7a09..a0a34cdba30 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-07-20}%
+\def\ExplFileDate{2024-09-10}%
\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 10c4ecbc700..f1706b731bd 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-07-20}%
+\def\ExplFileDate{2024-09-10}%
\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 000b6dcb41c..11e6953e008 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-07-20}{}{L3 Debugging support}
+\ProvidesExplFile{l3debug.def}{2024-09-10}{}{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 4d4876f5607..6219a5ee830 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-07-20}{}
+\ProvidesExplClass{l3doc}{2024-09-10}{}
{L3 Experimental documentation class}
\clist_new:N \g_docinput_clist
\seq_new:N \g_doc_functions_seq
@@ -789,17 +789,20 @@
\cs_generate_variant:Nn \__codedoc_get_hyper_target:nN { o , e }
\cs_new_protected:Npn \__codedoc_names_get_seq:nN #1#2
{
- \__kernel_tl_set:Nx \l__codedoc_tmpa_tl { \tl_to_str:n {#1} }
\bool_if:NTF \l__codedoc_names_verb_bool
{
\seq_clear:N #2
- \seq_put_right:NV #2 \l__codedoc_tmpa_tl
+ \seq_put_right:No #2 { \tl_to_str:n {#1} }
}
{
+ \tl_set:Nn \l__codedoc_tmpa_tl {#1}
\tl_remove_all:Ne \l__codedoc_tmpa_tl
- { \iow_char:N \^^M \c_percent_str }
+ { \exp_not:N \obeyedline \c_percent_str }
\tl_remove_all:Ne \l__codedoc_tmpa_tl
- { \token_to_str:N \obeyedline \c_space_tl \c_percent_str }
+ { \exp_not:N \obeyedline }
+ \__kernel_tl_set:Nx \l__codedoc_tmpa_tl { \tl_to_str:N \l__codedoc_tmpa_tl }
+ \tl_remove_all:Ne \l__codedoc_tmpa_tl
+ { \iow_char:N \^^M \c_percent_str }
\tl_remove_all:Ne \l__codedoc_tmpa_tl { \tl_to_str:n { ^ ^ A } }
\tl_remove_all:Ne \l__codedoc_tmpa_tl { \iow_char:N \^^I }
\tl_remove_all:Ne \l__codedoc_tmpa_tl { \iow_char:N \^^M }
@@ -1023,7 +1026,7 @@
\cs_new_protected:Npn \__codedoc_function_typeset_stop:
{
\par
- \dim_set:Nn \prevdepth { \box_dp:N \l__codedoc_descr_coffin }
+ \dim_set:Nn \prevdepth { \coffin_dp:N \l__codedoc_descr_coffin }
\allowbreak
}
\cs_new_protected:Npn \__codedoc_function_init:
@@ -1059,7 +1062,7 @@
\dim_zero:N \l__codedoc_trial_width_dim
\hcoffin_set:Nn \l__codedoc_functions_coffin { \__codedoc_typeset_functions: }
\dim_set:Nn \l__codedoc_trial_width_dim
- { \box_wd:N \l__codedoc_functions_coffin }
+ { \coffin_wd:N \l__codedoc_functions_coffin }
\bool_set:Nn \l__codedoc_long_name_bool
{ \dim_compare_p:nNn \l__codedoc_trial_width_dim > \marginparwidth }
}
@@ -1087,7 +1090,7 @@
\coffin_join:NnnNnnnn
\l__codedoc_output_coffin {l} {b}
\l__codedoc_descr_coffin {l} {t}
- {0.75\marginparwidth + \marginparsep} {-\medskipamount}
+ {\marginparwidth + \marginparsep} {-\medskipamount}
\coffin_typeset:Nnnnn \l__codedoc_output_coffin
{\l__codedoc_descr_coffin-l} {\l__codedoc_descr_coffin-t}
{0pt} {0pt}
@@ -1136,7 +1139,6 @@
{ \__codedoc_typeset_variant_list:nN {#1} #2 }
\\
}
-\cs_generate_variant:Nn \__codedoc_typeset_function_block:nN { e }
\cs_new_protected:Npn \__codedoc_function_index:n #1
{
\seq_gput_right:Nn \g_doc_functions_seq {#1}
@@ -1234,7 +1236,7 @@
{
\textwidth
\bool_if:NT \l__codedoc_long_name_bool
- { + 0.75 \marginparwidth - \l__codedoc_trial_width_dim }
+ { + \marginparwidth - \l__codedoc_trial_width_dim }
}
\hbox_gset:Nw \g__codedoc_syntax_box
\small \ttfamily
@@ -2186,7 +2188,6 @@
{#2}
\l__codedoc_index_internal_bool
}
-\cs_generate_variant:Nn \__codedoc_special_index:nn { o }
\tl_new:N \l__codedoc_index_escaped_macro_tl
\tl_new:N \l__codedoc_index_escaped_key_tl
\cs_new_protected:Npn \__codedoc_special_index_module:nnnnN #1#2#3#4#5
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 23dc455743d..0b83c0dd3f7 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3keys2e}{2024-05-08}{}
+\ProvidesExplPackage{l3keys2e}{2024-08-16}{}
{LaTeX2e option processing using LaTeX3 keys}
\cs_if_exist:NT \ProcessKeysOptions
{ \file_input_stop: }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index e63242d19ac..975f8bdd427 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{xfp}{2024-05-08}{}
+\ProvidesExplPackage{xfp}{2024-08-16}{}
{L3 Floating point unit}
\ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
\ProvideExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index e87a832432f..9a7eab1fe1a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -60,7 +60,7 @@
}
}
\ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2024-05-08}{}
+\ProvidesExplPackage{xparse}{2024-08-16}{}
{L3 Experimental document command parser}
\clist_new:N \l__cmd_options_clist
\DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption }
@@ -239,7 +239,22 @@
{
\__kernel_cmd_if_xparse:NTF #1
{
- \tl_set:Ne \ArgumentSpecification { \tl_item:Nn #1 { 2 } }
+ \tl_set:Ne \ArgumentSpecification
+ {
+ \exp_args:No \tl_if_head_eq_meaning:nNTF {#1} \__cmd_start_optimized:
+ {
+ \prg_replicate:nn
+ {
+ \str_count:e
+ {
+ \exp_args:Nc \cs_parameter_spec:N
+ { \cs_to_str:N #1 \c_space_tl code }
+ } / 2
+ }
+ { m }
+ }
+ { \tl_item:Nn #1 { 2 } }
+ }
#2
}
{#3}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 04c80418890..31aa3d9a5ee 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -25,7 +25,7 @@
\endinput
}
{%
- \ProvidesExplPackage{xtemplate}{2024-05-08}{}
+ \ProvidesExplPackage{xtemplate}{2024-08-16}{}
{L3 Experimental prototype document functions}
\long\protected\def\DeclareRestrictedTemplate#1#2#3#4{%
\DeclareTemplateCopy{#1}{#3}{#2}%
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusMono-TLF.fd
new file mode 100644
index 00000000000..f45795d4973
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusMono-TLF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/09/22
+%%
+\ProvidesFile{LGRLibertinusMono-TLF.fd}
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusMono-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 LibertinusMono@scale\endcsname\relax
+ \let\LibertinusMono@@scale\@empty
+\else
+ \edef\LibertinusMono@@scale{s*[\csname LibertinusMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{LibertinusMono-TLF}{\hyphenchar\font=-1}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LGR}{LibertinusMono-TLF}{m}{n}{
+ <-> \LibertinusMono@@scale LibertinusMono-Regular-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusMono-TLF}{regular}{n}{
+ <-> alias * LibertinusMono-TLF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-LF.fd
index fc819eff45d..115e899f2c6 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,6 +20,25 @@
\DeclareFontFamily{LGR}{LibertinusSans-LF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
+}{}
+
+
% ---- m = regular ----
\DeclareFontShape{LGR}{LibertinusSans-LF}{m}{it}{
@@ -30,14 +49,6 @@
<-> alias * LibertinusSans-LF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSans-LF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{regular}{scit}{
- <-> alias * LibertinusSans-LF/m/scit
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-LF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-lgr
}{}
@@ -46,6 +57,14 @@
<-> alias * LibertinusSans-LF/m/sc
}{}
+\DeclareFontShape{LGR}{LibertinusSans-LF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-LF}{regular}{scit}{
+ <-> alias * LibertinusSans-LF/m/scit
+}{}
+
\DeclareFontShape{LGR}{LibertinusSans-LF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-lf-lgr
}{}
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
+\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{n}{
+ <-> ssub * LibertinusSans-LF/b/n
}{}
\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{sc}{
<-> ssub * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-LF}{bx}{n}{
- <-> ssub * LibertinusSans-LF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-OsF.fd
index 862b5a34f6f..dfd9716617f 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,27 @@
\DeclareFontFamily{LGR}{LibertinusSans-OsF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{regular}{scit}{
- <-> alias * LibertinusSans-OsF/m/scit
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{sc}{
+ <-> alias * LibertinusSans-OsF/b/sc
}{}
+
+% ---- m = regular ----
+
\DeclareFontShape{LGR}{LibertinusSans-OsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-osf-lgr
}{}
@@ -46,6 +57,14 @@
<-> alias * LibertinusSans-OsF/m/n
}{}
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-OsF}{regular}{scit}{
+ <-> alias * LibertinusSans-OsF/m/scit
+}{}
+
\DeclareFontShape{LGR}{LibertinusSans-OsF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-lgr
}{}
@@ -71,79 +90,12 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{sc}{
- <-> alias * LibertinusSans-OsF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{sc}{
<-> ssub * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-OsF}{bx}{n}{
<-> ssub * LibertinusSans-OsF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-Sup.fd
index 063022ae8fd..c9dfe420b77 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -57,35 +57,11 @@
<-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-Sup}{bx}{n}{
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TLF.fd
index 0f54bc2d48e..328f60b7bed 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,27 @@
\DeclareFontFamily{LGR}{LibertinusSans-TLF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{regular}{sc}{
- <-> alias * LibertinusSans-TLF/m/sc
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{sc}{
+ <-> alias * LibertinusSans-TLF/b/sc
}{}
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{n}{
+ <-> alias * LibertinusSans-TLF/b/n
+}{}
+
+
+% ---- m = regular ----
+
\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-lgr
}{}
@@ -38,12 +49,12 @@
<-> alias * LibertinusSans-TLF/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-lgr
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{regular}{it}{
- <-> alias * LibertinusSans-TLF/m/it
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{regular}{sc}{
+ <-> alias * LibertinusSans-TLF/m/sc
}{}
\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{scit}{
@@ -54,6 +65,14 @@
<-> alias * LibertinusSans-TLF/m/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{regular}{it}{
+ <-> alias * LibertinusSans-TLF/m/it
+}{}
+
\DeclareFontShape{LGR}{LibertinusSans-TLF}{m}{scsl}{
<-> ssub * LibertinusSans-TLF/m/scit
}{}
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{n}{
- <-> alias * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{sc}{
- <-> alias * LibertinusSans-TLF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{sc}{
- <-> ssub * LibertinusSans-TLF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{n}{
<-> ssub * LibertinusSans-TLF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
+\DeclareFontShape{LGR}{LibertinusSans-TLF}{bx}{sc}{
+ <-> ssub * LibertinusSans-TLF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TOsF.fd
index 2011188e636..08cf3a25659 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,8 @@
\DeclareFontFamily{LGR}{LibertinusSans-TOsF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{n}{
- <-> alias * LibertinusSans-TOsF/b/n
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{sc}{
- <-> alias * LibertinusSans-TOsF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
-}{}
-
-
% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{regular}{scit}{
- <-> alias * LibertinusSans-TOsF/m/scit
-}{}
-
\DeclareFontShape{LGR}{LibertinusSans-TOsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-lgr
}{}
@@ -105,6 +46,14 @@
<-> alias * LibertinusSans-TOsF/m/sc
}{}
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSans-TOsF/m/scit
+}{}
+
\DeclareFontShape{LGR}{LibertinusSans-TOsF}{m}{scsl}{
<-> ssub * LibertinusSans-TOsF/m/scit
}{}
@@ -122,20 +71,27 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{n}{
+ <-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-lgr
}{}
+\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSans-TOsF/b/sc
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bx}{sc}{
<-> ssub * LibertinusSans-TOsF/b/sc
}{}
@@ -144,8 +100,4 @@
<-> ssub * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-LF.fd
index 27328a567a1..97047a6ad16 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,12 +30,12 @@
<-> alias * LibertinusSerif-LF/b/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{scit}{
+ <-> alias * LibertinusSerif-LF/b/scit
}{}
\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{n}{
@@ -46,20 +46,12 @@
<-> alias * LibertinusSerif-LF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{scit}{
- <-> alias * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
}{}
\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{scsl}{
@@ -70,106 +62,114 @@
<-> ssub * LibertinusSerif-LF/bold/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
+}{}
-% ---- m = regular ----
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
+}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-lgr
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{sc}{
- <-> alias * LibertinusSerif-LF/m/sc
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{n}{
+ <-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-LF/sb/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/semibold/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{sc}{
- <-> alias * LibertinusSerif-LF/sb/sc
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{sc}{
+ <-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{n}{
- <-> alias * LibertinusSerif-LF/sb/n
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{scit}{
- <-> alias * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-LF/semibold/scit
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
}{}
@@ -183,6 +183,10 @@
<-> ssub * LibertinusSerif-LF/b/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-LF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-LF/b/scsl
+}{}
+
\DeclareFontShape{LGR}{LibertinusSerif-LF}{bx}{it}{
<-> ssub * LibertinusSerif-LF/b/it
}{}
@@ -195,8 +199,4 @@
<-> ssub * LibertinusSerif-LF/b/sl
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-LF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-LF/b/scsl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-OsF.fd
index 81f0108e13a..886ed1c7daf 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,118 +20,110 @@
\DeclareFontFamily{LGR}{LibertinusSerif-OsF}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
% ---- sb = semibold ----
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
-}{}
-
\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-lgr
}{}
@@ -140,14 +132,6 @@
<-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
-}{}
-
\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-lgr
}{}
@@ -156,12 +140,20 @@
<-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{scsl}{
@@ -172,15 +164,23 @@
<-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
+}{}
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/sl
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{scsl}{
@@ -191,12 +191,12 @@
<-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{n}{
- <-> ssub * LibertinusSerif-OsF/b/n
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/sl
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{scit}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{LGR}{LibertinusSerif-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-OsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-Sup.fd
index ae77f5926b5..ed955074ee8 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bold}{it}{
- <-> alias * LibertinusSerif-Sup/b/it
-}{}
-
\DeclareFontShape{LGR}{LibertinusSerif-Sup}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-lgr
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSerif-Sup/b/n
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bold}{it}{
+ <-> alias * LibertinusSerif-Sup/b/it
+}{}
+
\DeclareFontShape{LGR}{LibertinusSerif-Sup}{b}{sl}{
<-> ssub * LibertinusSerif-Sup/b/it
}{}
@@ -47,72 +47,72 @@
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{n}{
- <-> alias * LibertinusSerif-Sup/m/n
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{it}{
+ <-> alias * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{it}{
- <-> alias * LibertinusSerif-Sup/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{sl}{
- <-> ssub * LibertinusSerif-Sup/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{sl}{
+ <-> ssub * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{sl}{
- <-> ssub * LibertinusSerif-Sup/regular/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{n}{
+ <-> alias * LibertinusSerif-Sup/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{it}{
- <-> alias * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{it}{
+ <-> alias * LibertinusSerif-Sup/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{sb}{sl}{
- <-> ssub * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{m}{sl}{
+ <-> ssub * LibertinusSerif-Sup/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{semibold}{sl}{
- <-> ssub * LibertinusSerif-Sup/semibold/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{regular}{sl}{
+ <-> ssub * LibertinusSerif-Sup/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bx}{it}{
- <-> ssub * LibertinusSerif-Sup/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bx}{sl}{
+ <-> ssub * LibertinusSerif-Sup/b/sl
}{}
\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bx}{n}{
<-> ssub * LibertinusSerif-Sup/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bx}{sl}{
- <-> ssub * LibertinusSerif-Sup/b/sl
+\DeclareFontShape{LGR}{LibertinusSerif-Sup}{bx}{it}{
+ <-> ssub * LibertinusSerif-Sup/b/it
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TLF.fd
index 1f51644fe32..1bfe8c9f53a 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,118 +20,110 @@
\DeclareFontFamily{LGR}{LibertinusSerif-TLF}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{n}{
+ <-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{it}{
+ <-> alias * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{sc}{
- <-> alias * LibertinusSerif-TLF/m/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{it}{
- <-> alias * LibertinusSerif-TLF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{n}{
- <-> alias * LibertinusSerif-TLF/m/n
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TLF/regular/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
-}{}
-
\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-lgr
}{}
@@ -140,14 +132,6 @@
<-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{n}{
- <-> alias * LibertinusSerif-TLF/b/n
-}{}
-
\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-lgr
}{}
@@ -156,12 +140,20 @@
<-> alias * LibertinusSerif-TLF/b/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{n}{
+ <-> alias * LibertinusSerif-TLF/b/n
}{}
\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{scsl}{
@@ -172,6 +164,14 @@
<-> ssub * LibertinusSerif-TLF/bold/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
+}{}
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
@@ -183,20 +183,20 @@
<-> ssub * LibertinusSerif-TLF/b/sl
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{it}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{n}{
<-> ssub * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
+
+\DeclareFontShape{LGR}{LibertinusSerif-TLF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scsl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TOsF.fd
index 2989dba1eeb..3a60f6c7109 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LGRLibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for LGR/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,20 @@
% ---- b = bold ----
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{n}{
@@ -46,20 +46,12 @@
<-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{scsl}{
@@ -70,133 +62,141 @@
<-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
+}{}
-% ---- m = regular ----
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
+}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-lgr
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{scit}{
- <-> alias * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/regular/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-lgr
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{it}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scsl
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{n}{
<-> ssub * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scsl
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
+\DeclareFontShape{LGR}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-LF.fd
deleted file mode 100644
index 6aba524166c..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index c28fadb8c52..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 4ca7f39724f..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index a31baf6fba5..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index d19f1c2f758..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifInitials-TLF.fd
deleted file mode 100644
index 2c8271fddec..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LGRLibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LGRLibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LGR/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LGR}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusMono-TLF.fd
index b0a34cd620b..1db4c228d04 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusMono-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusMono-TLF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusMono-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,62 +30,7 @@
<-> alias * LibertinusMono-TLF/m/n
}{}
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{m}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-Oblique-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{regular}{sl}{
- <-> alias * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{m}{it}{
- <-> ssub * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{regular}{it}{
- <-> ssub * LibertinusMono-TLF/regular/sl
-}{}
-
-
-% ---- b = bold ----
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{b}{n}{
- <-> \LibertinusMono@@scale LibertinusMono-Bold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bold}{n}{
- <-> alias * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{b}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-BoldOblique-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bold}{sl}{
- <-> alias * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{b}{it}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bold}{it}{
- <-> ssub * LibertinusMono-TLF/bold/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bx}{n}{
- <-> ssub * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bx}{it}{
- <-> ssub * LibertinusMono-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusMono-TLF}{bx}{sl}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-LF.fd
index 8b6004a304b..b40fd45c6ef 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,22 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-ly1
}{}
@@ -46,28 +30,12 @@
<-> alias * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{LY1}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
+\DeclareFontShape{LY1}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
}{}
@@ -81,12 +49,12 @@
<-> alias * LibertinusSans-LF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{regular}{scit}{
- <-> alias * LibertinusSans-LF/m/scit
+\DeclareFontShape{LY1}{LibertinusSans-LF}{regular}{n}{
+ <-> alias * LibertinusSans-LF/m/n
}{}
\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{sc}{
@@ -97,12 +65,12 @@
<-> alias * LibertinusSans-LF/m/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-ly1
+\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{regular}{n}{
- <-> alias * LibertinusSans-LF/m/n
+\DeclareFontShape{LY1}{LibertinusSans-LF}{regular}{scit}{
+ <-> alias * LibertinusSans-LF/m/scit
}{}
\DeclareFontShape{LY1}{LibertinusSans-LF}{m}{scsl}{
@@ -124,28 +92,12 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{n}{
<-> ssub * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
+\DeclareFontShape{LY1}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-OsF.fd
index db2abe49902..8da5ddb9b34 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,6 +20,25 @@
\DeclareFontFamily{LY1}{LibertinusSans-OsF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{sc}{
+ <-> alias * LibertinusSans-OsF/b/sc
+}{}
+
+
% ---- m = regular ----
\DeclareFontShape{LY1}{LibertinusSans-OsF}{m}{it}{
@@ -30,14 +49,6 @@
<-> alias * LibertinusSans-OsF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{regular}{scit}{
- <-> alias * LibertinusSans-OsF/m/scit
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-OsF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-ly1
}{}
@@ -46,6 +57,14 @@
<-> alias * LibertinusSans-OsF/m/sc
}{}
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{regular}{scit}{
+ <-> alias * LibertinusSans-OsF/m/scit
+}{}
+
\DeclareFontShape{LY1}{LibertinusSans-OsF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-osf-ly1
}{}
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{sc}{
- <-> alias * LibertinusSans-OsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{n}{
- <-> ssub * LibertinusSans-OsF/b/n
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{sc}{
<-> ssub * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{LY1}{LibertinusSans-OsF}{bx}{n}{
+ <-> ssub * LibertinusSans-OsF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-Sup.fd
index faaa4225cb0..896ca2095ef 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{regular}{it}{
- <-> alias * LibertinusSans-Sup/m/it
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-Sup}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-sup-ly1
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSans-Sup/m/n
}{}
+\DeclareFontShape{LY1}{LibertinusSans-Sup}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-Sup}{regular}{it}{
+ <-> alias * LibertinusSans-Sup/m/it
+}{}
+
\DeclareFontShape{LY1}{LibertinusSans-Sup}{m}{sl}{
<-> ssub * LibertinusSans-Sup/m/it
}{}
@@ -57,22 +57,6 @@
<-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
@@ -80,12 +64,4 @@
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TLF.fd
index 001b5eb5d5b..0d32a54d929 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-TLF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-ly1
}{}
@@ -46,41 +38,9 @@
<-> alias * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{regular}{scit}{
- <-> alias * LibertinusSans-TLF/m/scit
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-TLF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-ly1
}{}
@@ -97,6 +57,14 @@
<-> alias * LibertinusSans-TLF/m/n
}{}
+\DeclareFontShape{LY1}{LibertinusSans-TLF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSans-TLF}{regular}{scit}{
+ <-> alias * LibertinusSans-TLF/m/scit
+}{}
+
\DeclareFontShape{LY1}{LibertinusSans-TLF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-ly1
}{}
@@ -124,28 +92,12 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{n}{
- <-> ssub * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{sc}{
<-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
+\DeclareFontShape{LY1}{LibertinusSans-TLF}{bx}{n}{
+ <-> ssub * LibertinusSans-TLF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TOsF.fd
index 9c1ba02dc65..e6b2e7ee92c 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,22 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{sc}{
- <-> alias * LibertinusSans-TOsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-ly1
}{}
@@ -46,39 +30,23 @@
<-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSans-TOsF/b/sc
}{}
% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{regular}{n}{
- <-> alias * LibertinusSans-TOsF/m/n
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{regular}{it}{
+ <-> alias * LibertinusSans-TOsF/m/it
}{}
\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{sc}{
@@ -97,12 +65,12 @@
<-> alias * LibertinusSans-TOsF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{regular}{it}{
- <-> alias * LibertinusSans-TOsF/m/it
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{regular}{n}{
+ <-> alias * LibertinusSans-TOsF/m/n
}{}
\DeclareFontShape{LY1}{LibertinusSans-TOsF}{m}{scsl}{
@@ -124,28 +92,12 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSans-TOsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{n}{
<-> ssub * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
+\DeclareFontShape{LY1}{LibertinusSans-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSans-TOsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-LF.fd
index bee6acf0c49..31693e9b978 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,59 +20,24 @@
\DeclareFontFamily{LY1}{LibertinusSerif-LF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{n}{
- <-> alias * LibertinusSerif-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{scit}{
- <-> alias * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{sc}{
- <-> alias * LibertinusSerif-LF/b/sc
-}{}
+% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{scsl}{
- <-> ssub * LibertinusSerif-LF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-LF/bold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-ly1
}{}
@@ -81,14 +46,6 @@
<-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
-}{}
-
\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-ly1
}{}
@@ -97,12 +54,12 @@
<-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{sl}{
@@ -113,16 +70,16 @@
<-> ssub * LibertinusSerif-LF/regular/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
-}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
-}{}
+% ---- sb = semibold ----
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-ly1
+}{}
-% ---- sb = semibold ----
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-LF/sb/scit
+}{}
\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-ly1
@@ -140,14 +97,6 @@
<-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{semibold}{scit}{
- <-> alias * LibertinusSerif-LF/sb/scit
-}{}
-
\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-ly1
}{}
@@ -156,6 +105,14 @@
<-> alias * LibertinusSerif-LF/sb/it
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-LF/sb/scit
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/semibold/scit
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{sl}{
<-> ssub * LibertinusSerif-LF/sb/it
}{}
@@ -164,21 +121,72 @@
<-> ssub * LibertinusSerif-LF/semibold/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-LF/sb/scit
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-LF/semibold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{scit}{
+ <-> alias * LibertinusSerif-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{sc}{
+ <-> alias * LibertinusSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{n}{
+ <-> alias * LibertinusSerif-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/sl
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{scit}{
<-> ssub * LibertinusSerif-LF/b/scit
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-LF/b/sc
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{n}{
<-> ssub * LibertinusSerif-LF/b/n
}{}
@@ -191,12 +199,4 @@
<-> ssub * LibertinusSerif-LF/b/scsl
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{sl}{
- <-> ssub * LibertinusSerif-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-LF}{bx}{sc}{
- <-> ssub * LibertinusSerif-LF/b/sc
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-OsF.fd
index c2da55da2ab..e496570419e 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,175 +20,167 @@
\DeclareFontFamily{LY1}{LibertinusSerif-OsF}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-OsF/sb/sc
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/semibold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-OsF/b/sc
-}{}
-
\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{sl}{
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{it}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-OsF/b/sc
}{}
\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{scit}{
@@ -199,4 +191,12 @@
<-> ssub * LibertinusSerif-OsF/b/n
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-Sup.fd
index 543ad7a18d4..65e6f6d1e1d 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{LY1}{LibertinusSerif-Sup}{}
-% ---- sb = semibold ----
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{it}{
- <-> alias * LibertinusSerif-Sup/sb/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{sl}{
- <-> ssub * LibertinusSerif-Sup/sb/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{sl}{
- <-> ssub * LibertinusSerif-Sup/semibold/it
-}{}
-
-
% ---- b = bold ----
\DeclareFontShape{LY1}{LibertinusSerif-Sup}{b}{it}{
@@ -74,16 +47,35 @@
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{regular}{it}{
- <-> alias * LibertinusSerif-Sup/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{it}{
+ <-> alias * LibertinusSerif-Sup/sb/it
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{sb}{sl}{
+ <-> ssub * LibertinusSerif-Sup/sb/it
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/semibold/it
+}{}
+
+
+% ---- m = regular ----
+
\DeclareFontShape{LY1}{LibertinusSerif-Sup}{m}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-ly1
}{}
@@ -92,6 +84,14 @@
<-> alias * LibertinusSerif-Sup/m/n
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{regular}{it}{
+ <-> alias * LibertinusSerif-Sup/m/it
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-Sup}{m}{sl}{
<-> ssub * LibertinusSerif-Sup/m/it
}{}
@@ -103,16 +103,16 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{bx}{it}{
- <-> ssub * LibertinusSerif-Sup/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{bx}{sl}{
+ <-> ssub * LibertinusSerif-Sup/b/sl
}{}
\DeclareFontShape{LY1}{LibertinusSerif-Sup}{bx}{n}{
<-> ssub * LibertinusSerif-Sup/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-Sup}{bx}{sl}{
- <-> ssub * LibertinusSerif-Sup/b/sl
+\DeclareFontShape{LY1}{LibertinusSerif-Sup}{bx}{it}{
+ <-> ssub * LibertinusSerif-Sup/b/it
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TLF.fd
index fd437f00363..2301082b284 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,6 +30,14 @@
<-> alias * LibertinusSerif-TLF/sb/n
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-ly1
}{}
@@ -46,12 +54,12 @@
<-> alias * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
}{}
\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{sl}{
@@ -62,114 +70,106 @@
<-> ssub * LibertinusSerif-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
-}{}
+% ---- b = bold ----
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{sc}{
- <-> alias * LibertinusSerif-TLF/m/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TLF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{it}{
- <-> alias * LibertinusSerif-TLF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{n}{
- <-> alias * LibertinusSerif-TLF/m/n
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{n}{
+ <-> alias * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{it}{
+ <-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/bold/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TLF/regular/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{n}{
+ <-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{scit}{
- <-> alias * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{n}{
- <-> alias * LibertinusSerif-TLF/b/n
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{it}{
- <-> alias * LibertinusSerif-TLF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{it}{
+ <-> alias * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/bold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
@@ -179,24 +179,24 @@
<-> ssub * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/sl
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{sc}{
<-> ssub * LibertinusSerif-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{it}{
- <-> ssub * LibertinusSerif-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/sl
}{}
\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{scsl}{
<-> ssub * LibertinusSerif-TLF/b/scsl
}{}
+\DeclareFontShape{LY1}{LibertinusSerif-TLF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TOsF.fd
index af0477e1fbf..1bd6b192563 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{LY1LibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for LY1/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,161 +20,165 @@
\DeclareFontFamily{LY1}{LibertinusSerif-TOsF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{scit}{
- <-> alias * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/regular/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/bold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-ly1
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scsl
+}{}
+
\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{it}{
<-> ssub * LibertinusSerif-TOsF/b/it
}{}
@@ -187,16 +191,12 @@
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
-}{}
-
\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{sl}{
<-> ssub * LibertinusSerif-TOsF/b/sl
}{}
-\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scsl
+\DeclareFontShape{LY1}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd
deleted file mode 100644
index b4e9517df7a..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index 18326283433..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 69538630459..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index 1fa7456ccd6..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index 1d2ce714c30..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifInitials-TLF.fd
deleted file mode 100644
index 62efd441c85..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/LY1LibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{LY1LibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for LY1/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusMono-TLF.fd
index 443e55c3315..fd29777b08f 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusMono-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusMono-TLF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusMono-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{OT1}{LibertinusMono-TLF}{\hyphenchar\font=-1}
-% ---- b = bold ----
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{b}{n}{
- <-> \LibertinusMono@@scale LibertinusMono-Bold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bold}{n}{
- <-> alias * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{b}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-BoldOblique-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bold}{sl}{
- <-> alias * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{b}{it}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bold}{it}{
- <-> ssub * LibertinusMono-TLF/bold/sl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{OT1}{LibertinusMono-TLF}{m}{n}{
@@ -57,35 +30,7 @@
<-> alias * LibertinusMono-TLF/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{m}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-Oblique-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{regular}{sl}{
- <-> alias * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{m}{it}{
- <-> ssub * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{regular}{it}{
- <-> ssub * LibertinusMono-TLF/regular/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bx}{sl}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bx}{it}{
- <-> ssub * LibertinusMono-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusMono-TLF}{bx}{n}{
- <-> ssub * LibertinusMono-TLF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-LF.fd
index 59ba34390ac..45ef327f7ba 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,59 +20,24 @@
\DeclareFontFamily{OT1}{LibertinusSans-LF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
+% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{regular}{it}{
+ <-> alias * LibertinusSans-LF/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{regular}{scit}{
+ <-> alias * LibertinusSans-LF/m/scit
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-ot1
}{}
@@ -89,22 +54,6 @@
<-> alias * LibertinusSans-LF/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{regular}{it}{
- <-> alias * LibertinusSans-LF/m/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-LF}{regular}{scit}{
- <-> alias * LibertinusSans-LF/m/scit
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-LF}{m}{scsl}{
<-> ssub * LibertinusSans-LF/m/scit
}{}
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{n}{
- <-> ssub * LibertinusSans-LF/b/n
+\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
+\DeclareFontShape{OT1}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
+\DeclareFontShape{OT1}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{n}{
+ <-> ssub * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-OsF.fd
index f445d38ba90..15d9a000789 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,12 @@
% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{n}{
- <-> alias * LibertinusSans-OsF/m/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{sc}{
- <-> alias * LibertinusSans-OsF/m/sc
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{it}{
+ <-> alias * LibertinusSans-OsF/m/it
}{}
\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{scit}{
@@ -46,12 +38,20 @@
<-> alias * LibertinusSans-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-ot1
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{it}{
- <-> alias * LibertinusSans-OsF/m/it
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{sc}{
+ <-> alias * LibertinusSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{regular}{n}{
+ <-> alias * LibertinusSans-OsF/m/n
}{}
\DeclareFontShape{OT1}{LibertinusSans-OsF}{m}{scsl}{
@@ -73,22 +73,6 @@
% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-ot1
}{}
@@ -97,55 +81,23 @@
<-> alias * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{n}{
- <-> ssub * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{sc}{
<-> ssub * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
+\DeclareFontShape{OT1}{LibertinusSans-OsF}{bx}{n}{
+ <-> ssub * LibertinusSans-OsF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-Sup.fd
index 4820f1ea116..559a95301e5 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,19 @@
\DeclareFontFamily{OT1}{LibertinusSans-Sup}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{regular}{it}{
- <-> alias * LibertinusSans-Sup/m/it
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{bold}{n}{
+ <-> alias * LibertinusSans-Sup/b/n
}{}
+
+% ---- m = regular ----
+
\DeclareFontShape{OT1}{LibertinusSans-Sup}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-sup-ot1
}{}
@@ -38,54 +41,27 @@
<-> alias * LibertinusSans-Sup/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{m}{sl}{
- <-> ssub * LibertinusSans-Sup/m/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{regular}{sl}{
- <-> ssub * LibertinusSans-Sup/regular/it
-}{}
-
-
-% ---- b = bold ----
-
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{bold}{n}{
- <-> alias * LibertinusSans-Sup/b/n
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{regular}{it}{
+ <-> alias * LibertinusSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{m}{sl}{
+ <-> ssub * LibertinusSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
+\DeclareFontShape{OT1}{LibertinusSans-Sup}{regular}{sl}{
+ <-> ssub * LibertinusSans-Sup/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-Sup}{bx}{n}{
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TLF.fd
index fe4b0fe5374..4e82ff28a6f 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,12 +30,12 @@
<-> alias * LibertinusSans-TLF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{regular}{it}{
- <-> alias * LibertinusSans-TLF/m/it
+\DeclareFontShape{OT1}{LibertinusSans-TLF}{regular}{sc}{
+ <-> alias * LibertinusSans-TLF/m/sc
}{}
\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{n}{
@@ -46,12 +46,12 @@
<-> alias * LibertinusSans-TLF/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{regular}{sc}{
- <-> alias * LibertinusSans-TLF/m/sc
+\DeclareFontShape{OT1}{LibertinusSans-TLF}{regular}{it}{
+ <-> alias * LibertinusSans-TLF/m/it
}{}
\DeclareFontShape{OT1}{LibertinusSans-TLF}{m}{scsl}{
@@ -73,14 +73,6 @@
% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-TLF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-ot1
}{}
@@ -97,55 +89,15 @@
<-> alias * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
+\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{n}{
+ <-> ssub * LibertinusSans-TLF/b/n
}{}
\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{sc}{
<-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TLF}{bx}{n}{
- <-> ssub * LibertinusSans-TLF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TOsF.fd
index 925f75936b4..e4fa1afdb01 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,6 +22,14 @@
% ---- m = regular ----
+\DeclareFontShape{OT1}{LibertinusSans-TOsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSans-TOsF}{regular}{it}{
+ <-> alias * LibertinusSans-TOsF/m/it
+}{}
+
\DeclareFontShape{OT1}{LibertinusSans-TOsF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-ot1
}{}
@@ -46,14 +54,6 @@
<-> alias * LibertinusSans-TOsF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{regular}{it}{
- <-> alias * LibertinusSans-TOsF/m/it
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-TOsF}{m}{scsl}{
<-> ssub * LibertinusSans-TOsF/m/scit
}{}
@@ -73,22 +73,6 @@
% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{sc}{
- <-> alias * LibertinusSans-TOsF/b/sc
-}{}
-
\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-ot1
}{}
@@ -97,55 +81,23 @@
<-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSans-TOsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
+\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSans-TOsF/b/sc
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
+\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSans-TOsF/b/n
}{}
\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{sc}{
<-> ssub * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSans-TOsF}{bx}{n}{
- <-> ssub * LibertinusSans-TOsF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-LF.fd
index b3ab2a88cc1..58d2b629cd1 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,12 +22,12 @@
% ---- sb = semibold ----
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-LF/sb/sc
}{}
\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{scit}{
@@ -46,20 +46,12 @@
<-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{sc}{
- <-> alias * LibertinusSerif-LF/sb/sc
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{scsl}{
@@ -70,106 +62,114 @@
<-> ssub * LibertinusSerif-LF/semibold/scit
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
+}{}
-% ---- m = regular ----
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
+}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-ot1
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{sc}{
- <-> alias * LibertinusSerif-LF/m/sc
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{sc}{
+ <-> alias * LibertinusSerif-LF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{scit}{
+ <-> alias * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{n}{
+ <-> alias * LibertinusSerif-LF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/bold/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{sc}{
- <-> alias * LibertinusSerif-LF/b/sc
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{scit}{
- <-> alias * LibertinusSerif-LF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{n}{
- <-> alias * LibertinusSerif-LF/b/n
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{sc}{
+ <-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{b}{scsl}{
- <-> ssub * LibertinusSerif-LF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-LF/bold/scit
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
}{}
@@ -179,18 +179,14 @@
<-> ssub * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{scit}{
- <-> ssub * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{n}{
- <-> ssub * LibertinusSerif-LF/b/n
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{scsl}{
<-> ssub * LibertinusSerif-LF/b/scsl
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-LF/b/scit
+}{}
+
\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{sc}{
<-> ssub * LibertinusSerif-LF/b/sc
}{}
@@ -199,4 +195,8 @@
<-> ssub * LibertinusSerif-LF/b/sl
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-LF}{bx}{n}{
+ <-> ssub * LibertinusSerif-LF/b/n
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-OsF.fd
index bc32a36b84d..1a92bbcde8a 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,6 +22,14 @@
% ---- sb = semibold ----
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
+}{}
+
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-ot1
}{}
@@ -38,14 +46,6 @@
<-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-ot1
}{}
@@ -54,14 +54,6 @@
<-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{scsl}{
<-> ssub * LibertinusSerif-OsF/sb/scit
}{}
@@ -70,15 +62,23 @@
<-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
+}{}
+
% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{scit}{
@@ -89,14 +89,6 @@
<-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-ot1
}{}
@@ -105,12 +97,12 @@
<-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{scsl}{
@@ -121,17 +113,17 @@
<-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
+
+% ---- m = regular ----
+
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-ot1
}{}
@@ -148,20 +140,20 @@
<-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{scsl}{
@@ -172,9 +164,21 @@
<-> ssub * LibertinusSerif-OsF/regular/scit
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
+}{}
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
+}{}
+
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{sl}{
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
@@ -183,20 +187,16 @@
<-> ssub * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-OsF/b/n
}{}
\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{it}{
<-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{n}{
- <-> ssub * LibertinusSerif-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{scit}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-Sup.fd
index 50c36b02c58..70fcdfa342b 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,70 +20,62 @@
\DeclareFontFamily{OT1}{LibertinusSerif-Sup}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{it}{
- <-> alias * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{it}{
+ <-> alias * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{n}{
+ <-> alias * LibertinusSerif-Sup/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{sl}{
- <-> ssub * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{sl}{
+ <-> ssub * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{sl}{
- <-> ssub * LibertinusSerif-Sup/semibold/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/bold/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{n}{
- <-> alias * LibertinusSerif-Sup/b/n
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{it}{
- <-> alias * LibertinusSerif-Sup/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{it}{
+ <-> alias * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{b}{sl}{
- <-> ssub * LibertinusSerif-Sup/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{sb}{sl}{
+ <-> ssub * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bold}{sl}{
- <-> ssub * LibertinusSerif-Sup/bold/it
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/semibold/it
}{}
% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{regular}{n}{
- <-> alias * LibertinusSerif-Sup/m/n
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-Sup}{m}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-ot1
}{}
@@ -92,6 +84,14 @@
<-> alias * LibertinusSerif-Sup/m/it
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{regular}{n}{
+ <-> alias * LibertinusSerif-Sup/m/n
+}{}
+
\DeclareFontShape{OT1}{LibertinusSerif-Sup}{m}{sl}{
<-> ssub * LibertinusSerif-Sup/m/it
}{}
@@ -107,12 +107,12 @@
<-> ssub * LibertinusSerif-Sup/b/sl
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bx}{it}{
- <-> ssub * LibertinusSerif-Sup/b/it
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bx}{n}{
<-> ssub * LibertinusSerif-Sup/b/n
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-Sup}{bx}{it}{
+ <-> ssub * LibertinusSerif-Sup/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TLF.fd
index 92ff3f610e6..5dfded227ec 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,124 +20,116 @@
\DeclareFontFamily{OT1}{LibertinusSerif-TLF}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{it}{
+ <-> alias * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{n}{
+ <-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{sc}{
- <-> alias * LibertinusSerif-TLF/m/sc
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{n}{
- <-> alias * LibertinusSerif-TLF/m/n
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{it}{
- <-> alias * LibertinusSerif-TLF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TLF/regular/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{scit}{
- <-> alias * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{it}{
+ <-> alias * LibertinusSerif-TLF/b/it
}{}
\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{n}{
@@ -148,20 +140,20 @@
<-> alias * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{it}{
- <-> alias * LibertinusSerif-TLF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TLF/b/scit
}{}
\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{scsl}{
@@ -172,31 +164,39 @@
<-> ssub * LibertinusSerif-TLF/bold/scit
}{}
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{n}{
- <-> ssub * LibertinusSerif-TLF/b/n
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{it}{
<-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/sl
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scsl
}{}
\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{sc}{
<-> ssub * LibertinusSerif-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scsl
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-TLF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TLF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TOsF.fd
index 299e1ed5c1f..56b7226794e 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{OT1LibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for OT1/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,126 +20,110 @@
\DeclareFontFamily{OT1}{LibertinusSerif-TOsF}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/bold/scit
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
% ---- m = regular ----
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
-}{}
-
\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-ot1
}{}
@@ -148,6 +132,14 @@
<-> alias * LibertinusSerif-TOsF/m/n
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
+}{}
+
\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-ot1
}{}
@@ -156,12 +148,12 @@
<-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{scsl}{
@@ -172,6 +164,14 @@
<-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
+}{}
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
@@ -179,24 +179,24 @@
<-> ssub * LibertinusSerif-TOsF/b/scsl
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{it}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
}{}
\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{scit}{
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{n}{
- <-> ssub * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{OT1}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd
deleted file mode 100644
index b9ad0dd86ba..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index e0f64e3cdbf..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 0e368df70ae..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index 3430d6e7c8f..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index a92cfe5fe3c..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifInitials-TLF.fd
deleted file mode 100644
index a5707fc5c4a..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/OT1LibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{OT1LibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for OT1/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusMono-TLF.fd
index dcce12f2ac5..ba7f4efbc9a 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusMono-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusMono-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusMono-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusMono-TLF}{m}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-Oblique-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{regular}{sl}{
- <-> alias * LibertinusMono-TLF/m/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusMono-TLF}{m}{n}{
<-> \LibertinusMono@@scale LibertinusMono-Regular-tlf-t1
}{}
@@ -38,54 +30,7 @@
<-> alias * LibertinusMono-TLF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusMono-TLF}{m}{it}{
- <-> ssub * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{regular}{it}{
- <-> ssub * LibertinusMono-TLF/regular/sl
-}{}
-
-
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{b}{n}{
- <-> \LibertinusMono@@scale LibertinusMono-Bold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bold}{n}{
- <-> alias * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{b}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-BoldOblique-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bold}{sl}{
- <-> alias * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{b}{it}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bold}{it}{
- <-> ssub * LibertinusMono-TLF/bold/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bx}{sl}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bx}{it}{
- <-> ssub * LibertinusMono-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{LibertinusMono-TLF}{bx}{n}{
- <-> ssub * LibertinusMono-TLF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-LF.fd
index 7b11780b201..8736e2047c7 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,14 +20,33 @@
\DeclareFontFamily{T1}{LibertinusSans-LF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
+}{}
+
+
% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSans-LF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-t1
+\DeclareFontShape{T1}{LibertinusSans-LF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-LF}{regular}{sc}{
- <-> alias * LibertinusSans-LF/m/sc
+\DeclareFontShape{T1}{LibertinusSans-LF}{regular}{it}{
+ <-> alias * LibertinusSans-LF/m/it
}{}
\DeclareFontShape{T1}{LibertinusSans-LF}{m}{n}{
@@ -38,12 +57,12 @@
<-> alias * LibertinusSans-LF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-LF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-t1
+\DeclareFontShape{T1}{LibertinusSans-LF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-LF}{regular}{it}{
- <-> alias * LibertinusSans-LF/m/it
+\DeclareFontShape{T1}{LibertinusSans-LF}{regular}{sc}{
+ <-> alias * LibertinusSans-LF/m/sc
}{}
\DeclareFontShape{T1}{LibertinusSans-LF}{m}{scit}{
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{n}{
<-> ssub * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{T1}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-OsF.fd
index f18d1086d2d..5772c9a709c 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,30 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t1
}{}
@@ -54,20 +30,12 @@
<-> alias * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{T1}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
+\DeclareFontShape{T1}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
}{}
@@ -81,12 +49,12 @@
<-> alias * LibertinusSans-OsF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{regular}{scit}{
- <-> alias * LibertinusSans-OsF/m/scit
+\DeclareFontShape{T1}{LibertinusSans-OsF}{regular}{n}{
+ <-> alias * LibertinusSans-OsF/m/n
}{}
\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{sc}{
@@ -97,12 +65,12 @@
<-> alias * LibertinusSans-OsF/m/sc
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-t1
+\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{regular}{n}{
- <-> alias * LibertinusSans-OsF/m/n
+\DeclareFontShape{T1}{LibertinusSans-OsF}{regular}{scit}{
+ <-> alias * LibertinusSans-OsF/m/scit
}{}
\DeclareFontShape{T1}{LibertinusSans-OsF}{m}{scsl}{
@@ -124,28 +92,12 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSans-OsF/b/sc
}{}
\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{n}{
<-> ssub * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-OsF}{bx}{sc}{
- <-> ssub * LibertinusSans-OsF/b/sc
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-Sup.fd
index dbb3a0aeffe..da44dcffabe 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T1}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-Sup}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-sup-t1
}{}
@@ -38,16 +30,16 @@
<-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-\DeclareFontShape{T1}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
-}{}
+% ---- m = regular ----
+\DeclareFontShape{T1}{LibertinusSans-Sup}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-sup-t1
+}{}
-% ---- m = regular ----
+\DeclareFontShape{T1}{LibertinusSans-Sup}{regular}{n}{
+ <-> alias * LibertinusSans-Sup/m/n
+}{}
\DeclareFontShape{T1}{LibertinusSans-Sup}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-sup-t1
@@ -57,14 +49,6 @@
<-> alias * LibertinusSans-Sup/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSans-Sup}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-Sup}{regular}{n}{
- <-> alias * LibertinusSans-Sup/m/n
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-Sup}{m}{sl}{
<-> ssub * LibertinusSans-Sup/m/it
}{}
@@ -76,16 +60,8 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-Sup}{bx}{n}{
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TLF.fd
index 1a32b643c9d..6b82fa2161a 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,14 +20,33 @@
\DeclareFontFamily{T1}{LibertinusSans-TLF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{n}{
+ <-> alias * LibertinusSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{sc}{
+ <-> alias * LibertinusSans-TLF/b/sc
+}{}
+
+
% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-t1
+\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-TLF}{regular}{n}{
- <-> alias * LibertinusSans-TLF/m/n
+\DeclareFontShape{T1}{LibertinusSans-TLF}{regular}{it}{
+ <-> alias * LibertinusSans-TLF/m/it
}{}
\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{sc}{
@@ -46,12 +65,12 @@
<-> alias * LibertinusSans-TLF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t1
+\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSans-TLF}{regular}{it}{
- <-> alias * LibertinusSans-TLF/m/it
+\DeclareFontShape{T1}{LibertinusSans-TLF}{regular}{n}{
+ <-> alias * LibertinusSans-TLF/m/n
}{}
\DeclareFontShape{T1}{LibertinusSans-TLF}{m}{scsl}{
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{n}{
- <-> alias * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{sc}{
- <-> alias * LibertinusSans-TLF/b/sc
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{sc}{
<-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{n}{
<-> ssub * LibertinusSans-TLF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TOsF.fd
index 0cd8c9d2a8c..263258b5254 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,22 +22,6 @@
% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{regular}{sc}{
- <-> alias * LibertinusSans-TOsF/m/sc
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{regular}{n}{
- <-> alias * LibertinusSans-TOsF/m/n
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t1
}{}
@@ -54,6 +38,22 @@
<-> alias * LibertinusSans-TOsF/m/scit
}{}
+\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSans-TOsF}{regular}{n}{
+ <-> alias * LibertinusSans-TOsF/m/n
+}{}
+
\DeclareFontShape{T1}{LibertinusSans-TOsF}{m}{scsl}{
<-> ssub * LibertinusSans-TOsF/m/scit
}{}
@@ -81,14 +81,6 @@
<-> alias * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-TOsF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t1
}{}
@@ -97,55 +89,15 @@
<-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{n}{
- <-> ssub * LibertinusSans-TOsF/b/n
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{sc}{
<-> ssub * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
-}{}
-
-\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{T1}{LibertinusSans-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSans-TOsF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-LF.fd
index 12a98776fd1..6386d6efe10 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,126 +20,110 @@
\DeclareFontFamily{T1}{LibertinusSerif-LF}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{scit}{
- <-> alias * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{n}{
- <-> alias * LibertinusSerif-LF/sb/n
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{sc}{
+ <-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{sc}{
- <-> alias * LibertinusSerif-LF/sb/sc
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-LF/semibold/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-LF/sb/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{sc}{
- <-> alias * LibertinusSerif-LF/m/sc
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{n}{
+ <-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/semibold/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
}{}
% ---- b = bold ----
-\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{scit}{
- <-> alias * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{n}{
- <-> alias * LibertinusSerif-LF/b/n
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t1
}{}
@@ -156,12 +140,20 @@
<-> alias * LibertinusSerif-LF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{scit}{
+ <-> alias * LibertinusSerif-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{n}{
+ <-> alias * LibertinusSerif-LF/b/n
}{}
\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{scsl}{
@@ -172,17 +164,17 @@
<-> ssub * LibertinusSerif-LF/bold/scit
}{}
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{scit}{
- <-> ssub * LibertinusSerif-LF/b/scit
+\DeclareFontShape{T1}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{n}{
- <-> ssub * LibertinusSerif-LF/b/n
+\DeclareFontShape{T1}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{it}{
<-> ssub * LibertinusSerif-LF/b/it
}{}
@@ -191,6 +183,14 @@
<-> ssub * LibertinusSerif-LF/b/scsl
}{}
+\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{n}{
+ <-> ssub * LibertinusSerif-LF/b/n
+}{}
+
\DeclareFontShape{T1}{LibertinusSerif-LF}{bx}{sc}{
<-> ssub * LibertinusSerif-LF/b/sc
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-OsF.fd
index bb4d3a94eae..c7454cbae16 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,183 +20,183 @@
\DeclareFontFamily{T1}{LibertinusSerif-OsF}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-OsF/sb/sc
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/semibold/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-OsF/b/sc
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{sl}{
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{n}{
- <-> ssub * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-OsF/b/sc
}{}
\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{scit}{
<-> ssub * LibertinusSerif-OsF/b/scit
}{}
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-OsF/b/n
+}{}
+
\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{it}{
<-> ssub * LibertinusSerif-OsF/b/it
}{}
+\DeclareFontShape{T1}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-Sup.fd
index 900fc0ec905..40e48768b65 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{T1}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-Sup}{sb}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t1
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSerif-Sup/sb/it
}{}
+\DeclareFontShape{T1}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
+}{}
+
\DeclareFontShape{T1}{LibertinusSerif-Sup}{sb}{sl}{
<-> ssub * LibertinusSerif-Sup/sb/it
}{}
@@ -103,6 +103,10 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{T1}{LibertinusSerif-Sup}{bx}{n}{
+ <-> ssub * LibertinusSerif-Sup/b/n
+}{}
+
\DeclareFontShape{T1}{LibertinusSerif-Sup}{bx}{sl}{
<-> ssub * LibertinusSerif-Sup/b/sl
}{}
@@ -111,8 +115,4 @@
<-> ssub * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-Sup}{bx}{n}{
- <-> ssub * LibertinusSerif-Sup/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TLF.fd
index e8dd2d8be95..33d59bfcaad 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{sc}{
- <-> alias * LibertinusSerif-TLF/m/sc
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-t1
}{}
@@ -46,20 +38,20 @@
<-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{scsl}{
@@ -70,17 +62,17 @@
<-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
+
+% ---- b = bold ----
+
\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-sc-t1
}{}
@@ -89,6 +81,14 @@
<-> alias * LibertinusSerif-TLF/b/scit
}{}
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
+}{}
+
\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-t1
}{}
@@ -105,14 +105,6 @@
<-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{scsl}{
<-> ssub * LibertinusSerif-TLF/b/scit
}{}
@@ -121,6 +113,14 @@
<-> ssub * LibertinusSerif-TLF/bold/scit
}{}
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
+}{}
+
% ---- sb = semibold ----
@@ -140,14 +140,6 @@
<-> alias * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
-}{}
-
\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t1
}{}
@@ -156,12 +148,12 @@
<-> alias * LibertinusSerif-TLF/sb/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
}{}
\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{scsl}{
@@ -172,31 +164,39 @@
<-> ssub * LibertinusSerif-TLF/semibold/scit
}{}
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
+}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{it}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/sl
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{n}{
- <-> ssub * LibertinusSerif-TLF/b/n
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TLF/b/sc
}{}
\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{scsl}{
<-> ssub * LibertinusSerif-TLF/b/scsl
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/sl
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TLF/b/sc
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TOsF.fd
index 7585a0b6f1b..fa8de6350a8 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T1LibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T1/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,163 +20,167 @@
\DeclareFontFamily{T1}{LibertinusSerif-TOsF}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/bold/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{scit}{
- <-> alias * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/regular/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t1
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t1
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{it}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
}{}
\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{scit}{
@@ -187,16 +191,12 @@
<-> ssub * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
+\DeclareFontShape{T1}{LibertinusSerif-TOsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scsl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd
deleted file mode 100644
index 4d1d656cb30..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index 4db691dfa04..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 2e0bb89039c..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index 22ca1f0e29f..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index a311ff85802..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifInitials-TLF.fd
deleted file mode 100644
index 8af996d58af..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T1LibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T1LibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T1/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusMono-TLF.fd
new file mode 100644
index 00000000000..2fde6e166f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusMono-TLF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/09/22
+%%
+\ProvidesFile{T2ALibertinusMono-TLF.fd}
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusMono-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 LibertinusMono@scale\endcsname\relax
+ \let\LibertinusMono@@scale\@empty
+\else
+ \edef\LibertinusMono@@scale{s*[\csname LibertinusMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{LibertinusMono-TLF}{\hyphenchar\font=-1}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T2A}{LibertinusMono-TLF}{m}{n}{
+ <-> \LibertinusMono@@scale LibertinusMono-Regular-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusMono-TLF}{regular}{n}{
+ <-> alias * LibertinusMono-TLF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-LF.fd
index de49abb93f5..3a7b880807f 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,59 +20,24 @@
\DeclareFontFamily{T2A}{LibertinusSans-LF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{regular}{n}{
+ <-> alias * LibertinusSans-LF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{regular}{sc}{
+ <-> alias * LibertinusSans-LF/m/sc
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{scit}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-t2a
}{}
@@ -89,22 +54,6 @@
<-> alias * LibertinusSans-LF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{regular}{n}{
- <-> alias * LibertinusSans-LF/m/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-LF}{regular}{sc}{
- <-> alias * LibertinusSans-LF/m/sc
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-LF}{m}{scsl}{
<-> ssub * LibertinusSans-LF/m/scit
}{}
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
+\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
+\DeclareFontShape{T2A}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
+\DeclareFontShape{T2A}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{n}{
<-> ssub * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{T2A}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-OsF.fd
index 6ef263fc13d..187bf1a74a7 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,6 +20,25 @@
\DeclareFontFamily{T2A}{LibertinusSans-OsF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{sc}{
+ <-> alias * LibertinusSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
+}{}
+
+
% ---- m = regular ----
\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{scit}{
@@ -30,12 +49,12 @@
<-> alias * LibertinusSans-OsF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{regular}{it}{
- <-> alias * LibertinusSans-OsF/m/it
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{regular}{sc}{
+ <-> alias * LibertinusSans-OsF/m/sc
}{}
\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{n}{
@@ -46,12 +65,12 @@
<-> alias * LibertinusSans-OsF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{regular}{sc}{
- <-> alias * LibertinusSans-OsF/m/sc
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{regular}{it}{
+ <-> alias * LibertinusSans-OsF/m/it
}{}
\DeclareFontShape{T2A}{LibertinusSans-OsF}{m}{scsl}{
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{sc}{
- <-> alias * LibertinusSans-OsF/b/sc
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSans-OsF/b/sc
}{}
\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{n}{
<-> ssub * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-OsF}{bx}{sc}{
- <-> ssub * LibertinusSans-OsF/b/sc
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-Sup.fd
index 55f0a6d963d..d4581fd5082 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,35 +20,16 @@
\DeclareFontFamily{T2A}{LibertinusSans-Sup}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bold}{n}{
- <-> alias * LibertinusSans-Sup/b/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
+\DeclareFontShape{T2A}{LibertinusSans-Sup}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-sup-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
+\DeclareFontShape{T2A}{LibertinusSans-Sup}{regular}{n}{
+ <-> alias * LibertinusSans-Sup/m/n
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{T2A}{LibertinusSans-Sup}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-sup-t2a
}{}
@@ -57,14 +38,6 @@
<-> alias * LibertinusSans-Sup/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{regular}{n}{
- <-> alias * LibertinusSans-Sup/m/n
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-Sup}{m}{sl}{
<-> ssub * LibertinusSans-Sup/m/it
}{}
@@ -74,18 +47,21 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bx}{n}{
- <-> ssub * LibertinusSans-Sup/b/n
+\DeclareFontShape{T2A}{LibertinusSans-Sup}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-sup-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
+\DeclareFontShape{T2A}{LibertinusSans-Sup}{bold}{n}{
+ <-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2A}{LibertinusSans-Sup}{bx}{n}{
+ <-> ssub * LibertinusSans-Sup/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TLF.fd
index 2b1da877b6f..e9a00a000f5 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-TLF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t2a
}{}
@@ -46,39 +38,15 @@
<-> alias * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{regular}{sc}{
- <-> alias * LibertinusSans-TLF/m/sc
+\DeclareFontShape{T2A}{LibertinusSans-TLF}{regular}{it}{
+ <-> alias * LibertinusSans-TLF/m/it
}{}
\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{n}{
@@ -89,14 +57,6 @@
<-> alias * LibertinusSans-TLF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{regular}{it}{
- <-> alias * LibertinusSans-TLF/m/it
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{scit}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-sc-t2a
}{}
@@ -105,6 +65,14 @@
<-> alias * LibertinusSans-TLF/m/scit
}{}
+\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-TLF}{regular}{sc}{
+ <-> alias * LibertinusSans-TLF/m/sc
+}{}
+
\DeclareFontShape{T2A}{LibertinusSans-TLF}{m}{scsl}{
<-> ssub * LibertinusSans-TLF/m/scit
}{}
@@ -124,28 +92,12 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{n}{
- <-> ssub * LibertinusSans-TLF/b/n
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{sc}{
<-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
+\DeclareFontShape{T2A}{LibertinusSans-TLF}{bx}{n}{
+ <-> ssub * LibertinusSans-TLF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TOsF.fd
index d482ea4a37b..c8840ac612e 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,14 +20,33 @@
\DeclareFontFamily{T2A}{LibertinusSans-TOsF}{}
+% ---- b = bold ----
+
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{n}{
+ <-> alias * LibertinusSans-TOsF/b/n
+}{}
+
+
% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{regular}{sc}{
- <-> alias * LibertinusSans-TOsF/m/sc
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{regular}{it}{
+ <-> alias * LibertinusSans-TOsF/m/it
}{}
\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{n}{
@@ -38,12 +57,12 @@
<-> alias * LibertinusSans-TOsF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{regular}{it}{
- <-> alias * LibertinusSans-TOsF/m/it
+\DeclareFontShape{T2A}{LibertinusSans-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSans-TOsF/m/sc
}{}
\DeclareFontShape{T2A}{LibertinusSans-TOsF}{m}{scit}{
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{sc}{
- <-> alias * LibertinusSans-TOsF/b/sc
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{n}{
- <-> alias * LibertinusSans-TOsF/b/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{n}{
<-> ssub * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
-}{}
-
\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{sc}{
<-> ssub * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-LF.fd
index f8f12574c19..804ae028ab4 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,20 @@
% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{sc}{
- <-> alias * LibertinusSerif-LF/b/sc
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{scit}{
+ <-> alias * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{sc}{
+ <-> alias * LibertinusSerif-LF/b/sc
}{}
\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{n}{
@@ -46,20 +46,12 @@
<-> alias * LibertinusSerif-LF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{scit}{
- <-> alias * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
}{}
\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{scsl}{
@@ -70,106 +62,114 @@
<-> ssub * LibertinusSerif-LF/bold/scit
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
+}{}
-% ---- m = regular ----
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
+}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t2a
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{sc}{
- <-> alias * LibertinusSerif-LF/m/sc
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{n}{
+ <-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-LF/sb/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/semibold/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{sc}{
- <-> alias * LibertinusSerif-LF/sb/sc
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{sc}{
+ <-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{scit}{
- <-> alias * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{n}{
- <-> alias * LibertinusSerif-LF/sb/n
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-LF/semibold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
}{}
@@ -179,24 +179,24 @@
<-> ssub * LibertinusSerif-LF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{sc}{
- <-> ssub * LibertinusSerif-LF/b/sc
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-LF/b/scit
}{}
\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{sl}{
<-> ssub * LibertinusSerif-LF/b/sl
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{scit}{
- <-> ssub * LibertinusSerif-LF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{it}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-LF/b/sc
}{}
\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{scsl}{
<-> ssub * LibertinusSerif-LF/b/scsl
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-LF}{bx}{it}{
+ <-> ssub * LibertinusSerif-LF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-OsF.fd
index 5654bcd2d5d..544e0425279 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,179 +20,179 @@
\DeclareFontFamily{T2A}{LibertinusSerif-OsF}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-OsF/sb/sc
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/semibold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-OsF/b/n
}{}
\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{sl}{
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-OsF/b/sc
-}{}
-
\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{scit}{
<-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{n}{
- <-> ssub * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-OsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
}{}
\DeclareFontShape{T2A}{LibertinusSerif-OsF}{bx}{it}{
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-Sup.fd
index ede58c58bb5..5c11bf7bca5 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{T2A}{LibertinusSerif-Sup}{}
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{n}{
- <-> alias * LibertinusSerif-Sup/m/n
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{it}{
- <-> alias * LibertinusSerif-Sup/m/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{sl}{
- <-> ssub * LibertinusSerif-Sup/m/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{sl}{
- <-> ssub * LibertinusSerif-Sup/regular/it
-}{}
-
-
% ---- b = bold ----
\DeclareFontShape{T2A}{LibertinusSerif-Sup}{b}{it}{
@@ -76,14 +49,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
-}{}
-
\DeclareFontShape{T2A}{LibertinusSerif-Sup}{sb}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t2a
}{}
@@ -92,6 +57,14 @@
<-> alias * LibertinusSerif-Sup/sb/it
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
+}{}
+
\DeclareFontShape{T2A}{LibertinusSerif-Sup}{sb}{sl}{
<-> ssub * LibertinusSerif-Sup/sb/it
}{}
@@ -101,12 +74,35 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- m = regular ----
-\DeclareFontShape{T2A}{LibertinusSerif-Sup}{bx}{it}{
- <-> ssub * LibertinusSerif-Sup/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{it}{
+ <-> alias * LibertinusSerif-Sup/m/it
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-t2a
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{n}{
+ <-> alias * LibertinusSerif-Sup/m/n
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{m}{sl}{
+ <-> ssub * LibertinusSerif-Sup/m/it
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{regular}{sl}{
+ <-> ssub * LibertinusSerif-Sup/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T2A}{LibertinusSerif-Sup}{bx}{n}{
<-> ssub * LibertinusSerif-Sup/b/n
}{}
@@ -115,4 +111,8 @@
<-> ssub * LibertinusSerif-Sup/b/sl
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-Sup}{bx}{it}{
+ <-> ssub * LibertinusSerif-Sup/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TLF.fd
index d91cdfc37f6..c6aa91ec91e 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,6 +20,57 @@
\DeclareFontFamily{T2A}{LibertinusSerif-TLF}{}
+% ---- sb = semibold ----
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TLF/sb/scit
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
+}{}
+
+
% ---- b = bold ----
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{scit}{
@@ -30,6 +81,14 @@
<-> alias * LibertinusSerif-TLF/b/scit
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
+}{}
+
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-t2a
}{}
@@ -46,12 +105,12 @@
<-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/bold/scit
}{}
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{sl}{
@@ -62,14 +121,6 @@
<-> ssub * LibertinusSerif-TLF/bold/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/bold/scit
-}{}
-
% ---- m = regular ----
@@ -89,14 +140,6 @@
<-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
-}{}
-
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t2a
}{}
@@ -105,12 +148,12 @@
<-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{scsl}{
@@ -121,62 +164,31 @@
<-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
-}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
-}{}
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scsl
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TLF/b/n
}{}
\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{sc}{
@@ -187,16 +199,4 @@
<-> ssub * LibertinusSerif-TLF/b/sl
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{it}{
- <-> ssub * LibertinusSerif-TLF/b/it
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TLF}{bx}{n}{
- <-> ssub * LibertinusSerif-TLF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TOsF.fd
index dee7c2f94fc..d9dff0ab5fe 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2ALibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2A/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,105 +20,105 @@
\DeclareFontFamily{T2A}{LibertinusSerif-TOsF}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/bold/scit
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
@@ -132,14 +132,6 @@
<-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
-}{}
-
\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t2a
}{}
@@ -148,20 +140,20 @@
<-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2a
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2a
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{scsl}{
@@ -172,31 +164,39 @@
<-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{n}{
- <-> ssub * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{it}{
<-> ssub * LibertinusSerif-TOsF/b/it
}{}
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scsl
+}{}
+
\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{scit}{
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scsl
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-LF.fd
deleted file mode 100644
index 9d4efd426af..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index 952f2bdb851..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index cef64ce7771..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index 900213e7942..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index 7bdac3ddbf5..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifInitials-TLF.fd
deleted file mode 100644
index def3d5dcba5..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2ALibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2ALibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2A/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2A}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2A}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-t2a
-}{}
-
-\DeclareFontShape{T2A}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusMono-TLF.fd
new file mode 100644
index 00000000000..0d945da3ba5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusMono-TLF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/09/22
+%%
+\ProvidesFile{T2BLibertinusMono-TLF.fd}
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusMono-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 LibertinusMono@scale\endcsname\relax
+ \let\LibertinusMono@@scale\@empty
+\else
+ \edef\LibertinusMono@@scale{s*[\csname LibertinusMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{LibertinusMono-TLF}{\hyphenchar\font=-1}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T2B}{LibertinusMono-TLF}{m}{n}{
+ <-> \LibertinusMono@@scale LibertinusMono-Regular-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusMono-TLF}{regular}{n}{
+ <-> alias * LibertinusMono-TLF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-LF.fd
index c165c2ede19..63bdb754ead 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,12 @@
% ---- m = regular ----
-\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{it}{
- <-> alias * LibertinusSans-LF/m/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{scit}{
- <-> alias * LibertinusSans-LF/m/scit
+\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{n}{
+ <-> alias * LibertinusSans-LF/m/n
}{}
\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{sc}{
@@ -46,12 +38,20 @@
<-> alias * LibertinusSans-LF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-lf-t2b
+\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{n}{
- <-> alias * LibertinusSans-LF/m/n
+\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{scit}{
+ <-> alias * LibertinusSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSans-LF}{regular}{it}{
+ <-> alias * LibertinusSans-LF/m/it
}{}
\DeclareFontShape{T2B}{LibertinusSans-LF}{m}{scsl}{
@@ -73,22 +73,6 @@
% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t2b
}{}
@@ -97,55 +81,23 @@
<-> alias * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{T2B}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
+\DeclareFontShape{T2B}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{n}{
<-> ssub * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{T2B}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-OsF.fd
index 39f6795c73c..1bdce9e21a6 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,27 @@
\DeclareFontFamily{T2B}{LibertinusSans-OsF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{regular}{scit}{
- <-> alias * LibertinusSans-OsF/m/scit
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
}{}
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{sc}{
+ <-> alias * LibertinusSans-OsF/b/sc
+}{}
+
+
+% ---- m = regular ----
+
\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-osf-t2b
}{}
@@ -38,12 +49,12 @@
<-> alias * LibertinusSans-OsF/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{regular}{n}{
- <-> alias * LibertinusSans-OsF/m/n
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{regular}{scit}{
+ <-> alias * LibertinusSans-OsF/m/scit
}{}
\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{sc}{
@@ -54,6 +65,14 @@
<-> alias * LibertinusSans-OsF/m/sc
}{}
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSans-OsF}{regular}{n}{
+ <-> alias * LibertinusSans-OsF/m/n
+}{}
+
\DeclareFontShape{T2B}{LibertinusSans-OsF}{m}{scsl}{
<-> ssub * LibertinusSans-OsF/m/scit
}{}
@@ -71,79 +90,12 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{sc}{
- <-> alias * LibertinusSans-OsF/b/sc
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{sc}{
<-> ssub * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-OsF}{bx}{n}{
<-> ssub * LibertinusSans-OsF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-Sup.fd
index a557da421fe..c1e39348775 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,22 +30,6 @@
<-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
-}{}
-
% ---- m = regular ----
@@ -76,16 +60,8 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-Sup}{bx}{n}{
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TLF.fd
index bd99d4415bc..7ea2eece959 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,65 +20,14 @@
\DeclareFontFamily{T2B}{LibertinusSans-TLF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{n}{
- <-> alias * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{sc}{
- <-> alias * LibertinusSans-TLF/b/sc
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
-
% ---- m = regular ----
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-t2b
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{regular}{n}{
- <-> alias * LibertinusSans-TLF/m/n
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{regular}{scit}{
+ <-> alias * LibertinusSans-TLF/m/scit
}{}
\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{sc}{
@@ -89,12 +38,12 @@
<-> alias * LibertinusSans-TLF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{regular}{scit}{
- <-> alias * LibertinusSans-TLF/m/scit
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{regular}{n}{
+ <-> alias * LibertinusSans-TLF/m/n
}{}
\DeclareFontShape{T2B}{LibertinusSans-TLF}{m}{it}{
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{sc}{
- <-> ssub * LibertinusSans-TLF/b/sc
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{n}{
- <-> ssub * LibertinusSans-TLF/b/n
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{n}{
+ <-> alias * LibertinusSans-TLF/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{bold}{sc}{
+ <-> alias * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{sc}{
+ <-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
+\DeclareFontShape{T2B}{LibertinusSans-TLF}{bx}{n}{
+ <-> ssub * LibertinusSans-TLF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TOsF.fd
index 7fef592030e..1f446048fc3 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,30 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{n}{
- <-> alias * LibertinusSans-TOsF/b/n
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-t2b
}{}
@@ -54,20 +30,12 @@
<-> alias * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bold}{n}{
+ <-> alias * LibertinusSans-TOsF/b/n
}{}
@@ -81,12 +49,12 @@
<-> alias * LibertinusSans-TOsF/m/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t2b
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{regular}{it}{
- <-> alias * LibertinusSans-TOsF/m/it
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSans-TOsF/m/sc
}{}
\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{n}{
@@ -97,12 +65,12 @@
<-> alias * LibertinusSans-TOsF/m/n
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{regular}{sc}{
- <-> alias * LibertinusSans-TOsF/m/sc
+\DeclareFontShape{T2B}{LibertinusSans-TOsF}{regular}{it}{
+ <-> alias * LibertinusSans-TOsF/m/it
}{}
\DeclareFontShape{T2B}{LibertinusSans-TOsF}{m}{scsl}{
@@ -124,26 +92,10 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{sc}{
<-> ssub * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
\DeclareFontShape{T2B}{LibertinusSans-TOsF}{bx}{n}{
<-> ssub * LibertinusSans-TOsF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-LF.fd
index 38f578e1852..6c695ee3ad7 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t2b
}{}
@@ -38,14 +30,6 @@
<-> alias * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{n}{
- <-> alias * LibertinusSerif-LF/sb/n
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t2b
}{}
@@ -54,12 +38,20 @@
<-> alias * LibertinusSerif-LF/sb/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{n}{
+ <-> alias * LibertinusSerif-LF/sb/n
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{scsl}{
@@ -70,24 +62,16 @@
<-> ssub * LibertinusSerif-LF/semibold/scit
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{sc}{
- <-> alias * LibertinusSerif-LF/b/sc
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t2b
-}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
-}{}
+% ---- b = bold ----
\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-t2b
@@ -105,12 +89,20 @@
<-> alias * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{sc}{
+ <-> alias * LibertinusSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
}{}
\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{scsl}{
@@ -121,24 +113,16 @@
<-> ssub * LibertinusSerif-LF/bold/scit
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2b
-}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
-}{}
+% ---- m = regular ----
\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t2b
@@ -156,12 +140,20 @@
<-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{scsl}{
@@ -172,19 +164,31 @@
<-> ssub * LibertinusSerif-LF/regular/scit
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
+}{}
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-LF/b/scsl
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-LF/b/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{n}{
+ <-> ssub * LibertinusSerif-LF/b/n
}{}
\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{it}{
<-> ssub * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{scit}{
- <-> ssub * LibertinusSerif-LF/b/scit
+\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-LF/b/scsl
}{}
\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{sc}{
@@ -195,8 +199,4 @@
<-> ssub * LibertinusSerif-LF/b/sl
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-LF}{bx}{n}{
- <-> ssub * LibertinusSerif-LF/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-OsF.fd
index a1eba5ef239..33da18e7f78 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,165 +20,161 @@
\DeclareFontFamily{T2B}{LibertinusSerif-OsF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-OsF/sb/sc
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/semibold/scit
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{sc}{
<-> ssub * LibertinusSerif-OsF/b/sc
}{}
@@ -187,6 +183,14 @@
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-OsF/b/it
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{scit}{
<-> ssub * LibertinusSerif-OsF/b/scit
}{}
@@ -195,8 +199,4 @@
<-> ssub * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-OsF}{bx}{it}{
- <-> ssub * LibertinusSerif-OsF/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-Sup.fd
index e75d7fbb321..a81a953ec9b 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{bold}{n}{
- <-> alias * LibertinusSerif-Sup/b/n
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-Sup}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-t2b
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSerif-Sup/b/it
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{bold}{n}{
+ <-> alias * LibertinusSerif-Sup/b/n
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-Sup}{b}{sl}{
<-> ssub * LibertinusSerif-Sup/b/it
}{}
@@ -47,62 +47,66 @@
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{n}{
- <-> alias * LibertinusSerif-Sup/m/n
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{it}{
- <-> alias * LibertinusSerif-Sup/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{it}{
+ <-> alias * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{sl}{
- <-> ssub * LibertinusSerif-Sup/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{sl}{
+ <-> ssub * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{sl}{
- <-> ssub * LibertinusSerif-Sup/regular/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-sup-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{it}{
- <-> alias * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{it}{
+ <-> alias * LibertinusSerif-Sup/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-sup-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{n}{
+ <-> alias * LibertinusSerif-Sup/m/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{sb}{sl}{
- <-> ssub * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{m}{sl}{
+ <-> ssub * LibertinusSerif-Sup/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{semibold}{sl}{
- <-> ssub * LibertinusSerif-Sup/semibold/it
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{regular}{sl}{
+ <-> ssub * LibertinusSerif-Sup/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{T2B}{LibertinusSerif-Sup}{bx}{it}{
+ <-> ssub * LibertinusSerif-Sup/b/it
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-Sup}{bx}{sl}{
<-> ssub * LibertinusSerif-Sup/b/sl
}{}
@@ -111,8 +115,4 @@
<-> ssub * LibertinusSerif-Sup/b/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-Sup}{bx}{it}{
- <-> ssub * LibertinusSerif-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TLF.fd
index 4079a7d1910..ba3ab35ab0f 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,105 +20,105 @@
\DeclareFontFamily{T2B}{LibertinusSerif-TLF}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{n}{
+ <-> alias * LibertinusSerif-TLF/m/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{it}{
+ <-> alias * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/regular/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{sc}{
- <-> alias * LibertinusSerif-TLF/m/sc
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{it}{
- <-> alias * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{n}{
- <-> alias * LibertinusSerif-TLF/m/n
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{scit}{
- <-> alias * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TLF/m/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TLF/regular/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
@@ -156,14 +156,6 @@
<-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-TLF}{b}{scsl}{
<-> ssub * LibertinusSerif-TLF/b/scit
}{}
@@ -172,29 +164,37 @@
<-> ssub * LibertinusSerif-TLF/bold/scit
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{n}{
- <-> ssub * LibertinusSerif-TLF/b/n
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scsl
}{}
\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{it}{
<-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scsl
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TLF/b/n
}{}
\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{sc}{
<-> ssub * LibertinusSerif-TLF/b/sc
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-TLF}{bx}{sl}{
<-> ssub * LibertinusSerif-TLF/b/sl
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TOsF.fd
index 7fe87fa18c4..8d871fe53fd 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2BLibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2B/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,59 +20,16 @@
\DeclareFontFamily{T2B}{LibertinusSerif-TOsF}{}
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{scit}{
- <-> alias * LibertinusSerif-TOsF/m/scit
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
-}{}
+% ---- b = bold ----
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/regular/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-
-% ---- b = bold ----
-
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t2b
}{}
@@ -89,14 +46,6 @@
<-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t2b
}{}
@@ -105,14 +54,6 @@
<-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
-}{}
-
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{scsl}{
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
@@ -121,17 +62,17 @@
<-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2b
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
+
+% ---- sb = semibold ----
+
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t2b
}{}
@@ -148,6 +89,14 @@
<-> alias * LibertinusSerif-TOsF/sb/scit
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t2b
}{}
@@ -156,6 +105,14 @@
<-> alias * LibertinusSerif-TOsF/sb/it
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
+}{}
+
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{sl}{
<-> ssub * LibertinusSerif-TOsF/sb/it
}{}
@@ -164,39 +121,82 @@
<-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+
+% ---- m = regular ----
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2b
+}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
+}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t2b
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scsl
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{it}{
<-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{n}{
- <-> ssub * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scsl
}{}
\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{scit}{
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{LibertinusSerif-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-TOsF/b/sc
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-LF.fd
deleted file mode 100644
index c2f0cea29b7..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index c2b632583c7..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 4aad9b7b211..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index e87af08ba80..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index 05d22180f04..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifInitials-TLF.fd
deleted file mode 100644
index 217efac00f6..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2BLibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2BLibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2B/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2B}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2B}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-t2b
-}{}
-
-\DeclareFontShape{T2B}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusMono-TLF.fd
new file mode 100644
index 00000000000..4ffdf5330dd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusMono-TLF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/09/22
+%%
+\ProvidesFile{T2CLibertinusMono-TLF.fd}
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusMono-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 LibertinusMono@scale\endcsname\relax
+ \let\LibertinusMono@@scale\@empty
+\else
+ \edef\LibertinusMono@@scale{s*[\csname LibertinusMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{LibertinusMono-TLF}{\hyphenchar\font=-1}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T2C}{LibertinusMono-TLF}{m}{n}{
+ <-> \LibertinusMono@@scale LibertinusMono-Regular-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusMono-TLF}{regular}{n}{
+ <-> alias * LibertinusMono-TLF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-LF.fd
index b7b73fa3ed4..65836df9174 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,6 @@
\DeclareFontFamily{T2C}{LibertinusSans-LF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{scsl}{
- <-> alias * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{sc}{
- <-> alias * LibertinusSans-LF/b/sc
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{scit}{
- <-> ssub * LibertinusSans-LF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{scit}{
- <-> ssub * LibertinusSans-LF/bold/scsl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{T2C}{LibertinusSans-LF}{m}{n}{
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{n}{
- <-> ssub * LibertinusSans-LF/b/n
+\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{sc}{
+ <-> alias * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{sc}{
- <-> ssub * LibertinusSans-LF/b/sc
+\DeclareFontShape{T2C}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{scit}{
- <-> ssub * LibertinusSans-LF/b/scit
+\DeclareFontShape{T2C}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{sc}{
+ <-> ssub * LibertinusSans-LF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{scsl}{
- <-> ssub * LibertinusSans-LF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSans-LF}{bx}{n}{
+ <-> ssub * LibertinusSans-LF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-OsF.fd
index 5a14b62fd88..74558f20c67 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,6 @@
\DeclareFontFamily{T2C}{LibertinusSans-OsF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{scsl}{
- <-> alias * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{n}{
- <-> alias * LibertinusSans-OsF/b/n
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{sc}{
- <-> alias * LibertinusSans-OsF/b/sc
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{scit}{
- <-> ssub * LibertinusSans-OsF/bold/scsl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{scit}{
@@ -81,12 +30,12 @@
<-> alias * LibertinusSans-OsF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{regular}{it}{
- <-> alias * LibertinusSans-OsF/m/it
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{regular}{sc}{
+ <-> alias * LibertinusSans-OsF/m/sc
}{}
\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{n}{
@@ -97,12 +46,12 @@
<-> alias * LibertinusSans-OsF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{regular}{sc}{
- <-> alias * LibertinusSans-OsF/m/sc
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{regular}{it}{
+ <-> alias * LibertinusSans-OsF/m/it
}{}
\DeclareFontShape{T2C}{LibertinusSans-OsF}{m}{scsl}{
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{n}{
- <-> ssub * LibertinusSans-OsF/b/n
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-OsF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{n}{
+ <-> alias * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{sc}{
- <-> ssub * LibertinusSans-OsF/b/sc
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{bold}{sc}{
+ <-> alias * LibertinusSans-OsF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{n}{
+ <-> ssub * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{scit}{
- <-> ssub * LibertinusSans-OsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSans-OsF}{bx}{sc}{
+ <-> ssub * LibertinusSans-OsF/b/sc
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-Sup.fd
index 0ec106c58a7..1e79ce917c5 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSans-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSans-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-sup-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{bold}{sl}{
- <-> alias * LibertinusSans-Sup/b/sl
-}{}
-
\DeclareFontShape{T2C}{LibertinusSans-Sup}{b}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Bold-sup-t2c
}{}
@@ -38,14 +30,6 @@
<-> alias * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{b}{it}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{bold}{it}{
- <-> ssub * LibertinusSans-Sup/bold/sl
-}{}
-
% ---- m = regular ----
@@ -80,12 +64,4 @@
<-> ssub * LibertinusSans-Sup/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{bx}{sl}{
- <-> ssub * LibertinusSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-Sup}{bx}{it}{
- <-> ssub * LibertinusSans-Sup/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TLF.fd
index c6f519ce4da..57706057c4c 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,27 @@
\DeclareFontFamily{T2C}{LibertinusSans-TLF}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{regular}{sc}{
- <-> alias * LibertinusSans-TLF/m/sc
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{sc}{
+ <-> alias * LibertinusSans-TLF/b/sc
}{}
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{n}{
+ <-> alias * LibertinusSans-TLF/b/n
+}{}
+
+
+% ---- m = regular ----
+
\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-t2c
}{}
@@ -38,12 +49,12 @@
<-> alias * LibertinusSans-TLF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t2c
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tlf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{regular}{it}{
- <-> alias * LibertinusSans-TLF/m/it
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{regular}{sc}{
+ <-> alias * LibertinusSans-TLF/m/sc
}{}
\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{scit}{
@@ -54,6 +65,14 @@
<-> alias * LibertinusSans-TLF/m/scit
}{}
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSans-TLF}{regular}{it}{
+ <-> alias * LibertinusSans-TLF/m/it
+}{}
+
\DeclareFontShape{T2C}{LibertinusSans-TLF}{m}{scsl}{
<-> ssub * LibertinusSans-TLF/m/scit
}{}
@@ -71,81 +90,14 @@
}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{scsl}{
- <-> alias * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{sc}{
- <-> alias * LibertinusSans-TLF/b/sc
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{n}{
- <-> alias * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{b}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bold}{scit}{
- <-> ssub * LibertinusSans-TLF/bold/scsl
-}{}
-
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{sc}{
<-> ssub * LibertinusSans-TLF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{n}{
<-> ssub * LibertinusSans-TLF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TLF}{bx}{scit}{
- <-> ssub * LibertinusSans-TLF/b/scit
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TOsF.fd
index 9ccbe774444..0752edeb1fe 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,59 +20,24 @@
\DeclareFontFamily{T2C}{LibertinusSans-TOsF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{sc}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{sc}{
- <-> alias * LibertinusSans-TOsF/b/sc
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{n}{
- <-> alias * LibertinusSans-TOsF/b/n
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{scsl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{scsl}{
- <-> alias * LibertinusSans-TOsF/b/scsl
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{regular}{n}{
+ <-> alias * LibertinusSans-TOsF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{scit}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{scit}{
- <-> ssub * LibertinusSans-TOsF/bold/scsl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSans-TOsF/m/scit
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{sc}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-sc-t2c
}{}
@@ -81,14 +46,6 @@
<-> alias * LibertinusSans-TOsF/m/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-tosf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{regular}{n}{
- <-> alias * LibertinusSans-TOsF/m/n
-}{}
-
\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-t2c
}{}
@@ -97,14 +54,6 @@
<-> alias * LibertinusSans-TOsF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{scit}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-tosf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{regular}{scit}{
- <-> alias * LibertinusSans-TOsF/m/scit
-}{}
-
\DeclareFontShape{T2C}{LibertinusSans-TOsF}{m}{scsl}{
<-> ssub * LibertinusSans-TOsF/m/scit
}{}
@@ -122,30 +71,33 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{sc}{
- <-> ssub * LibertinusSans-TOsF/b/sc
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{sc}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{n}{
- <-> ssub * LibertinusSans-TOsF/b/n
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{scsl}{
- <-> ssub * LibertinusSans-TOsF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bold}{n}{
+ <-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{sc}{
+ <-> ssub * LibertinusSans-TOsF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{scit}{
- <-> ssub * LibertinusSans-TOsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSans-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSans-TOsF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-LF.fd
index cec46eb7fbb..21cd0e6a545 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,59 @@
\DeclareFontFamily{T2C}{LibertinusSerif-LF}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{n}{
- <-> alias * LibertinusSerif-LF/m/n
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{n}{
+ <-> alias * LibertinusSerif-LF/sb/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{scit}{
- <-> alias * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{it}{
- <-> alias * LibertinusSerif-LF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-LF/sb/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{sc}{
- <-> alias * LibertinusSerif-LF/m/sc
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{it}{
+ <-> alias * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{sl}{
- <-> ssub * LibertinusSerif-LF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-LF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{sl}{
- <-> ssub * LibertinusSerif-LF/regular/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-LF/semibold/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{scsl}{
- <-> ssub * LibertinusSerif-LF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-LF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-LF/regular/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-LF/semibold/it
}{}
% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{sc}{
- <-> alias * LibertinusSerif-LF/b/sc
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-t2c
}{}
@@ -89,14 +81,6 @@
<-> alias * LibertinusSerif-LF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{n}{
- <-> alias * LibertinusSerif-LF/b/n
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{scit}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-sc-t2c
}{}
@@ -105,12 +89,20 @@
<-> alias * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{sl}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{sl}{
- <-> ssub * LibertinusSerif-LF/bold/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{sc}{
+ <-> alias * LibertinusSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{n}{
+ <-> alias * LibertinusSerif-LF/b/n
}{}
\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{scsl}{
@@ -121,82 +113,90 @@
<-> ssub * LibertinusSerif-LF/bold/scit
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{b}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/it
+}{}
-% ---- sb = semibold ----
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-LF/bold/it
+}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-sc-t2c
+
+% ---- m = regular ----
+
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{sc}{
- <-> alias * LibertinusSerif-LF/sb/sc
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{n}{
+ <-> alias * LibertinusSerif-LF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{it}{
- <-> alias * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{scit}{
+ <-> alias * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-lf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-lf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{scit}{
- <-> alias * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{sc}{
+ <-> alias * LibertinusSerif-LF/m/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-lf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-lf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{n}{
- <-> alias * LibertinusSerif-LF/sb/n
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{it}{
+ <-> alias * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{sl}{
- <-> ssub * LibertinusSerif-LF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-LF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-LF/semibold/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-LF/regular/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-LF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{m}{sl}{
+ <-> ssub * LibertinusSerif-LF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-LF/semibold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-LF/regular/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{it}{
- <-> ssub * LibertinusSerif-LF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{n}{
+ <-> ssub * LibertinusSerif-LF/b/n
}{}
\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{scit}{
<-> ssub * LibertinusSerif-LF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{n}{
- <-> ssub * LibertinusSerif-LF/b/n
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{scsl}{
<-> ssub * LibertinusSerif-LF/b/scsl
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{sc}{
- <-> ssub * LibertinusSerif-LF/b/sc
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{it}{
+ <-> ssub * LibertinusSerif-LF/b/it
}{}
\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{sl}{
<-> ssub * LibertinusSerif-LF/b/sl
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-LF}{bx}{sc}{
+ <-> ssub * LibertinusSerif-LF/b/sc
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-OsF.fd
index 6a9738dfa22..284730fa4e8 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,175 +20,175 @@
\DeclareFontFamily{T2C}{LibertinusSerif-OsF}{}
-% ---- b = bold ----
+% ---- m = regular ----
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{sc}{
- <-> alias * LibertinusSerif-OsF/b/sc
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{scit}{
- <-> alias * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-OsF/m/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{n}{
+ <-> alias * LibertinusSerif-OsF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{it}{
+ <-> alias * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/regular/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-OsF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/bold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-OsF/regular/it
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{sc}{
- <-> alias * LibertinusSerif-OsF/m/sc
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{it}{
- <-> alias * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-OsF/sb/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{n}{
- <-> alias * LibertinusSerif-OsF/m/n
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{scit}{
- <-> alias * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-OsF/sb/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{sl}{
- <-> ssub * LibertinusSerif-OsF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-OsF/regular/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-OsF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-OsF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-OsF/regular/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-OsF/sb/sc
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{n}{
- <-> alias * LibertinusSerif-OsF/sb/n
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-OsF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-OsF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-OsF/semibold/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/bold/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-OsF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-OsF/semibold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{it}{
- <-> ssub * LibertinusSerif-OsF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-OsF/b/scsl
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{scit}{
- <-> ssub * LibertinusSerif-OsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-OsF/b/it
}{}
\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{n}{
<-> ssub * LibertinusSerif-OsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-OsF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-OsF/b/scit
}{}
\DeclareFontShape{T2C}{LibertinusSerif-OsF}{bx}{sl}{
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-Sup.fd
index b05bbead11e..031ba1720db 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSerif-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerif-Sup.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSerif-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -47,62 +47,66 @@
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{n}{
- <-> alias * LibertinusSerif-Sup/b/n
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{it}{
+ <-> alias * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{it}{
- <-> alias * LibertinusSerif-Sup/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{n}{
+ <-> alias * LibertinusSerif-Sup/sb/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{sl}{
- <-> ssub * LibertinusSerif-Sup/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{sl}{
+ <-> ssub * LibertinusSerif-Sup/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{sl}{
- <-> ssub * LibertinusSerif-Sup/bold/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-sup-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-sup-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{it}{
- <-> alias * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{it}{
+ <-> alias * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-sup-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-sup-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{n}{
- <-> alias * LibertinusSerif-Sup/sb/n
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{n}{
+ <-> alias * LibertinusSerif-Sup/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{sb}{sl}{
- <-> ssub * LibertinusSerif-Sup/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{b}{sl}{
+ <-> ssub * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{semibold}{sl}{
- <-> ssub * LibertinusSerif-Sup/semibold/it
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bold}{sl}{
+ <-> ssub * LibertinusSerif-Sup/bold/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bx}{n}{
+ <-> ssub * LibertinusSerif-Sup/b/n
+}{}
+
\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bx}{sl}{
<-> ssub * LibertinusSerif-Sup/b/sl
}{}
@@ -111,8 +115,4 @@
<-> ssub * LibertinusSerif-Sup/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-Sup}{bx}{n}{
- <-> ssub * LibertinusSerif-Sup/b/n
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TLF.fd
index 2859d534551..09408904d01 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,65 +20,14 @@
\DeclareFontFamily{T2C}{LibertinusSerif-TLF}{}
-% ---- sb = semibold ----
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TLF/sb/scit
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TLF/sb/sc
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TLF/sb/scit
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/semibold/scit
-}{}
-
-
% ---- m = regular ----
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{it}{
- <-> alias * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{n}{
+ <-> alias * LibertinusSerif-TLF/m/n
}{}
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{scit}{
@@ -89,14 +38,6 @@
<-> alias * LibertinusSerif-TLF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{n}{
- <-> alias * LibertinusSerif-TLF/m/n
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{sc}{
<-> \LibertinusSerif@@scale LibertinusSerif-Regular-tlf-sc-t2c
}{}
@@ -105,12 +46,12 @@
<-> alias * LibertinusSerif-TLF/m/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{sl}{
- <-> ssub * LibertinusSerif-TLF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tlf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TLF/regular/it
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{it}{
+ <-> alias * LibertinusSerif-TLF/m/it
}{}
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{scsl}{
@@ -121,6 +62,14 @@
<-> ssub * LibertinusSerif-TLF/regular/scit
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TLF/m/it
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TLF/regular/it
+}{}
+
% ---- b = bold ----
@@ -140,6 +89,14 @@
<-> alias * LibertinusSerif-TLF/b/scit
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TLF/b/sc
+}{}
+
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{it}{
<-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-t2c
}{}
@@ -148,12 +105,12 @@
<-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bold}{sc}{
- <-> alias * LibertinusSerif-TLF/b/sc
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/bold/scit
}{}
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{sl}{
@@ -164,39 +121,82 @@
<-> ssub * LibertinusSerif-TLF/bold/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scit
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TLF/bold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TLF/sb/scit
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TLF/sb/sc
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/sb/scit
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
+}{}
+
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/sl
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{scit}{
+ <-> ssub * LibertinusSerif-TLF/b/scit
}{}
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{sc}{
<-> ssub * LibertinusSerif-TLF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{scsl}{
- <-> ssub * LibertinusSerif-TLF/b/scsl
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/sl
}{}
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{n}{
<-> ssub * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{scit}{
- <-> ssub * LibertinusSerif-TLF/b/scit
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{it}{
<-> ssub * LibertinusSerif-TLF/b/it
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-TLF}{bx}{scsl}{
+ <-> ssub * LibertinusSerif-TLF/b/scsl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TOsF.fd
index d1c799135c8..6672738dff5 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{T2CLibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for T2C/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,173 +20,177 @@
\DeclareFontFamily{T2C}{LibertinusSerif-TOsF}{}
-% ---- sb = semibold ----
+% ---- m = regular ----
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{sc}{
- <-> alias * LibertinusSerif-TOsF/sb/sc
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{it}{
+ <-> alias * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{n}{
- <-> alias * LibertinusSerif-TOsF/sb/n
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{scit}{
+ <-> alias * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{scit}{
- <-> alias * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{sc}{
+ <-> alias * LibertinusSerif-TOsF/m/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{n}{
+ <-> alias * LibertinusSerif-TOsF/m/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TOsF/sb/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/m/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/sb/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/m/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/semibold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/regular/it
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TOsF/sb/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{scit}{
- <-> alias * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{n}{
- <-> alias * LibertinusSerif-TOsF/b/n
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/sb/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{sc}{
- <-> alias * LibertinusSerif-TOsF/b/sc
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TOsF/bold/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/b/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/sb/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/bold/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/semibold/it
}{}
-% ---- m = regular ----
+% ---- b = bold ----
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{sc}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{n}{
- <-> alias * LibertinusSerif-TOsF/m/n
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{sc}{
+ <-> alias * LibertinusSerif-TOsF/b/sc
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{scit}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{scit}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-sc-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{scit}{
- <-> alias * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{scit}{
+ <-> alias * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Italic-tosf-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{it}{
- <-> alias * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{n}{
+ <-> alias * LibertinusSerif-TOsF/b/n
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{sc}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Regular-tosf-sc-t2c
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-t2c
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{sc}{
- <-> alias * LibertinusSerif-TOsF/m/sc
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{sl}{
- <-> ssub * LibertinusSerif-TOsF/m/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{sl}{
- <-> ssub * LibertinusSerif-TOsF/regular/it
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{scsl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{m}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/m/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{regular}{scsl}{
- <-> ssub * LibertinusSerif-TOsF/regular/scit
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/bold/it
}{}
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSerif-TOsF/b/sl
-}{}
-
\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{sc}{
<-> ssub * LibertinusSerif-TOsF/b/sc
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-TOsF/b/sl
+}{}
+
\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{scsl}{
<-> ssub * LibertinusSerif-TOsF/b/scsl
}{}
+\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TOsF/b/it
+}{}
+
\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{n}{
<-> ssub * LibertinusSerif-TOsF/b/n
}{}
@@ -195,8 +199,4 @@
<-> ssub * LibertinusSerif-TOsF/b/scit
}{}
-\DeclareFontShape{T2C}{LibertinusSerif-TOsF}{bx}{it}{
- <-> ssub * LibertinusSerif-TOsF/b/it
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-LF.fd
deleted file mode 100644
index 76a2621167d..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index b8fd91ab984..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-Sup.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-Sup.fd
deleted file mode 100644
index 49ccd52ed64..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-Sup.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifDisplay-Sup.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifDisplay-Sup}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-Sup}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-sup-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-Sup}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-Sup/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index c87ad846a03..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index ddbafaf8d8a..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifInitials-TLF.fd
deleted file mode 100644
index 022bc9059a2..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/T2CLibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{T2CLibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for T2C/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T2C}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{T2C}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-t2c
-}{}
-
-\DeclareFontShape{T2C}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusMono-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusMono-TLF.fd
index c2a92fbe304..0ac2b3b4f9c 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusMono-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusMono-TLF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusMono-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{TS1}{LibertinusMono-TLF}{\hyphenchar\font=-1}
-% ---- b = bold ----
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{b}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-BoldOblique-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bold}{sl}{
- <-> alias * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{b}{n}{
- <-> \LibertinusMono@@scale LibertinusMono-Bold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bold}{n}{
- <-> alias * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{b}{it}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bold}{it}{
- <-> ssub * LibertinusMono-TLF/bold/sl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{TS1}{LibertinusMono-TLF}{m}{n}{
@@ -57,35 +30,7 @@
<-> alias * LibertinusMono-TLF/m/n
}{}
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{m}{sl}{
- <-> \LibertinusMono@@scale LibertinusMono-Oblique-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{regular}{sl}{
- <-> alias * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{m}{it}{
- <-> ssub * LibertinusMono-TLF/m/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{regular}{it}{
- <-> ssub * LibertinusMono-TLF/regular/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bx}{it}{
- <-> ssub * LibertinusMono-TLF/b/it
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bx}{n}{
- <-> ssub * LibertinusMono-TLF/b/n
-}{}
-
-\DeclareFontShape{TS1}{LibertinusMono-TLF}{bx}{sl}{
- <-> ssub * LibertinusMono-TLF/b/sl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-LF.fd
index 31df8f6be77..e8e5f46bceb 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSans-LF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSans-LF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSans-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,35 +20,16 @@
\DeclareFontFamily{TS1}{LibertinusSans-LF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{TS1}{LibertinusSans-LF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-LF}{bold}{sl}{
- <-> alias * LibertinusSans-LF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-LF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-LF}{bold}{n}{
- <-> alias * LibertinusSans-LF/b/n
-}{}
+% ---- m = regular ----
-\DeclareFontShape{TS1}{LibertinusSans-LF}{b}{it}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{TS1}{LibertinusSans-LF}{m}{it}{
+ <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSans-LF}{bold}{it}{
- <-> ssub * LibertinusSans-LF/bold/sl
+\DeclareFontShape{TS1}{LibertinusSans-LF}{regular}{it}{
+ <-> alias * LibertinusSans-LF/m/it
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{TS1}{LibertinusSans-LF}{m}{n}{
<-> \LibertinusSans@@scale LibertinusSans-Regular-lf-ts1
}{}
@@ -57,14 +38,6 @@
<-> alias * LibertinusSans-LF/m/n
}{}
-\DeclareFontShape{TS1}{LibertinusSans-LF}{m}{it}{
- <-> \LibertinusSans@@scale LibertinusSans-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-LF}{regular}{it}{
- <-> alias * LibertinusSans-LF/m/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSans-LF}{m}{sl}{
<-> ssub * LibertinusSans-LF/m/it
}{}
@@ -74,16 +47,19 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSans-LF}{bx}{it}{
- <-> ssub * LibertinusSans-LF/b/it
+\DeclareFontShape{TS1}{LibertinusSans-LF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-lf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSans-LF}{bx}{sl}{
- <-> ssub * LibertinusSans-LF/b/sl
+\DeclareFontShape{TS1}{LibertinusSans-LF}{bold}{n}{
+ <-> alias * LibertinusSans-LF/b/n
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{TS1}{LibertinusSans-LF}{bx}{n}{
<-> ssub * LibertinusSans-LF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-OsF.fd
index 7f012e77dab..d51210d6357 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSans-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSans-OsF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- m = regular ----
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{m}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{regular}{n}{
- <-> alias * LibertinusSans-OsF/m/n
-}{}
-
\DeclareFontShape{TS1}{LibertinusSans-OsF}{m}{it}{
<-> \LibertinusSans@@scale LibertinusSans-Italic-osf-ts1
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSans-OsF/m/it
}{}
+\DeclareFontShape{TS1}{LibertinusSans-OsF}{m}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSans-OsF}{regular}{n}{
+ <-> alias * LibertinusSans-OsF/m/n
+}{}
+
\DeclareFontShape{TS1}{LibertinusSans-OsF}{m}{sl}{
<-> ssub * LibertinusSans-OsF/m/it
}{}
@@ -57,35 +57,11 @@
<-> alias * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{bold}{sl}{
- <-> alias * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{b}{it}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{bold}{it}{
- <-> ssub * LibertinusSans-OsF/bold/sl
-}{}
-
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{bx}{it}{
- <-> ssub * LibertinusSans-OsF/b/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSans-OsF}{bx}{n}{
<-> ssub * LibertinusSans-OsF/b/n
}{}
-\DeclareFontShape{TS1}{LibertinusSans-OsF}{bx}{sl}{
- <-> ssub * LibertinusSans-OsF/b/sl
-}{}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TLF.fd
index 61e2f2cea9c..07f719efac2 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSans-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSans-TLF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSans-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{TS1}{LibertinusSans-TLF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{bold}{sl}{
- <-> alias * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{bold}{n}{
- <-> alias * LibertinusSans-TLF/b/n
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{b}{it}{
- <-> ssub * LibertinusSans-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{bold}{it}{
- <-> ssub * LibertinusSans-TLF/bold/sl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{TS1}{LibertinusSans-TLF}{m}{n}{
@@ -74,16 +47,19 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{bx}{it}{
- <-> ssub * LibertinusSans-TLF/b/it
+\DeclareFontShape{TS1}{LibertinusSans-TLF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSans-TLF}{bx}{sl}{
- <-> ssub * LibertinusSans-TLF/b/sl
+\DeclareFontShape{TS1}{LibertinusSans-TLF}{bold}{n}{
+ <-> alias * LibertinusSans-TLF/b/n
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{TS1}{LibertinusSans-TLF}{bx}{n}{
<-> ssub * LibertinusSans-TLF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TOsF.fd
index ac6407d56ec..ac4da99f41e 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSans-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSans-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSans-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{TS1}{LibertinusSans-TOsF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{b}{sl}{
- <-> \LibertinusSans@@scale LibertinusSans-BoldOblique-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bold}{sl}{
- <-> alias * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{b}{n}{
- <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bold}{n}{
- <-> alias * LibertinusSans-TOsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{b}{it}{
- <-> ssub * LibertinusSans-TOsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bold}{it}{
- <-> ssub * LibertinusSans-TOsF/bold/sl
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{TS1}{LibertinusSans-TOsF}{m}{n}{
@@ -74,18 +47,21 @@
}{}
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bx}{it}{
- <-> ssub * LibertinusSans-TOsF/b/it
+\DeclareFontShape{TS1}{LibertinusSans-TOsF}{b}{n}{
+ <-> \LibertinusSans@@scale LibertinusSans-Bold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bx}{n}{
- <-> ssub * LibertinusSans-TOsF/b/n
+\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bold}{n}{
+ <-> alias * LibertinusSans-TOsF/b/n
}{}
-\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bx}{sl}{
- <-> ssub * LibertinusSans-TOsF/b/sl
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{LibertinusSans-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSans-TOsF/b/n
}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-LF.fd
index 57a9bde0b0e..9ca671dbe96 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSerif-LF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerif-LF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSerif-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -49,14 +49,6 @@
% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSerif-LF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-LF}{bold}{it}{
- <-> alias * LibertinusSerif-LF/b/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-LF}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-lf-ts1
}{}
@@ -65,6 +57,14 @@
<-> alias * LibertinusSerif-LF/b/n
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-LF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-LF}{bold}{it}{
+ <-> alias * LibertinusSerif-LF/b/it
+}{}
+
\DeclareFontShape{TS1}{LibertinusSerif-LF}{b}{sl}{
<-> ssub * LibertinusSerif-LF/b/it
}{}
@@ -103,10 +103,6 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{TS1}{LibertinusSerif-LF}{bx}{sl}{
- <-> ssub * LibertinusSerif-LF/b/sl
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-LF}{bx}{it}{
<-> ssub * LibertinusSerif-LF/b/it
}{}
@@ -115,4 +111,8 @@
<-> ssub * LibertinusSerif-LF/b/n
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-LF}{bx}{sl}{
+ <-> ssub * LibertinusSerif-LF/b/sl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-OsF.fd
index a44478f9e7d..4958192fa88 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSerif-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerif-OsF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSerif-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,6 @@
\DeclareFontFamily{TS1}{LibertinusSerif-OsF}{}
-% ---- b = bold ----
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{n}{
- <-> alias * LibertinusSerif-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{it}{
- <-> alias * LibertinusSerif-OsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{sl}{
- <-> ssub * LibertinusSerif-OsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{sl}{
- <-> ssub * LibertinusSerif-OsF/bold/it
-}{}
-
-
% ---- m = regular ----
\DeclareFontShape{TS1}{LibertinusSerif-OsF}{m}{n}{
@@ -76,14 +49,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{semibold}{it}{
- <-> alias * LibertinusSerif-OsF/sb/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-OsF}{sb}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-osf-ts1
}{}
@@ -92,6 +57,14 @@
<-> alias * LibertinusSerif-OsF/sb/n
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-OsF/sb/it
+}{}
+
\DeclareFontShape{TS1}{LibertinusSerif-OsF}{sb}{sl}{
<-> ssub * LibertinusSerif-OsF/sb/it
}{}
@@ -101,18 +74,45 @@
}{}
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{it}{
+ <-> alias * LibertinusSerif-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{n}{
+ <-> alias * LibertinusSerif-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{b}{sl}{
+ <-> ssub * LibertinusSerif-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-OsF/bold/it
+}{}
+
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bx}{it}{
<-> ssub * LibertinusSerif-OsF/b/it
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bx}{n}{
- <-> ssub * LibertinusSerif-OsF/b/n
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bx}{sl}{
<-> ssub * LibertinusSerif-OsF/b/sl
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-OsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-OsF/b/n
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TLF.fd
index e055ddc164e..15b33224f5d 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSerif-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerif-TLF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSerif-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -47,57 +47,57 @@
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{it}{
- <-> alias * LibertinusSerif-TLF/b/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-ts1
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{n}{
- <-> alias * LibertinusSerif-TLF/b/n
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{n}{
+ <-> alias * LibertinusSerif-TLF/sb/n
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{sl}{
- <-> ssub * LibertinusSerif-TLF/b/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{sl}{
+ <-> ssub * LibertinusSerif-TLF/sb/it
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{sl}{
- <-> ssub * LibertinusSerif-TLF/bold/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/semibold/it
}{}
-% ---- sb = semibold ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tlf-ts1
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{it}{
- <-> alias * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{it}{
+ <-> alias * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{n}{
- <-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tlf-ts1
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{n}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-Bold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{n}{
- <-> alias * LibertinusSerif-TLF/sb/n
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{n}{
+ <-> alias * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{sb}{sl}{
- <-> ssub * LibertinusSerif-TLF/sb/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{b}{sl}{
+ <-> ssub * LibertinusSerif-TLF/b/it
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{semibold}{sl}{
- <-> ssub * LibertinusSerif-TLF/semibold/it
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bold}{sl}{
+ <-> ssub * LibertinusSerif-TLF/bold/it
}{}
@@ -107,12 +107,12 @@
<-> ssub * LibertinusSerif-TLF/b/n
}{}
-\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bx}{it}{
- <-> ssub * LibertinusSerif-TLF/b/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bx}{sl}{
<-> ssub * LibertinusSerif-TLF/b/sl
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-TLF}{bx}{it}{
+ <-> ssub * LibertinusSerif-TLF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TOsF.fd
index 4ca20bd9260..831c4cab254 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2022/11/07
+%% Generated by autoinst on 2024/09/22
%%
\ProvidesFile{TS1LibertinusSerif-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerif-TOsF.]
+ [2024/09/22 (autoinst) Font definitions for TS1/LibertinusSerif-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{sb}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{semibold}{it}{
- <-> alias * LibertinusSerif-TOsF/sb/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{sb}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Semibold-tosf-ts1
}{}
@@ -38,6 +30,14 @@
<-> alias * LibertinusSerif-TOsF/sb/n
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{sb}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-SemiboldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{semibold}{it}{
+ <-> alias * LibertinusSerif-TOsF/sb/it
+}{}
+
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{sb}{sl}{
<-> ssub * LibertinusSerif-TOsF/sb/it
}{}
@@ -49,14 +49,6 @@
% ---- b = bold ----
-\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{b}{it}{
- <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bold}{it}{
- <-> alias * LibertinusSerif-TOsF/b/it
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{b}{n}{
<-> \LibertinusSerif@@scale LibertinusSerif-Bold-tosf-ts1
}{}
@@ -65,6 +57,14 @@
<-> alias * LibertinusSerif-TOsF/b/n
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{b}{it}{
+ <-> \LibertinusSerif@@scale LibertinusSerif-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bold}{it}{
+ <-> alias * LibertinusSerif-TOsF/b/it
+}{}
+
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{b}{sl}{
<-> ssub * LibertinusSerif-TOsF/b/it
}{}
@@ -103,14 +103,14 @@
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bx}{n}{
- <-> ssub * LibertinusSerif-TOsF/b/n
-}{}
-
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bx}{it}{
<-> ssub * LibertinusSerif-TOsF/b/it
}{}
+\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bx}{n}{
+ <-> ssub * LibertinusSerif-TOsF/b/n
+}{}
+
\DeclareFontShape{TS1}{LibertinusSerif-TOsF}{bx}{sl}{
<-> ssub * LibertinusSerif-TOsF/b/sl
}{}
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd
deleted file mode 100644
index a0a7969b5ee..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-LF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{TS1LibertinusSerifDisplay-LF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibertinusSerifDisplay-LF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-LF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-LF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-LF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd
deleted file mode 100644
index c5054d35c07..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-OsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{TS1LibertinusSerifDisplay-OsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibertinusSerifDisplay-OsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-OsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-OsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-OsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd
deleted file mode 100644
index df70e220c08..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{TS1LibertinusSerifDisplay-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibertinusSerifDisplay-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-TLF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-TLF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd
deleted file mode 100644
index f7248d4a802..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifDisplay-TOsF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{TS1LibertinusSerifDisplay-TOsF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerifDisplay-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 LibertinusSerifDisplay@scale\endcsname\relax
- \let\LibertinusSerifDisplay@@scale\@empty
-\else
- \edef\LibertinusSerifDisplay@@scale{s*[\csname LibertinusSerifDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibertinusSerifDisplay-TOsF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-TOsF}{m}{n}{
- <-> \LibertinusSerifDisplay@@scale LibertinusSerifDisplay-Regular-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerifDisplay-TOsF}{regular}{n}{
- <-> alias * LibertinusSerifDisplay-TOsF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifInitials-TLF.fd b/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifInitials-TLF.fd
deleted file mode 100644
index c1f580b71ef..00000000000
--- a/Master/texmf-dist/tex/latex/libertinus-type1/TS1LibertinusSerifInitials-TLF.fd
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Generated by autoinst on 2022/11/07
-%%
-\ProvidesFile{TS1LibertinusSerifInitials-TLF.fd}
- [2022/11/07 (autoinst) Font definitions for TS1/LibertinusSerifInitials-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 LibertinusSerifInitials@scale\endcsname\relax
- \let\LibertinusSerifInitials@@scale\@empty
-\else
- \edef\LibertinusSerifInitials@@scale{s*[\csname LibertinusSerifInitials@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{LibertinusSerifInitials-TLF}{}
-
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{LibertinusSerifInitials-TLF}{m}{n}{
- <-> \LibertinusSerifInitials@@scale LibertinusSerifInitials-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{LibertinusSerifInitials-TLF}{regular}{n}{
- <-> alias * LibertinusSerifInitials-TLF/m/n
-}{}
-
-
-% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty b/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty
index 701a702771b..0ace2a84ef8 100644
--- a/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty
+++ b/Master/texmf-dist/tex/latex/libertinus-type1/libertinus-type1.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{libertinus-type1}[%
- 2023/06/23 (Bob Tennent) Supports libertinus fonts for latex/pdflatex.]
+ 2024/09/22 (Bob Tennent) Supports libertinus fonts for latex/pdflatex.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
\newif\iflibertinus@otf
@@ -137,10 +137,8 @@ use libertinus.sty or libertinus-otf.sty.\MessageBreak
\fi}
\newcommand*\LibertinusSerif@scale{1}
-\newcommand*\LibertinusSerifDisplayT@scale{1}
\newcommand*\LibertinusSans@scale{1}
\newcommand*\LibertinusMono@scale{0.85} % cf. MatchLowerCase
-\newcommand*\LibertinusSerifInitials@scale{1}
\DeclareOptionX{ScaleRM}{\renewcommand*{\LibertinusSerif@scale}{#1}}
\DeclareOptionX{ScaleSF}{\renewcommand*{\LibertinusSans@scale}{#1}}
\DeclareOptionX{ScaleTT}{\renewcommand*{\LibertinusMono@scale}{#1}}
@@ -198,9 +196,6 @@ use libertinus.sty or libertinus-otf.sty.\MessageBreak
\def\LibertinusSansTLF{\fontfamily{LibertinusSans-TLF}\selectfont}
\def\LibertinusSansLF{\fontfamily{LibertinusSans-LF}\selectfont}
\def\LibertinusMono{\fontfamily{LibertinusMono-TLF}\selectfont}
-\def\Libertinusinitials{\fontfamily{LibertinusSerifInitials-\libertinusserif@figurealign\libertinusserif@figurestyle}\selectfont}
-\def\LibertinusInitials{\fontfamily{LibertinusSerifInitials-\libertinusserif@figurealign\libertinusserif@figurestyle}\selectfont}
-\def\LibertinusDisplay{\fontfamily{LibertinusSerifDisplay-\libertinusserif@figurealign\libertinusserif@figurestyle}\selectfont}
\def\LibertinusKeyboard{\fontfamily{LibertinusKeyboard-TLF}\selectfont}
\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
diff --git a/Master/texmf-dist/tex/latex/libris/libris.sty b/Master/texmf-dist/tex/latex/libris/libris.sty
index 9dc634b3b42..4f1fa147786 100644
--- a/Master/texmf-dist/tex/latex/libris/libris.sty
+++ b/Master/texmf-dist/tex/latex/libris/libris.sty
@@ -1,23 +1,54 @@
-%% Copyright 2008 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `libris.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% librisadf.dtx (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% librisadf. You may however distribute the package librisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{libris}[2008/12/13 v1.0 libris]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[libris.sty]{$Id: librisadf.dtx 10402 2024-09-27 02:35:48Z cfrees $}[v1.1 \revinfo]
+\DefineFileInfoSVN[libris]
\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yly}{1}%
+ \DeclareEncodingSubset{TS1}{ylyw}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { libris }
+{
+ scale .tl_set:N = \yly@scale,
+ scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[libris]
+\ExplSyntaxOff
\renewcommand{\sfdefault}{yly}
-\endinput
%% end libris.sty
+%% end libris.sty
+\endinput
+%%
+%% End of file `libris.sty'.
diff --git a/Master/texmf-dist/tex/latex/libris/t1yly.fd b/Master/texmf-dist/tex/latex/libris/t1yly.fd
index 93220b3c665..425d3fa6a33 100644
--- a/Master/texmf-dist/tex/latex/libris/t1yly.fd
+++ b/Master/texmf-dist/tex/latex/libris/t1yly.fd
@@ -5,36 +5,49 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yly.fd}
- [2010/06/27 Fontinst v1.933 font definitions for T1/yly.]
+ [2024/09/27 Fontinst v1.933 font definitions for T1/yly.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+ \let\yly@@scale\@empty
+\else
+ \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yly}{}
\DeclareFontShape{T1}{yly}{m}{n}{
- <-> ylyr8t
+ <-> \yly@@scale ylyr8t
}{}
\DeclareFontShape{T1}{yly}{m}{it}{
- <-> ylyri8t
+ <-> \yly@@scale ylyri8t
}{}
\DeclareFontShape{T1}{yly}{b}{n}{
- <-> ylyb8t
+ <-> \yly@@scale ylyb8t
}{}
\DeclareFontShape{T1}{yly}{b}{it}{
- <-> ylybi8t
+ <-> \yly@@scale ylybi8t
}{}
\DeclareFontShape{T1}{yly}{m}{sc}{<->ssub * yly/m/n}{}
-\DeclareFontShape{T1}{yly}{m}{si}{<->ssub * yly/m/it}{}
-\DeclareFontShape{T1}{yly}{m}{sl}{<->ssub * yly/m/si}{}
+\DeclareFontShape{T1}{yly}{m}{sl}{<->ssub * yly/m/it}{}
+\DeclareFontShape{T1}{yly}{m}{scsl}{<->ssub * yly/m/sl}{}
+\DeclareFontShape{T1}{yly}{m}{scit}{<->ssub * yly/m/scsl}{}
+\DeclareFontShape{T1}{yly}{m}{si}{<->ssub * yly/m/scit}{}
\DeclareFontShape{T1}{yly}{bx}{n}{<->ssub * yly/b/n}{}
\DeclareFontShape{T1}{yly}{b}{sc}{<->ssub * yly/b/n}{}
\DeclareFontShape{T1}{yly}{bx}{sc}{<->ssub * yly/b/sc}{}
\DeclareFontShape{T1}{yly}{bx}{it}{<->ssub * yly/b/it}{}
-\DeclareFontShape{T1}{yly}{b}{si}{<->ssub * yly/b/it}{}
-\DeclareFontShape{T1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
-\DeclareFontShape{T1}{yly}{b}{sl}{<->ssub * yly/b/si}{}
+\DeclareFontShape{T1}{yly}{b}{sl}{<->ssub * yly/b/it}{}
\DeclareFontShape{T1}{yly}{bx}{sl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{T1}{yly}{b}{scsl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{T1}{yly}{bx}{scsl}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{T1}{yly}{b}{scit}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{T1}{yly}{bx}{scit}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{T1}{yly}{b}{si}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{T1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libris/t1ylyw.fd b/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
index 87b4a276f18..247d8136ad7 100644
--- a/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
+++ b/Master/texmf-dist/tex/latex/libris/t1ylyw.fd
@@ -5,36 +5,49 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1ylyw.fd}
- [2010/06/27 Fontinst v1.933 font definitions for T1/ylyw.]
+ [2024/09/27 Fontinst v1.933 font definitions for T1/ylyw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+ \let\yly@@scale\@empty
+\else
+ \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{ylyw}{}
\DeclareFontShape{T1}{ylyw}{m}{n}{
- <-> ylyrw8t
+ <-> \yly@@scale ylyrw8t
}{}
\DeclareFontShape{T1}{ylyw}{m}{it}{
- <-> ylyriw8t
+ <-> \yly@@scale ylyriw8t
}{}
\DeclareFontShape{T1}{ylyw}{b}{n}{
- <-> ylybw8t
+ <-> \yly@@scale ylybw8t
}{}
\DeclareFontShape{T1}{ylyw}{b}{it}{
- <-> ylybiw8t
+ <-> \yly@@scale ylybiw8t
}{}
\DeclareFontShape{T1}{ylyw}{m}{sc}{<->ssub * ylyw/m/n}{}
-\DeclareFontShape{T1}{ylyw}{m}{si}{<->ssub * ylyw/m/it}{}
-\DeclareFontShape{T1}{ylyw}{m}{sl}{<->ssub * ylyw/m/si}{}
+\DeclareFontShape{T1}{ylyw}{m}{sl}{<->ssub * ylyw/m/it}{}
+\DeclareFontShape{T1}{ylyw}{m}{scsl}{<->ssub * ylyw/m/sl}{}
+\DeclareFontShape{T1}{ylyw}{m}{scit}{<->ssub * ylyw/m/scsl}{}
+\DeclareFontShape{T1}{ylyw}{m}{si}{<->ssub * ylyw/m/scit}{}
\DeclareFontShape{T1}{ylyw}{bx}{n}{<->ssub * ylyw/b/n}{}
\DeclareFontShape{T1}{ylyw}{b}{sc}{<->ssub * ylyw/b/n}{}
\DeclareFontShape{T1}{ylyw}{bx}{sc}{<->ssub * ylyw/b/sc}{}
\DeclareFontShape{T1}{ylyw}{bx}{it}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{T1}{ylyw}{b}{si}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{T1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
-\DeclareFontShape{T1}{ylyw}{b}{sl}{<->ssub * ylyw/b/si}{}
+\DeclareFontShape{T1}{ylyw}{b}{sl}{<->ssub * ylyw/b/it}{}
\DeclareFontShape{T1}{ylyw}{bx}{sl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{T1}{ylyw}{b}{scsl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{T1}{ylyw}{bx}{scsl}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{T1}{ylyw}{b}{scit}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{T1}{ylyw}{bx}{scit}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{T1}{ylyw}{b}{si}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{T1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libris/ts1yly.fd b/Master/texmf-dist/tex/latex/libris/ts1yly.fd
index 33c01ff57fc..e43a62bec62 100644
--- a/Master/texmf-dist/tex/latex/libris/ts1yly.fd
+++ b/Master/texmf-dist/tex/latex/libris/ts1yly.fd
@@ -5,36 +5,49 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yly.fd}
- [2010/06/27 Fontinst v1.933 font definitions for TS1/yly.]
+ [2024/09/27 Fontinst v1.933 font definitions for TS1/yly.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+ \let\yly@@scale\@empty
+\else
+ \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yly}{}
\DeclareFontShape{TS1}{yly}{m}{n}{
- <-> ylyr8c
+ <-> \yly@@scale ylyr8c
}{}
\DeclareFontShape{TS1}{yly}{m}{it}{
- <-> ylyri8c
+ <-> \yly@@scale ylyri8c
}{}
\DeclareFontShape{TS1}{yly}{b}{n}{
- <-> ylyb8c
+ <-> \yly@@scale ylyb8c
}{}
\DeclareFontShape{TS1}{yly}{b}{it}{
- <-> ylybi8c
+ <-> \yly@@scale ylybi8c
}{}
\DeclareFontShape{TS1}{yly}{m}{sc}{<->ssub * yly/m/n}{}
-\DeclareFontShape{TS1}{yly}{m}{si}{<->ssub * yly/m/it}{}
-\DeclareFontShape{TS1}{yly}{m}{sl}{<->ssub * yly/m/si}{}
+\DeclareFontShape{TS1}{yly}{m}{sl}{<->ssub * yly/m/it}{}
+\DeclareFontShape{TS1}{yly}{m}{scsl}{<->ssub * yly/m/sl}{}
+\DeclareFontShape{TS1}{yly}{m}{scit}{<->ssub * yly/m/scsl}{}
+\DeclareFontShape{TS1}{yly}{m}{si}{<->ssub * yly/m/scit}{}
\DeclareFontShape{TS1}{yly}{bx}{n}{<->ssub * yly/b/n}{}
\DeclareFontShape{TS1}{yly}{b}{sc}{<->ssub * yly/b/n}{}
\DeclareFontShape{TS1}{yly}{bx}{sc}{<->ssub * yly/b/sc}{}
\DeclareFontShape{TS1}{yly}{bx}{it}{<->ssub * yly/b/it}{}
-\DeclareFontShape{TS1}{yly}{b}{si}{<->ssub * yly/b/it}{}
-\DeclareFontShape{TS1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
-\DeclareFontShape{TS1}{yly}{b}{sl}{<->ssub * yly/b/si}{}
+\DeclareFontShape{TS1}{yly}{b}{sl}{<->ssub * yly/b/it}{}
\DeclareFontShape{TS1}{yly}{bx}{sl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{TS1}{yly}{b}{scsl}{<->ssub * yly/b/sl}{}
+\DeclareFontShape{TS1}{yly}{bx}{scsl}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{TS1}{yly}{b}{scit}{<->ssub * yly/b/scsl}{}
+\DeclareFontShape{TS1}{yly}{bx}{scit}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{TS1}{yly}{b}{si}{<->ssub * yly/b/scit}{}
+\DeclareFontShape{TS1}{yly}{bx}{si}{<->ssub * yly/b/si}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd b/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
index e1f188edabe..3611eafc32e 100644
--- a/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
+++ b/Master/texmf-dist/tex/latex/libris/ts1ylyw.fd
@@ -5,36 +5,49 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1ylyw.fd}
- [2010/06/27 Fontinst v1.933 font definitions for TS1/ylyw.]
+ [2024/09/27 Fontinst v1.933 font definitions for TS1/ylyw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yly@scale\endcsname\relax
+ \let\yly@@scale\@empty
+\else
+ \edef\yly@@scale{s*[\csname yly@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{ylyw}{}
\DeclareFontShape{TS1}{ylyw}{m}{n}{
- <-> ylyr8c
+ <-> \yly@@scale ylyr8c
}{}
\DeclareFontShape{TS1}{ylyw}{m}{it}{
- <-> ylyri8c
+ <-> \yly@@scale ylyri8c
}{}
\DeclareFontShape{TS1}{ylyw}{b}{n}{
- <-> ylyb8c
+ <-> \yly@@scale ylyb8c
}{}
\DeclareFontShape{TS1}{ylyw}{b}{it}{
- <-> ylybi8c
+ <-> \yly@@scale ylybi8c
}{}
\DeclareFontShape{TS1}{ylyw}{m}{sc}{<->ssub * ylyw/m/n}{}
-\DeclareFontShape{TS1}{ylyw}{m}{si}{<->ssub * ylyw/m/it}{}
-\DeclareFontShape{TS1}{ylyw}{m}{sl}{<->ssub * ylyw/m/si}{}
+\DeclareFontShape{TS1}{ylyw}{m}{sl}{<->ssub * ylyw/m/it}{}
+\DeclareFontShape{TS1}{ylyw}{m}{scsl}{<->ssub * ylyw/m/sl}{}
+\DeclareFontShape{TS1}{ylyw}{m}{scit}{<->ssub * ylyw/m/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{m}{si}{<->ssub * ylyw/m/scit}{}
\DeclareFontShape{TS1}{ylyw}{bx}{n}{<->ssub * ylyw/b/n}{}
\DeclareFontShape{TS1}{ylyw}{b}{sc}{<->ssub * ylyw/b/n}{}
\DeclareFontShape{TS1}{ylyw}{bx}{sc}{<->ssub * ylyw/b/sc}{}
\DeclareFontShape{TS1}{ylyw}{bx}{it}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{TS1}{ylyw}{b}{si}{<->ssub * ylyw/b/it}{}
-\DeclareFontShape{TS1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
-\DeclareFontShape{TS1}{ylyw}{b}{sl}{<->ssub * ylyw/b/si}{}
+\DeclareFontShape{TS1}{ylyw}{b}{sl}{<->ssub * ylyw/b/it}{}
\DeclareFontShape{TS1}{ylyw}{bx}{sl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{TS1}{ylyw}{b}{scsl}{<->ssub * ylyw/b/sl}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{scsl}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{b}{scit}{<->ssub * ylyw/b/scsl}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{scit}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{TS1}{ylyw}{b}{si}{<->ssub * ylyw/b/scit}{}
+\DeclareFontShape{TS1}{ylyw}{bx}{si}{<->ssub * ylyw/b/si}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf
index dc28dfa2298..1c37f1cecf7 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-acm.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-acm.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-acm.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage[rgb, x11names]{xcolor}
\definecolor{Comments}{rgb}{0.00,0.50,0.00}
diff --git a/Master/texmf-dist/tex/latex/listings/listings-bash.prf b/Master/texmf-dist/tex/latex/listings/listings-bash.prf
index f79b2e4152a..d6a9673d240 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-bash.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-bash.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstset{%
diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf
index 52a2a0db65e..92e34d76107 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-fortran.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstset{%
diff --git a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf
index f5e3d6bb9d6..f581320a43a 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-hansl.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstdefinestyle{hanslbw}{%
diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf
index 7fdeea59d81..8ab08205f85 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-lua.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-lua.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-lua.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstdefinestyle{Lua}{%
language=[5.2]Lua,
diff --git a/Master/texmf-dist/tex/latex/listings/listings-python.prf b/Master/texmf-dist/tex/latex/listings/listings-python.prf
index 3d8ef9a3c9f..dbee3a2fe2e 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-python.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-python.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-python.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage{xcolor}
\usepackage{textcomp}
diff --git a/Master/texmf-dist/tex/latex/listings/listings-rexx.prf b/Master/texmf-dist/tex/latex/listings/listings-rexx.prf
index 0548072e97e..1562ab9f39c 100644
--- a/Master/texmf-dist/tex/latex/listings/listings-rexx.prf
+++ b/Master/texmf-dist/tex/latex/listings/listings-rexx.prf
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-rexx.prf}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\usepackage{xcolor} % needed for colors like yellow!10
\usepackage{textcomp} % needed for upquote
diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg
index 3024c431afa..2928f82c6e8 100644
--- a/Master/texmf-dist/tex/latex/listings/listings.cfg
+++ b/Master/texmf-dist/tex/latex/listings/listings.cfg
@@ -21,7 +21,7 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
-\ProvidesFile{listings.cfg}[2024/05/25 1.10b listings configuration]
+\ProvidesFile{listings.cfg}[2024/09/23 1.10c listings configuration]
\def\lstlanguagefiles
{lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty}
\lstset{defaultdialect=[R/3 6.10]ABAP,
diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty
index 28fc678ad55..e056a98e86e 100644
--- a/Master/texmf-dist/tex/latex/listings/listings.sty
+++ b/Master/texmf-dist/tex/latex/listings/listings.sty
@@ -16,8 +16,8 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
-\def\filedate{2024/05/25}
-\def\fileversion{1.10b}
+\def\filedate{2024/09/23}
+\def\fileversion{1.10c}
\NeedsTeXFormat{LaTeX2e}
\AtEndOfPackage{\ProvidesPackage{listings}
[\filedate\space\fileversion\space(Carsten Heinz)]}
@@ -920,6 +920,8 @@
\def#2{#6}}
\def\lst@UM#1{\csname\@lst @um#1@\endcsname}
\lst@CCPutMacro
+ \lst@ProcessOther {"22}{\lst@ifupquote \textquotedbl
+ \else \char34\relax \fi}
\lst@ProcessOther {"23}\#
\lst@ProcessLetter{"24}\textdollar
\lst@ProcessOther {"25}\%
@@ -1435,28 +1437,29 @@
\def\lst@linerange{#2}\lst@GLI@#1--\@nil%
}
\def\lst@GLI@#1-#2-#3\@nil{%
+
\lst@IfNumber{#1}%
{%
\ifx\@empty#1\@empty
\let\lst@firstline\@ne
\else
- \def\lst@firstline{#1\relax}%
+ \def\lst@firstline{#1\relax}
\fi
- \ifx\@empty#3\@empty%
- \def\lst@lastline{9999999\relax}%
+ \ifx\@empty#3\@empty
+ \def\lst@lastline{9999999\relax}
\ifx\@empty#2\@empty
- \let\lst@lastline\lst@firstline%
+ \let\lst@lastline\lst@firstline
\fi
\else%
\ifx\@empty#2\@empty
\def\lst@lastline{9999999\relax}
\else % doesn't happen(?)
- \def\lst@lastline{#2\relax}%
+ \def\lst@lastline{#2\relax}
\fi
\fi
}%
{%
- \def\lst@firstline{9999999\relax}%
+ \def\lst@firstline{9999999\relax}
\let\lst@lastline\lst@firstline
\let\lst@rangebegin\lst@rangebeginprefix
\lst@AddTo\lst@rangebegin{#1}%
@@ -1506,10 +1509,10 @@
\ifnum\@tempcnta=\z@ \else
\lst@nololtrue
\advance\@tempcnta\lst@advancenumber
- \edef\lst@firstnumber{\the\@tempcnta\relax}%
- \fi%
- \fi%
- }%
+ \edef\lst@firstnumber{\the\@tempcnta\relax}
+ \fi
+ \fi
+ }
}
\def\lst@InitLstNumber{%
\global\c@lstnumber\lst@firstnumber
@@ -1681,14 +1684,17 @@
\def\lst@maketitle{\caption@startrue\@makecaption\@empty}}%
}
\def\lst@HRefStepCounter#1{%
- \begingroup
- \c@lstlisting\lst@neglisting
- \advance\c@lstlisting\m@ne \xdef\lst@neglisting{\the\c@lstlisting}%
- \ifx\hyper@refstepcounter\@undefined\else
- \hyper@refstepcounter{#1}%
- \fi
- \endgroup}
-\gdef\lst@neglisting{\z@}% init
+ \begingroup
+ \c@lstlisting\lst@neglisting
+ \advance\c@lstlisting\m@ne \xdef\lst@neglisting{\the\c@lstlisting}%
+ \ifx\hyper@refstepcounter\@undefined\else
+ \hyper@refstepcounter{#1}%
+ \fi
+ \endgroup
+}
+\gdef\lst@neglisting{\z@}% init, \z@ can be used both for 0pt and 0,
+ % remember: _neg_ative number, but no
+ % counter!
\lst@Key{boxpos}{c}{\def\lst@boxpos{#1}}
\def\lst@boxtrue{\let\lst@ifbox\iftrue}
\let\lst@ifbox\iffalse
diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty
index 5de8d7ec5ab..3023a1a2974 100644
--- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty
@@ -6,8 +6,8 @@
%%
%% listings.dtx (with options: `doc')
%%
-\def\filedate{2024/05/25}
-\def\fileversion{1.10b}
+\def\filedate{2024/09/23}
+\def\fileversion{1.10c}
\ProvidesPackage{lstdoc}
[\filedate\space\fileversion\space(Carsten Heinz)]
\let\lstdoc@currversion\fileversion
@@ -32,7 +32,7 @@
\ifalgorithmicpkg \RequirePackage{algorithmic}\fi
\iflgrind \RequirePackage{lgrind}\fi
\RequirePackage{nameref}
-\RequirePackage{url}
+\RequirePackage{xurl} % allow URL breaks
\renewcommand\ref{\protect\T@ref}
\renewcommand\pageref{\protect\T@pageref}
\def\lst@BeginRemark#1{%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang1.sty b/Master/texmf-dist/tex/latex/listings/lstlang1.sty
index 97481e7d77b..e22121fbc01 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang1.sty}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
%%
%% ACSL definition (c) 2000 by Andreas Matthias
%%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
index 711754208fa..e00818eb63f 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang2.sty}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
%%
%% Abap definition by Knut Lickert
%%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty
index 751259d95d7..0fb43a4c370 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang3.sty}
- [2024/05/25 1.10b listings language file]
+ [2024/09/23 1.10c listings language file]
\lst@definelanguage[68]{Algol}%
{morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,%
char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,%
diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty
index 9e663303727..d3bf1fbf58e 100644
--- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty
@@ -16,8 +16,8 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
%%
-\def\filedate{2024/05/25}
-\def\fileversion{1.10b}
+\def\filedate{2024/09/23}
+\def\fileversion{1.10c}
\ProvidesFile{lstmisc.sty}
[\filedate\space\fileversion\space(Carsten Heinz)]
\lst@CheckVersion\fileversion%
@@ -1186,14 +1186,14 @@
right:\def\lst@PlaceNumber{\rlap{\normalfont
\kern\linewidth \kern\lst@numbersep
\lst@numberstyle{\thelstnumber}}}%
- }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
+ }{\PackageError{Listings}{value `#1' for keyword `numbers' not supported}\@ehc}}
+\lst@Key{stepnumber}{1}{\def\lst@stepnumber{#1\relax}}
+\lst@Key{numberfirstline}{f}[t]{\lstKV@SetIf{#1}\lst@ifnumberfirstline}
\lst@Key{numberstyle}{}{\def\lst@numberstyle{#1}}
\lst@Key{numbersep}{10pt}{\def\lst@numbersep{#1}}
-\lst@Key{stepnumber}{1}{\def\lst@stepnumber{#1\relax}}
-\lst@AddToHook{EmptyStyle}{\let\lst@stepnumber\@ne}
\lst@Key{numberblanklines}{true}[t]
{\lstKV@SetIf{#1}\lst@ifnumberblanklines}
-\lst@Key{numberfirstline}{f}[t]{\lstKV@SetIf{#1}\lst@ifnumberfirstline}
+\lst@AddToHook{EmptyStyle}{\let\lst@stepnumber\@ne}
\gdef\lst@numberfirstlinefalse{\let\lst@ifnumberfirstline\iffalse}
\lst@Key{firstnumber}{auto}{%
\lstKV@SwitchCases{#1}%
diff --git a/Master/texmf-dist/tex/latex/litetable/litetable.cls b/Master/texmf-dist/tex/latex/litetable/litetable.cls
index a52c0d5abd8..a87d3cb9bd6 100644
--- a/Master/texmf-dist/tex/latex/litetable/litetable.cls
+++ b/Master/texmf-dist/tex/latex/litetable/litetable.cls
@@ -1,314 +1,420 @@
-%% ************************************************************************************************************
-%% ****************************************************** *
-%% * This work may be distributed and/or modified under * * ***** * * *
-%% * the conditions of the LaTeX Project Public License * * ** * * *** * * *
-%% * http://www.latex-project.org/lppl.txt * * * ** * ***** * *
-%% * either version 1.3c of this license or any later * * * ** * ***** * *
-%% * version. * * * ** * * * * *
-%% ****************************************************** ***** ** * * *** * * *
-%% start of file `litetable.cls'. *
-%% Copyright 2023-2024 LiteLaTeX (xiamyphys@gmail.com) *
-%% available at https://github.com/xiamyphys/LiteTable *
-% !Mode:: "TeX:UTF-8" *
-%% ************************************************************************************************************
-\NeedsTeXFormat{LaTeX2e}
-\PassOptionsToPackage{quiet}{xeCJK}
-\PassOptionsToPackage{no-math}{fontspec}
-\ProvidesClass{litetable}[2024/03/03/ v2.4c LiteTable document class]
+%% ***********************************************************
+%% Copyright 2024 by Mingyu XIA <xiamyphys@gmail.com> *
+%% *
+%% This work may be distributed and/or modified under *
+%% the conditions of the LaTeX Project Public License *
+%% *
+%% http://www.latex-project.org/lppl.txt *
+%% *
+%% either version 1.3c of this license or any later *
+%% version. *
+%% *
+%% This work has the LPPL maintenance status `maintained'. *
+%% *
+%% The Current Maintainer of this work is Mingyu XIA. *
+%% *
+%% This work consists of the files litetable.cls, *
+%% and README.md. *
+%% available at https://github.com/xiamyphys/litetable *
+%% ***********************************************************
+\ProvidesExplClass{litetable}{2024/09/25}{3.0B}{Course Schedule}
-% ---------- 全局选项 ---------- %
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{family=LITE, prefix=LITE@, setkeys=\kvsetkeys}
-
-\DeclareStringOption[portiait]{direction}
-\DeclareVoidOption{portiait}{\kvsetkeys{LITE}{direction=portiait}}
-\DeclareVoidOption{landscape}{\kvsetkeys{LITE}{direction=landscape}}
-
-\DeclareStringOption[times]{font}
-\DeclareVoidOption{times}{\kvsetkeys{LITE}{font=times}}
-\DeclareVoidOption{libertinus}{\kvsetkeys{LITE}{font=libertinus}}
-
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{standalone}}
-\ProcessKeyvalOptions*\relax
-
-\LoadClass[tikz]{standalone}
-
-% ---- 文本中的数字 & 字母设置 ---- %
-\RequirePackage{xeCJK}
-\setCJKfamilyfont{zhhei}{Heiti SC}
-\newcommand*\heiti{\CJKfamily{zhhei}}
-\ifdefstring{\LITE@font}{libertinus}{
-\RequirePackage{libertine}
-}{\relax}
-\ifdefstring{\LITE@font}{times}{
-\ifXeTeX
- \RequirePackage[no-math]{fontspec}
- \setmainfont{texgyretermes}[
- UprightFont = *-regular ,
- BoldFont = *-bold ,
- ItalicFont = *-italic ,
- BoldItalicFont = *-bolditalic ,
- Extension = .otf ,
- Scale = 1.0]
- \setsansfont{texgyreheros}[
- UprightFont = *-regular ,
- BoldFont = *-bold ,
- ItalicFont = *-italic ,
- BoldItalicFont = *-bolditalic ,
- Extension = .otf ,
- Scale = 0.9]
-\else
- \RequirePackage{newtxtext}
- \RequirePackage[scaled=.90]{helvet}
-\fi
-}{\relax}
-
-% ---------- 色彩组合 ---------- %
-\definecolor{darkgray}{HTML}{727477} % 时间颜色
-\definecolor{darkergray}{HTML}{F1F3F5} % 深色块
-\definecolor{lightergray}{HTML}{FCFDFE} % 浅色块
-\definecolor{blackgray}{HTML}{1A1D21} % 序号颜色
-\definecolor{SEM}{HTML}{DEEAF8} % 学期按钮
-\definecolor{SEM*}{HTML}{3085F3}
-\definecolor{SEM**}{HTML}{007DC3}
-\pagecolor{lightergray}
-\definecolor{H1}{HTML}{74A7A2} % 深绿
-\definecolor{H1*}{HTML}{E9EEED}
-\definecolor{H1**}{HTML}{009787}
-\definecolor{H2}{HTML}{50C9BD} % 浅绿
-\definecolor{H2*}{HTML}{E1F3F2}
-\definecolor{H2**}{HTML}{009D8F}
-\definecolor{H3}{HTML}{86AFFE} % 深蓝
-\definecolor{H3*}{HTML}{DBE7FF}
-\definecolor{H3**}{HTML}{1663F5}
-\definecolor{H4}{HTML}{6BC0EB} % 浅蓝
-\definecolor{H4*}{HTML}{D8EFFA}
-\definecolor{H4**}{HTML}{0072B1}
-\definecolor{H5}{HTML}{D58DFB} % 深紫
-\definecolor{H5*}{HTML}{F2E3FB}
-\definecolor{H5**}{HTML}{A83FDF}
-\definecolor{H6}{HTML}{FF9393} % 浅紫
-\definecolor{H6*}{HTML}{FFDEDE}
-\definecolor{H6**}{HTML}{E73030}
-\definecolor{H7}{HTML}{FFA17D} % 深橙
-\definecolor{H7*}{HTML}{F5E1DA}
-\definecolor{H7**}{HTML}{E2612F}
-\definecolor{H8}{HTML}{F3C06A} % 浅橙
-\definecolor{H8*}{HTML}{F3EADB}
-\definecolor{H8**}{HTML}{E09B14}
-\definecolor{H9}{HTML}{D09966} % 棕色
-\definecolor{H9*}{HTML}{F2E0D0}
-\definecolor{H9**}{HTML}{C96F1C}
-\definecolor{W1}{HTML}{CCAD52}
-\definecolor{W2}{HTML}{8FCC52}
-\definecolor{W3}{HTML}{52CC70}
-\definecolor{W4}{HTML}{52CCCC}
-\definecolor{W5}{HTML}{5270CC}
-\definecolor{W6}{HTML}{8F52CC}
-\definecolor{W7}{HTML}{CC52AD}
+\ExplSyntaxOff
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessOptions\relax
+\LoadClass{article}
+\pagestyle{empty}
+\RequirePackage{listofitems,tikz,xcolor}
+\ignoreemptyitems\setsepchar{,/->}
\usetikzlibrary{calc}
-\ifdefstring{\LITE@direction}{portiait}{
- \def\pagewidth{8.5 in}
- \def\pageheight{-11 in}
- \def\rotatepage{
- \def\pagewidth{11 in}
- \def\pageheight{-8.5 in}
- }
- \def\rerotatepage{
- \def\pagewidth{8.5 in}
- \def\pageheight{-11 in}
- }
-}{\relax}
-
-\ifdefstring{\LITE@direction}{landscape}{
- \def\pagewidth{11 in}
- \def\pageheight{-8.5 in}
- \def\rotatepage{
- \def\pagewidth{8.5 in}
- \def\pageheight{-11 in}
- }
- \def\rerotatepage{
- \def\pagewidth{11 in}
- \def\pageheight{-8.5 in}
- }
-}{\relax}
-
-\ExplSyntaxOn % 数组
-% 1. Set up arrays
-\def\definearray#1#2
- {
- \seq_clear_new:c { l__litetable_array_#1_seq }
- \seq_set_split:cnn { l__litetable_array_#1_seq } { ; } { #2 }
- }
-
-\cs_generate_variant:Nn \seq_set_split:Nnn { c }
-
-% 2. Define commands to work with arrays
-\NewExpandableDocumentCommand{\arraycount}{ o m }
- {
- \IfNoValueTF { #1 }
- {
- \litetable_array_count_full:n { #2 }
- }
- {
- \litetable_array_count_item:nn { #2 } { #1 }
- }
- }
+\definecolor{darkergray}{HTML}{F4F6F8}% Blocks
-\cs_new:Nn \litetable_array_count_item:nn
- {
- \clist_count:e { \seq_item:cn { l__litetable_array_#1_seq } { #2 } }
- }
+\ExplSyntaxOn
-\NewExpandableDocumentCommand{\arrayitem}{ m m m }
- {
- \clist_item:en { \seq_item:cn { l__litetable_array_#1_seq } { #2 } } { #3 }
- }
-
-\ExplSyntaxOff
-
-\NewDocumentCommand{\timelist}{ o m }
+\int_new:N \l_time_num_int
+\dim_new:N \l__time_vunit_dim
+\msg_new:nnn {litetable} {timelist}
+{\noexpand\timelist~extra~time~group(s)~were~ignored}
+\NewDocumentCommand{\timelist}{om}
{
- \gdef\@timelist{#2}
- \definearray{timelist}{#2}
- \IfNoValueTF{#1}{
- \ifnum \arraycount[2]{timelist}<\arraycount[1]{timelist}
- \def\@classnum{\arraycount[1]{timelist}}
- \else
- \def\@classnum{\arraycount[2]{timelist}}
- \fi
- }{\def\@classnum{#1}}
-}
-\ifcsname @timelist\endcsname
- \relax
- \else
- \def\@classnum{12}
-\fi
-\def\weeklist#1{
- \gdef\@weeklist{#1}
- \definearray{weeklist}{#1}
+ \IfBlankTF{#2}
+ {
+ \int_set:Nn \l_time_num_int { #1 }
+ \tl_clear:N \@timelist
+ }{
+ \readlist*\@timelist{#2}
+ \IfNoValueTF{#1}
+ {
+ \int_set:Nn \l_time_num_int {\@timelistlen}
+ }{
+ \int_set:Nn \l_time_num_int { #1 }
+ \int_compare:nNnT {\@timelistlen} > {#1}
+ {
+ \msg_warning:nn {litetable} {timelist}
+ }
+ }
+ }
+ \dim_set:Nn \l__time_vunit_dim
+ {
+ \fp_eval:n {1/(2*\l_time_num_int+3.5)}\paperheight
+ }
}
-\gdef\@weeknum{\arraycount[1]{weeklist}}
-\RequirePackage{fontawesome5}
-\RequirePackage[hidelinks]{hyperref}
-\newcounter{number}
-\tikzset{
- hyperlink node/.style={
- alias=sourcenode,
- append after command={
- let \p1 = (sourcenode.north west),
- \p2 = (sourcenode.south east),
- \n1 = {\x2-\x1}, \n2 = {\y1-\y2} in
- node [inner sep=0pt, outer sep=auto, anchor=north west,at=(\p1)]
- {\Acrobatmenu{#1}{\XeTeXLinkBox{\phantom{\rule{\n1}{\n2}}}}}
+\clist_new:N \l__week_ratios_clist
+\clist_new:N \l__week_accum_clist
+\int_new:N \l__week_num_int
+\dim_new:N \l__week_hunit_dim
+\NewDocumentCommand{\weeklist}{om}
+{
+ \IfValueT{ #1 }{\tl_set:Nn \l_weeks_tl { #1 }}
+ \readlist*\@weeklist{#2}
+ \int_step_inline:nn {\@weeklistlen}
+ {
+ \clist_put_right:Ne \l__week_ratios_clist
+ {
+ \@weeklist[##1,2]
+ }
+ }
+ \int_step_inline:nn {\@weeklistlen}
+ {
+ \clist_clear:N \l__week_accumtmp_clist
+ \int_step_inline:nn { ##1 }
+ {
+ \clist_put_right:Ne \l__week_accumtmp_clist
+ {
+ \clist_item:Nn \l__week_ratios_clist { ####1 }
+ }
+ }
+ \clist_put_right:Ne \l__week_accum_clist
+ {
+ \int_eval:n
+ {
+ \clist_use:Nn \l__week_accumtmp_clist { + }
+ }
+ }
+ }
+ \int_set:Nn \l__week_num_int
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \@weeklistlen
+ }
+ }
+ \dim_set:Nn \l__week_hunit_dim
+ {
+ \fp_eval:n {1/\l__week_num_int*14/15}\paperwidth
}
- }
}
-\NewDocumentCommand{\makeframe}{ o m }{
- \draw [lightergray] (0,0) rectangle (\pagewidth,\pageheight);
- \fill [fill=darkergray] (0,0) rectangle (\pagewidth,{1.5*\pageheight/(2*\@classnum+3.5)});% 顶部深灰色块
- \node at (.5*\pagewidth,{.75*\pageheight/(2*\@classnum+3.5)}) {\huge\bfseries\sffamily #2}; % 标题
- \IfNoValueF{#1}{
- \node [outer sep=auto,hyperlink node=NextPage,left,rectangle,fill=SEM,text=SEM*,draw=none,inner sep=1.75ex,rounded corners=6pt] at (.98*\pagewidth,{.75*\pageheight/(2*\@classnum+3.5)}) {\large\sffamily\;$\rightleftharpoons$~#1\;}; % 学期
- }
- \ifodd\@classnum
- \foreach \a in {2,4,...,\@classnum,\@classnum+2}
- \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环)
- \else
- \foreach \a in {2,4,...,\@classnum}
- \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环)
- \fill [fill=darkergray,yshift=(2.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{\pageheight/(2*\@classnum+3.5)}); % 底部深灰色块
- \fi
- \foreach \a in {0,1,2,...,\@classnum}
- \draw [densely dashed,gray!75,yshift=(2.5+2*\a)*\pageheight/(2*\@classnum+3.5)] (0,0)--(\pagewidth,0); % 分割虚线
-
- % 时间标注
- \setcounter{number}{0}
- \ifcsempty{@timelist}{
- \foreach \a in {1,2,...,\@classnum}
+\int_new:N \l__week_day_int
+\newcommand{\newday}{\int_incr:N \l__week_day_int}
+\NewDocumentCommand{\maketable}{om}{
+ % Gray Block at top
+ \fill [ darkergray ] (current~page.north~west)
+ rectangle + (\paperwidth,{-1.5*\l__time_vunit_dim})
+ node [ midway, black, font = \huge\bfseries ] {#2};
+ \IfValueT{#1}% Semester
{
- \node [yshift=(1.5+2*\a)*\pageheight/(2*\@classnum+3.5)] at(\pagewidth/32,0)
- {\bfseries\large\color{blackgray}\texttt{\refstepcounter{number}\thenumber}};
+ \node [ left, rectangle, fill = DarkBlue!10,
+ text = DarkBlue!60, inner~sep = 2ex,
+ rounded~corners = 8pt, font = \large
+ ] at ($
+ (current~page.north~east)+
+ (-.02\paperwidth,-.75*\l__time_vunit_dim)
+ $) {\ensuremath\rightleftharpoons\ #1};
}
- }{
- \foreach \x in {1,2,...,\@classnum}
- {
- \node [yshift=(2*\x+.9)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0)
- {\bfseries\color{blackgray}\texttt{\refstepcounter{number}\thenumber}};
- \node[yshift=(2*\x+1.55)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0)
- {\color{darkgray}\texttt{\arrayitem{timelist}{1}{\x}}};
- \node[yshift=(2*\x+2.1)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0)
- {\color{darkgray}\texttt{\arrayitem{timelist}{2}{\x}}};
+ % Darker Blocks
+ \int_step_inline:nnnn {0} {2} {\l_time_num_int} {
+ \filldraw [ fill = darkergray, draw = gray, thick,
+ densely~dashed, line~cap = round
+ ] ([yshift = -2*##1*\l__time_vunit_dim]$
+ (current~page.north~west)+(-.4pt,0)+
+ (0,-2.5*\l__time_vunit_dim)
+ $) rectangle + ($
+ (\paperwidth,-2*\l__time_vunit_dim)+
+ (.8pt,0)
+ $);
+ }
+ \tl_if_empty:NTF {\@timelist}% Classes numbering
+ {
+ \int_step_inline:nn {\l_time_num_int} {
+ \node [ yshift = -2*##1*\l__time_vunit_dim,
+ darkgray!80, font = \bfseries\large\ttfamily
+ ] at ($
+ (current~page.north~west)+
+ (\paperwidth/30,-1.5*\l__time_vunit_dim)
+ $) {##1};
+ }
+ }{
+ \int_step_inline:nn {\l_time_num_int} {
+ \node [ yshift = -2*##1*\l__time_vunit_dim,
+ darkgray!80, font = \bfseries\large\ttfamily
+ ] at ($
+ (current~page.north~west)+
+ (\paperwidth/30,-\l__time_vunit_dim)
+ $) {##1};
+ }
+ % Classes time
+ \int_step_inline:nn {\@timelistlen} {
+ \node [ yshift = -2*##1*\l__time_vunit_dim,
+ gray, font = \ttfamily ,align = center]
+ at ($
+ (current~page.north~west)+
+ (\paperwidth/30,-1.9*\l__time_vunit_dim)
+ $) {\@timelist[##1,1]\\\@timelist[##1,2]};
+ }
+ }
+ % Weekdays
+ \int_step_inline:nn {\@weeklistlen}
+ {
+ \node [ font = \large\bfseries,
+ xshift = \clist_item:Nn \l__week_accum_clist {##1}/
+ \l__week_num_int*14/15*\paperwidth
+ ]
+ at ($
+ (current~page.north~west)-
+ (\fp_eval:n {(
+ \clist_item:Nn
+ \l__week_ratios_clist { ##1 }
+ /2)/\l__week_num_int*14/15-1/15
+ }*\paperwidth,2*\l__time_vunit_dim)
+ $) {\@weeklist[##1,1]};
}
- }
-
- % 星期标注
- \foreach \a in {1,2,...,\@weeknum}
- \node [xshift=\pagewidth/16] at ({.5*(\arrayitem{weeklist}{2}{\a}+\arrayitem{weeklist}{2}{\a+1})*15*\pagewidth/16},{2*\pageheight/(2*\@classnum+3.5)})
- {\arrayitem{weeklist}{1}{\a}};
-
- \ifcsname @sticker\endcsname
- \node [opacity=.3,above left,yshift=(1.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5),inner sep=0pt,outer sep=auto,scale=15] at (\pagewidth,{\pageheight/(2*\@classnum+3.5)}) {\includegraphics[width=\dimeval{\pagewidth/16/\@weeknum}]{\@sticker}};\fi
}
-\newcounter{weekday}
-\def\newday{\addtocounter{weekday}{1}}
-\AtEndEnvironment{tikzpicture}{\setcounter{weekday}{0}}
-\def\sticker#1{\gdef\@sticker{#1}}
-\def\corner#1{\gdef\@corner{#1}}
-\def\weeks#1{\gdef\@weeks{#1}}
-
-\NewDocumentCommand{\course}{O{H1} m m m m m O{\@weeks}}
+\keys_define:nn{course}{
+ color.tl_set:N = \l_color_tl,
+ color.initial:n = teal,
+ subject.tl_set:N = \l_subject_tl,
+ teacher.tl_set:N = \l_teacher_tl,
+ location.tl_set:N = \l_location_tl,
+ weeks.tl_set:N = \l_weeks_tl,
+ weeks.initial:n = \l_weeks_tl,
+}
+\dim_new:N \l__course_infoshift_dim
+\NewDocumentCommand{\course}{O{}mm}
{
- \ifcsname @corner\endcsname
- \tikzset{corner/.style={rounded corners=\@corner}}
- \else
- \tikzset{corner/.style={}}
- \fi
- \fill [#1,corner,
- yshift=(2*(#2-1))*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16]
- ({\arrayitem{weeklist}{2}{\theweekday+1}*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)}) rectangle ++
- ({(\arrayitem{weeklist}{2}{\theweekday+2}-\arrayitem{weeklist}{2}{\theweekday+1})*15*\pagewidth/16},{(2+2*(#3-#2))*\pageheight/(2*\@classnum+3.5)}); % frame
-
- \fill [#1*,
- yshift=(2*(#2-1)+.5)*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16]
- ({\arrayitem{weeklist}{2}{\theweekday+1}*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)}) --++
- ({(\arrayitem{weeklist}{2}{\theweekday+2}-\arrayitem{weeklist}{2}{\theweekday+1})*15*\pagewidth/16},0)
- { [corner] --++ (0,{(1.5+2*(#3-#2))*\pageheight/(2*\@classnum+3.5)}) --++
- ({(-\arrayitem{weeklist}{2}{\theweekday+2}+\arrayitem{weeklist}{2}{\theweekday+1})*15*\pagewidth/16},0)} -- cycle; % content
-
- \node [#1**,yshift=(#2+#3-1.25)*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16] at
- ({.5*(\arrayitem{weeklist}{2}{\theweekday+1}+\arrayitem{weeklist}{2}{\theweekday+2})*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)})
- {\heiti\large\bfseries #4}; % course
-
- \node [#1**,above,
- yshift=(#2+#3-.2)*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16] at
- ({.5*(\arrayitem{weeklist}{2}{\theweekday+1}+\arrayitem{weeklist}{2}{\theweekday+2})*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)})
- {\heiti\bfseries\small #5}; % location
-
- \node [#1**,below,
- yshift=(#2+#3-.2)*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16] at
- ({.5*(\arrayitem{weeklist}{2}{\theweekday+1}+\arrayitem{weeklist}{2}{\theweekday+2})*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)})
- {\heiti\bfseries\small #6}; % teacher
+ \group_begin:
+ \keys_set:nn { course } { #1 }
+ % Course block fg
+ \fill [ \l_color_tl!60, rounded~corners = 8pt ] ($
+ (current~page.north~west)+(.4pt,-.4pt)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-.5-2*#2}*\l__time_vunit_dim)
+ $) rectangle ($
+ (current~page.north~west)+(-.4pt,.4pt)+
+ (\clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-2.5-2*#3}*\l__time_vunit_dim)
+ $);
+ % Course block bg
+ \fill [ \l_color_tl!10 ] ($
+ (current~page.north~west)+(1.2pt,-.4pt)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1-2*#2}*\l__time_vunit_dim)
+ $) -- ($
+ (current~page.north~west)+(-1.2pt,-.4pt)+
+ (\clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1-2*#2}*\l__time_vunit_dim)
+ $) {[rounded~corners = 7.2pt] -- ($
+ (current~page.north~west)+(-1.2pt,1.2pt)+
+ (\clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-2.5-2*#3}*\l__time_vunit_dim)
+ $) -- ($
+ (current~page.north~west)+(1.2pt,1.2pt)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-2.5-2*#3}*\l__time_vunit_dim)
+ $)} -- cycle;
+ % Course info
+ \tl_if_eq:NNTF {#2} {#3}% Single-unit height course block
+ {
+ \bool_if:nTF
+ {
+ \tl_if_empty_p:N \l_location_tl &&
+ \tl_if_empty_p:N \l_teacher_tl
+ }{
+ \tl_set:Nn \l_shortcourse_anchor_tl { }
+ }{
+ \tl_set:Nn \l_shortcourse_anchor_tl { above }
+ }
+ \cs_if_exist:NT {\l_subject_tl }
+ {
+ \node [ \l_shortcourse_anchor_tl,
+ \l_color_tl!60, align = center,
+ font = \large\bfseries ]
+ at ($
+ (current~page.north~west)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }/2
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1.75-#2-#3}*\l__time_vunit_dim)
+ $) { \l_subject_tl };
+ }
+ \bool_if:nTF
+ {
+ !\tl_if_empty_p:N \l_location_tl &&
+ !\tl_if_empty_p:N \l_teacher_tl
+ }{
+ \tl_set:Nn \l_shortcourse_sep_tl { ,~ }
+ }{
+ \tl_set:Nn \l_shortcourse_sep_tl { }
+ }
+ \node [ below, \l_color_tl!60, align = center ]
+ at ($
+ (current~page.north~west)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }/2
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1.75-#2-#3}*\l__time_vunit_dim)
+ $) {
+ \tl_if_exist:NT
+ { \l_location_tl } { \l_location_tl }
+ \l_shortcourse_sep_tl
+ \tl_if_exist:NT
+ { \l_teacher_tl } { \l_teacher_tl }
+ };
+ }{
+ \bool_if:nTF% Multiply-unit height course block
+ {
+ \tl_if_empty_p:N \l_location_tl &&
+ \tl_if_empty_p:N \l_teacher_tl
+ }{
+ \tl_set:Nn \l_course_anchor_tl {}
+ \dim_set:Nn \l__course_infoshift_dim { 0pt }
+ }{
+ \tl_set:Nn \l_course_anchor_tl { above }
+ \dim_set:Nn \l__course_infoshift_dim
+ {
+ .125\l__time_vunit_dim
+ }
+ }
+ \cs_if_exist:NT { \l_subject_tl }
+ {
+ \node [ \l_course_anchor_tl,
+ yshift = \l__course_infoshift_dim,
+ \l_color_tl!60, align = center,
+ font = \large\bfseries
+ ] at ($
+ (current~page.north~west)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }/2
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1.5-#2-#3}*\l__time_vunit_dim)
+ $) { \l_subject_tl };
+ }
+ \bool_if:nTF
+ {
+ !\tl_if_empty_p:N \l_location_tl &&
+ !\tl_if_empty_p:N \l_teacher_tl
+ }{
+ \tl_set:Nn \l_courseinfo_sep_tl { \\ }
+ }{
+ \tl_set:Nn \l_courseinfo_sep_tl { }
+ }
+ \node [ below, \l_color_tl!60, align = center ]
+ at ($
+ (current~page.north~west)+
+ (\fp_eval:n
+ {
+ \clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }-
+ \clist_item:Nn \l__week_ratios_clist
+ {
+ \l__week_day_int
+ }/2
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-1.625-#2-#3}*\l__time_vunit_dim)
+ $) {
+ \tl_if_exist:NT
+ { \l_location_tl } { \l_location_tl }
+ \l_courseinfo_sep_tl
+ \tl_if_exist:NT
+ { \l_teacher_tl } { \l_teacher_tl }
+ };
+ \node [ above~left, \l_color_tl!60, outer~sep = .5ex ]
+ at ($
+ (current~page.north~west)+
+ (\clist_item:Nn \l__week_accum_clist
+ {
+ \l__week_day_int
+ }*\l__week_hunit_dim+\paperwidth/15,
+ \fp_eval:n {-2.5-2*#3}*\l__time_vunit_dim)
+ $) { \l_weeks_tl };
+ }
+ \group_end:
+}
- \ifcsname @weeks\endcsname
- \node [#1**,above left,
- yshift=2*#3*\pageheight/(2*\@classnum+3.5),
- xshift=\pagewidth/16] at
- ({\arrayitem{weeklist}{2}{\theweekday+2}*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)})
- {\heiti\footnotesize #7};
- \fi % weeks
+\newcommand{\more}[1]% Additional info
+{
+ \node [ left = 1ex, darkgray, font = \small\bfseries ]
+ at ($
+ (current~page.south~east)+(0,.5*\l__time_vunit_dim)
+ $) {#1};
}
-\def\more#1{
- \node [xshift=-1em,yshift=(2.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5),left] at (\pagewidth,{.5*\pageheight/(2*\@classnum+3.5)}){\small\bfseries\color{darkgray}#1};
-} \ No newline at end of file
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index 799e1ec279c..22b5c77097e 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -120,11 +120,15 @@
\c { group_end: }
\c { tl_set_rescan:Nnn } \c { l_tmpa_tl } { } { \1 }
\c { __markdown_setup:V } \c { l_tmpa_tl }
- \c { markdownReadAndConvert@markdown } { }
+ \c { exp_args:NV }
+ \c { markdownReadAndConvert@ }
+ \c { @currenvir }
}
{
\group_end:
- \markdownReadAndConvert@markdown { }
+ \exp_args:NV
+ \markdownReadAndConvert@
+ \@currenvir
}
}
{ \markdownEnd }
@@ -138,7 +142,8 @@
{ #1 }
\__markdown_setup:n
{ #1 }
- \markdownReadAndConvert@markdown *
+ \markdownReadAndConvert@
+ { markdown* }
}
{ \markdownEnd }
\msg_new:nnn
@@ -148,17 +153,17 @@
The~markdown*~LaTeX~environment~has~been~deprecated~and~will~
be~removed~in~the~next~major~version~of~the~Markdown~package.
}
+\cs_generate_variant:Nn
+ \__markdown_setup:n
+ { V }
\ExplSyntaxOff
\begingroup
\catcode`\|=0\catcode`\<=1\catcode`\>=2%
\catcode`\\=12|catcode`|{=12|catcode`|}=12%
- |gdef|markdownReadAndConvert@markdown#1<%
- |markdownReadAndConvert<\end{markdown#1}>%
- <|end<markdown#1>>>%
+ |gdef|markdownReadAndConvert@#1<%
+ |markdownReadAndConvert<\end{#1}>%
+ <|end<#1>>>%
|endgroup
-\DeclareOption*{%
- \expandafter\markdownSetup\expandafter{\CurrentOption}}%
-\ProcessOptions\relax
\ExplSyntaxOn
\cs_gset:Nn
\__markdown_load_theme:nn
@@ -202,9 +207,8 @@
{ #1 }
\AtEndOfPackage
{
- \__markdown_load_theme:nn
+ \__markdown_set_theme:n
{ #1 }
- { #2 }
}
\fi
}
@@ -246,6 +250,9 @@
\l_tmpa_tl
\l_tmpb_tl
\ExplSyntaxOff
+\DeclareOption*{%
+ \expandafter\markdownSetup\expandafter{\CurrentOption}}%
+\ProcessOptions\relax
\newcommand\markdownMakeOther{%
\count0=128\relax
\loop
diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
index fbe93b2844b..f96ab1f5ccf 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty
@@ -59,7 +59,8 @@
fi}}%
\markdownRendererImage{Graphviz image}{#1.pdf}{#1.pdf}{##2}%
}{%
- \markdown@witiko@dot@oldRendererInputFencedCodePrototype{#1}{#2}{#3}%
+ \markdown@witiko@dot@oldRendererInputFencedCodePrototype
+ {#1}{#2}{#3}%
}%
}%
\next#2 \relax}%
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 f90017e073b..981841627f8 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty
@@ -414,9 +414,21 @@
}
{
\ltx@ifpackageloaded
- { listings }
- { \lstinputlisting[language=\l_tmpa_tl]{#1} }
- { \markdownRendererInputFencedCode{#1}{}{} }
+ { minted2 }
+ {
+ \catcode`\#=6\relax
+ \exp_args:NV
+ \inputminted
+ \l_tmpa_tl
+ { #1 }
+ \catcode`\#=12\relax
+ }
+ {
+ \ltx@ifpackageloaded
+ { listings }
+ { \lstinputlisting[language=\l_tmpa_tl]{#1} }
+ { \markdownRendererInputFencedCode{#1}{}{} }
+ }
}
}
}
@@ -501,8 +513,9 @@
\advance\markdownLaTeXCitationsCounter by 1\relax
\ifx\relax#4\relax
\ifx\relax#5\relax
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
- \cite{#1#2#6}% Without prenotes and postnotes, just accumulate cites
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
+ \cite{#1#2#6}% No prenotes/postnotes, just accumulate cites
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
\@gobblethree
@@ -512,7 +525,8 @@
\cite{#1}%
\fi
\cite[#5]{#6}%
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\else
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
@@ -539,7 +553,8 @@
\space % Insert a space before the prenote in later citations
\fi
#4~\expandafter\cite\ifx\relax#5\relax{#6}\else[#5]{#6}\fi
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\else
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
@@ -558,8 +573,9 @@
\advance\markdownLaTeXCitationsCounter by 1\relax
\ifx\relax#3\relax
\ifx\relax#4\relax
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
- \citep{#1,#5}% Without prenotes and postnotes, just accumulate cites
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
+ \citep{#1,#5}% No prenotes/postnotes, just accumulate cites
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
\@gobbletwo
@@ -569,7 +585,8 @@
\citep{#1}%
\fi
\citep[][#4]{#5}%
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\else
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
@@ -589,7 +606,8 @@
\citep{#1}%
\fi
\citep[#3][#4]{#5}%
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\else
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
@@ -604,8 +622,9 @@
\advance\markdownLaTeXCitationsCounter by 1\relax
\ifx\relax#3\relax
\ifx\relax#4\relax
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
- \citet{#1,#5}% Without prenotes and postnotes, just accumulate cites
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
+ \citet{#1,#5}% No prenotes/postnotes, just accumulate cites
\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\expandafter
\@gobbletwo
@@ -615,10 +634,13 @@
\citet{#1}%
\fi
, \citet[#3][#4]{#5}%
- \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal
+ \relax
,
\else
- \ifnum\markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal\relax
+ \ifnum
+ \markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal
+ \relax
,
\fi
\fi
@@ -637,10 +659,13 @@
\citet{#1}%
\fi
, \citet[#3][#4]{#5}%
- \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal
+ \relax
,
\else
- \ifnum\markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal\relax
+ \ifnum
+ \markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal
+ \relax
,
\fi
\fi
@@ -654,13 +679,15 @@
\def\markdownLaTeXBibLaTeXCitations#1#2#3#4#5{%
\advance\markdownLaTeXCitationsCounter by 1\relax
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\autocites#1[#3][#4]{#5}%
\expandafter\@gobbletwo
\fi\markdownLaTeXBibLaTeXCitations{#1[#3][#4]{#5}}}
\def\markdownLaTeXBibLaTeXTextCitations#1#2#3#4#5{%
\advance\markdownLaTeXCitationsCounter by 1\relax
- \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax
+ \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal
+ \relax
\textcites#1[#3][#4]{#5}%
\expandafter\@gobbletwo
\fi\markdownLaTeXBibLaTeXTextCitations{#1[#3][#4]{#5}}}
@@ -737,7 +764,8 @@
{
\markdownLaTeXRendererAutolink { #2 } { #3 }
}{
- \markdownLaTeXRendererDirectOrIndirectLink { #1 } { #2 } { #3 } { #4 }
+ \markdownLaTeXRendererDirectOrIndirectLink
+ { #1 } { #2 } { #3 } { #4 }
}
}
\def\markdownLaTeXRendererAutolink#1#2{%
@@ -939,13 +967,13 @@
{
{ latex }
{
- \__markdown_plain_tex_default_input_raw_inline_renderer_prototype:nn
+ \__markdown_plain_tex_default_input_raw_inline:nn
{ #1 }
{ tex }
}
}
{
- \__markdown_plain_tex_default_input_raw_inline_renderer_prototype:nn
+ \__markdown_plain_tex_default_input_raw_inline:nn
{ #1 }
{ #2 }
}
@@ -958,13 +986,13 @@
{
{ latex }
{
- \__markdown_plain_tex_default_input_raw_block_renderer_prototype:nn
+ \__markdown_plain_tex_default_input_raw_block:nn
{ #1 }
{ tex }
}
}
{
- \__markdown_plain_tex_default_input_raw_block_renderer_prototype:nn
+ \__markdown_plain_tex_default_input_raw_block:nn
{ #1 }
{ #2 }
}
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index c1e00febb4e..1ee3b2e3f3a 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -4,7 +4,6 @@
\bool_if:nTF{
\bool_lazy_and_p:nn {\cs_if_exist_p:N \pdfmanagement_if_active_p:} { \pdfmanagement_if_active_p: }
}{\@mix@testphasetrue}{
-%\input{media9.old.tex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% media9.sty
@@ -39,8 +38,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@mix@date@tl{2022/08/04}
-\def\g@mix@version@tl{1.25}
+\def\g@mix@date@tl{2024/09/16}
+\def\g@mix@version@tl{1.29}
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
@@ -52,7 +51,7 @@
% package options
\msg_set:nnnn{media9}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
+ Package~option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
@@ -2446,8 +2445,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@mix@date@tl{2022/08/04}
-\def\g@mix@version@tl{1.25}
+\def\g@mix@date@tl{2024/09/16}
+\def\g@mix@version@tl{1.29}
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
@@ -2459,7 +2458,7 @@
% package options
\msg_set:nnnn{media9}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
+ Package~option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index 67ff708ad51..31b5e23deed 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -156,8 +156,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@pbs@date@tl{2022/08/04}
-\def\g@pbs@version@tl{0.55}
+\def\g@pbs@date@tl{2024/09/16}
+\def\g@pbs@version@tl{0.59}
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -168,7 +168,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
+ Package~option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
@@ -220,11 +220,11 @@
{dvipdfmx}{
\bool_gset_true:N\g_pbs_dvipdfmx_bool
\bool_gset_false:N\g_pbs_dvisvgm_bool
- }
+ }
{dvisvgm}{
\bool_gset_false:N\g_pbs_dvipdfmx_bool
\bool_gset_true:N\g_pbs_dvisvgm_bool
- }
+ }
}{ % otherwise let the L3 backend code decide
\str_case_e:nn{\c_sys_backend_str}{
{dvisvgm}{
@@ -270,6 +270,12 @@
\seq_new:N\g_pbs_bop_seq
\seq_new:N\g_pbs_eop_seq
+% column (boc, eoc) hooks
+\cs_new_protected:Nn\pbs_boc_action:n{\seq_gput_right:Nn\g_pbs_boc_seq{#1}}
+\cs_new_protected:Nn\pbs_eoc_action:n{\seq_gput_right:Nn\g_pbs_eoc_seq{#1}}
+\seq_new:N\g_pbs_boc_seq
+\seq_new:N\g_pbs_eoc_seq
+
\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
\bool_new:N\g_pbs_ocgbase_loaded_bool
\AtBeginDocument{
@@ -1105,8 +1111,8 @@
\mode_leave_vertical: % resources are managed automatically
%rescale box to fit within the papersize while distilling
\tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0,
- \dim_ratio:nn{\paperwidth}{\box_wd:N#5},
- \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}
+ \dim_ratio:nn{\paperwidth}{\box_wd:N#5}/\the\mag*1000,
+ \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}/\the\mag*1000
)}}
\box_scale:Nnn#5{
\tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}
@@ -1302,33 +1308,38 @@
\tl_gput_left:Nx\g_pbs_fields_tl{#1\space}
}
-%modify output routine for output box insertions
-\bool_new:N\l_pbs_is_vertical_bool
+% modify page output routine for inserting actions at begin and end
\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage
\cs_set_protected_nopar:Npn\@outputpage{
\int_gincr:N\g_pbs_page_int
- \box_if_vertical:cTF{@outputbox}{
- \bool_set_true:N\l_pbs_is_vertical_bool
- }{
- \bool_set_false:N\l_pbs_is_vertical_bool
- }
- \hbox_set:Nn\@outputbox{
+ \vbox_set:Nn\@outputbox{
%begin of page
- \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}}
+ \seq_map_inline:Nn\g_pbs_bop_seq{##1}
\box_use_drop:N\@outputbox
%end of page
- \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}}
- }
- \bool_if:NT\l_pbs_is_vertical_bool{
- \vbox_set:Nn\@outputbox{\box_use_drop:N\@outputbox}
+ \seq_map_inline:Nn\g_pbs_eop_seq{##1}
}
\pbs_outputpage_orig:
}
+% modify column making routine for inserting actions at begin and end
+\cs_set_eq:NN\pbs_makecol_orig:\@makecol
+\cs_set_protected_nopar:Npn\@makecol{
+ \vbox_set:Nn\@cclv{
+ %begin of column
+ \seq_map_inline:Nn\g_pbs_boc_seq{##1}
+ \vbox_unpack_drop:N\@cclv
+ %end of column
+ \seq_map_inline:Nn\g_pbs_eoc_seq{##1}
+ }
+ \pbs_makecol_orig:
+}
+
\AddToHook{shipout/foreground}{
%insert /Properties into current page's resources
\put(0,0){\pbs_insert_properties_entry:}
}
+
\AddToHook{shipout/background}{
% workaround for curious AR bug (pdf annot or link placed on
% OCG remains active although OCG is hidden)
@@ -1336,8 +1347,15 @@
% somewhere on the page.
\bool_if:NT\g_pbs_ocgbase_loaded_bool{
\put(1,-1){
+ \tl_if_exist:NF\g_pbs_blank_xform_tl{
+ \hbox_set:Nn\l_tmpa_box{\phantom{\rule{1pt}{1pt}}}
+ \pbs_pdfxform:nnnnn{0}{1}{}{}{\l_tmpa_box}
+ \tl_const:Ne\g_pbs_blank_xform_tl{\pbs_pdflastxform:}
+ }
\pbs_pdfannot:nnnn{3bp}{\c_zero_dim}{3bp}{
- /Ff~65537/FT/Btn/Subtype/Widget
+ /Ff~65537/FT/Btn/Subtype/Widget/F~4
+ /A~<</S/ResetForm>>% to make pdf.js happy
+ /AP~<</N~<</On~\g_pbs_blank_xform_tl>>>>/AS/On
/T~(pbs@ARFix@\int_use:N\g_pbs_page_int)
}
}
@@ -1435,8 +1453,8 @@
% `fstream', then
% {stream attributes as PDF key-value dictionary}{file name}
%
-% if #3 && #1 are both empty, an object reference will be reserved for later
-% use as #1
+% if #3 && #1 are both empty, an object reference will be reserved for
+% later use as #1
%
% \pbs_pdflastobj:
% inserts object ID of PDF object created/processed during most recent call
@@ -1471,9 +1489,9 @@
% --------
%
% \pbs_pdfxform:nnnnn
-% #1: add pgf/tikz resources (transparency, shading)? (0|1) %dvipdfmx/xetex
+% #1: add pgf/tikz resources (transparency, shading)? (0|1); dvipdfmx/xetex
% #2: write immediately to PDF? (0|1); eg 1 for appearances; pdftex/luatex
-% #3: additional resources %all BUT dvips
+% #3: additional resources; all BUT dvips
% #4: additional dictionary entries
% #5: savebox number
% creates PDF Form XObject from savebox content
@@ -1539,8 +1557,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@pbs@date@tl{2022/08/04}
-\def\g@pbs@version@tl{0.55}
+\def\g@pbs@date@tl{2024/09/16}
+\def\g@pbs@version@tl{0.59}
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -1551,7 +1569,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
+ Package~option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
@@ -1603,11 +1621,11 @@
{dvipdfmx}{
\bool_gset_true:N\g_pbs_dvipdfmx_bool
\bool_gset_false:N\g_pbs_dvisvgm_bool
- }
+ }
{dvisvgm}{
\bool_gset_false:N\g_pbs_dvipdfmx_bool
\bool_gset_true:N\g_pbs_dvisvgm_bool
- }
+ }
}{ % otherwise let the L3 backend code decide
\str_case_e:nn{\c_sys_backend_str}{
{dvisvgm}{
@@ -1653,8 +1671,16 @@
\seq_new:N\g_pbs_bop_seq
\seq_new:N\g_pbs_eop_seq
-\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
+% column (boc, eoc) hooks
+\cs_new_protected:Nn\pbs_boc_action:n{\seq_gput_right:Nn\g_pbs_boc_seq{#1}}
+\cs_new_protected:Nn\pbs_eoc_action:n{\seq_gput_right:Nn\g_pbs_eoc_seq{#1}}
+\seq_new:N\g_pbs_boc_seq
+\seq_new:N\g_pbs_eoc_seq
+
\bool_new:N\g_pbs_ocgbase_loaded_bool
+\AddToHook{package/ocgbase/after}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}
+
+\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\pbs@newkey[2]{}
@@ -1666,7 +1692,6 @@
\tl_put_right:Nn\landscape{\bool_gset_true:N\g_pbs_lscape_bool}
\tl_put_left:Nn\endlandscape{\bool_gset_false:N\g_pbs_lscape_bool}
}
- \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{}
}
% writing to core objects in the PDF, using the new pdfmanagement interface
@@ -1851,7 +1876,9 @@
\xsb_addto_props:n{/rm@oc\int_use:N\g_pbs_oc_int\space#2}
\int_gincr:N\g_pbs_oc_int
}{
- \pdf_bdcobject:nx{#1}{\tl_use:c{g_pbs_objname_#2_tl}}
+ \tl_if_exist:cT{g_pbs_objname_#2_tl}{
+ \exp_args:Nne\pdf_bdcobject:nn{#1}{\tl_use:c{g_pbs_objname_#2_tl}}
+ }
}
}
@@ -1868,9 +1895,7 @@
%pgf + transparency related settings
\bool_new:N\g_pbs_pgfloaded_bool
\bool_gset_false:N\g_pbs_pgfloaded_bool
- \AtBeginDocument{
- \@ifpackageloaded{pgf}{\bool_gset_true:N\g_pbs_pgfloaded_bool}{}
- }
+ \AddToHook{package/pgf/after}{\bool_gset_true:N\g_pbs_pgfloaded_bool}
\int_new:N\g_pbs_obj_int %object ID
\bool_if:NTF\g_pbs_dvipdfmx_bool{ %dvipdfmx/XeTeX
\AtBeginDocument{
@@ -2042,7 +2067,9 @@
}
\cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{
- \pdf_bdcobject:nx{#1}{\tl_use:c{g_pbs_objname_#2_tl}}
+ \tl_if_exist:cT{g_pbs_objname_#2_tl}{
+ \exp_args:Nne\pdf_bdcobject:nn{#1}{\tl_use:c{g_pbs_objname_#2_tl}}
+ }
}
}{
\bool_if:NTF\g_pbs_dvisvgm_bool{
@@ -2436,8 +2463,8 @@
\mode_leave_vertical: % resources are managed automatically
%rescale box to fit within the papersize while distilling
\tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0,
- \dim_ratio:nn{\paperwidth}{\box_wd:N#5},
- \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}
+ \dim_ratio:nn{\paperwidth}{\box_wd:N#5}/\the\mag*1000,
+ \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}/\the\mag*1000
)}}
\box_scale:Nnn#5{
\tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}
@@ -2602,7 +2629,6 @@
}
}
}
-\cs_generate_variant:Nn\pdf_bdcobject:nn{nx}
\cs_new_eq:NN\pbs_pdfemc:\pdf_emc:
\cs_new_nopar:Nn\pbs_pdflastobj:{\g_pbs_pdflastobj_tl}
@@ -2610,29 +2636,33 @@
\cs_new_nopar:Nn\pbs_pdflastxform:{\g_pbs_pdflastxform_tl}
\cs_new_nopar:Nn\pbs_pdflastximage:{\g_pbs_pdflastximage_tl}
-%modify output routine for output box insertions
-\bool_new:N\l_pbs_is_vertical_bool
+% modify page output routine for inserting actions at begin and end
\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage
\cs_set_protected_nopar:Npn\@outputpage{
\int_gincr:N\g_pbs_page_int
- \box_if_vertical:cTF{@outputbox}{
- \bool_set_true:N\l_pbs_is_vertical_bool
- }{
- \bool_set_false:N\l_pbs_is_vertical_bool
- }
- \hbox_set:Nn\@outputbox{
+ \vbox_set:Nn\@outputbox{
%begin of page
- \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}}
+ \seq_map_inline:Nn\g_pbs_bop_seq{##1}
\box_use_drop:N\@outputbox
%end of page
- \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}}
- }
- \bool_if:NT\l_pbs_is_vertical_bool{
- \vbox_set:Nn\@outputbox{\box_use_drop:N\@outputbox}
+ \seq_map_inline:Nn\g_pbs_eop_seq{##1}
}
\pbs_outputpage_orig:
}
+% modify column making routine for inserting actions at begin and end
+\cs_set_eq:NN\pbs_makecol_orig:\@makecol
+\cs_set_protected_nopar:Npn\@makecol{
+ \vbox_set:Nn\@cclv{
+ %begin of column
+ \seq_map_inline:Nn\g_pbs_boc_seq{##1}
+ \vbox_unpack_drop:N\@cclv
+ %end of column
+ \seq_map_inline:Nn\g_pbs_eoc_seq{##1}
+ }
+ \pbs_makecol_orig:
+}
+
\AddToHook{shipout/background}{
% workaround for curious AR bug (pdf annot or link placed on
% OCG remains active although OCG is hidden)
@@ -2640,8 +2670,14 @@
% somewhere on the page.
\bool_if:NT\g_pbs_ocgbase_loaded_bool{
\put(1,-1){
+ \tl_if_exist:NF\g_pbs_blank_xform_tl{
+ \hbox_set:Nn\l_tmpa_box{\phantom{\rule{1pt}{1pt}}}
+ \pbs_pdfxform:nnnnn{0}{1}{}{}{\l_tmpa_box}
+ \tl_const:Ne\g_pbs_blank_xform_tl{\pbs_pdflastxform:}
+ }
\pbs_pdfannot:nnnn{3bp}{\c_zero_dim}{3bp}{
- /Ff~65537/FT/Btn/Subtype/Widget
+ /Ff~65537/FT/Btn/Subtype/Widget/F~4
+ /AP~<</N~<</On~\g_pbs_blank_xform_tl>>>>/AS/On
/T~(pbs@ARFix@\int_use:N\g_pbs_page_int)
}
}
diff --git a/Master/texmf-dist/tex/latex/minted/minted.sty b/Master/texmf-dist/tex/latex/minted/minted.sty
index bd7e756dcc5..7058dbcd4a6 100644
--- a/Master/texmf-dist/tex/latex/minted/minted.sty
+++ b/Master/texmf-dist/tex/latex/minted/minted.sty
@@ -5,19 +5,17 @@
%% The original source files were:
%%
%% minted.dtx (with options: `package')
-%% Copyright 2013--2022 Geoffrey M. Poore
-%% Copyright 2010--2011 Konrad Rudolph
%%
+%% Copyright (C) 2013-2024 by Geoffrey M. Poore <gpoore@gmail.com>
+%% Copyright (C) 2010-2011 by Konrad Rudolph <konrad_rudolph@madrat.net>
+%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% Additionally, the project may be distributed under the terms of the new BSD
-%% license.
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
%%
@@ -25,1001 +23,1406 @@
%%
%% This work consists of the files minted.dtx and minted.ins
%% and the derived file minted.sty.
+%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{minted}
- [2023/12/18 v2.9 Yet another Pygments shim for LaTeX]
-\RequirePackage{keyval}
-\RequirePackage{kvoptions}
-\RequirePackage{fvextra}[2022/11/30]
-\RequirePackage{ifthen}
-\IfFileExists{shellesc.sty}
- {\RequirePackage{shellesc}
- \@ifpackagelater{shellesc}{2016/04/29}
- {}
- {\protected\def\ShellEscape{\immediate\write18 }}}
- {\protected\def\ShellEscape{\immediate\write18 }}
-\RequirePackage{ifplatform}
-\RequirePackage{pdftexcmds}
-\RequirePackage{etoolbox}
-\RequirePackage{xstring}
-\RequirePackage{lineno}
-\RequirePackage{framed}
+ [2024/09/22 v3.0.0 Yet another Pygments shim for LaTeX]
\RequirePackage{catchfile}
+\RequirePackage{etoolbox}
+\RequirePackage{fvextra}[2024/09/05]
+\RequirePackage{latex2pydata}[2024/05/16]
+\RequirePackage{pdftexcmds}
+\RequirePackage{pgfkeys}
+\RequirePackage{pgfopts}
+\RequirePackage{shellesc}
\AtEndPreamble{%
- \@ifpackageloaded{color}{}{%
- \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}}%
-}
-\DeclareVoidOption{chapter}{\def\minted@float@within{chapter}}
-\DeclareVoidOption{section}{\def\minted@float@within{section}}
-\DeclareBoolOption{newfloat}
-\DeclareBoolOption[true]{cache}
-\StrSubstitute{\jobname}{ }{_}[\minted@jobname]
-\StrSubstitute{\minted@jobname}{*}{_}[\minted@jobname]
-\StrSubstitute{\minted@jobname}{"}{}[\minted@jobname]
-\StrSubstitute{\minted@jobname}{'}{_}[\minted@jobname]
-\newcommand{\minted@cachedir}{\detokenize{_}minted-\minted@jobname}
-\let\minted@cachedir@windows\minted@cachedir
-\define@key{minted}{cachedir}{%
- \@namedef{minted@cachedir}{#1}%
- \StrSubstitute{\minted@cachedir}{/}{\@backslashchar}[\minted@cachedir@windows]}
-\DeclareBoolOption{finalizecache}
-\DeclareBoolOption{frozencache}
-\let\minted@outputdir\@empty
-\let\minted@outputdir@windows\@empty
-\define@key{minted}{outputdir}{%
- \@namedef{minted@outputdir}{#1/}%
- \StrSubstitute{\minted@outputdir}{/}%
- {\@backslashchar}[\minted@outputdir@windows]}
-\DeclareBoolOption{inputlanglinenos}
-\DeclareBoolOption{kpsewhich}
-\DeclareBoolOption{langlinenos}
-\DeclareBoolOption{draft}
-\DeclareComplementaryOption{final}{draft}
-\ProcessKeyvalOptions*
-\ifthenelse{\boolean{minted@newfloat}}{\RequirePackage{newfloat}}{\RequirePackage{float}}
-\ifcsname tikzifexternalizing\endcsname
- \tikzifexternalizing{\minted@drafttrue\minted@cachefalse}{}
+ \IfPackageLoadedTF{color}%
+ {}%
+ {\IfPackageLoadedTF{xcolor}{}{\RequirePackage{xcolor}}}}
+\def\minted@error#1{\PackageError{minted}{#1}{}}
+\def\minted@fatalerror#1{%
+ \minted@error{#1}%
+ \batchmode\read -1 to \minted@fatalerror@exitnow}
+\def\minted@warning#1{\PackageWarning{minted}{#1}}
+\edef\MintedExecutable{\detokenize{latexminted}}
+\edef\minted@executable@minversion{\detokenize{0.1.0}}
+\def\minted@executable@setminversioncomponents{%
+ \expandafter\minted@executable@setminversioncomponents@i
+ \minted@executable@minversion\relax}
+\begingroup
+\catcode`\.=12
+\gdef\minted@executable@setminversioncomponents@i#1.#2.#3\relax{%
+ \def\minted@executable@minmajor{#1}%
+ \def\minted@executable@minminor{#2}%
+ \def\minted@executable@minpatch{#3}}
+\endgroup
+\minted@executable@setminversioncomponents
+\let\minted@executable@version\relax
+\newbool{minted@executable@exists}
+\newbool{minted@executable@issupported}
+\begingroup
+\catcode`\-=12
+\catcode`\+=12
+\catcode`\:=12
+\def\minted@creationdatetotimestamp#1{%
+ \expandafter\minted@creationdatetotimestamp@i#1-\relax}
+\def\minted@creationdatetotimestamp@i#1:#2-#3\relax{%
+ \minted@creationdatetotimestamp@ii#2+\relax}
+\def\minted@creationdatetotimestamp@ii#1+#2\relax{%
+ #1}
+\expandafter\ifx\csname pdftexversion\endcsname\relax
\else
- \ifcsname tikzexternalrealjob\endcsname
- \minted@drafttrue
- \minted@cachefalse
- \else
- \fi
+ \xdef\minted@timestamp{\minted@creationdatetotimestamp{\pdfcreationdate}}
\fi
-\ifthenelse{\boolean{minted@finalizecache}}%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {\PackageError{minted}%
- {Options "finalizecache" and "frozencache" are not compatible}%
- {Options "finalizecache" and "frozencache" are not compatible}}%
- {}}%
- {}
-\ifthenelse{\boolean{minted@cache}}%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {}%
- {\AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}}%
- {}
-\newcommand{\minted@input}[1]{%
- \IfFileExists{#1}%
- {\input{#1}}%
- {\PackageError{minted}{Missing Pygments output; \string\inputminted\space
- was^^Jprobably given a file that does not exist--otherwise, you may need
- ^^Jthe outputdir package option, or may be using an incompatible build
- tool,^^Jor may be using frozencache with a missing file}%
- {This could be caused by using -output-directory or -aux-directory
- ^^Jwithout setting minted's outputdir, or by using a build tool that
- ^^Jchanges paths in ways minted cannot detect,
- ^^Jor using frozencache with a missing file.}}%
-}
-\newcommand{\minted@infile}{\minted@jobname.out.pyg}
-\newcommand{\minted@cachelist}{}
-\newcommand{\minted@addcachefile}[1]{%
- \expandafter\long\expandafter\gdef\expandafter\minted@cachelist\expandafter{%
- \minted@cachelist,^^J%
- \space\space#1}%
- \expandafter\gdef\csname minted@cached@#1\endcsname{}%
-}
-\newcommand{\minted@savecachelist}{%
- \ifdefempty{\minted@cachelist}{}{%
- \immediate\write\@mainaux{%
- \string\gdef\string\minted@oldcachelist\string{%
- \minted@cachelist\string}}%
- }%
-}
-\newcommand{\minted@cleancache}{%
- \ifcsname minted@oldcachelist\endcsname
- \def\do##1{%
- \ifthenelse{\equal{##1}{}}{}{%
- \ifcsname minted@cached@##1\endcsname\else
- \DeleteFile[\minted@outputdir\minted@cachedir]{##1}%
- \fi
- }%
- }%
- \expandafter\docsvlist\expandafter{\minted@oldcachelist}%
- \else
- \fi
-}
-\ifthenelse{\boolean{minted@draft}}%
- {\AtEndDocument{%
- \ifcsname minted@oldcachelist\endcsname
- \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
- \minted@savecachelist
- \fi}}%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {\AtEndDocument{%
- \ifcsname minted@oldcachelist\endcsname
- \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
- \minted@savecachelist
- \fi}}%
- {\AtEndDocument{%
- \minted@savecachelist
- \minted@cleancache}}}%
-\ifwindows
- \providecommand{\DeleteFile}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\IfFileExists{#2}{\ShellEscape{del #2}}{}}%
- {\IfFileExists{#1/#2}{%
- \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
- \ShellEscape{del \minted@windir\@backslashchar #2}}{}}}
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\else
- \providecommand{\DeleteFile}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\IfFileExists{#2}{\ShellEscape{rm #2}}{}}%
- {\IfFileExists{#1/#2}{\ShellEscape{rm #1/#2}}{}}}
+ \xdef\minted@timestamp{\minted@creationdatetotimestamp{\creationdate}}
\fi
-\ifwindows
- \newcommand{\ProvideDirectory}[1]{%
- \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
- \ShellEscape{if not exist \minted@windir\space mkdir \minted@windir}}
+\expandafter\ifx\csname directlua\endcsname\relax
\else
- \newcommand{\ProvideDirectory}[1]{%
- \ShellEscape{mkdir -p #1}}
+ \xdef\minted@timestamp{\minted@creationdatetotimestamp{\pdffeedback creationdate}}
\fi
-\newboolean{AppExists}
-\newread\minted@appexistsfile
-\newcommand{\TestAppExists}[1]{%
- \ifwindows
- \DeleteFile{\minted@jobname.aex}%
- \ShellEscape{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd)
- do set > \minted@jobname.aex <nul: /p
- x=\string^\@percentchar \string~$PATH:i>> \minted@jobname.aex}%
- %$ <- balance syntax highlighting
- \immediate\openin\minted@appexistsfile\minted@jobname.aex
- \expandafter\def\expandafter\@tmp@cr\expandafter{\the\endlinechar}%
- \endlinechar=-1\relax
- \readline\minted@appexistsfile to \minted@apppathifexists
- \endlinechar=\@tmp@cr
- \ifthenelse{\equal{\minted@apppathifexists}{}}%
- {\AppExistsfalse}%
- {\AppExiststrue}%
- \immediate\closein\minted@appexistsfile
- \DeleteFile{\minted@jobname.aex}%
+\endgroup
+\ifcsname minted@timestamp\endcsname
+\else
+ \begingroup
+ \newcounter{minted@timestamp@hr}
+ \newcounter{minted@timestamp@min}
+ \setcounter{minted@timestamp@min}{\number\time}
+ \loop\unless\ifnum\value{minted@timestamp@min}<60\relax
+ \addtocounter{minted@timestamp@hr}{1}
+ \addtocounter{minted@timestamp@min}{-60}
+ \repeat
+ \xdef\minted@timestamp{%
+ \the\year
+ \ifnum\month<10 0\fi\the\month
+ \ifnum\day<10 0\fi\the\day
+ \ifnum\value{minted@timestamp@hr}<10 0\fi\theminted@timestamp@hr
+ \ifnum\value{minted@timestamp@min}<10 0\fi\theminted@timestamp@min}
+ \endgroup
+\fi
+\begingroup
+\catcode`\"=12
+\catcode`\'=12
+\gdef\minted@setjobnamemdfive#1#2\FV@Sentinel{%
+ \ifx#1"\relax
+ \let\minted@next\minted@setjobnamemdfive@dquoted
+ \else\ifx#1'\relax
+ \let\minted@next\minted@setjobnamemdfive@squoted
\else
- \ShellEscape{command -v #1 && touch \minted@jobname.aex}%
- \IfFileExists{\minted@jobname.aex}%
- {\AppExiststrue
- \DeleteFile{\minted@jobname.aex}}%
- {\AppExistsfalse}%
- \fi
+ \let\minted@next\minted@setjobnamemdfive@uquoted
+ \fi\fi
+ \minted@next#1#2\FV@Sentinel}
+\gdef\minted@setjobnamemdfive@dquoted#1#2\FV@Sentinel{%
+ \minted@setjobnamemdfive@dquoted@i#2"\FV@Sentinel}
+\gdef\minted@setjobnamemdfive@dquoted@i#1"#2\FV@Sentinel{%
+ \if\relax\detokenize{#2}\relax
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{\jobname}}%
+ \else\if\relax\detokenize\expandafter{\@gobble#2}\relax
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{#1}}%
+ \else
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{\jobname}}%
+ \fi\fi}
+\gdef\minted@setjobnamemdfive@squoted#1#2\FV@Sentinel{%
+ \minted@setjobnamemdfive@squoted@i#2'\FV@Sentinel}
+\gdef\minted@setjobnamemdfive@squoted@i#1'#2\FV@Sentinel{%
+ \if\relax\detokenize{#2}\relax
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{\jobname}}%
+ \else\if\relax\detokenize\expandafter{\@gobble#2}\relax
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{#1}}%
+ \else
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{\jobname}}%
+ \fi\fi}
+\gdef\minted@setjobnamemdfive@uquoted#1\FV@Sentinel{%
+ \edef\MintedJobnameMdfive{\pdf@mdfivesum{#1}}}
+\endgroup
+\expandafter\minted@setjobnamemdfive\jobname\FV@Sentinel
+\edef\MintedCacheIndexFilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.index.minted}}
+\edef\MintedConfigFilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.config.minted}}
+\edef\MintedDataFilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.data.minted}}
+\edef\MintedErrlogFilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.errlog.minted}}
+\edef\MintedMessageFilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.message.minted}}
+\def\minted@pgfopts#1{%
+ \pgfkeys{/minted/pkg/.cd,#1}}
+\minted@pgfopts{
+ chapter/.code=\def\minted@float@within{chapter},
+ chapter/.value forbidden,
+ section/.code=\def\minted@float@within{section},
+ section/.value forbidden,
}
-\newcommand{\minted@optlistcl@g}{}
-\newcommand{\minted@optlistcl@g@i}{}
-\let\minted@lang\@empty
-\newcommand{\minted@optlistcl@lang}{}
-\newcommand{\minted@optlistcl@lang@i}{}
-\newcommand{\minted@optlistcl@cmd}{}
-\newcommand{\minted@optlistfv@g}{}
-\newcommand{\minted@optlistfv@g@i}{}
-\newcommand{\minted@optlistfv@lang}{}
-\newcommand{\minted@optlistfv@lang@i}{}
-\newcommand{\minted@optlistfv@cmd}{}
-\newcommand{\minted@configlang}[1]{%
- \def\minted@lang{#1}%
- \ifcsname minted@optlistcl@lang\minted@lang\endcsname\else
- \expandafter\gdef\csname minted@optlistcl@lang\minted@lang\endcsname{}%
- \fi
- \ifcsname minted@optlistcl@lang\minted@lang @i\endcsname\else
- \expandafter\gdef\csname minted@optlistcl@lang\minted@lang @i\endcsname{}%
- \fi
- \ifcsname minted@optlistfv@lang\minted@lang\endcsname\else
- \expandafter\gdef\csname minted@optlistfv@lang\minted@lang\endcsname{}%
- \fi
- \ifcsname minted@optlistfv@lang\minted@lang @i\endcsname\else
- \expandafter\gdef\csname minted@optlistfv@lang\minted@lang @i\endcsname{}%
- \fi
+\newbool{minted@newfloat}
+\minted@pgfopts{
+ newfloat/.is if=minted@newfloat,
}
-\ifwindows
- \newcommand{\minted@optlistcl@quote}[2]{%
- \detokenize{#1="#2"}}
-\else
- \newcommand{\minted@optlistcl@quote}[2]{%
- \detokenize{#1='#2'}}
-\fi
-\newcommand{\minted@addto@optlistcl}[3]{%
- \expandafter\def\expandafter#1\expandafter{#1%
- \minted@optlistcl@quote{#2}{#3}\space}}
-\newcommand{\minted@addto@optlistcl@lang}[3]{%
- \expandafter\let\expandafter\minted@tmp\csname #1\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp%
- \minted@optlistcl@quote{#2}{#3}\space}%
- \expandafter\let\csname #1\endcsname\minted@tmp}
-\newcommand{\minted@def@optcl}[4][]{%
- \ifthenelse{\equal{#1}{}}%
- {\define@key{minted@opt@g}{#2}{%
- \minted@addto@optlistcl{\minted@optlistcl@g}{#3}{#4}%
- \@namedef{minted@opt@g:#2}{#4}}%
- \define@key{minted@opt@g@i}{#2}{%
- \minted@addto@optlistcl{\minted@optlistcl@g@i}{#3}{#4}%
- \@namedef{minted@opt@g@i:#2}{#4}}%
- \define@key{minted@opt@lang}{#2}{%
- \minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
- \define@key{minted@opt@lang@i}{#2}{%
- \minted@addto@optlistcl@lang{%
- minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
- \define@key{minted@opt@cmd}{#2}{%
- \minted@addto@optlistcl{\minted@optlistcl@cmd}{#3}{#4}%
- \@namedef{minted@opt@cmd:#2}{#4}}}%
- {\define@key{minted@opt@g}{#2}[#1]{%
- \minted@addto@optlistcl{\minted@optlistcl@g}{#3}{#4}%
- \@namedef{minted@opt@g:#2}{#4}}%
- \define@key{minted@opt@g@i}{#2}[#1]{%
- \minted@addto@optlistcl{\minted@optlistcl@g@i}{#3}{#4}%
- \@namedef{minted@opt@g@i:#2}{#4}}%
- \define@key{minted@opt@lang}{#2}[#1]{%
- \minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
- \define@key{minted@opt@lang@i}{#2}[#1]{%
- \minted@addto@optlistcl@lang{%
- minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
- \define@key{minted@opt@cmd}{#2}[#1]{%
- \minted@addto@optlistcl{\minted@optlistcl@cmd}{#3}{#4}%
- \@namedef{minted@opt@cmd:#2}{#4}}}%
+\newbool{minted@debug}
+\minted@pgfopts{
+ debug/.is if=minted@debug,
}
-\begingroup
-\catcode`\!=0
-!catcode`!\=12
-!gdef!minted@escape#1{%
- !expandafter!minted@escape@i!detokenize{#1}\!FV@Sentinel}
-!gdef!minted@escape@i#1\#2!FV@Sentinel{%
- !if!relax!detokenize{#2}!relax
- !expandafter!@firstoftwo
- !else
- !expandafter!@secondoftwo
- !fi
- {#1!minted@escape@end\#2!FV@Sentinel}
- {#1!minted@escape@esc\#2!FV@Sentinel}}
-!gdef!minted@escape@end#1!FV@Sentinel{}
-!gdef!minted@escape@esc\#1#2!FV@Sentinel{%
- #1!minted@escape@i#2!FV@Sentinel}
-!endgroup
-\newcommand{\minted@addto@optlistcl@e}[3]{%
- \edef\minted@tmp{\minted@escape{#3}}%
- \expandafter\minted@addto@optlistcl@e@i\expandafter{\minted@tmp}{#1}{#2}}
-\def\minted@addto@optlistcl@e@i#1#2#3{%
- \expandafter\def\expandafter#2\expandafter{#2\minted@optlistcl@quote{#3}{#1}\space}}
-\newcommand{\minted@addto@optlistcl@lang@e}[3]{%
- \edef\minted@tmp{\minted@escape{#3}}%
- \expandafter\minted@addto@optlistcl@lang@e@i\expandafter{\minted@tmp}{#1}{#2}}
-\def\minted@addto@optlistcl@lang@e@i#1#2#3{%
- \expandafter\let\expandafter\minted@tmp\csname #2\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp\minted@optlistcl@quote{#3}{#1}\space}%
- \expandafter\let\csname #2\endcsname\minted@tmp}
-\newcommand{\minted@def@optcl@e}[4][]{%
- \ifthenelse{\equal{#1}{}}%
- {\define@key{minted@opt@g}{#2}{%
- \minted@addto@optlistcl@e{\minted@optlistcl@g}{#3}{#4}%
- \@namedef{minted@opt@g:#2}{#4}}%
- \define@key{minted@opt@g@i}{#2}{%
- \minted@addto@optlistcl@e{\minted@optlistcl@g@i}{#3}{#4}%
- \@namedef{minted@opt@g@i:#2}{#4}}%
- \define@key{minted@opt@lang}{#2}{%
- \minted@addto@optlistcl@lang@e{minted@optlistcl@lang\minted@lang}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
- \define@key{minted@opt@lang@i}{#2}{%
- \minted@addto@optlistcl@lang@e{%
- minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
- \define@key{minted@opt@cmd}{#2}{%
- \minted@addto@optlistcl@e{\minted@optlistcl@cmd}{#3}{#4}%
- \@namedef{minted@opt@cmd:#2}{#4}}}%
- {\define@key{minted@opt@g}{#2}[#1]{%
- \minted@addto@optlistcl@e{\minted@optlistcl@g}{#3}{#4}%
- \@namedef{minted@opt@g:#2}{#4}}%
- \define@key{minted@opt@g@i}{#2}[#1]{%
- \minted@addto@optlistcl@e{\minted@optlistcl@g@i}{#3}{#4}%
- \@namedef{minted@opt@g@i:#2}{#4}}%
- \define@key{minted@opt@lang}{#2}[#1]{%
- \minted@addto@optlistcl@lang@e{minted@optlistcl@lang\minted@lang}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
- \define@key{minted@opt@lang@i}{#2}[#1]{%
- \minted@addto@optlistcl@lang@e{%
- minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
- \define@key{minted@opt@cmd}{#2}[#1]{%
- \minted@addto@optlistcl@e{\minted@optlistcl@cmd}{#3}{#4}%
- \@namedef{minted@opt@cmd:#2}{#4}}}%
+\newbool{minted@cache}
+\booltrue{minted@cache}
+\minted@pgfopts{
+ cache/.is if=minted@cache,
+}
+\edef\minted@cachedir{\detokenize{_minted}}
+\minted@pgfopts{
+ cachedir/.estore in=\minted@cachedir,
+}
+\newbool{minted@frozencache}
+\minted@pgfopts{
+ frozencache/.is if=minted@frozencache,
+}
+\newbool{minted@lexerlinenos}
+\minted@pgfopts{
+ lexerlinenos/.is if=minted@lexerlinenos,
+ langlinenos/.is if=minted@lexerlinenos,
}
-\newcommand{\minted@def@optcl@switch}[2]{%
- \define@booleankey{minted@opt@g}{#1}%
- {\minted@addto@optlistcl{\minted@optlistcl@g}{#2}{True}%
- \@namedef{minted@opt@g:#1}{true}}
- {\minted@addto@optlistcl{\minted@optlistcl@g}{#2}{False}%
- \@namedef{minted@opt@g:#1}{false}}
- \define@booleankey{minted@opt@g@i}{#1}%
- {\minted@addto@optlistcl{\minted@optlistcl@g@i}{#2}{True}%
- \@namedef{minted@opt@g@i:#1}{true}}
- {\minted@addto@optlistcl{\minted@optlistcl@g@i}{#2}{False}%
- \@namedef{minted@opt@g@i:#1}{false}}
- \define@booleankey{minted@opt@lang}{#1}%
- {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#2}{True}%
- \@namedef{minted@opt@lang\minted@lang:#1}{true}}
- {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#2}{False}%
- \@namedef{minted@opt@lang\minted@lang:#1}{false}}
- \define@booleankey{minted@opt@lang@i}{#1}%
- {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang @i}{#2}{True}%
- \@namedef{minted@opt@lang\minted@lang @i:#1}{true}}
- {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang @i}{#2}{False}%
- \@namedef{minted@opt@lang\minted@lang @i:#1}{false}}
- \define@booleankey{minted@opt@cmd}{#1}%
- {\minted@addto@optlistcl{\minted@optlistcl@cmd}{#2}{True}%
- \@namedef{minted@opt@cmd:#1}{true}}
- {\minted@addto@optlistcl{\minted@optlistcl@cmd}{#2}{False}%
- \@namedef{minted@opt@cmd:#1}{false}}
+\newbool{minted@inputlexerlinenos}
+\minted@pgfopts{
+ inputlexerlinenos/.is if=minted@inputlexerlinenos,
+ inputlanglinenos/.is if=minted@inputlexerlinenos,
}
-\newcommand{\minted@def@optfv}[1]{%
- \define@key{minted@opt@g}{#1}{%
- \expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
- \minted@optlistfv@g#1={##1},}%
- \@namedef{minted@opt@g:#1}{##1}}
- \define@key{minted@opt@g@i}{#1}{%
- \expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
- \minted@optlistfv@g@i#1={##1},}%
- \@namedef{minted@opt@g@i:#1}{##1}}
- \define@key{minted@opt@lang}{#1}{%
- \expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1={##1},}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang:#1}{##1}}
- \define@key{minted@opt@lang@i}{#1}{%
- \expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang @i\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1={##1},}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang @i:#1}{##1}}
- \define@key{minted@opt@cmd}{#1}{%
- \expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
- \minted@optlistfv@cmd#1={##1},}%
- \@namedef{minted@opt@cmd:#1}{##1}}
+\newbool{minted@placeholder}
+\minted@pgfopts{
+ placeholder/.is if=minted@placeholder,
}
-\newcommand{\minted@def@optfv@switch}[1]{%
- \define@booleankey{minted@opt@g}{#1}%
- {\expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
- \minted@optlistfv@g#1=true,}%
- \@namedef{minted@opt@g:#1}{true}}%
- {\expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
- \minted@optlistfv@g#1=false,}%
- \@namedef{minted@opt@g:#1}{false}}%
- \define@booleankey{minted@opt@g@i}{#1}%
- {\expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
- \minted@optlistfv@g@i#1=true,}%
- \@namedef{minted@opt@g@i:#1}{true}}%
- {\expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
- \minted@optlistfv@g@i#1=false,}%
- \@namedef{minted@opt@g@i:#1}{false}}%
- \define@booleankey{minted@opt@lang}{#1}%
- {\expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=true,}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang:#1}{true}}%
- {\expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=false,}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang:#1}{false}}%
- \define@booleankey{minted@opt@lang@i}{#1}%
- {\expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang @i\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=true,}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang @i:#1}{true}}%
- {\expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang @i\endcsname
- \expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=false,}%
- \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
- \minted@tmp
- \@namedef{minted@opt@lang\minted@lang @i:#1}{false}}%
- \define@booleankey{minted@opt@cmd}{#1}%
- {\expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
- \minted@optlistfv@cmd#1=true,}%
- \@namedef{minted@opt@cmd:#1}{true}}%
- {\expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
- \minted@optlistfv@cmd#1=false,}%
- \@namedef{minted@opt@cmd:#1}{false}}%
+\gdef\minted@insertplaceholder{%
+ \ifbool{minted@isinline}%
+ {\begingroup
+ \fvset{extra=true}\Verb[formatcom=\color{red}\bfseries]{<MINTED>}%
+ \endgroup}%
+ {\begingroup
+ \par\noindent
+ \fvset{extra=true}\Verb[formatcom=\color{red}\bfseries]{<MINTED>}%
+ \par
+ \endgroup}}%
+\newbool{minted@verbatim}
+\minted@pgfopts{
+ verbatim/.is if=minted@verbatim,
+}
+\newbool{minted@fasthighlightmode}
+\newbool{minted@fasthighlightmode@open}
+\minted@pgfopts{
+ highlightmode/.is choice,
+ highlightmode/fast/.code=
+ \let\minted@highlightmode@init\minted@highlightmode@init@fast,
+ highlightmode/fastfirst/.code=
+ \let\minted@highlightmode@init\minted@highlightmode@init@fastfirst,
+ highlightmode/immediate/.code=
+ \let\minted@highlightmode@init\minted@highlightmode@init@immediate,
}
-\newboolean{minted@isinline}
-\newcommand{\minted@fvset}{%
- \expandafter\fvset\expandafter{\minted@optlistfv@g}%
- \expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang\endcsname
- \expandafter\fvset\expandafter{\minted@tmp}%
- \ifthenelse{\boolean{minted@isinline}}%
- {\expandafter\fvset\expandafter{\minted@optlistfv@g@i}%
- \expandafter\let\expandafter\minted@tmp%
- \csname minted@optlistfv@lang\minted@lang @i\endcsname
- \expandafter\fvset\expandafter{\minted@tmp}}%
+\def\minted@highlightmode@init@fast{%
+ \global\booltrue{minted@fasthighlightmode}}
+\def\minted@highlightmode@init@fastfirst{%
+ \IfFileExists{\minted@cachepath\MintedCacheIndexFilename}%
+ {\global\boolfalse{minted@fasthighlightmode}}
+ {\global\booltrue{minted@fasthighlightmode}}}
+\def\minted@highlightmode@init@immediate{%
+ \global\boolfalse{minted@fasthighlightmode}}
+\let\minted@highlightmode@init\minted@highlightmode@init@fastfirst
+\def\minted@fasthighlightmode@checkstart{%
+ \ifbool{minted@fasthighlightmode}%
+ {\pydatawritelistopen
+ \global\booltrue{minted@fasthighlightmode@open}}%
+ {}%
+ \global\let\minted@fasthighlightmode@checkstart\relax}
+\def\minted@fasthighlightmode@checkend{%
+ \ifbool{minted@fasthighlightmode@open}%
+ {\pydatasetfilename{\MintedDataFilename}%
+ \pydatawritelistclose
+ \pydataclosefilename{\MintedDataFilename}%
+ \global\boolfalse{minted@fasthighlightmode@open}%
+ \global\boolfalse{minted@fasthighlightmode}%
+ \begingroup
+ \minted@exec@batch
+ \ifx\minted@exec@warning\relax
+ \else
+ \expandafter\minted@exec@warning
+ \fi
+ \ifx\minted@exec@error\relax
+ \else
+ \expandafter\minted@exec@error
+ \fi
+ \endgroup
+ \global\boolfalse{minted@canexec}}%
{}%
- \expandafter\fvset\expandafter{\minted@optlistfv@cmd}%
+ \global\let\minted@fasthighlightmode@checkend\relax}
+\minted@pgfopts{
+ finalizecache/.code=\minted@error{%
+ Package option "finalizecache" is no longer needed with minted v3+},
}
-\newcommand{\minted@def@opt}[2][]{%
- \define@key{minted@opt@g}{#2}{%
- \@namedef{minted@opt@g:#2}{##1}}
- \define@key{minted@opt@g@i}{#2}{%
- \@namedef{minted@opt@g@i:#2}{##1}}
- \define@key{minted@opt@lang}{#2}{%
- \@namedef{minted@opt@lang\minted@lang:#2}{##1}}
- \define@key{minted@opt@lang@i}{#2}{%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{##1}}
- \define@key{minted@opt@cmd}{#2}{%
- \@namedef{minted@opt@cmd:#2}{##1}}
- \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{#1}}%
+\minted@pgfopts{
+ kpsewhich/.code=\minted@error{%
+ Package option "kpsewhich" is no longer needed with minted v3+},
}
-\newcommand{\minted@def@opt@detok}[2][]{%
- \define@key{minted@opt@g}{#2}{%
- \@namedef{minted@opt@g:#2}{\detokenize{##1}}}
- \define@key{minted@opt@g@i}{#2}{%
- \@namedef{minted@opt@g@i:#2}{\detokenize{##1}}}
- \define@key{minted@opt@lang}{#2}{%
- \@namedef{minted@opt@lang\minted@lang:#2}{\detokenize{##1}}}
- \define@key{minted@opt@lang@i}{#2}{%
- \@namedef{minted@opt@lang\minted@lang @i:#2}{\detokenize{##1}}}
- \define@key{minted@opt@cmd}{#2}{%
- \@namedef{minted@opt@cmd:#2}{\detokenize{##1}}}
- \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{\detokenize{#1}}}%
+\minted@pgfopts{
+ outputdir/.code=\minted@error{%
+ Package option "outputdir" is no longer needed with minted v3+;
+ the output directory is automatically detected for TeX Live 2024+,
+ and the environment variable \detokenize{TEXMF_OUTPUT_DIRECTORY}
+ can be set manually in other cases},
}
-\newcommand{\minted@generate@PYGdef}[1]{%
- \ifthenelse{\boolean{minted@cache}}%
- {\def\minted@pygstylepath@load{\minted@outputdir\minted@cachedir/#1.pygstyle}%
- \minted@addcachefile{#1.pygstyle}}%
- {\def\minted@pygstylepath@load{\minted@outputdir\minted@jobname.out.pyg}}%
- \ifwindows
- \StrSubstitute{\minted@pygstylepath@load}%
- {/}{\@backslashchar}[\minted@pygstylepath@save]%
+\def\minted@outputdir{}
+\minted@pgfopts{
+ draft/.code=\minted@warning{%
+ Package option "draft" no longer has any effect with minted v3+},
+}
+\minted@pgfopts{
+ final/.code=\minted@warning{%
+ Package option "final" no longer has any effect with minted v3+},
+}
+\ProcessPgfOptions{/minted/pkg}
+\ifbool{minted@cache}{}{\def\minted@cachedir{}}%
+\ifbool{minted@newfloat}{\RequirePackage{newfloat}}{\RequirePackage{float}}
+\ifcsname tikzifexternalizing\endcsname
+ \ifx\tikzifexternalizing\relax
+ \else
+ \tikzifexternalizing{\booltrue{minted@placeholder}}{}
+ \fi
+\fi
+\def\minted@styleprefix{PYG}
+\newcounter{minted@tmpcnt}
+\def\minted@forcsvlist#1#2{%
+ \if\relax\detokenize\expandafter{\@gobble#2}\relax
+ \expandafter\minted@forcsvlist@exp
+ \else
+ \expandafter\minted@forcsvlist@i
+ \fi
+ {#2}{#1}}
+\def\minted@forcsvlist@exp#1#2{%
+ \expandafter\minted@forcsvlist@i\expandafter{#1}{#2}}
+\def\minted@forcsvlist@i#1#2{%
+ \forcsvlist{#2}{#1}}
+\def\minted@apptoprovidecs#1#2{%
+ \ifcsname#1\endcsname
\else
- \let\minted@pygstylepath@save\minted@pygstylepath@load
+ \expandafter\def\csname#1\endcsname{}%
\fi
- \IfFileExists{\minted@pygstylepath@load}%
+ \expandafter\let\expandafter\minted@tmp\csname#1\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp#2}%
+ \expandafter\let\csname#1\endcsname\minted@tmp}
+\def\minted@const@pgfkeysnovalue{\pgfkeysnovalue}
+\def\minted@ensureatletter#1{%
+ \edef\minted@tmpatcat{\the\catcode`\@}%
+ \catcode`\@=11\relax
+ #1%
+ \catcode`\@=\minted@tmpatcat\relax}
+\setcounter{minted@tmpcnt}{48}
+\loop\unless\ifnum\value{minted@tmpcnt}>57\relax
+ \expandafter\let\csname minted@isnum\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let\csname minted@isalphanum\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let
+ \csname minted@isalphanumhyphenunderscore\arabic{minted@tmpcnt}\endcsname\relax
+ \stepcounter{minted@tmpcnt}
+\repeat
+\setcounter{minted@tmpcnt}{65}
+\loop\unless\ifnum\value{minted@tmpcnt}>90\relax
+ \expandafter\let\csname minted@isalpha\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let\csname minted@isalphanum\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let
+ \csname minted@isalphanumhyphenunderscore\arabic{minted@tmpcnt}\endcsname\relax
+ \stepcounter{minted@tmpcnt}
+\repeat
+\setcounter{minted@tmpcnt}{97}
+\loop\unless\ifnum\value{minted@tmpcnt}>122\relax
+ \expandafter\let\csname minted@isalpha\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let\csname minted@isalphanum\arabic{minted@tmpcnt}\endcsname\relax
+ \expandafter\let
+ \csname minted@isalphanumhyphenunderscore\arabic{minted@tmpcnt}\endcsname\relax
+ \stepcounter{minted@tmpcnt}
+\repeat
+\expandafter\let\csname minted@isalphanumhyphenunderscore45\endcsname\relax
+\expandafter\let\csname minted@isalphanumhyphenunderscore95\endcsname\relax
+\def\minted@ifalphanumhyphenunderscore#1#2#3{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#3}%
+ {\expandafter\minted@ifalphanumhyphenunderscore@i\detokenize{#1}\FV@Sentinel{#2}{#3}}}
+\def\minted@ifalphanumhyphenunderscore@i#1#2\FV@Sentinel{%
+ \if\relax#2\relax
+ \expandafter\minted@ifalphanumhyphenunderscore@iii
+ \else
+ \expandafter\minted@ifalphanumhyphenunderscore@ii
+ \fi
+ #1#2\FV@Sentinel}
+\def\minted@ifalphanumhyphenunderscore@ii#1#2\FV@Sentinel{%
+ \ifcsname minted@isalphanumhyphenunderscore\number`#1\endcsname
+ \expandafter\minted@ifalphanumhyphenunderscore@i
+ \else
+ \expandafter\minted@ifalphanumhyphenunderscore@false
+ \fi
+ #2\FV@Sentinel}
+\def\minted@ifalphanumhyphenunderscore@iii#1\FV@Sentinel{%
+ \ifcsname minted@isalphanumhyphenunderscore\number`#1\endcsname
+ \expandafter\minted@ifalphanumhyphenunderscore@true
+ \else
+ \expandafter\minted@ifalphanumhyphenunderscore@false
+ \fi
+ \FV@Sentinel}
+\def\minted@ifalphanumhyphenunderscore@true\FV@Sentinel#1#2{#1}
+\def\minted@ifalphanumhyphenunderscore@false#1\FV@Sentinel#2#3{#3}
+\let\minted@lexer\@empty
+\newbool{minted@isinline}
+\newcounter{minted@tmpcodebufferlength}
+\newbool{minted@canexec}
+\booltrue{minted@canexec}
+\ifnum\csname c_sys_shell_escape_int\endcsname=0\relax
+ \boolfalse{minted@canexec}
+\fi
+\ifbool{minted@frozencache}{\boolfalse{minted@canexec}}{}
+\ifbool{minted@placeholder}{\boolfalse{minted@canexec}}{}
+\ifbool{minted@verbatim}{\boolfalse{minted@canexec}}{}
+\def\minted@ShellEscapeMaybeMessages#1{%
+ \let\minted@exec@warning\relax
+ \let\minted@exec@error\relax
+ \ifbool{minted@canexec}{\ShellEscape{#1}\minted@inputexecmessages}{}}
+\def\minted@ShellEscapeNoMessages#1{%
+ \ifbool{minted@canexec}{\ShellEscape{#1}}{}}
+\def\minted@execarg@debug{%
+ \ifbool{minted@debug}{\detokenize{ --debug }}{}}
+\def\minted@execarg@timestamp{%
+ \detokenize{ --timestamp }\minted@timestamp\detokenize{ }}
+\def\minted@exec@cleanfile#1{%
+ \minted@ShellEscapeNoMessages{%
+ \MintedExecutable\detokenize{ cleanfile }\minted@execarg@debug#1}}
+\def\minted@inputexecmessages{%
+ \minted@ensureatletter{\InputIfFileExists{\MintedMessageFilename}{}{}}}
+\def\minted@exec@batch{%
+ \minted@ShellEscapeMaybeMessages{%
+ \MintedExecutable
+ \detokenize{ batch }\minted@execarg@timestamp\minted@execarg@debug
+ \MintedJobnameMdfive}}
+\def\minted@exec@config{%
+ \minted@ShellEscapeMaybeMessages{%
+ \MintedExecutable
+ \detokenize{ config }\minted@execarg@timestamp\minted@execarg@debug
+ \MintedJobnameMdfive}}
+\def\minted@exec@styledef{%
+ \minted@ShellEscapeMaybeMessages{%
+ \MintedExecutable
+ \detokenize{ styledef }\minted@execarg@timestamp\minted@execarg@debug
+ \MintedJobnameMdfive}}
+\def\minted@exec@highlight{%
+ \minted@ShellEscapeMaybeMessages{%
+ \MintedExecutable
+ \detokenize{ highlight }\minted@execarg@timestamp\minted@execarg@debug
+ \MintedJobnameMdfive}}
+\def\minted@exec@clean{%
+ \minted@ShellEscapeNoMessages{%
+ \MintedExecutable
+ \detokenize{ clean }\minted@execarg@timestamp\minted@execarg@debug
+ \MintedJobnameMdfive}}
+\newbool{minted@diddetectconfig}
+\def\minted@detectconfig{%
+ \ifbool{minted@diddetectconfig}%
{}%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {\PackageError{minted}%
- {Missing style definition for #1 with frozencache}%
- {Missing style definition for #1 with frozencache}}%
- {}%
- \ShellEscape{%
- \MintedPygmentize\space -S #1 -f latex -P commandprefix=PYG
- > \minted@pygstylepath@save
- }%
- }%
- \CatchFileDef{\minted@tmp@filecontents}%
- {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
- \begingroup
- \let\PYG\relax
- \minted@tmp@filecontents
- \ifx\PYG\relax
- \ifthenelse{\boolean{minted@frozencache}}%
- {\PackageError{minted}%
- {Outdated style definition for #1 with frozencache}%
- {Outdated style definition for #1 with frozencache}}%
- {}%
- \ShellEscape{%
- \MintedPygmentize\space -S #1 -f latex -P commandprefix=PYG
- > \minted@pygstylepath@save
- }%
- \CatchFileDef{\minted@tmp@filecontents}%
- {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
- \minted@tmp@filecontents
- \ifx\PYG\relax
- \PackageError{minted}%
- {Cannot find Pygments style #1}%
- {Cannot find Pygments style #1}%
+ {\ifx\minted@cachedir\@empty
+ \gdef\minted@cachepath{}%
+ \else
+ \gdef\minted@cachepath{\minted@cachedir/}%
\fi
+ \ifbool{minted@canexec}{\begingroup\minted@detectconfig@i\endgroup}{}%
+ \global\booltrue{minted@diddetectconfig}}}
+\def\minted@detectconfig@i{%
+ \global\let\minted@executable@version\relax
+ \global\let\minted@executable@timestamp\relax
+ \global\let\minted@config@timestamp\relax
+ \pydatasetfilename{\MintedDataFilename}%
+ \pydatawritedictopen
+ \pydatawritekeyvalue{command}{config}%
+ \pydatawritekeyedefvalue{jobname}{\jobname}%
+ \pydatawritekeyedefvalue{timestamp}{\minted@timestamp}%
+ \pydatawritekeyedefvalue{cachedir}{\minted@cachedir}%
+ \pydatawritedictclose
+ \pydataclosefilename{\MintedDataFilename}%
+ \minted@exec@config
+ \minted@ensureatletter{%
+ \InputIfFileExists{\MintedConfigFilename}{}{}}%
+ \ifx\minted@executable@version\relax
+ \expandafter\minted@detectconfig@noexecutable
+ \else
+ \expandafter\minted@detectconfig@ii
+ \fi}
+\def\minted@detectconfig@noexecutable{%
+ \global\boolfalse{minted@canexec}%
+ \ifnum\csname c_sys_shell_escape_int\endcsname=1\relax
+ \minted@error{minted v3+ executable is not installed or is not added to PATH}%
+ \else
+ \minted@error{minted v3+ executable is not installed, is not added to PATH,
+ or is not permitted with restricted shell escape}%
+ \fi}
+\def\minted@detectconfig@ii{%
+ \ifx\minted@timestamp\minted@config@timestamp
+ \expandafter\minted@detectconfig@iii
+ \else
+ \expandafter\minted@detectconfig@wrongtimestamp
+ \fi}
+\def\minted@detectconfig@wrongtimestamp{%
+ \ifx\minted@timestamp\minted@executable@timestamp
+ \minted@exec@cleanfile{\MintedConfigFilename}%
+ \global\boolfalse{minted@canexec}%
+ \minted@error{minted v3 Python executable could not find output directory;
+ upgrade to TeX distribution that supports \detokenize{TEXMF_OUTPUT_DIRECTORY}
+ or set environment variable \detokenize{TEXMF_OUTPUT_DIRECTORY} manually)}%
+ \else
+ \expandafter\minted@detectconfig@noexecutable
+ \fi}
+\def\minted@detectconfig@iii{%
+ \minted@exec@cleanfile{\MintedConfigFilename}%
+ \ifx\minted@exec@warning\relax
+ \else
+ \expandafter\minted@exec@warning
\fi
- \expandafter\global\expandafter\let\csname minted@PYGdef@#1\endcsname%
- \minted@tmp@filecontents
- \endgroup
-}
-\newcommand{\minted@defstyle}[1]{%
- \edef\minted@style{#1}%
- \ifcsname minted@PYGdef@\minted@style\endcsname\else
- \expandafter\minted@generate@PYGdef\expandafter{\minted@style}%
+ \ifx\minted@exec@error\relax
+ \expandafter\minted@detectconfig@iv
+ \else
+ \expandafter\minted@detectconfig@error
+ \fi}
+\def\minted@detectconfig@error{%
+ \global\boolfalse{minted@canexec}%
+ \minted@exec@error}
+\def\minted@detectconfig@iv{%
+ \expandafter\minted@detectconfig@v\minted@executable@version\relax}
+\begingroup
+\catcode`\.=12
+\gdef\minted@detectconfig@v#1.#2.#3\relax{%
+ \def\minted@executable@major{#1}%
+ \def\minted@executable@minor{#2}%
+ \def\minted@executable@patch{#3}%
+ \minted@detectconfig@vi}
+\endgroup
+\def\minted@detectconfig@vi{%
+ \ifnum\minted@executable@major>\minted@executable@minmajor\relax
+ \global\booltrue{minted@executable@issupported}%
+ \else\ifnum\minted@executable@major=\minted@executable@minmajor\relax
+ \ifnum\minted@executable@minor>\minted@executable@minminor\relax
+ \global\booltrue{minted@executable@issupported}%
+ \else\ifnum\minted@executable@minor=\minted@executable@minminor\relax
+ \ifnum\minted@executable@patch<\minted@executable@minpatch\relax
+ \else
+ \global\booltrue{minted@executable@issupported}%
+ \fi
+ \fi\fi
+ \fi\fi
+ \ifbool{minted@executable@issupported}%
+ {\ifx\minted@config@cachepath\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\global\boolfalse{minted@canexec}%
+ \minted@error{minted Python executable returned incomplete configuration data;
+ this may indicate a bug in minted or file corruption}}%
+ {\global\let\minted@cachepath\minted@config@cachepath
+ \minted@highlightmode@init}}%
+ {\global\boolfalse{minted@canexec}%
+ \minted@error{minted Python executable is version \minted@executable@version,
+ but version \minted@executable@minversion+ is required}}}
+\begingroup
+\catcode`\,=12
+\gdef\minted@optcats{fv,py,tex}
+\endgroup
+\def\minted@do#1{\expandafter\def\csname minted@optkeyslist@#1\endcsname{}}
+\minted@forcsvlist{\minted@do}{\minted@optcats}
+\begingroup
+\catcode`\,=12
+\gdef\minted@optscopes{global,lexer,globalinline,lexerinline,cmd}
+\gdef\minted@optscopes@onlyblock{global,lexer,cmd}
+\endgroup
+\let\minted@iflexerscope@lexer\relax
+\let\minted@iflexerscope@lexerinline\relax
+\def\minted@iflexerscope#1#2#3{%
+ \ifcsname minted@iflexerscope@#1\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
\fi
- \csname minted@PYGdef@\minted@style\endcsname
- \minted@patch@PYGZsq
- \minted@patch@PYGZhy
- \ifthenelse{\equal{\minted@get@opt{ignorelexererrors}{true}}{true}}%
- {\let\PYG@tok@err\relax}{}}
-\ifthenelse{\boolean{minted@draft}}{\renewcommand{\minted@defstyle}[1]{}}{}
-\newcommand{\minted@patch@PYGZsq}{%
- \ifcsname PYGZsq\endcsname
- \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
- {\minted@patch@PYGZsq@i}%
- {}%
+ {#2}{#3}}
+\def\minted@addoptkey#1#2{%
+ \ifcsname minted@optkeyslist@#1\endcsname
+ \else
+ \minted@fatalerror{Defining options under category "#1" is not supported}%
\fi
-}
+ \expandafter\let\expandafter\minted@tmp\csname minted@optkeyslist@#1\endcsname
+ \ifx\minted@tmp\@empty
+ \def\minted@tmp{#2}%
+ \else
+ \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp,#2}%
+ \fi
+ \expandafter\let\csname minted@optkeyslist@#1\endcsname\minted@tmp}
+\newcommand*{\mintedpgfkeyscreate}[3][]{%
+ \mintedpgfkeyscreate@i{#1}{#2}{#3}}
\begingroup
-\catcode`\'=\active
-\gdef\minted@patch@PYGZsq@i{\gdef\PYGZsq{'}}
+\catcode`\==12
+\gdef\mintedpgfkeyscreate@i#1#2#3{%
+ \def\minted@do##1{%
+ \minted@do@i##1=\FV@Sentinel}%
+ \def\minted@do@i##1=##2\FV@Sentinel{%
+ \minted@do@ii##1<>\FV@Sentinel}%
+ \def\minted@do@ii##1<##2>##3\FV@Sentinel{%
+ \minted@addoptkey{#2}{##1}}%
+ \minted@forcsvlist{\minted@do}{#3}%
+ \csname minted@pgfkeyscreate@#2\endcsname{#1}{#3}}
\endgroup
-\newcommand{\minted@patch@PYGZhy}{%
- \ifcsname PYGZhy\endcsname
- \expandafter\ifdefstring\expandafter{\csname PYGZhy\endcsname}{\char`\-}%
- {\def\PYGZhy{\mbox{-}}}%
- {}%
+\def\minted@pgfkeyscreate@fv#1#2{%
+ \if\relax\detokenize{#1}\relax
+ \else
+ \minted@fatalerror{Processor macros are not supported in defining fancyvrb options}%
\fi
-}
-\newcommand{\minted@def@opt@switch}[2][false]{%
- \define@booleankey{minted@opt@g}{#2}%
- {\@namedef{minted@opt@g:#2}{true}}%
- {\@namedef{minted@opt@g:#2}{false}}
- \define@booleankey{minted@opt@g@i}{#2}%
- {\@namedef{minted@opt@g@i:#2}{true}}%
- {\@namedef{minted@opt@g@i:#2}{false}}
- \define@booleankey{minted@opt@lang}{#2}%
- {\@namedef{minted@opt@lang\minted@lang:#2}{true}}%
- {\@namedef{minted@opt@lang\minted@lang:#2}{false}}
- \define@booleankey{minted@opt@lang@i}{#2}%
- {\@namedef{minted@opt@lang\minted@lang @i:#2}{true}}%
- {\@namedef{minted@opt@lang\minted@lang @i:#2}{false}}
- \define@booleankey{minted@opt@cmd}{#2}%
- {\@namedef{minted@opt@cmd:#2}{true}}%
- {\@namedef{minted@opt@cmd:#2}{false}}%
- \@namedef{minted@opt@g:#2}{#1}%
-}
-\def\minted@get@opt#1#2{%
- \ifcsname minted@opt@cmd:#1\endcsname
- \csname minted@opt@cmd:#1\endcsname
+ \minted@forcsvlist{\minted@pgfkeycreate@fv}{#2}}
+\begingroup
+\catcode`\==12
+\gdef\minted@pgfkeycreate@fv#1{%
+ \minted@pgfkeycreate@fv@i#1=\FV@Sentinel}
+\gdef\minted@pgfkeycreate@fv@i#1=#2\FV@Sentinel{%
+ \if\relax\detokenize{#2}\relax
+ \expandafter\minted@pgfkeycreate@fv@ii
\else
- \ifminted@isinline
- \ifcsname minted@opt@lang\minted@lang @i:#1\endcsname
- \csname minted@opt@lang\minted@lang @i:#1\endcsname
- \else
- \ifcsname minted@opt@g@i:#1\endcsname
- \csname minted@opt@g@i:#1\endcsname
+ \expandafter\minted@pgfkeycreate@fv@iii
+ \fi
+ {#1}#2\FV@Sentinel}
+\gdef\minted@pgfkeycreate@fv@ii#1\FV@Sentinel{%
+ \minted@pgfkeycreate@fv@iv{#1}{\minted@const@pgfkeysnovalue}}
+\gdef\minted@pgfkeycreate@fv@iii#1#2=\FV@Sentinel{%
+ \minted@pgfkeycreate@fv@iv{#1}{#2}}
+\endgroup
+\def\minted@pgfkeycreate@fv@iv#1#2{%
+ \def\minted@do##1{%
+ \minted@iflexerscope{##1}%
+ {\minted@do@i{##1}{@\minted@lexer}}%
+ {\minted@do@i{##1}{}}}%
+ \def\minted@do@i##1##2{%
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #1/.code=
+ \def\minted@tmp{####1}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \begingroup\fvset{#1}\endgroup
+ \minted@apptoprovidecs{minted@fvoptlist@##1##2}{#1,}%
\else
- \ifcsname minted@opt@lang\minted@lang:#1\endcsname
- \csname minted@opt@lang\minted@lang:#1\endcsname
+ \begingroup\fvset{#1=####1}\endgroup
+ \minted@apptoprovidecs{minted@fvoptlist@##1##2}{#1=####1,}%
+ \fi,
+ }%
+ }%
+ \minted@forcsvlist{\minted@do}{\minted@optscopes}%
+ \ifx\minted@const@pgfkeysnovalue#2\relax
+ \else
+ \pgfkeys{%
+ /minted/global/.cd,
+ #1=#2,
+ }%
+ \fi}
+\def\minted@usefvopts{%
+ \ifbool{minted@isinline}%
+ {\minted@forcsvlist{\minted@usefvopts@do}{\minted@optscopes}}%
+ {\minted@forcsvlist{\minted@usefvopts@do}{\minted@optscopes@onlyblock}}}
+\def\minted@usefvopts@do#1{%
+ \minted@iflexerscope{#1}%
+ {\ifcsname minted@fvoptlist@#1@\minted@lexer\endcsname
+ \expandafter
+ \let\expandafter\minted@tmp\csname minted@fvoptlist@#1@\minted@lexer\endcsname
+ \expandafter\fvset\expandafter{\minted@tmp}%
+ \fi}%
+ {\ifcsname minted@fvoptlist@#1\endcsname
+ \expandafter
+ \let\expandafter\minted@tmp\csname minted@fvoptlist@#1\endcsname
+ \expandafter\fvset\expandafter{\minted@tmp}%
+ \fi}}
+\def\minted@useadditionalfvoptsnopy{%
+ \edef\minted@tmp{\mintedpyoptvalueof{gobble}}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \else
+ \expandafter\minted@useadditionalfvoptsnopy@fvsetvk
+ \expandafter{\minted@tmp}{gobble}%
+ \fi
+ \edef\minted@tmp{\mintedpyoptvalueof{mathescape}}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \else
+ \expandafter\minted@useadditionalfvoptsnopy@fvsetvk
+ \expandafter{\minted@tmp}{mathescape}%
+ \fi}
+\def\minted@useadditionalfvoptsnopy@fvsetvk#1#2{%
+ \fvset{#2=#1}}
+\def\minted@pgfkeyscreate@py#1#2{%
+ \minted@forcsvlist{\minted@pgfkeycreate@py{#1}}{#2}}
+\begingroup
+\catcode`\==12
+\catcode`\<=12
+\catcode`\>=12
+\gdef\minted@pgfkeycreate@py#1#2{%
+ \minted@pgfkeycreate@py@i{#1}#2=\FV@Sentinel}
+\gdef\minted@pgfkeycreate@py@i#1#2=#3\FV@Sentinel{%
+ \if\relax\detokenize{#3}\relax
+ \expandafter\minted@pgfkeycreate@py@ii
+ \else
+ \expandafter\minted@pgfkeycreate@py@iii
+ \fi
+ {#1}{#2}#3\FV@Sentinel}
+\gdef\minted@pgfkeycreate@py@ii#1#2\FV@Sentinel{%
+ \minted@pgfkeycreate@py@iv{#1}{\pgfkeysnovalue}#2<>\FV@Sentinel}
+\gdef\minted@pgfkeycreate@py@iii#1#2#3=\FV@Sentinel{%
+ \minted@pgfkeycreate@py@iv{#1}{#3}#2<>\FV@Sentinel}
+\gdef\minted@pgfkeycreate@py@iv#1#2#3<#4>#5\FV@Sentinel{%
+ \if\relax\detokenize{#4}\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\minted@pgfkeycreate@py@v{#1}{#3}{#2}{\minted@const@pgfkeysnovalue}}%
+ {\minted@pgfkeycreate@py@v{#1}{#3}{#2}{#4}}}
+\endgroup
+\def\minted@pgfkeycreate@py@v#1#2#3#4{%
+ \def\minted@do##1{%
+ \minted@iflexerscope{##1}%
+ {\minted@do@i{##1}{@\minted@lexer}}%
+ {\minted@do@i{##1}{}}}
+ \def\minted@do@i##1##2{%
+ \if\relax\detokenize{#1}\relax
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.code=\expandafter\def\csname minted@pyopt@##1##2@#2\endcsname{####1},
+ }%
+ \else
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.code=
+ \def\minted@tmp{####1}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \expandafter\let\csname minted@pyopt@##1##2@#2\endcsname\minted@tmp
+ \else\ifcsname minted@opthandler@immediate@\string#1\endcsname
+ #1{minted@pyopt@##1##2@#2}{####1}%
\else
- \ifcsname minted@opt@g:#1\endcsname
- \csname minted@opt@g:#1\endcsname
- \else
- #2%
- \fi
- \fi
- \fi
- \fi
+ \expandafter\def\csname minted@pyopt@##1##2@#2\endcsname{#1{####1}}%
+ \fi\fi,
+ }%
+ \fi
+ \ifx\minted@const@pgfkeysnovalue#4\relax
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.value required,
+ }%
\else
- \ifcsname minted@opt@lang\minted@lang:#1\endcsname
- \csname minted@opt@lang\minted@lang:#1\endcsname
- \else
- \ifcsname minted@opt@g:#1\endcsname
- \csname minted@opt@g:#1\endcsname
- \else
- #2%
- \fi
- \fi
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.default=#4,
+ }%
\fi
- \fi
-}%
-\minted@def@optcl{encoding}{-P encoding}{#1}
-\minted@def@optcl{outencoding}{-P outencoding}{#1}
-\minted@def@optcl@e{escapeinside}{-P escapeinside}{#1}
-\minted@def@optcl@switch{stripnl}{-P stripnl}
-\minted@def@optcl@switch{stripall}{-P stripall}
-\minted@def@optcl@switch{python3}{-P python3}
-\minted@def@optcl@switch{funcnamehighlighting}{-P funcnamehighlighting}
-\minted@def@optcl@switch{startinline}{-P startinline}
-\ifthenelse{\boolean{minted@draft}}%
- {\minted@def@optfv{gobble}}%
- {\minted@def@optcl{gobble}{-F gobble:n}{#1}}
-\minted@def@optcl{codetagify}{-F codetagify:codetags}{#1}
-\minted@def@optcl{keywordcase}{-F keywordcase:case}{#1}
-\minted@def@optcl@switch{texcl}{-P texcomments}
-\minted@def@optcl@switch{texcomments}{-P texcomments}
-\minted@def@optcl@switch{mathescape}{-P mathescape}
-\minted@def@optfv@switch{linenos}
-\minted@def@opt@detok{style}
-\minted@def@optfv{frame}
-\minted@def@optfv{framesep}
-\minted@def@optfv{framerule}
-\minted@def@optfv{rulecolor}
-\minted@def@optfv{numbersep}
-\minted@def@optfv{numbers}
-\minted@def@optfv{firstnumber}
-\minted@def@optfv{stepnumber}
-\minted@def@optfv{firstline}
-\minted@def@optfv{lastline}
-\minted@def@optfv{baselinestretch}
-\minted@def@optfv{xleftmargin}
-\minted@def@optfv{xrightmargin}
-\minted@def@optfv{fillcolor}
-\minted@def@optfv{tabsize}
-\minted@def@optfv{fontfamily}
-\minted@def@optfv{fontsize}
-\minted@def@optfv{fontshape}
-\minted@def@optfv{fontseries}
-\minted@def@optfv{formatcom}
-\minted@def@optfv{label}
-\minted@def@optfv{labelposition}
-\minted@def@optfv{highlightlines}
-\minted@def@optfv{highlightcolor}
-\minted@def@optfv{space}
-\minted@def@optfv{spacecolor}
-\minted@def@optfv{tab}
-\minted@def@optfv{tabcolor}
-\minted@def@optfv{highlightcolor}
-\minted@def@optfv@switch{beameroverlays}
-\minted@def@optfv@switch{curlyquotes}
-\minted@def@optfv@switch{numberfirstline}
-\minted@def@optfv@switch{numberblanklines}
-\minted@def@optfv@switch{stepnumberfromfirst}
-\minted@def@optfv@switch{stepnumberoffsetvalues}
-\minted@def@optfv@switch{showspaces}
-\minted@def@optfv@switch{resetmargins}
-\minted@def@optfv@switch{samepage}
-\minted@def@optfv@switch{showtabs}
-\minted@def@optfv@switch{obeytabs}
-\minted@def@optfv@switch{breaklines}
-\minted@def@optfv@switch{breakbytoken}
-\minted@def@optfv@switch{breakbytokenanywhere}
-\minted@def@optfv{breakindent}
-\minted@def@optfv{breakindentnchars}
-\minted@def@optfv@switch{breakautoindent}
-\minted@def@optfv{breaksymbol}
-\minted@def@optfv{breaksymbolsep}
-\minted@def@optfv{breaksymbolsepnchars}
-\minted@def@optfv{breaksymbolindent}
-\minted@def@optfv{breaksymbolindentnchars}
-\minted@def@optfv{breaksymbolleft}
-\minted@def@optfv{breaksymbolsepleft}
-\minted@def@optfv{breaksymbolsepleftnchars}
-\minted@def@optfv{breaksymbolindentleft}
-\minted@def@optfv{breaksymbolindentleftnchars}
-\minted@def@optfv{breaksymbolright}
-\minted@def@optfv{breaksymbolsepright}
-\minted@def@optfv{breaksymbolseprightnchars}
-\minted@def@optfv{breaksymbolindentright}
-\minted@def@optfv{breaksymbolindentrightnchars}
-\minted@def@optfv{breakbefore}
-\minted@def@optfv{breakbeforesymbolpre}
-\minted@def@optfv{breakbeforesymbolpost}
-\minted@def@optfv@switch{breakbeforeinrun}
-\minted@def@optfv{breakafter}
-\minted@def@optfv@switch{breakafterinrun}
-\minted@def@optfv{breakaftersymbolpre}
-\minted@def@optfv{breakaftersymbolpost}
-\minted@def@optfv@switch{breakanywhere}
-\minted@def@optfv{breakanywheresymbolpre}
-\minted@def@optfv{breakanywheresymbolpost}
-\minted@def@optfv{fontencoding}
-\minted@def@opt{bgcolor}
-\minted@def@opt@switch{autogobble}
-\minted@def@opt@switch{ignorelexererrors}
-\newcommand{\minted@encoding}{\minted@get@opt{encoding}{UTF8}}
-\newenvironment{minted@snugshade*}[1]{%
- \def\FrameCommand##1{\hskip\@totalleftmargin
- \colorbox{#1}{##1}%
- \hskip-\linewidth \hskip-\@totalleftmargin \hskip\columnwidth}%
- \MakeFramed{\advance\hsize-\width
- \@totalleftmargin\z@ \linewidth\hsize
- \advance\labelsep\fboxsep
- \@setminipage}%
- }{\par\unskip\@minipagefalse\endMakeFramed}
-\newsavebox{\minted@bgbox}
-\newenvironment{minted@colorbg}[1]{%
- \setlength{\OuterFrameSep}{0pt}%
- \let\minted@tmp\FV@NumberSep
- \edef\FV@NumberSep{%
- \the\numexpr\dimexpr\minted@tmp+\number\fboxsep\relax sp\relax}%
- \medskip
- \begin{minted@snugshade*}{#1}}
- {\end{minted@snugshade*}%
- \medskip\noindent}
-\newwrite\minted@code
-\newcommand{\minted@savecode}[1]{
- \immediate\openout\minted@code\minted@jobname.pyg\relax
- \immediate\write\minted@code{\expandafter\detokenize\expandafter{#1}}%
- \immediate\closeout\minted@code}
-\newcounter{minted@FancyVerbLineTemp}
-\newcommand{\minted@write@detok}[1]{%
- \immediate\write\FV@OutFile{\detokenize{#1}}}
-\newcommand{\minted@FVB@VerbatimOut}[1]{%
- \setcounter{minted@FancyVerbLineTemp}{\value{FancyVerbLine}}%
- \@bsphack
- \begingroup
- \FV@UseKeyValues
- \FV@DefineWhiteSpace
- \def\FV@Space{\space}%
- \FV@DefineTabOut
- \let\FV@ProcessLine\minted@write@detok
- \immediate\openout\FV@OutFile #1\relax
- \let\FV@FontScanPrep\relax
- \let\@noligs\relax
- \FV@Scan}
-\newcommand{\minted@FVE@VerbatimOut}{%
- \immediate\closeout\FV@OutFile\endgroup\@esphack
- \setcounter{FancyVerbLine}{\value{minted@FancyVerbLineTemp}}}%
-\ifcsname MintedPygmentize\endcsname\else
- \newcommand{\MintedPygmentize}{pygmentize}
-\fi
-\newcounter{minted@pygmentizecounter}
-\ifwindows
- \newcommand{\MintedPython}{python}
-\else
- \newcommand{\MintedPython}{python3}
-\fi
-\newcommand{\minted@check@MintedPython}{%
- \ifcsname minted@MintedPython@\MintedPython\endcsname
+ }%
+ \minted@forcsvlist{\minted@do}{\minted@optscopes}%
+ \pgfkeys{%
+ /minted/global/.cd,
+ #2=#3,
+ }}
+\def\mintedpyoptvalueof#1{%
+ \ifbool{minted@isinline}%
+ {\minted@pyoptvalueof@inline{#1}}%
+ {\minted@pyoptvalueof@block{#1}}}
+\def\minted@pyoptvalueof@inline#1{%
+ \ifcsname minted@pyopt@cmd@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@cmd@#1\endcsname}%
+ \else\ifcsname minted@pyopt@lexerinline@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@lexerinline@\minted@lexer @#1\endcsname}%
+ \else\ifcsname minted@pyopt@globalinline@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@globalinline@#1\endcsname}%
+ \else\ifcsname minted@pyopt@lexer@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@lexer@\minted@lexer @#1\endcsname}%
\else
- \let\minted@altpython\minted@undefined
- \ifdefstring{\MintedPython}{python}{\def\minted@altpython{python3}}{}%
- \ifdefstring{\MintedPython}{python3}{\def\minted@altpython{python}}{}%
- \ifx\minted@altpython\minted@undefined\relax
- \TestAppExists{\MintedPython}%
- \ifAppExists
- \expandafter\global\expandafter\let%
- \csname minted@MintedPython@\MintedPython\endcsname\relax
- \else
- \PackageError{minted}%
- {Failed to find Python executable \MintedPython;
- check Python installation (including PATH),
- or redefine \string\MintedPython}%
- {Failed to find Python executable \MintedPython;
- check Python installation (including PATH),
- or redefine \string\MintedPython}%
- \fi
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@global@#1\endcsname}%
+ \fi\fi\fi\fi}
+\def\minted@pyoptvalueof@block#1{%
+ \ifcsname minted@pyopt@cmd@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@cmd@#1\endcsname}%
+ \else\ifcsname minted@pyopt@lexer@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@lexer@\minted@lexer @#1\endcsname}%
+ \else
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@pyopt@global@#1\endcsname}%
+ \fi\fi}
+\def\minted@pgfkeyscreate@tex#1#2{%
+ \minted@forcsvlist{\minted@pgfkeycreate@tex{#1}}{#2}}
+\begingroup
+\catcode`\==12
+\gdef\minted@pgfkeycreate@tex#1#2{%
+ \minted@pgfkeycreate@tex@i{#1}#2=\FV@Sentinel}
+\gdef\minted@pgfkeycreate@tex@i#1#2=#3\FV@Sentinel{%
+ \if\relax\detokenize{#3}\relax
+ \expandafter\minted@pgfkeycreate@tex@ii
+ \else
+ \expandafter\minted@pgfkeycreate@tex@iii
+ \fi
+ {#1}{#2}#3\FV@Sentinel}
+\gdef\minted@pgfkeycreate@tex@ii#1#2\FV@Sentinel{%
+ \minted@pgfkeycreate@tex@iv{#1}{#2}{\pgfkeysnovalue}}
+\gdef\minted@pgfkeycreate@tex@iii#1#2#3=\FV@Sentinel{%
+ \minted@pgfkeycreate@tex@iv{#1}{#2}{#3}}
+\endgroup
+\def\minted@pgfkeycreate@tex@iv#1#2#3{%
+ \def\minted@do##1{%
+ \minted@iflexerscope{##1}%
+ {\minted@do@i{##1}{@\minted@lexer}}%
+ {\minted@do@i{##1}{}}}
+ \def\minted@do@i##1##2{%
+ \if\relax\detokenize{#1}\relax
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.code=\expandafter\def\csname minted@texopt@##1##2@#2\endcsname{####1},
+ #2/.value required,
+ }%
\else
- \ifcsname minted@MintedPython@\minted@altpython\endcsname
- \let\MintedPython\minted@altpython
- \else
- \TestAppExists{\MintedPython}%
- \ifAppExists
- \expandafter\global\expandafter\let%
- \csname minted@MintedPython@\MintedPython\endcsname\relax
- \else
- \TestAppExists{\minted@altpython}%
- \ifAppExists
- \expandafter\global\expandafter\let%
- \csname minted@MintedPython@\minted@altpython\endcsname\relax
- \let\MintedPython\minted@altpython
+ \pgfkeys{%
+ /minted/##1/.cd,
+ #2/.code=
+ \def\minted@tmp{####1}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \expandafter\let\csname minted@texopt@##1##2@#2\endcsname\minted@tmp
+ \else\ifcsname minted@opthandler@immediate@\string#1\endcsname
+ #1{minted@texopt@##1##2@#2}{####1}%
\else
- \PackageError{minted}%
- {Failed to find Python executables python or python3;
- check Python installation (including PATH),
- or redefine \string\MintedPython}%
- {Failed to find Python executables python or python3;
- check Python installation (including PATH),
- or redefine \string\MintedPython}%
- \fi
- \fi
- \fi
+ \expandafter\def\csname minted@texopt@##1##2@#2\endcsname{#1{####1}}%
+ \fi\fi,
+ #2/.value required,
+ }%
\fi
- \fi
+ }%
+ \minted@forcsvlist{\minted@do}{\minted@optscopes}%
+ \pgfkeys{%
+ /minted/global/.cd,
+ #2=#3,
+ }}
+\def\mintedtexoptvalueof#1{%
+ \ifbool{minted@isinline}%
+ {\minted@texoptvalueof@inline{#1}}%
+ {\minted@texoptvalueof@block{#1}}}
+\def\minted@texoptvalueof@inline#1{%
+ \ifcsname minted@texopt@cmd@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@cmd@#1\endcsname}%
+ \else\ifcsname minted@texopt@lexerinline@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@lexerinline@\minted@lexer @#1\endcsname}%
+ \else\ifcsname minted@texopt@globalinline@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@globalinline@#1\endcsname}%
+ \else\ifcsname minted@texopt@lexer@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@lexer@\minted@lexer @#1\endcsname}%
+ \else
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@global@#1\endcsname}%
+ \fi\fi\fi\fi}
+\def\minted@texoptvalueof@block#1{%
+ \ifcsname minted@texopt@cmd@#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@cmd@#1\endcsname}%
+ \else\ifcsname minted@texopt@lexer@\minted@lexer @#1\endcsname
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@lexer@\minted@lexer @#1\endcsname}%
+ \else
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname minted@texopt@global@#1\endcsname}%
+ \fi\fi}
+\def\minted@usetexoptsnonpygments{}
+\def\minted@opthandler@deforrestrictedescape#1#2{%
+ \if\relax\detokenize{#2}\relax
+ \expandafter\def\csname#1\endcsname{#2}%
+ \else\if\relax\detokenize\expandafter{\@gobble#2}\relax
+ \ifcat\relax\noexpand#2%
+ \expandafter\expandafter\expandafter\minted@opthandler@deforrestrictedescape@i
+ \expandafter\@gobble\string#2\FV@Sentinel{#1}{#2}%
+ \else
+ \FVExtraDetokenizeREscVArg{\expandafter\def\csname#1\endcsname}{#2}%
+ \fi
+ \else
+ \FVExtraDetokenizeREscVArg{\expandafter\def\csname#1\endcsname}{#2}%
+ \fi\fi}
+\def\minted@opthandler@deforrestrictedescape@i#1#2\FV@Sentinel#3#4{%
+ \ifcsname minted@isalpha\number`#1\endcsname
+ \expandafter\def\csname#3\endcsname{#4}%
+ \else
+ \FVExtraDetokenizeREscVArg{\expandafter\def\csname#3\endcsname}{#4}%
+ \fi}
+\expandafter\let\csname
+ minted@opthandler@immediate@\string\minted@opthandler@deforrestrictedescape
+ \endcsname\relax
+\mintedpgfkeyscreate{fv}{
+ baselinestretch,
+ beameroverlays,
+ backgroundcolor,
+ backgroundcolorvphantom,
+ bgcolor,
+ bgcolorpadding,
+ bgcolorvphantom,
+ breakafter,
+ breakafterinrun,
+ breakaftersymbolpost,
+ breakaftersymbolpre,
+ breakanywhere,
+ breakanywhereinlinestretch,
+ breakanywheresymbolpost,
+ breakanywheresymbolpre,
+ breakautoindent,
+ breakbefore,
+ breakbeforeinrun,
+ breakbeforesymbolpost,
+ breakbeforesymbolpre,
+ breakbytoken,
+ breakbytokenanywhere,
+ breakindent,
+ breakindentnchars,
+ breaklines,
+ breaksymbol,
+ breaksymbolindent,
+ breaksymbolindentleft,
+ breaksymbolindentleftnchars,
+ breaksymbolindentnchars,
+ breaksymbolindentright,
+ breaksymbolindentrightnchars,
+ breaksymbolleft,
+ breaksymbolright,
+ breaksymbolsep,
+ breaksymbolsepleft,
+ breaksymbolsepleftnchars,
+ breaksymbolsepnchars,
+ breaksymbolsepright,
+ breaksymbolseprightnchars,
+ curlyquotes,
+ fillcolor,
+ firstline,
+ firstnumber,
+ fontencoding,
+ fontfamily,
+ fontseries,
+ fontshape,
+ fontsize,
+ formatcom,
+ frame,
+ framerule,
+ framesep,
+ highlightcolor,
+ highlightlines,
+ label,
+ labelposition,
+ lastline,
+ linenos,
+ listparameters,
+ numberblanklines,
+ numberfirstline,
+ numbers,
+ numbersep,
+ obeytabs,
+ resetmargins,
+ rulecolor,
+ samepage,
+ showspaces,
+ showtabs,
+ space,
+ spacecolor,
+ stepnumber,
+ stepnumberfromfirst,
+ stepnumberoffsetvalues,
+ tab,
+ tabcolor=black,
+ tabsize,
+ xleftmargin,
+ xrightmargin,
}
-\ifwindows
- \def\minted@opt@quote#1{\detokenize{"#1"}}
-\else
- \def\minted@opt@quote#1{\detokenize{'#1'}}
+\mintedpgfkeyscreate{py}{
+ autogobble<true>=false,
+ encoding=utf8,
+ funcnamehighlighting<true>=true,
+ gobble=0,
+ gobblefilter=0,
+ keywordcase=none,
+ literalenvname=MintedVerbatim,
+ mathescape<true>=false,
+ python3<true>=true,
+ rangeregexmatchnumber=1,
+ rangeregexdotall<true>=false,
+ rangeregexmultiline<true>=false,
+ startinline<true>=false,
+ stripall<true>=false,
+ stripnl<true>=false,
+ texcl<true>=false,
+ texcomments<true>=false,
+}
+\mintedpgfkeyscreate[\minted@opthandler@deforrestrictedescape]{py}{
+ codetagify=,
+ escapeinside=,
+ literatecomment=,
+ rangestartstring=,
+ rangestartafterstring=,
+ rangestopstring=,
+ rangestopbeforestring=,
+ rangeregex=,
+}
+\let\minted@tmplexer\minted@lexer
+\def\minted@lexer{php}
+\pgfkeys{
+ /minted/lexerinline/.cd,
+ startinline=true,
+}
+\let\minted@lexer\minted@tmplexer
+\mintedpgfkeyscreate{tex}{
+ envname=Verbatim,
+ ignorelexererrors=false,
+ style=default,
+}
+\pgfkeys{
+ /minted/globalinline/.cd,
+ envname=VerbEnv,
+}
+\expandafter\def\expandafter\minted@usetexoptsnonpygments\expandafter{%
+ \minted@usetexoptsnonpygments
+ \edef\minted@literalenvname{\mintedpyoptvalueof{literalenvname}}%
+ \edef\minted@envname{\mintedtexoptvalueof{envname}}%
+ \expandafter\def\expandafter\minted@literalenv\expandafter{%
+ \csname \minted@literalenvname\endcsname}%
+ \expandafter\def\expandafter\minted@endliteralenv\expandafter{%
+ \csname end\minted@literalenvname\endcsname}%
+ \expandafter\expandafter\expandafter
+ \let\expandafter\minted@literalenv\csname \minted@envname\endcsname
+ \expandafter\expandafter\expandafter
+ \let\expandafter\minted@endliteralenv\csname end\minted@envname\endcsname}%
+\ifcsname minted@def@optcl\endcsname
+ \ifx\minted@def@optcl\relax
+ \let\minted@def@optcl\minted@undefined
+ \fi
\fi
-\newcommand{\minted@pygmentize}[2][\minted@outputdir\minted@jobname.pyg]{%
- \minted@defstyle{\minted@get@opt{style}{default}}%
- \stepcounter{minted@pygmentizecounter}%
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
- {\def\minted@codefile{\minted@outputdir\minted@jobname.pyg}}%
- {\def\minted@codefile{#1}}%
- \ifthenelse{\boolean{minted@isinline}}%
- {\def\minted@optlistcl@inlines{%
- \minted@optlistcl@g@i
- \csname minted@optlistcl@lang\minted@lang @i\endcsname}}%
- {\let\minted@optlistcl@inlines\@empty}%
- \def\minted@cmd{%
- \ifminted@kpsewhich
- \ifwindows
- \detokenize{for /f "usebackq tokens=*"}\space\@percentchar\detokenize{a in (`kpsewhich}\space\minted@codefile\detokenize{`) do}\space
- \fi
+\providecommand{\minted@def@optcl}[4][]{%
+ \minted@warning{Macro \string\minted@def@optcl\space is deprecated with minted v3
+ and no longer has any effect}}
+\newcounter{minted@numcachefiles}
+\def\minted@addcachefilename#1{%
+ \ifbool{minted@canexec}%
+ {\stepcounter{minted@numcachefiles}%
+ \expandafter
+ \xdef\csname minted@cachefile\arabic{minted@numcachefiles}\endcsname{#1}}%
+ {}}
+\def\minted@clean{%
+ \ifbool{minted@canexec}%
+ {\ifbool{minted@diddetectconfig}{\minted@clean@i}{}}%
+ {}}
+\def\minted@clean@i{%
+ \ifnum\value{minted@numcachefiles}>0\relax
+ \expandafter\minted@savecachelist
+ \fi
+ \ifbool{minted@fasthighlightmode}%
+ {}%
+ {\minted@exec@clean
+ \global\boolfalse{minted@canexec}}}
+\def\minted@savecachelist{%
+ \pydatasetfilename{\MintedDataFilename}%
+ \minted@fasthighlightmode@checkstart
+ \pydatawritedictopen
+ \pydatawritekeyvalue{command}{clean}%
+ \pydatawritekeyedefvalue{jobname}{\jobname}%
+ \pydatawritekeyedefvalue{timestamp}{\minted@timestamp}%
+ \pydatawritekeyedefvalue{cachepath}{\minted@cachepath}%
+ \pydatawritekey{cachefiles}%
+ \pydatawritemlvaluestart
+ \pydatawritemlvalueline{[}%
+ \setcounter{minted@tmpcnt}{1}%
+ \loop\unless\ifnum\value{minted@tmpcnt}>\value{minted@numcachefiles}\relax
+ \expandafter\minted@savecachelist@writecachefile\expandafter{%
+ \csname minted@cachefile\arabic{minted@tmpcnt}\endcsname}%
+ \expandafter\global\expandafter
+ \let\csname minted@cachefile\arabic{minted@tmpcnt}\endcsname\minted@undefined
+ \stepcounter{minted@tmpcnt}%
+ \repeat
+ \setcounter{minted@numcachefiles}{0}%
+ \pydatawritemlvalueline{]}%
+ \pydatawritemlvalueend
+ \pydatawritedictclose
+ \ifbool{minted@fasthighlightmode}{}{\pydataclosefilename{\MintedDataFilename}}}
+\begingroup
+\catcode`\"=12
+\catcode`\,=12
+\gdef\minted@savecachelist@writecachefile#1{%
+ \expandafter\pydatawritemlvalueline\expandafter{\expandafter"#1",}}
+\endgroup
+\AfterEndDocument{%
+ \minted@clean
+ \minted@fasthighlightmode@checkend}
+\def\minted@patch@PygmentsZsq{%
+ \ifcsname\minted@styleprefix Zsq\endcsname
+ \ifcsstring{\minted@styleprefix Zsq}{\char`\'}{\minted@patch@PygmentsZsq@i}{}%
+ \fi}
+\begingroup
+\catcode`\'=\active
+\gdef\minted@patch@PygmentsZsq@i{\def\PYGZsq{'}}
+\endgroup
+\def\minted@patch@PygmentsZhy{%
+ \ifcsname\minted@styleprefix Zhy\endcsname
+ \ifcsstring{\minted@styleprefix Zhy}{\char`\-}{\def\PYGZhy{\mbox{-}}}{}%
+ \fi}
+\def\minted@patch@ignorelexererrors{%
+ \edef\minted@tmp{\mintedtexoptvalueof{ignorelexererrors}}%
+ \ifdefstring{\minted@tmp}{true}%
+ {\expandafter\let\csname\minted@styleprefix @tok@err\endcsname\relax}%
+ {}}
+\def\minted@patch@PygmentsStyledef{%
+ \minted@patch@PygmentsZsq
+ \minted@patch@PygmentsZhy
+ \minted@patch@ignorelexererrors}
+\def\minted@VerbatimPygments{%
+ \expandafter\minted@VerbatimPygments@i\expandafter{%
+ \csname\minted@styleprefix\endcsname}}
+\def\minted@VerbatimPygments@i#1{%
+ \VerbatimPygments{#1}{#1}}
+\def\minted@standardcatcodes{%
+ \catcode`\\=0
+ \catcode`\{=1
+ \catcode`\}=2
+ \catcode`\#=6
+ \catcode`\ =10
+ \catcode`\@=11
+ \catcode`\`=12
+ \catcode`\==12
+ \catcode`\+=12
+ \catcode`\.=12
+ \catcode`\,=12
+ \catcode`\[=12
+ \catcode`\]=12
+ \catcode`\%=14}
+\def\minted@defstyle{%
+ \edef\minted@tmp{\mintedtexoptvalueof{style}}%
+ \expandafter\minted@defstyle@i\expandafter{\minted@tmp}}
+\def\minted@defstyle@i#1{%
+ \minted@ifalphanumhyphenunderscore{#1}%
+ {\minted@defstyle@ii{#1}}%
+ {\minted@error{Highlighting style is set to "#1" but only style names with
+ alphanumeric characters, hyphens, and underscores are supported;
+ falling back to default style}%
+ \minted@defstyle@ii{default}}}
+\def\minted@defstyle@ii#1{%
+ \ifcsname minted@styledef@#1\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\csname minted@styledef@#1\endcsname
+ \minted@patch@PygmentsStyledef
+ \minted@VerbatimPygments}%
+ {\minted@defstyle@load{#1}}}
+\def\minted@catchfiledef#1#2{%
+ \CatchFileDef{#1}{#2}{\minted@standardcatcodes\endlinechar=-1}}
+\def\minted@defstyle@load#1{%
+ \minted@detectconfig
+ \ifbool{minted@cache}%
+ {\edef\minted@styledeffilename{#1\detokenize{.style.minted}}%
+ \edef\minted@styledeffilepath{\minted@cachepath\minted@styledeffilename}%
+ \IfFileExists{\minted@styledeffilepath}%
+ {\minted@defstyle@input{#1}}%
+ {\ifbool{minted@canexec}%
+ {\minted@defstyle@generate{#1}}%
+ {\minted@error{Missing definition for highlighting style "#1" (minted executable
+ is unavailable or disabled); attempting to substitute fallback style}%
+ \minted@defstyle@fallback{#1}}}}%
+ {\edef\minted@styledeffilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.style.minted}}%
+ \let\minted@styledeffilepath\minted@styledeffilename
+ \ifbool{minted@canexec}%
+ {\minted@defstyle@generate{#1}}%
+ {\minted@error{Missing definition for highlighting style "#1" (minted executable
+ is unavailable or disabled); attempting to substitute fallback style}%
+ \minted@defstyle@fallback{#1}}}}
+\def\minted@defstyle@input#1{%
+ \begingroup
+ \minted@catchfiledef{\minted@tmp}{\minted@styledeffilepath}%
+ \minted@tmp
+ \ifcsname\minted@styleprefix\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\expandafter\global\expandafter\let\csname minted@styledef@#1\endcsname\minted@tmp
+ \endgroup
+ \ifbool{minted@cache}{\minted@addcachefilename{\minted@styledeffilename}}{}%
+ \csname minted@styledef@#1\endcsname
+ \minted@patch@PygmentsStyledef
+ \minted@VerbatimPygments}%
+ {\endgroup
+ \ifbool{minted@canexec}%
+ {\minted@warning{Invalid or corrupted style definition file
+ "\minted@styledeffilename"; attempting to regenerate}%
+ \minted@defstyle@generate{#1}}%
+ {\minted@error{Invalid or corrupted style definition file
+ "\minted@styledeffilename"; attempting to substitute fallback style
+ (minted executable is unavailable or disabled)}%
+ \minted@defstyle@fallback{#1}}}}
+\def\minted@defstyle@generate#1{%
+ \pydatasetfilename{\MintedDataFilename}%
+ \minted@fasthighlightmode@checkstart
+ \pydatawritedictopen
+ \pydatawritekeyvalue{command}{styledef}%
+ \pydatawritekeyedefvalue{jobname}{\jobname}%
+ \pydatawritekeyedefvalue{timestamp}{\minted@timestamp}%
+ \pydatawritekeyedefvalue{currentfilepath}{\CurrentFilePath}%
+ \pydatawritekeyedefvalue{currentfile}{\CurrentFile}%
+ \pydatawritekeyedefvalue{inputlineno}{\the\inputlineno}%
+ \pydatawritekeyedefvalue{cachepath}{\minted@cachepath}%
+ \pydatawritekeyedefvalue{styledeffilename}{\minted@styledeffilename}%
+ \pydatawritekeyvalue{style}{#1}%
+ \pydatawritekeyedefvalue{commandprefix}{\minted@styleprefix}%
+ \pydatawritedictclose
+ \ifbool{minted@fasthighlightmode}%
+ {\minted@defstyle@fallback{#1}}%
+ {\pydataclosefilename{\MintedDataFilename}%
+ \begingroup
+ \minted@exec@styledef
+ \ifx\minted@exec@warning\relax
+ \else
+ \expandafter\minted@exec@warning
\fi
- \MintedPygmentize\space -l \minted@opt@quote{#2}
- -f latex -P commandprefix=PYG -F tokenmerge
- \minted@optlistcl@g \csname minted@optlistcl@lang\minted@lang\endcsname
- \minted@optlistcl@inlines
- \minted@optlistcl@cmd -o \minted@outputdir\minted@infile\space
- \ifminted@kpsewhich
- \ifwindows
- \@percentchar\detokenize{a}%
- \else
- \detokenize{`}kpsewhich \minted@codefile\space
- \detokenize{||} \minted@codefile\detokenize{`}%
- \fi
+ \ifx\minted@exec@error\relax
+ \expandafter\minted@defstyle@generate@i
\else
- \minted@codefile
- \fi}%
- % For debugging, uncomment: %%%%
- % \immediate\typeout{\minted@cmd}%
- % %%%%
- \ifthenelse{\boolean{minted@cache}}%
- {%
- \ifminted@frozencache
+ \expandafter\minted@defstyle@generate@error
+ \fi
+ {#1}}}
+\def\minted@defstyle@generate@i#1{%
+ \endgroup
+ \begingroup
+ \minted@catchfiledef{\minted@tmp}{\minted@styledeffilepath}%
+ \minted@tmp
+ \ifcsname\minted@styleprefix\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\expandafter\global\expandafter\let\csname minted@styledef@#1\endcsname\minted@tmp
+ \endgroup
+ \ifbool{minted@cache}{\minted@addcachefilename{\minted@styledeffilename}}{}%
+ \csname minted@styledef@#1\endcsname
+ \minted@patch@PygmentsStyledef
+ \minted@VerbatimPygments}%
+ {\endgroup
+ \minted@error{Failed to create style definition file "\minted@styledeffilename"
+ (no error message, see "\MintedErrlogFilename" if it exists);
+ attempting to substitute fallback style}%
+ \minted@defstyle@fallback{#1}}}
+\def\minted@defstyle@generate@error#1{%
+ \minted@exec@error
+ \endgroup
+ \minted@defstyle@fallback{#1}}
+\def\minted@defstyle@fallback#1{%
+ \ifstrequal{#1}{default}%
+ {\expandafter\global\expandafter
+ \let\csname minted@styledef@default\endcsname\minted@styledeffallback}%
+ {\ifcsname minted@styledef@default\endcsname
+ \else
+ \minted@defstyle@load{default}%
+ \fi
+ \expandafter\let\expandafter\minted@tmp\csname minted@styledef@default\endcsname
+ \expandafter\global\expandafter\let\csname minted@styledef@#1\endcsname\minted@tmp}}
+\def\minted@styledeffallback{%
+ \expandafter\def\csname\minted@styleprefix\endcsname##1##2{##2}%
+ \expandafter\def\csname\minted@styleprefix Zbs\endcsname{\char`\\}%
+ \expandafter\def\csname\minted@styleprefix Zus\endcsname{\char`\_}%
+ \expandafter\def\csname\minted@styleprefix Zob\endcsname{\char`\{}%
+ \expandafter\def\csname\minted@styleprefix Zcb\endcsname{\char`\}}%
+ \expandafter\def\csname\minted@styleprefix Zca\endcsname{\char`\^}%
+ \expandafter\def\csname\minted@styleprefix Zam\endcsname{\char`\&}%
+ \expandafter\def\csname\minted@styleprefix Zlt\endcsname{\char`\<}%
+ \expandafter\def\csname\minted@styleprefix Zgt\endcsname{\char`\>}%
+ \expandafter\def\csname\minted@styleprefix Zsh\endcsname{\char`\#}%
+ \expandafter\def\csname\minted@styleprefix Zpc\endcsname{\char`\%}%
+ \expandafter\def\csname\minted@styleprefix Zdl\endcsname{\char`\$}%
+ \expandafter\def\csname\minted@styleprefix Zhy\endcsname{\char`\-}%
+ \expandafter\def\csname\minted@styleprefix Zsq\endcsname{\char`\'}%
+ \expandafter\def\csname\minted@styleprefix Zdq\endcsname{\char`\"}%
+ \expandafter\def\csname\minted@styleprefix Zti\endcsname{\char`\~}%
+ \minted@patch@PygmentsStyledef
+ \minted@VerbatimPygments}
+\newcounter{minted@FancyVerbLineTemp}
+\def\minted@lexerlinenoson{%
+ \ifcsname c@minted@lexer\minted@lexer\endcsname
+ \else
+ \newcounter{minted@lexer\minted@lexer}%
+ \fi
+ \setcounter{minted@FancyVerbLineTemp}{\value{FancyVerbLine}}%
+ \setcounter{FancyVerbLine}{\value{minted@lexer\minted@lexer}}}
+\def\minted@lexerlinenosoff{%
+ \setcounter{minted@lexer\minted@lexer}{\value{FancyVerbLine}}%
+ \setcounter{FancyVerbLine}{\value{minted@FancyVerbLineTemp}}}
+\ifbool{minted@inputlexerlinenos}%
+ {\let\minted@inputlexerlinenoson\minted@lexerlinenoson
+ \let\minted@inputlexerlinenosoff\minted@lexerlinenosoff}%
+ {\let\minted@inputlexerlinenoson\relax
+ \let\minted@inputlexerlinenosoff\relax
+ \ifbool{minted@lexerlinenos}
+ {}%
+ {\let\minted@lexerlinenoson\relax
+ \let\minted@lexerlinenosoff\relax}}
+\def\minted@codewrapper#1{%
+ \ifcsname minted@inputfilepath\endcsname
+ \minted@inputlexerlinenoson
+ \else
+ \minted@lexerlinenoson
+ \fi
+ #1%
+ \ifcsname minted@inputfilepath\endcsname
+ \minted@inputlexerlinenosoff
+ \else
+ \minted@lexerlinenosoff
+ \fi}
+\def\minted@debug@input{%
+ \ifbool{minted@debug}%
+ {\immediate\typeout{%
+ minted debug: \string\input\space at
+ \ifx\CurrentFile\@empty\else\CurrentFile\space\fi line \the\inputlineno}}%
+ {}}
+\def\minted@highlight{%
+ \minted@defstyle
+ \pydatasetbuffername{minted@tmpdatabuffer}%
+ \pydatabufferkeyvalue{command}{highlight}%
+ \pydatabufferkey{code}%
+ \pydatabuffermlvaluestart
+ \setcounter{minted@tmpcnt}{1}%
+ \loop\unless\ifnum\value{minted@tmpcnt}>\value{minted@tmpcodebufferlength}\relax
+ \expandafter\let\expandafter
+ \minted@tmp\csname minted@tmpcodebufferline\arabic{minted@tmpcnt}\endcsname
+ \expandafter\pydatabuffermlvalueline\expandafter{\minted@tmp}%
+ \stepcounter{minted@tmpcnt}%
+ \repeat
+ \pydatabuffermlvalueend
+ \minted@highlight@i}
+\def\minted@highlightinputfile{%
+ \minted@defstyle
+ \edef\minted@inputfilemdfivesum{\pdf@filemdfivesum{\minted@inputfilepath}}%
+ \ifx\minted@inputfilemdfivesum\@empty
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\minted@error{Cannot find input file "\minted@inputfilepath"; inserting placeholder}%
+ \minted@insertplaceholder}%
+ {\pydatasetbuffername{minted@tmpdatabuffer}%
+ \pydatabufferkeyvalue{command}{highlight}%
+ \pydatabufferkeyedefvalue{inputfilepath}{\minted@inputfilepath}%
+ \pydatabufferkeyedefvalue{inputfilemdfivesum}{\minted@inputfilemdfivesum}%
+ \minted@highlight@i}}
+\def\minted@def@FV@GetKeyValues@standardcatcodes{%
+ \let\minted@FV@GetKeyValues@orig\FV@GetKeyValues
+ \def\FV@GetKeyValues##1{%
+ \begingroup
+ \minted@standardcatcodes
+ \minted@FV@GetKeyValues@i{##1}}%
+ \def\minted@FV@GetKeyValues@i##1[##2]{%
+ \endgroup
+ \let\FV@GetKeyValues\minted@FV@GetKeyValues@orig
+ \let\minted@FV@GetKeyValues@i\minted@undefined
+ \FV@GetKeyValues{##1}[##2]}}
+\def\minted@highlight@i{%
+ \pydatabufferkeyedefvalue{pyopt.lexer}{\minted@lexer}%
+ \pydatabufferkeyedefvalue{pyopt.commandprefix}{\minted@styleprefix}%
+ \minted@forcsvlist{\minted@highlight@bufferpykeys}{\minted@optkeyslist@py}%
+ \ifbool{minted@cache}%
+ {\edef\minted@highlightfilename{\pydatabuffermdfivesum\detokenize{.highlight.minted}}%
+ \edef\minted@highlightfilepath{\minted@cachepath\minted@highlightfilename}%
+ \IfFileExists{\minted@highlightfilepath}%
+ {\minted@codewrapper{%
+ \minted@def@FV@GetKeyValues@standardcatcodes
+ \minted@debug@input
+ \input{\minted@highlightfilepath}}%
+ \minted@addcachefilename{\minted@highlightfilename}}%
+ {\ifbool{minted@canexec}%
+ {\minted@highlight@create}%
+ {\minted@error{Cannot highlight code (minted executable is unavailable or
+ disabled); attempting to typeset without highlighting}%
+ \minted@highlight@fallback}}}%
+ {\edef\minted@highlightfilename{%
+ \detokenize{_}\MintedJobnameMdfive\detokenize{.highlight.minted}}%
+ \let\minted@highlightfilepath\minted@highlightfilename
+ \ifbool{minted@canexec}%
+ {\minted@highlight@create}%
+ {\minted@error{Cannot highlight code (minted executable is unavailable or
+ disabled); attempting to typeset without highlighting}%
+ \minted@highlight@fallback}}%
+ \pydataclearbuffername{minted@tmpdatabuffer}}
+\def\minted@highlight@bufferpykeys#1{%
+ \edef\minted@tmp{\mintedpyoptvalueof{#1}}%
+ \ifx\minted@tmp\minted@const@pgfkeysnovalue
+ \else
+ \pydatabufferkeyedefvalue{pyopt.#1}{\minted@tmp}%
+ \fi}
+\def\minted@highlight@create{%
+ \pydatasetfilename{\MintedDataFilename}%
+ \minted@fasthighlightmode@checkstart
+ \pydatawritedictopen
+ \pydatawritebuffer
+ \pydatawritekeyedefvalue{jobname}{\jobname}%
+ \pydatawritekeyedefvalue{timestamp}{\minted@timestamp}%
+ \pydatawritekeyedefvalue{currentfilepath}{\CurrentFilePath}%
+ \pydatawritekeyedefvalue{currentfile}{\CurrentFile}%
+ \pydatawritekeyedefvalue{inputlineno}{\the\inputlineno}%
+ \pydatawritekeyedefvalue{cachepath}{\minted@cachepath}%
+ \pydatawritekeyedefvalue{highlightfilename}{\minted@highlightfilename}%
+ \pydatawritedictclose
+ \ifbool{minted@fasthighlightmode}%
+ {\minted@insertplaceholder}%
+ {\pydataclosefilename{\MintedDataFilename}%
+ \begingroup
+ \minted@exec@highlight
+ \IfFileExists{\minted@highlightfilepath}%
+ {\ifx\minted@exec@warning\relax
\else
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
- {\edef\minted@hash{%
- \pdf@filemdfivesum{#1}%
- \pdf@mdfivesum{\minted@cmd\space%
- autogobble(\the\numexpr\FancyVerbStartNum\relax-%
- \the\numexpr\FancyVerbStopNum\relax)}}}%
- {\edef\minted@hash{%
- \pdf@filemdfivesum{#1}%
- \pdf@mdfivesum{\minted@cmd}}}%
- \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}%
- \IfFileExists{\minted@infile}{}{%
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
- \minted@autogobble{#1}}{}%
- \ShellEscape{\minted@cmd}}%
+ \expandafter\minted@exec@warning
\fi
- \ifthenelse{\boolean{minted@finalizecache}}%
- {%
- \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
- \edef\minted@actualinfile{\minted@cachedir/\minted@cachefilename}%
- \ifwindows
- \StrSubstitute{\minted@infile}{/}{\@backslashchar}[\minted@infile@windows]
- \StrSubstitute{\minted@actualinfile}{/}{\@backslashchar}[\minted@actualinfile@windows]
- \ShellEscape{move /y \minted@outputdir\minted@infile@windows\space\minted@outputdir\minted@actualinfile@windows}%
- \else
- \ShellEscape{mv -f \minted@outputdir\minted@infile\space\minted@outputdir\minted@actualinfile}%
- \fi
- \let\minted@infile\minted@actualinfile
- \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}%
- }%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {%
- \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
- \edef\minted@infile{\minted@cachedir/\minted@cachefilename}%
- \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}}%
- {\expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}}%
- }%
- \minted@inputpyg}%
- {%
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
- \minted@autogobble{#1}}{}%
- \ShellEscape{\minted@cmd}%
- \minted@inputpyg}%
-}
-\def\minted@autogobble#1{%
- \edef\minted@argone@esc{#1}%
- \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]%
- \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]%
- \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}%
- \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]%
- \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]%
- %Need a version of open() that supports encoding under Python 2
- \minted@check@MintedPython
- \edef\minted@autogobblecmd{%
- \ifminted@kpsewhich
- \ifwindows
- \detokenize{for /f "usebackq tokens=*" }\@percentchar\detokenize{a in (`kpsewhich} #1\detokenize{`) do}\space
+ \ifx\minted@exec@error\relax
+ \else
+ \expandafter\minted@exec@error
\fi
- \fi
- \MintedPython\detokenize{ -c "import sys; import os;
- import textwrap;
- from io import open;
- fname = }%
- \ifminted@kpsewhich
- \detokenize{sys.argv[1];}\space
+ \endgroup
+ \minted@codewrapper{%
+ \minted@def@FV@GetKeyValues@standardcatcodes
+ \minted@debug@input
+ \input{\minted@highlightfilepath}}%
+ \ifbool{minted@cache}{\minted@addcachefilename{\minted@highlightfilename}}{}}%
+ {\ifx\minted@exec@warning\relax
\else
- \detokenize{os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\"));}\space
+ \expandafter\minted@exec@warning
\fi
- \detokenize{f = open(fname, \"r\", encoding=\"}\minted@encoding\detokenize{\") if os.path.isfile(fname) else None;
- t = f.readlines() if f is not None else None;
- t_opt = t if t is not None else [];
- f.close() if f is not None else None;
- tmpfname = os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\"));
- f = open(tmpfname, \"w\", encoding=\"}\minted@encoding\detokenize{\") if t is not None else None;
- fvstartnum = }\the\numexpr\FancyVerbStartNum\detokenize{;
- fvstopnum = }\the\numexpr\FancyVerbStopNum\detokenize{;
- s = max(0, fvstartnum-1);
- e = max(s, fvstopnum) if fvstopnum > 0 else len(t_opt);
- [f.write(textwrap.dedent(\"\".join(x))) for x in (t_opt[0:s], t_opt[s:e], t_opt[e:]) if x and t is not None];
- f.close() if t is not None else os.remove(tmpfname);"}%
- \ifminted@kpsewhich
- \ifwindows
- \space\@percentchar\detokenize{a}%
+ \ifx\minted@exec@error\relax
+ \minted@error{Minted executable failed during syntax highlighting
+ but returned no error message (see if "\MintedErrlogFilename" exists)}%
\else
- \space\detokenize{`}kpsewhich #1\space\detokenize{||} #1\detokenize{`}%
+ \expandafter\minted@exec@error
\fi
- \fi
- }%
- \ShellEscape{\minted@autogobblecmd}%
-}
-\newcommand{\minted@inputpyg}{%
- \VerbatimPygments{\PYG}{\PYG}%
- \ifthenelse{\boolean{minted@isinline}}%
- {\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}%
- {\let\FV@BeginVBox\relax
- \let\FV@EndVBox\relax
- \def\FV@BProcessLine##1{\FancyVerbFormatLine{##1}}%
- \minted@inputpyg@inline}%
- {\minted@inputpyg@inline}}%
- {\minted@inputpyg@block}%
-}
-\def\minted@inputpyg@inline{%
- \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
- {\minted@input{\minted@outputdir\minted@infile}}%
- {\colorbox{\minted@get@opt{bgcolor}{}}{%
- \minted@input{\minted@outputdir\minted@infile}}}%
-}
-\def\minted@inputpyg@block{%
- \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
- {\minted@input{\minted@outputdir\minted@infile}}%
- {\begin{minted@colorbg}{\minted@get@opt{bgcolor}{}}%
- \minted@input{\minted@outputdir\minted@infile}%
- \end{minted@colorbg}}}
-\newcommand{\minted@langlinenoson}{%
- \ifcsname c@minted@lang\minted@lang\endcsname\else
- \newcounter{minted@lang\minted@lang}%
- \fi
- \setcounter{minted@FancyVerbLineTemp}{\value{FancyVerbLine}}%
- \setcounter{FancyVerbLine}{\value{minted@lang\minted@lang}}%
-}
-\newcommand{\minted@langlinenosoff}{%
- \setcounter{minted@lang\minted@lang}{\value{FancyVerbLine}}%
- \setcounter{FancyVerbLine}{\value{minted@FancyVerbLineTemp}}%
-}
-\ifbool{minted@langlinenos}{}{%
- \ifbool{minted@inputlanglinenos}{}{%
- \let\minted@langlinenoson\relax
- \let\minted@langlinenosoff\relax
- }
-}
-\ifbool{minted@inputlanglinenos}%
- {\def\minted@inputlanglinenoson{\minted@langlinenoson}%
- \def\minted@inputlanglinenosoff{\minted@langlinenosoff}}%
- {\let\minted@inputlanglinenoson\relax
- \let\minted@inputlanglinenosoff\relax}
+ \endgroup
+ \minted@highlight@fallback}}}
+\def\minted@highlight@fallback{%
+ \minted@insertplaceholder}
\newcommand{\setminted}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\setkeys{minted@opt@g}{#2}}%
- {\minted@configlang{#1}%
- \setkeys{minted@opt@lang}{#2}}}
+ \ifstrempty{#1}%
+ {\pgfkeys{/minted/global/.cd,#2}}%
+ {\let\minted@tmplexer\minted@lexer
+ \edef\minted@lexer{#1}%
+ \pgfkeys{/minted/lexer/.cd,#2}%
+ \let\minted@lexer\minted@tmplexer}}
\newcommand{\setmintedinline}[2][]{%
- \ifthenelse{\equal{#1}{}}%
- {\setkeys{minted@opt@g@i}{#2}}%
- {\minted@configlang{#1}%
- \setkeys{minted@opt@lang@i}{#2}}}
-\setmintedinline[php]{startinline=true}
-\setminted{tabcolor=black}
-\setminted{stripnl=false}
+ \ifstrempty{#1}%
+ {\pgfkeys{/minted/globalinline/.cd,#2}}%
+ {\let\minted@tmplexer\minted@lexer
+ \edef\minted@lexer{#1}%
+ \pgfkeys{/minted/lexerinline/.cd,#2}%
+ \let\minted@lexer\minted@tmplexer}}
\newcommand{\usemintedstyle}[2][]{\setminted[#1]{style=#2}}
-\begingroup
-\catcode`\ =\active
-\catcode`\^^I=\active
-\gdef\minted@defwhitespace@retok{\def {\noexpand\FV@Space}\def^^I{\noexpand\FV@Tab}}%
-\endgroup
-\newcommand{\minted@writecmdcode}[1]{%
- \immediate\openout\minted@code\minted@jobname.pyg\relax
- \immediate\write\minted@code{\detokenize{#1}}%
- \immediate\closeout\minted@code}
\def\mintinline{%
\FVExtraRobustCommand\RobustMintInline\FVExtraUnexpandedReadStarOArgMArgBVArg}
\FVExtrapdfstringdefDisableCommands{%
@@ -1028,31 +1431,51 @@
\ifbool{FVExtraRobustCommandExpanded}%
{\@ifnextchar\bgroup
{\FVExtraReadVArg{\RobustMintInlineProcess{#1}{#2}}}%
- {\PackageError{minted}%
- {Inline delimiters must be paired curly braces in this context}%
- {Use curly braces as delimiters}}}%
+ {\minted@error{Inline delimiters must be paired curly braces in this context}}}%
{\FVExtraReadVArg{\RobustMintInlineProcess{#1}{#2}}}}
-\def\RobustMintInlineProcess#1#2#3{%
+\def\RobustMintInlineProcess@highlight#1#2#3{%
\begingroup
- \setboolean{minted@isinline}{true}%
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \RobustMintInlineProcess@i{#3}}
-\ifthenelse{\boolean{minted@draft}}%
- {\def\RobustMintInlineProcess@i#1{%
- \fvset{extra=true}%
- \Verb{#1}%
- \endgroup}}%
- {\def\RobustMintInlineProcess@i#1{%
- \FVExtraDetokenizeVArg{%
- \FVExtraRetokenizeVArg{\RobustMintInlineProcess@ii}{\FV@CatCodes}}{#1}}
- \def\RobustMintInlineProcess@ii#1{%
- \minted@writecmdcode{#1}%
- \let\Verbatim\VerbEnv
- \let\endVerbatim\endVerbEnv
- \expandafter\minted@pygmentize\expandafter{\minted@lang}%
- \endgroup}}
+ \booltrue{minted@isinline}%
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@usetexoptsnonpygments
+ \FVExtraDetokenizeVArg{%
+ \FVExtraRetokenizeVArg{\RobustMintInlineProcess@highlight@i}{\FV@CatCodes}}{#3}}
+\def\RobustMintInlineProcess@highlight@i#1{%
+ \expandafter\def\csname minted@tmpcodebufferline1\endcsname{#1}%
+ \setcounter{minted@tmpcodebufferlength}{1}%
+ \let\minted@highlight@fallback\RobustMintInlineProcess@highlight@fallback
+ \minted@highlight
+ \setcounter{minted@tmpcodebufferlength}{0}%
+ \endgroup}
+\def\RobustMintInlineProcess@highlight@fallback{%
+ \minted@useadditionalfvoptsnopy
+ \fvset{extra=true}%
+ \minted@codewrapper{%
+ \expandafter\let\expandafter\minted@tmp\csname minted@tmpcodebufferline1\endcsname
+ \expandafter\Verb\expandafter{\minted@tmp}}}
+\def\RobustMintInlineProcess@placeholder#1#2#3{%
+ \begingroup
+ \booltrue{minted@isinline}%
+ \minted@insertplaceholder
+ \endgroup}
+\def\RobustMintInlineProcess@verbatim#1#2#3{%
+ \begingroup
+ \booltrue{minted@isinline}%
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@useadditionalfvoptsnopy
+ \minted@usetexoptsnonpygments
+ \fvset{extra=true}%
+ \minted@codewrapper{\Verb{#3}}%
+ \endgroup}
+\ifbool{minted@placeholder}%
+ {\let\RobustMintInlineProcess\RobustMintInlineProcess@placeholder}%
+ {\ifbool{minted@verbatim}%
+ {\let\RobustMintInlineProcess\RobustMintInlineProcess@verbatim}%
+ {\let\RobustMintInlineProcess\RobustMintInlineProcess@highlight}}
\def\mint{%
\FVExtraRobustCommand\RobustMint\FVExtraUnexpandedReadStarOArgMArgBVArg}
\FVExtrapdfstringdefDisableCommands{%
@@ -1061,110 +1484,165 @@
\ifbool{FVExtraRobustCommandExpanded}%
{\@ifnextchar\bgroup
{\FVExtraReadVArg{\RobustMintProcess{#1}{#2}}}%
- {\PackageError{minted}%
- {Delimiters must be paired curly braces in this context}%
- {Use curly braces as delimiters}}}%
+ {\minted@error{Delimiters must be paired curly braces in this context}}}%
{\FVExtraReadVArg{\RobustMintProcess{#1}{#2}}}}
-\def\RobustMintProcess#1#2#3{%
+\def\RobustMintProcess@highlight#1#2#3{%
+ \begingroup
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@usetexoptsnonpygments
+ \FVExtraDetokenizeVArg{%
+ \FVExtraRetokenizeVArg{\RobustMintProcess@highlight@i}{\FV@CatCodes}}{#3}}
+\def\RobustMintProcess@highlight@i#1{%
+ \expandafter\def\csname minted@tmpcodebufferline1\endcsname{#1}%
+ \setcounter{minted@tmpcodebufferlength}{1}%
+ \let\minted@highlight@fallback\RobustMintProcess@highlight@fallback
+ \minted@highlight
+ \setcounter{minted@tmpcodebufferlength}{0}%
+ \endgroup}
+\def\RobustMintProcess@highlight@fallback{%
+ \minted@useadditionalfvoptsnopy
+ \minted@codewrapper{%
+ \VerbatimInsertBuffer[buffername=minted@tmpcodebuffer,insertenvname=\minted@envname]}}
+\def\RobustMintProcess@placeholder#1#2#3{%
+ \minted@insertplaceholder}
+\def\RobustMintProcess@verbatim#1#2#3{%
+ \begingroup
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@useadditionalfvoptsnopy
+ \minted@usetexoptsnonpygments
+ \FVExtraDetokenizeVArg{%
+ \FVExtraRetokenizeVArg{\RobustMintProcess@verbatim@i}{\FV@CatCodes}}{#3}}
+\def\RobustMintProcess@verbatim@i#1{%
+ \expandafter\def\csname minted@tmpcodebufferline1\endcsname{#1}%
+ \setcounter{minted@tmpcodebufferlength}{1}%
+ \minted@codewrapper{%
+ \VerbatimInsertBuffer[buffername=minted@tmpcodebuffer,insertenvname=\minted@envname]}%
+ \setcounter{minted@tmpcodebufferlength}{0}%
+ \endgroup}
+\ifbool{minted@placeholder}%
+ {\let\RobustMintProcess\RobustMintProcess@placeholder}%
+ {\ifbool{minted@verbatim}%
+ {\let\RobustMintProcess\RobustMintProcess@verbatim}%
+ {\let\RobustMintProcess\RobustMintProcess@highlight}}
+\newenvironment{minted}[2][]%
+ {\VerbatimEnvironment
+ \MintedBegin{#1}{#2}}%
+ {\MintedEnd}
+\def\MintedBegin@highlight#1#2{%
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@usetexoptsnonpygments
+ \begin{VerbatimBuffer}[buffername=minted@tmpcodebuffer,globalbuffer=true]}
+\def\MintedEnd@highlight{%
+ \end{VerbatimBuffer}%
+ \let\minted@highlight@fallback\MintedEnv@highlight@fallback
+ \minted@highlight
+ \VerbatimClearBuffer[buffername=minted@tmpcodebuffer]}
+\def\MintedEnv@highlight@fallback{%
+ \minted@useadditionalfvoptsnopy
+ \minted@codewrapper{%
+ \VerbatimInsertBuffer[buffername=minted@tmpcodebuffer,insertenvname=\minted@envname]}}
+\def\MintedBegin@placeholder#1#2{%
+ \begin{VerbatimBuffer}[buffername=minted@tmpcodebuffer]}
+\def\MintedEnd@placeholder{%
+ \end{VerbatimBuffer}%
+ \minted@insertplaceholder}
+\def\MintedBegin@verbatim#1#2{%
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \minted@usefvopts
+ \minted@useadditionalfvoptsnopy
+ \minted@usetexoptsnonpygments
+ \begin{\minted@envname}}
+\def\MintedEnd@verbatim{%
+ \end{\minted@envname}}
+\ifbool{minted@placeholder}%
+ {\let\MintedBegin\MintedBegin@placeholder
+ \let\MintedEnd\MintedEnd@placeholder}%
+ {\ifbool{minted@verbatim}%
+ {\let\MintedBegin\MintedBegin@verbatim
+ \let\MintedEnd\MintedEnd@verbatim}%
+ {\let\MintedBegin\MintedBegin@highlight
+ \let\MintedEnd\MintedEnd@highlight}}
+\def\minted@readinputmintedargs#1#{%
+ \minted@readinputmintedargs@i{#1}}
+\def\minted@readinputmintedargs@i#1#2#3{%
+ \FVExtraAlwaysUnexpanded{\minted@readinputmintedargs#1{#2}{#3}}}
+\FVExtrapdfstringdefDisableCommands{%
+ \makeatletter
+ \def\minted@readinputmintedargs@i#1#2#3{%
+ \detokenize{<input from file "}#3\detokenize{">}}%
+ \makeatother}
+\def\inputminted{%
+ \FVExtraRobustCommand\RobustInputMinted\minted@readinputmintedargs}
+\FVExtrapdfstringdefDisableCommands{%
+ \def\RobustInputMinted{}}
+\newrobustcmd{\RobustInputMinted}[3][]{%
+ \RobustInputMintedProcess{#1}{#2}{#3}}
+\def\RobustInputMintedProcess@highlight#1#2#3{%
\begingroup
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \RobustMintProcess@i{#3}}
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \edef\minted@inputfilepath{#3}%
+ \minted@usefvopts
+ \minted@usetexoptsnonpygments
+ \let\minted@highlight@fallback\RobustInputMintedProcess@highlight@fallback
+ \minted@highlightinputfile
+ \endgroup}
+\def\RobustInputMintedProcess@highlight@fallback{%
+ \minted@useadditionalfvoptsnopy
+ \minted@codewrapper{%
+ \csname\minted@envname Input\endcsname{\minted@inputfilepath}}}
+\def\RobustInputMintedProcess@placeholder#1#2#3{%
+ \minted@insertplaceholder}
+\def\RobustInputMintedProcess@verbatim#1#2#3{%
+ \begingroup
+ \ifstrempty{#1}{}{\pgfkeys{/minted/cmd/.cd,#1}}%
+ \edef\minted@lexer{#2}%
+ \edef\minted@inputfilepath{#3}%
+ \minted@usefvopts
+ \minted@useadditionalfvoptsnopy
+ \minted@usetexoptsnonpygments
+ \minted@codewrapper{%
+ \csname\minted@envname Input\endcsname{\minted@inputfilepath}}%
+ \endgroup}
+\ifbool{minted@placeholder}%
+ {\let\RobustInputMintedProcess\RobustInputMintedProcess@placeholder}%
+ {\ifbool{minted@verbatim}%
+ {\let\RobustInputMintedProcess\RobustInputMintedProcess@verbatim}%
+ {\let\RobustInputMintedProcess\RobustInputMintedProcess@highlight}}
+\newcommand{\newminted}[3][]{%
+ \ifstrempty{#1}%
+ {\newminted@i{#2code}{#2}{#3}}%
+ {\newminted@i{#1}{#2}{#3}}}
\begingroup
\catcode`\^^M=\active%
-\catcode`\<=1%
-\catcode`\>=2%
-\catcode`\{=12%
-\catcode`\}=12%
-\catcode`\!=0%
-\catcode`\\=12%
-!ifthenelse<!boolean<minted@draft>>%
- <!gdef!RobustMintProcess@i#1<%
- !FVExtraDetokenizeVArg<%
- !FVExtraRetokenizeVArg<!RobustMintProcess@ii><!FV@CatCodes>><#1>>%
- !gdef!RobustMintProcess@ii#1<%
- !minted@langlinenoson%
- !scantokens<%
- \begin{Verbatim}
- #1
- \end{Verbatim}
- !noexpand>%
- !minted@langlinenosoff%
- !endgroup!@doendpe>>%
- <!gdef!RobustMintProcess@i#1<%
- !FVExtraDetokenizeVArg<%
- !FVExtraRetokenizeVArg<!RobustMintProcess@ii><!FV@CatCodes>><#1>>%
- !gdef!RobustMintProcess@ii#1<%
- !minted@writecmdcode<#1>%
- !minted@langlinenoson%
- !expandafter!minted@pygmentize!expandafter<!minted@lang>%
- !minted@langlinenosoff%
- !endgroup!@doendpe>>%
-!endgroup
-\ifthenelse{\boolean{minted@draft}}%
- {\newenvironment{minted}[2][]
- {\VerbatimEnvironment
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \minted@langlinenoson
- \begin{Verbatim}}%
- {\end{Verbatim}%
- \minted@langlinenosoff}}%
- {\newenvironment{minted}[2][]
- {\VerbatimEnvironment
- \let\FVB@VerbatimOut\minted@FVB@VerbatimOut
- \let\FVE@VerbatimOut\minted@FVE@VerbatimOut
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \begin{VerbatimOut}[codes={\catcode`\^^I=12},firstline,lastline]{\minted@jobname.pyg}}%
- {\end{VerbatimOut}%
- \minted@langlinenoson
- \expandafter\minted@pygmentize\expandafter{\minted@lang}%
- \minted@langlinenosoff}}
-\ifthenelse{\boolean{minted@draft}}%
- {\newcommand{\inputminted}[3][]{%
- \begingroup
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \minted@inputlanglinenoson
- \VerbatimInput{#3}%
- \minted@inputlanglinenosoff
- \endgroup}}%
- {\newcommand{\inputminted}[3][]{%
- \begingroup
- \minted@configlang{#2}%
- \setkeys{minted@opt@cmd}{#1}%
- \minted@fvset
- \minted@inputlanglinenoson
- \minted@pygmentize[#3]{#2}%
- \minted@inputlanglinenosoff
- \endgroup}}
-\newcommand{\newminted}[3][]{
- \ifthenelse{\equal{#1}{}}
- {\def\minted@envname{#2code}}
- {\def\minted@envname{#1}}
- \newenvironment{\minted@envname}
- {\VerbatimEnvironment
- \begin{minted}[#3]{#2}}
- {\end{minted}}
- \newenvironment{\minted@envname *}[1]
- {\VerbatimEnvironment\begin{minted}[#3,##1]{#2}}
- {\end{minted}}}
+\gdef\newminted@i#1#2#3{%
+ \expandafter\def\csname#1@i\endcsname##1{%
+ \begin{minted}[#3,##1]{#2}^^M}%
+ \newenvironment{#1}%
+ {\VerbatimEnvironment%
+ \FVExtraReadOArgBeforeVEnv{\csname#1@i\endcsname}}%
+ {\end{minted}}%
+ \newenvironment{#1*}[1]%
+ {\VerbatimEnvironment%
+ \begin{minted}[#3,##1]{#2}}%
+ {\end{minted}}}%
+\endgroup
\newcommand{\newmint}[3][]{%
- \if\relax\detokenize{#1}\relax
- \def\minted@shortname{#2}%
- \else
- \def\minted@shortname{#1}%
- \fi
- \expandafter\newmint@i\expandafter{\minted@shortname}{#2}{#3}}
+ \ifstrempty{#1}%
+ {\edef\minted@tmp{#2}}%
+ {\edef\minted@tmp{#1}}
+ \expandafter\newmint@i\expandafter{\minted@tmp}{#2}{#3}}
\def\newmint@i#1#2#3{%
\expandafter\newcommand\csname#1\endcsname{%
\expandafter\FVExtraRobustCommand\csname RobustNewMint#1\endcsname
- \FVExtraUnexpandedReadStarOArgBVArg}%
+ \FVExtraUnexpandedReadStarOArgBVArg}%
\FVExtrapdfstringdefDisableCommands{%
\expandafter\def\csname RobustNewMint#1\endcsname{}}%
\expandafter\newrobustcmd\csname RobustNewMint#1\endcsname{%
@@ -1173,29 +1651,41 @@
\ifbool{FVExtraRobustCommandExpanded}%
{\@ifnextchar\bgroup
{\FVExtraReadVArg{\csname RobustNewMint#1@ii\endcsname{##1}}}%
- {\PackageError{minted}%
- {Delimiters must be paired curly braces in this context}%
- {Use curly braces as delimiters}}}%
+ {\minted@error{Delimiters must be paired curly braces in this context}}}%
{\FVExtraReadVArg{\csname RobustNewMint#1@ii\endcsname{##1}}}}
\expandafter\def\csname RobustNewMint#1@ii\endcsname##1##2{%
\RobustMintProcess{#3,##1}{#2}{##2}}}
-\newcommand{\newmintedfile}[3][]{
- \ifthenelse{\equal{#1}{}}
- {\def\minted@shortname{#2file}}
- {\def\minted@shortname{#1}}
- \expandafter\newcommand\csname\minted@shortname\endcsname[2][]{
- \inputminted[#3,##1]{#2}{##2}}}
+\def\minted@readnewmintedfileargs#1#{%
+ \minted@readnewmintedfileargs@i{#1}}
+\def\minted@readnewmintedfileargs@i#1#2{%
+ \FVExtraAlwaysUnexpanded{\minted@readnewmintedfileargs#1{#2}}}
+\FVExtrapdfstringdefDisableCommands{%
+ \makeatletter
+ \def\minted@readnewmintedfileargs@i#1#2{%
+ \detokenize{<input from file "}#2\detokenize{">}}%
+ \makeatother}
+\newcommand{\newmintedfile}[3][]{%
+ \ifstrempty{#1}%
+ {\edef\minted@tmp{#2file}}%
+ {\edef\minted@tmp{#1}}%
+ \expandafter\newmintedfile@i\expandafter{\minted@tmp}{#2}{#3}}
+\def\newmintedfile@i#1#2#3{%
+ \expandafter\newcommand\csname#1\endcsname{%
+ \expandafter\FVExtraRobustCommand\csname RobustNewMintedFile#1\endcsname
+ \minted@readnewmintedfileargs}%
+ \FVExtrapdfstringdefDisableCommands{%
+ \expandafter\def\csname RobustNewMintedFile#1\endcsname{}}%
+ \expandafter\newrobustcmd\csname RobustNewMintedFile#1\endcsname[2][]{%
+ \RobustInputMintedProcess{#3,##1}{#2}{##2}}}
\newcommand{\newmintinline}[3][]{%
- \if\relax\detokenize{#1}\relax
- \def\minted@shortname{#2inline}%
- \else
- \def\minted@shortname{#1}%
- \fi
- \expandafter\newmintinline@i\expandafter{\minted@shortname}{#2}{#3}}
+ \ifstrempty{#1}%
+ {\edef\minted@tmp{#2inline}}%
+ {\edef\minted@tmp{#1}}%
+ \expandafter\newmintinline@i\expandafter{\minted@tmp}{#2}{#3}}
\def\newmintinline@i#1#2#3{%
\expandafter\newcommand\csname#1\endcsname{%
\expandafter\FVExtraRobustCommand\csname RobustNewMintInline#1\endcsname
- \FVExtraUnexpandedReadStarOArgBVArg}%
+ \FVExtraUnexpandedReadStarOArgBVArg}%
\FVExtrapdfstringdefDisableCommands{%
\expandafter\def\csname RobustNewMintInline#1\endcsname{}}%
\expandafter\newrobustcmd\csname RobustNewMintInline#1\endcsname{%
@@ -1204,71 +1694,25 @@
\ifbool{FVExtraRobustCommandExpanded}%
{\@ifnextchar\bgroup
{\FVExtraReadVArg{\csname RobustNewMintInline#1@ii\endcsname{##1}}}%
- {\PackageError{minted}%
- {Inline delimiters must be paired curly braces in this context}%
- {Use curly braces as delimiters}}}%
+ {\minted@error{Inline delimiters must be paired curly braces in this context}}}%
{\FVExtraReadVArg{\csname RobustNewMintInline#1@ii\endcsname{##1}}}}
\expandafter\def\csname RobustNewMintInline#1@ii\endcsname##1##2{%
\RobustMintInlineProcess{#3,##1}{#2}{##2}}}
-\ifthenelse{\boolean{minted@newfloat}}%
+\ifbool{minted@newfloat}%
{\@ifundefined{minted@float@within}%
- {\DeclareFloatingEnvironment[fileext=lol,placement=tbp]{listing}}%
- {\def\minted@tmp#1{%
- \DeclareFloatingEnvironment[fileext=lol,placement=tbp, within=#1]{listing}}%
- \expandafter\minted@tmp\expandafter{\minted@float@within}}}%
+ {\DeclareFloatingEnvironment[fileext=lol,placement=tbp]{listing}}%
+ {\def\minted@tmp#1{%
+ \DeclareFloatingEnvironment[fileext=lol,placement=tbp,within=#1]{listing}}%
+ \expandafter\minted@tmp\expandafter{\minted@float@within}}}%
{\@ifundefined{minted@float@within}%
- {\newfloat{listing}{tbp}{lol}}%
- {\newfloat{listing}{tbp}{lol}[\minted@float@within]}}
+ {\newfloat{listing}{tbp}{lol}}%
+ {\newfloat{listing}{tbp}{lol}[\minted@float@within]}}
\ifminted@newfloat\else
\newcommand{\listingscaption}{Listing}
\floatname{listing}{\listingscaption}
\newcommand{\listoflistingscaption}{List of Listings}
\providecommand{\listoflistings}{\listof{listing}{\listoflistingscaption}}
\fi
-\AtEndOfPackage{%
- \ifthenelse{\boolean{minted@draft}}%
- {}%
- {%
- \ifthenelse{\boolean{minted@frozencache}}{}{%
- \ifnum\pdf@shellescape=1\relax\else
- \PackageError{minted}%
- {You must invoke LaTeX with the
- -shell-escape flag}%
- {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty
- documentation for more information.}%
- \fi}%
- }%
-}
-\AtEndPreamble{%
- \ifthenelse{\boolean{minted@draft}}%
- {}%
- {%
- \ifthenelse{\boolean{minted@frozencache}}{}{%
- \TestAppExists{\MintedPygmentize}%
- \ifAppExists\else
- \PackageError{minted}%
- {You must have `pygmentize' installed
- to use this package}%
- {Refer to the installation instructions in the minted
- documentation for more information.}%
- \fi}%
- }%
-}
-\AfterEndDocument{%
- \ifthenelse{\boolean{minted@draft}}%
- {}%
- {\ifthenelse{\boolean{minted@frozencache}}%
- {}
- {\ifx\XeTeXinterchartoks\minted@undefined
- \else
- \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}%
- \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}%
- \fi
- \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}%
- \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}%
- }%
- }%
-}
\endinput
%%
%% End of file `minted.sty'.
diff --git a/Master/texmf-dist/tex/latex/minted/minted2.sty b/Master/texmf-dist/tex/latex/minted/minted2.sty
new file mode 100644
index 00000000000..e2431e47143
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/minted/minted2.sty
@@ -0,0 +1,1285 @@
+%%
+%% This is file `minted2.sty'.
+%%
+%% Copyright 2013--2024 Geoffrey M. Poore
+%% Copyright 2010--2011 Konrad Rudolph
+%%
+%% 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.
+%%
+%% Additionally, the project may be distributed under the terms of the new BSD
+%% license.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Geoffrey Poore.
+%%
+%% This work consists of the file minted2.sty.
+\NeedsTeXFormat{LaTeX2e}
+%%%% Begin minted2 modification
+%% \ProvidesPackage{minted}
+%% [2023/12/18 v2.9 Yet another Pygments shim for LaTeX]
+\ProvidesPackage{minted2}
+ [2024/05/09 v2.9 Yet another Pygments shim for LaTeX]
+\IfPackageLoadedTF{minted}%
+ {\PackageError{minted2}%
+ {Packages minted and minted2 cannot be loaded at the same time}{}%
+ \endinput}%
+ {}
+\@namedef{ver@minted.sty}{2023/12/18 v2.9 Yet another Pygments shim for LaTeX}
+\expandafter\let\expandafter\minted@tmp\csname opt@minted2.sty\endcsname
+\expandafter\let\csname opt@minted.sty\endcsname\minted@tmp
+\let\minted@tmp\relax
+%%%% End minted2 modification
+\RequirePackage{keyval}
+\RequirePackage{kvoptions}
+%%%% Begin minted2 modification
+\SetupKeyvalOptions{family=minted, prefix=minted@}
+%%%% End minted2 modification
+\RequirePackage{fvextra}[2022/11/30]
+\RequirePackage{ifthen}
+\IfFileExists{shellesc.sty}
+ {\RequirePackage{shellesc}
+ \@ifpackagelater{shellesc}{2016/04/29}
+ {}
+ {\protected\def\ShellEscape{\immediate\write18 }}}
+ {\protected\def\ShellEscape{\immediate\write18 }}
+\RequirePackage{ifplatform}
+\RequirePackage{pdftexcmds}
+\RequirePackage{etoolbox}
+\RequirePackage{xstring}
+\RequirePackage{lineno}
+\RequirePackage{framed}
+\RequirePackage{catchfile}
+\AtEndPreamble{%
+ \@ifpackageloaded{color}{}{%
+ \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}}%
+}
+\DeclareVoidOption{chapter}{\def\minted@float@within{chapter}}
+\DeclareVoidOption{section}{\def\minted@float@within{section}}
+\DeclareBoolOption{newfloat}
+\DeclareBoolOption[true]{cache}
+\StrSubstitute{\jobname}{ }{_}[\minted@jobname]
+\StrSubstitute{\minted@jobname}{*}{_}[\minted@jobname]
+\StrSubstitute{\minted@jobname}{"}{}[\minted@jobname]
+\StrSubstitute{\minted@jobname}{'}{_}[\minted@jobname]
+\newcommand{\minted@cachedir}{\detokenize{_}minted-\minted@jobname}
+\let\minted@cachedir@windows\minted@cachedir
+\define@key{minted}{cachedir}{%
+ \@namedef{minted@cachedir}{#1}%
+ \StrSubstitute{\minted@cachedir}{/}{\@backslashchar}[\minted@cachedir@windows]}
+\DeclareBoolOption{finalizecache}
+\DeclareBoolOption{frozencache}
+\let\minted@outputdir\@empty
+\let\minted@outputdir@windows\@empty
+\define@key{minted}{outputdir}{%
+ \@namedef{minted@outputdir}{#1/}%
+ \StrSubstitute{\minted@outputdir}{/}%
+ {\@backslashchar}[\minted@outputdir@windows]}
+\DeclareBoolOption{inputlanglinenos}
+\DeclareBoolOption{kpsewhich}
+\DeclareBoolOption{langlinenos}
+\DeclareBoolOption{draft}
+\DeclareComplementaryOption{final}{draft}
+\ProcessKeyvalOptions*
+\ifthenelse{\boolean{minted@newfloat}}{\RequirePackage{newfloat}}{\RequirePackage{float}}
+\ifcsname tikzifexternalizing\endcsname
+ \tikzifexternalizing{\minted@drafttrue\minted@cachefalse}{}
+\else
+ \ifcsname tikzexternalrealjob\endcsname
+ \minted@drafttrue
+ \minted@cachefalse
+ \else
+ \fi
+\fi
+\ifthenelse{\boolean{minted@finalizecache}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {\PackageError{minted}%
+ {Options "finalizecache" and "frozencache" are not compatible}%
+ {Options "finalizecache" and "frozencache" are not compatible}}%
+ {}}%
+ {}
+\ifthenelse{\boolean{minted@cache}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {}%
+ {\AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}}%
+ {}
+\newcommand{\minted@input}[1]{%
+ \IfFileExists{#1}%
+ {\input{#1}}%
+ {\PackageError{minted}{Missing Pygments output; \string\inputminted\space
+ was^^Jprobably given a file that does not exist--otherwise, you may need
+ ^^Jthe outputdir package option, or may be using an incompatible build
+ tool,^^Jor may be using frozencache with a missing file}%
+ {This could be caused by using -output-directory or -aux-directory
+ ^^Jwithout setting minted's outputdir, or by using a build tool that
+ ^^Jchanges paths in ways minted cannot detect,
+ ^^Jor using frozencache with a missing file.}}%
+}
+\newcommand{\minted@infile}{\minted@jobname.out.pyg}
+\newcommand{\minted@cachelist}{}
+\newcommand{\minted@addcachefile}[1]{%
+ \expandafter\long\expandafter\gdef\expandafter\minted@cachelist\expandafter{%
+ \minted@cachelist,^^J%
+ \space\space#1}%
+ \expandafter\gdef\csname minted@cached@#1\endcsname{}%
+}
+\newcommand{\minted@savecachelist}{%
+ \ifdefempty{\minted@cachelist}{}{%
+ \immediate\write\@mainaux{%
+ \string\gdef\string\minted@oldcachelist\string{%
+ \minted@cachelist\string}}%
+ }%
+}
+\newcommand{\minted@cleancache}{%
+ \ifcsname minted@oldcachelist\endcsname
+ \def\do##1{%
+ \ifthenelse{\equal{##1}{}}{}{%
+ \ifcsname minted@cached@##1\endcsname\else
+ \DeleteFile[\minted@outputdir\minted@cachedir]{##1}%
+ \fi
+ }%
+ }%
+ \expandafter\docsvlist\expandafter{\minted@oldcachelist}%
+ \else
+ \fi
+}
+\ifthenelse{\boolean{minted@draft}}%
+ {\AtEndDocument{%
+ \ifcsname minted@oldcachelist\endcsname
+ \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
+ \minted@savecachelist
+ \fi}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {\AtEndDocument{%
+ \ifcsname minted@oldcachelist\endcsname
+ \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
+ \minted@savecachelist
+ \fi}}%
+ {\AtEndDocument{%
+ \minted@savecachelist
+ \minted@cleancache}}}%
+\ifwindows
+ \providecommand{\DeleteFile}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\IfFileExists{#2}{\ShellEscape{del #2}}{}}%
+ {\IfFileExists{#1/#2}{%
+ \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
+ \ShellEscape{del \minted@windir\@backslashchar #2}}{}}}
+\else
+ \providecommand{\DeleteFile}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\IfFileExists{#2}{\ShellEscape{rm #2}}{}}%
+ {\IfFileExists{#1/#2}{\ShellEscape{rm #1/#2}}{}}}
+\fi
+\ifwindows
+ \newcommand{\ProvideDirectory}[1]{%
+ \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
+ \ShellEscape{if not exist \minted@windir\space mkdir \minted@windir}}
+\else
+ \newcommand{\ProvideDirectory}[1]{%
+ \ShellEscape{mkdir -p #1}}
+\fi
+\newboolean{AppExists}
+\newread\minted@appexistsfile
+\newcommand{\TestAppExists}[1]{%
+ \ifwindows
+ \DeleteFile{\minted@jobname.aex}%
+ \ShellEscape{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd)
+ do set > \minted@jobname.aex <nul: /p
+ x=\string^\@percentchar \string~$PATH:i>> \minted@jobname.aex}%
+ %$ <- balance syntax highlighting
+ \immediate\openin\minted@appexistsfile\minted@jobname.aex
+ \expandafter\def\expandafter\@tmp@cr\expandafter{\the\endlinechar}%
+ \endlinechar=-1\relax
+ \readline\minted@appexistsfile to \minted@apppathifexists
+ \endlinechar=\@tmp@cr
+ \ifthenelse{\equal{\minted@apppathifexists}{}}%
+ {\AppExistsfalse}%
+ {\AppExiststrue}%
+ \immediate\closein\minted@appexistsfile
+ \DeleteFile{\minted@jobname.aex}%
+ \else
+ \ShellEscape{command -v #1 && touch \minted@jobname.aex}%
+ \IfFileExists{\minted@jobname.aex}%
+ {\AppExiststrue
+ \DeleteFile{\minted@jobname.aex}}%
+ {\AppExistsfalse}%
+ \fi
+}
+\newcommand{\minted@optlistcl@g}{}
+\newcommand{\minted@optlistcl@g@i}{}
+\let\minted@lang\@empty
+\newcommand{\minted@optlistcl@lang}{}
+\newcommand{\minted@optlistcl@lang@i}{}
+\newcommand{\minted@optlistcl@cmd}{}
+\newcommand{\minted@optlistfv@g}{}
+\newcommand{\minted@optlistfv@g@i}{}
+\newcommand{\minted@optlistfv@lang}{}
+\newcommand{\minted@optlistfv@lang@i}{}
+\newcommand{\minted@optlistfv@cmd}{}
+\newcommand{\minted@configlang}[1]{%
+ \def\minted@lang{#1}%
+ \ifcsname minted@optlistcl@lang\minted@lang\endcsname\else
+ \expandafter\gdef\csname minted@optlistcl@lang\minted@lang\endcsname{}%
+ \fi
+ \ifcsname minted@optlistcl@lang\minted@lang @i\endcsname\else
+ \expandafter\gdef\csname minted@optlistcl@lang\minted@lang @i\endcsname{}%
+ \fi
+ \ifcsname minted@optlistfv@lang\minted@lang\endcsname\else
+ \expandafter\gdef\csname minted@optlistfv@lang\minted@lang\endcsname{}%
+ \fi
+ \ifcsname minted@optlistfv@lang\minted@lang @i\endcsname\else
+ \expandafter\gdef\csname minted@optlistfv@lang\minted@lang @i\endcsname{}%
+ \fi
+}
+\ifwindows
+ \newcommand{\minted@optlistcl@quote}[2]{%
+ \detokenize{#1="#2"}}
+\else
+ \newcommand{\minted@optlistcl@quote}[2]{%
+ \detokenize{#1='#2'}}
+\fi
+\newcommand{\minted@addto@optlistcl}[3]{%
+ \expandafter\def\expandafter#1\expandafter{#1%
+ \minted@optlistcl@quote{#2}{#3}\space}}
+\newcommand{\minted@addto@optlistcl@lang}[3]{%
+ \expandafter\let\expandafter\minted@tmp\csname #1\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp%
+ \minted@optlistcl@quote{#2}{#3}\space}%
+ \expandafter\let\csname #1\endcsname\minted@tmp}
+\newcommand{\minted@def@optcl}[4][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\define@key{minted@opt@g}{#2}{%
+ \minted@addto@optlistcl{\minted@optlistcl@g}{#3}{#4}%
+ \@namedef{minted@opt@g:#2}{#4}}%
+ \define@key{minted@opt@g@i}{#2}{%
+ \minted@addto@optlistcl{\minted@optlistcl@g@i}{#3}{#4}%
+ \@namedef{minted@opt@g@i:#2}{#4}}%
+ \define@key{minted@opt@lang}{#2}{%
+ \minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
+ \define@key{minted@opt@lang@i}{#2}{%
+ \minted@addto@optlistcl@lang{%
+ minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
+ \define@key{minted@opt@cmd}{#2}{%
+ \minted@addto@optlistcl{\minted@optlistcl@cmd}{#3}{#4}%
+ \@namedef{minted@opt@cmd:#2}{#4}}}%
+ {\define@key{minted@opt@g}{#2}[#1]{%
+ \minted@addto@optlistcl{\minted@optlistcl@g}{#3}{#4}%
+ \@namedef{minted@opt@g:#2}{#4}}%
+ \define@key{minted@opt@g@i}{#2}[#1]{%
+ \minted@addto@optlistcl{\minted@optlistcl@g@i}{#3}{#4}%
+ \@namedef{minted@opt@g@i:#2}{#4}}%
+ \define@key{minted@opt@lang}{#2}[#1]{%
+ \minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
+ \define@key{minted@opt@lang@i}{#2}[#1]{%
+ \minted@addto@optlistcl@lang{%
+ minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
+ \define@key{minted@opt@cmd}{#2}[#1]{%
+ \minted@addto@optlistcl{\minted@optlistcl@cmd}{#3}{#4}%
+ \@namedef{minted@opt@cmd:#2}{#4}}}%
+}
+\begingroup
+\catcode`\!=0
+!catcode`!\=12
+!gdef!minted@escape#1{%
+ !expandafter!minted@escape@i!detokenize{#1}\!FV@Sentinel}
+!gdef!minted@escape@i#1\#2!FV@Sentinel{%
+ !if!relax!detokenize{#2}!relax
+ !expandafter!@firstoftwo
+ !else
+ !expandafter!@secondoftwo
+ !fi
+ {#1!minted@escape@end\#2!FV@Sentinel}
+ {#1!minted@escape@esc\#2!FV@Sentinel}}
+!gdef!minted@escape@end#1!FV@Sentinel{}
+!gdef!minted@escape@esc\#1#2!FV@Sentinel{%
+ #1!minted@escape@i#2!FV@Sentinel}
+!endgroup
+\newcommand{\minted@addto@optlistcl@e}[3]{%
+ \edef\minted@tmp{\minted@escape{#3}}%
+ \expandafter\minted@addto@optlistcl@e@i\expandafter{\minted@tmp}{#1}{#2}}
+\def\minted@addto@optlistcl@e@i#1#2#3{%
+ \expandafter\def\expandafter#2\expandafter{#2\minted@optlistcl@quote{#3}{#1}\space}}
+\newcommand{\minted@addto@optlistcl@lang@e}[3]{%
+ \edef\minted@tmp{\minted@escape{#3}}%
+ \expandafter\minted@addto@optlistcl@lang@e@i\expandafter{\minted@tmp}{#1}{#2}}
+\def\minted@addto@optlistcl@lang@e@i#1#2#3{%
+ \expandafter\let\expandafter\minted@tmp\csname #2\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{\minted@tmp\minted@optlistcl@quote{#3}{#1}\space}%
+ \expandafter\let\csname #2\endcsname\minted@tmp}
+\newcommand{\minted@def@optcl@e}[4][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\define@key{minted@opt@g}{#2}{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@g}{#3}{#4}%
+ \@namedef{minted@opt@g:#2}{#4}}%
+ \define@key{minted@opt@g@i}{#2}{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@g@i}{#3}{#4}%
+ \@namedef{minted@opt@g@i:#2}{#4}}%
+ \define@key{minted@opt@lang}{#2}{%
+ \minted@addto@optlistcl@lang@e{minted@optlistcl@lang\minted@lang}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
+ \define@key{minted@opt@lang@i}{#2}{%
+ \minted@addto@optlistcl@lang@e{%
+ minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
+ \define@key{minted@opt@cmd}{#2}{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@cmd}{#3}{#4}%
+ \@namedef{minted@opt@cmd:#2}{#4}}}%
+ {\define@key{minted@opt@g}{#2}[#1]{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@g}{#3}{#4}%
+ \@namedef{minted@opt@g:#2}{#4}}%
+ \define@key{minted@opt@g@i}{#2}[#1]{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@g@i}{#3}{#4}%
+ \@namedef{minted@opt@g@i:#2}{#4}}%
+ \define@key{minted@opt@lang}{#2}[#1]{%
+ \minted@addto@optlistcl@lang@e{minted@optlistcl@lang\minted@lang}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang:#2}{#4}}%
+ \define@key{minted@opt@lang@i}{#2}[#1]{%
+ \minted@addto@optlistcl@lang@e{%
+ minted@optlistcl@lang\minted@lang @i}{#3}{#4}%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{#4}}%
+ \define@key{minted@opt@cmd}{#2}[#1]{%
+ \minted@addto@optlistcl@e{\minted@optlistcl@cmd}{#3}{#4}%
+ \@namedef{minted@opt@cmd:#2}{#4}}}%
+}
+\newcommand{\minted@def@optcl@switch}[2]{%
+ \define@booleankey{minted@opt@g}{#1}%
+ {\minted@addto@optlistcl{\minted@optlistcl@g}{#2}{True}%
+ \@namedef{minted@opt@g:#1}{true}}
+ {\minted@addto@optlistcl{\minted@optlistcl@g}{#2}{False}%
+ \@namedef{minted@opt@g:#1}{false}}
+ \define@booleankey{minted@opt@g@i}{#1}%
+ {\minted@addto@optlistcl{\minted@optlistcl@g@i}{#2}{True}%
+ \@namedef{minted@opt@g@i:#1}{true}}
+ {\minted@addto@optlistcl{\minted@optlistcl@g@i}{#2}{False}%
+ \@namedef{minted@opt@g@i:#1}{false}}
+ \define@booleankey{minted@opt@lang}{#1}%
+ {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#2}{True}%
+ \@namedef{minted@opt@lang\minted@lang:#1}{true}}
+ {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang}{#2}{False}%
+ \@namedef{minted@opt@lang\minted@lang:#1}{false}}
+ \define@booleankey{minted@opt@lang@i}{#1}%
+ {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang @i}{#2}{True}%
+ \@namedef{minted@opt@lang\minted@lang @i:#1}{true}}
+ {\minted@addto@optlistcl@lang{minted@optlistcl@lang\minted@lang @i}{#2}{False}%
+ \@namedef{minted@opt@lang\minted@lang @i:#1}{false}}
+ \define@booleankey{minted@opt@cmd}{#1}%
+ {\minted@addto@optlistcl{\minted@optlistcl@cmd}{#2}{True}%
+ \@namedef{minted@opt@cmd:#1}{true}}
+ {\minted@addto@optlistcl{\minted@optlistcl@cmd}{#2}{False}%
+ \@namedef{minted@opt@cmd:#1}{false}}
+}
+\newcommand{\minted@def@optfv}[1]{%
+ \define@key{minted@opt@g}{#1}{%
+ \expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
+ \minted@optlistfv@g#1={##1},}%
+ \@namedef{minted@opt@g:#1}{##1}}
+ \define@key{minted@opt@g@i}{#1}{%
+ \expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
+ \minted@optlistfv@g@i#1={##1},}%
+ \@namedef{minted@opt@g@i:#1}{##1}}
+ \define@key{minted@opt@lang}{#1}{%
+ \expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1={##1},}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang:#1}{##1}}
+ \define@key{minted@opt@lang@i}{#1}{%
+ \expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang @i\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1={##1},}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang @i:#1}{##1}}
+ \define@key{minted@opt@cmd}{#1}{%
+ \expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
+ \minted@optlistfv@cmd#1={##1},}%
+ \@namedef{minted@opt@cmd:#1}{##1}}
+}
+\newcommand{\minted@def@optfv@switch}[1]{%
+ \define@booleankey{minted@opt@g}{#1}%
+ {\expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
+ \minted@optlistfv@g#1=true,}%
+ \@namedef{minted@opt@g:#1}{true}}%
+ {\expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
+ \minted@optlistfv@g#1=false,}%
+ \@namedef{minted@opt@g:#1}{false}}%
+ \define@booleankey{minted@opt@g@i}{#1}%
+ {\expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
+ \minted@optlistfv@g@i#1=true,}%
+ \@namedef{minted@opt@g@i:#1}{true}}%
+ {\expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
+ \minted@optlistfv@g@i#1=false,}%
+ \@namedef{minted@opt@g@i:#1}{false}}%
+ \define@booleankey{minted@opt@lang}{#1}%
+ {\expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1=true,}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang:#1}{true}}%
+ {\expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1=false,}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang:#1}{false}}%
+ \define@booleankey{minted@opt@lang@i}{#1}%
+ {\expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang @i\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1=true,}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang @i:#1}{true}}%
+ {\expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang @i\endcsname
+ \expandafter\def\expandafter\minted@tmp\expandafter{%
+ \minted@tmp#1=false,}%
+ \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
+ \minted@tmp
+ \@namedef{minted@opt@lang\minted@lang @i:#1}{false}}%
+ \define@booleankey{minted@opt@cmd}{#1}%
+ {\expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
+ \minted@optlistfv@cmd#1=true,}%
+ \@namedef{minted@opt@cmd:#1}{true}}%
+ {\expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
+ \minted@optlistfv@cmd#1=false,}%
+ \@namedef{minted@opt@cmd:#1}{false}}%
+}
+\newboolean{minted@isinline}
+\newcommand{\minted@fvset}{%
+ \expandafter\fvset\expandafter{\minted@optlistfv@g}%
+ \expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang\endcsname
+ \expandafter\fvset\expandafter{\minted@tmp}%
+ \ifthenelse{\boolean{minted@isinline}}%
+ {\expandafter\fvset\expandafter{\minted@optlistfv@g@i}%
+ \expandafter\let\expandafter\minted@tmp%
+ \csname minted@optlistfv@lang\minted@lang @i\endcsname
+ \expandafter\fvset\expandafter{\minted@tmp}}%
+ {}%
+ \expandafter\fvset\expandafter{\minted@optlistfv@cmd}%
+}
+\newcommand{\minted@def@opt}[2][]{%
+ \define@key{minted@opt@g}{#2}{%
+ \@namedef{minted@opt@g:#2}{##1}}
+ \define@key{minted@opt@g@i}{#2}{%
+ \@namedef{minted@opt@g@i:#2}{##1}}
+ \define@key{minted@opt@lang}{#2}{%
+ \@namedef{minted@opt@lang\minted@lang:#2}{##1}}
+ \define@key{minted@opt@lang@i}{#2}{%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{##1}}
+ \define@key{minted@opt@cmd}{#2}{%
+ \@namedef{minted@opt@cmd:#2}{##1}}
+ \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{#1}}%
+}
+\newcommand{\minted@def@opt@detok}[2][]{%
+ \define@key{minted@opt@g}{#2}{%
+ \@namedef{minted@opt@g:#2}{\detokenize{##1}}}
+ \define@key{minted@opt@g@i}{#2}{%
+ \@namedef{minted@opt@g@i:#2}{\detokenize{##1}}}
+ \define@key{minted@opt@lang}{#2}{%
+ \@namedef{minted@opt@lang\minted@lang:#2}{\detokenize{##1}}}
+ \define@key{minted@opt@lang@i}{#2}{%
+ \@namedef{minted@opt@lang\minted@lang @i:#2}{\detokenize{##1}}}
+ \define@key{minted@opt@cmd}{#2}{%
+ \@namedef{minted@opt@cmd:#2}{\detokenize{##1}}}
+ \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{\detokenize{#1}}}%
+}
+\newcommand{\minted@generate@PYGdef}[1]{%
+ \ifthenelse{\boolean{minted@cache}}%
+ {\def\minted@pygstylepath@load{\minted@outputdir\minted@cachedir/#1.pygstyle}%
+ \minted@addcachefile{#1.pygstyle}}%
+ {\def\minted@pygstylepath@load{\minted@outputdir\minted@jobname.out.pyg}}%
+ \ifwindows
+ \StrSubstitute{\minted@pygstylepath@load}%
+ {/}{\@backslashchar}[\minted@pygstylepath@save]%
+ \else
+ \let\minted@pygstylepath@save\minted@pygstylepath@load
+ \fi
+ \IfFileExists{\minted@pygstylepath@load}%
+ {}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {\PackageError{minted}%
+ {Missing style definition for #1 with frozencache}%
+ {Missing style definition for #1 with frozencache}}%
+ {}%
+ \ShellEscape{%
+ \MintedPygmentize\space -S #1 -f latex -P commandprefix=PYG
+ > \minted@pygstylepath@save
+ }%
+ }%
+ \CatchFileDef{\minted@tmp@filecontents}%
+ {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
+ \begingroup
+ \let\PYG\relax
+ \minted@tmp@filecontents
+ \ifx\PYG\relax
+ \ifthenelse{\boolean{minted@frozencache}}%
+ {\PackageError{minted}%
+ {Outdated style definition for #1 with frozencache}%
+ {Outdated style definition for #1 with frozencache}}%
+ {}%
+ \ShellEscape{%
+ \MintedPygmentize\space -S #1 -f latex -P commandprefix=PYG
+ > \minted@pygstylepath@save
+ }%
+ \CatchFileDef{\minted@tmp@filecontents}%
+ {\minted@pygstylepath@load}{\catcode`@=11\catcode`\%=14\catcode``=12\endlinechar=-1}%
+ \minted@tmp@filecontents
+ \ifx\PYG\relax
+ \PackageError{minted}%
+ {Cannot find Pygments style #1}%
+ {Cannot find Pygments style #1}%
+ \fi
+ \fi
+ \expandafter\global\expandafter\let\csname minted@PYGdef@#1\endcsname%
+ \minted@tmp@filecontents
+ \endgroup
+}
+\newcommand{\minted@defstyle}[1]{%
+ \edef\minted@style{#1}%
+ \ifcsname minted@PYGdef@\minted@style\endcsname\else
+ \expandafter\minted@generate@PYGdef\expandafter{\minted@style}%
+ \fi
+ \csname minted@PYGdef@\minted@style\endcsname
+ \minted@patch@PYGZsq
+ \minted@patch@PYGZhy
+ \ifthenelse{\equal{\minted@get@opt{ignorelexererrors}{true}}{true}}%
+ {\let\PYG@tok@err\relax}{}}
+\ifthenelse{\boolean{minted@draft}}{\renewcommand{\minted@defstyle}[1]{}}{}
+\newcommand{\minted@patch@PYGZsq}{%
+ \ifcsname PYGZsq\endcsname
+ \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
+ {\minted@patch@PYGZsq@i}%
+ {}%
+ \fi
+}
+\begingroup
+\catcode`\'=\active
+\gdef\minted@patch@PYGZsq@i{\gdef\PYGZsq{'}}
+\endgroup
+\newcommand{\minted@patch@PYGZhy}{%
+ \ifcsname PYGZhy\endcsname
+ \expandafter\ifdefstring\expandafter{\csname PYGZhy\endcsname}{\char`\-}%
+ {\def\PYGZhy{\mbox{-}}}%
+ {}%
+ \fi
+}
+\newcommand{\minted@def@opt@switch}[2][false]{%
+ \define@booleankey{minted@opt@g}{#2}%
+ {\@namedef{minted@opt@g:#2}{true}}%
+ {\@namedef{minted@opt@g:#2}{false}}
+ \define@booleankey{minted@opt@g@i}{#2}%
+ {\@namedef{minted@opt@g@i:#2}{true}}%
+ {\@namedef{minted@opt@g@i:#2}{false}}
+ \define@booleankey{minted@opt@lang}{#2}%
+ {\@namedef{minted@opt@lang\minted@lang:#2}{true}}%
+ {\@namedef{minted@opt@lang\minted@lang:#2}{false}}
+ \define@booleankey{minted@opt@lang@i}{#2}%
+ {\@namedef{minted@opt@lang\minted@lang @i:#2}{true}}%
+ {\@namedef{minted@opt@lang\minted@lang @i:#2}{false}}
+ \define@booleankey{minted@opt@cmd}{#2}%
+ {\@namedef{minted@opt@cmd:#2}{true}}%
+ {\@namedef{minted@opt@cmd:#2}{false}}%
+ \@namedef{minted@opt@g:#2}{#1}%
+}
+\def\minted@get@opt#1#2{%
+ \ifcsname minted@opt@cmd:#1\endcsname
+ \csname minted@opt@cmd:#1\endcsname
+ \else
+ \ifminted@isinline
+ \ifcsname minted@opt@lang\minted@lang @i:#1\endcsname
+ \csname minted@opt@lang\minted@lang @i:#1\endcsname
+ \else
+ \ifcsname minted@opt@g@i:#1\endcsname
+ \csname minted@opt@g@i:#1\endcsname
+ \else
+ \ifcsname minted@opt@lang\minted@lang:#1\endcsname
+ \csname minted@opt@lang\minted@lang:#1\endcsname
+ \else
+ \ifcsname minted@opt@g:#1\endcsname
+ \csname minted@opt@g:#1\endcsname
+ \else
+ #2%
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ifcsname minted@opt@lang\minted@lang:#1\endcsname
+ \csname minted@opt@lang\minted@lang:#1\endcsname
+ \else
+ \ifcsname minted@opt@g:#1\endcsname
+ \csname minted@opt@g:#1\endcsname
+ \else
+ #2%
+ \fi
+ \fi
+ \fi
+ \fi
+}%
+\minted@def@optcl{encoding}{-P encoding}{#1}
+\minted@def@optcl{outencoding}{-P outencoding}{#1}
+\minted@def@optcl@e{escapeinside}{-P escapeinside}{#1}
+\minted@def@optcl@switch{stripnl}{-P stripnl}
+\minted@def@optcl@switch{stripall}{-P stripall}
+\minted@def@optcl@switch{python3}{-P python3}
+\minted@def@optcl@switch{funcnamehighlighting}{-P funcnamehighlighting}
+\minted@def@optcl@switch{startinline}{-P startinline}
+\ifthenelse{\boolean{minted@draft}}%
+ {\minted@def@optfv{gobble}}%
+ {\minted@def@optcl{gobble}{-F gobble:n}{#1}}
+\minted@def@optcl{codetagify}{-F codetagify:codetags}{#1}
+\minted@def@optcl{keywordcase}{-F keywordcase:case}{#1}
+\minted@def@optcl@switch{texcl}{-P texcomments}
+\minted@def@optcl@switch{texcomments}{-P texcomments}
+\minted@def@optcl@switch{mathescape}{-P mathescape}
+\minted@def@optfv@switch{linenos}
+\minted@def@opt@detok{style}
+\minted@def@optfv{frame}
+\minted@def@optfv{framesep}
+\minted@def@optfv{framerule}
+\minted@def@optfv{rulecolor}
+\minted@def@optfv{numbersep}
+\minted@def@optfv{numbers}
+\minted@def@optfv{firstnumber}
+\minted@def@optfv{stepnumber}
+\minted@def@optfv{firstline}
+\minted@def@optfv{lastline}
+\minted@def@optfv{baselinestretch}
+\minted@def@optfv{xleftmargin}
+\minted@def@optfv{xrightmargin}
+\minted@def@optfv{fillcolor}
+\minted@def@optfv{tabsize}
+\minted@def@optfv{fontfamily}
+\minted@def@optfv{fontsize}
+\minted@def@optfv{fontshape}
+\minted@def@optfv{fontseries}
+\minted@def@optfv{formatcom}
+\minted@def@optfv{label}
+\minted@def@optfv{labelposition}
+\minted@def@optfv{highlightlines}
+\minted@def@optfv{highlightcolor}
+\minted@def@optfv{space}
+\minted@def@optfv{spacecolor}
+\minted@def@optfv{tab}
+\minted@def@optfv{tabcolor}
+\minted@def@optfv{highlightcolor}
+\minted@def@optfv@switch{beameroverlays}
+\minted@def@optfv@switch{curlyquotes}
+\minted@def@optfv@switch{numberfirstline}
+\minted@def@optfv@switch{numberblanklines}
+\minted@def@optfv@switch{stepnumberfromfirst}
+\minted@def@optfv@switch{stepnumberoffsetvalues}
+\minted@def@optfv@switch{showspaces}
+\minted@def@optfv@switch{resetmargins}
+\minted@def@optfv@switch{samepage}
+\minted@def@optfv@switch{showtabs}
+\minted@def@optfv@switch{obeytabs}
+\minted@def@optfv@switch{breaklines}
+\minted@def@optfv@switch{breakbytoken}
+\minted@def@optfv@switch{breakbytokenanywhere}
+\minted@def@optfv{breakindent}
+\minted@def@optfv{breakindentnchars}
+\minted@def@optfv@switch{breakautoindent}
+\minted@def@optfv{breaksymbol}
+\minted@def@optfv{breaksymbolsep}
+\minted@def@optfv{breaksymbolsepnchars}
+\minted@def@optfv{breaksymbolindent}
+\minted@def@optfv{breaksymbolindentnchars}
+\minted@def@optfv{breaksymbolleft}
+\minted@def@optfv{breaksymbolsepleft}
+\minted@def@optfv{breaksymbolsepleftnchars}
+\minted@def@optfv{breaksymbolindentleft}
+\minted@def@optfv{breaksymbolindentleftnchars}
+\minted@def@optfv{breaksymbolright}
+\minted@def@optfv{breaksymbolsepright}
+\minted@def@optfv{breaksymbolseprightnchars}
+\minted@def@optfv{breaksymbolindentright}
+\minted@def@optfv{breaksymbolindentrightnchars}
+\minted@def@optfv{breakbefore}
+\minted@def@optfv{breakbeforesymbolpre}
+\minted@def@optfv{breakbeforesymbolpost}
+\minted@def@optfv@switch{breakbeforeinrun}
+\minted@def@optfv{breakafter}
+\minted@def@optfv@switch{breakafterinrun}
+\minted@def@optfv{breakaftersymbolpre}
+\minted@def@optfv{breakaftersymbolpost}
+\minted@def@optfv@switch{breakanywhere}
+\minted@def@optfv{breakanywheresymbolpre}
+\minted@def@optfv{breakanywheresymbolpost}
+\minted@def@optfv{fontencoding}
+\minted@def@opt{bgcolor}
+\minted@def@opt@switch{autogobble}
+\minted@def@opt@switch{ignorelexererrors}
+\newcommand{\minted@encoding}{\minted@get@opt{encoding}{UTF8}}
+\newenvironment{minted@snugshade*}[1]{%
+ \def\FrameCommand##1{\hskip\@totalleftmargin
+ \colorbox{#1}{##1}%
+ \hskip-\linewidth \hskip-\@totalleftmargin \hskip\columnwidth}%
+ \MakeFramed{\advance\hsize-\width
+ \@totalleftmargin\z@ \linewidth\hsize
+ \advance\labelsep\fboxsep
+ \@setminipage}%
+ }{\par\unskip\@minipagefalse\endMakeFramed}
+\newsavebox{\minted@bgbox}
+\newenvironment{minted@colorbg}[1]{%
+ \setlength{\OuterFrameSep}{0pt}%
+ \let\minted@tmp\FV@NumberSep
+ \edef\FV@NumberSep{%
+ \the\numexpr\dimexpr\minted@tmp+\number\fboxsep\relax sp\relax}%
+ \medskip
+ \begin{minted@snugshade*}{#1}}
+ {\end{minted@snugshade*}%
+ \medskip\noindent}
+\newwrite\minted@code
+\newcommand{\minted@savecode}[1]{
+ \immediate\openout\minted@code\minted@jobname.pyg\relax
+ \immediate\write\minted@code{\expandafter\detokenize\expandafter{#1}}%
+ \immediate\closeout\minted@code}
+\newcounter{minted@FancyVerbLineTemp}
+\newcommand{\minted@write@detok}[1]{%
+ \immediate\write\FV@OutFile{\detokenize{#1}}}
+\newcommand{\minted@FVB@VerbatimOut}[1]{%
+ \setcounter{minted@FancyVerbLineTemp}{\value{FancyVerbLine}}%
+ \@bsphack
+ \begingroup
+ \FV@UseKeyValues
+ \FV@DefineWhiteSpace
+ \def\FV@Space{\space}%
+ \FV@DefineTabOut
+ \let\FV@ProcessLine\minted@write@detok
+ \immediate\openout\FV@OutFile #1\relax
+ \let\FV@FontScanPrep\relax
+ \let\@noligs\relax
+ \FV@Scan}
+\newcommand{\minted@FVE@VerbatimOut}{%
+ \immediate\closeout\FV@OutFile\endgroup\@esphack
+ \setcounter{FancyVerbLine}{\value{minted@FancyVerbLineTemp}}}%
+\ifcsname MintedPygmentize\endcsname\else
+ \newcommand{\MintedPygmentize}{pygmentize}
+\fi
+\newcounter{minted@pygmentizecounter}
+\ifwindows
+ \newcommand{\MintedPython}{python}
+\else
+ \newcommand{\MintedPython}{python3}
+\fi
+\newcommand{\minted@check@MintedPython}{%
+ \ifcsname minted@MintedPython@\MintedPython\endcsname
+ \else
+ \let\minted@altpython\minted@undefined
+ \ifdefstring{\MintedPython}{python}{\def\minted@altpython{python3}}{}%
+ \ifdefstring{\MintedPython}{python3}{\def\minted@altpython{python}}{}%
+ \ifx\minted@altpython\minted@undefined\relax
+ \TestAppExists{\MintedPython}%
+ \ifAppExists
+ \expandafter\global\expandafter\let%
+ \csname minted@MintedPython@\MintedPython\endcsname\relax
+ \else
+ \PackageError{minted}%
+ {Failed to find Python executable \MintedPython;
+ check Python installation (including PATH),
+ or redefine \string\MintedPython}%
+ {Failed to find Python executable \MintedPython;
+ check Python installation (including PATH),
+ or redefine \string\MintedPython}%
+ \fi
+ \else
+ \ifcsname minted@MintedPython@\minted@altpython\endcsname
+ \let\MintedPython\minted@altpython
+ \else
+ \TestAppExists{\MintedPython}%
+ \ifAppExists
+ \expandafter\global\expandafter\let%
+ \csname minted@MintedPython@\MintedPython\endcsname\relax
+ \else
+ \TestAppExists{\minted@altpython}%
+ \ifAppExists
+ \expandafter\global\expandafter\let%
+ \csname minted@MintedPython@\minted@altpython\endcsname\relax
+ \let\MintedPython\minted@altpython
+ \else
+ \PackageError{minted}%
+ {Failed to find Python executables python or python3;
+ check Python installation (including PATH),
+ or redefine \string\MintedPython}%
+ {Failed to find Python executables python or python3;
+ check Python installation (including PATH),
+ or redefine \string\MintedPython}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+}
+\ifwindows
+ \def\minted@opt@quote#1{\detokenize{"#1"}}
+\else
+ \def\minted@opt@quote#1{\detokenize{'#1'}}
+\fi
+\newcommand{\minted@pygmentize}[2][\minted@outputdir\minted@jobname.pyg]{%
+ \minted@defstyle{\minted@get@opt{style}{default}}%
+ \stepcounter{minted@pygmentizecounter}%
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
+ {\def\minted@codefile{\minted@outputdir\minted@jobname.pyg}}%
+ {\def\minted@codefile{#1}}%
+ \ifthenelse{\boolean{minted@isinline}}%
+ {\def\minted@optlistcl@inlines{%
+ \minted@optlistcl@g@i
+ \csname minted@optlistcl@lang\minted@lang @i\endcsname}}%
+ {\let\minted@optlistcl@inlines\@empty}%
+ \def\minted@cmd{%
+ \ifminted@kpsewhich
+ \ifwindows
+ \detokenize{for /f "usebackq tokens=*"}\space\@percentchar\detokenize{a in (`kpsewhich}\space\minted@codefile\detokenize{`) do}\space
+ \fi
+ \fi
+ \MintedPygmentize\space -l \minted@opt@quote{#2}
+ -f latex -P commandprefix=PYG -F tokenmerge
+ \minted@optlistcl@g \csname minted@optlistcl@lang\minted@lang\endcsname
+ \minted@optlistcl@inlines
+ \minted@optlistcl@cmd -o \minted@outputdir\minted@infile\space
+ \ifminted@kpsewhich
+ \ifwindows
+ \@percentchar\detokenize{a}%
+ \else
+ \detokenize{`}kpsewhich \minted@codefile\space
+ \detokenize{||} \minted@codefile\detokenize{`}%
+ \fi
+ \else
+ \minted@codefile
+ \fi}%
+ % For debugging, uncomment: %%%%
+ % \immediate\typeout{\minted@cmd}%
+ % %%%%
+ \ifthenelse{\boolean{minted@cache}}%
+ {%
+ \ifminted@frozencache
+ \else
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
+ {\edef\minted@hash{%
+ \pdf@filemdfivesum{#1}%
+ \pdf@mdfivesum{\minted@cmd\space%
+ autogobble(\the\numexpr\FancyVerbStartNum\relax-%
+ \the\numexpr\FancyVerbStopNum\relax)}}}%
+ {\edef\minted@hash{%
+ \pdf@filemdfivesum{#1}%
+ \pdf@mdfivesum{\minted@cmd}}}%
+ \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}%
+ \IfFileExists{\minted@infile}{}{%
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
+ \minted@autogobble{#1}}{}%
+ \ShellEscape{\minted@cmd}}%
+ \fi
+ \ifthenelse{\boolean{minted@finalizecache}}%
+ {%
+ \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
+ \edef\minted@actualinfile{\minted@cachedir/\minted@cachefilename}%
+ \ifwindows
+ \StrSubstitute{\minted@infile}{/}{\@backslashchar}[\minted@infile@windows]
+ \StrSubstitute{\minted@actualinfile}{/}{\@backslashchar}[\minted@actualinfile@windows]
+ \ShellEscape{move /y \minted@outputdir\minted@infile@windows\space\minted@outputdir\minted@actualinfile@windows}%
+ \else
+ \ShellEscape{mv -f \minted@outputdir\minted@infile\space\minted@outputdir\minted@actualinfile}%
+ \fi
+ \let\minted@infile\minted@actualinfile
+ \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}%
+ }%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {%
+ \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
+ \edef\minted@infile{\minted@cachedir/\minted@cachefilename}%
+ \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}}%
+ {\expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}}%
+ }%
+ \minted@inputpyg}%
+ {%
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
+ \minted@autogobble{#1}}{}%
+ \ShellEscape{\minted@cmd}%
+ \minted@inputpyg}%
+}
+\def\minted@autogobble#1{%
+ \edef\minted@argone@esc{#1}%
+ \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]%
+ \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]%
+ \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}%
+ \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]%
+ \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]%
+ %Need a version of open() that supports encoding under Python 2
+ \minted@check@MintedPython
+ \edef\minted@autogobblecmd{%
+ \ifminted@kpsewhich
+ \ifwindows
+ \detokenize{for /f "usebackq tokens=*" }\@percentchar\detokenize{a in (`kpsewhich} #1\detokenize{`) do}\space
+ \fi
+ \fi
+ \MintedPython\detokenize{ -c "import sys; import os;
+ import textwrap;
+ from io import open;
+ fname = }%
+ \ifminted@kpsewhich
+ \detokenize{sys.argv[1];}\space
+ \else
+ \detokenize{os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\"));}\space
+ \fi
+ \detokenize{f = open(fname, \"r\", encoding=\"}\minted@encoding\detokenize{\") if os.path.isfile(fname) else None;
+ t = f.readlines() if f is not None else None;
+ t_opt = t if t is not None else [];
+ f.close() if f is not None else None;
+ tmpfname = os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\"));
+ f = open(tmpfname, \"w\", encoding=\"}\minted@encoding\detokenize{\") if t is not None else None;
+ fvstartnum = }\the\numexpr\FancyVerbStartNum\detokenize{;
+ fvstopnum = }\the\numexpr\FancyVerbStopNum\detokenize{;
+ s = max(0, fvstartnum-1);
+ e = max(s, fvstopnum) if fvstopnum > 0 else len(t_opt);
+ [f.write(textwrap.dedent(\"\".join(x))) for x in (t_opt[0:s], t_opt[s:e], t_opt[e:]) if x and t is not None];
+ f.close() if t is not None else os.remove(tmpfname);"}%
+ \ifminted@kpsewhich
+ \ifwindows
+ \space\@percentchar\detokenize{a}%
+ \else
+ \space\detokenize{`}kpsewhich #1\space\detokenize{||} #1\detokenize{`}%
+ \fi
+ \fi
+ }%
+ \ShellEscape{\minted@autogobblecmd}%
+}
+\newcommand{\minted@inputpyg}{%
+ \VerbatimPygments{\PYG}{\PYG}%
+ \ifthenelse{\boolean{minted@isinline}}%
+ {\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}%
+ {\let\FV@BeginVBox\relax
+ \let\FV@EndVBox\relax
+ \def\FV@BProcessLine##1{\FancyVerbFormatLine{##1}}%
+ \minted@inputpyg@inline}%
+ {\minted@inputpyg@inline}}%
+ {\minted@inputpyg@block}%
+}
+\def\minted@inputpyg@inline{%
+ \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
+ {\minted@input{\minted@outputdir\minted@infile}}%
+ {\colorbox{\minted@get@opt{bgcolor}{}}{%
+ \minted@input{\minted@outputdir\minted@infile}}}%
+}
+\def\minted@inputpyg@block{%
+ \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
+ {\minted@input{\minted@outputdir\minted@infile}}%
+ {\begin{minted@colorbg}{\minted@get@opt{bgcolor}{}}%
+ \minted@input{\minted@outputdir\minted@infile}%
+ \end{minted@colorbg}}}
+\newcommand{\minted@langlinenoson}{%
+ \ifcsname c@minted@lang\minted@lang\endcsname\else
+ \newcounter{minted@lang\minted@lang}%
+ \fi
+ \setcounter{minted@FancyVerbLineTemp}{\value{FancyVerbLine}}%
+ \setcounter{FancyVerbLine}{\value{minted@lang\minted@lang}}%
+}
+\newcommand{\minted@langlinenosoff}{%
+ \setcounter{minted@lang\minted@lang}{\value{FancyVerbLine}}%
+ \setcounter{FancyVerbLine}{\value{minted@FancyVerbLineTemp}}%
+}
+\ifbool{minted@langlinenos}{}{%
+ \ifbool{minted@inputlanglinenos}{}{%
+ \let\minted@langlinenoson\relax
+ \let\minted@langlinenosoff\relax
+ }
+}
+\ifbool{minted@inputlanglinenos}%
+ {\def\minted@inputlanglinenoson{\minted@langlinenoson}%
+ \def\minted@inputlanglinenosoff{\minted@langlinenosoff}}%
+ {\let\minted@inputlanglinenoson\relax
+ \let\minted@inputlanglinenosoff\relax}
+\newcommand{\setminted}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\setkeys{minted@opt@g}{#2}}%
+ {\minted@configlang{#1}%
+ \setkeys{minted@opt@lang}{#2}}}
+\newcommand{\setmintedinline}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\setkeys{minted@opt@g@i}{#2}}%
+ {\minted@configlang{#1}%
+ \setkeys{minted@opt@lang@i}{#2}}}
+\setmintedinline[php]{startinline=true}
+\setminted{tabcolor=black}
+\setminted{stripnl=false}
+\newcommand{\usemintedstyle}[2][]{\setminted[#1]{style=#2}}
+\begingroup
+\catcode`\ =\active
+\catcode`\^^I=\active
+\gdef\minted@defwhitespace@retok{\def {\noexpand\FV@Space}\def^^I{\noexpand\FV@Tab}}%
+\endgroup
+\newcommand{\minted@writecmdcode}[1]{%
+ \immediate\openout\minted@code\minted@jobname.pyg\relax
+ \immediate\write\minted@code{\detokenize{#1}}%
+ \immediate\closeout\minted@code}
+\def\mintinline{%
+ \FVExtraRobustCommand\RobustMintInline\FVExtraUnexpandedReadStarOArgMArgBVArg}
+\FVExtrapdfstringdefDisableCommands{%
+ \def\RobustMintInline{}}
+\newrobustcmd{\RobustMintInline}[2][]{%
+ \ifbool{FVExtraRobustCommandExpanded}%
+ {\@ifnextchar\bgroup
+ {\FVExtraReadVArg{\RobustMintInlineProcess{#1}{#2}}}%
+ {\PackageError{minted}%
+ {Inline delimiters must be paired curly braces in this context}%
+ {Use curly braces as delimiters}}}%
+ {\FVExtraReadVArg{\RobustMintInlineProcess{#1}{#2}}}}
+\def\RobustMintInlineProcess#1#2#3{%
+ \begingroup
+ \setboolean{minted@isinline}{true}%
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \RobustMintInlineProcess@i{#3}}
+\ifthenelse{\boolean{minted@draft}}%
+ {\def\RobustMintInlineProcess@i#1{%
+ \fvset{extra=true}%
+ \Verb{#1}%
+ \endgroup}}%
+ {\def\RobustMintInlineProcess@i#1{%
+ \FVExtraDetokenizeVArg{%
+ \FVExtraRetokenizeVArg{\RobustMintInlineProcess@ii}{\FV@CatCodes}}{#1}}
+ \def\RobustMintInlineProcess@ii#1{%
+ \minted@writecmdcode{#1}%
+ \let\Verbatim\VerbEnv
+ \let\endVerbatim\endVerbEnv
+ \expandafter\minted@pygmentize\expandafter{\minted@lang}%
+ \endgroup}}
+\def\mint{%
+ \FVExtraRobustCommand\RobustMint\FVExtraUnexpandedReadStarOArgMArgBVArg}
+\FVExtrapdfstringdefDisableCommands{%
+ \def\RobustMint{}}
+\newrobustcmd{\RobustMint}[2][]{%
+ \ifbool{FVExtraRobustCommandExpanded}%
+ {\@ifnextchar\bgroup
+ {\FVExtraReadVArg{\RobustMintProcess{#1}{#2}}}%
+ {\PackageError{minted}%
+ {Delimiters must be paired curly braces in this context}%
+ {Use curly braces as delimiters}}}%
+ {\FVExtraReadVArg{\RobustMintProcess{#1}{#2}}}}
+\def\RobustMintProcess#1#2#3{%
+ \begingroup
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \RobustMintProcess@i{#3}}
+\begingroup
+\catcode`\^^M=\active%
+\catcode`\<=1%
+\catcode`\>=2%
+\catcode`\{=12%
+\catcode`\}=12%
+\catcode`\!=0%
+\catcode`\\=12%
+!ifthenelse<!boolean<minted@draft>>%
+ <!gdef!RobustMintProcess@i#1<%
+ !FVExtraDetokenizeVArg<%
+ !FVExtraRetokenizeVArg<!RobustMintProcess@ii><!FV@CatCodes>><#1>>%
+ !gdef!RobustMintProcess@ii#1<%
+ !minted@langlinenoson%
+ !scantokens<%
+ \begin{Verbatim}
+ #1
+ \end{Verbatim}
+ !noexpand>%
+ !minted@langlinenosoff%
+ !endgroup!@doendpe>>%
+ <!gdef!RobustMintProcess@i#1<%
+ !FVExtraDetokenizeVArg<%
+ !FVExtraRetokenizeVArg<!RobustMintProcess@ii><!FV@CatCodes>><#1>>%
+ !gdef!RobustMintProcess@ii#1<%
+ !minted@writecmdcode<#1>%
+ !minted@langlinenoson%
+ !expandafter!minted@pygmentize!expandafter<!minted@lang>%
+ !minted@langlinenosoff%
+ !endgroup!@doendpe>>%
+!endgroup
+\ifthenelse{\boolean{minted@draft}}%
+ {\newenvironment{minted}[2][]
+ {\VerbatimEnvironment
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \minted@langlinenoson
+ \begin{Verbatim}}%
+ {\end{Verbatim}%
+ \minted@langlinenosoff}}%
+ {\newenvironment{minted}[2][]
+ {\VerbatimEnvironment
+ \let\FVB@VerbatimOut\minted@FVB@VerbatimOut
+ \let\FVE@VerbatimOut\minted@FVE@VerbatimOut
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \begin{VerbatimOut}[codes={\catcode`\^^I=12},firstline,lastline]{\minted@jobname.pyg}}%
+ {\end{VerbatimOut}%
+ \minted@langlinenoson
+ \expandafter\minted@pygmentize\expandafter{\minted@lang}%
+ \minted@langlinenosoff}}
+\ifthenelse{\boolean{minted@draft}}%
+ {\newcommand{\inputminted}[3][]{%
+ \begingroup
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \minted@inputlanglinenoson
+ \VerbatimInput{#3}%
+ \minted@inputlanglinenosoff
+ \endgroup}}%
+ {\newcommand{\inputminted}[3][]{%
+ \begingroup
+ \minted@configlang{#2}%
+ \setkeys{minted@opt@cmd}{#1}%
+ \minted@fvset
+ \minted@inputlanglinenoson
+ \minted@pygmentize[#3]{#2}%
+ \minted@inputlanglinenosoff
+ \endgroup}}
+\newcommand{\newminted}[3][]{
+ \ifthenelse{\equal{#1}{}}
+ {\def\minted@envname{#2code}}
+ {\def\minted@envname{#1}}
+ \newenvironment{\minted@envname}
+ {\VerbatimEnvironment
+ \begin{minted}[#3]{#2}}
+ {\end{minted}}
+ \newenvironment{\minted@envname *}[1]
+ {\VerbatimEnvironment\begin{minted}[#3,##1]{#2}}
+ {\end{minted}}}
+\newcommand{\newmint}[3][]{%
+ \if\relax\detokenize{#1}\relax
+ \def\minted@shortname{#2}%
+ \else
+ \def\minted@shortname{#1}%
+ \fi
+ \expandafter\newmint@i\expandafter{\minted@shortname}{#2}{#3}}
+\def\newmint@i#1#2#3{%
+ \expandafter\newcommand\csname#1\endcsname{%
+ \expandafter\FVExtraRobustCommand\csname RobustNewMint#1\endcsname
+ \FVExtraUnexpandedReadStarOArgBVArg}%
+ \FVExtrapdfstringdefDisableCommands{%
+ \expandafter\def\csname RobustNewMint#1\endcsname{}}%
+ \expandafter\newrobustcmd\csname RobustNewMint#1\endcsname{%
+ \FVExtraReadOArgBeforeVArg{\csname RobustNewMint#1@i\endcsname}}%
+ \expandafter\def\csname RobustNewMint#1@i\endcsname##1{%
+ \ifbool{FVExtraRobustCommandExpanded}%
+ {\@ifnextchar\bgroup
+ {\FVExtraReadVArg{\csname RobustNewMint#1@ii\endcsname{##1}}}%
+ {\PackageError{minted}%
+ {Delimiters must be paired curly braces in this context}%
+ {Use curly braces as delimiters}}}%
+ {\FVExtraReadVArg{\csname RobustNewMint#1@ii\endcsname{##1}}}}
+ \expandafter\def\csname RobustNewMint#1@ii\endcsname##1##2{%
+ \RobustMintProcess{#3,##1}{#2}{##2}}}
+\newcommand{\newmintedfile}[3][]{
+ \ifthenelse{\equal{#1}{}}
+ {\def\minted@shortname{#2file}}
+ {\def\minted@shortname{#1}}
+ \expandafter\newcommand\csname\minted@shortname\endcsname[2][]{
+ \inputminted[#3,##1]{#2}{##2}}}
+\newcommand{\newmintinline}[3][]{%
+ \if\relax\detokenize{#1}\relax
+ \def\minted@shortname{#2inline}%
+ \else
+ \def\minted@shortname{#1}%
+ \fi
+ \expandafter\newmintinline@i\expandafter{\minted@shortname}{#2}{#3}}
+\def\newmintinline@i#1#2#3{%
+ \expandafter\newcommand\csname#1\endcsname{%
+ \expandafter\FVExtraRobustCommand\csname RobustNewMintInline#1\endcsname
+ \FVExtraUnexpandedReadStarOArgBVArg}%
+ \FVExtrapdfstringdefDisableCommands{%
+ \expandafter\def\csname RobustNewMintInline#1\endcsname{}}%
+ \expandafter\newrobustcmd\csname RobustNewMintInline#1\endcsname{%
+ \FVExtraReadOArgBeforeVArg{\csname RobustNewMintInline#1@i\endcsname}}%
+ \expandafter\def\csname RobustNewMintInline#1@i\endcsname##1{%
+ \ifbool{FVExtraRobustCommandExpanded}%
+ {\@ifnextchar\bgroup
+ {\FVExtraReadVArg{\csname RobustNewMintInline#1@ii\endcsname{##1}}}%
+ {\PackageError{minted}%
+ {Inline delimiters must be paired curly braces in this context}%
+ {Use curly braces as delimiters}}}%
+ {\FVExtraReadVArg{\csname RobustNewMintInline#1@ii\endcsname{##1}}}}
+ \expandafter\def\csname RobustNewMintInline#1@ii\endcsname##1##2{%
+ \RobustMintInlineProcess{#3,##1}{#2}{##2}}}
+\ifthenelse{\boolean{minted@newfloat}}%
+ {\@ifundefined{minted@float@within}%
+ {\DeclareFloatingEnvironment[fileext=lol,placement=tbp]{listing}}%
+ {\def\minted@tmp#1{%
+ \DeclareFloatingEnvironment[fileext=lol,placement=tbp, within=#1]{listing}}%
+ \expandafter\minted@tmp\expandafter{\minted@float@within}}}%
+ {\@ifundefined{minted@float@within}%
+ {\newfloat{listing}{tbp}{lol}}%
+ {\newfloat{listing}{tbp}{lol}[\minted@float@within]}}
+\ifminted@newfloat\else
+\newcommand{\listingscaption}{Listing}
+\floatname{listing}{\listingscaption}
+\newcommand{\listoflistingscaption}{List of Listings}
+\providecommand{\listoflistings}{\listof{listing}{\listoflistingscaption}}
+\fi
+\AtEndOfPackage{%
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {%
+ \ifthenelse{\boolean{minted@frozencache}}{}{%
+ \ifnum\pdf@shellescape=1\relax\else
+ \PackageError{minted}%
+ {You must invoke LaTeX with the
+ -shell-escape flag}%
+ {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty
+ documentation for more information.}%
+ \fi}%
+ }%
+}
+\AtEndPreamble{%
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {%
+ \ifthenelse{\boolean{minted@frozencache}}{}{%
+ \TestAppExists{\MintedPygmentize}%
+ \ifAppExists\else
+ \PackageError{minted}%
+ {You must have `pygmentize' installed
+ to use this package}%
+ {Refer to the installation instructions in the minted
+ documentation for more information.}%
+ \fi}%
+ }%
+}
+\AfterEndDocument{%
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {}
+ {\ifx\XeTeXinterchartoks\minted@undefined
+ \else
+ \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}%
+ \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}%
+ \fi
+ \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}%
+ \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}%
+ }%
+ }%
+}
+\endinput
+%%
+%% End of file `minted2.sty'.
diff --git a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
index 0a3a44310c5..a41d201f0ea 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.14}
- \def\versiondate{2024/07/19\space}
+ \def\versionno{1.16}
+ \def\versiondate{2024/09/06\space}
%%
%% Author: John H. Lienhard, V
%% Department of Mechanical Engineering
@@ -89,6 +89,7 @@
\IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax}
}
}
+% Most compatibility commands will be dropped as time goes by ...
%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -157,22 +158,28 @@
% pdf bookmarks. This is not automatic for \chapter*, which is the format of toc, lof, and lot.
\RequirePackage{etoolbox}% provides \patchcmd
+
\patchcmd{\tableofcontents}{\contentsname}{\pdfbookmark[0]{Table of Contents}{toc}\contentsname}{}{} % placement matters.
-\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\phantomsection\listfigurename}\addcontentsline{toc}{frontmatter}{\listfigurename}}{}{}
-\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\phantomsection\listtablename}\addcontentsline{toc}{frontmatter}{\listtablename}}{}{}
+
+%% Temporary accommodation of latex tagging. Rework once tagging structures have been finalized by LaTeX3 team.
+%% No guarantee that this hack is hierarchically correct.
+%% Current latex-lab places tags around \@schapter, which is harder to deal with here.
+\providecommand*\MakeLinkTarget{\@gobbletwo}
+
+\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\phantomsection\listfigurename}\MakeLinkTarget[chapter]{}\addcontentsline{toc}{frontmatter}{\listfigurename}}{}{}
+\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\phantomsection\listtablename}\MakeLinkTarget[chapter]{}\addcontentsline{toc}{frontmatter}{\listtablename}}{}{}
\NewCommandCopy\l@frontmatter\l@chapter
\NewCommandCopy\l@backmatter\l@chapter
\providecommand*{\toclevel@frontmatter}{0}% prevent warning, see hyperref manual Sec. 13.3
\providecommand*{\toclevel@backmatter}{0}
-%% if you want different formatting for front/back matter, change here (cf. report.cls). This approach preserves tagging hooks.
-\AtBeginDocument{
- \patchcmd{\l@frontmatter}{\bfseries}{\itshape}{}{}
- \patchcmd{\l@frontmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
- \patchcmd{\l@frontmatter}{1.0em}{3pt}{}{}
- \patchcmd{\l@backmatter}{\bfseries}{\itshape}{}{}
- \patchcmd{\l@backmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
-}
+
+%% if you want different formatting for front/back matter, change here (cf. report.cls).
+\patchcmd{\l@frontmatter}{\bfseries}{\itshape}{}{}
+\patchcmd{\l@frontmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
+\patchcmd{\l@frontmatter}{1.0em}{3pt}{}{}
+\patchcmd{\l@backmatter}{\bfseries}{\itshape}{}{}
+\patchcmd{\l@backmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{}
%%%%%%%%%%%%% Geometry, mathtools, graphics, design, fonts, hyperrefs, bookmarks, footnotes %%%%%%%%%%%%%%%%%%%
@@ -294,8 +301,10 @@
%%%%%%%%%%%% PDF bookmark strings %%%%%%%%%%%%%%%%
-%%% Since \bm may be useful in headings, use this fix to reduce frequency with which alternate
-%%% bookmark strings must be given with commands such as \section{ \texorpdfstring{texstring}{pdfstring} }
+%%% By early 2024, \pdfstring removes all robust commands from bookmarks, so that such commands
+%%% don't cause errors; the following pdfstringdisables serve to suppress warnings.
+
+%% \bm may be useful in headings, but let's disable in the associated bookmarks
\pdfstringdefDisableCommands{%
\def\bm#1#{\relax}%
}
@@ -323,7 +332,7 @@
}
%%% Here's a more cumbersome removal of the warning for $ (math shift) in pdfbookmarks.
-%%% Not implementing this by default, since novice authors may benefit from the warning.
+%%% Not implementing this by default, since novice authors may benefit from the warning. :-)
%%% https://tex.stackexchange.com/a/620360/119566
%\let\oldHyPsd@CatcodeWarning\HyPsd@CatcodeWarning
%\renewcommand{\HyPsd@CatcodeWarning}[1]{%
@@ -349,6 +358,10 @@
%%%%%%%%%%%% MACROS FOR HANDLING TITLE AND ABSTRACT PAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\AtBeginDocument{
+ \providecommand{\textls}[2][]{#2}% in case microtype is not loaded
+}
+
%%%%%%%%%% Degree Date Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\tl_new:N \g__dd_month_tl
@@ -441,11 +454,11 @@
\int_incr:N \l__author_autcrcnt_int
\int_while_do:nNnn { \l__author_autcrcnt_int } < { \g_author_authorcnt_int }
{
- \tl_gput_right:Nx \g__author_ca_tl {,\ \seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } }
+ \tl_gput_right:Nx \g__author_ca_tl {,~\seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } }
\int_incr:N \l__author_autcrcnt_int
}
\int_compare:nNnT { \l__author_autcrcnt_int } = { \g_author_authorcnt_int } {
- \tl_gput_right:Nx \g__author_ca_tl {\ and\ \seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } }
+ \tl_gput_right:Nx \g__author_ca_tl {~and~\seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } }
}
\tl_set:Nn \l_tmpa_tl {\tl_item:Nn \g__author_ca_tl {-1} }% get last token
\str_case_e:nnT
@@ -453,6 +466,7 @@
{ {.}{} }
{ \__copyright_remove_period:N { \g__author_ca_tl } }% remove last token if it is a period
\__author_pdfcopyrightauthor:
+ \cs_gset:Npe \@author { \tl_use:N \g__author_ca_tl }% 2024/08/06
}
\cs_new:Nn \__copyright_remove_period:N
{
@@ -465,11 +479,11 @@
\int_until_do:nNnn { \l_tmpa_int } = { \g_author_authorcnt_int }
{
\int_incr:N \l_tmpa_int
- \tl_gput_right:Nx \g__author_pdfca_tl {,\ { \seq_item:cn { g_author_name_seq } { \l_tmpa_int } } }
- }
+ \tl_gput_right:Nx \g__author_pdfca_tl {;\ { \seq_item:cn { g_author_name_seq } { \l_tmpa_int } } }
+ % changed comma to semicolon for consistency with Dublin Core metadata format, 2024/08/30
+ }
}
-
\tl_new:N \g__author_namesize_tl
\tl_gset:Nn \g__author_namesize_tl { \large }
\cs_new:Nn \__author_block: {
@@ -722,10 +736,10 @@
\ of}
\par
\int_until_do:nNnn { \l__degree_degreeno_int } = { \g_degree_degreecnt_int } {
- \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par and\par
+ \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par and\par
\int_incr:N \l__degree_degreeno_int
}
- \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par
+ \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par
}
\msg_new:nnnn { \ClassName } { no_degree }
{ Missing\ degree!\ You\ must\ issue\ the\ \Degree{name}{department}\ command. }{
@@ -750,10 +764,10 @@
\ of}
\par\medskip
\int_until_do:nNnn { \l__degree_degreeno_int } = { \g_degree_degreecnt_int } {
- \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par and\par
+ \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par and\par
\int_incr:N \l__degree_degreeno_int
}
- \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par\medskip
+ \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par\medskip
}
%%%%%%%%%% End Degree Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -890,6 +904,7 @@
\RenewDocumentCommand{\title}{m}
{
\__mitthesis_title:n { #1 }
+ \cs_gset:Npe \@title { \tl_use:N \g_mitthesis_title_tl } % 2024/08/06
\hypersetup{
pdftitle={\g_mitthesis_title_tl},
}
@@ -967,12 +982,12 @@
{\Large\textbf{\g_mitthesis_title_tl}
%\phantomsection\addcontentsline{toc}{chapter}{Title\ page}
\par}
- \__titlepage_blockskip:nn {12}{1.5}% new idea
+ \__titlepage_blockskip:nn {12}{1.5}
\__author_block:
\__titlepage_blockskip:nn {12}{1.5}
\__degree_block:
- at\ the\par
- \text_uppercase:n { \g_titlepage_institution_name_tl }\par
+ at~the\par
+ \textls[60]{\text_uppercase:n { \g_titlepage_institution_name_tl }}\par
\DegreeMonth\ \DegreeYear\par
\__titlepage_blockskip:nn {12}{2}
\copyright\space\DegreeYear\space\CopyrightAuthor\@.\c_space_token \g_copyright_copyrightlicencse_tl % \@. in case name ends with III, IV, V,...
diff --git a/Master/texmf-dist/tex/latex/mlacls/mla.cls b/Master/texmf-dist/tex/latex/mlacls/mla.cls
index 4a3613b4a99..9013a526b88 100644
--- a/Master/texmf-dist/tex/latex/mlacls/mla.cls
+++ b/Master/texmf-dist/tex/latex/mlacls/mla.cls
@@ -23,7 +23,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{mla}
- [2021/09/14 v1.0 MLA Paper Class]
+ [2024/09/13 v1.1 MLA Paper Class]
\LoadClass[letterpaper,12pt]{article}
\newcommand{\mladate}{%
@@ -54,6 +54,7 @@
\newif\ifMLA@pageheader
\newif\ifMLA@plainheadings
\newif\ifMLA@fullpage
+\newif\ifMLA@times
\DeclareOption{mla7}{\MLA@seventrue\MLA@eightfalse\MLA@eightaltfalse}
\DeclareOption{mla8}{\MLA@sevenfalse\MLA@eighttrue\MLA@eightaltfalse}
\DeclareOption{mla8alt}{\MLA@sevenfalse\MLA@eightfalse\MLA@eightalttrue}
@@ -71,6 +72,8 @@
\DeclareOption{plainheadings}{\MLA@plainheadingstrue}
\MLA@fullpagefalse
\DeclareOption{fullpage}{\MLA@fullpagetrue}
+\MLA@timestrue
+\DeclareOption{notimes}{\MLA@timesfalse}
\DeclareOption*{%
\ClassWarning{mla}{Unknown option `\CurrentOption'; ignoring}
}
@@ -80,7 +83,6 @@
\RequirePackage{fancyhdr}
\RequirePackage{fullpage}
\RequirePackage{ragged2e}
-\RequirePackage{newtxtext}
\RequirePackage{titlesec}
\RequirePackage{xstring}
\RequirePackage[american]{babel}
@@ -106,6 +108,9 @@
\ifMLA@notes
\RequirePackage{enotez}
\fi
+\ifMLA@times
+ \RequirePackage{newtxtext}
+\fi
\ifMLA@microtype
\RequirePackage{microtype}
\fi
@@ -211,6 +216,18 @@
topsep=0pt,
leftmargin=\parindent
}
+\addtolength{\skip\footins}{1pc}
+\renewcommand{\footnoterule}{%
+ \vfill
+ \kern -3pt\hrule width 0.4\columnwidth
+ \vskip 6pt
+}
+\renewcommand{\@makefnmark}{\@thefnmark}
+\renewcommand{\@makefntext}[1]{%
+ \leftskip 0.5in
+ \parindent -0.5in
+ \@makefnmark.~#1
+}
\renewenvironment{blockquote}{%
\list{}{\leftmargin 0.5in}
\item[]
diff --git a/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty b/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty
index 5fd527fbf3a..b89baa7f1fb 100644
--- a/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty
+++ b/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty
@@ -31,7 +31,8 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{naive-ebnf}
-[2023-08-11 0.0.15 EBNF in Plain Text]
+[2024/09/06 0.0.16 EBNF in Plain Text]
+
@@ -138,6 +139,8 @@
{ >([^\s]) } {\\textgreater{}\1} \ebnf_tmp%
\regex_replace_all:nnN
{ ([^\s])'([^\s]) } {\1\\textquotesingle{}\2} \ebnf_tmp%
+ \regex_replace_all:nnN { \|\|\| }%
+ {\c{makebox}[#1][r]{ }} \ebnf_tmp%
\regex_replace_all:nnN
{ ([^\s])\|([^\s]) } {\1\\textbar{}\2} \ebnf_tmp%
%
diff --git a/Master/texmf-dist/tex/latex/newcomputermodern/newcomputermodern.sty b/Master/texmf-dist/tex/latex/newcomputermodern/newcomputermodern.sty
index 6318522d6ba..6edd20dc1b2 100644
--- a/Master/texmf-dist/tex/latex/newcomputermodern/newcomputermodern.sty
+++ b/Master/texmf-dist/tex/latex/newcomputermodern/newcomputermodern.sty
@@ -1,5 +1,5 @@
%\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{newcomputermodern}[v5.2.0 NewCM fonts by Antonis Tsolomitis]
+\ProvidesPackage{newcomputermodern}[v6.0.0 NewCM fonts by Antonis Tsolomitis]
\typeout{Loading NewCM fonts by Antonis Tsolomitis}
\RequirePackage{fontspec}
\RequirePackage{unicode-math}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty
index 3c31a91788b..8d86b9aeaf4 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtx.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtx.sty
@@ -1,6 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-
%Package to simplify loading of newtxmath with a text font family such as newtxtext for all latex engines, or for newtxtext and an otf math package.
\def\fileversion{1.751}
\def\filedate{2024/06/22}
@@ -298,6 +297,7 @@ propmathfigs,curlybraces,cochrho,cochf,alty,alth,liby,nochvw}
\or \def\tx@mathtotextfactor{.92} % 16, gel
\fi
+\def\tx@divide#1#2{\ntx@dima=\dimexpr 1pt * (\dimexpr #1 pt\relax) / \dimexpr #2pt\relax\relax}
%\show\ntx@Mopt
%\show\ntx@Topt
%\traceon
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 83fc81cae33..5fbcf14b08c 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.752}
-\def\filedate{2024/07/05}
+\def\fileversion{1.754}
+\def\filedate{2024/09/22}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -3106,8 +3106,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareMathSizes{5} {5.5} {5.5} {5.5}
\DeclareMathSizes{6} {6.5} {5.5} {5.5}
\DeclareMathSizes{7} {7.3} {5.5} {5.5}
-\DeclareMathSizes{8} {8} {6.2} {5.5}
-\DeclareMathSizes{9} {9} {7.3} {5.5}
+\DeclareMathSizes{8} {8} {6} {5.5}
+\DeclareMathSizes{9} {9} {6.6} {5.5}
\DeclareMathSizes{10} {10} {7.3} {5.5}
\DeclareMathSizes{10.95}{10.95}{8} {6.1}
\DeclareMathSizes{11} {10.95}{8} {6.1}
diff --git a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nfss.sty b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nfss.sty
new file mode 100644
index 00000000000..7d72b81c902
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nfss.sty
@@ -0,0 +1,554 @@
+%%
+%% This is file `nfssext-cfr-nfss.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nfssext-cfr.dtx (with options: `sty-nfss')
+%% Additions and changes Copyright (C) 2008-2024 Clea F. Rees.
+%% Code from fontinstallationguide Copyright (C) 2002-2004 Philipp Lehman (see below)
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%%
+%% The file nfssext-cfr-nfss.sty is a derived work under the terms of the LPPL.
+%% It is based on version 1.2 of nfssext.sty which is supplied with
+%% The Font Installation Guide by Philipp Lehman. A copy of The Font Installation Guide, including an
+%% unmodified version of nfssext.sty is available from
+%% https://tug.ctan.org/pkg/fontinstallationguide.
+%% nfssext.sty is part of the included archive figuide-examples.tar.gz
+%% which consists of examples and templates released under the LPPL.
+%% nfssext.sty is included in the files for tutorials 3, 5 and 6.
+%%
+%% The main modifications made to this file are described in nfssext-cfr.dtx.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase-nfss.sty]{$Id: nfssext-cfr.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v1.0 \revinfo{} specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions; for old NFSS]
+\DefineFileInfoSVN
+\RequirePackage{ifthen}
+\newcommand*{\exfs@tempa}{}
+\newcommand*{\exfs@tempb}{}
+\newcommand*{\exfs@tempf}{}
+\newcommand*{\exfs@try@family}[2][]{%
+ \let\exfs@tempa\relax
+ \begingroup
+ \fontfamily{#2}\try@load@fontshape
+ \expandafter\ifx\csname\curr@fontshape\endcsname\relax
+ \edef\exfs@tempa{#1}%
+ \ifx\exfs@tempa\@empty
+ \PackageWarning{nfssext}{%
+ Font family '\f@encoding/#2' not available\MessageBreak
+ Ignoring font switch}%
+ \else
+ \PackageInfo{nfssext}{%
+ Font family '\f@encoding/#2' not available\MessageBreak
+ Font family '\f@encoding/#1' tried instead}%
+ \exfs@try@family{#1}%
+ \fi
+ \else
+ \gdef\exfs@tempa{\fontfamily{#2}\selectfont}%
+ \fi
+ \endgroup
+ \exfs@tempa}
+\newcommand*{\exfs@try@series}[2][]{%
+ \let\exfs@tempa\relax
+ \begingroup
+ \fontseries{#2}\try@load@fontshape
+ \expandafter\ifx\csname\curr@fontshape\endcsname\relax
+ \edef\exfs@tempa{#1}%
+ \ifx\exfs@tempa\@empty
+ \PackageWarning{nfssext-cfr}{%
+ Font series '\f@encoding/\f@family/#2' not available\MessageBreak
+ Ignoring font switch}%
+ \else
+ \PackageInfo{nfssext-cfr}{%
+ Font family '\f@encoding/\f@family/#2' not available\MessageBreak
+ Font family '\f@encoding/\f@family/#1' tried instead}%
+ \exfs@try@series{#1}%
+ \fi
+ \else
+ \gdef\exfs@tempa{\fontseries{#2}\selectfont}%
+ \fi
+ \endgroup
+ \exfs@tempa
+}
+\def\exfs@get@base#1#2#3#4\@nil{#1#2#3}
+\def\exfs@get@variants#1#2#3#4\@nil{#4}
+\def\exfs@next#1#2\@nil{#1}
+\def\exfs@shift#1#2\@nil{#2}
+\def\exfs@first#1#2\@nil{#1}
+\def\exfs@part#1#2\@nil{#2}
+\def\exfs@second#1#2#3\@nil{#2}
+\DeclareRobustCommand{\lnstyle}{%
+ \not@math@alphabet\lnstyle\relax
+ \exfs@try@family[\expandafter\exfs@get@base\f@family\@nil]%
+ {\expandafter\exfs@get@base\f@family\@nil x}%
+}
+\DeclareRobustCommand{\osstyle}{%
+ \not@math@alphabet\osstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil j}}
+\DeclareRobustCommand{\instyle}{%
+ \not@math@alphabet\instyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 0}}
+\DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 1}}
+\DeclareRobustCommand{\swstyle}{%
+ \not@math@alphabet\swstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil w}}
+\newcommand*\exfs@merge@families[1]{%
+ \edef\exfs@tempf{#1}%
+ \edef\tempa{\expandafter\exfs@get@variants\f@family\@nil}%
+ \edef\tempo{2j}%
+ \let\exfs@tempq\@empty
+ \def\exfs@tempg{}%
+ \newif\ifadded
+ \addedfalse
+ \ifx\tempa\@empty
+ \edef\exfs@tempq{\exfs@tempf}%
+ \addedtrue
+ \else
+ \gdef\set{0,1,2,a,d,e,f,h,j,l,p,q,s,t,v,w}% these are the variants to consider - the order here and in the font name is crucial
+ \ifx\tempo\exfs@tempf
+ \@for \xx:=\set \do {%
+ \ifx\tempa\@empty
+ \let\exfs@tempn\@empty
+ \else
+ \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
+ \fi
+ \edef\tempt{2}%
+ \edef\tempj{j}%
+ \ifx\exfs@tempn\tempt
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \fi
+ \ifx\exfs@tempn\tempj % if the next variant is j, ignore it
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \fi
+ \ifx\tempt\xx
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \else
+ \ifx\tempj\xx % if the current value is j, we're done
+ \edef\exfs@tempq{\exfs@tempg\xx\tempa}%
+ \let\tempa\@empty
+ \addedtrue
+ \else
+ \ifx\xx\exfs@tempn
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \fi
+ \fi
+ \fi
+ }%
+ \else
+ \@for \xx:=\set \do {%
+ \ifx\tempa\@empty
+ \ifadded
+ \else
+ \edef\exfs@tempq{\exfs@tempg\exfs@tempf}%
+ \addedtrue
+ \fi
+ \else
+ \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
+ \ifx\exfs@tempn\exfs@tempf
+ \edef\exfs@tempq{\exfs@tempg\tempa}%
+ \addedtrue
+ \let\tempa\@empty
+ \else
+ \ifx\exfs@tempf\xx
+ \edef\exfs@tempq{\exfs@tempg\xx\tempa}%
+ \addedtrue
+ \let\tempa\@empty
+ \else
+ \ifx\exfs@tempn\xx
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ \fi
+ \fi
+ \ifx\exfs@tempq\@empty
+ \PackageError{nfssext-cfr}{Something is wrong here. Ignoring font switching command.}{}%
+ \else
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}%
+ \fi
+}
+\DeclareRobustCommand{\pstyle}{% proportional figures
+ \not@math@alphabet\pstyle\relax
+ \exfs@merge@families{2}}
+\DeclareRobustCommand{\tistyle}{% titling/display
+ \not@math@alphabet\tistyle\relax
+ \exfs@merge@families{d}}
+\DeclareRobustCommand{\ostyle}{% oldstyle figures (cf. original osstyle above)
+ \not@math@alphabet\ostyle\relax
+ \exfs@merge@families{j}}
+\DeclareRobustCommand{\postyle}{%
+ \not@math@alphabet\postyle\relax
+ \exfs@merge@families{2j}}
+\DeclareRobustCommand{\ltstyle}{%
+ \not@math@alphabet\ltstyle\relax
+ \exfs@merge@families{l}}
+\DeclareRobustCommand{\ofstyle}{%
+ \not@math@alphabet\ofstyle\relax
+ \exfs@merge@families{l}}
+\DeclareRobustCommand{\altstyle}{% alternative style
+ \not@math@alphabet\altstyle\relax
+ \exfs@merge@families{a}}
+\DeclareRobustCommand{\regstyle}{% ``regular'' style
+ \not@math@alphabet\regstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil}}
+\DeclareRobustCommand{\embossstyle}{%
+ \not@math@alphabet\embossstyle\relax
+ \exfs@merge@families{e}}
+\DeclareRobustCommand{\ornamentalstyle}{% intended primarily for decorative initial fonts etc.
+ \not@math@alphabet\ornamentalstyle\relax
+ \exfs@merge@families{p}}
+\DeclareRobustCommand{\qtstyle}{% quotation style (assumes sans)
+ \not@math@alphabet\qtstyle\relax
+ \sffamily
+ \exfs@merge@families{q}}
+\DeclareRobustCommand{\shstyle}{%
+ \not@math@alphabet\shstyle\relax
+ \exfs@merge@families{h}}
+\DeclareRobustCommand{\swashstyle}{% an attempt to improve on \swstyle
+ \not@math@alphabet\swashstyle\relax
+ \exfs@merge@families{w}}
+\DeclareRobustCommand{\tmstyle}{% monowidth typewriter
+ \not@math@alphabet\tmstyle\relax
+ \exfs@unmerge@families{s}%
+ \exfs@unmerge@families{v}%
+ \exfs@merge@families{t}}
+\DeclareRobustCommand{\tvstyle}{% variable width typewriter
+ \not@math@alphabet\tvstyle\relax
+ \exfs@unmerge@families{s}%
+ \exfs@unmerge@families{t}%
+ \exfs@merge@families{v}}
+\newcounter{taken}%
+\newcommand*\exfs@unmerge@families[1]{%
+ \edef\exfs@tempf{#1}%
+ \edef\tempa{\expandafter\exfs@get@variants\f@family\@nil}%
+ \let\exfs@tempq\@empty
+ \edef\exfs@tempg{}%
+ \setcounter{taken}{0}%
+ \ifx\tempa\@empty
+ \edef\exfs@tempq{}%
+ \else
+ \whiledo{\value{taken}<1}{%
+ \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
+ \ifx\exfs@tempf\exfs@tempn
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \edef\exfs@tempq{\exfs@tempg\tempa}%
+ \stepcounter{taken}%
+ \else
+ \edef\exfs@tempg{\exfs@tempg\exfs@tempn}%
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \ifx\tempa\@empty% if there are no variants left, we're done
+ \edef\exfs@tempq{\exfs@tempg}%
+ \stepcounter{taken}%
+ \fi
+ \fi
+ }%
+ \fi
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}%
+}
+\DeclareRobustCommand{\tstyle}{% tabular figures
+ \not@math@alphabet\tstyle\relax
+ \exfs@unmerge@families{2}}
+\DeclareRobustCommand{\lstyle}{% lining figures (cf. command above)
+ \not@math@alphabet\lstyle\relax
+ \exfs@unmerge@families{j}}
+\DeclareRobustCommand{\tlstyle}{%
+ \lstyle\tstyle}
+\DeclareRobustCommand{\plstyle}{%
+ \lstyle\pstyle}
+\DeclareRobustCommand{\tostyle}{%
+ \ostyle\tstyle}
+\newcommand*{\sidefault}{si}
+\DeclareRobustCommand{\sishape}{%
+ \not@math@alphabet\sishape\relax
+ \fontshape\sidefault\selectfont}
+\newcommand*{\oldefault}{ol}
+\DeclareRobustCommand{\olshape}{%
+ \not@math@alphabet\olshape\relax
+ \fontshape\oldefault\selectfont}
+\newcommand*{\scoldefault}{scol}
+\DeclareRobustCommand{\scolshape}{%
+ \not@math@alphabet\scolshape\relax
+ \fontshape\scoldefault\selectfont}
+\newcommand*{\udefault}{u}
+\DeclareRobustCommand{\ushape}{%
+ \not@math@alphabet\ushape\relax
+ \fontshape\udefault\selectfont}
+\newcommand*{\scudefault}{su}
+\DeclareRobustCommand{\scushape}{%
+ \not@math@alphabet\scushape\relax
+ \fontshape\scudefault\selectfont}
+\newcommand*{\uidefault}{ui}
+\DeclareRobustCommand{\uishape}{%
+ \not@math@alphabet\uishape\relax
+ \fontshape\uidefault\selectfont}
+\newcommand*{\ridefault}{ri}
+\DeclareRobustCommand{\rishape}{%
+ \not@math@alphabet\rishape\relax
+ \fontshape\ridefault\selectfont}
+\newcommand*{\exfs@merge@shape}[3]{%
+ \edef\exfs@tempa{#1}%
+ \edef\exfs@tempb{#2}%
+ \ifx\f@shape\exfs@tempb
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series/#3\endcsname\relax
+ \else
+ \edef\exfs@tempa{#3}%
+ \fi
+ \fi
+ \fontshape{\exfs@tempa}\selectfont}
+\newcommand*{\exfs@font@width}{%
+ \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
+ \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
+ \ifx\exfs@temppart\@empty
+ \def\exfs@width{}
+ \else
+ \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
+ \ifx\exfs@temps{b}
+ \edef\exfs@width{\expandafter\exfs@part\exfs@temps\@nil }%
+ \else
+ \ifx\exfs@temps{l}
+ \edef\exfs@width{\expandafter\exfs@part\exfs@temps\@nil }%
+ \else
+ \edef\exfs@width{\exfs@temppart}%
+ \fi
+ \fi
+ \fi
+ \exfs@width
+}
+\newcommand*{\exfs@merge@width}[1]{%
+ \edef\exfs@temph{#1}%
+ \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
+ \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
+ \def\tempb{b}%
+ \def\templ{l}%
+ \ifx\exfs@temppart\@empty
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temph}%
+ \else
+ \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
+ \ifx\exfs@temps\tempb
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temps\exfs@temph}%
+ \else
+ \ifx\exfs@temps\templ
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temps\exfs@temph}%
+ \else
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temph}%
+ \fi
+ \fi
+ \fi
+ \exfs@try@series{\exfs@series}%
+}
+\newcommand*{\exfs@unmerge@width}{%
+ \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
+ \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
+ \def\tempb{b}%
+ \def\templ{l}%
+ \ifx\exfs@temppart\@empty
+ \def\exfs@series{\expandafter\exfs@tempf}%
+ \else
+ \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
+ \ifx\exfs@temps\tempb
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temps}%
+ \else
+ \ifx\exfs@temps\templ
+ \def\exfs@series{\expandafter\exfs@tempf\exfs@temps}%
+ \else
+ \def\exfs@series{\expandafter\exfs@tempf}%
+ \fi
+ \fi
+ \fi
+ \exfs@try@series{\exfs@series}%
+}
+\DeclareRobustCommand{\regwidth}{%
+ \not@math@alphabet\regwidth\relax
+ \exfs@unmerge@width}
+\newcommand*{\nwdefault}{c}
+\DeclareRobustCommand{\nwwidth}{%
+ \not@math@alphabet\nwwidth\relax
+ \exfs@merge@width{\nwdefault}}
+\newcommand*{\cddefault}{c}
+\DeclareRobustCommand{\cdwidth}{%
+ \not@math@alphabet\cdwidth\relax
+ \exfs@merge@width{\cddefault}}
+\newcommand*{\ecdefault}{ec}
+\DeclareRobustCommand{\ecwidth}{%
+ \not@math@alphabet\ecwidth\relax
+ \exfs@merge@width{\ecdefault}}
+\newcommand*{\ucdefault}{uc}
+\DeclareRobustCommand{\ucwidth}{%
+ \not@math@alphabet\ucwidth\relax
+ \exfs@merge@width{\ucdefault}}
+\newcommand*{\etdefault}{x}
+\DeclareRobustCommand{\etwidth}{%
+ \not@math@alphabet\etwidth\relax
+ \exfs@merge@width{\etdefault}}
+\newcommand*{\epdefault}{x}
+\DeclareRobustCommand{\epwidth}{%
+ \not@math@alphabet\epwidth\relax
+ \exfs@merge@width{\epdefault}}
+\newcommand*{\exdefault}{ex}
+\DeclareRobustCommand{\exwidth}{%
+ \not@math@alphabet\exwidth\relax
+ \exfs@merge@width{\exdefault}}
+\newcommand*{\uxdefault}{ux}
+\DeclareRobustCommand{\uxwidth}{%
+ \not@math@alphabet\uxwidth\relax
+ \exfs@merge@width{\uxdefault}}
+\newcommand*{\exfs@merge@weight}[1]{%
+ \edef\exfs@tempg{#1}%
+ \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
+ \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
+ \def\templ{l}%
+ \def\tempb{b}%
+ \ifx\exfs@temppart\@empty
+ \def\exfs@series{\expandafter\exfs@tempg}%
+ \else
+ \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
+ \edef\exfs@tempw{\expandafter\exfs@part\exfs@temps\@nil }%
+ \ifx\exfs@temps\tempb
+ \def\exfs@series{\expandafter\exfs@tempg\exfs@tempw}%
+ \else
+ \ifx\exfs@temps\templ
+ \def\exfs@series{\expandafter\exfs@tempg\exfs@tempw}%
+ \else
+ \def\exfs@series{\expandafter\exfs@tempg\exfs@temppart}%
+ \fi
+ \fi
+ \fi
+ \ifx\exfs@tempg\exfs@series
+ \exfs@try@series{\exfs@series}%
+ \else
+ \exfs@try@series[\exfs@tempg]{\exfs@series}% assume user wants to change weight even if this changes back to the default width
+ \fi
+}
+\newcommand*{\mbdefault}{mb}
+\DeclareRobustCommand{\mbweight}{%
+ \not@math@alphabet\mbweight\relax
+ \exfs@merge@weight{\mbdefault}}
+\newcommand*{\dbdefault}{db}
+\DeclareRobustCommand{\dbweight}{%
+ \not@math@alphabet\dbweight\relax
+ \exfs@merge@weight{\dbdefault}}
+\newcommand*{\sbdefault}{sb}
+\DeclareRobustCommand{\sbweight}{%
+ \not@math@alphabet\sbweight\relax
+ \exfs@merge@weight{\sbdefault}}
+\newcommand*{\ebdefault}{eb}
+\DeclareRobustCommand{\ebweight}{%
+ \not@math@alphabet\ebweight\relax
+ \exfs@merge@weight{\ebdefault}}
+\newcommand*{\ubdefault}{ub}
+\DeclareRobustCommand{\ubweight}{%
+ \not@math@alphabet\ubweight\relax
+ \exfs@merge@weight{\ubdefault}}
+\newcommand*{\lgdefault}{l}
+\DeclareRobustCommand{\lgweight}{%
+ \not@math@alphabet\lgweight\relax
+ \exfs@merge@weight{\lgdefault}}
+\newcommand*{\eldefault}{el}
+\DeclareRobustCommand{\elweight}{%
+ \not@math@alphabet\elweight\relax
+ \exfs@merge@weight{\eldefault}}
+\newcommand*{\uldefault}{ul}
+\DeclareRobustCommand{\ulweight}{%
+ \not@math@alphabet\ulweight\relax
+ \exfs@merge@weight{\uldefault}}
+\DeclareRobustCommand{\itshape}{%
+ \not@math@alphabet\itshape\mathit
+ \exfs@merge@shape{\itdefault}{\scdefault}{\sidefault}}
+\DeclareRobustCommand{\scshape}{%
+ \not@math@alphabet\scshape\relax
+ \def\tempu{u}%
+ \def\tempo{ol}%
+ \ifx\f@shape\tempu
+ \exfs@merge@shape{\scdefault}{\udefault}{\scudefault}%
+ \else
+ \ifx\f@shape\tempo
+\exfs@merge@shape{\scdefault}{\oldefault}{\scoldefault}%
+\else
+ \exfs@merge@shape{\scdefault}{\itdefault}{\sidefault}%
+\fi
+ \fi
+}
+\DeclareRobustCommand{\upshape}{%
+ \not@math@alphabet\upshape\relax
+ \exfs@merge@shape{\updefault}{\sidefault}{\scdefault}}
+\DeclareRobustCommand{\dfshape}{%
+ \not@math@alphabet\dfshape\relax
+ \fontshape\shapedefault\selectfont}
+\newcommand*{\swshapedefault}{\itdefault}
+\DeclareRobustCommand{\swshape}{%
+ \not@math@alphabet\swshape\relax
+ \swstyle\fontshape\swshapedefault\selectfont}
+\DeclareTextFontCommand{\textln}{\lnstyle}
+\DeclareTextFontCommand{\textos}{\osstyle}
+\DeclareTextFontCommand{\textin}{\instyle}
+\DeclareTextFontCommand{\textsu}{\sustyle}
+\DeclareTextFontCommand{\textsi}{\sishape}
+\DeclareTextFontCommand{\textdf}{\dfshape}
+\DeclareTextFontCommand{\textsw}{\swshape}
+\DeclareTextFontCommand{\textti}{\tistyle}
+\DeclareTextFontCommand{\textlt}{\ltstyle}
+\DeclareTextFontCommand{\textof}{\ofstyle} % open-face (or outline or blank) style
+\DeclareTextFontCommand{\textalt}{\altstyle} % alternative style
+\DeclareTextFontCommand{\textreg}{\regstyle} % ``regular'' style
+\DeclareTextFontCommand{\emboss}{\embossstyle}
+\DeclareTextFontCommand{\textorn}{\ornamentalstyle} % intended primarily for decorative initials etc.
+\DeclareTextFontCommand{\textqt}{\qtstyle}
+\DeclareTextFontCommand{\textsh}{\shstyle} % shadowed style
+\DeclareTextFontCommand{\texttm}{\tmstyle}
+\DeclareTextFontCommand{\texttv}{\tvstyle}
+\DeclareTextFontCommand{\textl}{\lstyle}
+\DeclareTextFontCommand{\texto}{\ostyle}
+\DeclareTextFontCommand{\textp}{\pstyle}
+\DeclareTextFontCommand{\textt}{\tstyle}
+\DeclareTextFontCommand{\textpl}{\plstyle}
+\DeclareTextFontCommand{\textpo}{\postyle}
+\DeclareTextFontCommand{\texttl}{\tlstyle}
+\DeclareTextFontCommand{\textto}{\tostyle}
+\DeclareTextFontCommand{\textol}{\olshape} % outline
+\DeclareTextFontCommand{\textswash}{\swashstyle} % an attempt to improve on \textsw
+\DeclareTextFontCommand{\textu}{\ushape}
+\DeclareTextFontCommand{\textscu}{\scushape}
+\DeclareTextFontCommand{\textui}{\uishape} % upright italic
+\DeclareTextFontCommand{\textri}{\rishape} % reverse italic
+\DeclareTextFontCommand{\textnw}{\nwwidth}
+\DeclareTextFontCommand{\textcd}{\cdwidth}
+\DeclareTextFontCommand{\textec}{\ecwidth}
+\DeclareTextFontCommand{\textuc}{\ucwidth}
+\DeclareTextFontCommand{\textet}{\etwidth}
+\DeclareTextFontCommand{\textep}{\epwidth}
+\DeclareTextFontCommand{\textex}{\exwidth}
+\DeclareTextFontCommand{\textux}{\uxwidth}
+\DeclareTextFontCommand{\textrw}{\regwidth}
+\DeclareTextFontCommand{\textmb}{\mbweight}
+\DeclareTextFontCommand{\textdb}{\dbweight}
+\DeclareTextFontCommand{\textsb}{\sbweight}
+\DeclareTextFontCommand{\texteb}{\ebweight}
+\DeclareTextFontCommand{\textub}{\ubweight}
+\DeclareTextFontCommand{\textlg}{\lgweight}
+\DeclareTextFontCommand{\textel}{\elweight}
+\DeclareTextFontCommand{\textul}{\ulweight}
+\endinput
+%%
+%% End of file `nfssext-cfr-nfss.sty'.
diff --git a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nnfss.sty b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nnfss.sty
new file mode 100644
index 00000000000..02ef6549f9d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr-nnfss.sty
@@ -0,0 +1,721 @@
+%%
+%% This is file `nfssext-cfr-nnfss.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nfssext-cfr.dtx (with options: `sty-nnfss')
+%% Additions and changes Copyright (C) 2008-2024 Clea F. Rees.
+%% Code from fontinstallationguide Copyright (C) 2002-2004 Philipp Lehman (see below)
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%%
+%% The file nfssext-cfr-nnfss.sty is a derived work under the terms of the LPPL.
+%% It is based on version 1.2 of nfssext.sty which is supplied with
+%% The Font Installation Guide by Philipp Lehman. A copy of The Font Installation Guide, including an
+%% unmodified version of nfssext.sty is available from
+%% https://tug.ctan.org/pkg/fontinstallationguide.
+%% nfssext.sty is part of the included archive figuide-examples.tar.gz
+%% which consists of examples and templates released under the LPPL.
+%% nfssext.sty is included in the files for tutorials 3, 5 and 6.
+%%
+%% The main modifications made to this file are described in nfssext-cfr.dtx.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase-nnfss.sty]{$Id: nfssext-cfr.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v1.0 \revinfo{} extended New New Font Selection Scheme (NNFSS) based on 2003/03/14 v1.2 Experimental NFSS Extensions]
+\DefineFileInfoSVN
+\newcommand*{\exfs@tempa}{}
+\newcommand*{\exfs@tempb}{}
+\newcommand*{\exfs@tempf}{}
+\ExplSyntaxOn
+\hook_gput_code:nnn { cmd/wrong@fontshape/before } { . }
+{
+ \global\expandafter\expandafter\expandafter\let
+ \expandafter \csname exfs@fake@ \curr@fontshape\endcsname\relax
+}
+\ExplSyntaxOff
+\newcommand \exfs@info[2][nfssext-cfr]{%
+ \ifexfs@debug
+ \PackageWarning{#1}{Info: #2}%
+ \else
+ \PackageInfo{#1}{#2}%
+ \fi
+}
+\newcommand* \exfs@normalise[1]{%
+ \ifcsname exfs@fake@\curr@fontshape\endcsname
+ \exfs@info{Current font '\curr@fontshape' is fake.\MessageBreak
+ Normalising}%
+ \expandafter\csname f@#1\endcsname{\csname #1default\endcsname}\selectfont
+ \ifcsname exfs@fake@\curr@fontshape\endcsname
+ \f@series{\seriesdefault}\f@shape{\shapedefault}\selectfont
+ \ifcsname exfs@fake@\curr@fontshape\endcsname
+ \normalfont
+ \ifcsname exfs@fake@\curr@fontshape\endcsname
+ \PackageError{nfssext-cfr}{Default font appears to be fake!\MessageBreak
+ Switch \textbackslash normalfont yielded '\curr@fontshape'}
+ {This is highly unlikely, so the bug is probably in the phenomena\MessageBreak
+ rather than the noumena}%
+ \fi
+ \fi
+ \fi
+ \exfs@info{Normalised to '\curr@fontshape'}%
+ \else
+ \exfs@info{Current font '\curr@fontshape' appears real}%
+ \fi
+}
+\newcommand*{\exfs@try@family}[2][]{%
+ \let\exfs@tempa\relax
+ \begingroup % fel arall, bydd latex yn credu bod y family yn go iawn beth bynnag
+ \exfs@info{Trying Font family '\f@encoding/#2'}%
+ \fontfamily{#2}\try@load@fontshape
+ \expandafter\ifx\csname\curr@fontshape\endcsname\relax
+ \edef\exfs@tempa{#1}%
+ \ifx\exfs@tempa\@empty
+ \PackageWarning{nfssext}{%
+ Font family '\f@encoding/#2' not available\MessageBreak
+ Ignoring font switch}%
+ \else
+ \exfs@info[nfssext]{%
+ Font family '\f@encoding/#2' not available\MessageBreak
+ Font family '\f@encoding/#1' tried instead}%
+ \exfs@try@family{#1}%
+ \fi
+ \else
+ \exfs@info{Loading font family '\f@encoding/#2'}%
+ \gdef\exfs@tempa{\fontfamily{#2}\selectfont}%
+ \fi
+ \endgroup
+ \exfs@tempa}
+\newcommand*{\exfs@try@series}[2][]{%
+ \let\exfs@targetseries\relax
+ \edef\exfs@tempa{#2}%
+ \ifx\f@series\exfs@tempa\relax
+ \exfs@info{Current (\f@series) matches target (#2) series.\MessageBreak
+ Ignoring font switch}%
+ \else
+ \begingroup
+ \exfs@normalise{series}%
+ \edef\exfs@tempa{\f@encoding/\f@family/#2/\f@shape}%
+ \ifcsname \exfs@tempa\endcsname
+ \exfs@info{Switching series: \f@series\space -> #2}%
+ \gdef\exfs@targetseries{\fontseries{#2}\selectfont}%
+ \else
+ \edef\exfs@reserved{#1}%
+ \ifx\exfs@reserved\@empty
+ \PackageWarning{nfssext-cfr}{%
+ Font series '\f@encoding/\f@family/#2/\f@shape' not available\MessageBreak
+ Ignoring font change}%
+ \else
+ \PackageWarning{nfssext-cfr}{%
+ Font series '\f@encoding/\f@family/#2/\f@shape' not available\MessageBreak
+ Trying '\f@encoding/\f@family/#1/\f@shape'}%
+ \exfs@try@series{#1}%
+ \fi
+ \fi
+ \endgroup
+ \exfs@targetseries
+ \fi}
+\def\exfs@try@shapeshift#1{%
+ \edef\exfs@targetshape{\csname #1default\endcsname}%
+ \ifx\f@shape\exfs@targetshape\relax
+ \exfs@info{Current (\f@shape) matches target (#1) shape.\MessageBreak
+ Ignoring font switch}%
+ \else
+ \not@math@alphabet\edef\exfs@targetshape\relax
+ \exfs@info{\f@shape\space -> \exfs@targetshape\MessageBreak
+ Trying \f@encoding/\f@family/\f@series/\exfs@targetshape}%
+ \fontshape{\exfs@targetshape}\selectfont
+ \fi}
+\newcommand* \exfs@swshape{%
+ \let\exfs@targetsw\relax
+ \begingroup % angen neu beidio? angen - bendant!
+ \edef\exfs@tempa{\f@encoding/\f@family/\f@series/\swdefault}%
+ \edef\exfs@tempa@fake{exfs@fake@\exfs@tempa}%
+ \ifcsname \exfs@tempa\endcsname
+ \ifcsname exfs@fake@\exfs@tempa\endcsname
+ \exfs@swfamily
+ \else
+ \gdef\exfs@targetsw{\fontshape{\swdefault}\selectfont}% kernel
+ \fi
+ \else
+ \exfs@swfamily
+ \fi
+ \endgroup
+ \ifx\exfs@targetsw\relax
+ \PackageWarning{nfssext-cfr}{%
+ Cannot find any route to swash.\MessageBreak
+ Are you sure one is available?}%
+ \else
+ \exfs@targetsw
+ \exfs@info{Switch to swash resulted in '\curr@fontshape'}%
+ \fi
+}
+\newcommand* \exfs@swfamily{%
+ \let\exfs@targetsw\relax
+ \begingroup
+ \let\exfs@tempa\f@family
+ \exfs@merge@families{w}%
+ \ifx\exfs@tempa\f@family % try merge with current shape
+ \fontshape{n}%
+ \exfs@merge@families{w}% up & merge
+ \if\exfs@tempa\f@family
+ \fontshape\swshapedefault
+ \exfs@merge@families{w}% up & nfssext-cfr default/configured
+ \if\exfs@tempa\f@family
+ \exf@try@family{\expandafter\exfs@get@base\f@family\@nil w}% nfssext switch
+ \if\exfs@tempa\f@family % nfssext switch
+ \fontshape\swshapedefault\exfs@try@family{%
+ \expandafter\exfs@get@base\f@family\@nil w}% nfssext switch & shape
+ \if\exfs@tempa\f@family
+ \relax % rhodd y ffidl yn y to (give up)
+ \else
+ \gdef\exfs@targetsw{%
+ \fontshape\swshapedefault\expandafter\fontfamily{%
+ \exfs@get@base\f@family\@nil w}\selectfont
+ }% nfssext switch & shape
+ \fi % nfssext switch & shape
+ \else
+ \gdef\exfs@targetsw{\expandafter\fontfamily{%
+ \exfs@get@base\f@family\@nil w}\selectfont
+ }% nfssext switch
+ \fi % nfssext switch
+ \else
+ \gdef\exfs@targetsw{%
+ \fontshape\swshapedefault\exfs@merge@families{w}%
+ }% up & nfssext-cfr default/configured
+ \fi % up & nfssext-cfr default/configured
+ \else
+ \gdef\exfs@targetsw{%
+ \fontshape{n}\exfs@merge@families{w}%
+ }% up & merge
+ \fi % up & merge
+ \else
+ \gdef\exfs@targetsw{\exfs@merge@families{w}}% merge with current shape
+ \fi % merge with current shape
+ \endgroup
+}
+\def\exfs@get@base#1#2#3#4\@nil{#1#2#3}
+\def\exfs@get@variants#1#2#3#4\@nil{#4}
+\def\exfs@next#1#2\@nil{#1}
+\def\exfs@shift#1#2\@nil{#2}
+\def\exfs@first#1#2\@nil{#1}
+\def\exfs@part#1#2\@nil{#2}
+\def\exfs@second#1#2#3\@nil{#2}
+\def\exfs@series@splitter#1{%
+ \edef\exfs@weight{\expandafter\exfs@first#1\@nil}%
+ \edef\exfs@width{\expandafter\exfs@shift#1\@nil}%
+ \if\exfs@weight u\exfs@check@cx{u}%
+ \else\if\exfs@weight e\exfs@check@cx{e}%
+ \else\if\exfs@weight s\exfs@check@cx{s}%
+ \else\if\exfs@weight d\exfs@check@cx{d}%
+ \else\ifx\exfs@width\@empty % m dealt with elsewhere
+ \if\exfs@weight c\def\exfs@width{c}\let\exfs@weight\@empty
+ \else\if\exfs@weight x\def\exfs@width{x}\let\exfs@weight\@empty
+ \fi\fi
+ \fi\fi\fi\fi\fi
+ \exfs@info{#1 -> \exfs@weight:\exfs@width;}%
+}
+\def\exfs@check@cx#1{%
+ \edef\exfs@tempa{\expandafter\exfs@first\exfs@width\@nil}%
+ \if\exfs@tempa c\edef\exfs@width{#1c}\let\exfs@weight\@empty
+ \else\if\exfs@tempa x\edef\exfs@width{#1x}\let\exfs@weight\@empty
+ \else\edef\exfs@weighta{%
+ \exfs@weight\exfs@tempa
+ }\let\exfs@weight\exfs@weighta
+ \edef\exfs@widtha{%
+ \expandafter\exfs@shift\exfs@width\@nil
+ }\let\exfs@width\exfs@widtha
+ \fi\fi
+}
+\DeclareRobustCommand{\lnstyle}{%% anniffiniedig
+ \not@math@alphabet\lnstyle\relax
+ \exfs@try@family[\expandafter\exfs@get@base\f@family\@nil]%
+ {\expandafter\exfs@get@base\f@family\@nil x}}
+\DeclareRobustCommand{\osstyle}{%% anniffiniedig
+ \not@math@alphabet\osstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil j}}
+\DeclareRobustCommand{\infstyle}{%% anniffiniedig
+ \not@math@alphabet\infstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 0}}
+\let\instyle\infstyle
+\DeclareRobustCommand{\sustyle}{%% anniffiniedig
+ \not@math@alphabet\sustyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 1}}
+\DeclareRobustCommand{\swstyle}{%% anniffiniedig
+ \not@math@alphabet\swstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil w}}
+\newif\ifexfs@added
+\newcommand*\exfs@merge@families[1]{%
+ \edef\exfs@vartomerge{#1}%
+ \edef\exfs@variants{\expandafter\exfs@get@variants\f@family\@nil}%
+ \exfs@info{Trying to merge variants #1 and \exfs@variants}%
+ \edef\tempo{2j}%
+ \let\exfs@tempq\@empty
+ \def\exfs@tempg{}%
+ \exfs@addedfalse
+ \ifx\exfs@variants\@empty
+ \edef\exfs@tempq{\exfs@vartomerge}%
+ \exfs@addedtrue
+ \else
+ \gdef\set{0,1,2,a,d,e,f,h,j,l,p,q,s,t,v,w}% these are the variants to consider - the order here and in the font name is crucial
+ \ifx\tempo\exfs@vartomerge
+ \@for \xx:=\set \do {%
+ \ifx\exfs@variants\@empty
+ \let\exfs@nextvariant\@empty
+ \else
+ \edef\exfs@nextvariant{\expandafter\exfs@next\exfs@variants\@nil}%
+ \fi
+ \if\exfs@nextvariant 2%
+ \edef\exfs@variants{\expandafter\exfs@shift\exfs@variants\@nil}%
+ \fi
+ \if\exfs@nextvariant j% if the next variant is j, ignore it
+ \edef\exfs@variants{\expandafter\exfs@shift\exfs@variants\@nil}%
+ \fi
+ \if\xx 2%
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \else
+ \if\xx j% if the current value is j, we're done
+ \edef\exfs@tempq{\exfs@tempg\xx\exfs@variants}%
+ \let\exfs@variants\@empty
+ \exfs@addedtrue
+ \else
+ \ifx\xx\exfs@nextvariant
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \edef\exfs@variants{\expandafter\exfs@shift\exfs@variants\@nil}%
+ \fi
+ \fi
+ \fi
+ }%
+ \else
+ \@for \xx:=\set \do {%
+ \ifx\exfs@variants\@empty
+ \ifexfs@added
+ \else
+ \edef\exfs@tempq{\exfs@tempg\exfs@vartomerge}%
+ \exfs@addedtrue
+ \fi
+ \else
+ \edef\exfs@nextvariant{\expandafter\exfs@next\exfs@variants\@nil}%
+ \ifx\exfs@nextvariant\exfs@vartomerge
+ \edef\exfs@tempq{\exfs@tempg\exfs@variants}%
+ \exfs@addedtrue
+ \let\exfs@variants\@empty
+ \else
+ \ifx\exfs@vartomerge\xx
+ \edef\exfs@tempq{\exfs@tempg\xx\exfs@variants}%
+ \exfs@addedtrue
+ \let\exfs@variants\@empty
+ \else
+ \ifx\exfs@nextvariant\xx
+ \edef\exfs@tempg{\exfs@tempg\xx}%
+ \edef\exfs@variants{\expandafter\exfs@shift\exfs@variants\@nil}%
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ \fi
+ \fi
+ \ifx\exfs@tempq\@empty
+ \PackageError{nfssext-cfr}{Something is wrong here. Ignoring font switching command.}{}%
+ \else
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}%
+ \fi
+}
+\DeclareRobustCommand{\pstyle}{%% anniffiniedig proportional figures
+ \not@math@alphabet\pstyle\relax
+ \exfs@merge@families{2}}
+\DeclareRobustCommand{\ostyle}{%% anniffiniedig oldstyle figures (cf. original osstyle above)
+ \not@math@alphabet\ostyle\relax
+ \exfs@merge@families{j}}
+\DeclareRobustCommand{\postyle}{%% anniffiniedig
+ \not@math@alphabet\postyle\relax
+ \exfs@merge@families{2j}}
+\DeclareRobustCommand{\tistyle}{%% anniffiniedig titling/display
+ \not@math@alphabet\tistyle\relax
+ \exfs@merge@families{d}}
+\DeclareRobustCommand{\ltstyle}{%% anniffiniedig
+ \not@math@alphabet\ltstyle\relax
+ \exfs@merge@families{l}}
+\DeclareRobustCommand{\ofstyle}{%% anniffiniedig
+ \not@math@alphabet\ofstyle\relax
+ \exfs@merge@families{l}}
+\DeclareRobustCommand{\altstyle}{%% anniffiniedig alternative style
+ \not@math@alphabet\altstyle\relax
+ \exfs@merge@families{a}}
+\DeclareRobustCommand{\regstyle}{%% anniffiniedig 'regular' style
+ \not@math@alphabet\regstyle\relax
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil}}
+\DeclareRobustCommand{\embossstyle}{%% anniffiniedig
+ \not@math@alphabet\embossstyle\relax
+ \exfs@merge@families{e}}
+\DeclareRobustCommand{\ornamentalstyle}{%% anniffiniedig intended primarily for decorative initial fonts etc.
+ \not@math@alphabet\ornamentalstyle\relax
+ \exfs@merge@families{p}}
+\DeclareRobustCommand{\qtstyle}{%% anniffiniedig quotation style (assumes sans)
+ \not@math@alphabet\qtstyle\relax
+ \sffamily
+ \exfs@merge@families{q}}
+\DeclareRobustCommand{\shstyle}{%% anniffiniedig
+ \not@math@alphabet\shstyle\relax
+ \exfs@merge@families{h}}
+\DeclareRobustCommand{\swashstyle}{%% anniffiniedig an attempt to improve on \swstyle
+ \not@math@alphabet\swashstyle\relax
+ \exfs@merge@families{w}}
+\DeclareRobustCommand{\tmstyle}{%% anniffiniedig monowidth typewriter
+ \not@math@alphabet\tmstyle\relax
+ \exfs@unmerge@families{s}%
+ \exfs@unmerge@families{v}%
+ \exfs@merge@families{t}}
+\DeclareRobustCommand{\tvstyle}{%% anniffiniedig variable width typewriter
+ \not@math@alphabet\tvstyle\relax
+ \exfs@unmerge@families{s}%
+ \exfs@unmerge@families{t}%
+ \exfs@merge@families{v}}
+\newif\ifexfs@take
+\newcommand*\exfs@unmerge@families[1]{%
+ \edef\exfs@tempf{#1}%
+ \edef\tempa{\expandafter\exfs@get@variants\f@family\@nil}%
+ \let\exfs@tempq\@empty
+ \edef\exfs@tempg{}%
+ \exfs@taketrue
+ \ifx\tempa\@empty
+ \edef\exfs@tempq{}%
+ \else
+ \loop
+ \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
+ \ifx\exfs@tempf\exfs@tempn
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \edef\exfs@tempq{\exfs@tempg\tempa}%
+ \exfs@takefalse
+ \else
+ \edef\exfs@tempg{\exfs@tempg\exfs@tempn}%
+ \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
+ \ifx\tempa\@empty% if there are no variants left, we're done
+ \edef\exfs@tempq{\exfs@tempg}%
+ \exfs@takefalse
+ \fi
+ \fi
+ \ifexfs@take % \fi yn \repeat
+ \repeat
+ \fi
+ \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}%
+}
+\DeclareRobustCommand{\tstyle}{%% anniffiniedig tabular figures
+ \not@math@alphabet\tstyle\relax
+ \exfs@unmerge@families{2}}
+\DeclareRobustCommand{\lstyle}{%% anniffiniedig lining figures (cf. command above)
+ \not@math@alphabet\lstyle\relax
+ \exfs@unmerge@families{j}}
+\DeclareRobustCommand{\tlstyle}{%% anniffiniedig
+ \lstyle\tstyle}
+\DeclareRobustCommand{\plstyle}{%% anniffiniedig
+ \lstyle\pstyle}
+\DeclareRobustCommand{\tostyle}{%% anniffiniedig
+ \ostyle\tstyle}
+\newcommand*{\sidefault}{si}% anniffiniedig
+\DeclareRobustCommand{\sishape}{%
+ \exfs@try@shapeshift{si}}
+\DeclareFontShapeChangeRule {n}{si}{scit}{scsl}% current; request (& trydedd); dewisiad cyntaf; ail ddewisiad
+\DeclareFontShapeChangeRule {it}{si}{scit}{scsl}
+\DeclareFontShapeChangeRule {sl}{si}{scit}{scsl}
+\DeclareFontShapeChangeRule {sc}{si}{scit}{scsl}
+\DeclareFontShapeChangeRule {si}{sc} {si} {}
+\DeclareFontShapeChangeRule {si}{it} {si} {}
+\DeclareFontShapeChangeRule {si}{sl} {scsl} {si}
+\DeclareFontShapeChangeRule {si}{scit} {scit} {si}% rhag ofn?!
+\DeclareFontShapeChangeRule {si}{ulc} {it} {}
+\DeclareFontShapeChangeRule {si}{up}{sc}{}
+\ExplSyntaxOn
+\bool_if:NT \g__exfs_compat_bool
+{
+ \DeclareFontShapeChangeRule {it}{sc}{si}{scsl}
+ \DeclareFontShapeChangeRule{sl}{sc}{scsl}{si}
+ \DeclareFontShapeChangeRule {sc}{it} {si} {scsl}
+ \DeclareFontShapeChangeRule {sc}{sl} {scsl} {si}
+ \DeclareFontShapeChangeRule {scsl}{it} {si} {scsl}
+}
+\ExplSyntaxOff
+\DeclareFontShapeChangeRule {ui}{sc}{scit}{scsl}
+\DeclareFontShapeChangeRule {ui}{scsl}{scsl}{scit}
+\DeclareFontShapeChangeRule {ui}{it}{it}{ui}
+\DeclareFontShapeChangeRule {ui}{ri}{ri}{ui}
+\DeclareFontShapeChangeRule {ui}{up}{n}{}
+\DeclareFontShapeChangeRule {ui}{ulc}{ui}{}
+\DeclareFontShapeChangeRule {ri}{sc}{scit}{scsl}
+\DeclareFontShapeChangeRule {ri}{scsl}{scsl}{scit}
+\DeclareFontShapeChangeRule {ri}{it}{it}{ri}
+\DeclareFontShapeChangeRule {ri}{ui}{ui}{ri}
+\DeclareFontShapeChangeRule {ri}{up}{n}{}
+\DeclareFontShapeChangeRule {ri}{ulc}{ri}{}
+\DeclareFontShapeChangeRule {ol} {sc} {scol} {} % <- seiliedig ar nfssext-cfr-nfss.sty \scshape
+\DeclareFontShapeChangeRule {ol} {ulc} {ol} {}
+\DeclareFontShapeChangeRule {ol} {up} {ol} {}
+\DeclareFontShapeChangeRule {scol} {sc} {scol} {}
+\DeclareFontShapeChangeRule {scol} {ulc} {ol} {}
+\DeclareFontShapeChangeRule {scol} {up} {scol} {}
+\DeclareFontShapeChangeRule {u}{sc}{su}{} % <- seiliedig ar nfssext-cfr-nfss.sty \scshape
+\DeclareFontShapeChangeRule {su}{ulc}{u}{}
+\DeclareFontShapeChangeRule {sc}{u}{su}{}
+\DeclareFontShapeChangeRule {su}{u}{su}{}
+\DeclareFontShapeChangeRule {su}{sc}{su}{}
+\newcommand*{\oldefault}{ol}% anniffiniedig
+\DeclareRobustCommand{\olshape}{%% anniffiniedig
+ \exfs@try@shapeshift{ol}}
+\newcommand*{\scoldefault}{scol}% anniffiniedig
+\DeclareRobustCommand{\scolshape}{%% anniffiniedig
+ \exfs@try@shapeshift{scol}}
+\newcommand*{\udefault}{u}% anniffiniedig
+\DeclareRobustCommand{\ushape}{%% anniffiniedig
+ \exfs@try@shapeshift{u}}
+\newcommand*{\scudefault}{su}% anniffiniedig
+\DeclareRobustCommand{\scushape}{%% anniffiniedig
+ \exfs@try@shapeshift{scu}}
+\newcommand*{\uidefault}{ui}% anniffiniedig
+\DeclareRobustCommand{\uishape}{% anniffiniedig
+ \exfs@try@shapeshift{ui}}
+\newcommand*{\ridefault}{ri}% anniffiniedig
+\DeclareRobustCommand{\rishape}{% anniffiniedig
+ \exfs@try@shapeshift{ri}}
+\newcommand*{\exfs@merge@width}[1]{%
+ \exfs@series@splitter{\f@series}%
+ \edef\exfs@temph{#1}%
+ \if\exfs@temph m\ifx\exfs@weight\@empty\else\let\exfs@temph\@empty\fi\fi
+ \if\exfs@weight m\ifx\exfs@temph\@empty\else\let\exfs@weight\@empty\fi\fi
+ \edef\exfs@series{\exfs@weight\exfs@temph}%
+ \exfs@info{Trying \exfs@series}%
+\exfs@try@series{\exfs@series}}
+\DeclareRobustCommand{\regwidth}{%% anniffiniedig
+\not@math@alphabet\regwidth\relax
+ \exfs@merge@width{m}}
+\newcommand*{\nwdefault}{c}% anniffiniedig
+\DeclareRobustCommand{\nwwidth}{%% anniffiniedig ond rheolau
+\not@math@alphabet\nwwidth\relax
+\exfs@merge@width{\nwdefault}}% neu \exfs@try@series ?
+\newcommand*{\cddefault}{c}% anniffiniedig
+\DeclareRobustCommand{\cdwidth}{% anniffiniedig ond rheolau
+\not@math@alphabet\cdwidth\relax
+\exfs@merge@width{\cddefault}}% neu \exfs@try@series ?
+\newcommand*{\ecdefault}{ec}% anniffiniedig
+\DeclareRobustCommand{\ecwidth}{%% anniffiniedig ond rheolau
+\not@math@alphabet\ecwidth\relax
+\exfs@merge@width{\ecdefault}}% neu \exfs@try@series ?
+\newcommand*{\ucdefault}{uc}% anniffiniedig
+\DeclareRobustCommand{\ucwidth}{%% anniffiniedig
+\not@math@alphabet\ucwidth\relax
+\exfs@merge@width{\ucdefault}}
+\newcommand*{\etdefault}{x}% anniffiniedig
+\DeclareRobustCommand{\etwidth}{%% anniffiniedig
+\not@math@alphabet\etwidth\relax
+\exfs@merge@width{\etdefault}}% neu \exfs@try@series ?
+\newcommand*{\epdefault}{x}% anniffiniedig
+\DeclareRobustCommand{\epwidth}{%% anniffiniedig ond rheolau
+\not@math@alphabet\epwidth\relax
+\exfs@merge@width{\epdefault}}% neu \exfs@try@series ?
+\newcommand*{\exdefault}{ex}% anniffiniedig
+\DeclareRobustCommand{\exwidth}{%% anniffiniedig
+\not@math@alphabet\exwidth\relax
+\exfs@merge@width{\exdefault}}
+\newcommand*{\uxdefault}{ux}% anniffiniedig
+\DeclareRobustCommand{\uxwidth}{%% anniffiniedig
+\not@math@alphabet\uxwidth\relax
+\exfs@merge@width{\uxdefault}}
+\newcommand*\mdwdefault{m}
+\DeclareRobustCommand{\mdwidth}{%% anniffiniedig
+ \not@math@alphabet\mdwidth\relax
+ \exfs@merge@width{\mdwdefault}}
+\newcommand*{\exfs@merge@weight}[1]{%
+ \exfs@series@splitter{\f@series}%
+ \let\exfs@tempg\f@series
+ \def\exfs@temph{#1}%
+ \if\exfs@temph m\relax
+ \ifx\exfs@width\@empty\relax
+ \else
+ \let\exfs@temph\@empty
+ \fi
+ \fi
+ \edef\exfs@series{\exfs@temph\exfs@width}%
+ \ifx\exfs@temph\exfs@series
+ \exfs@info{Trying \exfs@series}%
+ \exfs@try@series{\exfs@series}%
+ \else
+ \exfs@info{Trying \exfs@series, favouring \exfs@weight}%
+ \exfs@try@series[\exfs@weight]{\exfs@series}% assume user wants to change weight even if this changes back to the default width
+ \fi}
+\newcommand*{\mbdefault}{sb}% dim byd i'w gael ei wneud yma
+\DeclareRobustCommand{\mbweight}{%% anniffiniedig
+ \not@math@alphabet\mbweight\relax
+ \exfs@merge@weight{\mbdefault}}
+\newcommand*{\bddefault}{b}% dim byd i'w gael ei wneud yma
+\DeclareRobustCommand{\bfweight}{%% anniffiniedig
+ \not@math@alphabet\bfweight\relax
+ \exfs@merge@weight{\bddefault}}
+\DeclareRobustCommand{\bdweight}{%% anniffiniedig
+ \not@math@alphabet\bdweight\relax
+ \exfs@merge@weight{\bddefault}}
+\newcommand*\mwdefault{m}
+\DeclareRobustCommand{\mdweight}{%% anniffiniedig
+ \not@math@alphabet\mdweight\relax
+ \exfs@merge@weight{\mwdefault}}
+\newcommand*{\dbdefault}{db}% anniffiniedig
+\DeclareRobustCommand{\dbweight}{%% anniffiniedig
+\not@math@alphabet\dbweight\relax
+\exfs@merge@weight{\dbdefault}}
+\newcommand*{\sbdefault}{sb}% anniffiniedig
+\DeclareRobustCommand{\sbweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\sbweight\relax
+\exfs@merge@weight{\sbdefault}}% neu \exfs@try@series ?
+\newcommand*{\ebdefault}{eb}% anniffiniedig
+\DeclareRobustCommand{\ebweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\ebweight\relax
+\exfs@merge@weight{\ebdefault}}% neu \exfs@try@series ?
+\newcommand*{\ubdefault}{ub}% anniffiniedig
+\DeclareRobustCommand{\ubweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\ubweight\relax
+\exfs@merge@weight{\ubdefault}}% neu \exfs@try@series ?
+\newcommand*{\lgdefault}{l}% anniffiniedig
+\DeclareRobustCommand{\lgweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\lgweight\relax
+\exfs@merge@weight{\lgdefault}}% neu \exfs@try@series ?
+\newcommand*{\eldefault}{el}% anniffiniedig
+\DeclareRobustCommand{\elweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\elweight\relax
+\exfs@merge@weight{\eldefault}}% neu \exfs@try@series ?
+\newcommand*{\uldefault}{ul}% anniffiniedig
+\DeclareRobustCommand{\ulweight}{%% anniffiniedig ond rheolau
+\not@math@alphabet\ulweight\relax
+\exfs@merge@weight{\uldefault}}% neu \exfs@try@series ?
+\let\dfshape\normalshape
+\newcommand*{\swshapedefault}{\itdefault}
+\ExplSyntaxOn
+\hook_gput_code:nnn {begindocument}{.}
+{% compatibility with original nfss \swshape
+ \bool_if:NTF \g__exfs_compat_bool
+ {
+ \DeclareRobustCommand{\swshape}
+ {
+ \not@math@alphabet\swshape\relax
+ \swstyle\fontshape\swshapedefault\selectfont
+ }
+ \PackageWarning{nfssext-cfr}{
+ Overwriting ~ kernel ~ definition ~ of ~ \swshape \space (compat)
+ }
+ }{
+ \DeclareRobustCommand \swshape
+ {
+ \not@math@alphabet\swshape\relax
+ \exfs@swshape
+ }
+ \PackageWarning{nfssext-cfr}{
+ Overwriting ~ kernel ~ definition ~ of ~ \swshape \space (new)
+ }
+ }
+ \@ifpackageloaded{hyperref}{
+ \hook_gput_code:nnn { cmd/textin/before } { . }
+ {
+ \exfs@info{
+ Note ~ that ~ '\protect\textin' ~ is ~ defined ~ by ~ hyperref.\MessageBreak
+ Use ~ for ~ inferior ~ digits ~ will ~ yield ~ an\MessageBreak
+ undefined ~ command ~ error ~ in ~ document ~ font ~ encodings.\MessageBreak
+ Use ~ '\protect\textinf' ~ to ~ access ~ inferior ~ digits
+ }
+ }
+ }{
+ \DeclareTextFontCommand{\textin}{\infstyle}
+ }
+}
+\ExplSyntaxOff
+\DeclareTextFontCommand{\textln}{\lnstyle}% anniffiniedig
+\DeclareTextFontCommand{\textos}{\osstyle}% anniffiniedig
+\DeclareTextFontCommand{\textinf}{\infstyle}% anniffiniedig
+\DeclareTextFontCommand{\textsu}{\sustyle}% anniffiniedig
+\DeclareTextFontCommand{\textsi}{\sishape}% anniffiniedig
+\DeclareTextFontCommand{\textdf}{\dfshape}% anniffiniedig
+\DeclareTextFontCommand{\textti}{\tistyle}% anniffiniedig
+\DeclareTextFontCommand{\textlt}{\ltstyle}% anniffiniedig
+\DeclareTextFontCommand{\textof}{\ofstyle}% anniffiniedig % open-face (or outline or blank) style
+\DeclareTextFontCommand{\textalt}{\altstyle}% anniffiniedig % alternative style
+\DeclareTextFontCommand{\textreg}{\regstyle}% anniffiniedig % `regular' style
+\DeclareTextFontCommand{\emboss}{\embossstyle}% anniffiniedig
+\DeclareTextFontCommand{\textorn}{\ornamentalstyle}% anniffiniedig % intended primarily for decorative initials etc.
+\DeclareTextFontCommand{\textqt}{\qtstyle}% anniffiniedig
+\DeclareTextFontCommand{\textsh}{\shstyle}% anniffiniedig % shadowed style
+\DeclareTextFontCommand{\texttm}{\tmstyle}% anniffiniedig
+\DeclareTextFontCommand{\texttv}{\tvstyle}% anniffiniedig
+\DeclareTextFontCommand{\textl}{\lstyle}% anniffiniedig
+\DeclareTextFontCommand{\texto}{\ostyle}% anniffiniedig
+\DeclareTextFontCommand{\textp}{\pstyle}% anniffiniedig
+\DeclareTextFontCommand{\textt}{\tstyle}% anniffiniedig
+\DeclareTextFontCommand{\textpl}{\plstyle}% anniffiniedig
+\DeclareTextFontCommand{\textpo}{\postyle}% anniffiniedig
+\DeclareTextFontCommand{\texttl}{\tlstyle}% anniffiniedig
+\DeclareTextFontCommand{\textto}{\tostyle}% anniffiniedig
+\DeclareTextFontCommand{\textol}{\olshape}% anniffiniedig % outline
+\DeclareTextFontCommand{\textswash}{\swashstyle}% anniffiniedig % an attempt to improve on \textsw
+\DeclareTextFontCommand{\textu}{\ushape}% anniffiniedig % be' yw hwn?! <_ underlined?
+\DeclareTextFontCommand{\textscu}{\scushape}% anniffiniedig
+\DeclareTextFontCommand{\textui}{\uishape}% anniffiniedig % upright italic
+\DeclareTextFontCommand{\textri}{\rishape}% anniffiniedig % reverse italic
+\DeclareTextFontCommand{\textnw}{\nwwidth}% anniffiniedig
+\DeclareTextFontCommand{\textcd}{\cdwidth}% anniffiniedig
+\DeclareTextFontCommand{\textec}{\ecwidth}% anniffiniedig
+\DeclareTextFontCommand{\textuc}{\ucwidth}% anniffiniedig
+\DeclareTextFontCommand{\textet}{\etwidth}% anniffiniedig
+\DeclareTextFontCommand{\textep}{\epwidth}% anniffiniedig
+\DeclareTextFontCommand{\textex}{\exwidth}% anniffiniedig
+\DeclareTextFontCommand{\textux}{\uxwidth}% anniffiniedig
+\DeclareTextFontCommand{\textrw}{\regwidth}% anniffiniedig
+\DeclareTextFontCommand{\textmb}{\mbweight}% anniffiniedig
+\DeclareTextFontCommand{\textdb}{\dbweight}% anniffiniedig
+\DeclareTextFontCommand{\textbd}{\bdweight}% new?
+\DeclareTextFontCommand{\textsb}{\sbweight}% anniffiniedig
+\DeclareTextFontCommand{\texteb}{\ebweight}% anniffiniedig
+\DeclareTextFontCommand{\textub}{\ubweight}% anniffiniedig
+\DeclareTextFontCommand{\textlg}{\lgweight}% anniffiniedig
+\DeclareTextFontCommand{\textel}{\elweight}% anniffiniedig
+\DeclareTextFontCommand{\textul}{\ulweight}% anniffiniedig
+\patchcmd{\init@series@setup}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt,clm,clm2,clm2j,clmj,clm2js,clm2s,clmjs,clms,clm2jt,clm2t,clmjt,clmt,clm2jv,clm2v,clmjv,clmv,clm2jqs,clm2qs,clmjqs,clmqs}{%
+ \PackageWarning{nfssext-cfr}{%
+ Patching font initialisation macro for serif.%
+ }%
+}{%
+ \PackageWarning{nfssext-cfr}{%
+ Failed to patch font initialisation macro for serif.%
+ }%
+}
+\patchcmd{\init@series@setup}{{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}}{{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt,clm,clm2,clm2j,clmj,clm2js,clm2s,clmjs,clms,clm2jt,clm2t,clmjt,clmt,clm2jv,clm2v,clmjv,clmv,clm2jqs,clm2qs,clmjqs,clmqs}}{%
+ \PackageWarning{nfssext-cfr}{%
+ Patching font initialisation macro for sans.%
+ }%
+}{%
+ \PackageWarning{nfssext-cfr}{%
+ Failed to patch font initialisation macro for sans.%
+ }%
+}
+\patchcmd{\init@series@setup}{{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}}{{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt,clm,clm2,clm2j,clmj,clm2js,clm2s,clmjs,clms,clm2jt,clm2t,clmjt,clmt,clm2jv,clm2v,clmjv,clmv,clm2jqs,clm2qs,clmjqs,clmqs}}{%
+ \PackageWarning{nfssext-cfr}{%
+ Patching font initialisation macro for typewriter.%
+ }%
+}{%
+ \PackageWarning{nfssext-cfr}{%
+ Failed to patch font initialisation macro for typewriter.%
+ }%
+}
+\endinput
+%%
+%% End of file `nfssext-cfr-nnfss.sty'.
diff --git a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty
index 03d19d2e595..32438edbf1e 100644
--- a/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty
+++ b/Master/texmf-dist/tex/latex/nfssext-cfr/nfssext-cfr.sty
@@ -1,605 +1,152 @@
-%% nfssext-cfr.sty
-%% Additions and changes are copyright 2017 Clea F. Rees
-%% Code from nfssext.sty copyright 2003 Philipp Lehman (see below)
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of the file nfssext-cfr.sty.
-%
-% The file nfssext-cfr.sty is a derived work under the terms of the
-% LPPL. It is based on version 1.2 of nfssext.sty which is part of The
-% Font Installation Guide by Philipp Lehman. A copy of the The Font
-% Installation Guide, including the unmodified version of nfssext.sty
-% is available from
-% http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=fontinstallationguide.
-% nfssext.sty is part of the included archive figuide-examples.tar.gz
-% which consists of examples and templates released under the LPPL.
-% nfssext.sty is included in the files for tutorials 3, 5 and 6.
-%
-% 2017-03-28: modify \tmstyle and \tvstyle to unmerge sans and other
-% typewriter before mergining appropriate variant
-%
+%%
+%% This is file `nfssext-cfr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nfssext-cfr.dtx (with options: `sty')
+%% Additions and changes Copyright (C) 2008-2024 Clea F. Rees.
+%% Code from fontinstallationguide Copyright (C) 2002-2004 Philipp Lehman (see below)
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%%
+%% The file nfssext-cfr.sty is a derived work under the terms of the LPPL.
+%% It is based on version 1.2 of nfssext.sty which is supplied with
+%% The Font Installation Guide by Philipp Lehman. A copy of The Font Installation Guide, including an
+%% unmodified version of nfssext.sty is available from
+%% https://tug.ctan.org/pkg/fontinstallationguide.
+%% nfssext.sty is part of the included archive figuide-examples.tar.gz
+%% which consists of examples and templates released under the LPPL.
+%% nfssext.sty is included in the files for tutorials 3, 5 and 6.
+%%
+%% The main modifications made to this file are described in nfssext-cfr.dtx.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{svn-prov}
-\ProvidesPackageSVN{$Id: nfssext-cfr.sty 6140 2017-03-28 18:07:31Z cfrees $}[\revinfo{} specially mangled by cfr; based on 2003/03/14 v1.2 Experimental NFSS Extensions]
-%:cfr-added: use ifthen
-\RequirePackage{ifthen}
-%:end-added
-\newcommand*{\exfs@tempa}{}
-\newcommand*{\exfs@tempb}{}
-%:cfr-added: extra variable (\exfs@tempf)
-\newcommand*{\exfs@tempf}{}
-%:end-added
-\newcommand*{\exfs@try@family}[2][]{%
- \let\exfs@tempa\relax
- \begingroup
- \fontfamily{#2}\try@load@fontshape
- \expandafter\ifx\csname\curr@fontshape\endcsname\relax
- \edef\exfs@tempa{#1}%
- \ifx\exfs@tempa\@empty
- \PackageWarning{nfssext}{%
- Font family '\f@encoding/#2' not available\MessageBreak
- Ignoring font switch}%
- \else
- \PackageInfo{nfssext}{%
- Font family '\f@encoding/#2' not available\MessageBreak
- Font family '\f@encoding/#1' tried instead}%
- \exfs@try@family{#1}%
- \fi
- \else
- \gdef\exfs@tempa{\fontfamily{#2}\selectfont}%
- \fi
- \endgroup
- \exfs@tempa}
-%:cfr-added exfs@try@series
-\newcommand*{\exfs@try@series}[2][]{%
- \let\exfs@tempa\relax
- \begingroup
- \fontseries{#2}\try@load@fontshape
- \expandafter\ifx\csname\curr@fontshape\endcsname\relax
- \edef\exfs@tempa{#1}%
- \ifx\exfs@tempa\@empty
- \PackageWarning{nfssext-cfr}{%
- Font series '\f@encoding/\f@family/#2' not available\MessageBreak
- Ignoring font switch}%
- \else
- \PackageInfo{nfssext-cfr}{%
- Font family '\f@encoding/\f@family/#2' not available\MessageBreak
- Font family '\f@encoding/\f@family/#1' tried instead}%
- \exfs@try@series{#1}%
- \fi
- \else
- \gdef\exfs@tempa{\fontseries{#2}\selectfont}%
- \fi
- \endgroup
- \exfs@tempa}
-%:end-added
-\def\exfs@get@base#1#2#3#4\@nil{#1#2#3}
-%:cfr-added:more \exfs@ commands (get@variants, next, shift, first, part, second)
-\def\exfs@get@variants#1#2#3#4\@nil{#4}
-\def\exfs@next#1#2\@nil{#1}
-\def\exfs@shift#1#2\@nil{#2}
-\def\exfs@first#1#2\@nil{#1}
-\def\exfs@part#1#2\@nil{#2}
-\def\exfs@second#1#2#3\@nil{#2}
-%:end-added
-\DeclareRobustCommand{\lnstyle}{%
- \not@math@alphabet\lnstyle\relax
- \exfs@try@family[\expandafter\exfs@get@base\f@family\@nil]%
- {\expandafter\exfs@get@base\f@family\@nil x}}
-\DeclareRobustCommand{\osstyle}{%
- \not@math@alphabet\osstyle\relax
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil j}}
-\DeclareRobustCommand{\instyle}{%
- \not@math@alphabet\instyle\relax
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 0}}
-\DeclareRobustCommand{\sustyle}{%
- \not@math@alphabet\sustyle\relax
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil 1}}
-\DeclareRobustCommand{\swstyle}{%
- \not@math@alphabet\swstyle\relax
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil w}}
-%:cfr-added - merge families
-\newcommand*\exfs@merge@families[1]{%
- \edef\exfs@tempf{#1}%
- \edef\tempa{\expandafter\exfs@get@variants\f@family\@nil}%
- \edef\tempo{2j}%
- \let\exfs@tempq\@empty
- \def\exfs@tempg{}%
- \newif\ifadded
- \addedfalse
- % check whether there are variants - if not just use the requested addition
- \ifx\tempa\@empty
- \edef\exfs@tempq{\exfs@tempf}%
- \addedtrue
- \else
- \gdef\set{0,1,2,a,d,e,f,h,j,l,p,q,s,t,v,w}% these are the variants to consider - the order here and in the font name is crucial
- \ifx\tempo\exfs@tempf
- \@for \xx:=\set \do {%
- % check whether there are variants left - if not set the ``next variant'' to empty
- \ifx\tempa\@empty
- \let\exfs@tempn\@empty
- \else
- % o/w get the next variant
- \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
- \fi
- \edef\tempt{2}%
- \edef\tempj{j}%
- % if the next variant is 2 or j, ignore it
- \ifx\exfs@tempn\tempt
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \fi
- \ifx\exfs@tempn\tempj % if the next variant is j, ignore it
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \fi
- % see if the current value is either 2 or j and add it if so and if needed
- \ifx\tempt\xx
- \edef\exfs@tempg{\exfs@tempg\xx}%
- \else
- \ifx\tempj\xx % if the current value is j, we're done
- \edef\exfs@tempq{\exfs@tempg\xx\tempa}%
- \let\tempa\@empty
- \addedtrue
- \else
- % o/w see if the current value matches the next variant
- \ifx\xx\exfs@tempn
- \edef\exfs@tempg{\exfs@tempg\xx}%
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \fi
- \fi
- \fi
- }%
- \else
- \@for \xx:=\set \do {%
- % check whether there are variants left and, if not, add the addition if needed
- \ifx\tempa\@empty
- \ifadded
- \else
- \edef\exfs@tempq{\exfs@tempg\exfs@tempf}%
- \addedtrue
- \fi
- \else
- % o/w get the next variant
- \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
- % if the new token equals the next variant, combine whatever is saved in \exfs@tempg with whatever remains in \tempa
- \ifx\exfs@tempn\exfs@tempf
- \edef\exfs@tempq{\exfs@tempg\tempa}%
- \addedtrue
- \let\tempa\@empty
- \else
- % o/w, if the current value matches the requested addition, add it in
- \ifx\exfs@tempf\xx
- \edef\exfs@tempq{\exfs@tempg\xx\tempa}%
- \addedtrue
- \let\tempa\@empty
- \else
- % o/w, if the current value matches the next variant, shift
- \ifx\exfs@tempn\xx
- \edef\exfs@tempg{\exfs@tempg\xx}%
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \fi
- \fi
- \fi
- \fi
- }%
- \fi
- \fi
- \ifx\exfs@tempq\@empty
- \PackageError{nfssext-cfr}{Something is wrong here. Ignoring font switching command.}{}%
- \else
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}%
- \fi}
-\DeclareRobustCommand{\pstyle}{% proportional figures
- \not@math@alphabet\pstyle\relax
- \exfs@merge@families{2}}
-\DeclareRobustCommand{\tistyle}{% titling/display
- \not@math@alphabet\tistyle\relax
- \exfs@merge@families{d}}
-\DeclareRobustCommand{\ostyle}{% oldstyle figures (cf. original osstyle above)
- \not@math@alphabet\ostyle\relax
- \exfs@merge@families{j}}
-% combined command for proportional oldstyle
-\DeclareRobustCommand{\postyle}{%
- \not@math@alphabet\postyle\relax
- \exfs@merge@families{2j}}
-%note that this command is for use when the light version is a separate family rather than a weight variant (e.g. when you've got light, light bold etc. as well as regular weights)
-\DeclareRobustCommand{\ltstyle}{%
- \not@math@alphabet\ltstyle\relax
- \exfs@merge@families{l}}
-%let's hope there aren't any fonts with a light family *and* an outline/openface/blank version
-\DeclareRobustCommand{\ofstyle}{%
- \not@math@alphabet\ofstyle\relax
- \exfs@merge@families{l}}
-\DeclareRobustCommand{\altstyle}{% alternative style
- \not@math@alphabet\altstyle\relax
- \exfs@merge@families{a}}
-\DeclareRobustCommand{\regstyle}{% ``regular'' style
- \not@math@alphabet\regstyle\relax
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil}}
-\DeclareRobustCommand{\embossstyle}{%
- \not@math@alphabet\embossstyle\relax
- \exfs@merge@families{e}}
-\DeclareRobustCommand{\ornamentalstyle}{% intended primarily for decorative initial fonts etc.
- \not@math@alphabet\ornamentalstyle\relax
- \exfs@merge@families{p}}
-\DeclareRobustCommand{\qtstyle}{% quotation style (assumes sans)
- \not@math@alphabet\qtstyle\relax
- \sffamily
- \exfs@merge@families{q}}
-\DeclareRobustCommand{\shstyle}{%
- \not@math@alphabet\shstyle\relax
- \exfs@merge@families{h}}
-\DeclareRobustCommand{\swashstyle}{% an attempt to improve on \swstyle
- \not@math@alphabet\swashstyle\relax
- \exfs@merge@families{w}}
-\DeclareRobustCommand{\tmstyle}{% monowidth typewriter
- \not@math@alphabet\tmstyle\relax
- \exfs@unmerge@families{s}%
- \exfs@unmerge@families{v}%
- \exfs@merge@families{t}}
-\DeclareRobustCommand{\tvstyle}{% variable width typewriter
- \not@math@alphabet\tvstyle\relax
- \exfs@unmerge@families{s}%
- \exfs@unmerge@families{t}%
- \exfs@merge@families{v}}
-%:cfr-added - unmerge families
-\newcounter{taken}%
-\newcommand*\exfs@unmerge@families[1]{%
- \edef\exfs@tempf{#1}%
- \edef\tempa{\expandafter\exfs@get@variants\f@family\@nil}%
- \let\exfs@tempq\@empty
- \edef\exfs@tempg{}%
- \setcounter{taken}{0}%
- % check whether there are variants - if not do nothing
- \ifx\tempa\@empty
- \edef\exfs@tempq{}%
- \else
- % o/w go through the variants to find the one to delete
- \whiledo{\value{taken}<1}{%
- % get the next variant
- \edef\exfs@tempn{\expandafter\exfs@next\tempa\@nil}%
- % see if the next variant is the thing we seek and, if so, eliminate it
- \ifx\exfs@tempf\exfs@tempn
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \edef\exfs@tempq{\exfs@tempg\tempa}%
- \stepcounter{taken}%
- % o/w save the next variant and move on if any variants remain
- \else
- \edef\exfs@tempg{\exfs@tempg\exfs@tempn}%
- \edef\tempa{\expandafter\exfs@shift\tempa\@nil}%
- \ifx\tempa\@empty% if there are no variants left, we're done
- \edef\exfs@tempq{\exfs@tempg}%
- \stepcounter{taken}%
- \fi
- \fi
- }%
- \fi
- \exfs@try@family{\expandafter\exfs@get@base\f@family\@nil \exfs@tempq}}
-\DeclareRobustCommand{\tstyle}{% tabular figures
- \not@math@alphabet\tstyle\relax
- \exfs@unmerge@families{2}}
-\DeclareRobustCommand{\lstyle}{% lining figures (cf. command above)
- \not@math@alphabet\lstyle\relax
- \exfs@unmerge@families{j}}
-% make a combined command for tabular lining
-\DeclareRobustCommand{\tlstyle}{%
- \lstyle\tstyle}
-% proportional lining
-\DeclareRobustCommand{\plstyle}{%
- \lstyle\pstyle}
-% tabular oldstyle {?!}
-\DeclareRobustCommand{\tostyle}{%
- \ostyle\tstyle}
-%:end-added % si is italic sc
-\newcommand*{\sidefault}{si}
-\DeclareRobustCommand{\sishape}{%
- \not@math@alphabet\sishape\relax
- \fontshape\sidefault\selectfont}
-%:cfr-added - is this how outline shapes should be handled?
-\newcommand*{\oldefault}{ol}
-\DeclareRobustCommand{\olshape}{%
- \not@math@alphabet\olshape\relax
- \fontshape\oldefault\selectfont}
-\newcommand*{\scoldefault}{scol}
-\DeclareRobustCommand{\scolshape}{%
- \not@math@alphabet\scolshape\relax
- \fontshape\scoldefault\selectfont}
-%\DeclareRobustCommand{\olshape}{%
-% \not@math@alphabet\olshape\relax
-% \exfs@merge@shape{\oldefault}{\scdefault}{\scoldefault}}
-%:fudge
-\newcommand*{\udefault}{u}
-\DeclareRobustCommand{\ushape}{%
- \not@math@alphabet\ushape\relax
- \fontshape\udefault\selectfont}
-\newcommand*{\scudefault}{su}
-\DeclareRobustCommand{\scushape}{%
- \not@math@alphabet\scushape\relax
- \fontshape\scudefault\selectfont}
-%:upright italic
-\newcommand*{\uidefault}{ui}
-\DeclareRobustCommand{\uishape}{%
- \not@math@alphabet\uishape\relax
- \fontshape\uidefault\selectfont}
-%:can i do this for reverse italic?
-\newcommand*{\ridefault}{ri}
-\DeclareRobustCommand{\rishape}{%
- \not@math@alphabet\rishape\relax
- \fontshape\ridefault\selectfont}
-%:end-added
-\newcommand*{\exfs@merge@shape}[3]{%
- \edef\exfs@tempa{#1}%
- \edef\exfs@tempb{#2}%
- \ifx\f@shape\exfs@tempb
- \expandafter\ifx\csname\f@encoding/\f@family/\f@series/#3\endcsname\relax
- \else
- \edef\exfs@tempa{#3}%
- \fi
- \fi
- \fontshape{\exfs@tempa}\selectfont}
-%:cfr-added - merge width changes into series
-\newcommand*{\exfs@font@width}{%
- \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
- \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
- \ifx\exfs@temppart\@empty
- \def\exfs@width{}
- \else
- \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
- \ifx\exfs@temps{b}
- \edef\exfs@width{\expandafter\exfs@part\exfs@temps\@nil }%
- \else
- \ifx\exfs@temps{l}
- \edef\exfs@width{\expandafter\exfs@part\exfs@temps\@nil }%
- \else
- \edef\exfs@width{\exfs@temppart}%
- \fi
- \fi
- \fi
- \exfs@width
- }
-\newcommand*{\exfs@merge@width}[1]{%
- \edef\exfs@temph{#1}%
- \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
- \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
- \def\tempb{b}%
- \def\templ{l}%
- \ifx\exfs@temppart\@empty
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temph}%
- \else
- \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
- \ifx\exfs@temps\tempb
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temps\exfs@temph}%
- \else
- \ifx\exfs@temps\templ
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temps\exfs@temph}%
- \else
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temph}%
- \fi
- \fi
- \fi
- \exfs@try@series{\exfs@series}}
-% \fontseries\exfs@series\selectfont}
-\newcommand*{\exfs@unmerge@width}{%
- \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
- \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
- \def\tempb{b}%
- \def\templ{l}%
- \ifx\exfs@temppart\@empty
- \def\exfs@series{\expandafter\exfs@tempf}%
- \else
- \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
- \ifx\exfs@temps\tempb
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temps}%
- \else
- \ifx\exfs@temps\templ
- \def\exfs@series{\expandafter\exfs@tempf\exfs@temps}%
- \else
- \def\exfs@series{\expandafter\exfs@tempf}%
- \fi
- \fi
- \fi
- \exfs@try@series{\exfs@series}}
-\DeclareRobustCommand{\regwidth}{%
- \not@math@alphabet\regwidth\relax
- \exfs@unmerge@width}
-\newcommand*{\nwdefault}{c}
-\DeclareRobustCommand{\nwwidth}{%
- \not@math@alphabet\nwwidth\relax
- \exfs@merge@width{\nwdefault}}
-\newcommand*{\cddefault}{c}
-\DeclareRobustCommand{\cdwidth}{%
- \not@math@alphabet\cdwidth\relax
- \exfs@merge@width{\cddefault}}
-\newcommand*{\ecdefault}{ec}
-\DeclareRobustCommand{\ecwidth}{%
- \not@math@alphabet\ecwidth\relax
- \exfs@merge@width{\ecdefault}}
-\newcommand*{\ucdefault}{uc}
-\DeclareRobustCommand{\ucwidth}{%
- \not@math@alphabet\ucwidth\relax
- \exfs@merge@width{\ucdefault}}
-\newcommand*{\etdefault}{x}
-\DeclareRobustCommand{\etwidth}{%
- \not@math@alphabet\etwidth\relax
- \exfs@merge@width{\etdefault}}
-\newcommand*{\epdefault}{x}
-\DeclareRobustCommand{\epwidth}{%
- \not@math@alphabet\epwidth\relax
- \exfs@merge@width{\epdefault}}
-\newcommand*{\exdefault}{ex}
-\DeclareRobustCommand{\exwidth}{%
- \not@math@alphabet\exwidth\relax
- \exfs@merge@width{\exdefault}}
-\newcommand*{\uxdefault}{ux}
-\DeclareRobustCommand{\uxwidth}{%
- \not@math@alphabet\uxwidth\relax
- \exfs@merge@width{\uxdefault}}
-%:cfr-added merge weight changes into series
-\newcommand*{\exfs@merge@weight}[1]{%
- \edef\exfs@tempg{#1}%
- \edef\exfs@tempf{\expandafter\exfs@first\f@series\@nil }%
- \edef\exfs@temppart{\expandafter\exfs@part\f@series\@nil }%
- \def\templ{l}%
- \def\tempb{b}%
- %:case when there's no second part, so the single character must be the weight and should be replaced
- \ifx\exfs@temppart\@empty
- \def\exfs@series{\expandafter\exfs@tempg}%
- %:case when there's a second part
- \else
- %:get first character of second part
- \edef\exfs@temps{\expandafter\exfs@second\f@series\@nil }%
- \edef\exfs@tempw{\expandafter\exfs@part\exfs@temps\@nil }%
- %:is the first character b? if so, it is part of the weight and should be replaced
- \ifx\exfs@temps\tempb
- \def\exfs@series{\expandafter\exfs@tempg\exfs@tempw}%
- \else
- %:is the first character l? if so, it is part of the weight and should be replaced
- \ifx\exfs@temps\templ
- \def\exfs@series{\expandafter\exfs@tempg\exfs@tempw}%
- \else
- %:o/w the first character is part of the width and should be retained
- \def\exfs@series{\expandafter\exfs@tempg\exfs@temppart}%
- \fi
- \fi
- \fi
- %\fontseries\exfs@series\selectfont}
- \ifx\exfs@tempg\exfs@series
- \exfs@try@series{\exfs@series}%
- \else
- \exfs@try@series[\exfs@tempg]{\exfs@series}% assume user wants to change weight even if this changes back to the default width
- \fi}
-\newcommand*{\mbdefault}{mb}
-\DeclareRobustCommand{\mbweight}{%
- \not@math@alphabet\mbweight\relax
- \exfs@merge@weight{\mbdefault}}
-\newcommand*{\dbdefault}{db}
-\DeclareRobustCommand{\dbweight}{%
- \not@math@alphabet\dbweight\relax
- \exfs@merge@weight{\dbdefault}}
-\newcommand*{\sbdefault}{sb}
-\DeclareRobustCommand{\sbweight}{%
- \not@math@alphabet\sbweight\relax
- \exfs@merge@weight{\sbdefault}}
-\newcommand*{\ebdefault}{eb}
-\DeclareRobustCommand{\ebweight}{%
- \not@math@alphabet\ebweight\relax
- \exfs@merge@weight{\ebdefault}}
-\newcommand*{\ubdefault}{ub}
-\DeclareRobustCommand{\ubweight}{%
- \not@math@alphabet\ubweight\relax
- \exfs@merge@weight{\ubdefault}}
-\newcommand*{\lgdefault}{l}
-%note - use this if light is a variant weight, rather than a separate family
-\DeclareRobustCommand{\lgweight}{%
- \not@math@alphabet\lgweight\relax
- \exfs@merge@weight{\lgdefault}}
-\newcommand*{\eldefault}{el}
-\DeclareRobustCommand{\elweight}{%
- \not@math@alphabet\elweight\relax
- \exfs@merge@weight{\eldefault}}
-\newcommand*{\uldefault}{ul}
-\DeclareRobustCommand{\ulweight}{%
- \not@math@alphabet\ulweight\relax
- \exfs@merge@weight{\uldefault}}
-%:end-added
-\DeclareRobustCommand{\itshape}{%
- \not@math@alphabet\itshape\mathit
- \exfs@merge@shape{\itdefault}{\scdefault}{\sidefault}}
-% original
-%\DeclareRobustCommand{\scshape}{%
-% \not@math@alphabet\scshape\relax
-% \exfs@merge@shape{\scdefault}{\itdefault}{\sidefault}}
-%:cfr-altered: \scshape
-\DeclareRobustCommand{\scshape}{%
- \not@math@alphabet\scshape\relax
- \def\tempu{u}%
- \def\tempo{ol}%
- \ifx\f@shape\tempu
- \exfs@merge@shape{\scdefault}{\udefault}{\scudefault}%
- \else
- \ifx\f@shape\tempo
- \exfs@merge@shape{\scdefault}{\oldefault}{\scoldefault}%
- \else
- \exfs@merge@shape{\scdefault}{\itdefault}{\sidefault}%
- \fi
- \fi}
-%:end-altered
-\DeclareRobustCommand{\upshape}{%
- \not@math@alphabet\upshape\relax
- \exfs@merge@shape{\updefault}{\sidefault}{\scdefault}}
-\DeclareRobustCommand{\dfshape}{%
- \not@math@alphabet\dfshape\relax
- \fontshape\shapedefault\selectfont}
-\newcommand*{\swshapedefault}{\itdefault}
-\DeclareRobustCommand{\swshape}{%
- \not@math@alphabet\swshape\relax
- \swstyle\fontshape\swshapedefault\selectfont}
-\DeclareTextFontCommand{\textln}{\lnstyle}
-\DeclareTextFontCommand{\textos}{\osstyle}
-\DeclareTextFontCommand{\textin}{\instyle}
-\DeclareTextFontCommand{\textsu}{\sustyle}
-\DeclareTextFontCommand{\textsi}{\sishape}
-\DeclareTextFontCommand{\textdf}{\dfshape}
-\DeclareTextFontCommand{\textsw}{\swshape}
-%:cfr-added
-%:families
-\DeclareTextFontCommand{\textti}{\tistyle}
-\DeclareTextFontCommand{\textlt}{\ltstyle}
-\DeclareTextFontCommand{\textof}{\ofstyle} % open-face (or outline or blank) style
-\DeclareTextFontCommand{\textalt}{\altstyle} % alternative style
-\DeclareTextFontCommand{\textreg}{\regstyle} % ``regular'' style
-\DeclareTextFontCommand{\emboss}{\embossstyle}
-\DeclareTextFontCommand{\textorn}{\ornamentalstyle} % intended primarily for decorative initials etc.
-\DeclareTextFontCommand{\textqt}{\qtstyle}
-\DeclareTextFontCommand{\textsh}{\shstyle} % shadowed style
-\DeclareTextFontCommand{\texttm}{\tmstyle}
-\DeclareTextFontCommand{\texttv}{\tvstyle}
-%:families - figures
-\DeclareTextFontCommand{\textl}{\lstyle}
-\DeclareTextFontCommand{\texto}{\ostyle}
-\DeclareTextFontCommand{\textp}{\pstyle}
-\DeclareTextFontCommand{\textt}{\tstyle}
-\DeclareTextFontCommand{\textpl}{\plstyle}
-\DeclareTextFontCommand{\textpo}{\postyle}
-\DeclareTextFontCommand{\texttl}{\tlstyle}
-\DeclareTextFontCommand{\textto}{\tostyle}
-%:shapes
-\DeclareTextFontCommand{\textol}{\olshape} % outline
-\DeclareTextFontCommand{\textswash}{\swashstyle} % an attempt to improve on \textsw
-\DeclareTextFontCommand{\textu}{\ushape}
-\DeclareTextFontCommand{\textscu}{\scushape}
-\DeclareTextFontCommand{\textui}{\uishape} % upright italic
-\DeclareTextFontCommand{\textri}{\rishape} % reverse italic
-%:widths
-\DeclareTextFontCommand{\textnw}{\nwwidth}
-\DeclareTextFontCommand{\textcd}{\cdwidth}
-\DeclareTextFontCommand{\textec}{\ecwidth}
-\DeclareTextFontCommand{\textuc}{\ucwidth}
-\DeclareTextFontCommand{\textet}{\etwidth}
-\DeclareTextFontCommand{\textep}{\epwidth}
-\DeclareTextFontCommand{\textex}{\exwidth}
-\DeclareTextFontCommand{\textux}{\uxwidth}
-\DeclareTextFontCommand{\textrw}{\regwidth}
-%:weights
-\DeclareTextFontCommand{\textmb}{\mbweight}
-\DeclareTextFontCommand{\textdb}{\dbweight}
-\DeclareTextFontCommand{\textsb}{\sbweight}
-\DeclareTextFontCommand{\texteb}{\ebweight}
-\DeclareTextFontCommand{\textub}{\ubweight}
-\DeclareTextFontCommand{\textlg}{\lgweight}
-\DeclareTextFontCommand{\textel}{\elweight}
-\DeclareTextFontCommand{\textul}{\ulweight}
-%end-added
+\ProvidesPackageSVN[\filebase.sty]{$Id: nfssext-cfr.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v1.0 \revinfo{} extensions for NFSS and NNFSS; based on 2003/03/14 v1.2 Experimental NFSS Extensions]
+\DefineFileInfoSVN
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\if@nfssextcfr@digonnew
+\@nfssextcfr@digonnewtrue
+\@ifundefined{ExplLoaderFileDate}{%
+ \IfFileExists{expl3.sty}{%
+ \RequirePackage{expl3}%
+ }{%
+ \RequirePackage{nfssext-cfr-nfss}%
+ \@nfssextcfr@digonnewfalse
+ }%
+}{}
+\if@nfssextcfr@digonnew
+ \@ifl@t@r\ExplLoaderFileDate{2022-02-24}{%
+ }{%
+ \RequirePackage{nfssext-cfr-nfss}%
+ \@nfssextcfr@digonnewfalse
+ }%
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\if@nfssextcfr@digonnew
+\newif\ifexfs@debug
+\ExplSyntaxOn
+\prop_gput:Nnn \g_msg_module_name_prop { nfssext-cfr } { exfs }
+\keys_define:nn { exfs }
+{
+ compat .bool_gset:N = \g__exfs_compat_bool,
+ compat .default:n = true,
+ compat .initial:n = false,
+ compat .usage:n = preamble,
+ debug .legacy_if_gset:n = exfs@debug,
+ debug .initial:n = false,
+ debug .default:n = true,
+ force .bool_gset:N = \g__exfs_force_bool,
+ force .default:n = true,
+ force .initial:n = false,
+ force .usage:n = preamble,
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
+\IfFormatAtLeastTF { 2022-06-01 }
+{
+ \ProcessKeyOptions [ exfs ]
+}{
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { exfs }
+ \NewDocumentCommand \ProcessKeyOptions { o }
+ {
+ \IfValueTF { #1 } { \ProcessKeysOptions { #1 } }
+ { \PackageError{nfssext-cfr}{
+ Optional~argument~mandatory~on~kernels~this~old.\MessageBreak
+ Please~specify~the~module~whose~keys~should~be~processed
+ }{
+ \protect\ProcessKeyOptions~only~passes~keys~to~
+ \protect\ProcessKeyOptions\MessageBreak
+ on~older~kernels~for~the~convenience~of~package~authors.~
+ Since~\protect\ProcessKeysOptions\MessageBreak
+ takes~an~argument,~the~optional~argument~to~
+ \protect\ProcessKeyOptions~is~required
+ }
+ }
+ }
+}
+\IfFormatAtLeastTF { 2020-10-01 }{
+}{
+ \RequirePackage { xparse }
+ \providecommand \ExpandArgs [1]
+ { \cs_if_exist_use:c { exp_args:N #1 } }
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{etoolbox}
+\msg_new:nnn { nfssext-cfr } { compat }
+{
+ You ~ or ~ a ~ font-support ~ package ~ have ~ loaded ~ me ~ ( line ~ \msg_line_number: ) ~ with ~ the ~ compat ~ option. ~
+ This ~ means ~ the ~ package ~ may ~ require ~ updating. ~
+ Update ~ the ~ package ~ if ~ necessary ~ and ~ use ~ compat=false ~ when ~ loading ~ me.
+}
+\msg_new:nnn { nfssext-cfr } { force }
+{
+ You ~ or ~ a ~ font-support ~ package ~ have ~ loaded ~ me ~ ( line ~ \msg_line_number: ) ~ with ~ the ~ force ~ option. ~
+ This ~ is ~ a ~ desperate ~ measure ~ of ~ last ~ resort. ~
+ **Breakage ~ is ~ expected.**
+}
+\hook_gput_code:nnn { begindocument/before } { . }
+{
+ \cs_if_exist:NTF \init@series@setup
+ {
+ \bool_if:NTF \g__exfs_force_bool
+ {
+ \msg_warning:nn { nfssext-cfr } { force }
+ \RequirePackage {nfssext-cfr-nfss}
+ }{
+ \bool_if:NT \g__exfs_compat_bool
+ {
+ \msg_warning:nn { nfssext-cfr } { compat }
+ }
+ \RequirePackage {nfssext-cfr-nnfss}
+ }
+ }{% achosiad heb broblemau - diolch byth!
+ \RequirePackage {nfssext-cfr-nfss}
+ }
+}
+\cs_new_protected_nopar:Nn \__exfs_set:n
+{
+ \keys_set:nn { exfs } { #1 }
+}
+\cs_set_eq:NN \nfssextset \__exfs_set:n
+\ExplSyntaxOff
\newcommand*{\DeclareTextOrnament}[7]{%
\expandafter\def\csname#1@orn\@roman#2\endcsname{#3/#4/#5/#6/#7}}
\begingroup
@@ -626,16 +173,19 @@
\selectfont\char\exfs@tempa
\endgroup
\fi}
-%:add microtype hooks
-%:partly from microtype docs; partly from MinionPro package
\def\nfssextcfr@MT@Hook{%
-% \DeclareMicrotypeVariants{x,j,w,a,d,0,1}% this is the default declaration according to the docs
-% \DeclareMicrotypeVariants*{2,e,h,l}% this should *append* the variants (what do I use 'f' for? better take it out...)
- \DeclareMicrotypeVariants*{2,2d,2dj,2j,dj,e,h,l}% is this necessary or would the previous line be enough?
- }
+ \DeclareMicrotypeVariants*{2,2d,2dj,2j,dj,e,h,l}% is this necessary or would the previous line be enough?
+}
\@ifpackageloaded{microtype}{%
- \nfssextcfr@MT@Hook}{%
+ \PackageWarning{nfssext-cfr}{%
+ You have loaded me (or a font support package which loads me)\MessageBreak
+ after loading microtype, but microtype should be loaded after\MessageBreak
+ all font defaults have been setup}%
+ \nfssextcfr@MT@Hook
+}{%
\@ifundefined{Microtype@Hook}{%
- \let\Microtype@Hook\nfssextcfr@MT@Hook}{% MinionPro has \global before this
- \g@addto@macro\Microtype@Hook{\nfssextcfr@MT@Hook}}}
+ \let\Microtype@Hook\nfssextcfr@MT@Hook}{% MinionPro has \global before this
+ \g@addto@macro\Microtype@Hook{\nfssextcfr@MT@Hook}}}
\endinput
+%%
+%% End of file `nfssext-cfr.sty'.
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
index bf4edf432b7..e182f8670d5 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty
@@ -100,8 +100,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@ocgbase@date@tl{2022/08/04}
-\def\g@ocgbase@version@tl{0.22}
+\def\g@ocgbase@date@tl{2024/09/15}
+\def\g@ocgbase@version@tl{0.24}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
@@ -167,10 +167,8 @@
%global Order list
\tl_new:N\l_ocgbase_ocgorderentry_tl
\tl_new:N\l_ocgbase_ocgorder_tl
- \tl_if_exist:cT{g_ocgbase_nd_0_chld_tl}{
- \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{
- \tl_use:c{g_ocgbase_nd_0_chld_tl}
- }
+ \seq_if_empty:NF\g_ocgbase_order_root_seq{
+ \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{root}
}
\tl_if_empty:NF\l_ocgbase_ocgorder_tl{
\pbs_pdfobj:nnn{}{array}{\l_ocgbase_ocgorder_tl}
@@ -228,98 +226,45 @@
\cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl}
-\int_new:N\g_ocgbase_nd_int %node id
-\seq_new:N\g_ocgbase_tree_nd_stack_seq %stack with open ocg node id
-\seq_new:N\g_ocgbase_tree_ocg_stack_seq %stack with open ocg obj number
-\seq_gpush:Nn\g_ocgbase_tree_nd_stack_seq{0} %push root node
-\seq_gpush:Nn\g_ocgbase_tree_ocg_stack_seq{null} %push root node
+\seq_new:N\g_ocgbase_open_ocg_seq %stack with open ocg ref
+\seq_new:N\g_ocgbase_order_root_seq %seq taking ocg ref /Order root
-%macro for starting OCG object (and nested children) insertion into Order
+%macro for starting OCG object (and nested children) insertion into order
%hierarchy (shown as tree structure in the viewers `Layers' tab
\cs_new_protected_nopar:Nn\ocgbase_tree_node_begin:n{ % #1: OCG obj
- %get the parent node from stack
- \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_prnt_tl
- \tl_if_exist:cTF{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}{
- %parent has >=1 children (i. e. my older siblings), traverse them
- \tl_set:Nv\l__ocgbase_prev_sbl_tl{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}
- \tl_set:Nx\l__ocgbase_cur_ocg_tl{#1}
- \ocgbase_traverse_siblings:NN\l__ocgbase_prev_sbl_tl\l__ocgbase_cur_ocg_tl
- \str_if_empty:NTF\l__ocgbase_cur_ocg_tl{
- %I am the first child of my parent to refer to OCG #1
- \int_gincr:N\g_ocgbase_nd_int
- \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int}
- %set myself as my next-older sibling's `next sibling'
- \tl_gset:cV{
- g_ocgbase_nd_\l__ocgbase_prev_sbl_tl _sbl_tl}\l__ocgbase_cur_nd_tl
- }{
- %there is already a sibling referring to OCG #1; no new node needs be
- %created
- \tl_set:NV\l__ocgbase_cur_nd_tl\l__ocgbase_prev_sbl_tl
- }
- }{
- %I am the very first child of my parent
- \int_gincr:N\g_ocgbase_nd_int
- \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int}
- %set myself as my parent's first child
- \tl_gset:cV{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}\l__ocgbase_cur_nd_tl
+ % get parent (either currently open ocg or root)
+ \seq_get:NNF\g_ocgbase_open_ocg_seq\l__ocgbase_prnt_tl{
+ \tl_set:Nn\l__ocgbase_prnt_tl{root}
}
- %set the OCG I am referring to
- \tl_gset:cx{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}{#1}
- %push current node and its associated OCG obj on the stacks
- \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- \seq_gpush:Nx\g_ocgbase_tree_ocg_stack_seq{#1}
-}
-
-%macro that ends insertion of OCG and sub-OCGs into Order tree
-\cs_new_protected:Nn\ocgbase_tree_node_end:{
- \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl
- \seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl
- \str_if_eq:eeT{
- \cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl}
- }{
- \l_tempb_tl
- }{
- \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\g_trash_tl
- \seq_gpop:NN\g_ocgbase_tree_ocg_stack_seq\g_trash_tl
+ %push current ocg ref on stack with open ocgs
+ \seq_gpush:Nx\g_ocgbase_open_ocg_seq{#1}
+ %create seq for current ocg if not yet existing and
+ %append ocg ref to its parent seq
+ \seq_if_exist:cF{g_ocgbase_order_#1_seq}{
+ \seq_new:c{g_ocgbase_order_#1_seq}
+ \seq_gput_right:cx{g_ocgbase_order_ \l__ocgbase_prnt_tl _seq}{#1}
}
}
-% helper macro (recursive); traverses siblings to find either
-% the node which refers to the same OCG (arg #2 remains un-modified), or
-% the last sibling inserted (arg #2 is cleared);
-% the node id of the sibling found is returned in arg #1
-\cs_new_protected:Nn\ocgbase_traverse_siblings:NN{
- % #1: current node (in/out), #2: OCG obj (in/out)
- \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
- \tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{
- \tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl}
- \ocgbase_traverse_siblings:NN#1#2
- }{
- \tl_clear:N#2
- }
- }
+%macro that ends insertion of current OCG into order tree
+\cs_new_protected:Nn\ocgbase_tree_node_end:{
+ %pop top ocg ref from stack with open ocgs
+ \seq_gpop:NN\g_ocgbase_open_ocg_seq\g_trash_tl
}
+%macro that builds global ocg order from hierarchy and saves it into tl var
\cs_new_protected_nopar:Nn\ocgbase_build_order:Nn{
% (recursive macro)
% #1: tl var to which the OCG order is written (output)
- % #2: starting node id (input; usually `1')
- \tl_set:Nx\l__ocgbase_cur_nd_tl{#2}
- % first, append the OCG obj the current node is referring to
- \tl_put_right:Nx#1{~\tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}}
- % second, traverse the tree starting with the first child node
- \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}{
- \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- \tl_put_right:Nn#1{~[}
- \ocgbase_build_order:Nn#1{
- \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}}
- \tl_put_right:Nn#1{~]}
- \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- }
- % third, traverse the tree starting with the next sibling node
- \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}{
- \ocgbase_build_order:Nn#1{
- \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}}
+ % #2: starting node (input; usually `root')
+ \seq_map_inline:cn{g_ocgbase_order_#2_seq}{
+ % first, append ocg ref to result tl var
+ \tl_put_right:Nx#1{~##1}
+ \seq_if_empty:cF{g_ocgbase_order_##1_seq}{
+ \tl_put_right:Nn#1{~[}
+ \ocgbase_build_order:Nn#1{##1}
+ \tl_put_right:Nn#1{~]}
+ }
}
}
@@ -433,7 +378,7 @@
% \ocgbase@tree@node@end
% #1: OCG PDF object
% macro pair (begin and end) for inserting OCG object and its children
-% into Order hierarchy (shown as tree structure in the viewers `Layers' tab
+% into order hierarchy (shown as tree structure in the viewers `Layers' tab
%
% --------
%
@@ -479,8 +424,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@ocgbase@date@tl{2022/08/04}
-\def\g@ocgbase@version@tl{0.22}
+\def\g@ocgbase@date@tl{2024/09/15}
+\def\g@ocgbase@version@tl{0.24}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
@@ -535,25 +480,23 @@
\AddToHook{shipout/lastpage}{
\tl_if_empty:NF\g_ocgbase_ocgs_tl{
%global OCG array
- \pbs_pdfobj:nnn{}{array}{\g_ocgbase_ocgs_tl}
- \tl_set:Nx\l_ocgbase_ocgarray_tl{\pbs_pdflastobj:}
- \tl_new:N\l_ocgbase_offocgentry_tl
+ \pdf_object_unnamed_write:ne{array}{\g_ocgbase_ocgs_tl}
+ \tl_set:Nx\l_ocgbase_ocgarray_tl{\pdf_object_ref_last:}
%global OFF list
+ \tl_new:N\l_ocgbase_offocgentry_tl
\seq_if_empty:NF\g_ocgbase_offocgs_seq{
- \pbs_pdfobj:nnn{}{array}{\seq_use:Nn\g_ocgbase_offocgs_seq{~}}
- \tl_set:Nx\l_ocgbase_offocgentry_tl{/OFF~\pbs_pdflastobj:}
+ \pdf_object_unnamed_write:ne{array}{\seq_use:Nn\g_ocgbase_offocgs_seq{~}}
+ \tl_set:Nx\l_ocgbase_offocgentry_tl{/OFF~\pdf_object_ref_last:}
}
%global Order list
\tl_new:N\l_ocgbase_ocgorderentry_tl
\tl_new:N\l_ocgbase_ocgorder_tl
- \tl_if_exist:cT{g_ocgbase_nd_0_chld_tl}{
- \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{
- \tl_use:c{g_ocgbase_nd_0_chld_tl}
- }
+ \seq_if_empty:NF\g_ocgbase_order_root_seq{
+ \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{root}
}
\tl_if_empty:NF\l_ocgbase_ocgorder_tl{
- \pbs_pdfobj:nnn{}{array}{\l_ocgbase_ocgorder_tl}
- \tl_set:Nx\l_ocgbase_ocgorderentry_tl{/Order~\pbs_pdflastobj:}
+ \pdf_object_unnamed_write:ne{array}{\l_ocgbase_ocgorder_tl}
+ \tl_set:Nx\l_ocgbase_ocgorderentry_tl{/Order~\pdf_object_ref_last:}
}
%generate RBGroups entry (radio button groups)
\tl_new:N\l_ocgbase_rbtn_groups_tl
@@ -566,16 +509,19 @@
}
\tl_new:N\l_ocgbase_rbgroupsentry_tl
\tl_if_empty:NF\l_ocgbase_rbtn_groups_tl{
- \pbs_pdfobj:nnn{}{array}{\l_ocgbase_rbtn_groups_tl}
- \tl_set:Nx\l_ocgbase_rbgroupsentry_tl{/RBGroups~\pbs_pdflastobj:}
+ \pdf_object_unnamed_write:ne{array}{\l_ocgbase_rbtn_groups_tl}
+ \tl_set:Nx\l_ocgbase_rbgroupsentry_tl{/RBGroups~\pdf_object_ref_last:}
}
\pdfmanagement_add:nnx{Catalog/OCProperties}{OCGs}{\g_ocgbase_ocgs_tl}
\pdfmanagement_add:nnx{Catalog/OCProperties}{D}{<<
- /AS~[
- <</Event/View /Category[/View] /OCGs~\l_ocgbase_ocgarray_tl>>
- <</Event/Print /Category[/Print] /OCGs~\l_ocgbase_ocgarray_tl>>
- <</Event/Export/Category[/Export]/OCGs~\l_ocgbase_ocgarray_tl>>
- ]
+ /Name~(OC~default~configuration)
+ \pdfmeta_standard_verify:nT{Catalog_OCProperties_no_AS}{ %for pdf/a compliance
+ /AS~[
+ <</Event/View /Category[/View] /OCGs~\l_ocgbase_ocgarray_tl>>
+ <</Event/Print /Category[/Print] /OCGs~\l_ocgbase_ocgarray_tl>>
+ <</Event/Export/Category[/Export]/OCGs~\l_ocgbase_ocgarray_tl>>
+ ]
+ }
/BaseState/ON~\l_ocgbase_offocgentry_tl
\l_ocgbase_ocgorderentry_tl
\l_ocgbase_rbgroupsentry_tl
@@ -586,12 +532,10 @@
}
%macro for inserting new OCG object
-\cs_generate_variant:Nn\pdf_object_new:nn{xn}
-\cs_generate_variant:Nn\pdf_object_write:nn{xx}
\int_new:N\g_ocgbase_int
\cs_new_protected_nopar:Nn\ocgbase_new_ocg:nnn{
- \pdf_object_new:xn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict}
- \pdf_object_write:xx{g_object_\int_use:N\g_ocgbase_int _pdf}{
+ \exp_args:Ne\pdf_object_new:n{g_object_\int_use:N\g_ocgbase_int _pdf}
+ \exp_args:Neee\pdf_object_write:nnn{g_object_ \int_use:N\g_ocgbase_int _pdf}{dict}{
/Type/OCG/Name~(#1)~\str_if_eq:eeF{#2}{}{/Usage<<#2>>}
}
\tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pdf_object_ref_last:}
@@ -612,98 +556,45 @@
\cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl}
-\int_new:N\g_ocgbase_nd_int %node id
-\seq_new:N\g_ocgbase_tree_nd_stack_seq %stack with open ocg node id
-\seq_new:N\g_ocgbase_tree_ocg_stack_seq %stack with open ocg obj number
-\seq_gpush:Nn\g_ocgbase_tree_nd_stack_seq{0} %push root node
-\seq_gpush:Nn\g_ocgbase_tree_ocg_stack_seq{null} %push root node
+\seq_new:N\g_ocgbase_open_ocg_seq %stack with open ocg ref
+\seq_new:N\g_ocgbase_order_root_seq %seq taking ocg ref /Order root
-%macro for starting OCG object (and nested children) insertion into Order
+%macro for starting OCG object (and nested children) insertion into order
%hierarchy (shown as tree structure in the viewers `Layers' tab
\cs_new_protected_nopar:Nn\ocgbase_tree_node_begin:n{ % #1: OCG obj
- %get the parent node from stack
- \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_prnt_tl
- \tl_if_exist:cTF{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}{
- %parent has >=1 children (i. e. my older siblings), traverse them
- \tl_set:Nv\l__ocgbase_prev_sbl_tl{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}
- \tl_set:Nx\l__ocgbase_cur_ocg_tl{#1}
- \ocgbase_traverse_siblings:NN\l__ocgbase_prev_sbl_tl\l__ocgbase_cur_ocg_tl
- \str_if_empty:NTF\l__ocgbase_cur_ocg_tl{
- %I am the first child of my parent to refer to OCG #1
- \int_gincr:N\g_ocgbase_nd_int
- \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int}
- %set myself as my next-older sibling's `next sibling'
- \tl_gset:cV{
- g_ocgbase_nd_\l__ocgbase_prev_sbl_tl _sbl_tl}\l__ocgbase_cur_nd_tl
- }{
- %there is already a sibling referring to OCG #1; no new node needs be
- %created
- \tl_set:NV\l__ocgbase_cur_nd_tl\l__ocgbase_prev_sbl_tl
- }
- }{
- %I am the very first child of my parent
- \int_gincr:N\g_ocgbase_nd_int
- \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int}
- %set myself as my parent's first child
- \tl_gset:cV{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}\l__ocgbase_cur_nd_tl
+ % get parent (either currently open ocg or root)
+ \seq_get:NNF\g_ocgbase_open_ocg_seq\l__ocgbase_prnt_tl{
+ \tl_set:Nn\l__ocgbase_prnt_tl{root}
}
- %set the OCG I am referring to
- \tl_gset:cx{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}{#1}
- %push current node and its associated OCG obj on the stacks
- \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- \seq_gpush:Nx\g_ocgbase_tree_ocg_stack_seq{#1}
-}
-
-%macro that ends insertion of OCG and sub-OCGs into Order tree
-\cs_new_protected:Nn\ocgbase_tree_node_end:{
- \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl
- \seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl
- \str_if_eq:eeT{
- \cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl}
- }{
- \l_tempb_tl
- }{
- \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\g_trash_tl
- \seq_gpop:NN\g_ocgbase_tree_ocg_stack_seq\g_trash_tl
+ %push current ocg ref on stack with open ocgs
+ \seq_gpush:Nx\g_ocgbase_open_ocg_seq{#1}
+ %create seq for current ocg if not yet existing and
+ %append ocg ref to its parent seq
+ \seq_if_exist:cF{g_ocgbase_order_#1_seq}{
+ \seq_new:c{g_ocgbase_order_#1_seq}
+ \seq_gput_right:cx{g_ocgbase_order_ \l__ocgbase_prnt_tl _seq}{#1}
}
}
-% helper macro (recursive); traverses siblings to find either
-% the node which refers to the same OCG (arg #2 remains un-modified), or
-% the last sibling inserted (arg #2 is cleared);
-% the node id of the sibling found is returned in arg #1
-\cs_new_protected:Nn\ocgbase_traverse_siblings:NN{
- % #1: current node (in/out), #2: OCG obj (in/out)
- \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
- \tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{
- \tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl}
- \ocgbase_traverse_siblings:NN#1#2
- }{
- \tl_clear:N#2
- }
- }
+%macro that ends insertion of current OCG into order tree
+\cs_new_protected:Nn\ocgbase_tree_node_end:{
+ %pop top ocg ref from stack with open ocgs
+ \seq_gpop:NN\g_ocgbase_open_ocg_seq\g_trash_tl
}
+%macro that builds global ocg order from hierarchy and saves it into tl var
\cs_new_protected_nopar:Nn\ocgbase_build_order:Nn{
% (recursive macro)
% #1: tl var to which the OCG order is written (output)
- % #2: starting node id (input; usually `1')
- \tl_set:Nx\l__ocgbase_cur_nd_tl{#2}
- % first, append the OCG obj the current node is referring to
- \tl_put_right:Nx#1{~\tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}}
- % second, traverse the tree starting with the first child node
- \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}{
- \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- \tl_put_right:Nn#1{~[}
- \ocgbase_build_order:Nn#1{
- \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}}
- \tl_put_right:Nn#1{~]}
- \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl
- }
- % third, traverse the tree starting with the next sibling node
- \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}{
- \ocgbase_build_order:Nn#1{
- \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}}
+ % #2: starting node (input; usually `root')
+ \seq_map_inline:cn{g_ocgbase_order_#2_seq}{
+ % first, append ocg ref to result tl var
+ \tl_put_right:Nx#1{~##1}
+ \seq_if_empty:cF{g_ocgbase_order_##1_seq}{
+ \tl_put_right:Nn#1{~[}
+ \ocgbase_build_order:Nn#1{##1}
+ \tl_put_right:Nn#1{~]}
+ }
}
}
@@ -740,7 +631,7 @@
% OC-marked content
\cs_new_protected_nopar:Nn\ocgbase_oc_bdc:n{\pbs_pdfbdc:nn{OC}{#1}}
-\cs_new_protected_nopar:Nn\ocgbase_oc_emc:{\pbs_pdfemc:}
+\cs_new_eq:NN\ocgbase_oc_emc:\pbs_pdfemc:
%stack of PDF obj references of currently open OCGs
\seq_new:N\g_ocgbase_open_stack_seq
diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
index a1081f88ac5..84d14323952 100644
--- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
+++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty
@@ -43,11 +43,11 @@
%
% The Current Maintainer of this work is A. Grahn.
- \def\g@ocgxii@date@tl{2024/03/18}
- \def\g@ocgxii@version@tl{0.57}
+ \def\g@ocgxii@date@tl{2024/09/16}
+ \def\g@ocgxii@version@tl{0.60}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
- {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
+ {ports~`ocgx'~functionality~to~dvips+ps2pdf,~xelatex~and~dvipdfmx}
%creating global definitions
\cs_new_protected:Npn\ocgxii@newkey#1#2{\tl_gset:cx{#1}{#2}}
@@ -1579,8 +1579,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\def\g@ocgxii@date@tl{2024/03/18}
-\def\g@ocgxii@version@tl{0.57}
+\def\g@ocgxii@date@tl{2024/09/16}
+\def\g@ocgxii@version@tl{0.60}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -1810,8 +1810,8 @@
\cs_set_eq:NN\And \ocgxii_protected_dummy_cs:n
\cs_set_eq:NN\Or \ocgxii_protected_dummy_cs:n
\ocgxii_ocmd_read_visbility:xN{#2}\l_ocgxii_ocmd_visibility_tl
- \pdf_object_new:xn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict}
- \pdf_object_write:xx{g_object_\int_use:N\g_ocgbase_int _pdf}{
+ \exp_args:Ne\pdf_object_new:n{g_object_\int_use:N\g_ocgbase_int _pdf}
+ \exp_args:Neee\pdf_object_write:nnn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict}{
/Type/OCMD\l_ocgxii_ocmd_visibility_tl
}
\tl_gset:cx{g_pbs_objname_\pdf_object_ref_last: _tl}{
@@ -2385,104 +2385,132 @@
%
\bool_if:nTF{\l_ocgxii_nobreak_bool || \l_ocgxii_mouse_triggers_bool}{
\hbox_set:Nn\l_tmpa_box{#6}
- \bool_if:NTF\l_ocgxii_mouse_triggers_bool{
- % e,d,x mouse triggers require (non-breakable) /Widget annot
- \pdfannot_dict_put:nnn{link/GoTo}{Subtype}{/Widget}
- \pdfannot_dict_remove:nn{link/GoTo}{Border}
- }{
- \pdfannot_dict_put:nnn{link/GoTo}{Border}{[0~0~0]}
- }
- \pdfannot_dict_remove:nn{link/GoTo}{C}
- \pbs_pdfannot:nnnn{
- \dim_use:N\box_wd:N\l_tmpa_box}{
- \dim_use:N\box_ht:N\l_tmpa_box}{
- \dim_use:N\box_dp:N\l_tmpa_box
- }{
- \pdfannot_dict_use:n{link/GoTo}
+ % suppress annots with SetOCGState Action Subtype for pdf/a compliance
+ \pdfmeta_standard_verify:nT{annot_action_A}{
\bool_if:NTF\l_ocgxii_mouse_triggers_bool{
- /Ff~65536/FT/Btn/BS<</W~0>>
- /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
- %treat mouse-up as mouse-click --> handle through /A dictionary
- \str_if_eq:eeF{}{
- \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
- }{
- /A <</S/SetOCGState/State [
- \str_if_eq:VnF\l_ocgxii_toswitch_u_tl{}{
- /Toggle~\l_ocgxii_toswitch_u_tl
- }
- \str_if_eq:VnF\l_ocgxii_toshow_u_tl{}{
- /ON~\l_ocgxii_toshow_u_tl
- }
- \str_if_eq:VnF\l_ocgxii_tohide_u_tl{}{
- /OFF~\l_ocgxii_tohide_u_tl
- }
- ]>>
- }
- % other mouse triggers need add. actions dict
- /AA <<
- %\str_if_eq:eeF{}{ % mouse-up
- % \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
- %}{
- % /U <</S/SetOCGState/State [
- % \str_if_eq:VnF\l_ocgxii_toswitch_u_tl{}{
- % /Toggle~\l_ocgxii_toswitch_u_tl
- % }
- % \str_if_eq:VnF\l_ocgxii_toshow_u_tl{}{
- % /ON~\l_ocgxii_toshow_u_tl
- % }
- % \str_if_eq:VnF\l_ocgxii_tohide_u_tl{}{
- % /OFF~\l_ocgxii_tohide_u_tl
- % }
- % ]>>
- %}
- \str_if_eq:eeF{}{ % mouse-down
- \l_ocgxii_toswitch_d_tl\l_ocgxii_toshow_d_tl\l_ocgxii_tohide_d_tl
- }{
- /D <</S/SetOCGState/State [
- \str_if_eq:VnF\l_ocgxii_toswitch_d_tl{}{
- /Toggle~\l_ocgxii_toswitch_d_tl
- }
- \str_if_eq:VnF\l_ocgxii_toshow_d_tl{}{
- /ON~\l_ocgxii_toshow_d_tl
- }
- \str_if_eq:VnF\l_ocgxii_tohide_d_tl{}{
- /OFF~\l_ocgxii_tohide_d_tl
- }
- ]>>
- }
- \str_if_eq:eeF{}{ % mouse-enter
- \l_ocgxii_toswitch_e_tl\l_ocgxii_toshow_e_tl\l_ocgxii_tohide_e_tl
- }{
- /E <</S/SetOCGState/State [
- \str_if_eq:VnF\l_ocgxii_toswitch_e_tl{}{
- /Toggle~\l_ocgxii_toswitch_e_tl
- }
- \str_if_eq:VnF\l_ocgxii_toshow_e_tl{}{
- /ON~\l_ocgxii_toshow_e_tl
- }
- \str_if_eq:VnF\l_ocgxii_tohide_e_tl{}{
- /OFF~\l_ocgxii_tohide_e_tl
- }
- ]>>
- }
- \str_if_eq:eeF{}{ % mouse-exit
- \l_ocgxii_toswitch_x_tl\l_ocgxii_toshow_x_tl\l_ocgxii_tohide_x_tl
+ % e,d,x mouse triggers require (non-breakable) /Widget annot
+ \pdfannot_dict_put:nnn{link/GoTo}{Subtype}{/Widget}
+ \pdfannot_dict_remove:nn{link/GoTo}{Border}
+ }{
+ \pdfannot_dict_put:nnn{link/GoTo}{Border}{[0~0~0]}
+ }
+ \pdfannot_dict_remove:nn{link/GoTo}{C}
+ \pbs_pdfannot:nnnn{
+ \dim_use:N\box_wd:N\l_tmpa_box}{
+ \dim_use:N\box_ht:N\l_tmpa_box}{
+ \dim_use:N\box_dp:N\l_tmpa_box
+ }{
+ \pdfannot_dict_use:n{link/GoTo}
+ \bool_if:NTF\l_ocgxii_mouse_triggers_bool{
+ /Ff~65536/FT/Btn/BS<</W~0>>
+ /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
+ %treat mouse-up as mouse-click --> handle through /A dictionary
+ \str_if_eq:eeF{}{
+ \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
}{
- /X <</S/SetOCGState/State [
- \str_if_eq:VnF\l_ocgxii_toswitch_x_tl{}{
- /Toggle~\l_ocgxii_toswitch_x_tl
+ /A <</S/SetOCGState/State [
+ \str_if_eq:VnF\l_ocgxii_toswitch_u_tl{}{
+ /Toggle~\l_ocgxii_toswitch_u_tl
}
- \str_if_eq:VnF\l_ocgxii_toshow_x_tl{}{
- /ON~\l_ocgxii_toshow_x_tl
+ \str_if_eq:VnF\l_ocgxii_toshow_u_tl{}{
+ /ON~\l_ocgxii_toshow_u_tl
}
- \str_if_eq:VnF\l_ocgxii_tohide_x_tl{}{
- /OFF~\l_ocgxii_tohide_x_tl
+ \str_if_eq:VnF\l_ocgxii_tohide_u_tl{}{
+ /OFF~\l_ocgxii_tohide_u_tl
}
]>>
}
- >>
- }{
- %mouse-up alone
+ % other mouse triggers need add. actions dict
+ /AA <<
+ %\str_if_eq:eeF{}{ % mouse-up
+ % \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
+ %}{
+ % /U <</S/SetOCGState/State [
+ % \str_if_eq:VnF\l_ocgxii_toswitch_u_tl{}{
+ % /Toggle~\l_ocgxii_toswitch_u_tl
+ % }
+ % \str_if_eq:VnF\l_ocgxii_toshow_u_tl{}{
+ % /ON~\l_ocgxii_toshow_u_tl
+ % }
+ % \str_if_eq:VnF\l_ocgxii_tohide_u_tl{}{
+ % /OFF~\l_ocgxii_tohide_u_tl
+ % }
+ % ]>>
+ %}
+ \str_if_eq:eeF{}{ % mouse-down
+ \l_ocgxii_toswitch_d_tl\l_ocgxii_toshow_d_tl\l_ocgxii_tohide_d_tl
+ }{
+ /D <</S/SetOCGState/State [
+ \str_if_eq:VnF\l_ocgxii_toswitch_d_tl{}{
+ /Toggle~\l_ocgxii_toswitch_d_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_toshow_d_tl{}{
+ /ON~\l_ocgxii_toshow_d_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_tohide_d_tl{}{
+ /OFF~\l_ocgxii_tohide_d_tl
+ }
+ ]>>
+ }
+ \str_if_eq:eeF{}{ % mouse-enter
+ \l_ocgxii_toswitch_e_tl\l_ocgxii_toshow_e_tl\l_ocgxii_tohide_e_tl
+ }{
+ /E <</S/SetOCGState/State [
+ \str_if_eq:VnF\l_ocgxii_toswitch_e_tl{}{
+ /Toggle~\l_ocgxii_toswitch_e_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_toshow_e_tl{}{
+ /ON~\l_ocgxii_toshow_e_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_tohide_e_tl{}{
+ /OFF~\l_ocgxii_tohide_e_tl
+ }
+ ]>>
+ }
+ \str_if_eq:eeF{}{ % mouse-exit
+ \l_ocgxii_toswitch_x_tl\l_ocgxii_toshow_x_tl\l_ocgxii_tohide_x_tl
+ }{
+ /X <</S/SetOCGState/State [
+ \str_if_eq:VnF\l_ocgxii_toswitch_x_tl{}{
+ /Toggle~\l_ocgxii_toswitch_x_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_toshow_x_tl{}{
+ /ON~\l_ocgxii_toshow_x_tl
+ }
+ \str_if_eq:VnF\l_ocgxii_tohide_x_tl{}{
+ /OFF~\l_ocgxii_tohide_x_tl
+ }
+ ]>>
+ }
+ >>
+ }{
+ %mouse-up alone
+ /A <</S/SetOCGState
+ /State [
+ \str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{
+ /Toggle~\l_ocgxii_toswitch_u_tl}~
+ \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_u_tl}~
+ \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl}
+ ]
+ >>
+ }
+ }
+ \bool_if:NT\l_ocgxii_mouse_triggers_bool{
+ \pbs_appendtofields:n{\pbs_pdflastann:}
+ \int_gincr:N\g_ocgxii_widcount_int
+ }
+ }
+ \box_use_drop:N\l_tmpa_box
+ }{
+ % suppress annots with SetOCGState Action Subtype for pdf/a compliance
+ \pdfmeta_standard_verify:nTF{annot_action_A}{
+ \bool_if:NF\g_ocgxii_hyperref_loaded_bool{
+ \pdfannot_dict_put:nnn{link/GoTo}{Border}{[0~0~0]}
+ }
+ %line-breakable annotation
+ \pbs_pdflink:nn{
+ %look and feel of hyperref internal links
+ \pdfannot_dict_use:n{link/GoTo}
/A <</S/SetOCGState
/State [
\str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{
@@ -2491,33 +2519,12 @@
\str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl}
]
>>
+ }{
+ \hook_use:n{pdfannot/link/GoTo/begin}
+ #6
+ \hook_use:n{pdfannot/link/GoTo/end}
}
- }\box_use_drop:N\l_tmpa_box
- \bool_if:NT\l_ocgxii_mouse_triggers_bool{
- \pbs_appendtofields:n{\pbs_pdflastann:}
- \int_gincr:N\g_ocgxii_widcount_int
- }
- }{
- \bool_if:NF\g_ocgxii_hyperref_loaded_bool{
- \pdfannot_dict_put:nnn{link/GoTo}{Border}{[0~0~0]}
- }
- %line-breakable annotation
- \pbs_pdflink:nn{
- %look and feel of hyperref internal links
- \pdfannot_dict_use:n{link/GoTo}
- /A <</S/SetOCGState
- /State [
- \str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{
- /Toggle~\l_ocgxii_toswitch_u_tl}~
- \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_u_tl}~
- \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl}
- ]
- >>
- }{
- \hook_use:n{pdfannot/link/GoTo/begin}
- #6
- \hook_use:n{pdfannot/link/GoTo/end}
- }
+ }{#6}
}
\group_end:
}
diff --git a/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty b/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty
index bb79723d21a..5f6cd304105 100644
--- a/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty
+++ b/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty
@@ -2,7 +2,8 @@
% licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{OutilsGeomTikz}[2023/12/13 v0.1.5 Outils geometriques en TikZ]
+\ProvidesPackage{OutilsGeomTikz}[2024/08/29 v0.1.6 Outils geometriques en TikZ]
+% 0.1.6 Correction de bugs avec pdflatex + amélioration de la gestion des rotations/échelles des labels (tks Cyril I. ^^)
% 0.1.5 Modification de la graduation intérieure pour les rapporteurs 180°
% 0.1.4 Possibilité de positionner les outils avec deux points (angle calculé automatiquement)
% 0.1.3 Ajout du pourcenteur
@@ -60,7 +61,8 @@
Origine=\xdef\REGLposOrigin{#1},%
Rotation=\def\REGLangle{#1},%
Opacite=\def\REGLopac{#1},%
- PosVal=\def\REGLposval{#1}
+ PosVal=\def\REGLposval{#1},%
+ EchelleValeurs=\def\REGLechlabel{#1}
}
\setKVdefault[RegleGeom]{%
@@ -74,7 +76,8 @@
AfficheValeurs=true,%
Fond=false,%
Opacite=0.5,%
- PosVal=m
+ PosVal=m,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzRegle}{ O{} }{%
@@ -88,7 +91,7 @@
}{}%
\xdef\REGLlongueur{\fpeval{max(3,\REGLlongueur)}}%valeurs mini
\xdef\REGLlargeur{\fpeval{max(1.5,\REGLlargeur)}}
- \begin{scope}[shift={(\REGLposOrigin)},rotate=\REGLangle,scale=\REGLechelle]
+ \begin{scope}[shift={(\REGLposOrigin)},rotate=\REGLangle,scale=\REGLechelle,transform shape]
\ifboolKV[RegleGeom]{Fond}
{%
\begin{scope}
@@ -104,13 +107,13 @@
\ifboolKV[RegleGeom]{AfficheValeurs}%
{%
\IfSubStr{\REGLposval}{h}
- {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small,below] {$\i$} ;}
+ {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small,below] {$\i$} ;}}
{}
\IfSubStr{\REGLposval}{m}
- {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-0.5*\REGLlargeur}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small] {$\i$} ;}
+ {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-0.5*\REGLlargeur}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small] {$\i$} ;}}
{}
\IfSubStr{\REGLposval}{b}
- {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-\REGLlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(\REGLlongueur)-\i}$}} ;}
+ {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-\REGLlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(\REGLlongueur)-\i}$}} ;}}
{}
}%
{}%
@@ -126,7 +129,8 @@
CouleurFond=\def\REGLREPcouleurfond{#1},%
Origine=\def\REGLREPposOrigin{#1},%
Rotation=\def\REGLREPangle{#1},%
- Opacite=\def\REGLREPopac{#1}
+ Opacite=\def\REGLREPopac{#1},%
+ EchelleValeurs=\def\REGLREPechlabel{#1}
}
\setKVdefault[RegleRepereGeom]{%
@@ -140,7 +144,8 @@
AfficheValeurs=true,%
Fond=false,%
Opacite=0.5,%
- Retourne=false
+ Retourne=false,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzRegleRepere}{ O{} }{%
@@ -154,7 +159,7 @@
\pgfmathanglebetweenpoints{\pgfpointanchor{\REGLREPposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}%
\edef\REGLREPangle{\pgfmathresult}%
}{}%
- \begin{scope}[shift={(\REGLREPposOrigin)},rotate=\REGLREPangle,scale=\REGLREPechelle]
+ \begin{scope}[shift={(\REGLREPposOrigin)},rotate=\REGLREPangle,scale=\REGLREPechelle,transform shape]
%bases de la règle-repère
\ifboolKV[RegleRepereGeom]{Fond}%
{\draw[draw=none,fill=\REGLREPcouleurfond!10!white,fill opacity=\REGLREPopac,rounded corners] (-0.5,0) rectangle++ ({\REGLREPlongueur+1},{-\REGLREPlargeur}) ;}%
@@ -175,12 +180,12 @@
{%
\ifboolKV[RegleRepereGeom]{Retourne}%
{%
- {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,below] {$\fpeval{-trunc(0.5*\REGLREPlongueur)+\i}$} ;}
- {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,above] {\rotatebox{180}{$\inteval{\REGLREPlongueur-\i}$}} ;}
+ {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,below] {$\fpeval{-trunc(0.5*\REGLREPlongueur)+\i}$} ;}}
+ {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,above] {\rotatebox{180}{$\inteval{\REGLREPlongueur-\i}$}} ;}}
}%
{%
- {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,below] {$\i$} ;}
- {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(0.5*\REGLREPlongueur)-\i}$}} ;}
+ {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,below] {$\i$} ;}}
+ {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(0.5*\REGLREPlongueur)-\i}$}} ;}}
}%
}
{}%
@@ -196,7 +201,8 @@
CouleurFond=\def\REQcouleurfond{#1},%
Origine=\def\REQposOrigin{#1},%
Rotation=\def\REQangle{#1},%
- Opacite=\def\REQopac{#1}
+ Opacite=\def\REQopac{#1},%
+ EchelleValeurs=\def\REQechlabel{#1}
}
\setKVdefault[RequerreGeom]{%
@@ -209,7 +215,8 @@
Rotation=0,%
AfficheValeurs=true,%
Fond=false,%
- Opacite=0.5
+ Opacite=0.5,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzRequerre}{ O{} }{%
@@ -223,7 +230,7 @@
\pgfmathanglebetweenpoints{\pgfpointanchor{\REQposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}%
\edef\REQangle{\pgfmathresult}%
}{}%
- \begin{scope}[shift={(\REQposOrigin)},rotate=\REQangle,scale=\REQechelle]
+ \begin{scope}[shift={(\REQposOrigin)},rotate=\REQangle,scale=\REQechelle,transform shape]
\ifboolKV[RequerreGeom]{Fond}
{
\fill[draw=none,rounded corners,fill=\REQcouleurfond!10!white,fill opacity=\REQopac] ({-\REQlongueur*0.5},0) rectangle ({\REQlongueur*0.5},{-\REQlargeur}) ;
@@ -243,10 +250,10 @@
\end{scope}
\ifboolKV[RequerreGeom]{AfficheValeurs}%
{%
- \draw[\REQcouleur] (0,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$0$} ;
+ \draw[\REQcouleur] (0,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$0$} ;
\foreach \i in {1,2,...,\fpeval{0.5*\REQlongueur-0.5}}{%
- \draw[\REQcouleur] (\i,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$\i$} ;
- \draw[\REQcouleur] (-\i,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$-\i$} ;}
+ \draw[\REQcouleur] (\i,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$\i$} ;
+ \draw[\REQcouleur] (-\i,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$-\i$} ;}
}%
{}%
\end{scope}
@@ -260,7 +267,8 @@
CouleurFond=\def\EQcouleurfond{#1},%
Origine=\def\EQposOrigin{#1},%
Rotation=\def\EQangle{#1},%
- Opacite=\def\EQopac{#1}
+ Opacite=\def\EQopac{#1},%
+ EchelleValeurs=\def\EQechlabel{#1}
}
\setKVdefault[EquerreGeom]{%
@@ -273,7 +281,8 @@
AfficheValeurs=true,%
Fond=false,%
Opacite=0.5,%
- PetitCote=false
+ PetitCote=false,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzEquerre}{ O{} }{%
@@ -293,7 +302,7 @@
\edef\EQangle{\fpeval{\pgfmathresult-90}}%
}%
}{}%
- \begin{scope}[shift={(\EQposOrigin)},rotate=\EQangle,scale=\EQechelle]
+ \begin{scope}[shift={(\EQposOrigin)},rotate=\EQangle,scale=\EQechelle,transform shape]
\ifboolKV[EquerreGeom]{Fond}
{%
\begin{scope} %diff extérieur-intérieur
@@ -318,10 +327,12 @@
\foreach \y in {0,1,...,\fpeval{0.925*\EQlongueur}} {\draw[\EQcouleur] (0,\y)--(0.4,\y) ;}
\ifboolKV[EquerreGeom]{AfficheValeurs}%
{%
- \foreach \i in {1,2,...,\fpeval{0.9*\EQlongueur-1}}
- \draw[\EQcouleur] (0.4,\i) node[inner sep=1pt,outer sep=1pt,rotate=\EQangle,scale={0.8*\EQechelle},font=\small,right] {\rotatebox{90}{$\i$}} ;
- \foreach \i in {1,2,...,\fpeval{0.9*\EQlargeur-0.5}}
- \draw[\EQcouleur] (\i,0.4) node[inner sep=1pt,outer sep=1pt,rotate=\EQangle,scale={0.8*\EQechelle},font=\small,above] {\rotatebox{180}{$\i$}} ;
+ \foreach \i in {1,2,...,\fpeval{0.9*\EQlongueur-1}}{%
+ \draw[\EQcouleur] (0.4,\i) node[inner sep=1pt,outer sep=1pt,scale={\EQechlabel},font=\small,right] {\rotatebox{90}{$\i$}} ;
+ }%
+ \foreach \i in {1,2,...,\fpeval{0.9*\EQlargeur-0.5}}{%
+ \draw[\EQcouleur] (\i,0.4) node[inner sep=1pt,outer sep=1pt,scale={\EQechlabel},font=\small,above] {\rotatebox{180}{$\i$}} ;
+ }%
}%
{}%
\end{scope}
@@ -336,7 +347,8 @@
CouleurFond=\def\RAPPcouleurfond{#1},%
Origine=\def\RAPPposOrigin{#1},%
Rotation=\def\RAPPangle{#1},%
- Opacite=\def\RAPPopac{#1}
+ Opacite=\def\RAPPopac{#1},%
+ EchelleValeurs=\def\RAPPechlabel{#1}
}
\setKVdefault[RapporteurGeom]{%
@@ -350,13 +362,14 @@
Fond=false,%
Opacite=0.5,%
Complet=false,%
- GraduationsInt=false
+ GraduationsInt=false,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzRapporteur}{ O{} }{%
\useKVdefault[RapporteurGeom]%
\setKV[RapporteurGeom]{#1}%
- \begin{scope}[shift={(\RAPPposOrigin)},rotate=\RAPPangle,scale=\RAPPechelle,every node/.style={rotate=\RAPPangle}]
+ \begin{scope}[shift={(\RAPPposOrigin)},rotate=\RAPPangle,scale=\RAPPechelle,transform shape]
\ifboolKV[RapporteurGeom]{Complet}
{
%fond
@@ -382,27 +395,27 @@
%valeurs si booléen
\ifboolKV[RapporteurGeom]{AfficheAngles}
{%
- \draw[\RAPPcouleur] (0:2.75) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$0$} ;
- \draw[\RAPPcouleur] (180:3.25) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\pm 180$} ;
- \draw[\RAPPcouleur] (180:2.75) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\pm \pi$} ;
+ \draw[\RAPPcouleur] (0:2.75) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$0$} ;
+ \draw[\RAPPcouleur] (180:3.25) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\pm 180$} ;
+ \draw[\RAPPcouleur] (180:2.75) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\pm \pi$} ;
\foreach \i in {0,10,...,170}
- {\draw[\RAPPcouleur] (\i:3.25) node[rotate={\i-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\i$} ;}
- \draw[\RAPPcouleur] (30:2.75) node[rotate={30-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{6}$} ;
- \draw[\RAPPcouleur] (45:2.75) node[rotate={45-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{4}$} ;
- \draw[\RAPPcouleur] (60:2.75) node[rotate={60-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{3}$} ;
- \draw[\RAPPcouleur] (90:2.75) node[rotate={90-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{2}$} ;
- \draw[\RAPPcouleur] (120:2.75) node[rotate={120-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{2\pi}{3}$} ;
- \draw[\RAPPcouleur] (135:2.75) node[rotate={135-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{3\pi}{4}$} ;
- \draw[\RAPPcouleur] (150:2.75) node[rotate={150-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{5\pi}{6}$} ;
+ {\draw[\RAPPcouleur] (\i:3.25) node[rotate={\i-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\i$} ;}
+ \draw[\RAPPcouleur] (30:2.75) node[rotate={30-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{6}$} ;
+ \draw[\RAPPcouleur] (45:2.75) node[rotate={45-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{4}$} ;
+ \draw[\RAPPcouleur] (60:2.75) node[rotate={60-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{3}$} ;
+ \draw[\RAPPcouleur] (90:2.75) node[rotate={90-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{2}$} ;
+ \draw[\RAPPcouleur] (120:2.75) node[rotate={120-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{2\pi}{3}$} ;
+ \draw[\RAPPcouleur] (135:2.75) node[rotate={135-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{3\pi}{4}$} ;
+ \draw[\RAPPcouleur] (150:2.75) node[rotate={150-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{5\pi}{6}$} ;
\foreach \i in {10,20,...,170}
- {\draw[\RAPPcouleur] ({-\i}:3.25) node[rotate={270-\i},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$-\i$} ;}
- \draw[\RAPPcouleur] (-30:2.75) node[rotate={270-30},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{6}$} ;
- \draw[\RAPPcouleur] (-45:2.75) node[rotate={270-45},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{4}$} ;
- \draw[\RAPPcouleur] (-60:2.75) node[rotate={270-60},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{3}$} ;
- \draw[\RAPPcouleur] (-90:2.75) node[rotate={270-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{2}$} ;
- \draw[\RAPPcouleur] (-120:2.75) node[rotate={270-120},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-2\pi}{3}$} ;
- \draw[\RAPPcouleur] (-135:2.75) node[rotate={270-135},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-3\pi}{4}$} ;
- \draw[\RAPPcouleur] (-150:2.75) node[rotate={270-150},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-5\pi}{6}$} ;
+ {\draw[\RAPPcouleur] ({-\i}:3.25) node[rotate={270-\i},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$-\i$} ;}
+ \draw[\RAPPcouleur] (-30:2.75) node[rotate={270-30},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{6}$} ;
+ \draw[\RAPPcouleur] (-45:2.75) node[rotate={270-45},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{4}$} ;
+ \draw[\RAPPcouleur] (-60:2.75) node[rotate={270-60},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{3}$} ;
+ \draw[\RAPPcouleur] (-90:2.75) node[rotate={270-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{2}$} ;
+ \draw[\RAPPcouleur] (-120:2.75) node[rotate={270-120},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-2\pi}{3}$} ;
+ \draw[\RAPPcouleur] (-135:2.75) node[rotate={270-135},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-3\pi}{4}$} ;
+ \draw[\RAPPcouleur] (-150:2.75) node[rotate={270-150},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-5\pi}{6}$} ;
}{}
}
{
@@ -440,9 +453,9 @@
\ifboolKV[RapporteurGeom]{AfficheAngles}
{%
\foreach \i in {0,10,...,180}
- {\draw[\RAPPcouleur] (\i:3.2) node[rotate={\i-90},scale=\fpeval{\RAPPechelle*\RAPPechangle},font=\tiny] {\i} ;}
+ {\draw[\RAPPcouleur] (\i:3.2) node[rotate={\i-90},scale=\fpeval{\RAPPechangle},font=\tiny] {\i} ;}
\foreach \i in {0,10,...,180}
- {\draw[\RAPPcouleur] (\i:2.7) node[rotate={\i-90},scale=\fpeval{\RAPPechelle*\RAPPechangle},font=\tiny] {\inteval{180-\i}} ;}
+ {\draw[\RAPPcouleur] (\i:2.7) node[rotate={\i-90},scale=\fpeval{\RAPPechangle},font=\tiny] {\inteval{180-\i}} ;}
}{}
}
\end{scope}
@@ -455,7 +468,8 @@
CouleurFond=\def\POURCcouleurfond{#1},%
Origine=\def\POURCposOrigin{#1},%
Rotation=\def\POURCangle{#1},%
- Opacite=\def\POURCopac{#1}
+ Opacite=\def\POURCopac{#1},%
+ EchelleValeurs=\def\POURCechlabel{#1}
}
\setKVdefault[Pourcenteur]{%
@@ -468,13 +482,14 @@
AfficheValeurs=true,%
Fond=false,%
Opacite=0.5,%
- Decoration=true
+ Decoration=true,%
+ EchelleValeurs=0.8
}
\NewDocumentCommand{\tkzPourcenteur}{ O{} }{%
\useKVdefault[Pourcenteur]%
\setKV[Pourcenteur]{#1}%
- \begin{scope}[shift={(\POURCposOrigin)},rotate=\POURCangle,scale=\POURCechelle,every node/.style={rotate=\POURCangle}]
+ \begin{scope}[shift={(\POURCposOrigin)},rotate=\POURCangle,scale=\POURCechelle,transform shape]
\ifboolKV[Pourcenteur]{Fond}
{%
\fill[draw=none,fill=\POURCcouleurfond!10!white,fill opacity=\POURCopac] (0,0) circle[radius=3] ;
@@ -483,7 +498,7 @@
\draw[\POURCcouleur,semithick] (0,0) circle[radius=3] ;
\draw[\POURCcouleur,semithick] ({-0.15*3},0)--({0.15*3},0) (0,{-0.15*3})--(0,{0.15*3}) ;
\foreach \pct in {0,1,...,199}
- {\draw[\POURCcouleur,thin] ({0.5*\pct*3.6}:{3})--({0.5*\pct*3.6}:{3-0.2}) ;}
+ {\draw[\POURCcouleur,thin] ({0.5*\pct*3.6}:{3})--({0.5*\pct*3.6}:{3-0.2}) ;}
\foreach \pct in {0,10,...,90}{%
\draw[\POURCcouleur,thin] ({(\pct+1)*3.6}:{3})--({(\pct+1)*3.6}:{3-0.35}) ;
\filldraw[\POURCcouleur] ({(\pct+1)*3.6}:{3-0.35}) circle[fill=\POURCcouleur,radius=0.75pt] ;
@@ -505,14 +520,14 @@
\foreach \pct in {5,10,15,20,30,35,40,45,55,60,65,70,80,85,90,95}{%
\draw[\POURCcouleur,semithick] ({\pct*3.6}:{3})--({\pct*3.6}:{3-0.5}) ;
\ifboolKV[Pourcenteur]{AfficheValeurs}
- {\draw ({-\pct*3.6+90}:{3-0.6}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\tiny] {\pct\,\%} ;}{}
+ {\draw ({-\pct*3.6+90}:{3-0.6}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\tiny] {\pct\,\%} ;}{}
}
\foreach \pct in {0,25,50,75}{%
\draw[\POURCcouleur,semithick] ({\pct*3.6}:{3})--({\pct*3.6}:{3-0.5}) ;
\ifboolKV[Pourcenteur]{AfficheValeurs}
{%
- \draw ({-\pct*3.6+90}:{3-0.61}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\scriptsize\bfseries] {\pct\,\%} ;
- \draw ({-\pct*3.6+90}:{2+0.15}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\tiny\bfseries] {\pct\,\%} ;
+ \draw ({-\pct*3.6+90}:{3-0.61}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\scriptsize\bfseries] {\pct\,\%} ;
+ \draw ({-\pct*3.6+90}:{2+0.15}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\tiny\bfseries] {\pct\,\%} ;
}{}%
}
\draw[\POURCcouleur,semithick] (0,1)--(0,2) (1.6,0)--(2,0) (0,-1.6)--(0,-2) (-1.6,0)--(-2,0) ;
@@ -533,7 +548,7 @@
CouleurFond=\def\RAPPEQcouleurfond{#1},%
Origine=\def\RAPPEQposOrigin{#1},%
Rotation=\def\RAPPEQangle{#1},%
- Opacite=\def\RAPPEQopac{#1}
+ Opacite=\def\RAPPEQopac{#1},%
}
\setKVdefault[RapporteurEquerreGeom]{%
@@ -561,7 +576,7 @@
\pgfmathanglebetweenpoints{\pgfpointanchor{\RAPPEQposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}%
\edef\RAPPEQangle{\pgfmathresult}%
}{}%
- \begin{scope}[shift={(\RAPPEQposOrigin)},rotate=\RAPPEQangle,scale=\RAPPEQechelle,every node/.style={rotate=\RAPPEQangle}]
+ \begin{scope}[shift={(\RAPPEQposOrigin)},rotate=\RAPPEQangle,scale=\RAPPEQechelle,transform shape]
%fond
\ifboolKV[RapporteurEquerreGeom]{Fond}
{%
@@ -591,16 +606,16 @@
\ifboolKV[RapporteurEquerreGeom]{AfficheAngles}
{%
\foreach \i in {10,20,...,170}
- {\draw[\RAPPEQcouleur] ({-\i}:{0.6125*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {\i} ;}
+ {\draw[\RAPPEQcouleur] ({-\i}:{0.6125*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechangle},font=\tiny] {\i} ;}
%angles "extérieurs"
\foreach \i in {10,20,...,170}
- {\draw[\RAPPEQcouleur] ({-\i}:{0.6375*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {\inteval{180-\i}} ;}
+ {\draw[\RAPPEQcouleur] ({-\i}:{0.6375*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechangle},font=\tiny] {\inteval{180-\i}} ;}
}%
{}%
\ifboolKV[RapporteurEquerreGeom]{AfficheValeurs}
{%
\foreach \i in {-1,0,1}
- {\draw[\RAPPEQcouleur] ({\i},-0.375) node[scale=\fpeval{\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {$\i$} ;}
+ {\draw[\RAPPEQcouleur] ({\i},-0.375) node[scale=\fpeval{\RAPPEQechangle},font=\tiny] {$\i$} ;}
}%
{}%
%tracés intérieurs
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Indication/PanneauRouteC24a.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Indication/PanneauRouteC24a.pdf
new file mode 100644
index 00000000000..3b5ec7e8a4c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Indication/PanneauRouteC24a.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB14_80.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB14_80.pdf
new file mode 100644
index 00000000000..890d68ee510
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB14_80.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB1j.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB1j.pdf
new file mode 100644
index 00000000000..5a98b386726
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB1j.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB30_30.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB30_30.pdf
new file mode 100644
index 00000000000..2e158110165
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB30_30.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b1.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b1.pdf
new file mode 100644
index 00000000000..91952f39a87
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b1.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b2.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b2.pdf
new file mode 100644
index 00000000000..ec8a30e4374
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b2.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b3.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b3.pdf
new file mode 100644
index 00000000000..92fd45c47f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b3.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b4.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b4.pdf
new file mode 100644
index 00000000000..02b47faac07
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b4.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b5.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b5.pdf
new file mode 100644
index 00000000000..6d3a6716b7e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Interdiction/PanneauRouteB6b5.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB49VL.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB49VL.pdf
new file mode 100644
index 00000000000..d737b9b2032
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB49VL.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50a.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50a.pdf
new file mode 100644
index 00000000000..a3ef5fd0ce7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50a.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50b.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50b.pdf
new file mode 100644
index 00000000000..f5bb08180f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50b.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50c.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50c.pdf
new file mode 100644
index 00000000000..3fecb25982a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50c.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50d.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50d.pdf
new file mode 100644
index 00000000000..250253b066f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50d.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50e.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50e.pdf
new file mode 100644
index 00000000000..853cc07c531
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB50e.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB51_30.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB51_30.pdf
new file mode 100644
index 00000000000..08e96de6170
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB51_30.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB52.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB52.pdf
new file mode 100644
index 00000000000..a14e1a111d3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB52.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB53.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB53.pdf
new file mode 100644
index 00000000000..13e4ce3ac3a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB53.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB54.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB54.pdf
new file mode 100644
index 00000000000..ce71fbd4b1c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB54.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB55.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB55.pdf
new file mode 100644
index 00000000000..099108818f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB55.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB56.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB56.pdf
new file mode 100644
index 00000000000..a721b753c27
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB56.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB57.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB57.pdf
new file mode 100644
index 00000000000..f1b433d19ba
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB57.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB58.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB58.pdf
new file mode 100644
index 00000000000..2f96cdbec47
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB58.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB59.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB59.pdf
new file mode 100644
index 00000000000..02bc961ed8a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Obligation/PanneauRouteB59.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/PanneauxRoute.sty b/Master/texmf-dist/tex/latex/panneauxroute/PanneauxRoute.sty
index d94943962b7..68021ef1486 100644
--- a/Master/texmf-dist/tex/latex/panneauxroute/PanneauxRoute.sty
+++ b/Master/texmf-dist/tex/latex/panneauxroute/PanneauxRoute.sty
@@ -5,7 +5,11 @@
% : Licence CC BY-SA 3.0 for svg source (http://sig974.free.fr/?p=1520)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{PanneauxRoute}[2023/08/14 v0.1.0 Panneaux de signalisation fr]
+\ProvidesPackage{PanneauxRoute}[2024/09/14 v0.1.2 Panneaux de signalisation fr]
+
+%------Historique
+% 0.1.2 Ajout des panneaux divers
+% 0.1.1 Ajout du panneau B14 (80)
% 0.1.0 Version initiale
%------Packages utiles
@@ -56,8 +60,20 @@
\NewDocumentCommand\prFinRoutePrio{ O{height=1.15cm} }{\AffPanneau[#1]{AB7}}
\NewDocumentCommand\prRondPoint{ O{height=1.15cm} }{\AffPanneau[#1]{AB25}}
+\NewDocumentCommand\prDosAneTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK2}}
+\NewDocumentCommand\prChaussGlissTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK4}}
+\NewDocumentCommand\prChausRetTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK3}}
+\NewDocumentCommand\prTravauxTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK5}}
+\NewDocumentCommand\prDangerTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK14}}
+\NewDocumentCommand\prFeuxTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK17}}
+\NewDocumentCommand\prGraviersTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK22}}
+\NewDocumentCommand\prBouchonTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK30}}
+\NewDocumentCommand\prAccidentTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK31}}
+\NewDocumentCommand\prBrouillardTemp{ O{height=1.15cm} }{\AffPanneau[#1]{AK32}}
+
\NewDocumentCommand\prCircInterd{ O{height=1.15cm} }{\AffPanneau[#1]{B0}}
\NewDocumentCommand\prSensInterdit{ O{height=1.15cm} }{\AffPanneau[#1]{B1}}
+\NewDocumentCommand\prSensInterditJ{ O{height=1.15cm} }{\AffPanneau[#1]{B1j}}
\NewDocumentCommand\prInterdTournG{ O{height=1.15cm} }{\AffPanneau[#1]{B2a}}
\NewDocumentCommand\prInterdTournD{ O{height=1.15cm} }{\AffPanneau[#1]{B2b}}
\NewDocumentCommand\prInterdDemiTour{ O{height=1.15cm} }{\AffPanneau[#1]{B2c}}
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK14.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK14.pdf
new file mode 100644
index 00000000000..8b388c78e4f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK14.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK17.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK17.pdf
new file mode 100644
index 00000000000..27845490800
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK17.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK2.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK2.pdf
new file mode 100644
index 00000000000..521f95a618d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK2.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK22.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK22.pdf
new file mode 100644
index 00000000000..7596e846eb5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK22.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK3.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK3.pdf
new file mode 100644
index 00000000000..3871b514b2f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK3.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK30.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK30.pdf
new file mode 100644
index 00000000000..2c0aac367ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK30.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK31.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK31.pdf
new file mode 100644
index 00000000000..18e5e37d90e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK31.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK32.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK32.pdf
new file mode 100644
index 00000000000..7f59c16d001
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK32.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK4.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK4.pdf
new file mode 100644
index 00000000000..bcee3bff90d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK4.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK5.pdf b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK5.pdf
new file mode 100644
index 00000000000..236c455af6a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/panneauxroute/Temporaire/PanneauRouteAK5.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty b/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
index a2de8687f22..84928cd92d6 100644
--- a/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
+++ b/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
-% pas-tableur.sty v2.05 encodage : UTF8 %
+% pas-tableur.sty v2.06 encodage : UTF8 %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -8,8 +8,8 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-\def\fileversion{2.04}
-\def\filedate{2023/04/16}
+\def\fileversion{2.06}
+\def\filedate{2024/09/14}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{pas-tableur}[%
\filedate\space v\fileversion\space
@@ -102,7 +102,14 @@
%
%==> Macro etoilee : \tableur*{A/<l1>,B/<l2>,...}. Tableur avec colonnes de largeurs differentes
%
-\newcommand{\tableur@star}[2][1]
+% Modifiée dans la version 2.06 sur la suggestion de Emiel van Miltenburg
+
+\newcommand{\tableur@star}[2][1]
+ {
+ \IfSubStr{#2}{,}{\tableur@star@columns[#1]{#2}}{\tableur@star@onecolumn[#1]{#2}}
+ }
+
+\newcommand{\tableur@star@columns}[2][1]
{%
\xdef\list@of@col{#2}%
% Placement de la premiere cellule en-tête
@@ -139,7 +146,39 @@
}%
}%
\fi%
- } % --> Fin de \tableur*
+ }
+
+\newcommand{\tableur@star@onecolumn}[2][1]
+ {%
+ % Placement de la premiere cellule en-tête
+ \StrBefore{#2}{/}[\first@name] % Récupère la partie avant "/"
+ \StrBehind{#2}{/}[\first@width] % Récupère la partie après "/"
+ \pastab@draw@cell{\first@width}{\first@name}{0}{}{\first@name}
+ % Placement des en-têtes de lignes
+ \pastab@draw@cell{\numline@width}{numline1}{2}{\first@name.south west}{1}
+ \ifnum#1>1%
+ \foreach \num@line [remember=\num@line as \lastnum (initially 1)] in {2,...,#1}
+ {%
+ \pastab@draw@cell{\numline@width}{numline\num@line}{3}{numline\lastnum.south east}{\num@line}%
+ }%
+ \fi%
+ % Trace de la grille
+ \foreach \name/\w in {#2}
+ {%
+ \pastableur@grid{\w}{\name}{1}{\name.south}%
+ }%
+ \ifnum#1>1%
+ \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
+ {%
+ \foreach \name/\w in {#2}
+ {%
+ \pastableur@grid{\w}{\name}{\numline}{cell\name-\lastnumline.south}%
+ }%
+ }%
+ \fi%
+ }
+
+% --> Fin de \tableur*
%
%==> Macro non etoilee : \tableur{A,B,C,...} ou \tableur{A-C}
%
@@ -302,7 +341,6 @@
\newcommand*\multiSelec[2]
{%
\fill[blueSelec,opacity=0.5] ($(cell#1.north west)+(0.25pt,-0.25pt)$) rectangle ($(cell#2.south east)+(-0.25pt,0.25pt)$);%
- \draw[very thick] (cell#1.south west) rectangle (cell#1.north east);%
\fill[black] ($(cell#2.south east)+(-0.5pt,0.5pt)$) rectangle +(3pt,-3pt);%
%
%==> On colorie les en-têtes "colonnes"
@@ -328,10 +366,51 @@
\pastableur@colorcell{numline\i}{0}
\node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline\i) {\helvbx\i};%
}%
+ \draw[very thick] (cell#1.south west) rectangle (cell#1.north east);%
}% fin de \multiSelec
%
%
%
+
+%
+% Selection de plusieurs cellules : \multimultiSelec{A-1}{A-2}{A-3}
+% Proposition de Emiel van Miltenburg pour la version 2.06 le 2024/09/14
+%
+\newcommand*\multimultiSelec[3]
+{%
+ \fill[blueSelec,opacity=0.5] ($(cell#1.north west)+(0.25pt,-0.25pt)$) rectangle ($(cell#3.south east)+(-0.25pt,0.25pt)$);%
+
+ \fill[black] ($(cell#3.south east)+(-0.5pt,0.5pt)$) rectangle +(3pt,-3pt);%
+ %
+ %==> On colorie les en-têtes "colonnes"
+ %
+ \StrChar{#1}{1}[\str@start] % par exemple, "G"
+ \StrChar{#2}{1}[\str@end] % par exemple, "L"
+ \StrBetween{\col@names}{\str@start}{\str@end}[\str@col] % retourne par exemple "HIJK"
+ \edef\str@col{\str@start\str@col\str@end} % retourne alors "GHIJKL"
+ \StrLen{\str@col}[\nb@columns] % nombre d'en-têtes "colonnes" \`a colorier
+ \foreach \i in {1,...,\nb@columns}
+ {%
+ \StrChar{\str@col}{\i}[\name]%
+ \pastableur@colorcell{\name}{1}
+ \node at (\name) {\helvbx\name};%
+ }%
+ %
+ %==> On colorie les en-têtes "lignes"
+ %
+ \StrGobbleLeft{#1}{2}[\first@num]%
+ \StrGobbleLeft{#2}{2}[\second@num]%
+ \foreach \i in {\first@num,...,\second@num}
+ {%
+ \pastableur@colorcell{numline\i}{0}
+ \node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline\i) {\helvbx\i};%
+ }%
+ \draw[very thick] (cell#2.south west) rectangle (cell#1.north east);%
+}% fin de \multimultiSelec
+%
+%
+%
+
\newlength\pastableur@decal
\newcommand{\pastableur@colorcell}[2] % #1 : name, #2 : 0=en-tetes "lignes" / 1=en-tetes "colonnes"
{%
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
index 68272c9b162..a8ced5210e0 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2024-08-17 v0.96j
+\ProvidesPackage{color-ltx}[2024-09-29 v0.96m
Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
@@ -186,7 +186,7 @@
\InputIfFileExists{mathcolor.ltx}{}{}
\def\color@setgroup{\begingroup\set@color}
\let\color@begingroup\begingroup
-\def\color@endgroup{\endgraf\endgroup}
+\def\color@endgroup{\endgraf\@endpefalse\endgroup}
\def\color@hbox{\hbox\bgroup\color@begingroup}
\def\color@vbox{\vbox\bgroup\color@begingroup}
\def\color@endbox{\color@endgroup\egroup}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
index eb3c8e4b86e..8a7c2a1b32c 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-08-17}{0.96j}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-09-29}{0.96m}
{temporary patches for the colorspace package to test pdfresource management ... UF}
@@ -72,7 +72,7 @@
\RemoveFromHook{begindocument}[colorspace]
-\hook_gput_code:nnn {enddocument} {pdf}
+\hook_gput_code:nnn {begindocument/end} {pdf}
{
\def\spc@elt#1#2
{
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
index 7929a7ae13c..54cff3f5938 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: hyperref-generic.dtx
-\ProvidesFile{hgeneric-testphase.def}[2024-08-17 v0.96j %
+\ProvidesFile{hgeneric-testphase.def}[2024-09-29 v0.96m %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
@@ -399,7 +399,7 @@
%\tl_set:cn {@#1}{#2}
\AddToDocumentProperties[hyperref]{#1}{#2}
}
-\cs_generate_variant:Nn \__hyp_store_metadata:nn {en,ne,ee}
+\cs_generate_variant:Nn \__hyp_store_metadata:nn {en,ne,ee,no,eo}
\hook_new:n{hyp/link/cite}
\keys_define:nn { hyp }
{
@@ -471,6 +471,7 @@
\cs_generate_variant:Nn \__hyp_property_record:nn {ee}
\box_new:N \l__hyp_tmpa_box
\tl_new:N \l__hyp_tmpa_tl
+\tl_new:N \l__hyp_tmpb_tl
\seq_new:N \l__hyp_tmpa_seq
\int_new:N \l__hyp_tmpa_int
\str_new:N \l__hyp_tmpa_str
@@ -600,6 +601,7 @@
{
\__hyp_text_pdfstring:noN { #1 }{ \l__hyp_text_enc_info_print_tl } #2
}
+\cs_generate_variant:Nn \__hyp_text_pdfstring_info:nN {eN,oN}
\cs_new_protected:Npn\__hyp_PageLabels_gpush:
{
\pdfmanagement_add:nne {Catalog} {PageLabels}{<</Nums[\HyPL@Labels]>>}
@@ -2213,13 +2215,16 @@
}
\regex_new:N\l__hyp_optlang_regex
\regex_set:Nn\l__hyp_optlang_regex {\A\[([A-Za-z\-]+)\](.*)}
+\cs_generate_variant:Nn\clist_item:nn{on}
\cs_new_protected:Npn \__hyp_setup_info_key:nn #1 #2
{
\keys_define:nn { hyp }
{
pdf#1 .code:n =
{
- \tl_if_blank:nTF {##1}
+ \tl_set:Ne\l__hyp_tmpa_tl {\text_expand:n{##1}}
+ \__hyp_store_metadata:no {pdf#1}{\l__hyp_tmpa_tl}
+ \tl_if_empty:NTF \l__hyp_tmpa_tl
{
\str_case:nnF { #1 }
{
@@ -2239,45 +2244,44 @@
}
}
{
- \tl_set:Ne\l__hyp_tmpa_tl {\clist_item:nn{##1}{1}}
+ \tl_set:Ne\l__hyp_tmpb_tl {\clist_item:on{\l__hyp_tmpa_tl}{1}}
\exp_args:NNV
- \regex_extract_once:NnN \l__hyp_optlang_regex \l__hyp_tmpa_tl\l__hyp_tmpa_seq
+ \regex_extract_once:NnN \l__hyp_optlang_regex \l__hyp_tmpb_tl\l__hyp_tmpa_seq
\seq_if_empty:NTF\l__hyp_tmpa_seq
{
- \__hyp_text_pdfstring_info:nN {##1}\l__hyp_tmpa_str
+ \__hyp_text_pdfstring_info:oN {\l__hyp_tmpa_tl}\l__hyp_tmpa_str
}
{
- \exp_args:Ne
- \__hyp_text_pdfstring_info:nN {\seq_item:Nn \l__hyp_tmpa_seq{3}}\l__hyp_tmpa_str
+ \__hyp_text_pdfstring_info:eN {\seq_item:Nn \l__hyp_tmpa_seq{3}}\l__hyp_tmpa_str
}
\str_if_eq:VnF\l__hyp_tmpa_str{<FEFF>}
{
\pdfmanagement_add:nne {Info}{#2}{\l__hyp_tmpa_str}
}
}
- \__hyp_store_metadata:nn {pdf#1}{##1}
}
}
\keys_define:nn { hyp / info }
{
#2 .code:n =
{
+ \tl_set:Ne\l__hyp_tmpa_tl {\text_expand:n{##1}}
+ \__hyp_store_metadata:eo {pdf\str_lowercase:n{#1}}{\l__hyp_tmpa_tl}
\tl_if_blank:nTF {##1}
{
\pdfmanagement_remove:nn {Info}{#2}
}
{
- \__hyp_text_pdfstring_info:nN {##1}\l__hyp_tmpa_str
+ \__hyp_text_pdfstring_info:oN {\l__hyp_tmpa_tl}\l__hyp_tmpa_str
\str_if_eq:VnF\l__hyp_tmpa_str{<FEFF>}
{
\pdfmanagement_add:nne {Info}{#2}{\l__hyp_tmpa_str}
}
}
- \exp_args:Ne \__hyp_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1}
}
,unknown .code:n =
{
- \__hyp_text_pdfstring_info:nN {##1}\l__hyp_tmpa_str
+ \__hyp_text_pdfstring_info:eN {##1}\l__hyp_tmpa_str
\str_if_eq:VnF\l__hyp_tmpa_str{<FEFF>}
{
\exp_args:Nno
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
index 23634ecb9ee..66e2654e36a 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-dvipdfmx.def}{2024-08-17}{}
+ {l3backend-testphase-dvipdfmx.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
\cs_generate_variant:Nn \__kernel_backend_literal:n { e }
\cs_generate_variant:Nn \__pdf_backend:n { e }
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
index 7058f285cd8..20af21ab26a 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-dvips.def}{2024-08-17}{}
+ {l3backend-testphase-dvips.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
\cs_generate_variant:Nn \__kernel_backend_postscript:n { e }
\cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e }
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
index df51df34d7d..3be79d71124 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-dvisvgm.def}{2024-08-17}{}
+ {l3backend-testphase-dvisvgm.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
\bool_if:NT \l__pdfmanagement_delayed_shipout_bool
{
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
index c7f70a83868..39c0e7e4742 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-luatex.def}{2024-08-17}{}
+ {l3backend-testphase-luatex.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
\cs_generate_variant:Nn \__kernel_backend_literal_page:n { e }
\bool_if:NT \l__pdfmanagement_delayed_shipout_bool
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
index 5936e320450..75469255746 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-pdftex.def}{2024-08-17}{}
+ {l3backend-testphase-pdftex.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
\cs_generate_variant:Nn \__kernel_backend_literal_page:n { e }
\bool_if:NT \l__pdfmanagement_delayed_shipout_bool
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
index 67567a9b56b..c29a76a19a8 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
@@ -20,7 +20,7 @@
%%
%% File: l3backend-testphase.dtx
\ProvidesExplFile
- {l3backend-testphase-xetex.def}{2024-08-17}{}
+ {l3backend-testphase-xetex.def}{2024-09-29}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
\cs_generate_variant:Nn \__kernel_backend_literal:n { e }
\cs_generate_variant:Nn \__pdf_backend:n { e }
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
index 8e472778520..6c37dc8c22c 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
@@ -27,7 +27,7 @@
%% File: l3pdffield.dtx
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2024-08-17}{0.96j}%
+\ProvidesExplPackage{l3pdffield-testphase}{2024-09-29}{0.96m}%
{form fields}
\csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances
\str_new:N \l__pdffield_tmpa_str
@@ -1762,6 +1762,8 @@
%% File: l3pdfpdffield-choice.dtx
+
+
\RequirePackage{l3draw}
\seq_new:N \l__pdffield_choice_values_seq
\seq_new:N \l__pdffield_choice_defaultvalues_seq
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
index 783ba92c910..afa15df4993 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: pdfmanagement-firstaid.dtx
-\ProvidesExplPackage{pdfmanagement-firstaid}{2024-08-17}{0.96j}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2024-09-29}{0.96m}
{LaTeX PDF management testphase bundle / firstaid-patches}
\clist_map_inline:nn
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
index 458a1d95bd3..8d362291023 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
@@ -27,7 +27,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: pdfmanagement-testphase.dtx
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-08-17}{0.96j}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-09-29}{0.96m}
{PDF~management~code~(testphase)}
\bool_new:N\l__pdfmanagement_delayed_shipout_bool
\msg_new:nnn {pdfmanagement}{delayed-shipout}
@@ -1080,6 +1080,13 @@
\prop_map_function:NN \g__pdfmanagement_documentproperties_prop \msg_show_item:nn
}
}
+\NewDocumentCommand\LogDocumentProperties {}
+ {
+ \msg_log:nne {pdfmanagement}{show-properties}
+ {
+ \prop_map_function:NN \g__pdfmanagement_documentproperties_prop \msg_show_item:nn
+ }
+ }
%% File: l3pdfannot.dtx
\cs_if_exist:NF \bitset_new:Nn
{ \RequirePackage { l3bitset } }
@@ -1313,6 +1320,7 @@
%% File: l3pdfmeta.dtx
+
\msg_new:nnn {pdf }{unknown-standard}{The~standard~'#1'~is~unknown~and~has~been~ignored}
\msg_new:nnn {pdf }{wrong-pdfversion}
{PDF~version~#1~is~too~#2~for~standard~'#3'.}
@@ -1463,7 +1471,10 @@
%
%===============
% Rule 6.1.13-1 CosDocument, isOptionalContentPresent == false
- ,Catalog_no_OCProperties =
+ ,Catalog_no_OCProperties =
+ % Rule 6.9-4 The AS key shall not appear in any optional content configuration dictionary.
+ % actually only starting with A-2 but doesn't harm here either
+ ,Catalog_OCProperties_no_AS=
%===============
% Rule 6.6.1-1: PDAction, S == "GoTo" || S == "GoToR" || S == "Thread"
% || S == "URI" || S == "Named" || S == "SubmitForm"
@@ -1512,6 +1523,10 @@
{ g__pdfmeta_standard_pdf/A-2B_prop }{max_pdf_version}{1.7}
\prop_gput:cnn
{ g__pdfmeta_standard_pdf/A-2B_prop }{omit_CID}{}
+\prop_gremove:cn
+ { g__pdfmeta_standard_pdf/A-2B_prop }
+ { Catalog_no_OCProperties }
+
%A-2u ==============
\prop_new:c { g__pdfmeta_standard_pdf/A-2U_prop }
\prop_gset_eq:cc
@@ -1590,7 +1605,8 @@
{ g__pdfmeta_standard_pdf/A-4_prop }{conformance}
\prop_gremove:cn
{ g__pdfmeta_standard_pdf/A-4_prop }{max_pdf_version}
-
+\prop_gremove:cn
+ { g__pdfmeta_standard_pdf/A-4_prop }{Catalog_OCProperties_no_AS}
\prop_new:c { g__pdfmeta_standard_pdf/A-4F_prop }
\prop_gset_eq:cc
{ g__pdfmeta_standard_pdf/A-4F_prop }
@@ -1886,7 +1902,8 @@
}
,debug / xmp-export .default:n = true
}
-\msg_new:nnn{pdfmeta}{namespace-defined}{The~xmlns~namespace~`#1`~is~already~declared}
+\msg_new:nnn{pdfmeta}{xmp-defined}{The~XMP~#1~`#2`~is~already~declared}
+\msg_new:nnn{pdfmeta}{xmp-undefined}{The~XMP~#1~`#2`~is~undefined}
\msg_new:nnn{pdfmeta}{colorprofile-undefined}{The~colorprofile~`#1`~is~unknown}
\bool_lazy_or:nnTF
{ \sys_if_engine_luatex_p: }
@@ -2207,63 +2224,78 @@
\__pdfmeta_xmp_indent:n{4} xmlns:\exp_not:n{#1="#2"}
}
}
-\cs_generate_variant:Nn \__pdfmeta_xmp_xmlns_new:nn {ne}
\__pdfmeta_xmp_xmlns_new:nn {pdf} {http://ns.adobe.com/pdf/1.3/}
\__pdfmeta_xmp_xmlns_new:nn {xmpRights}{http://ns.adobe.com/xap/1.0/rights/}
\__pdfmeta_xmp_xmlns_new:nn {dc} {http://purl.org/dc/elements/1.1/}
\__pdfmeta_xmp_xmlns_new:nn {photoshop}{http://ns.adobe.com/photoshop/1.0/}
\__pdfmeta_xmp_xmlns_new:nn {xmp} {http://ns.adobe.com/xap/1.0/}
\__pdfmeta_xmp_xmlns_new:nn {xmpMM} {http://ns.adobe.com/xap/1.0/mm/}
-\__pdfmeta_xmp_xmlns_new:ne {stEvt}
+\__pdfmeta_xmp_xmlns_new:nn {stEvt}
{http://ns.adobe.com/xap/1.0/sType/ResourceEvent\c_hash_str}
\__pdfmeta_xmp_xmlns_new:nn {pdfaid} {http://www.aiim.org/pdfa/ns/id/}
\__pdfmeta_xmp_xmlns_new:nn {pdfuaid} {http://www.aiim.org/pdfua/ns/id/}
\__pdfmeta_xmp_xmlns_new:nn {pdfx} {http://ns.adobe.com/pdfx/1.3/}
\__pdfmeta_xmp_xmlns_new:nn {pdfxid} {http://www.npes.org/pdfx/ns/id/}
\__pdfmeta_xmp_xmlns_new:nn {prism} {http://prismstandard.org/namespaces/basic/3.0/}
-\__pdfmeta_xmp_xmlns_new:ne {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str}
+\__pdfmeta_xmp_xmlns_new:nn {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str}
\__pdfmeta_xmp_xmlns_new:nn {Iptc4xmpCore}{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/}
\__pdfmeta_xmp_xmlns_new:nn {pdfaExtension}{http://www.aiim.org/pdfa/ns/extension/}
-\__pdfmeta_xmp_xmlns_new:ne {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str}
-\__pdfmeta_xmp_xmlns_new:ne {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str}
-\__pdfmeta_xmp_xmlns_new:ne {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str}
-\__pdfmeta_xmp_xmlns_new:ne {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str}
+\__pdfmeta_xmp_xmlns_new:nn {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str}
+\__pdfmeta_xmp_xmlns_new:nn {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str}
+\__pdfmeta_xmp_xmlns_new:nn {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str}
+\__pdfmeta_xmp_xmlns_new:nn {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str}
\seq_new:N \l__pdfmeta_xmp_schema_seq
\cs_new_protected:Npn \__pdfmeta_xmp_schema_new:nnn #1 #2 #3
%#1 name #2 prefix, #3 text
{
- \seq_put_right:Nn \l__pdfmeta_xmp_schema_seq { #2 }
- \tl_new:c { g__pdfmeta_xmp_schema_#2_tl }
- \tl_new:c { g__pdfmeta_xmp_schema_#2_properties_tl }
- \tl_gput_right:cn { g__pdfmeta_xmp_schema_#2_tl }
+ \tl_if_exist:cTF { g__pdfmeta_xmp_schema_#2_tl }
{
- \__pdfmeta_xmp_add_packet_open_attr:nnn{rdf}{li}{rdf:parseType="Resource"}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{schema}{#1}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{prefix}{#2}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{namespaceURI}{#3}
- \__pdfmeta_xmp_add_packet_open:nn {pdfaSchema}{property}
- \__pdfmeta_xmp_add_packet_open:nn{rdf}{Seq}
- \tl_use:c { g__pdfmeta_xmp_schema_#2_properties_tl }
- \__pdfmeta_xmp_add_packet_close:nn{rdf}{Seq}
- \__pdfmeta_xmp_add_packet_close:nn {pdfaSchema}{property}
- \cs_if_exist_use:c {__pdfmeta_xmp_schema_#2_additions:}
- \__pdfmeta_xmp_add_packet_close:nn{rdf}{li}
+ \msg_warning:nnnn{pdfmeta}{xmp-defined}{schema}{#2}
+ }
+ {
+ \seq_put_right:Nn \l__pdfmeta_xmp_schema_seq { #2 }
+ \tl_new:c { g__pdfmeta_xmp_schema_#2_tl }
+ \tl_new:c { g__pdfmeta_xmp_schema_#2_properties_tl }
+ \tl_gput_right:cn { g__pdfmeta_xmp_schema_#2_tl }
+ {
+ \__pdfmeta_xmp_add_packet_open_attr:nnn{rdf}{li}{rdf:parseType="Resource"}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{schema}{#1}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{prefix}{#2}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{namespaceURI}{#3}
+ \__pdfmeta_xmp_add_packet_open:nn {pdfaSchema}{property}
+ \__pdfmeta_xmp_add_packet_open:nn{rdf}{Seq}
+ \tl_use:c { g__pdfmeta_xmp_schema_#2_properties_tl }
+ \__pdfmeta_xmp_add_packet_close:nn{rdf}{Seq}
+ \__pdfmeta_xmp_add_packet_close:nn {pdfaSchema}{property}
+ \cs_if_exist_use:c {__pdfmeta_xmp_schema_#2_additions:}
+ \__pdfmeta_xmp_add_packet_close:nn{rdf}{li}
+ }
}
}
-
+\prop_new:N\g__pdfmeta_xmp_schema_property_prop
\cs_new_protected:Npn \__pdfmeta_xmp_property_new:nnnnn #1 #2 #3 #4 #5 %
%#1 schema #2 name, #3 type, #4 category #5 description
{
- \tl_gput_right:cn { g__pdfmeta_xmp_schema_#1_properties_tl }
+ \tl_if_exist:cTF { g__pdfmeta_xmp_schema_#1_properties_tl }
+ {
+ \prop_get:NeNF \g__pdfmeta_xmp_schema_property_prop {#1:#2}\l__pdfmeta_tmpa_tl
+ {
+ \prop_gput:Nee \g__pdfmeta_xmp_schema_property_prop {#1:#2}{#3}
+ \tl_gput_right:cn { g__pdfmeta_xmp_schema_#1_properties_tl }
+ {
+ \__pdfmeta_xmp_add_packet_open:nn {rdf}{li~rdf:parseType="Resource"}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{name}{#2}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{valueType}{#3}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{category}{#4}
+ \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{description}{#5}
+ \__pdfmeta_xmp_add_packet_close:nn{rdf}{li}
+ }
+ }
+ }
{
- \__pdfmeta_xmp_add_packet_open:nn {rdf}{li~rdf:parseType="Resource"}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{name}{#2}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{valueType}{#3}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{category}{#4}
- \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{description}{#5}
- \__pdfmeta_xmp_add_packet_close:nn{rdf}{li}
- }
+ \msg_warning:nnnn{pdfmeta}{xmp-undefined}{schema}{#1}
+ }
}
\cs_new_protected:Npn \__pdfmeta_xmp_add_packet_field:nnn #1 #2 #3 %
@@ -2469,7 +2501,7 @@
}
\cs_new_protected:Npn \__pdfmeta_xmp_schema_enable_pdfd:
{
- \__pdfmeta_xmp_xmlns_new:ne {pdfd}{http://pdfa.org/declarations/}
+ \__pdfmeta_xmp_xmlns_new:nn {pdfd}{http://pdfa.org/declarations/}
\__pdfmeta_xmp_schema_new:nnn
{PDF~Declarations~Schema}
{pdfd}
@@ -2832,9 +2864,11 @@
\cs_new_protected:Npn \pdfmeta_xmp_xmlns_new:nn #1 #2
{
\prop_if_in:NnTF \g__pdfmeta_xmp_xmlns_prop {#1}
- {\msg_warning:nnn{pdfmeta}{namespace-defined}{#1}}
+ {\msg_warning:nnnn{pdfmeta}{xmp-defined}{xmlns~namespace}{#1}}
{\__pdfmeta_xmp_xmlns_new:nn {#1}{#2}}
}
+\cs_set_eq:NN \pdfmeta_xmp_schema_new:nnn \__pdfmeta_xmp_schema_new:nnn
+\cs_set_eq:NN \pdfmeta_xmp_property_new:nnnnn \__pdfmeta_xmp_property_new:nnnnn
\cs_new_protected:Npn \pdfmeta_xmp_add_declaration:n #1 %conformsTo uri
{
\__pdfmeta_xmp_schema_enable_pdfd:
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
index ce1dbc393f7..f78f2e9fc3a 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: pdfmanagement-testphase.dtx
-\ProvidesExplPackage{pdfmanagement-testphase}{2024-08-17}{0.96j}
+\ProvidesExplPackage{pdfmanagement-testphase}{2024-09-29}{0.96m}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 5fce11f19d5..a429ca97547 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches-tmp-ltx.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-08-17 v0.96j patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-09-29 v0.96m patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 62890e82891..2c9076f90db 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index 6f36c0a652b..49bc11c8c41 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index b44308c0fe7..32569a0ef4d 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppdvips.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index d885101ed45..5047ce749f2 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppluatex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for LuaTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 153a63b3a87..fd4175617f2 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppnull.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index 442aae7e70e..67d1af500b6 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index d5a2a88c130..a1a0fb7e56a 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppvtex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index b1bd4a1f989..90f8a7831c7 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.6a}
+\def\AM@fileversion{v0.6b}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $
-\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
+\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $
+\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
@@ -47,10 +47,10 @@
}
\def\AM@getpagecount{%
\expandafter\filename@parse\expandafter{\AM@currentdocname}%
- \edef\type@ext{%
- \noexpand\lowercase{%
- \noexpand\def\noexpand\type@ext{.\filename@ext}}}%
- \type@ext
+ \begingroup\edef\x{%
+ \lowercase{\endgroup
+ \def\noexpand\type@ext{\expandafter\scantokens\expandafter{\filename@ext\noexpand}}}}%
+ \x
\ifx\type@ext\AM@pdf@ext
\ifdefined\subfix
\let\AM@import@path\@empty
@@ -68,7 +68,7 @@
\def\AM@pagecount{1}%
\fi
}
-\def\AM@pdf@ext{.pdf}
+\def\AM@pdf@ext{pdf}
\begingroup
\def\gobble@nil#1\@nil{}
\ifnum\XeTeXversion=0
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 69f65ee6027..41e135194ff 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
@@ -1,4 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hugo Gomes @ 09/09/2024 v2.1.4
% Hugo Gomes @ 07/08/2024 v2.1.3
% Hugo Gomes @ 01/08/2024 v2.1.2
% Hugo Gomes @ 07/07/2024 v2.1.1
@@ -10,7 +11,7 @@
% Hugo Gomes @ 10/10/2022 v1.0.0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{pgf-PeriodicTable}[07/08/2024 pgf-PeriodicTable v2.1.3]%%
+\ProvidesPackage{pgf-PeriodicTable}[08/09/2024 pgf-PeriodicTable v2.1.4]%%
\RequirePackage{tikz}%
\usetikzlibrary{fadings}%
\tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]%
@@ -2446,7 +2447,7 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT
\tikz{%
\node[text width=\pgfPT@boxwd,text centered,inner sep=0pt] (exFlag) at (0,0) {\includegraphics[height=\pgfPT@boxht]{flags/\pgfPT@country@flag.pdf}};%
\global\pgfPT@countc=0%
- \node[below right,text width=3.75*\pgfPTcellwd,inner xsep=0pt] at ([xshift=.025*\pgfPTcellwd]exFlag.north east) {%
+ \node[below right,text width=2.2*\pgfPTcellwd,inner xsep=0pt] at ([xshift=.025*\pgfPTcellwd]exFlag.north east) {%
\@for\pgfPT@tmp:=\pgfPTlanguages\do{%
\ifnum\pgfPT@countc=0\relax%
\pgfPT@box@zerodepth{\csname pgfPT@country@name@\pgfPT@tmp\endcsname}%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
index 076f588ca02..b9e45c2b5ef 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
@@ -6,24 +6,25 @@
%
% defining PGF keys: the colors of the cells of the periodic table to be drawn -----------------
% list names available to use in key 'back color scheme', e.g. ----------------------------------
-% back color scheme=CPK or back color scheme=Wikipedia ------------------------------
+% v2.1.4 -> add prefix pgfPT to the built-in names
+% back color scheme=pgfPTCPK or back color scheme=pgfPTWikipedia ------------------
% if back color scheme=solid the back color key is used to fill the cells -------------------
-\def\pgfPT@backColorsScheme@default{.769/.812/.961,.678/.733/.925,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741}%
-\def\pgfPT@backColorsScheme@Soft{.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918}%
-\def\pgfPT@backColorsScheme@Jmol{1/1/1,.851/1/1,.8/.502/1,.761/1/0,1/.71/.71,.565/.565/.565,.188/.314/.973,1/.051/.051,.565/.878/.314,.702/.89/.961,.671/.361/.949,.541/1/0,.749/.651/.651,.941/.784/.627,1/.502/0,1/1/.188,.122/.941/.122,.502/.82/.89,.561/.251/.831,.239/1/0,.902/.902/.902,.749/.761/.78,.651/.651/.671,.541/.6/.78,.612/.478/.78,.878/.4/.2,.941/.565/.627,.314/.816/.314,.784/.502/.2,.49/.502/.69,.761/.561/.561,.4/.561/.561,.741/.502/.89,1/.631/0,.651/.161/.161,.361/.722/.82,.439/.18/.69,0/1/0,.58/1/1,.58/.878/.878,.451/.761/.788,.329/.71/.71,.231/.62/.62,.141/.561/.561,.039/.49/.549,0/.412/.522,.753/.753/.753,1/.851/.561,.651/.459/.451,.4/.502/.502,.62/.388/.71,.831/.478/0,.58/0/.58,.259/.62/.69,.341/.09/.561,0/.788/0,.439/.831/1,1/1/.78,.851/1/.78,.78/1/.78,.639/1/.78,.561/1/.78,.38/1/.78,.271/1/.78,.188/1/.78,.122/1/.78,0/1/.612,0/.902/.459,0/.831/.322,0/.749/.22,0/.671/.141,.302/.761/1,.302/.651/1,.129/.58/.839,.149/.49/.671,.149/.4/.588,.09/.329/.529,.816/.816/.878,1/.82/.137,.722/.722/.816,.651/.329/.302,.341/.349/.38,.62/.31/.71,.671/.361/0,.459/.31/.271,.259/.51/.588,.259/0/.4,0/.49/0,.439/.671/.98,0/.729/1,0/.631/1,0/.561/1,0/.502/1,0/.42/1,.329/.361/.949,.471/.361/.89,.541/.31/.89,.631/.212/.831,.702/.122/.831,.702/.122/.729,.702/.051/.651,.741/.051/.529,.78/0/.4,.8/0/.349,.82/0/.31,.851/0/.271,.878/0/.22,.902/0/.18,.922/0/.149,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
-\def\pgfPT@backColorsScheme@CPK{1/1/1,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.133/.133/.133,.133/.2/1,1/.133/0,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,.867/.467/1,.867/.467/1,1/.6/0,1/.898/.133,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.6/.6/.6,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.6/.133/0,0/1/1,.467/0/1,0/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.4/0/.733,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
-\def\pgfPT@backColorsScheme@Rasmol{1/1/1,1/.753/.796,.698/.133/.133,1/.078/.576,0/1/0,.784/.784/.784,.561/.561/1,.941/0/0,.855/.647/.125,1/.078/.576,0/0/1,.133/.545/.133,.502/.502/.565,.855/.647/.125,1/.647/0,1/.784/.196,0/1/0,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,.502/.502/.565,1/.647/0,1/.078/.576,.647/.165/.165,.647/.165/.165,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.941,1/.078/.576,1/.078/.576,1/.647/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.125,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
-\def\pgfPT@backColorsScheme@RasmolNew{1/1/1,1/.753/.796,.698/.129/.129,1/.078/.58,0/1/.004,.827/.827/.827,.529/.808/.902,1/0/0,.855/.647/.129,1/.078/.58,0/0/1,.133/.545/.137,.412/.412/.412,.855/.647/.129,1/.667/0,1/1/0,0/1/.004,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.58,.412/.412/.412,1/.078/.58,.412/.412/.412,.412/.412/.412,1/.667/0,1/.078/.58,.502/.157/.157,.502/.157/.157,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.945,1/.078/.576,1/.078/.576,1/.667/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.129,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576}%
-\def\pgfPT@backColorsScheme@Wikipedia{.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.8,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.753/1/1,1/.4/.4,1/.871/.678,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91}%
-\def\pgfPT@backColorsScheme@MNM{.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847}%
-\def\pgfPT@backColorsScheme@PS{.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647}%
-\def\pgfPT@backColorsScheme@Radio{.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0}%
-\def\pgfPT@backColorsScheme@Blocks{1/.937/.671,1/.937/.671,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635}%
+\def\pgfPT@backColorsScheme@pgfPTdefault{.769/.812/.961,.678/.733/.925,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741}%
+\def\pgfPT@backColorsScheme@pgfPTSoft{.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918}%
+\def\pgfPT@backColorsScheme@pgfPTJmol{1/1/1,.851/1/1,.8/.502/1,.761/1/0,1/.71/.71,.565/.565/.565,.188/.314/.973,1/.051/.051,.565/.878/.314,.702/.89/.961,.671/.361/.949,.541/1/0,.749/.651/.651,.941/.784/.627,1/.502/0,1/1/.188,.122/.941/.122,.502/.82/.89,.561/.251/.831,.239/1/0,.902/.902/.902,.749/.761/.78,.651/.651/.671,.541/.6/.78,.612/.478/.78,.878/.4/.2,.941/.565/.627,.314/.816/.314,.784/.502/.2,.49/.502/.69,.761/.561/.561,.4/.561/.561,.741/.502/.89,1/.631/0,.651/.161/.161,.361/.722/.82,.439/.18/.69,0/1/0,.58/1/1,.58/.878/.878,.451/.761/.788,.329/.71/.71,.231/.62/.62,.141/.561/.561,.039/.49/.549,0/.412/.522,.753/.753/.753,1/.851/.561,.651/.459/.451,.4/.502/.502,.62/.388/.71,.831/.478/0,.58/0/.58,.259/.62/.69,.341/.09/.561,0/.788/0,.439/.831/1,1/1/.78,.851/1/.78,.78/1/.78,.639/1/.78,.561/1/.78,.38/1/.78,.271/1/.78,.188/1/.78,.122/1/.78,0/1/.612,0/.902/.459,0/.831/.322,0/.749/.22,0/.671/.141,.302/.761/1,.302/.651/1,.129/.58/.839,.149/.49/.671,.149/.4/.588,.09/.329/.529,.816/.816/.878,1/.82/.137,.722/.722/.816,.651/.329/.302,.341/.349/.38,.62/.31/.71,.671/.361/0,.459/.31/.271,.259/.51/.588,.259/0/.4,0/.49/0,.439/.671/.98,0/.729/1,0/.631/1,0/.561/1,0/.502/1,0/.42/1,.329/.361/.949,.471/.361/.89,.541/.31/.89,.631/.212/.831,.702/.122/.831,.702/.122/.729,.702/.051/.651,.741/.051/.529,.78/0/.4,.8/0/.349,.82/0/.31,.851/0/.271,.878/0/.22,.902/0/.18,.922/0/.149,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
+\def\pgfPT@backColorsScheme@pgfPTCPK{1/1/1,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.133/.133/.133,.133/.2/1,1/.133/0,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,.867/.467/1,.867/.467/1,1/.6/0,1/.898/.133,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.6/.6/.6,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.6/.133/0,0/1/1,.467/0/1,0/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.4/0/.733,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
+\def\pgfPT@backColorsScheme@pgfPTRasmol{1/1/1,1/.753/.796,.698/.133/.133,1/.078/.576,0/1/0,.784/.784/.784,.561/.561/1,.941/0/0,.855/.647/.125,1/.078/.576,0/0/1,.133/.545/.133,.502/.502/.565,.855/.647/.125,1/.647/0,1/.784/.196,0/1/0,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,.502/.502/.565,1/.647/0,1/.078/.576,.647/.165/.165,.647/.165/.165,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.941,1/.078/.576,1/.078/.576,1/.647/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.125,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}%
+\def\pgfPT@backColorsScheme@pgfPTRasmolNew{1/1/1,1/.753/.796,.698/.129/.129,1/.078/.58,0/1/.004,.827/.827/.827,.529/.808/.902,1/0/0,.855/.647/.129,1/.078/.58,0/0/1,.133/.545/.137,.412/.412/.412,.855/.647/.129,1/.667/0,1/1/0,0/1/.004,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.58,.412/.412/.412,1/.078/.58,.412/.412/.412,.412/.412/.412,1/.667/0,1/.078/.58,.502/.157/.157,.502/.157/.157,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.945,1/.078/.576,1/.078/.576,1/.667/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.129,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576}%
+\def\pgfPT@backColorsScheme@pgfPTWikipedia{.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.8,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.753/1/1,1/.4/.4,1/.871/.678,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91}%
+\def\pgfPT@backColorsScheme@pgfPTMNM{.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847}%
+\def\pgfPT@backColorsScheme@pgfPTPS{.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647}%
+\def\pgfPT@backColorsScheme@pgfPTRadio{.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0}%
+\def\pgfPT@backColorsScheme@pgfPTBlocks{1/.937/.671,1/.937/.671,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635}%
% user defined color schemes(s): -----------------------------------------------------------------
% \pgfPTnewcolorscheme[<trailing color (default=1/1/1 e.g. white)>]{name}{list} -----
\def\pgfPTnewColorScheme{\@ifnextchar[\pgfPT@newColorScheme@withoptions{\pgfPT@newColorScheme@noptions}}%
\def\pgfPT@newColorScheme@withoptions[#1/#2/#3]#4#5{%
-\expandafter\def\csname pgfPT@backColorsScheme@#4\endcsname{#5,#1/#2/#3}%
+\expandafter\gdef\csname pgfPT@backColorsScheme@#4\endcsname{#5,#1/#2/#3}%
\definecolor{cpgfPTTMP}{rgb}{#1,#2,#3}%
\xglobal\colorlet{cpgfPTTMP}{cpgfPTTMP}%
}%
@@ -36,20 +37,20 @@
\pgfkeys{/pgfPerTable/.cd,%
back color scheme/.get=\pgfPTbcs,%
back color scheme/.store in=\pgfPTbcs,%
-back color scheme/.default=default,%
+back color scheme/.default=pgfPTdefault,%
back color/.get=\pgfPTbcsolid,%
back color/.store in=\pgfPTbcsolid,%
back color/.default=white,%
-csSoft/.style={back color scheme=Soft},%
-csJmol/.style={back color scheme=Jmol},%
-csCPK/.style={back color scheme=CPK},%
-csRasmol/.style={back color scheme=Rasmol},%
-csRasmolNew/.style={back color scheme=RasmolNew},%
-csWikipedia/.style={back color scheme=Wikipedia},%
-csMNM/.style={back color scheme=MNM},%
-csPS/.style={back color scheme=PS},%
-csRadio/.style={back color scheme=Radio},%
-csBlocks/.style={back color scheme=Blocks},%
+csSoft/.style={back color scheme=pgfPTSoft},%
+csJmol/.style={back color scheme=pgfPTJmol},%
+csCPK/.style={back color scheme=pgfPTCPK},%
+csRasmol/.style={back color scheme=pgfPTRasmol},%
+csRasmolNew/.style={back color scheme=pgfPTRasmolNew},%
+csWikipedia/.style={back color scheme=pgfPTWikipedia},%
+csMNM/.style={back color scheme=pgfPTMNM},%
+csPS/.style={back color scheme=pgfPTPS},%
+csRadio/.style={back color scheme=pgfPTRadio},%
+csBlocks/.style={back color scheme=pgfPTBlocks},%
csSolid/.style={back color scheme=solid,back color=#1}%
}% STYLES -> csSoft,csJmol,csCPK,csRasmol,csRasmolNew,csWikipedia,csMNM,csPS,csRadio,csBlocks,csSolid
% setting keys with default values ---------------------------------------------------------------
@@ -59,7 +60,7 @@ csSolid/.style={back color scheme=solid,back color=#1}%
\def\pgfPTcolorSchemeInfo{%
\global\pgfPT@dima=0pt\relax%
\foreach \Z in {1,...,118}{\path (-\pgfPTcellwd,-10pt*\Z) rectangle node[midway,font=\tiny\bfseries] {Z=\Z} ++(\pgfPTcellwd,-10pt);}%
-\foreach \cs in {default,Soft,Jmol,CPK,Rasmol,RasmolNew,Wikipedia,MNM,PS,Radio,Blocks}{%
+\foreach \cs in {pgfPTdefault,pgfPTSoft,pgfPTJmol,pgfPTCPK,pgfPTRasmol,pgfPTRasmolNew,pgfPTWikipedia,pgfPTMNM,pgfPTPS,pgfPTRadio,pgfPTBlocks}{%
\node[below right,text width=\pgfPTcellwd,text centered,font=\tiny,inner xsep=0pt] at (\pgfPT@dima,0pt) {\cs};%
\path (\pgfPTcellwd+\pgfPT@dima,0pt) rectangle node[midway,font=\tiny\bfseries] {(r,g,b)} ++(2*\pgfPTcellwd,-10pt);%
\edef\pgfPT@@colorlist{\csname pgfPT@backColorsScheme@\cs\endcsname}%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.buildcell.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.buildcell.tex
index a9a3699c363..7684834830a 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.buildcell.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.buildcell.tex
@@ -38,7 +38,9 @@
\newif\ifpgfPT@dot\pgfPT@dotfalse%
\newif\ifpgfPT@unnamedcell\pgfPT@unnamedcelltrue%
\newdimen\pgfPT@cell@collumnwd\pgfPT@cell@collumnwd=0pt%
+\newdimen\pgfPT@cell@collumnwd@unnamedcell\pgfPT@cell@collumnwd@unnamedcell=0pt%
\newdimen\pgfPT@cell@lineht\pgfPT@cell@lineht=0pt%
+\newdimen\pgfPT@cell@lineht@unnamedcell\pgfPT@cell@lineht@unnamedcell=0pt%
\newdimen\pgfPT@tmpx\pgfPT@tmpx=0pt%
\newdimen\pgfPT@tmpy\pgfPT@tmpy=0pt%
\newdimen\pgfPT@tmpwd\pgfPT@tmpwd=0pt%
@@ -47,10 +49,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\pgfPTbuildcellstyle#1(#2,#3)[#4]{\pgfPT@unnamedcellfalse\relax%
\pgfPTbuildcell(#2,#3)[#4]%
-\expandafter\edef\csname pgfPT@cellcontents@#1\endcsname{\pgfPT@cellcontents}%
-\expandafter\edef\csname ppfPT@thebuildcellcom@#1\endcsname{\textbackslash pgfPTbuildcell(\detokenize{#2},\detokenize{#3})\%\par[\detokenize{#4}]}%
-\expandafter\edef\csname pgfPT@nlinhas@#1\endcsname{#2}%
-\expandafter\edef\csname pgfPT@ncolunas@#1\endcsname{#3}%
+\expandafter\xdef\csname pgfPT@cellcontents@#1\endcsname{\pgfPT@cellcontents}%
+\expandafter\xdef\csname ppfPT@thebuildcellcom@#1\endcsname{\textbackslash pgfPTbuildcell(\detokenize{#2},\detokenize{#3})\%\par[\detokenize{#4}]}%
+\expandafter\xdef\csname pgfPT@nlinhas@#1\endcsname{#2}%
+\expandafter\xdef\csname pgfPT@ncolunas@#1\endcsname{#3}%
\pgfPT@unnamedcelltrue\relax%
}%
\def\pgfPT@builtincellstyle#1(#2,#3)[#4]{\pgfPT@unnamedcellfalse\relax%
@@ -66,7 +68,8 @@
% \pgfPTbuildcell(<lines>,<columns>)[<entries>]
%
\def\pgfPTbuildcell(#1,#2)[#3]{%
-\ifpgfPT@unnamedcell\gdef\ppfPT@thebuildcellcom{\textbackslash pgfPTbuildcell(\detokenize{#1},\detokenize{#2})\%\par[\detokenize{#3}]}\fi%
+\ifpgfPT@unnamedcell\gdef\pgfPT@numlinhas@unnamedcell{#1}\gdef\pgfPT@numcolunas@unnamedcell{#2}%
+\gdef\ppfPT@thebuildcellcom{\textbackslash pgfPTbuildcell(\detokenize{#1},\detokenize{#2})\%\par[\detokenize{#3}]}\fi%
\gdef\pgfPT@numlinhas{#1}\gdef\pgfPT@numcolunas{#2}%
\pgfPT@cellcontentssize=0%
\xdef\pgfPT@cellcontents{}% vanishes list contents
@@ -74,6 +77,10 @@
\pgfmathsetlength{\pgfPT@cell@lineht}{\pgfPTcellht/#1}%
\global\pgfPT@cell@lineht=\pgfPT@cell@lineht%
\global\pgfPT@cell@collumnwd=\pgfPT@cell@collumnwd%
+\ifpgfPT@unnamedcell%
+\global\pgfPT@cell@lineht@unnamedcell=\pgfPT@cell@lineht%
+\global\pgfPT@cell@collumnwd@unnamedcell=\pgfPT@cell@collumnwd%
+\fi%
\expandafter\pgfPTg@bblespaces#3\relax%
\@for\@tmp:=\pgfPT@listn@spaces\do{\expandafter\pgfPT@buildcellcontents\@tmp\relax}%
\ifpgfPT@unnamedcell\global\let\pgfPT@cellcontents@unnamed\pgfPT@cellcontents\relax\fi%
@@ -186,7 +193,7 @@
\@for\pgfPT@tmp:=\pgfPT@builtincells@names\do{\edef\pgfPT@tempb{\pgfPT@tmp}\ifx\pgfPT@tempa\pgfPT@tempb\relax\def\pgfPT@builtin{1}\fi}%
\ifnum\pgfPT@builtin=1\relax\textit{Built-in style}\else\textit{User style}\fi\ \textbf{#2}\relax%
\if\pgfPT@preview@cellcontents\@empty\relax%
-\textit{ doesn't exist!}%
+\textit{ doesn't exist!} (\pgfPT@preview@cellcontents)%
\else%
\edef\pgfPT@numlinhas{\csname pgfPT@nlinhas@#2\endcsname}%
\edef\pgfPT@numcolunas{\csname pgfPT@ncolunas@#2\endcsname}%
@@ -204,6 +211,8 @@
\\ [2pt]The build command:\\ \textcolor{green!70!black}{\footnotesize\ppfPT@thebuildcellcom}\\ %
\else\textbf{Using the last cell built}%
\edef\pgfPT@preview@cellcontents{\csname pgfPT@cellcontents@unnamed\endcsname}%
+\let\pgfPT@numlinhas\pgfPT@numlinhas@unnamedcell\let\pgfPT@numcolunas\pgfPT@numcolunas@unnamedcell%
+\let\pgfPT@cell@lineht\pgfPT@cell@lineht@unnamedcell\let\pgfPT@cell@collumnwd\pgfPT@cell@collumnwd@unnamedcell%
\\ [2pt]The build command:\\ \textcolor{green!70!black}{\footnotesize\ppfPT@thebuildcellcom}\\ %
\fi\fi%
\makebox[\linewidth][c]{%
@@ -354,7 +363,7 @@ at (-.5*\pgfPT@cell@collumnwd+\pgfPT@cell@collumnwd*\coluna,\pgfPT@cell@lineht)
% wd -> \pgfPT@<what>@wd
% ht -> \pgfPT@<what>@ht
% and turning the if<what> to true
-% what -> \@pgfPT@<what>rtue
+% what -> \@pgfPT@<what>true
\ifdim\pgfPTcellwd=34pt\relax%
\xdef\pgfPT@loadcell@scaleX{1}%
\else%
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty
index 7d4bdfea491..b612979423a 100644
--- a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty
@@ -1,4 +1,4 @@
-% beamerthemeXiaoshan.sty v1.01 2023/10/29
+% beamerthemeXiaoshan.sty v1.02 2024/09/19
% by LianTze Lim (liantze@gmail.com)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthemeTianQing}
@@ -35,12 +35,20 @@
\setbeamerfont{section name}{family=\kaishu,size=\Large}
\setbeamerfont{section title}{family=\kaishu,size=\huge}
\setbeamerfont{section in toc}{family=\kaishu,size=\large}
+\setbeamerfont{block title}{family=\kaishu\romankai,series=\bfseries}
\setbeamercolor{alerted text}{fg=樱桃色}
\setbeamercolor{example text}{fg=绿沉}
\setbeamercolor{block title}{fg=宝蓝}
\setbeamercolor{mini frame}{bg=天青色}
+\newlength{\TQTopDecoWidth}
+\newlength{\TQBottomDecoWidth}
+\setlength{\TQTopDecoWidth}{.5\paperheight}
+\setlength{\TQBottomDecoWidth}{.2\paperheight}
+\newcommand{\TQTopDecoOpacity}{.2}
+\newcommand{\TQBottomDecoOpacity}{.9}
+
\AddToHook{begindocument/before}{%
\newsavebox{\bulletboxone}
\savebox{\bulletboxone}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{43}};}
@@ -55,12 +63,12 @@
\savebox{\topcornermotif}{%
\usebeamercolor{deco outline}%
\usebeamercolor{top deco}%
- \tikzset{pgfornamentstyle/.style={rotate=30,color=top deco.fg,draw=deco outline.fg,opacity=.2,inner sep=0pt,ultra thick}}\pgfornamenthan[width=.5\paperheight]{64}}
+ \tikzset{pgfornamentstyle/.style={rotate=30,color=top deco.fg,draw=deco outline.fg,opacity=\TQTopDecoOpacity,inner sep=0pt,ultra thick}}\pgfornamenthan[width=\TQTopDecoWidth]{64}}
\newsavebox{\bottomcornermotif}
\savebox{\bottomcornermotif}{%
\usebeamercolor{structure}%
- \tikzset{pgfornamentstyle/.style={color=structure.fg,opacity=.9,inner sep=0pt,very thick}}\pgfornamenthan[width=.2\paperheight,symmetry=v]{74}}%
+ \tikzset{pgfornamentstyle/.style={color=structure.fg,opacity=\TQBottomDecoOpacity,inner sep=0pt,very thick}}\pgfornamenthan[width=\TQBottomDecoWidth,symmetry=v]{74}}%
}
\setbeamertemplate{itemize item}{\raisebox{.08\ccwd}{\usebox{\bulletboxone}}}
@@ -108,7 +116,7 @@
coltitle = alerted text.fg!70!black,
colback = alerted text.bg,
halign title = flush center,
- fonttitle=\kaishu\romankai\bfseries,
+ fonttitle=\usebeamerfont{block title alerted},
title = #2,
#1
}
@@ -128,7 +136,7 @@
coltitle = example text.fg!70!black,
colback = example text.bg,
halign title = flush center,
- fonttitle=\kaishu\romankai\bfseries,
+ fonttitle=\usebeamerfont{block title example},
title = #2,
#1
}
@@ -150,7 +158,7 @@
coltitle = block title.fg!70!black,
colback = block title.bg,
halign title = flush center,
- fonttitle=\kaishu\romankai\bfseries,
+ fonttitle=\usebeamerfont{block title},
title = #2,
#1
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
index c231e80f342..a2eaae84fab 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-acadian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for Canadian (Acadian) French]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
index 7029af6bf65..764c92b8f31 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-aeb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
index baa1c8c0282..640399a7072 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-af.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (Afrikaans)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
index 41b672984bb..bb92a313eb2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-afb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-afrikaans.ldf
index 653d10b5dda..5befce7a866 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for Afrikaans]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-albanian.ldf
index bbfbb2e7576..6d66dd23c80 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 e5a358a17e8..a49b871c05b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-am.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (Amharic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
index 2531eb7c587..57b5419eaae 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-american.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-american.ldf}[polyglossia: module for American English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-amharic.ldf
index aebbd10989a..9d67c71642d 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 54cb4d4b6eb..8e2f1a39613 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-apd.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (Arabic)]
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 3583fd12ccb..f8bf0310728 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-IQ.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (Arabic)]
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 bd140fb026c..3b76069cd86 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-JO.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (Arabic)]
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 538e6a5a90a..da70c805f62 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-LB.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (Arabic)]
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 471dad5d12b..4b95987fccd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-MR.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (Arabic)]
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 8158dca6e94..475202a4582 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-PS.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (Arabic)]
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 b437f61e191..de54d55975b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-SY.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (Arabic)]
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 4eef25a7166..0d2decc24e9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar-YE.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
index 84a751f2fc0..8d6e79bb471 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ar.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
index 885fe3d02e8..7dfc5531765 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for Arabic]
\RequireBidi
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-armenian.ldf
index 0770300480f..5a167dd8c2c 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for Armenian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
index d71e48bd945..64421d29059 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arq.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
index c0b5debd39d..aff989a8ed1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ary.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
index 41e1cfd5702..fe6defdfd98 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arz.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
index f073cdc632f..0bd2d6607b4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ast.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (Asturian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-asturian.ldf
index 109a560111f..a2d29dd5ac5 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% 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 d3c85168511..fd9506e201d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-australian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-australian.ldf}[polyglossia: module for Australian English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
index b1397542781..dd079ba151f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-austrian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for Austrian German (old spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
index a24eb19c922..9543ecd0cec 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ayl.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (Arabic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
index 4395a83d2e8..a966cf7cdad 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasa.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for Bahasa Indonesia]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
index e710b619997..093f3bcd3a2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasai.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for Bahasa Indonesia]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
index d4c2ea9ec0c..a333b16ea27 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bahasam.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for Bahasa Melayu]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-basque.ldf
index dbff903d788..112d8d31ab6 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 975f48c0acc..dc5ffa64a6e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be-tarask.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (Belarusian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
index 666620a671c..39cf456b886 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-be.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (Belarusian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-belarusian.ldf
index 816e5900378..a32c2c13095 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for Belarusian]
@@ -123,7 +123,7 @@
\def\@Ccdash{\leavevmode
\nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
\ifx\cyrdash\undefined
- \def\cyrdash{\hbox to.8em{\textendash\hss\textendash}}%
+ \def\cyrdash{\leavevmode\hbox to.8em{\textendash\hss\textendash}}%
\fi
\declare@shorthand{belarusian}{",}{\nobreak\hskip.2em\ignorespaces}%
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bengali.ldf
index 1831fbdf032..476eee7d7ca 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% Translations provided by সাজেদুর রহিম জোয়ারদার <toshazed@gmail.com>
% TODO implement Bengali calendar
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
index fe47cb79588..960b5027336 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bg.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (Bulgarian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
index c85acb7dcac..bcb64153926 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (Bengali)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
index f569a743133..a87872198c1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bo.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (Tibetan)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bosnian.ldf
index 24b7756ae52..d01a5c5b334 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 62436958f59..e6d50a9b8cb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-br.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (Breton)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-brazil.ldf
index 85e541ab0c3..8dc9fb7fd46 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for Brazilian Portuguese]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-breton.ldf
index 51f048c909f..62a658788ef 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 2a9870c6370..47de0faae4c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-british.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-british.ldf}[polyglossia: module for British English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
index fa0243300c8..afbe48289e1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-bs.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (Bosnian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-bulgarian.ldf
index 22cb9194716..a4062e493e6 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for Bulgarian]
\PolyglossiaSetup{bulgarian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
index 9c8d87d3226..bfa2f310766 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ca.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (Catalan)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
index 119f086eeac..451529dff02 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for Canadian English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
index e62a04726aa..47aa61e6a49 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-canadien.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for Canadian French]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-catalan.ldf
index 1e855fabb64..cd7f34b68a2 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for Catalan]
\PolyglossiaSetup{catalan}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-chinese.ldf
index 004a8e8903c..f322958cfb1 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-chinese.ldf}[polyglossia: module for Chinese]
@@ -78,6 +78,20 @@
\SetLanguageAliasValues{chinese}{variant}{tw,traditional}
+\providecommand*\presection{}
+\providecommand*\presubsection{}
+\providecommand*\presubsubsection{}
+\providecommand*\postsection{}
+\providecommand*\postsubsection{}
+\providecommand*\postsubsubsection{}
+\let\xpg@save@presection\presection
+\let\xpg@save@presubsection\presubsection
+\let\xpg@save@presubsubsection\presubsubsection
+\let\xpg@save@postsection\postsection
+\let\xpg@save@postsubsection\postsubsection
+\let\xpg@save@postsubsubsection\postsubsubsection
+\let\xpg@save@seccntformat\@seccntformat
+
\def\chinese@capsformat{%
\def\@seccntformat##1{%
\csname pre##1\endcsname%
@@ -98,6 +112,16 @@
\def\presubsubsection{第}%
}
+\def\nochinese@capsformat{%
+ \let\presection\xpg@save@presection%
+ \let\presubsection\xpg@save@presubsection%
+ \let\presubsubsection\xpg@save@presubsubsection%
+ \let\postsection\xpg@save@postsection%
+ \let\postsubsection\xpg@save@postsubsection%
+ \let\postsubsubsection\xpg@save@postsubsubsection%
+ \let\@seccntformat\xpg@save@seccntformat%
+}
+
\def\captionschinese{%
\ifchinese@traditional
\captions@chinese@traditional
@@ -276,16 +300,60 @@
}%
}
+\ifluatex
+ \@ifundefined{xpg@attr@cjkspacing}{\newattribute\xpg@attr@cjkspacing}{}
+ \directlua{ require"polyglossia-cjk-spacing" }
+ \def\chinese@simplified@spacing {\xpg@attr@cjkspacing=\thr@@} % chinese simplified
+ \def\chinese@traditional@spacing{\xpg@attr@cjkspacing=4\relax} % chinese traditional
+ \def\nochinese@spacing{\unsetattribute\xpg@attr@cjkspacing}
+\else
+ \@ifundefined{xpg@orig@XeTeXlinebreakskip}{\newskip\xpg@orig@XeTeXlinebreakskip}{}
+ \xpg@orig@XeTeXlinebreakskip=\XeTeXlinebreakskip
+ \def\chinese@simplified@spacing{%
+ \XeTeXlinebreaklocale "zh"%
+ \XeTeXlinebreakskip = 0pt plus 0.1em minus 0.01em%
+ }
+ \let\chinese@traditional@spacing\chinese@simplified@spacing
+ \def\nochinese@spacing{%
+ \XeTeXlinebreakskip=\xpg@orig@XeTeXlinebreakskip%
+ \XeTeXlinebreaklocale ""%
+ }
+\fi
+
\def\noextras@chinese{%
- \chinese@capsformat%
+ \nochinese@capsformat%
+ \nochinese@spacing%
}
\def\blockextras@chinese{%
\chinese@capsformat%
+ \ifchinese@traditional
+ \chinese@traditional@spacing%
+ \else
+ \chinese@simplified@spacing%
+ \fi%
}
\def\inlineextras@chinese{%
\chinese@capsformat%
+ \ifchinese@traditional
+ \chinese@traditional@spacing%
+ \else
+ \chinese@simplified@spacing%
+ \fi%
}
+
+\ifxetex
+ % \XeTeXlinebreaklocale is global,
+ % so we need to reset after nested language got closed
+ \def\nestedextras@chinese{%
+ \ifchinese@traditional
+ \chinese@traditional@spacing%
+ \else
+ \chinese@simplified@spacing%
+ \fi%
+ }
+\fi
+
% Based on contributions of Toru Inagaki, Norio Iwase, François Charette
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 f3fb645422d..99e58d07798 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Arab.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (Kurdish)]
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 93bd7dcdcf8..bcc49a399da 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb-Latn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
index 73d86d55a01..0e98a403ba5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ckb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
index b20a680f5bd..bfb41cdbb00 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-classiclatin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-classiclatin.ldf}[polyglossia: module for classic Latin]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
index 3aea4d6ff28..2d77ac75545 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cop.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (Coptic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-coptic.ldf
index 4368557e1c7..b307313b155 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 8c7d64ae5e1..2c9e035f274 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for Croatian]
\PolyglossiaSetup{croatian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
index 107496bca65..5242ba58730 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cy.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (Welsh)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
index 81cf42534e9..164ebcd141b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-cz.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (Czech)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-czech.ldf
index 85aaf6fca69..d60fd051fd8 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-czech.ldf}[polyglossia: module for Czech]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
index 7a6f2e8abd1..75001758963 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-da.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (Danish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-danish.ldf
index 0e779b8677a..7f98ba74532 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 ab66673e7c4..1d4716cc788 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (Austrian German, old spelling)]
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 38021f39d44..51aafd52c02 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (Austrian German)]
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 2c74672a940..b9dd535f033 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-AT.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (Austrian German)]
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 0c68393bc3e..fb69ea8dd31 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (Swiss German, old spelling)]
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 d115b45dd71..dcbff2cabf6 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (Swiss German)]
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 5ca22d3cf8f..50dbdd12a4d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-CH.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (Swiss German)]
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 f1b57ec2d43..c29fb7f8887 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (Germany's German, old spelling)]
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 a51fb8fca22..600aaf6e54e 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (Germany's German)]
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 f88846d4d5d..65b6e86b215 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-DE.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (Germany's German)]
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 07e96769bf4..9e250002536 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (Austrian German, old spelling)]
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 02124310792..ea0b6c72b35 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (Austrian German)]
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 a71b3cac654..77f5ff3cc2a 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (Austrian German)]
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 2545c40ce48..109304a6d00 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (Swiss German, old spelling)]
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 08f3d5b3da0..e133756a801 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (Swiss German)]
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 e9022148d23..354e31d09fe 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (Swiss German)]
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 a5637e4fb1a..1ab860716be 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (Germany's German, old spelling)]
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 cb6c2261296..a92f9560343 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (Germany's German)]
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 161729c7fd1..78379253041 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (Germany's German)]
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 c399b378c46..f2965a187b2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de-Latf.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (German)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
index 05d3f990eea..129984e5453 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-de.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (German)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
index a8859eac5fb..93a829f5271 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 c3f45032b9b..03e5af1f054 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dsb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (Sorbian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dutch.ldf
index f2ebd6f9168..87f134bc6de 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for Dutch]
\PolyglossiaSetup{dutch}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
index e157ca05322..226c2563bca 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-dv.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (Divehi)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
index 51659c46528..8341a31bffc 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ecclesiasticlatin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ecclesiasticlatin.ldf}[polyglossia: module for ecclesiastic Latin]
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 32cfa796b91..ddf60b4dfed 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-monoton.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (Greek)]
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 0a57420ca3f..87b5c481d73 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el-polyton.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (Greek)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
index b9a45d3501f..456bbff4257 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-el.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (Greek)]
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 362795a36b2..e01c1f9c819 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-AU.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (Australian English)]
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 4c61b1afdd0..74f1eb912e2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-CA.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadian English)]
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 bf8d7eb4726..3eb708baf40 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-GB.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (British English)]
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 b9956311def..4d97546562f 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-NZ.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (Newzealand English)]
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 943933b5836..7c4f5842c94 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en-US.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (American English)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
index 65818e7fd70..ce078fd7059 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-en.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (English)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
index c434e00c40d..f1bbcf05398 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-english.ldf}[polyglossia: module for English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
index ee888a9a3df..a5d24deeb0b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eo.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (Esperanto)]
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 2d4927f3c40..70f60cb8e31 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-ES.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (Spain's Spanish)]
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 656834e9f4a..28ad8c60d35 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es-MX.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (Mexican Spanish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
index 8d6968fea50..19e07362d82 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-es.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (Spanish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-esperanto.ldf
index cb6c35e5329..e83ba9cdd09 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for Esperanto]
\PolyglossiaSetup{esperanto}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-estonian.ldf
index 7d179e433d7..3ae068c0e83 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for Estonian]
\PolyglossiaSetup{estonian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
index 0151ac000df..43b2c150748 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-et.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (Estonian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
index 39c5bdfef1c..009c53cecce 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-eu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (Basque)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
index abe7241e059..09cc80b5f3c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fa.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (Persian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
index 21af458e2cf..28ceff04ce6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for Farsi]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
index a6b932ff10b..1624f23a2ce 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (Finnish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-finnish.ldf
index 1d9b03c1974..5e33e87f194 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for Finnish]
\PolyglossiaSetup{finnish}{
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 173d01f3c57..33586fd863a 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fr-CA-u-sd-canb.ldf}[polyglossia: module for fr-CA-u-sd-canb (Canadian French, Acadian subvariety)]
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 c1404f6862e..2e5c89f0d4b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CA.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (Canadian French)]
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 c31c4f57f8c..25cc652cee4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-CH.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (Swiss French)]
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 b66ad30ec8c..92682395655 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr-FR.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (France's French)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
index 46267775b17..b42b42741f5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fr.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (French)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-french.ldf
index 8beace22bbd..401f4981c23 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-french.ldf}[polyglossia: module for French]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
index 7713ef99fe5..70e3ae0d475 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulan.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for Friulian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-friulian.ldf
index ed1f24ae428..579f2af366d 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for Friulian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
index 2005e4d484a..807487e9cc8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-fur.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (Friulian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
index 364fa8e773e..4c9287deae4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ga.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (Gaelic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gaelic.ldf
index 8b91897888a..f78c7250274 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for Gaelic]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-galician.ldf
index ab10957c8ea..1e489682f15 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 bd0a4572e90..58045731450 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gd.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (Gaelic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-georgian.ldf
index be0db60a34b..9a5b693adf4 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for Georgian]
@@ -83,7 +83,7 @@
\def\@Ccdash{\leavevmode
\nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
\ifx\cyrdash\undefined
- \def\cyrdash{\hbox to.8em{\textendash\hss\textendash}}%
+ \def\cyrdash{\leavevmode\hbox to.8em{\textendash\hss\textendash}}%
\fi
\declare@shorthand{georgian}{",}{\nobreak\hskip.2em\ignorespaces}%
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index f4f918f50cb..1980f9d179e 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-german.ldf}[polyglossia: module for German]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
index da48264a9c9..625478d0561 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-germanb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for German (old spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
index c5be58f01c4..9b8442935e3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-gl.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (Galician)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
index 820df8e3198..17733e08e61 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-grc.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (Greek)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek.ldf
index b48684d1b58..cfc57f0b639 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-greek.ldf}[polyglossia: module for Greek]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
index 05e2aa40bb5..ee5c85a6589 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-he.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (Hebrew)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
index 3b3491ce9ad..b866f508ff4 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for Hebrew]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
index 1e9f1240502..f95ff044ad4 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hi.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (Hindi)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hindi.ldf
index a3a6360fe04..f2603cff064 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% UTF-8 strings kindly provided by Zdenĕk Wagner, 10-03-2008
% with corrections and additional contributions by Anshuman Pandey
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
index 1bcc48ff4c6..f0e1fa462f8 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hr.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (Croatian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
index 51d2499b0ac..68e8b65c00d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hsb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (Higher Sorbian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
index 8f86fc248e4..47ed150e040 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hu.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (Hungarian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hungarian.ldf
index 0ed88f1aca6..29b51e5d417 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for Hungarian]
@@ -343,14 +343,14 @@
% Hungarian needs 1) trailing dots in chapter headings; 2) trailing dot in section, subsection, etc, counters
\def\@hungarian@forced@dot{}
\def\xpg@save@autodot{}
-\ifdef{\KOMAScript}{%
+\ifdef{\KOMAClassName}{%
\providecommand*\autodot{}%
\let\xpg@save@autodot\autodot%
}{}
% The following is based on some ideas from gloss-russian.ldf
\def\hungarian@sectsformat{%
\ifhungarian@forceheadingpunctuation%
- \ifdef{\KOMAScript}{%
+ \ifdef{\KOMAClassName}{%
\renewcommand*\autodot{.}%
}{%
\def\@seccntformat##1{\csname pre##1\endcsname%
@@ -376,7 +376,7 @@
%
\def\nohungarian@sectsformat{%
\ifhungarian@forceheadingpunctuation%
- \ifdef{\KOMAScript}{%
+ \ifdef{\KOMAClassName}{%
\let\autodot\xpg@save@autodot%
}{%
\def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
index 16b61a8776b..b6f49d2b33a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hy.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (Armenian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
index 1e843ef5df8..5affad8c964 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ia.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (Interlingua)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-icelandic.ldf
index 43a9efe3f8a..9aaf77a1201 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 adf9c602827..a9f38697584 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-id.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (Malay)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-interlingua.ldf
index ec3b1844e9a..94ce192a52a 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 0e5b9c888b3..b1455f6242a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-irish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-irish.ldf}[polyglossia: module for Irish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
index 6724333f2bc..e5f58354a9c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-is.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (Icelandic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
index 42ae275e327..92cccf90957 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-it.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (Italian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-italian.ldf
index da005e54c76..a646035f855 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-italian.ldf}[polyglossia: module for Italian]
\PolyglossiaSetup{italian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
index 6abed7ecc51..609950fc65c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ja.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (Japanese)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-japanese.ldf
index 43015d36cec..805e25e78c6 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for Japanese]
@@ -20,6 +20,20 @@
% BCP-47 compliant aliases
\setlanguagealias*{japanese}{ja}
+\providecommand*\presection{}
+\providecommand*\presubsection{}
+\providecommand*\presubsubsection{}
+\providecommand*\postsection{}
+\providecommand*\postsubsection{}
+\providecommand*\postsubsubsection{}
+\let\xpg@save@presection\presection
+\let\xpg@save@presubsection\presubsection
+\let\xpg@save@presubsubsection\presubsubsection
+\let\xpg@save@postsection\postsection
+\let\xpg@save@postsubsection\postsubsection
+\let\xpg@save@postsubsubsection\postsubsubsection
+\let\xpg@save@seccntformat\@seccntformat
+
\def\japanese@capsformat{%
\def\@seccntformat##1{%
\csname pre##1\endcsname%
@@ -34,6 +48,16 @@
\def\presubsubsection{第}%
}
+\def\nojapanese@capsformat{%
+ \let\presection\xpg@save@presection%
+ \let\presubsection\xpg@save@presubsection%
+ \let\presubsubsection\xpg@save@presubsubsection%
+ \let\postsection\xpg@save@postsection%
+ \let\postsubsection\xpg@save@postsubsection%
+ \let\postsubsubsection\xpg@save@postsubsubsection%
+ \let\@seccntformat\xpg@save@seccntformat%
+}
+
\def\captionsjapanese{%
\def\refname{参考文献}%
\def\abstractname{概要}%
@@ -215,16 +239,46 @@
}%
}
+\ifluatex
+ \@ifundefined{xpg@attr@cjkspacing}{\newattribute\xpg@attr@cjkspacing}{}
+ \directlua{ require"polyglossia-cjk-spacing" }
+ \def\japanese@spacing{\xpg@attr@cjkspacing=\@ne}
+ \def\nojapanese@spacing{\unsetattribute\xpg@attr@cjkspacing}
+\else
+ \@ifundefined{xpg@orig@XeTeXlinebreakskip}{\newskip\xpg@orig@XeTeXlinebreakskip}{}
+ \xpg@orig@XeTeXlinebreakskip=\XeTeXlinebreakskip
+ \def\japanese@spacing{%
+ \XeTeXlinebreaklocale "ja"%
+ \XeTeXlinebreakskip = 0pt plus 0.1em minus 0.01em%
+ }
+ \def\nojapanese@spacing{%
+ \XeTeXlinebreakskip=\xpg@orig@XeTeXlinebreakskip%
+ \XeTeXlinebreaklocale ""%
+ }
+\fi
+
\def\noextras@japanese{%
- \japanese@capsformat%
+ \nojapanese@capsformat%
+ \nojapanese@spacing%
}
\def\blockextras@japanese{%
- \japanese@capsformat%
+ \japanese@capsformat%
+ \japanese@spacing%
}
\def\inlineextras@japanese{%
- \japanese@capsformat%
+ \japanese@capsformat%
+ \japanese@spacing%
}
+
+\ifxetex
+ % \XeTeXlinebreaklocale is global,
+ % so we need to reset after nested language got closed
+ \def\nestedextras@japanese{%
+ \japanese@spacing%
+ }
+\fi
+
% Based on contributions of Toru Inagaki, Norio Iwase, François Charette
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
index c48b7287989..884d438d8f9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ka.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (Georgian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kannada.ldf
index 97941ff1902..aef2fc70e0e 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.2 -- 2024/07/15)
+%% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%%
%% Copyright 2011 Aravinda VK <hallimanearavind AT gmail.com>,
%% Shankar Prasad <prasad.mvs AT gmail.com>,
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-khmer.ldf
index 0a8656b4c50..7b8444da0d8 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-khmer.ldf}[polyglossia: module for Khmer]
\PolyglossiaSetup{khmer}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
index f2af014aef5..8780f9607a1 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-km.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (Khmer)]
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 63807f6320b..1d531a5c74a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Arab.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (Kurdish)]
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 64bb99df246..292b4be633e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr-Latn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
index 254d0d846ca..08db6b0ca78 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kmr.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
index 3c311112a86..04304f4d68c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (Kannada)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
index c4b68924c06..69f94cc04bd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ko.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (Korean)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
index fd464294356..e720d797fee 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-korean.ldf}[polyglossia: module for Korean]
@@ -25,12 +25,12 @@
{
variant.choices:nn = { plain, classic, modern }
{%
- \edef\xpg@korean@variant{\the\numexpr\UseName{l_keys_choice_int}-1\relax}
+ \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}
+ \edef\xpg@korean@captions{\the\numexpr\UseName{l_keys_choice_int}-1\relax}%
},
captions.default:n = hangul,
swapstrings.choice:,
@@ -432,6 +432,11 @@
\XeTeXlinebreaklocale ""
\noextras@korean@common
}
+ % \XeTeXlinebreaklocale is global,
+ % so we need to reset after nested language got closed
+ \def\nestedextras@korean{%
+ \XeTeXlinebreaklocale "ko"\relax
+ }
\else % luatex
\def\inlineextras@korean{\xpg@attr@cjkspacing\xpg@korean@variant\relax}
\def\noextras@korean{%
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 f25b8d53397..cd3dd2b095a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Arab.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (Kurdish)]
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 ba7b6a32954..7101900dd18 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku-Latn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
index b261cbc0df6..2f8ccbff8b3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ku.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (Kurdish)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurdish.ldf
index 3b69d39e010..7f0f9fd3131 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% Created on September 1, 2019
% Last updated on May 17, 2020
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
index 79deb39afc7..622cec28a9b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-kurmanji.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for Kurmanji Kurdish]
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 b4091d70014..92bf3d90364 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (Latin)]
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 8eec40dbd49..ce81a43267a 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (Latin)]
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 029ad4a9168..3050d190040 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,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (Latin)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
index 99e36c42bf0..99600faf727 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-la.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (Latin)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lao.ldf
index 41a6817e115..23587f106b3 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lao.ldf}[polyglossia: module for Lao]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latex.ldf
index 8479fbaa42a..f2bcb54772d 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 d1211a83cb2..c1285ae2705 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin]
@@ -618,6 +618,7 @@
% For the aux file:
\protected@write \@auxout { }
{
+ \ProvideDocumentCommand \shorthandoff{sm}{} % #643
\shorthandoff {=}
\shorthandoff* {^} % #582
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latvian.ldf
index a0e938f3c5a..e59a7798e3a 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for Latvian]
\PolyglossiaSetup{latvian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lithuanian.ldf
index c120f8394f7..95116bac6e3 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% 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 d74145d09a8..d6790701b6a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lo.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (Lao)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
index a4927b4f86a..ef03f24ffe2 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lowersorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for Lower Sorbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
index 96cd05cede4..cad1b920dcb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lsorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for Lower Sorbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
index c01d7f9cae3..d1d2172128e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lt.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (Lithuanian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
index 88932fe434d..83fe7ad2f75 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-lv.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (Latvian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-macedonian.ldf
index e1c8534b2a3..371cb4292b0 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 9533a325b4a..efdbca6fcb9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-magyar.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for Hungarian (Magyar)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malay.ldf
index 451ed329b8f..8e43e5d6299 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-malay.ldf}[polyglossia: module for Malay]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-malayalam.ldf
index 84524dac5ce..87f686780af 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 cbb0dce0cbb..6402f6ea1c8 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% Translations provided by Abhijit Navale <abhi_navale@live.in>
% Ordinals (1-100) added by Niranjan Tambe <niranjanvikastambe@gmail.com> on 14th December, 2019
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
index f718bde8fa3..204a0fc0643 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-medievallatin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-medievallatin.ldf}[polyglossia: module for medieval Latin]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
index dd2fbe301bd..f1956bdedb9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mk.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (Macedonian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
index 175a75bee7f..c3c8cccbba3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ml.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (Malayalam)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
index 985d73b69d8..d4c39c4b607 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mn.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (Mongolian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mongolian.ldf
index d8eca6721d5..edfce3ba719 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for Mongolian]
@@ -105,7 +105,7 @@
\def\@Ccdash{\leavevmode
\nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
\ifx\cyrdash\undefined
- \def\cyrdash{\hbox to.8em{\textendash\hss\textendash}}%
+ \def\cyrdash{\leavevmode\hbox to.8em{\textendash\hss\textendash}}%
\fi
\declare@shorthand{mongolian}{",}{\nobreak\hskip.2em\ignorespaces}%
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
index 7a56186cb25..c03ea34f8f5 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-mr.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (Marathi)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
index 32524dab4fe..53b02f23a5c 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-naustrian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for Austrian German (current spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
index 34bfbbce49a..580eaea1594 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nb.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (Norwegian)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
index baf56a91398..3fc12f2e3ba 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-newzealand.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for Newzealand English]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
index 7bacbf2b423..4e9f8e5b886 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ngerman.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for German (current spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nko.ldf
index 196b55d48ee..623de02539e 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 95121a64502..e03f920d27a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-norsk.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for Norwegian (Bokmal)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-norwegian.ldf
index ba7b7aca46d..bafaf96e5fb 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for Norwegian]
\PolyglossiaSetup{norwegian}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
index 19d45a3143c..b57f684c275 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nswissgerman.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for Swiss German (current spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
index 5a44bced302..e014dfbcf60 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-nynorsk.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for Norwegian (Nynorsk)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-occitan.ldf
index 163fd7dc576..da29e0b5672 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
%%
%% This is file `gloss-occitan.ldf',
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-odia.ldf
index 7101033d02e..77a1c64c0e9 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% Translations provided by ଅଶୋକ ଦାସ୍ <das@pas.rochester.edu> and ଅଭିଷେକ ଜେନା <avisekjena@gmail.com>
% TODO implement Odia calendar
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
index 7f9cee9b542..3fb94208cac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-or.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-odia.ldf}[polyglossia: module for or (Odia)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
index 9f56ed05039..d91c55f137e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-pa.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-pa.ldf}[polyglossia: module for pa (Punjabi)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-persian.ldf
index 6018964b451..4b2a383f050 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-persian.ldf}[polyglossia: module for Persian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-piedmontese.ldf
index 214182ba500..4d88d68cd25 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for Piedmontese]
\makeatletter
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polish.ldf
index bc48e3e4b1e..34f6d90d320 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-polish.ldf}[polyglossia: module for Polish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
index e8f541e486c..9b6148cedd0 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-polutonikogreek.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic Greek]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuges.ldf
index d635007377a..3595060f874 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for Portuguese]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-portuguese.ldf
index e58233056a1..bad8ef2d8d2 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for Portuguese]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-punjabi.ldf
index e150176c02d..dd350cb47ef 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
% UTF-8 strings kindly provided by
% Arvinder Singh Kang, <17-11-2022>
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-romanian.ldf
index 0051613ac77..e7a43d19326 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 b8c9d628e01..f5d6d9a8cda 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 34b2abd2445..850c39bc363 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-russian.ldf}[polyglossia: module for Russian]
@@ -148,7 +148,7 @@
\def\@Ccdash{\leavevmode
\nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
\ifx\cyrdash\undefined
- \def\cyrdash{\hbox to.8em{\textendash\hss\textendash}}%
+ \def\cyrdash{\leavevmode\hbox to.8em{\textendash\hss\textendash}}%
\fi
\declare@shorthand{russian}{",}{\nobreak\hskip.2em\ignorespaces}%
}
@@ -247,14 +247,14 @@
% Russian needs trailing dots in all headings
\def\xpg@save@autodot{}
-\ifdef{\KOMAScript}{%
+\ifdef{\KOMAClassName}{%
\providecommand*\autodot{}%
\let\xpg@save@autodot\autodot%
-}
+}{}
\def\russian@capsformat{%
\ifrussian@forceheadingpunctuation%
- \ifdef{\KOMAScript}{%
+ \ifdef{\KOMAClassName}{%
\renewcommand*\autodot{.}%
}{%
% The following is based on some ideas from ruscor.sty
@@ -280,7 +280,7 @@
\def\norussian@capsformat{%
\ifrussian@forceheadingpunctuation%
- \ifdef{\KOMAScript}{%
+ \ifdef{\KOMAClassName}{%
\let\autodot\xpg@save@autodot%
}{%
\def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sami.ldf
index 802718dbc47..529131beaec 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-sami.ldf}[polyglossia: module for Sami]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
index e15a05b2430..48f923acf56 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-samin.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-samin.ldf}[polyglossia: module for Northern Sami]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sanskrit.ldf
index 1c9901082c9..197f773cf62 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for Sanskrit]
@@ -28,25 +28,25 @@
\setlanguagealias*[script=latin]{sanskrit}{sa-Latn}
\def\fontsetup@sanskrit@devanagari{%
- \SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari,bcp47=sa-Deva,bcp47-language=sa,bcp47-script=Deva,bcp47-casing=sa-Deva}
+ \SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari,bcp47=sa-Deva,bcp47-language=sa,bcp47-script=Deva,bcp47-casing=sa-Deva}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=gujr,script=Gujarati,bcp47=sa-Gujr,bcp47-language=sa,bcp47-script=Gujr,bcp47-casing=sa-Gujr}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=mlym,script=Malayalam,bcp47=sa-Mlym,bcp47-language=sa,bcp47-script=Mlym,bcp47-casing=sa-Mlym}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=beng,script=Bengali,bcp47=sa-Beng,bcp47-language=sa,bcp47-script=Beng,bcp47-casing=sa-Beng}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=knda,script=Kannada,bcp47=sa-Knda,bcp47-language=sa,bcp47-script=Knda,bcp47-casing=sa-Knda}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=telu,script=Telugu,bcp47=sa-Relu,bcp47-language=sa,bcp47-script=Relu,bcp47-casing=sa-Relu}%
\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}
+ \SetLanguageKeys{sanskrit}{scripttag=latn,script=Latin,bcp47=sa-Latn,bcp47-language=sa,bcp47-script=Latn,bcp47-casing=sa-Latn}%
\SetupLatinPolyglossiaFont{sanskrit}}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
index 562e7358a5e..a6a75400469 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-scottish.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for Scottish Gaelic]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbian.ldf
index 3bc4740ebb4..aea350d0273 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for Serbian]
%TODO split into gloss-serbiancyr.ldf and gloss-serbianlat.ldf
@@ -47,17 +47,17 @@
\def\serbian@set@languagekeys{%
\if@serbian@cyr
\if@serbian@ijekavian
- \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc,bcp47=sr-Cyrl-ijekavsk,bcp47-language=sr,bcp47-script=Cyrl,bcp47-variant=ijekavsk,bcp47-casing=sr-Cyrl}
+ \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc,bcp47=sr-Cyrl-ijekavsk,bcp47-language=sr,bcp47-script=Cyrl,bcp47-variant=ijekavsk,bcp47-casing=sr-Cyrl}%
\else
- \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc,bcp47=sr-Cyrl,bcp47-language=sr,bcp47-script=Cyrl,bcp47-variant=ekavsk,bcp47-casing=sr-Cyrl}
+ \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc,bcp47=sr-Cyrl,bcp47-language=sr,bcp47-script=Cyrl,bcp47-variant=ekavsk,bcp47-casing=sr-Cyrl}%
\fi
\else
\if@serbian@ijekavian
- \SetLanguageKeys{serbian}{scripttag=latn,script=Latin,babelname=serbian,bcp47=sr-Latn-ijekavsk,bcp47-language=sr,bcp47-script=Latn,bcp47-variant=ijekavsk,bcp47-casing=sr-Latn}
+ \SetLanguageKeys{serbian}{scripttag=latn,script=Latin,babelname=serbian,bcp47=sr-Latn-ijekavsk,bcp47-language=sr,bcp47-script=Latn,bcp47-variant=ijekavsk,bcp47-casing=sr-Latn}%
\else
- \SetLanguageKeys{serbian}{scripttag=latn,script=Latin,babelname=serbian,bcp47=sr-Latn,bcp47-language=sr,bcp47-script=Latn,bcp47-variant=ekavsk,bcp47-casing=sr-Latn}
+ \SetLanguageKeys{serbian}{scripttag=latn,script=Latin,babelname=serbian,bcp47=sr-Latn,bcp47-language=sr,bcp47-script=Latn,bcp47-variant=ekavsk,bcp47-casing=sr-Latn}%
\fi
- \fi%
+ \fi
}
\DeclareKeys[polyglossia/gloss/serbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
index 5493765d9b6..6026ddd6098 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-serbianc.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for Serbian (cyrillic)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovak.ldf
index b08d84335ed..b845f3bbba1 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for Slovak]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
index ce2de8083c9..d8f84351b31 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovene.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for Slovenian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-slovenian.ldf
index 5a08442e3f0..da90692bc3f 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for Slovenian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-sorbian.ldf
index c7b0a1c0ce8..117c40f3cb4 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for Sorbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanish.ldf
index 0b5b128ae2a..c1f3452bb5f 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for Spanish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
index 4c0e71b0235..8d126e739ac 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-spanishmx.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for Mexican Spanish]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-swedish.ldf
index 142a4b2d795..d65e5dba85e 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 9ab9f7e8d57..08bed4a210d 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-swissgerman.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for Swiss German (old spelling)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
index e93148da005..6ad71c2ad06 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for Syriac]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tamil.ldf
index 38b4a1e7ba9..d52d85b6d51 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 dfe53caabd4..0b63e04c6c9 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 bfaa96cb1ed..023a27bca08 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-thai.ldf}[polyglossia: module for Thai]
%% This is partly based on thai-latex for Babel:
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
index b8223fe8458..f3209145bf2 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for Tibetan]
%% Copyright 2013 Elie Roux
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
index da46f8a6dda..f8d1b16154d 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 af159166235..eee9e39a2d8 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 65faa3e0795..1958f48ef74 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ug.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ug.ldf}[polyglossia: module for ug (Uyghur)]
% BCP 47 tag for Uyghur
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
index 4a9674f2feb..94275336a50 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for Ukrainian]
% Strings taken from Babel
@@ -108,7 +108,7 @@
\def\@Ccdash{\leavevmode
\nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
\ifx\cyrdash\undefined
- \def\cyrdash{\hbox to.8em{\textendash\hss\textendash}}%
+ \def\cyrdash{\leavevmode\hbox to.8em{\textendash\hss\textendash}}%
\fi
\declare@shorthand{ukrainian}{",}{\nobreak\hskip.2em\ignorespaces}%
}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
index 418551d25f3..9e25f61d2ea 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-uppersorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for Upper Sorbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
index 47af125a2b7..fa9a1695d98 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
%%% Adapted from a file contributed by Kamal Abdali
\ProvidesFile{gloss-urdu.ldf}[polyglossia: module for Urdu]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
index 9c33a8be580..e9a9cf545eb 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-usorbian.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for Upper Sorbian]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-uyghur.ldf
index b96e21cda77..633f5f8b4a5 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-uyghur.ldf}[polyglossia: module for Uyghur]
%% Translations provided by Osman Tursun (Github Account: neouyghur)
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-vietnamese.ldf
index 3689b48112f..05f0769e8d2 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\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 81174769141..264b5833e1a 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.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for Welsh]
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 2e99abca24d..5e922469913 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-CN.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-zh-CN.ldf}[polyglossia: module for zh-CN (Chinese)]
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 0b907e2a4e1..38e6a2656f6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-zh-TW.ldf
@@ -1,4 +1,4 @@
-% Language definition file (part of polyglossia v2.2 -- 2024/07/15)
+% Language definition file (part of polyglossia v2.3 -- 2024/09/23)
%
\ProvidesFile{gloss-zh-TW.ldf}[polyglossia: module for zh-TW (Chinese)]
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
index 7102dc0cf37..4c1ba185455 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-cjk-spacing.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-cjk-spacing.lua
--- part of polyglossia v2.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
local glyph_id = node.id"glyph"
@@ -409,7 +409,9 @@ local function cjk_break (head)
curr, next = next, node.getnext(next)
end
- if next and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
+ if next and node.has_attribute(next, attr_cjk)
+ and (next.id == glyph_id or next.id == math_id and next.subtype == 0) then
+
local n = next.char or 0
f = f or next.font or 0 -- in case of curr == math_off
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-french.lua
index d0257e93720..ffb6327b2f4 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.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
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 844d11cb5ac..46838b40a06 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.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
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 d8cfa89e5fa..a19b2152b62 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-punct.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-punct.lua
--- part of polyglossia v2.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
require('polyglossia') -- just in case...
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-sanskrit.lua
index 7a2b84270db..d21386e5fba 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.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
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 d51a594de3f..aa3a9e430e3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia-tibt.lua
@@ -1,6 +1,6 @@
--
-- polyglossia-tibt.lua
--- part of polyglossia v2.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
require('polyglossia') -- just in case...
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.lua
index 5f346bef767..1c7c818910d 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.2 -- 2024/07/15
+-- part of polyglossia v2.3 -- 2024/09/23
--
local module_name = "polyglossia"
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index a8d0c57b540..0e8b8f1c302 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage
- {polyglossia} {2024/07/15} {v2.2}
+ {polyglossia} {2024/09/23} {v2.3}
{Modern multilingual typesetting with XeLaTeX and LuaLaTeX}
% TODO Handle remaining uses in the gloss files (\patchcmd)
@@ -30,10 +30,26 @@
%% \l@nohyphenation is defined in polyglossia.lua
\sys_if_engine_luatex:TF
{
- \lua_load_module:n{polyglossia}
+ \lua_load_module:n{polyglossia}
+ \prg_new_conditional:Nnn \xpg_if_script:n { TF, T, F }
+ {
+ \fontspec_if_fontspec_font:TF
+ {
+ \lua_now:e
+ {
+ if~ luaotfload.aux.provides_script(font.current(), '#1')~ then~
+ token.put_next(token.create('prg_return_true:'))~
+ else~
+ token.put_next(token.create('prg_return_false:'))~
+ end
+ }
+ }
+ { \prg_return_false: }
+ }
}{
- \cs_if_free:cT { l@nohyphenation }
- { \chardef\l@nohyphenation=255 }
+ \cs_if_free:cT { l@nohyphenation }
+ { \chardef\l@nohyphenation=255 }
+ \prg_set_eq_conditional:NNn \xpg_if_script:n \fontspec_if_script:n { TF, T, F }
}
% Which version of XeTeX do we use? What is the boundary class? 4095 or 255
@@ -65,13 +81,14 @@
}
%% Internal hooks
-% select language hook
-\cs_new_nopar:Nn \__xpg_at_begin_document_selectlanguage: {}
-% \disablehyphenation hook
-\cs_new_nopar:Nn \__xpg_at_begin_document_hyphenation: {}
+% select defaultlanguage hook. Since we only want the
+% last definition of this, we do not use a \hook
+\cs_new_nopar:Nn \__xpg_selectdefaultlanguage: {}
+% things to be done after the above
+\hook_new:n { polyglossia / selectdefaultlanguage / after }
-% hook to be executed at begin of document
-\cs_new_nopar:Nn \__xpg_at_begin_document:
+% things to be executed at begin of document
+\hook_gput_code:nnn {begindocument} {.}
{
% save various command
\cs_gset_eq:cc{latin@alph}{@alph}% TODO rename when we have the C locale
@@ -84,22 +101,14 @@
\xpg_set_familydefault:
}
-\hook_gput_code:nnn {begindocument} {.}
-{
- \__xpg_at_begin_document:
-}
-
% The following needs to go after any \AtBeginDocument (also of packages
% loaded after \set[main|other]language
-% Track whether the main language has been set
-\bool_new:N \g_xpg_main_lang_set_bool
\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
- % If hyphenation disabling has been requested in preamble, do it now
- \__xpg_at_begin_document_hyphenation:
+ \__xpg_selectdefaultlanguage:
+ % Do the things that need to be done after default language selection
+ \hook_use_once:n { polyglossia / selectdefaultlanguage / after }
}
%
@@ -806,17 +815,12 @@
\DeclareDocumentCommand \disablehyphenation {}
{
- \bool_if:NTF \g_xpg_main_lang_set_bool
- {
- \__xpg_disable_hyphenation:
- }
- {
- % we have to postpone the execution until the main language
- % has been set (#125).
- \cs_gset_nopar:Nn \__xpg_at_begin_document_hyphenation: {
- \__xpg_disable_hyphenation:
- }
- }
+ % we have to postpone the execution until the main language
+ % has been set (#125).
+ \hook_gput_code:nnn { polyglossia / selectdefaultlanguage / after } {.}
+ {
+ \__xpg_disable_hyphenation:
+ }
}
\cs_new:Nn \__xpg_disable_hyphenation:
@@ -898,7 +902,7 @@
(Script="#3"~ to~ scripttag~ "#2")}
}
{
- \fontspec_if_script:nTF{#2}
+ \xpg_if_script:nTF{#2}
{\addfontfeature{Script=#3}}
{
\tl_set:Nn \xpg_ffamily_tl {}
@@ -919,6 +923,8 @@
% Strip font family name for error message
% Courtesy of egreg, https://tex.stackexchange.com/a/613996
\str_set:Nx \xpg_fname_str { \fontname\font }
+ % Remove name: prefix
+ \regex_replace_once:nnN { name: } { } \xpg_fname_str
% Remove all after :
\regex_replace_once:nnN { \:.* } { } \xpg_fname_str
% ... and all after /
@@ -1311,7 +1317,8 @@
{
\__xpg_setRTLmain:
}
- \cs_gset_nopar:Nn \__xpg_at_begin_document_selectlanguage: {
+ \cs_gset_nopar:Nn \__xpg_selectdefaultlanguage:
+ {
\selectbackgroundlanguage{#2}
\selectlanguage[#1]{#2}
}
@@ -1657,6 +1664,7 @@
% (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} }
+ \tl_set:Ne \xpg__current_options_tl { #2 }
}
% joint code of \foreignlanguage, otherlanguage*
@@ -1685,13 +1693,6 @@
% prevent case changing of language name in \foreignlanguage
\tl_put_right:Nn \l_text_case_exclude_arg_tl { \foreignlanguage }
-% Direct access to \xpg_set_foreign_language:nn
-% used in captions
-\NewDocumentCommand \setforeignlanguage { O{} m }
-{
- \xpg_set_foreign_language:nn { #1 } { #2 }
-}
-
% internal wrapper for foreign language
% #1 option
% #2 alias
@@ -1707,6 +1708,7 @@
\xpg_otherlanguage:nn{ \xpg_alias_add_to_option_i:nn{#2}{#1} }{ #3 }
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
+ \cs_if_exist_use:c{ nestedextras@\languagename }
}
}
\cs_generate_variant:Nn \__xpg_foreignlanguage:nnnn {eeen}
@@ -1718,6 +1720,7 @@
\__xpg_otherlanguage:eee { #1 } { #2 } { \xpg_alias_base_lang:n { #2 } }
}{
\c_group_end_token% \group_end: does not work here!
+ \cs_if_exist_use:c{ nestedextras@\languagename }
}
% internal wrapper
@@ -1769,20 +1772,18 @@
\cs_if_exist_use:c{date@bbl@\babelname}
\__xpg_lang_set_text_direction:nn{#3}{#4}
\group_end:
+ \cs_if_exist_use:c{ nestedextras@\languagename }
}
}
\cs_generate_variant:Nn \__xpg_textlanguage:nnnn {nnen}
% Define language-specific hyphenation exceptions
\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}
- \c_group_end_token
-}
+ {
+ \begin{hyphenrules}[#1]{#2}
+ \hyphenation{#3}
+ \end{hyphenrules}
+ }
% Hook that other package authors can use
@@ -1859,6 +1860,7 @@
\__xpg_set_language_options:nn {#1} {#2}
}
\tl_new:N \xpg__tmp_default_options_tl
+\tl_new:N \xpg__current_options_tl
\cs_generate_variant:Nn \keys_precompile:nnN { nec }
% Record synonymous keyvals such as variant=us and variant=american
@@ -2011,21 +2013,26 @@
}
\hook_gput_code:nnn {begindocument} {.}
-{
- \if@filesw
- \immediate\write\@mainaux
- {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
- \fi
-}
+ {
+ \if@filesw
+ \immediate\write\@mainaux
+ {\ProvideDocumentCommand\selectlanguage{sO{}m}{}}
+ \fi
-% Since captions might float to other language regions,
-% we need to change the language here (#542)
-\hook_gput_code:nnn {cmd/caption/before} {.}
-{
- \ifhmode\unskip\fi
- \addtocontents{lof}{\protect\setforeignlanguage{\languagename}}
- \addtocontents{lot}{\protect\setforeignlanguage{\languagename}}
-}
+ % we need to redefine \@caption to intrude the currently active language
+ % for the lot/lof.
+ % Since captions might float to other language regions,
+ % we need to specify the language here (#542)
+ \cs_set_eq:cc { __xpg_save_caption:n } { @caption }
+ \cs_new:Npn \xpg@current@opts {}
+
+ \cs_set:Npn \@caption #1 [#2] #3
+ {
+ % we might be outside of l3 catcode regime
+ \tl_set_eq:NN \xpg@current@opts \xpg__current_options_tl
+ \__xpg_save_caption:n { #1 } [ { \selectlanguage*[\xpg@current@opts]{\languagename}#2 } ] { #3 }
+ }
+ }
% check if language is defined
\prg_set_conditional:Npnn \__xpg_pattern_check_if_exists:n #1 { F, TF }
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex
index f603c71f965..dea7c68cb9d 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex
@@ -1,6 +1,10 @@
%%%
% Allumettes
%%%
+\def\filedateAllu{2024/08/04}%
+\def\fileversionAllu{0.1}%
+\message{-- \filedateAllu\space v\fileversionAllu}
+%
\setKVdefault[Allumettes]{Impression=false,Echelles=false}%
\defKV[Allumettes]{Echelle=\setKV[Allumettes]{Echelles}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex
index 4113ae9a278..347c56f6401 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex
@@ -1,6 +1,9 @@
%%%
% Arbre de calculs
%%%
+\def\filedateArbreC{2024/08/04}%
+\def\fileversionArbreC{0.1}%
+\message{-- \filedateArbreC\space v\fileversionArbreC}%
\newtoks\toklistearbre%
\newtoks\toklistearbrefractions%
\newtoks\toklistearbreexpressions%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex
index f724c16fda8..26d5cb021af 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex
@@ -2,6 +2,9 @@
% ArbreChiffre
%%%
% https://tex.stackexchange.com/questions/112975/how-to-print-the-permutation-of-s-u-v-a-t-with-latex
+\def\filedateArbreCh{2024/08/04}%
+\def\fileversionArbreCh{0.1}%
+\message{-- \filedateArbreCh\space v\fileversionArbreCh}%
\def\recurse#1#2#3#4\endmarker{%
\dopermute{#1#3}#2#4\endmarker
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex
index 5521dbb4193..7f04a083238 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex
@@ -1,6 +1,10 @@
%%%
% Assemblages solides
%%%
+\def\filedateAssemblageS{2024/08/04}%
+\def\fileversionAssemblageS{0.1}%
+\message{-- \filedateAssemblageS\space v\fileversionAssemblageS}%
+%
\setKVdefault[Assemblage]{Phi=30,Theta=20,Distance=50,Anglez=0,Anglex=0,Largeur=1.5,Profondeur=0.75,Hauteur=1,RayonBoule=1,RayonCone=1,RayonCylindre=1,HauteurPrisme=1,HauteurPyramideA=1,HauteurPyramideB=1,HauteurConeA=1,HauteurConeB=1,HauteurCylindre=1,Cotes=3,Trace=false,Type=Pyramides}%
\defKV[Assemblage]{Traces=\setKV[Assemblage]{Trace}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex
index fbf80943d41..bb000dee6a5 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex
@@ -1,6 +1,10 @@
%%%
% Automatismes
%%%
+\def\filedateAutomatismes{2024/08/04}%
+\def\fileversionAutomatismes{0.1}%
+\message{-- \filedateAutomatismes\space v\fileversionAutomatismes}%
+%
\NewDocumentCommand\ChoixAleaMixold{mmmm}{%
\ChoixAlea{1}{2}{\Autograine}%
\ifnum\Autograine=1\relax%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex
index b75161ffcc9..3e72a725755 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex
@@ -1,4 +1,10 @@
-%%% Autonomie %%%
+%%%
+%Autonomie
+%%%
+\def\filedateAutonomie{2024/08/04}%
+\def\fileversionAutonomie{0.1}%
+\message{-- \filedateAutonomie\space v\fileversionAutonomie}%
+%
\setKVdefault[Autonomie]{AfficheMarge=false,TitreEnigme=Enigme,TitreAtoi=\`A toi,Enigme=false,TexteCorrection=\bfseries Correction,ARemplir=false,Deux=false,Landscape=false}%
\newcommand\Autonomie[3][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex
index 8ee730bbfb3..d56f096d7eb 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex
@@ -1,6 +1,10 @@
%%%
% Barres de niveaux
%%%
+\def\filedateBarreNiveaux{2024/08/04}%
+\def\fileversionBarreNiveaux{0.1}%
+\message{-- \filedateBarreNiveaux\space v\fileversionBarreNiveaux}%
+%
\setKVdefault[ClesBarre]{Niveau=false,LimiteI=25,LimiteF=50,LimiteS=75,TexteOrigine=0,TexteReference=100,CouleurGraduation=white,CouleurFond=gray!50,CouleurBarre=black,Graduation=false,Nom=D\'efaut,Pas=10,CouleurI=red,CouleurF=orange,CouleurS=yellow,CouleurM=green}
\newlength{\barrewidth}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex
index 12b50770251..47537abe92f 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex
@@ -1,6 +1,9 @@
%%%
% Barres de calculs
%%%
+\def\filedateBarresCalculs{2024/08/04}%
+\def\fileversionBarresCalculs{0.1}%
+\message{-- \filedateBarresCalculs\space v\fileversionBarresCalculs}%
\setKVdefault[SuiteBarre]{Litteral=false,Perso=false,Decimaux=false}
\NewDocumentCommand\BarresCalculs{o m m}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex
index 6faf8038038..dc0082cef84 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex
@@ -1,6 +1,10 @@
%%%
% Billard
%%%
+\def\filedateBillard{2024/08/28}%
+\def\fileversionBillard{0.1a}%
+\message{-- \filedateBillard\space v\fileversionBillard}%
+%
\newtoks\tokPfCMotBillard{}%
\def\UpdateTokBillard#1\nil{\addtotok\tokPfCMotBillard{"#1"}}%
@@ -227,11 +231,9 @@
}%
\def\MPBillardSolution#1#2#3{%
- % \mplibcodeinherit{enable}%
\mplibforcehmode
\xdef\PfCNomBillard{\useKV[ClesBillard]{Nom}}
\begin{mplibcode}[\PfCNomBillard]
-% Figure(0,0,\useKV[ClesBillard]{Longueur}+2cm,\useKV[ClesBillard]{Largeur}+3cm);
trace rec;
% Tracés
drawarrow Pt[1]--(Pt[1]+1.5cm*unitvector(Pt[2]-Pt[1])) withpen pencircle scaled 1.25;
@@ -253,14 +255,16 @@
else:
dotlabel.bot(TEX(substring(0,1) of #1),Pt[1]);
fi;
+ path segmenttest;
for k=2 upto BLong:
- if (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[1])<>(-1,-1):
+ segmenttest:=(9/10)[Pt[k-1],Pt[k]]--(11/10)[Pt[k-1],Pt[k]];
+ if segmenttest intersectiontimes cote[1]<>(-1,-1):
dotlabel.bot(TEX(substring(k-1,k) of #1),Pt[k]);
- elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[2])<>(-1,-1):
+ elseif segmenttest intersectiontimes cote[2]<>(-1,-1):
dotlabel.rt(TEX(substring(k-1,k) of #1),Pt[k]);
- elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[3])<>(-1,-1):
+ elseif segmenttest intersectiontimes cote[3]<>(-1,-1):
dotlabel.top(TEX(substring(k-1,k) of #1),Pt[k]);
- elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[4])<>(-1,-1):
+ elseif segmenttest intersectiontimes cote[4]<>(-1,-1):
dotlabel.lft(TEX(substring(k-1,k) of #1),Pt[k]);
fi;
endfor;
@@ -270,5 +274,4 @@
label.top(TEX(substring(k-1,k) of #1),((xpart(Co),5mm)-center Reponse)+(k-1)*(7mm,0)+(2.5mm,0));
endfor;
\end{mplibcode}%
-% \mplibcodeinherit{disable}%
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex
index 25408ad5fed..c783f90d8e3 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex
@@ -1,6 +1,10 @@
%%%
% Bon de sortie
%%%
+\def\filedateBonSortie{2024/08/04}%
+\def\fileversionBonSortie{0.1}%
+\message{-- \filedateBonSortie\space v\fileversionBonSortie}%
+%
\newcommand\BonSortieBandeau{%
Nom : \hfill Date : \hspace*{3cm}
}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex
index 08be71cd4f0..8c897fa4deb 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex
@@ -1,9 +1,13 @@
%%%
% Bonbon
%%%
+\def\filedateBonbon{2024/08/04}%
+\def\fileversionBonbon{0.1}%
+\message{-- \filedateBonbon\space v\fileversionBonbon}%
+%
\setKVdefault[Bonbon]{CouleurUn=red,Bicolore=false,Echelle=1}%
\defKV[Bonbon]{CouleurDeux=\setKV[Bonbon]{Bicolore}}%
-
+%
\NewDocumentCommand\Bonbon{o}{%
\useKVdefault[Bonbon]%
\setKV[Bonbon]{#1}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex
index f77aea497a2..cb8dd56fd27 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex
@@ -1,3 +1,10 @@
+%%%
+% CAN
+%
+\def\filedateCAN{2024/08/04}%
+\def\fileversionCAN{0.1}%
+\message{-- \filedateCAN\space v\fileversionCAN}%
+%
% Gestion de l'aléatoire (pour la CAN)
\newcommand\ChoixAlea[4][]{%
\ifx\bla#1\bla%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex
index d2a189e29b5..c97b32472fd 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex
@@ -1,6 +1,9 @@
%%%
% Calculatrice
%%%
+\def\filedateCalculatrice{2024/08/04}%
+\def\fileversionCalculatrice{0.1}%
+\message{-- \filedateCalculatrice\space v\fileversionCalculatrice}%
%https://tex.stackexchange.com/questions/290321/mimicking-a-calculator-inputs-and-screen
\definecolor{lightorange}{rgb}{0.9,0.4,0}%
\definecolor{lightestorange}{rgb}{1,0.8,0.5}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex
index d17a6c9f556..eb9b8b739d1 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex
@@ -1,6 +1,10 @@
%%%
% Calculs Croises
%%%
+\def\filedateCalculsCroises{2024/08/04}%
+\def\fileversionCalculsCroises{0.1}%
+\message{-- \filedateCalculsCroises\space v\fileversionCalculsCroises}%
+%
\setKVdefault[CalculsCroises]{Largeur=20pt,Solution=false,Inverse=false,Creation=false,Graines=false,Vide=false,Couleur=LightGray,Negatifs=false,Aide=false,CouleurS=blue}
\defKV[CalculsCroises]{Graine=\setKV[CalculsCroises]{Graines}}%
\defKV[CalculsCroises]{ListeNombres=\setKV[CalculsCroises]{Aide}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex
new file mode 100644
index 00000000000..df321d523a2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex
@@ -0,0 +1,147 @@
+%%%
+% Calculs détaillés
+%%%
+\def\filedateCDetailles{2024/08/24}%
+\def\fileversionCDetailles{0.1}%
+\message{-- \filedateCDetailles\space v\fileversionCDetailles}
+%
+\setKVdefault[CalculAuto]{Under=false,OverB=false,OverC=false,UnderB=false,UnderC=false,Cadre=false,Fluo=false,Evidence=false,Lettres={A,B,C,D,E},Couleur=Purple}
+
+\newcounter{PfCNbCalculs}
+\newcounter{PfCNbSousCalculs}
+\newcounter{PfCNbMarque}
+
+\NewDocumentCommand\PfCMarquePriorite{m}{%
+ \ifboolKV[CalculAuto]{OverB}{%
+ \Overbrace{#1}%
+ }{%
+ \ifboolKV[CalculAuto]{OverC}{%
+ \Overcrochet{#1}%
+ }{%
+ \ifboolKV[CalculAuto]{UnderC}{%
+ \Undercrochet{#1}%
+ }{%
+ \ifboolKV[CalculAuto]{UnderB}{%
+ \Underbrace{#1}%
+ }{%
+ \ifboolKV[CalculAuto]{Cadre}{%
+ \PfCFbox{CCalculAuto}{#1}
+ }{%
+ \ifboolKV[CalculAuto]{Fluo}{%
+ \Surligner[CCalculAuto]{#1}
+ }{%
+ \ifboolKV[CalculAuto]{Under}{%
+ \mathunderline{CCalculAuto}{#1}%
+ }{%
+ \ifboolKV[CalculAuto]{Evidence}{%
+ \mathcolor{CCalculAuto}{#1}%
+ }{%
+ #1%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}%
+
+\NewDocumentCommand\CalculDetaille{om}{%
+ \useKVdefault[CalculAuto]%
+ \setKV[CalculAuto]{#1}%
+ \colorlet{CCalculAuto}{\useKV[CalculAuto]{Couleur}}%
+ \setcounter{PfCNbCalculs}{0}%
+ \setsepchar{§}\ignoreemptyitems%
+ \readlist*\ListeNombresCalculs{#2}%
+ \reademptyitems%
+ \xdef\PfCFooListeLettres{\useKV[CalculAuto]{Lettres}}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeLettres{\PfCFooListeLettres}%
+ \reademptyitems%
+ \xdef\PfCNbMaxLignesCalculs{0}%
+ \foreachitem\compteur\in\ListeNombresCalculs{%
+ \stepcounter{PfCNbCalculs}%
+ \itemtomacro\ListeNombresCalculs[\compteurcnt]\Titi%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeNombresCalculsDetails{\Titi}%
+ \reademptyitems%
+ \expandafter\xdef\csname NbLignesCalculs\Alph{PfCNbCalculs}\endcsname{\ListeNombresCalculsDetailslen}%
+ \xdef\PfCNbMaxLignesCalculs{\fpeval{max(\PfCNbMaxLignesCalculs,\ListeNombresCalculsDetailslen)}}%
+ \setcounter{PfCNbSousCalculs}{0}%
+ \foreachitem\compteura\in\ListeNombresCalculsDetails{%
+ \stepcounter{PfCNbSousCalculs}%
+ \StrSubstitute{\compteura}{*}{\times}[\PfCCalculAutoUn]%
+ \StrSubstitute{\PfCCalculAutoUn}{:}{\div}[\PfCCalculAutoDeux]%
+ \StrCount{\PfCCalculAutoDeux}{<}[\NbInf]%
+ \ifnum\fpeval{\NbInf}=0\relax%
+ \expandafter\xdef\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname{1}%
+ \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}A\endcsname{\PfCCalculAutoDeux}%
+ \else%
+ \xdef\PfCExpressionDepart{\PfCCalculAutoDeux}%
+ \setcounter{PfCNbMarque}{0}%
+ \foreach\xx in{1,...,\NbInf}{%
+ \StrBefore{\PfCExpressionDepart}{<}[\PfCDevant]%
+ \StrBetween{\PfCExpressionDepart}{<}{>}[\PfCAEncadrer]%
+ \stepcounter{PfCNbMarque}%
+ \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{\PfCDevant}%
+ \stepcounter{PfCNbMarque}%
+ \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{<\PfCAEncadrer}%
+ \StrBehind{\PfCExpressionDepart}{>}[\PfCExpressionDepartA]%
+ \xdef\PfCExpressionDepart{\PfCExpressionDepartA}%
+ }%
+ \stepcounter{PfCNbMarque}%
+ \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{\PfCExpressionDepart}%
+ \expandafter\xdef\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname{\thePfCNbMarque}%
+ \fi
+ }%
+ }%
+ %%%%%%%%%
+ \setcounter{PfCNbSousCalculs}{0}%
+ \[%
+ \begin{aligned}
+ \xintFor* ##2 in{\xintSeq{1}{\PfCNbMaxLignesCalculs}}\do{%
+ \stepcounter{PfCNbSousCalculs}%
+ \setcounter{PfCNbCalculs}{0}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeNombresCalculslen}}\do{%
+ \stepcounter{PfCNbCalculs}%
+ \ifnum##2>\fpeval{\csname NbLignesCalculs\Alph{PfCNbCalculs}\endcsname}\relax%
+ \uppercase{&}
+ \else
+ \ListeLettres[\thePfCNbCalculs]\uppercase{&}=\xdef\Tata{\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname}\setcounter{PfCNbMarque}{0}\xintFor*##3 in{\xintSeq{1}{\Tata}}\do{%
+ \stepcounter{PfCNbMarque}
+ \xdef\Toto{\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname}\StrChar{\Toto}{1}[\PfCATester]
+ \IfStrEq{\PfCATester}{<}{\StrBehind{\Toto}{<}[\PfCAEncadrer]\PfCMarquePriorite{\PfCAEncadrer}}{\Toto}
+ }
+ \fi\xintifForLast{&}{}
+ }\\
+ }
+ \end{aligned}
+ \]
+}%
+
+\def\Underbrace#1{%
+ \ifx#1\bla\bla\else\color{CCalculAuto}\underbrace{{\color{black}#1}}\color{black}\fi%
+}%
+\def\Undercrochet#1{%
+ \ifx#1\bla\bla\else\color{CCalculAuto}\underbracket{{\color{black}#1}}\color{black}\fi%
+}%
+\def\Overbrace#1{%
+ \ifx#1\bla\bla\else\color{CCalculAuto}\overbrace{{\color{black}#1}}\color{black}\fi%
+}%
+\def\Overcrochet#1{%
+ \ifx#1\bla\bla\else\color{CCalculAuto}\overbracket{{\color{black}#1}}\color{black}\fi%
+}%
+\def\PfCFbox#1#2{%
+ \ifx#2\bla\bla\else\setlength{\fboxrule}{1pt}\fcolorbox{#1}{white}{$\displaystyle#2$}\fi%
+}%
+
+\NewDocumentCommand{\Surligner}{O{yellow}m}{%
+ \ifx#2\bla\bla\else
+ \ifmmode%
+ \colorbox{#1}{$\displaystyle#2$}%
+ \else%
+ \colorbox{#1}{#2}%
+ \fi%
+ \fi
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
index e3660cff1e1..cc19c93e548 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex
@@ -1,3 +1,10 @@
+%%%
+% Calculs fractions
+%
+\def\filedateCalculsFractions{2024/08/04}%
+\def\fileversionCalculsFractions{0.1}%
+\message{-- \filedateCalculsFractions\space v\fileversionCalculsFractions}%
+%
\setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false,Seul=false}%
\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}\setKV[ClesSimplification]{Couleur=#1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex
index 929b1fb28e9..dd2fe56db37 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex
@@ -1,6 +1,10 @@
%%%
% Calisson
%%%
+\def\filedateCalisson{2024/08/04}%
+\def\fileversionCalisson{0.1}%
+\message{-- \filedateCalisson\space v\fileversionCalisson}%
+%
\setKVdefault[Calisson]{Taille=3,Solution=false,Rayon=5cm,Couleur=red,CouleurTrace=black}%
\def\UpdatetoksCalissong#1\nil{\addtotok\tokcalissonlistetracesg{,"#1"}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex
index 1e2075d91af..98bb4b8b3cf 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex
@@ -1,6 +1,10 @@
%%%
% Cards
%%%
+\def\filedateCartesJeux{2024/08/04}%
+\def\fileversionCartesJeux{0.1}%
+\message{-- \filedateCartesJeux\space v\fileversionCartesJeux}%
+%
\setKVdefault[Cards]{Formats=false,Largeur=165,Hauteur=250,HauteurTheme=40,Marge=12,Landscape=false,Couleur=Cornsilk,CouleurAr=Cornsilk,Theme=Th\'eor\`eme\\de
Pythagore,ThemeSol=Solution,AfficheTheme=false,Trame=false,Jointes=false,TrameVisible=false,RayonArc=5pt,Titre=false,NomTitre=Jeu 1,Loop,JaiQuia=false,Eleve=false,BackgroundAv=false,BackgroundAr=false,%ImageAv=4813762.jpg,ImageAr=4813762.jpg,
AffichageSolution=true,SolutionSeule=false,%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex
index ea9b30af037..90812c7e9ea 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex
@@ -1,6 +1,10 @@
%%%
% Cartes Mentales
%%%
+\def\filedateCarteMentale{2024/08/04}%
+\def\fileversionCarteMentale{0.1}%
+\message{-- \filedateCarteMentale\space v\fileversionCarteMentale}%
+%
\setKVdefault[ClesMentales]{Nom={Bulle}, Largeur=5cm, Ancre={0,0},Pointilles=false,CTrace=black,CFond=white,Epaisseur=1pt,Rayon=1}%
\newenvironment{Mind}{\begin{tikzpicture}}{\end{tikzpicture}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
index e23001bbcca..4396dc6f87b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex
@@ -1,7 +1,11 @@
%%%
% Cartographie
%%%
-\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2023/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1,Maillage=false}
+\def\filedateCartographie{2024/08/04}%
+\def\fileversionCartographie{0.1}%
+\message{-- \filedateCartographie\space v\fileversionCartographie}%
+%
+\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2024/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1,Maillage=false}
\defKV[Cartographie]{EchelleCarte=\setKV[Cartographie]{Carte}}
\defKV[Cartographie]{Pays=\setKV[Cartographie]{PaysSeul}}
\defKV[Cartographie]{Villes=\setKV[Cartographie]{VillesSup}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex
new file mode 100644
index 00000000000..531af4efc12
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex
@@ -0,0 +1,125 @@
+%%%
+% PfCCheque
+%%%
+\def\filedateCheque{2024/09/03}%
+\def\fileversionCheque{0.1}%
+\message{-- \filedateCheque\space v\fileversionCheque}%
+\newlength{\oldbaseline}
+\newlength{\PfCTailleCursive}
+
+\setKVdefault[Cheque]{Sigle=CMF,Banque=Crédit Mathématique de France,Date=\today,Lieu={},Lire=false,Destinataire=Institut Curie,Solution=false,Longueur=15,Taille=\normalsize,Ajust=0pt}
+
+%https://tex.stackexchange.com/questions/406015/defining-macro-gsetlength-as-global-setlength-reliable
+\makeatletter
+\gdef\gsetlength#1#2{%
+ \begingroup
+ \setlength\skip@{#2}% Local assignment to a scratch register.
+ \global#1=\skip@ % Global assignement to #1;
+ % \relax is not necessary because of the following \endgroup.
+ \endgroup % \skip@ is restored by end of group.
+}
+\makeatother
+
+\NewDocumentCommand{\Cheque}{om}{%
+ \useKVdefault[Cheque]%
+ \setKV[Cheque]{#1}%
+ \setbox1=\hbox{\useKV[Cheque]{Taille}\myfontCursive abcdefghijklmnopqrstuvwxyz}%
+ {\useKV[Cheque]{Taille}\myfontCursive\gsetlength{\oldbaseline}{\baselineskip}\normalsize}%
+ \setlength{\PfCTailleCursive}{0.5\ht1+\useKV[Cheque]{Ajust}}%
+ \BuildCheque{#2}%
+}%
+
+\NewDocumentCommand{\BuildCheque}{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Solution,Lire;
+ Solution=\useKV[Cheque]{Solution};
+ Lire=\useKV[Cheque]{Lire};
+ Longueur=\useKV[Cheque]{Longueur};
+ baselinecp=\fpeval{\oldbaseline};
+ %
+ pair A,B,C,D,M[],N[];
+ A=(0,0);
+ B-A=u*(Longueur,0);
+ C-B=u*(0,5);
+ D-C=A-B;
+ %
+ M1=1/3[D,A];
+ %
+ picture Payez;
+ Payez=image(
+ label.rt(TEX("Payez contre ce chèque"),M1);
+ );
+ %
+ M20=(xpart(M1),ypart(llcorner Payez));
+ M2-M20=(0,-baselinecp);
+ M3-M2=u*(0,-0.5);
+ M4-M3=M2-M1;
+ M5-M4=u*(0.4*Longueur,-0.25);
+ M6-M4=u*(0,-0.25)+u*(0.5,0);
+ M7-M6=u*(2,0);
+ %
+ A:=(xpart(M4),ypart(M6)-1u);
+ B:=A+C-D;
+ %
+ N1=1/2[M1,M2]+0.8*(B-A);
+ N2-N1=M2-M1;
+ N3-N2=0.18*(B-A);
+ N4-N3=N1-N2;
+ drawoptions(withcolor NavyBlue);
+ picture BaseLettre;
+ %%%%%%%%%%%%%%%%
+ fill polygone(A,B,C,D) withcolor 0.8[LightSteelBlue,white];
+ trace polygone(A,B,C,D);
+ draw Payez;
+ label.rt(TEX("{\sffamily \Huge \useKV[Cheque]{Sigle}}"),D+u*(0,-0.5));
+ label.rt(TEX("{\sffamily \useKV[Cheque]{Banque}}"),D+u*(0,-1));
+ trace (lrcorner Payez)--(0.75[(xpart(M1),ypart(lrcorner Payez)),(xpart(M1+B-A),ypart(lrcorner Payez))]);
+ label.rt(TEX("\tiny non endossable sauf au profit d'une banque ou d'un établissement assimilé."),M1+u*(0,-0.300));
+ trace 1/90[M2,M2+B-A]--(0.75[M2,M2+B-A]);
+ label.rt(TEX("À \useKV[Cheque]{Destinataire}"),M3);
+ trace 1/45[M3+u*(0,-0.2),M3+u*(0,-0.2)+B-A]--(0.75[M3+u*(0,-0.2),M3+u*(0,-0.2)+B-A]);
+ fill polygone(N1,N2,N3,N4) withcolor white;
+ trace polygone(N1,N2,N3,N4) withpen pencircle scaled 1.2 withcolor NavyBlue;
+ if Lire=false:
+ label.rt(TEX("\si{\EuRo}~#1"),iso(N1,N2));
+ else:
+ if Solution:
+ label.rt(TEX("\si{\EuRo}~\num{#1}"),iso(N1,N2));
+ fi;
+ fi;
+ label.rt(TEX("À~\hbox to"&decimal(Longueur/5)&"cm{\hrulefill}\quad Le~\hbox to"&decimal(Longueur/5)&"cm{\hrulefill}"),M5);
+ label.top(TEX("\Huge \si{\EuRo}uro"),iso(N4,N1)+u*(0,1));
+ label(TEX("\tiny « à régler exclusivement en euros »"),iso(N4,N1)+u*(-0.5,1));
+ label(TEX("\ChoixAlea{100000}{999999}{\numcheque}\numcheque"),iso(M6,M7));
+ trace cotationmil(M6,M7,2.5mm,25,TEX("\scriptsize chèque \no"));
+ %%
+% drawoptions(withcolor red);
+% draw (llcorner Payez)--(llcorner Payez+B-A);
+% draw M2--(M2+B-A);
+% drawoptions();
+ picture Sous;
+ Sous=image(%
+ label(TEX("\begin{minipage}{\fpeval{0.75*"&decimal(Longueur)&"}cm}
+ \hspace{"&decimal(abs(lrcorner Payez-llcorner Payez))&"pt}\myfontCursive\useKV[Cheque]{Taille}\Ecriture{#1}~euros
+ \end{minipage}"),(0,0));
+ );
+ pair PointBase,PointTest,Decalage;
+ PointBase=1/2[M20,M2+(u*0.75Longueur,0)];
+ PointTest=(0,0);%
+ if abs(llcorner Sous-ulcorner Sous)>baselinecp:
+ Decalage=(8pt,\fpeval{\PfCTailleCursive});
+ else:
+ Decalage=(8pt,2*\fpeval{\PfCTailleCursive});
+ fi;
+ if Lire:
+ draw Sous shifted (PointBase-PointTest+Decalage);
+ else:
+ if Solution:
+ draw Sous shifted (PointBase-PointTest+Decalage);
+ fi;
+ fi;
+ \end{mplibcode}
+ \fi%
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex
index d29fdccf9de..91e8f28e042 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex
@@ -1,6 +1,10 @@
%%%
% Cibles
%%%
+\def\filedateCible{2024/08/04}%
+\def\fileversionCible{0.1}%
+\message{-- \filedateCible\space v\fileversionCible}%
+%
\newtoks\toklisteciblea%
\def\UpdatetoksCibleA#1\nil{\addtotok\toklisteciblea{"#1",}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex
index 336b10651d0..c33f5242b37 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex
@@ -1,3 +1,10 @@
+%%%
+% Cible 4 opérations
+%%%
+\def\filedateCibleQOp{2024/08/04}%
+\def\fileversionCibleQOp{0.1}%
+\message{-- \filedateCibleQOp\space v\fileversionCibleQOp}%
+
\newcount\anpcqo\newcount\bnpcqo\newcount\cnpcqo%
\NewDocumentCommand\PfCCQODiviseurs{m}{%#1 : le nombre entier \`a tester
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex b/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex
index 33a1ef2446e..9c446f6b435 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex
@@ -1,4 +1,10 @@
-%%% Colorilude %%%
+%%%
+% Colorilude
+%%%
+\def\filedateColorilude{2024/08/04}%
+\def\fileversionColorilude{0.1}%
+\message{-- \filedateColorilude\space v\fileversionColorilude}%
+%
\setKVdefault[Colorilude]{Largeur=10,Lignes=10,Legende=false,Coef=0.6,Solution=false,CartonReponse=false,Resultats=false}
\newcommand\dispogpfc[3][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex
index 1d5339b114c..bbf219e431a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex
@@ -1,6 +1,10 @@
%%%
% Le compte est bon
%%%
+\def\filedateCompteBon{2024/08/04}%
+\def\fileversionCompteBon{0.1}%
+\message{-- \filedateCompteBon\space v\fileversionCompteBon}%
+%
\setKVdefault[CompteBon]{NombreCalculs=5,NombrePlaques=4,Solution=false,Relatifs=false,Original=false,Graines=false,Plaques=6,CDot=false}
\defKV[CompteBon]{Graine=\setKV[CompteBon]{Graines}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex
index e6ed80f0125..86da03a0784 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex
@@ -1,3 +1,10 @@
+%%%
+% Conversion
+%%%
+\def\filedateConversion{2024/08/04}%
+\def\fileversionConversion{0.1}%
+\message{-- \filedateConversion\space v\fileversionConversion}%
+
\setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Completes=false}%
\defKV[ClesConversion]{Complete=\setKV[ClesConversion]{Completes}}%
\defKV[ClesConversion]{Masse=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Masses}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex
index 34c96a9b069..4818b941c78 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex
@@ -1,6 +1,10 @@
%%%
% Criteres de divisibilite
%%%
+\def\filedateCritere{2024/08/04}%
+\def\fileversionCritere{0.1}%
+\message{-- \filedateCritere\space v\fileversionCritere}%
+%
\setKVdefault[Critere]{Div=2,Remarque=false,All=false,RemarqueAll=false}
\NewDocumentCommand\Critere{om}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex
index bfa2e8c76af..1494c2adc6c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex
@@ -1,6 +1,10 @@
%%%
% Cryptarithmes
%%%
+\def\filedateCrypta{2024/08/04}%
+\def\fileversionCrypta{0.1}%
+\message{-- \filedateCrypta\space v\fileversionCrypta}%
+%
\setKVdefault[Crypta]{Solution=false,ListeLettres={A,B,C,D,E,F,G,H,I,J},Tableau=false}%
\defKV[Crypta]{Indices=\setKV[Crypta]{Tableau}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex
index b2db7fd38b0..861821ce823 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex
@@ -1,6 +1,10 @@
%%%
% Décomposition décimale
%%
+\def\filedateDecDeci{2024/08/04}%
+\def\fileversionDecDeci{0.1}%
+\message{-- \filedateDecDeci\space v\fileversionDecDeci}%
+%
\setKVdefault[DecompDeci]{Parentheses,Colore=false,CouleurU=Blue,CouleurD=Red,CouleurC=Green,Fleches=false,Details=false,ResultatSeul=false,SansMul=false}
\newcounter{PfCNbDecDeci}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex
index b045c64f63b..1e627c2e3f7 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex
@@ -1,7 +1,12 @@
%%%
% D\'ecomposition de fractions d\'ecimales
%%%
-\setKVdefault[ClesFracDeci]{Complete=false,SansZero=false,Remediation=false,Longueur=1cm}
+\def\filedateDecompFracDeci{2024/08/13}%
+\def\fileversionDecompFracDeci{0.1a}%
+\message{-- \filedateDecompFracDeci\space v\fileversionDecompFracDeci}%
+%
+\setKVdefault[ClesFracDeci]{Complete=false,SansZero=false,Remediation=false,Longueur=1cm,Vides=false}%
+\defKV[ClesFracDeci]{Vide=\setKV[ClesFracDeci]{Remediation}\setKV[ClesFracDeci]{Vides}}%
\newlength{\PfCLongueurP}%
\newcommand\FractionDecimale[2][]{%
@@ -26,7 +31,7 @@
\xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}%
\xintFor* ##1 in {\xintSeq{1}{\LongueurPartieDecimale}}\do{%
\StrMid{\PartieDecimaleFractionDeci}{##1}{##1}[\ChiffrePartieDecimale]%
- \xintifForFirst{}{\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{+}}\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}%
+ \xintifForFirst{}{\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{+}}\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}}%
}%
}%
}{%
@@ -38,20 +43,20 @@
\StrGobbleLeft{\FractionDeciNum}{\fpeval{\LongueurPartieEntiere}}[\DecompositionFracDeciComplete]%
% on affiche la partie décimale.
\xintFor* ##1 in {\xintSeq{1}{\fpeval{\LongueurFracDeciNum-\LongueurPartieEntiere}}}\do{%
- \xintifForFirst{}{+}\StrMid{\DecompositionFracDeciComplete}{##1}{##1}[\ChiffrePartieDecimale]\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**##1}}}%
+ \xintifForFirst{}{+}\StrMid{\DecompositionFracDeciComplete}{##1}{##1}[\ChiffrePartieDecimale]\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**##1}}}}%
}%
}%
}{%
\ensuremath{%
\xintFor* ##1 in {\xintSeq{1}{\LongueurPartieDecimale}}\do{%
\StrMid{\PartieDecimaleFractionDeci}{##1}{##1}[\ChiffrePartieDecimale]%
- \xintifForFirst{}{+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}%
+ \xintifForFirst{}{+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}%
}%
}%
}%
}{%
\ensuremath{%
- \xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieDecimaleFractionDeci}}}{\num{\FractionDeciDeno}}%
+ \xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieDecimaleFractionDeci}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\FractionDeciDeno}}}%
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex
index bf1a28e3334..a741919482c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex
@@ -1,10 +1,19 @@
%%%
% Nombre Premier
%%%
-\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVide=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,ArbreDessine=false,ArbreDessineVide=false,Entoure=false,Entourefin=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill,Impose=false,ImposeAll=false,Potence=false,Decalage=10,Vide=false,CouleurFeuillage=ForestGreen,CouleurTronc=BurlyWood,CouleurFruits=Red,CouleurTexte=white}%
+\def\filedateDecompNbPremier{2024/09/01}%
+\def\fileversionDecompNbPremier{0.1a}%
+\message{-- \filedateDecompNbPremier\space v\fileversionDecompNbPremier}%
+%
+\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVide=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,ArbreDessine=false,ArbreDessineVide=false,Entoure=false,Entourefin=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill,Impose=false,ImposeAll=false,Potence=false,Decalage=10,Vide=false,CouleurFeuillage=ForestGreen,CouleurTronc=BurlyWood,CouleurFruits=Red,CouleurTexte=white,Poisson=false,Echelle=1cm,AngleArete=45,CouleurPoisson=white,Visible=false,Solution=false}%
\defKV[ClesNombrePremier]{Nombre=\ifboolKV[ClesNombrePremier]{ArbreDessine}{}{\ifboolKV[ClesNombrePremier]{ArbreDessineVide}{}{\setKV[ClesNombrePremier]{Impose}}}}%
\defKV[ClesNombrePremier]{AllNombre=\setKV[ClesNombrePremier]{ImposeAll}}%
-\defKV[ClesNombrePremier]{Impression=\setKV[ClesNombrePremier]{CouleurFeuillage=white,CouleurTronc=white,CouleurFruits=gris,CouleurTexte=black}}
+\defKV[ClesNombrePremier]{Impression=\setKV[ClesNombrePremier]{CouleurFeuillage=white,CouleurTronc=white,CouleurFruits=gris,CouleurTexte=black}}%
+\defKV[ClesNombrePremier]{ElementsVisibles=\setKV[ClesNombrePremier]{Visible}\setKV[ClesNombrePremier]{Vide}}%
+\defKV[ClesNombrePremier]{CouleurSolution=\setKV[ClesNombrePremier]{Solution}}%
+
+\newtoks\tokNPElementsVisibles%
+\def\UpdatetoksElementAfficher#1\nil{\addtotok\tokNPElementsVisibles{#1,}}%
\newcommand\Decomposition[2][]{%
\useKVdefault[ClesNombrePremier]%
@@ -26,6 +35,136 @@
\ifboolKV[ClesNombrePremier]{ArbreDessineVide}{\setKV[ClesNombrePremier]{Vide=true}\MPArbreDessine{#2}{\useKV[ClesNombrePremier]{Nombre}}}{}%
\ifboolKV[ClesNombrePremier]{Diviseurs}{\ListeDiviseur{#2}}{}%
\ifboolKV[ClesNombrePremier]{DiviseursT}{\ListeDiviseurT{#2}}{}%
+ \ifboolKV[ClesNombrePremier]{Poisson}{%
+ \tokNPElementsVisibles{}%
+ \PfCTousLesDiviseurs{#2}%
+ \ifboolKV[ClesNombrePremier]{Visible}{%
+ \xdef\foo{\useKV[ClesNombrePremier]{ElementsVisibles}}%
+ \readlist*\ListeElementsAAfficher{\foo}%
+ }{%
+ \xdef\foo{-1}\readlist*\ListeElementsAAfficher{\foo}%
+ }%
+ \foreachitem\compteur\in\ListeElementsAAfficher{\expandafter\UpdatetoksElementAfficher\compteur\nil}%
+ \MPFish{\PfCPileDiviseurs}{#2}{\the\tokNPElementsVisibles}%
+ }{}%
+}%
+
+\newcommand\PfCTousLesDiviseurs[1]{%
+ %#1 : le nombre entier \`a tester
+ \xdef\anpl{#1}%\relax%
+ \xdef\bnpl{2}%\relax%
+ \xdef\pilebl{2}%\relax%
+ \xdef\PfCPileDiviseurs{1}%
+ \loop
+ \ifnum\fpeval{\bnpl}<\fpeval{\anpl}\relax
+ \modulo{\fpeval{\anpl}}{\fpeval{\bnpl}}
+ \ifnum\remainder=0\relax
+ \xdef\PfCPileDiviseurs{\PfCPileDiviseurs,\fpeval{\bnpl}}%
+ \fi
+ \xdef\bnpl{\fpeval{\bnpl+1}}%
+ \repeat
+ \xdef\PfCPileDiviseurs{\PfCPileDiviseurs,#1}%
+}%%
+
+\def\MPFish#1#2#3{
+ \ifluatex
+ \mplibforcehmode%
+ \mplibnumbersystem{double}%
+ \begin{mplibcode}
+ Echelle=\useKV[ClesNombrePremier]{Echelle};
+ AngleArete=\useKV[ClesNombrePremier]{AngleArete};
+
+ boolean Vide,Visible,Solution;
+ Vide=\useKV[ClesNombrePremier]{Vide};
+ Visible=\useKV[ClesNombrePremier]{Visible};
+ Solution=\useKV[ClesNombrePremier]{Solution};
+
+ color CoulTete,CoulSol;
+ CoulTete=\useKV[ClesNombrePremier]{CouleurPoisson};
+ if Solution:
+ CoulSol=\useKV[ClesNombrePremier]{CouleurSolution};
+ fi;
+
+ numeric Diviseurs[];
+ vardef LectureDiviseurs(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ Diviseurs[n]=p_;
+ endfor;
+ enddef;
+
+ LectureDiviseurs(#1);
+ TotalDiviseurs:=n;
+
+ boolean RETOUR;
+ RETOUR=false;
+
+ vardef TestVisible(expr nrt)=
+ RETOUR:=false;
+ for p_=#3:
+ if p_=nrt:
+ RETOUR:=true;
+ fi;
+ endfor;
+ enddef;
+
+
+ pair Ah[],Ab[],O[],Ac;
+ O0=(0,0);
+ O[-1]=O0+Echelle*(0,1);
+ O[-2]=O0+Echelle*(0,-1);
+ fill (arccercle(O[-1],O[-2],O0)--cycle) withcolor CoulTete;
+ trace arccercle(O[-1],O[-2],O0)--cycle;
+ label.lft(TEX("\num{"&decimal(#2)&"}"),O0);
+ %
+ for k=1 upto (TotalDiviseurs div 2):
+ if k=1:Echelle:=Echelle/2;fi;
+ O[k]-O[k-1]=Echelle*(1,0);
+ if k=1:Echelle:=Echelle*2;fi;
+ Ah[k]-O[k]=Echelle*(cosd(AngleArete),sind(AngleArete));
+ Ab[k]-O[k]=Echelle*(cosd(AngleArete),-sind(AngleArete));
+ draw O[k-1]--O[k];
+ draw Ah[k]--O[k]--Ab[k];
+ if Vide=false:
+ label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]);
+ label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]);
+ else:
+ if Visible:
+ TestVisible(Diviseurs[k]);
+ if RETOUR:
+ label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]);
+ else:
+ if Solution:
+ drawoptions(withcolor CoulSol);
+ label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]);
+ drawoptions();
+ fi;
+ fi;
+ TestVisible(Diviseurs[TotalDiviseurs+1-k]);
+ if RETOUR:
+ label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]);
+ else:
+ if Solution:
+ drawoptions(withcolor CoulSol);
+ label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]);
+ drawoptions();
+ fi;
+ fi;
+ fi;
+ fi;
+ endfor;
+ if (TotalDiviseurs mod 2)<>0:
+ Ac-O[TotalDiviseurs div 2]=Echelle*(1,0);
+ draw Ac--O[TotalDiviseurs div 2];
+ if Vide=false:
+ label.rt(TEX("\num{"&decimal(Diviseurs[(TotalDiviseurs+1) div 2])&"}"),Ac);
+ fi;
+ fi;
+ \end{mplibcode}
+ \else
+ %
+ \fi
}%
\def\MPArbre#1{%
@@ -824,13 +963,13 @@
\begin{tabular}{c|c}%
1&\num{#1}\\
\xintFor* ##1 in {\xintSeq {1}{\fpeval{(\cnpT+1)/2}}}\do{%
- \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\xintifboolexpr{\dnpT=\fpeval{#1/\dnpT}}{}{\num{\fpeval{#1/\dnpT}}}\\
+ \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\xintifboolexpr{\dnpT==\fpeval{#1/\dnpT}}{\num{\fpeval{\dnpT}}}{\num{\fpeval{#1/\dnpT}}}\\
}
\end{tabular}%
\else%
\begin{tabular}{c|c}
1&\num{#1}
- \ifnum\cnpT>2\relax\\
+ \ifnum\cnpT>1\relax\\
\xintFor* ##1 in {\xintSeq {1}{\fpeval{\cnpT/2}}}\do{%
\DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\num{\fpeval{#1/\dnpT}}\\
}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex
index 6d850f80126..089b51658ab 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex
@@ -1,6 +1,10 @@
%%%
% Defi Calculatrice
%%%
+\def\filedateDefiCalc{2024/08/04}%
+\def\fileversionDefiCalc{0.1}%
+\message{-- \filedateDefiCalc\space v\fileversionDefiCalc}%
+%
\setKVdefault[DefiCalculatrice]{NbCasesNoires=6,ListeTouches={!},Impression=false}%
\newtoks\toktexteecran{}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex
index 340d598e2f8..79ad1064ebd 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex
@@ -1,7 +1,10 @@
%%%
% Defi Table
%%%
-
+\def\filedateDefiTables{2024/08/04}%
+\def\fileversionDefiTables{0.1}%
+\message{-- \filedateDefiTables\space v\fileversionDefiTables}%
+%
\setKVdefault[DefiTable]{Solution=false,Math=false,LargeurT=5mm,Graines=false,Creation=false,ValeurMin=1,ValeurMax=10,Restreint=false}
\defKV[DefiTable]{Graine=\setKV[DefiTable]{Graines}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex
index 85274cac81c..092aa5e8257 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex
@@ -1,6 +1,10 @@
%%%
% Dessin Algo
%%%
+\def\filedateDessinAlgo{2024/08/04}%
+\def\fileversionDessinAlgo{0.1}%
+\message{-- \filedateDessinAlgo\space v\fileversionDessinAlgo}%
+%
\newtoks\tokDessinAlgo%
\def\UpdatetoksDA#1\nil{\addtotok\tokDessinAlgo{#1,}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex
index 3bfacac68c2..bd83bb62404 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex
@@ -1,6 +1,10 @@
%%%
% Dessin Gradue
%%%
+\def\filedateDessinGradue{2024/08/04}%
+\def\fileversionDessinGradue{0.1}%
+\message{-- \filedateDessinGradue\space v\fileversionDessinGradue}%
+%
\setKVdefault[DessinGradue]{Lignes=10,Debut=-5,Fin=5,Pas=10,Solution=false,EcartVertical=1.5,LignesIdentiques,Longueur=10,Echelle=1,Droites=false,DemiDroites=false,OrigineVariable=false,Code=false}
\defKV[DessinGradue]{Traces=\setKV[DessinGradue]{Code}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex
index 27922bdd038..bbb24cb99cd 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex
@@ -1,6 +1,10 @@
%%%
% Lien : ratio
%%%
+\def\filedateDessinRatio{2024/08/04}%
+\def\fileversionDessinRatio{0.1}%
+\message{-- \filedateDessinRatio\space v\fileversionDessinRatio}%
+%
\setKVdefault[ClesRatio]{FigureCours=false,Figure=false,Longueur=5cm,TexteTotal=quantit\'e,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,CouleurTab=gray!15,ModeleCouleur=5}
\newcommand\MPTest[9][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex
index cbed30414d5..70180f2a315 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex
@@ -1,6 +1,10 @@
%%%
% Radar
%%%
+\def\filedateRadar{2024/08/04}%
+\def\fileversionRadar{0.1}%
+\message{-- \filedateRadar\space v\fileversionRadar}%
+%
\setKVdefault[ClesRadar]{Rayon=3cm,Reference=20,MoyenneClasse=false,Disciplines=false,Pas=5}
\newtoks\toklisteradara%pour la moyenne de l'\'el\`eve
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex
index ad0dd8885d8..b8a9dc57fc5 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex
@@ -1,6 +1,9 @@
%%%
% Distributivit\'e
%%%
+\def\filedateDistributivite{2024/08/04}%
+\def\fileversionDistributivite{0.1}%
+\message{-- \filedateDistributivite\space v\fileversionDistributivite}%
% https://tex.stackexchange.com/questions/168972/draw-arrows-to-show-multiplication-pattern-distributive-property/169278?noredirect=1
\newcommand\Tikzmark[1]{%
\tikz[remember picture,baseline,inner sep=0pt]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex
index 2767a20c500..c00592b393f 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex
@@ -1,8 +1,10 @@
%%%
% dobble
%%%
+\def\filedateDobble{2024/08/04}%
+\def\fileversionDobble{0.1}%
+\message{-- \filedateDobble\space v\fileversionDobble}%
% by Maxime Chupin
-
\NewDocumentCommand\dobble{m}{%
\directlua{
require('PfCdobble.lua')
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex
index 49cf667c163..338dc07bb7b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex
@@ -1,6 +1,10 @@
%%%
% Domino
%%%
+\def\filedateDomino{2024/08/04}%
+\def\fileversionDomino{0.1}%
+\message{-- \filedateDomino\space v\fileversionDomino}%
+%
\newtcolorbox{MyDominoMini}[1][]{%
enhanced,
nobeforeafter,
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex
index e395500a3c3..ea6761035e2 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex
@@ -1,3 +1,9 @@
+%%%
+% Ne compte pas
+%%%
+\def\filedateDontCount{2024/08/04}%
+\def\fileversionDontCount{0.1}%
+\message{-- \filedateDontCount\space v\fileversionDontCount}%
% D'après twitter : https://twitter.com/DavidKButlerUoA/status/1700612346258002030/photo/1
\setKVdefault[NCPP]{Largeur=5,Longueur=7,Unite=5mm,Rayon=1mm,Multiple=3,Couleur=black,Solution=false,Graines=false}%
\defKV[NCPP]{Graine=\setKV[NCPP]{Graines}\PfCGraineAlea{#1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
index f39b93ea469..372efa97842 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex
@@ -1,7 +1,11 @@
%%%
% QCM
%%%
-\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false,ACompleter=false}%
+\def\filedateQCM{2024/08/04}%
+\def\fileversionQCM{0.1}%
+\message{-- \filedateQCM\space v\fileversionQCM}%
+%
+\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false,ACompleter=false,AllSeul=false}%
\newlength{\LargeurQCM}%
\newlength{\PfCLargeurQCM}%
\newcounter{QuestionQCM}%
@@ -34,6 +38,23 @@
\fi%
}%
+\NewDocumentCommand\PfCQCMSMultiChoixLabelSol{mm}{%
+ \xdef\PfCFooChoixLabel{\ListeQCM[#1,\fpeval{\NumeroReponse}]}%
+ \setsepchar{-}%
+ \readlist*\PfCSolListeReponses{\PfCFooChoixLabel}%
+ \xdef\RetiensSiSol{0}%
+ \xintFor* ##3 in{\xintSeq{1}{\PfCSolListeReponseslen}}\do{%
+ \ifnum#2=\PfCSolListeReponses[##3]\relax%
+ \xdef\RetiensSiSol{\fpeval{\RetiensSiSol+1}}%
+ \fi%
+ }%
+ \ifnum\RetiensSiSol>0\relax%
+ $\blacksquare$%
+ \else%
+ $\square$%
+ \fi%
+}%
+
\NewDocumentCommand\QCMSeul{om}{%
\useKVdefault[QCMSeul]%
\setKV[QCMSeul]{#1}%
@@ -173,6 +194,36 @@
\newcommand\QCM[2][]{%
\useKVdefault[ClesQCM]%
\setKV[ClesQCM]{#1}%
+ \ifboolKV[ClesQCM]{AllSeul}{%
+ \setKV[QCMSeul]{#1}
+ \setsepchar[*]{,*&}\ignoreemptyitems%
+ \readlist*\ListeQCM{#2}%
+ \reademptyitems%
+ \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
+ \xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}%
+ \begin{enumerate}
+ \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+ \item\ListeQCM[##1,1]%
+ \ifboolKV[QCMSeul]{EnColonne}{\begin{multicols}{\useKV[QCMSeul]{Colonnes}}}{}%
+ \ifboolKV[QCMSeul]{LabelLettre}{
+ \begin{enumerate}[label=\Alph{*}/]
+ }{%
+ \begin{enumerate}[label=$\square$]
+ }%
+ \xintFor* ##2 in{\xintSeq{1}{\fpeval{\NumeroReponse-2}}}\do{%
+ \xdef\Titi{##2}
+ \ifboolKV[QCMSeul]{Solution}{%
+ \item[\PfCQCMSMultiChoixLabelSol{##1}{##2}]%
+ }{%
+ \item%
+ }%
+ \ListeQCM[##1,\fpeval{##2+1}]
+ }%
+ \end{enumerate}
+ \ifboolKV[QCMSeul]{EnColonne}{\end{multicols}}{}%
+ }%
+ \end{enumerate}
+ }{%
\ifboolKV[ClesQCM]{Seul}{%
\QCMSeul[#1]{#2}%
}{%
@@ -248,6 +299,7 @@
}%
}%
}%
+}%
\NewDocumentCommand\PfCSolCellColor{mm}{%
\xdef\PfCFooSolColor{\ListeQCM[#1,\NumeroReponse]}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex
index 11ae58b5b71..f80bc938669 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex
@@ -1,6 +1,10 @@
%%%
% Ecriture des nombres en lettres
%%%
+\def\filedateEcrireLettres{2024/08/04}%
+\def\fileversionEcrireLettres{0.1}%
+\message{-- \filedateEcrireLettres\space v\fileversionEcrireLettres}%
+%
\setKVdefault[ClesEcriture]{Math=false,Majuscule=false,E=false,Tradition=false,Zero=false}%
\newcommand\EcriturePluriel[1]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex
index c4503954b3b..05e593623cd 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex
@@ -1,6 +1,10 @@
%%%
% Ecritures d'unit\'es
%%%
+\def\filedateEcrireUnites{2024/08/04}%
+\def\fileversionEcrireUnites{0.1}%
+\message{-- \filedateEcrireUnites\space v\fileversionEcrireUnites}%
+%
\setKVdefault[Unites]{m=false,km=false,hm=false,ha=false,dam=false,a=false,dm=false,cm=true,mm=false,um=false,nm=false,g=true,t=false,q=false,kg=false,hg=false,dag=false,dg=false,cg=false,mg=false,ug=false,ng=false,mmin=false,kmh=true,kms=false,ms=false,mh=false,kgm=false,gcm=true,L=true,kL=false,hL=false,daL=false,dL=false,cL=false,mL=false,l=true,kl=false,hl=false,dal=false,dl=false,cl=false,ml=false,Go=true,Mo=false,ko=false,To=false,o=false,kWh=true,C=true,K=false,F=false,Nombre,US=false,UK=false,CFA=false,CFP=false,CHF=false,Euro=false,Precision=2}%
\defKV[Unites]{Dots=\setKV[Unites]{Nombre=false}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
index fc1674d37ff..58553f57f8b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex
@@ -1,11 +1,14 @@
%%%
% Engrenages
%%%
+\def\filedateEngrenages{2024/08/04}%
+\def\fileversionEngrenages{0.1}%
+\message{-- \filedateEngrenages\space v\fileversionEngrenages}%
+%
\newtoks\tokPfCEngrenages%
\def\UpdatetoksEngrenages#1/#2\nil{\addtotok\tokPfCEngrenages{#1,#2,}}%
\setKVdefault[Engrenages]{Couleur=LightSteelBlue,Unite=3mm,ListeCouleurs={?}}%
-%\defKV[Engrenages]{Couleur=\setKV[Engrenages]{ListeCouleurs=#1}}%
\NewDocumentCommand\Engrenages{o m}{%
\newtoks\toklistecouleur%
@@ -24,7 +27,6 @@
\xdef\ListeAvantCouleurs{\useKV[Engrenages]{ListeCouleurs}}%
\readlist*\ListeCouleur{\ListeAvantCouleurs}%
\foreachitem\couleur\in\ListeCouleur{\expandafter\UpdateCoul\couleur\nil}%
- %\setKV[Engrenages]{Couleurs=\ListeCouleur[1]}%
\BuildEngrenages{\PfCFooEngrenages}{\the\toklistecouleur}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex
index 345f7416560..1840d8b0e39 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex
@@ -1,6 +1,10 @@
%%%
% Enigme Aire
%%%
+\def\filedateEnigmeAire{2024/08/04}%
+\def\fileversionEnigmeAire{0.1}%
+\message{-- \filedateEnigmeAire\space v\fileversionEnigmeAire}%
+%
\setKVdefault[EnigmeAire]{Modele=A,Couleur=LightSteelBlue,Echelle=7mm,Etape=1,Solution=false,Graines=false}
\defKV[EnigmeAire]{Graine=\setKV[EnigmeAire]{Graines}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex
index 678b268c57d..5dfc36587cb 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex
@@ -1,6 +1,10 @@
%%%
% Enquête
%%%
+\def\filedateEnquete{2024/08/04}%
+\def\fileversionEnquete{0.1}%
+\message{-- \filedateEnquete\space v\fileversionEnquete}%
+%
\setKVdefault[ClesEnquete]{Perso=Qui ?,Objet=Quoi ?,Lieu=Où ?,Largeur=4.5cm}
\newcommand\Enquete[1][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex
index 192e470e66b..5374c485d2a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex
@@ -1,3 +1,10 @@
+%%%
+% Crible Eratostene
+%%%
+\def\filedateEratos{2024/08/04}%
+\def\fileversionEratos{0.1}%
+\message{-- \filedateEratos\space v\fileversionEratos}%
+%
\setKVdefault[ClesEra]{Premier=false,Nombre=1,CouleurP=Cornsilk!50,CouleurNP=Crimson!15,Colonnes=10,Lignes=10,Hauteur=24pt}%
\NewDocumentCommand\TestPremier{m}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex
index 823f2036237..bdcea30d9db 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex
@@ -1,3 +1,10 @@
+%%%
+% Factorisation
+%%%
+\def\filedateFactorisation{2024/08/04}%
+\def\fileversionFactorisation{0.1}%
+\message{-- \filedateFactorisation\space v\fileversionFactorisation}%
+%
\setKVdefault[Facto]{Aide=false,AideMul=false,Couleur=Crimson,NomExpression=A,Lettre=x,Details,Formel=false,VariableSup=false,ParenthesesFin=false,Finale=false,Type=0}
\defKV[Facto]{Litteral=\setKV[Facto]{Details=false}}
\defKV[Facto]{AutreVariable=\setKV[Facto]{VariableSup}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex
index 511e47da2f1..e2dfc25f137 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex
@@ -1,6 +1,10 @@
%%%
% Fiche m\'emorisation active
%%%
+\def\filedateFicheMemo{2024/08/04}%
+\def\fileversionFicheMemo{0.1}%
+\message{-- \filedateFicheMemo\space v\fileversionFicheMemo}%
+%
\setKVdefault[ClesFicheMemo]{TexteReponses=Réponses,TexteQuestions=Questions,Solution=false,Largeur=\linewidth}
\newcommand\FicheMemo[3][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
index 5b95ddb02ec..26777eaac0e 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex
@@ -1,6 +1,10 @@
%%%
% Fonction Affine
%%%
+\def\filedateAffine{2024/08/04}%
+\def\fileversionAffine{0.1}%
+\message{-- \filedateAffine\space v\fileversionAffine}%
+%
\setKVdefault[ClesAffine]{Nom=f,Variable=x,CoefDir=a,OrdoOrig=b,Ligne=false,Image=false,Antecedent=false,Graphique=false,Retrouve=false,ProgCalcul=false,Unitex=1,Unitey=1,VoirCoef=false,ACoef=0,Redaction=false,Ecriture=false,Definition=false,Centre=false}%ACoefficient=false%: inutile ?
\newcommand\FonctionAffine[5][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex
index dbfe8109d21..8fe19930167 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex
@@ -1,6 +1,10 @@
%%%
% Fraction d'aire d'un carré
%%%
+\def\filedateFractionCarre{2024/08/04}%
+\def\fileversionFractionCarre{0.1}%
+\message{-- \filedateFractionCarre\space v\fileversionFractionCarre}%
+%
\setKVdefault[JeuAireCarre]{Couleur=LightSteelBlue,CouleurFond=Cornsilk,Perso=false,Graines=false,Parts=3,Longueur=4,NbPoints=2,Angle=0}%
\defKV[JeuAireCarre]{Graine=\setKV[JeuAireCarre]{Graines}\PfCGraineAlea{#1}}%
\defKV[JeuAireCarre]{ListeParts=\setKV[JeuAireCarre]{Perso}\xdef\PfCFooJeuAireCarre{#1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex
index 52512fb83ef..20d1d1e93ac 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex
@@ -1,6 +1,10 @@
%%%
% Fraction Nombre
%%%
+\def\filedateFractionNombre{2024/08/04}%
+\def\fileversionFractionNombre{0.1}%
+\message{-- \filedateFractionNombre\space v\fileversionFractionNombre}%
+%
\newtoks\tokFractionNombrePerso%
\def\UpdatetoksFN#1\nil{\addtotok\tokFractionNombrePerso{"#1",}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex
index a07d2a931bd..c56b2c6f4f6 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex
@@ -1,6 +1,10 @@
%%%
% Frise temporelle
%%%
+\def\filedateFrise{2024/08/04}%
+\def\fileversionFrise{0.1}%
+\message{-- \filedateFrise\space v\fileversionFrise}%
+%
\setKVdefault[ClesFrise]{Longueur=8cm,Fleches=false,Ecart=5mm,Sup=false}%
\newtoks\toklistefrise%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex
index 0ce7af2ffa4..fd1f973bfd1 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex
@@ -1,3 +1,10 @@
+%%%
+% Fubuki
+%%%
+\def\filedateFubuki{2024/08/04}%
+\def\fileversionFubuki{0.1}%
+\message{-- \filedateFubuki\space v\fileversionFubuki}%
+%
\setKVdefault[Fubuki]{Largeur=20pt,Solution=false,Indice=false,Sommes=false,Couleur=LightSteelBlue,Perso=false,Vierge=false}%
\defKV[Fubuki]{Graine=\PfCGraineAlea{#1}}%
\defKV[Fubuki]{Indices=\setKV[Fubuki]{Indice}\xdef\PfCFooListeIndices{#1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex
index 4603265e0e5..300bdd43d0c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex
@@ -1,6 +1,10 @@
%%%
% Futoshiki
%%%
+\def\filedateFutoshiki{2024/08/04}%
+\def\fileversionFutoshiki{0.1}%
+\message{-- \filedateFutoshiki\space v\fileversionFutoshiki}%
+%
\setKVdefault[Futo]{Largeur=15pt,Solution=false,CouleurSolution=Black,CouleurCase=Cornsilk,StyleTexte={}}
\newlength\PfCFutoHeight
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex
index 7e04378a93b..fd5a97439cf 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex
@@ -1,17 +1,21 @@
%%%
% Garam
%%%
-\setKVdefault[Garam]{Taille=7,Largeur=15pt,Solution=false,CouleurSolution=Black}
+\def\filedateGaram{2024/08/04}%
+\def\fileversionGaram{0.1}%
+\message{-- \filedateGaram\space v\fileversionGaram}%
+%
+\setKVdefault[Garam]{Taille=7,Largeur=15pt,Solution=false}%
+\defKV[Garam]{CouleurSolution=\setKV[Garam]{Solution}\colorlet{PfCGaramCoulSol}{#1}}%
\newlength\PfCGaramHeight
\NewDocumentCommand\Garam{o m}{%
- \useKVdefault[Garam]
+ \useKVdefault[Garam]%
\setKV[Garam]{#1}%
\setlength{\PfCGaramHeight}{\useKV[Garam]{Largeur}+\tabcolsep}%
\reademptyitems%
\setsepchar[*]{§*,*/}%
\readlist*\PfCListeGaram{#2}%
- \colorlet{PfCGaramCoulSol}{\useKV[Garam]{CouleurSolution}}%
\begin{NiceTabular}{*{\useKV[Garam]{Taille}}{m{\useKV[Garam]{Largeur}}}}
\CodeBefore
\xintFor* ##1 in{\xintSeq{2}{\fpeval{\useKV[Garam]{Taille}}}}\do{%
@@ -26,7 +30,7 @@
\rule{0pt}{\PfCGaramHeight}\xintFor* ##2 in {\xintSeq{1}{\useKV[Garam]{Taille}}}\do{%
\xintifForFirst{}{&}\StrChar{\PfCListeGaram[##1,##2,1]}{1}[\PfCCaracGaram]%
\IfStrEq{\PfCCaracGaram}{*}{\Block[draw,fill=black]{1-1}{}}{%
- \IfStrEq{\PfCCaracGaram}{!}{\Block{}{\ifboolKV[Garam]{Solution}{\StrGobbleLeft{\PfCListeGaram[##1,##2,1]}{1}}{}}}{\Block{}{\color{PfCGaramCoulSol}\PfCListeGaram[##1,##2,1]}}%
+ \IfStrEq{\PfCCaracGaram}{!}{\Block{}{\ifboolKV[Garam]{Solution}{\color{PfCGaramCoulSol}\StrGobbleLeft{\PfCListeGaram[##1,##2,1]}{1}}{}}}{\Block{}{\PfCListeGaram[##1,##2,1]}}%
}%
}\\
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex
index ad7e495f044..9bb83ad50d6 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex
@@ -1,6 +1,10 @@
%%%
% Geometrie
%%%
+\def\filedateGeometrie{2024/08/04}%
+\def\fileversionGeometrie{0.1}%
+\message{-- \filedateGeometrie\space v\fileversionGeometrie}%
+%
\setKVdefault[Geometrie]{CoinBG={(0,0)},CoinHD={(10u,10u)},TypeTrace="Instruments",Clip,Cadres=false,Epaisseur=1,Pointilles=false,Ombre=false,Couleur=black,Ecart=2,ModeleCouleur=5}%
\defKV[Geometrie]{Cadre=\setKV[Geometrie]{Cadres}\setKV[Geometrie]{Clip=false}}%
@@ -42,6 +46,9 @@
elseif \useKV[Geometrie]{TypeTrace}="Espace":
typetrace:="3D";
typerepre:="persp";
+ elseif \useKV[Geometrie]{TypeTrace}="Schema":
+ input PfCSketch;
+ sketchypaths;
fi;
xa:=xpart(Coinbg);
xb:=xpart(Coinhd);
@@ -120,6 +127,9 @@
elseif \useKV[Geometrie]{TypeTrace}="Espace":
typetrace:="3D";
typerepre:="persp";
+ elseif \useKV[Geometrie]{TypeTrace}="Schema":
+ input PfCSketch;
+ sketchypaths;
fi;}
]%
xa:=xpart(Coinbg);
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex
index 6155c43ca1d..d86c6e4e420 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex
@@ -1,8 +1,12 @@
%%%
% Grades
%%%
-\setKVdefault[Grades]{Solution=false,Longueur=9,Largeur=9,Echelle=8mm,Graines=false}
-\defKV[Grades]{Graine=\setKV[Grades]{Graines}}
+\def\filedateGrades{2024/08/04}%
+\def\fileversionGrades{0.1}%
+\message{-- \filedateGrades\space v\fileversionGrades}%
+%
+\setKVdefault[Grades]{Solution=false,Longueur=9,Largeur=9,Echelle=8mm,Graines=false}%
+\defKV[Grades]{Graine=\setKV[Grades]{Graines}}%
\NewDocumentCommand\Grades{o}{%
\useKVdefault[Grades]%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex
index 81e667533a3..9185b768929 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex
@@ -1,6 +1,10 @@
%%%
% Grimuku
%%%
+\def\filedateGrimuku{2024/08/04}%
+\def\fileversionGrimuku{0.1}%
+\message{-- \filedateGrimuku\space v\fileversionGrimuku}%
+%
\setKVdefault[Grimuku]{TLargeur=7,Solution=false,Largeur=30pt,CouleurCase=0.7white}%
\defKV[Grimuku]{CouleurSolution=\setKV[Grimuku]{Solution}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex
index f472e078443..65948f59498 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex
@@ -1,6 +1,10 @@
%%%
% Message caché
%%%
+\def\filedateHidden{2024/08/04}%
+\def\fileversionHidden{0.1}%
+\message{-- \filedateHidden\space v\fileversionHidden}%
+%
\setKVdefault[Hidden]{TLargeur=5,THauteur=3,Solution=false,Hauteur=70pt,Largeur=120pt,Jeu=false,Solution}
\defKV[Hidden]{Plateau=\setKV[Hidden]{Jeu}\setKV[Hidden]{Solution=false}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex b/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex
index 1133714ecdc..01af381977a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex
@@ -1,7 +1,11 @@
%%%
% Horloges
%%%
-\setKVdefault[ClesHorloge]{Aiguilles,Numerique=false,Secondes,Cadre,Rayon=1,Impression=false}
+\def\filedateHorloge{2024/08/12}%
+\def\fileversionHorloge{0.1a}%
+\message{-- \filedateHorloge\space v\fileversionHorloge}%
+%
+\setKVdefault[ClesHorloge]{Aiguilles,Numerique=false,Secondes,Cadre,Rayon=1,Impression=false,Sombre=false}
\NewDocumentCommand\Horloge{ }{%On désactive les :
\begingroup
@@ -62,13 +66,19 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
- boolean Secondes,Impression;
+ boolean Secondes,Impression,Sombre;
Secondes=\useKV[ClesHorloge]{Secondes};
Impression=\useKV[ClesHorloge]{Impression};
+ Sombre=\useKV[ClesHorloge]{Sombre};
if Impression:
+ if Sombre:
+ LightSteelBlue:=0.8*white;
+ Crimson:=black;
+ else:
LightSteelBlue:=0.9*white;
Crimson:=0.5*white;
fi;
+ fi;
u:=0.5u;
draw Afficheur(#1 div10,0);
draw Afficheur(#1 mod10,0) shifted(u*(1,0));
@@ -80,9 +90,21 @@
draw Afficheur(#3 div10,0) shifted(u*(6,0));
draw Afficheur(#3 mod10,0) shifted(u*(7,0));
fi;
+ if Sombre:
+ draw bbox currentpicture;
+ fi;
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={boolean Secondes;Secondes=\useKV[ClesHorloge]{Secondes};}]
+ \begin{mpost}[mpsettings={boolean Secondes,Impression,Sombre;Secondes=\useKV[ClesHorloge]{Secondes};Impression=\useKV[ClesHorloge]{Impression};Sombre=\useKV[ClesHorloge]{Sombre};}]
+ if Impression:
+ if Sombre:
+ LightSteelBlue:=0.8*white;
+ Crimson:=black;
+ else:
+ LightSteelBlue:=0.9*white;
+ Crimson:=0.5*white;
+ fi;
+ fi;
u:=0.5u;
draw Afficheur(#1 div10,0);
draw Afficheur(#1 mod10,0) shifted(u*(1,0));
@@ -94,6 +116,9 @@
draw Afficheur(#3 div10,0) shifted(u*(6,0));
draw Afficheur(#3 mod10,0) shifted(u*(7,0));
fi;
+ if Sombre:
+ draw bbox currentpicture;
+ fi;
\end{mpost}
\fi
}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex b/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex
index e3012070f27..68523efce53 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex
@@ -1,6 +1,10 @@
%%%
% Jeton
%%%
+\def\filedateJeton{2024/08/04}%
+\def\fileversionJeton{0.1}%
+\message{-- \filedateJeton\space v\fileversionJeton}%
+%
\setKVdefault[Jeton]{Diametre=5mm,Impression=false}%
\NewDocumentCommand\Jeton{om}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex b/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex
index 6508e6cd1a9..df2f709271b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex
@@ -1,3 +1,10 @@
+%%%
+% Jeu Rangement
+%%%
+\def\filedateJeuRangement{2024/08/04}%
+\def\fileversionJeuRangement{0.1}%
+\message{-- \filedateJeuRangement\space v\fileversionJeuRangement}%
+%
\setKVdefault[JeuRgt]{Creation=false,Deno=12,Graines=false,Largeur=15pt,Hauteur=20pt,Negatif=false,Decimaux=false,Solution=false,ValeurMin=2,ValeurMax=50,Exposants=false}
\defKV[JeuRgt]{Graine=\setKV[JeuRgt]{Graines}}%
\defKV[JeuRgt]{Exposant=\setKV[JeuRgt]{Exposants}\setKV[JeuRgt]{Deno=1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex
index 944d295e8fe..d608320b3e5 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex
@@ -1,6 +1,10 @@
%%%
% Kakurasu
%%%
+\def\filedateKakurasu{2024/08/04}%
+\def\fileversionKakurasu{0.1}%
+\message{-- \filedateKakurasu\space v\fileversionKakurasu}%
+%
\setKVdefault[Kakurasu]{Solution=false,Longueur=6,Largeur=6,Echelle=8mm,Graines=false,Trace=false}
\defKV[Kakurasu]{Graine=\setKV[Kakurasu]{Graines}}
\defKV[Kakurasu]{Traces=\setKV[Kakurasu]{Trace}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex
index adf0aba7d21..b480f442757 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex
@@ -1,6 +1,10 @@
%%%
% Kakuro
%%%
+\def\filedateKakuro{2024/08/04}%
+\def\fileversionKakuro{0.1}%
+\message{-- \filedateKakuro\space v\fileversionKakuro}%
+%
\setKVdefault[Kakuro]{CouleurCase=LightGray,TLargeur=5,THauteur=5,Solution=false,Largeur=2em,Aide=false,CouleurSolution=Black,Tailles=false}%,Taille=5
\defKV[Kakuro]{ListeNombres=\setKV[Kakuro]{Aide}}%
\defKV[Kakuro]{Taille=\setKV[Kakuro]{Tailles}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex
index e28efc379f5..21a16dbc783 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex
@@ -1,6 +1,10 @@
%%%
% KenKen
%%%
+\def\filedateKenken{2024/08/04}%
+\def\fileversionKenken{0.1}%
+\message{-- \filedateKenken\space v\fileversionKenken}%
+%
\setKVdefault[ClesKK]{Solution=false,Taille=3,Largeur=2em,Aide=false}%
\defKV[ClesKK]{Nombre=\setKV[ClesKK]{Aide}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex
index 5922748104b..f60cbce35ec 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex
@@ -1,8 +1,12 @@
%%%
% Labyrinthe
%%%
-\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false,Slop}
-
+\def\filedateLabyJeu{2024/08/04}%
+\def\fileversionLabyJeu{0.1}%
+\message{-- \filedateLabyJeu\space v\fileversionLabyJeu}%
+%
+\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false,Slop}%
+%
\tikzset{FDirect/.style={-stealth}}
\tikzset{FIndirect/.style={stealth-}}
\tikzset{FBidirect/.style={stealth-stealth}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex
index b610849ea51..769617eb902 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex
@@ -1,6 +1,10 @@
%%%
% Labyrinthe Nombre
%%%
+\def\filedateLabyNombre{2024/08/04}%
+\def\fileversionLabyNombre{0.1}%
+\message{-- \filedateLabyNombre\space v\fileversionLabyNombre}%
+%
\setKVdefault[ClesLabyNb]{Multiple=5,XDepart=0,YDepart=0,Longueur=7,Largeur=4,Solution=false,Echelle=1,Angle=0,Couleur=red,Murs=false,Nom=Ex1,CouleurChemin=LightSteelBlue,DoubleOperation=false,Multiplication=false,Chemin=false,EntreeSortie=false,Entree="Nord",Sortie="Sud",SortieUnique=true,Graines=false,XArrivees=false,YArrivees=false,ArriveeX=5,ArriveeY=5}
\defKV[ClesLabyNb]{Graine=\setKV[ClesLabyNb]{Graines}}
\defKV[ClesLabyNb]{XArrivee=\setKV[ClesLabyNb]{XArrivees}\setKV[ClesLabyNb]{ArriveeX=#1}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex
index 901eb0a54bb..80bc5ddc1a4 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex
@@ -1,6 +1,10 @@
%%%
% Lego
%%%
+\def\filedateLego{2024/09/01}%
+\def\fileversionLego{0.1a}%
+\message{-- \filedateLego\space v\fileversionLego}%
+%
\setKVdefault[Lego]{Echelle=1,Couleur=LightSteelBlue,Unite=8,Diviseur=2,Perso=false,Plaque=false,Largeura=2,Largeurb=2,Unique=false}%
\defKV[Lego]{ListePerso=\setKV[Lego]{Perso}\xdef\PfCFooLegoListePerso{#1}}%
@@ -27,10 +31,14 @@
}{%
\xdef\PfCNbCouleurs{\fpeval{floor(\useKV[Lego]{Unite}/\useKV[Lego]{Diviseur})}}%
}%
- \ChoixCouleur{\PfCNbCouleurs}%
\ifboolKV[Lego]{Perso}{%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeAvantChoixCouleurs{\PfCFooLegoListePerso}%
+ \ChoixCouleur{\ListeAvantChoixCouleurslen}%
+ \reademptyitems%
\BuildBarreLego{\FooCouleur}{\PfCFooLegoListePerso}%
}{%
+ \ChoixCouleur{\PfCNbCouleurs}%
\BuildBarreLego{\FooCouleur}{}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex
index 84176c0d1ff..0c024facd2a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex
@@ -1,6 +1,10 @@
%%%
% Mentalo
%%%
+\def\filedateMentalo{2024/08/04}%
+\def\fileversionMentalo{0.1}%
+\message{-- \filedateMentalo\space v\fileversionMentalo}%
+%
\NewDocumentCommand\PfCNumold{m}{%
\xintifboolexpr{#1<0}{(\num{#1})}{\num{#1}}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex
index 0813f66c446..4fea05dcbb7 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex
@@ -1,6 +1,10 @@
%%%
% Midpoint
%%%
+\def\filedateMidpoint{2024/08/04}%
+\def\fileversionMidpoint{0.1}%
+\message{-- \filedateMidpoint\space v\fileversionMidpoint}%
+%
\setKVdefault[MidPoint]{Solution=false,Graines=false,Hard=false}
\defKV[MidPoint]{Graine=\setKV[MidPoint]{Graines}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex
index a05ae0075b6..e894a9ebc6f 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex
@@ -1,6 +1,10 @@
%%%
% Modele en barre
%%%
+\def\filedateModeleBarre{2024/08/04}%
+\def\fileversionModeleBarre{0.1}%
+\message{-- \filedateModeleBarre\space v\fileversionModeleBarre}%
+%
\setKVdefault[ClesModeleBarre]{Hauteur=0.5cm,Largeur=1cm,Separation={0},Homogene=false,Multiplicatif=false,MultiplicatifH=false,MultiplicatifB=false}%Separation pour conserver le lien avec les équations.
\defKV[ClesModeleBarre]{Longueur=\setKV[ClesModeleBarre]{Homogene}}%
\defKV[ClesModeleBarre]{AccoladesH=\setKV[ClesModeleBarre]{MultiplicatifH}\setKV[ClesModeleBarre]{Multiplicatif}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex
index 91936d597b1..af964995ef7 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex
@@ -1,6 +1,10 @@
%%%
% Mosaique
%%%
+\def\filedateMosaique{2024/08/04}%
+\def\fileversionMosaique{0.1}%
+\message{-- \filedateMosaique\space v\fileversionMosaique}%
+%
\setKVdefault[ClesMosaique]{Largeur=2,Hauteur=2,Solution=false,Type=1,Label,Echelle=1cm}
\newcommand\DessineMosaique[2][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex
index 0929b761971..088f417c35d 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex
@@ -1,6 +1,10 @@
%%%
% Mots Cod\'es
%%%
+\def\filedateMotsCodes{2024/08/04}%
+\def\fileversionMotsCodes{0.1}%
+\message{-- \filedateMotsCodes\space v\fileversionMotsCodes}%
+%
\setKVdefault[MotsCodes]{LargeurT=1cm,Colonnes=5,Largeur=3cm,Solution=false,Math=false}%
\newcommand\MotsCodes[2][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex
index 4e6734dd7b4..5310516799b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex
@@ -1,6 +1,10 @@
%%%
% Mots croisés
%%%
+\def\filedateMotsCroises{2024/08/04}%
+\def\fileversionMotsCroises{0.1}%
+\message{-- \filedateMotsCroises\space v\fileversionMotsCroises}%
+%
\setKVdefault[ClesCroises]{Lignes=6,Colonnes=8,Solution=false,Croises=false,Couleur=gray,Largeur=1em}
\newcounter{PfCLettreHorizontal}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex
index 1c42d433a6a..c8ec37bc5d8 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex
@@ -1,6 +1,10 @@
%%%
% Mots empilés
%%%
+\def\filedateMotsEmpiles{2024/08/04}%
+\def\fileversionMotsEmpiles{0.1}%
+\message{-- \filedateMotsEmpiles\space v\fileversionMotsEmpiles}%
+%
\setKVdefault[ClesMotEmpile]{Colonne=4,Solution=false,Couleur=black}
\newcounter{CompteurMotEmpile}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex
index 27156c00b7f..99425418732 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex
@@ -1,6 +1,10 @@
%%%
% Mulart
%%%
+\def\filedateMulArt{2024/08/04}%
+\def\fileversionMulArt{0.1}%
+\message{-- \filedateMulArt\space v\fileversionMulArt}%
+%
\setKVdefault[TabMul]{Multiple=2,Cibles=false,Largeur=20pt,Couleurs=false,Graines=false,Operations=false,Enonce=false,SchemaEnonce=false}
\defKV[TabMul]{Couleur=\setKV[TabMul]{Couleurs}}
\defKV[TabMul]{Graine=\setKV[TabMul]{Graines}\PfCGraineAlea{#1}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex
index befce7a1106..3f9ba37758d 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex
@@ -1,6 +1,10 @@
%%%
% Multiplication par jalousie
%%%
+\def\filedateMulJal{2024/08/04}%
+\def\fileversionMulJal{0.1}%
+\message{-- \filedateMulJal\space v\fileversionMulJal}%
+%
\setKVdefault[MulJal]{Solution=false,CouleurTab=gray!15}%
\defKV[MulJal]{CouleurSolution=\setKV[MulJal]{Solution}}%
%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
index bdb59526f0c..8fdf37c5b30 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex
@@ -1,6 +1,10 @@
%%%
% Multiplication Japonaise
%%%
+\def\filedateMulJap{2024/08/04}%
+\def\fileversionMulJap{0.1}%
+\message{-- \filedateMulJap\space v\fileversionMulJap}%
+%
\setKVdefault[MulJap]{Couleur=Orange,Bloc=false,DessinSeul=false}
\defKV[MulJap]{CouleurBloc=\setKV[MulJap]{Bloc}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
index 7851f36ba79..aaf98ffe6ac 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex
@@ -1,6 +1,10 @@
%%%
% Pièces de puzzle pour multiplication
%%%
+\def\filedateMulPiecesPuzzle{2024/08/04}%
+\def\fileversionMulPiecesPuzzle{0.1}%
+\message{-- \filedateMulPiecesPuzzle\space v\fileversionMulPiecesPuzzle}%
+%
%https://mirror.gutenberg-asso.fr/tex.loria.fr/prod-graph/metafun.pdf
\newtoks\toklistepuzzlea%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex
index 428cd8d37c7..df1903bc0ea 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex
@@ -1,6 +1,10 @@
%%%
% Nombre Astral
%%%
+\def\filedateNombreAstral{2024/08/04}%
+\def\fileversionNombreAstral{0.1}%
+\message{-- \filedateNombreAstral\space v\fileversionNombreAstral}%
+%
\setKVdefault[NombreAstral]{Solution=false,Graines=false,Echelle=1,Couleur=LightSteelBlue,Horizontal=false}
\defKV[NombreAstral]{Graine=\setKV[NombreAstral]{Graines}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex
index 8adfbd5654e..d63fd9c70f1 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex
@@ -1,3 +1,10 @@
+%%%
+% Nonogramme
+%%%
+\def\filedateNonogramme{2024/08/04}%
+\def\fileversionNonogramme{0.1}%
+\message{-- \filedateNonogramme\space v\fileversionNonogramme}%
+%
\setKVdefault[Nono]{Largeur=10pt,Taille=5,Unite=1cm,Solution=false,Enonce=true}
\newtoks\toklistenonoa%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
index 4fe05bc4d04..265beb92f9b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex
@@ -1,6 +1,10 @@
%%%
% Fonction
%%%
+\def\filedateFonction{2024/08/04}%
+\def\fileversionFonction{0.1}%
+\message{-- \filedateFonction\space v\fileversionFonction}%
+%
\setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false,Points=false,Tangentes=false,PasX=1,PasY=1,UniteX=1,UniteY=1,Prolonge=false,Trace=false,Catmull=false,Splines=false,Lagrange=false,Epaisseur=1,Couleur=black,CouleurTrace=black,PointsCourbe=true,Codes=false,Origine={(0,0)},Vide=false}
\defKV[ClesFonction]{Traces=\setKV[ClesFonction]{Codes}}%
@@ -1249,6 +1253,17 @@ vardef Lagrange(expr valeur)(text t)=
%
RetiensCouleur(\useKV[TraceG]{CouleurTrace});
%
+ numeric styletrace[];
+ vardef RetiensStyle(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ styletrace[n]=p_;
+ endfor;
+ enddef;
+ %
+ RetiensStyle(\useKV[TraceG]{StyleTrace});
+ %
pair Origine,DecalageOrigine;
Origine=(xmin,ymin)+\useKV[TraceG]{Origine};
DecalageOrigine=\useKV[TraceG]{Origine};
@@ -1305,6 +1320,19 @@ vardef Lagrange(expr valeur)(text t)=
n:=0;
for p_=texto:
n:=n+1;
+ if unknown styletrace[n]:
+ drawoptions();
+ else:
+ if styletrace[n]=1:
+ drawoptions(dashed evenly);
+ elseif styletrace[n]=2:
+ drawoptions(dashed withdots);
+ elseif styletrace[n]=3:
+ drawoptions(dashed dashpattern(on6 off3 on1.5 off3));
+ else:
+ drawoptions();
+ fi;
+ fi;
draw courbe[n](borneinf[n],bornesup[n],100)(scantokens p_) withpen (pencircle scaled Epaisseur) withcolor if unknown colortrace[n]:black else: colortrace[n] fi;
endfor;
enddef;
@@ -1419,6 +1447,9 @@ vardef Lagrange(expr valeur)(text t)=
trace u*(xmin-grillex,k)--u*(xmax+grillex,k);
endfor;
drawoptions();
+ else:
+ grillex:=0;
+ grilley:=0;
fi;
if Graduations:
for k=gradx step gradx until (((xmax-xmin)-xpart(DecalageOrigine))*pasx):
@@ -1470,11 +1501,12 @@ vardef Lagrange(expr valeur)(text t)=
else:
DessineCourbes(#1);
NommeCourbes(#2);
- if Grille:
clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley));
+ if Grille:
+ %clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley));
draw polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)) withcolor 0.75white;
else:
- clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax));
+ %clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax));
fi;
%
if Code:
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex
index ee37a5b2f18..96019b3d831 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex
@@ -1,6 +1,10 @@
%%%
% Number Hive
%%%
+\def\filedateNumberHive{2024/08/04}%
+\def\fileversionNumberHive{0.1}%
+\message{-- \filedateNumberHive\space v\fileversionNumberHive}%
+%
\setKVdefault[NumberHive]{Negatif=false,Produit=false,Niveau=8,Double=false,ListeCouleurs={Cornsilk,LightSteelBlue},CouleurCase=false,Jeton=false,Graines=false,Aide=false,UniteHexa=6mm}%
\defKV[NumberHive]{Cases=\setKV[NumberHive]{CouleurCase}}%
\defKV[NumberHive]{Jetons=\setKV[NumberHive]{Jeton}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex
index a864165fba1..b9560bb504b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex
@@ -1,3 +1,10 @@
+%%%
+% Numerations anciennes
+%%%
+\def\filedateNumAnciennes{2024/08/04}%
+\def\fileversionNumAnciennes{0.1}%
+\message{-- \filedateNumAnciennes\space v\fileversionNumAnciennes}%
+%
\setKVdefault[NumerationAncienne]{Couleur=black}%
\NewDocumentCommand\Chinoise{om}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex b/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex
index 347ca499bcf..ca9f72976e9 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex
@@ -1,11 +1,11 @@
%%%
% Op\'erations pos\'es à trou
%%%
-%% D'après https://tex.stackexchange.com/questions/277246/drawing-a-circle-around-the-numbers-in-xlop-package
-
-%\begin{document}%
+\def\filedateOpTrou{2024/08/04}%
+\def\fileversionOpTrou{0.1}%
+\message{-- \filedateOpTrou\space v\fileversionOpTrou}%
%
-%\end{document}
+%% D'après https://tex.stackexchange.com/questions/277246/drawing-a-circle-around-the-numbers-in-xlop-package
\newcommand\PfCchiffre[2]{\tikz[remember picture] \node[inner sep=0pt](#1){#2};}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex
index 0bb41363ec6..3929600a6e6 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex
@@ -1,6 +1,10 @@
%%%
% Papiers
%%%
+\def\filedatePapiers{2024/08/04}%
+\def\fileversionPapiers{0.1}%
+\message{-- \filedatePapiers\space v\fileversionPapiers}%
+%
\setKVdefault[Papiers]{Cinq=true,Seyes=false,Echelle=8,Isometrique=false,IsometriquePointe=false,Millimetre=false,Triangle=false,Largeur=5,Hauteur=4,Couleur=black,Grille=-1,GrillePointe=-1,PageEntiere=false,ZoneTexte=false,Baseline=false,CodeAfter=false}%
\defKV[Papiers]{Traces=\setKV[Papiers]{CodeAfter}}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
index 6628d3d505a..904f272411a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex
@@ -1,6 +1,10 @@
%%%
% Patrons de pavés droits et cubes
%%%
+\def\filedatePatronspaves{2024/08/04}%
+\def\fileversionPatronspaves{0.1}%
+\message{-- \filedatePatronspaves\space v\fileversionPatronspaves}%
+%
\setKVdefault[ClesPatron]{Cube,Arete=1cm,ListeCouleurs={white},Pave=false,Largeur=2cm,Hauteur=1.5cm,Profondeur=1cm,Codes=false,AColorier=false}%
%EcartColorier est en nombre de parts pour le cube, en mm pour le pavé.
\defKV[ClesPatron]{EcartColorier=\setKV[ClesPatron]{AColorier}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex
index 29fa45c08fe..fb6f0bf9f3a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex
@@ -1,6 +1,10 @@
%%%
% Visual Pattern
%%%
+\def\filedatePattern{2024/08/04}%
+\def\fileversionPattern{0.1}%
+\message{-- \filedatePattern\space v\fileversionPattern}%
+%
\setKVdefault[Pattern]{Type=1,Etape=3}
\NewDocumentCommand\VisualPattern{o}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex
index 2d25df1b990..4dabb044116 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex
@@ -1,6 +1,10 @@
%%%
% Pavage
%%%
+\def\filedatePavage{2024/08/04}%
+\def\fileversionPavage{0.1}%
+\message{-- \filedatePavage\space v\fileversionPavage}%
+%
\setKVdefault[Pavage]{%
Before=false,
Niveau=3,
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
index df380d48ee4..503e2e1182d 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex
@@ -1,11 +1,16 @@
%%%
% PixelArt
%%%
+\def\filedatePixelArt{2024/08/04}%
+\def\fileversionPixelArt{0.1}%
+\message{-- \filedatePixelArt\space v\fileversionPixelArt}%
+%
\newtoks\toklistePANombre%
\def\UpdatetoksPANombre#1\nil{\addtotok\toklistePANombre{"#1",}}%
-\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm,Geant=false,HauteurD=1,LargeurD=1,Complet=false,Numero=1,Separations=false}%
+\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm,Geant=false,HauteurD=1,LargeurD=1,Complet=false,Numero=1,Separations=false,Deforme=false,Coefx=0.25,Coefy=0.25,Borne=false,Graines=false}%
\defKV[ClesPixelArt]{ListeNombres=\setKV[ClesPixelArt]{Nombres}}%
+\defKV[ClesPixelArt]{Graine=\setKV[ClesPixelArt]{Graines}}%
\NewDocumentCommand\PixelArt{o m}{%
\toklistePANombre{}%
@@ -34,11 +39,15 @@
\BuildPixelArtGeant{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}{\the\intquotient}{\the\remainder}%
}%
}{%
- \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}%
+ \ifboolKV[ClesPixelArt]{Deforme}{%
+ \BuildPixelArtDeforme{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}%
+ }{%
+ \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}%
+ }%
}%
}%
-\NewDocumentCommand\BuildPixelArt{m m m m}{%
+\NewDocumentCommand\BuildPixelArtDeforme{m m m m}{%
\ifluatex
\mplibforcehmode
\begin{mplibcode}
@@ -48,6 +57,39 @@
hauteurd:=\useKV[ClesPixelArt]{HauteurD};
Unite:=\useKV[ClesPixelArt]{Unite};
+ %Deformation
+ Coefx=\useKV[ClesPixelArt]{Coefx};
+ Coefy=\useKV[ClesPixelArt]{Coefy};
+ boolean Borne,Graines;
+ Borne=\useKV[ClesPixelArt]{Borne};
+ Graines=\useKV[ClesPixelArt]{Graines};
+ if Graines:
+ randomseed:=\useKV[ClesPixelArt]{Graine};
+ fi;
+ %
+ pair M[][];
+ for l=1 upto hauteur+1:
+ for c=1 upto largeur+1:
+ if Borne:
+ if (l=1) or (l=hauteur+1):
+ M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),0);
+ if (c=1) or (c=largeur+1):
+ M[l][c]:=Unite*(c,l);
+ fi;
+ else:
+ if (c=1) or (c=largeur+1):
+ M[l][c]=Unite*(c,l-1)+Unite*(0,uniformdeviate(Coefy));
+ else:
+ M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),-Coefy+uniformdeviate(2*Coefy));
+ fi;
+ fi;
+ else:
+ M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),-Coefy+uniformdeviate(2*Coefy));
+ fi;
+ %dotlabel("",M[l][c]);
+ endfor;
+ endfor;
+
boolean Solution,Nombres,Separations;
Solution:=\useKV[ClesPixelArt]{Solution};
Nombres:=\useKV[ClesPixelArt]{Nombres};
@@ -56,7 +98,7 @@
string BaseLettres;
BaseLettres=str #2;
numeric EchelleScale;
- EchelleScale=Unite/5mm;
+ EchelleScale=Unite/10mm;
color ColorEntier[],ColFond;
n:=0;
@@ -86,11 +128,107 @@
if Nombres:
for m=0 upto (length BaseLettres-1):
if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
- label(TEX(RetiensNombres[m+1]) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite));
+ label(TEX(RetiensNombres[m+1]) scaled EchelleScale,iso(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]));
fi;
endfor;
else:
- label(TEX(substring(p,p+1) of p_) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite));
+ label(TEX(substring(p,p+1) of p_) scaled EchelleScale,iso(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]));
+ fi;
+ if Solution:
+ for m=0 upto (length BaseLettres-1):
+ if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
+ ColFond:=ColorEntier[m+1];
+ fi;
+ endfor;
+ if unknown ColFond: else: fill polygone(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]) withcolor ColFond fi;
+ fi;
+ trace polygone(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]);
+ fi;
+ endfor;
+ endfor;
+ closefrom nomfichier;
+ enddef;
+
+ Lecturecsv("#1");
+% if Separations:
+% drawoptions(withcolor Purple);
+% for k=hauteur step -hauteurd until 0:
+% draw (Unite*(-1,k-0.5)--Unite*(largeur,k-0.5)) withpen pencircle scaled 1.25;
+% endfor;
+% for k=0 step largeurd until largeur:
+% draw (Unite*(k-0.5,hauteur+0.125)--Unite*(k-0.5,-0.875)) withpen pencircle scaled 1.25;
+% endfor;
+% drawoptions();
+% fi;
+ \end{mplibcode}
+\fi
+}%
+
+\NewDocumentCommand\BuildPixelArt{m m m m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ largeur:=\useKV[ClesPixelArt]{Largeur};
+ hauteur:=\useKV[ClesPixelArt]{Hauteur};
+ largeurd:=\useKV[ClesPixelArt]{LargeurD};
+ hauteurd:=\useKV[ClesPixelArt]{HauteurD};
+ Unite:=\useKV[ClesPixelArt]{Unite};
+
+ boolean Solution,Nombres,Separations;
+ Solution:=\useKV[ClesPixelArt]{Solution};
+ Nombres:=\useKV[ClesPixelArt]{Nombres};
+ Separations:=\useKV[ClesPixelArt]{Separations};
+
+ string BaseLettres;
+ BaseLettres=str #2;
+ numeric EchelleScale;
+ EchelleScale=Unite/5mm;
+
+ color ColorEntier[],ColFond;
+ n:=0;
+ for p_=#3:
+ n:=n+1;
+ ColorEntier[n]:=p_;
+ endfor;
+
+ string RetiensNombres[];
+ if Nombres:
+ k:=0;
+ for p_=#4:
+ k:=k+1;
+ RetiensNombres[k]=p_;
+ endfor;
+ else:
+ m:=0;
+ for p_=0 upto n-1:
+ m:=m+1;
+ RetiensNombres[m]=substring(p_,p_+1) of BaseLettres;
+ endfor;
+ fi;
+
+ picture Etiquette[];
+ for k=1 upto n:
+ Etiquette[k]=image(
+ label(TEX(RetiensNombres[k]) scaled EchelleScale,(0,0));
+ );
+ endfor;
+
+ vardef Lecturecsv(expr nomfichier)=
+ for h=hauteur downto 1:
+ string p_;
+ p_=readfrom nomfichier;
+ l:=0;
+ for p=0 step 2 until 2*largeur-2:
+ l:=l+1;
+ if Solution=false:
+ if (substring(p,p+1) of p_)="-":
+ else:
+ for m=0 upto (length BaseLettres-1):
+ if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
+ draw Etiquette[m+1] shifted((l-1)*Unite,(h-1)*Unite);
+ fi;
+ endfor;
+ fi;
fi;
if Solution:
for m=0 upto (length BaseLettres-1):
@@ -101,7 +239,6 @@
if unknown ColFond: else: fill (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite) withcolor ColFond fi;
fi;
trace (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite);
- fi;
endfor;
endfor;
closefrom nomfichier;
@@ -120,10 +257,12 @@
fi;
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; Unite:=\useKV[ClesPixelArt]{Unite}; boolean Solution,Nombres; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres};}]
+ \begin{mpost}[mpsettings={largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; Unite:=\useKV[ClesPixelArt]{Unite}; boolean Solution,Nombres,Separations; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres}; Separations:=\useKV[ClesPixelArt]{Separations};}]
string BaseLettres;
BaseLettres=str #2;
-
+ numeric EchelleScale;
+ EchelleScale=Unite/5mm;
+
color ColorEntier[],ColFond;
n:=0;
for p_=#3:
@@ -133,13 +272,26 @@
string RetiensNombres[];
if Nombres:
- n:=0;
+ k:=0;
for p_=#4:
- n:=n+1;
- RetiensNombres[n]=p_;
+ k:=k+1;
+ RetiensNombres[k]=p_;
+ endfor;
+ else:
+ m:=0;
+ for p_=0 upto n-1:
+ m:=m+1;
+ RetiensNombres[m]=substring(p_,p_+1) of BaseLettres;
endfor;
fi;
-
+
+ picture Etiquette[];
+ for k=1 upto n:
+ Etiquette[k]=image(
+ label(LATEX(RetiensNombres[k]) scaled EchelleScale,(0,0));
+ );
+ endfor;
+
vardef Lecturecsv(expr nomfichier)=
for h=hauteur downto 1:
string p_;
@@ -147,16 +299,15 @@
l:=0;
for p=0 step 2 until 2*largeur-2:
l:=l+1;
+ if Solution=false:
if (substring(p,p+1) of p_)="-":
else:
- if Nombres:
for m=0 upto (length BaseLettres-1):
if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
- label(LATEX(RetiensNombres[m+1]),((l-1)*Unite,(h-1)*Unite));
+ draw Etiquette[m+1] shifted((l-1)*Unite,(h-1)*Unite);
fi;
endfor;
- else:
- label(LATEX(substring(p,p+1) of p_),((l-1)*Unite,(h-1)*Unite));
+ fi;
fi;
if Solution:
for m=0 upto (length BaseLettres-1):
@@ -167,21 +318,30 @@
if unknown ColFond: else: fill (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite) withcolor ColFond fi;
fi;
trace (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite);
- fi;
endfor;
endfor;
closefrom nomfichier;
enddef;
Lecturecsv("#1");
+ if Separations:
+ drawoptions(withcolor Purple);
+ for k=hauteur step -hauteurd until 0:
+ draw (Unite*(-1,k-0.5)--Unite*(largeur,k-0.5)) withpen pencircle scaled 1.25;
+ endfor;
+ for k=0 step largeurd until largeur:
+ draw (Unite*(k-0.5,hauteur+0.125)--Unite*(k-0.5,-0.875)) withpen pencircle scaled 1.25;
+ endfor;
+ drawoptions();
+ fi;
\end{mpost}
\fi
-}
+}%
\NewDocumentCommand\BuildPixelArtGeant{m m m m m m}{%
- \ifluatex
- \mplibforcehmode
- \begin{mplibcode}
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}%
largeur:=\useKV[ClesPixelArt]{Largeur};
hauteur:=\useKV[ClesPixelArt]{Hauteur};
largeurd:=\useKV[ClesPixelArt]{LargeurD};
@@ -253,5 +413,5 @@
Lecturecsv("#1");
\end{mplibcode}
- \fi
-} \ No newline at end of file
+ \fi%
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex
index 1f6f18b19b3..03177d14dc8 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex
@@ -1,6 +1,10 @@
%%%
% Application : pourcentage
%%%
+\def\filedatePourcentage{2024/08/04}%
+\def\fileversionPourcentage{0.1}%
+\message{-- \filedatePourcentage\space v\fileversionPourcentage}%
+%
\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,Largeur=1cm,MotReduction=diminution,AideTableau=false,ColorFill=white,CouleurTab=gray!15}
\defKV[ClesPourcentage]{Unite=\setKV[ClesPourcentage]{Concret}}
\newcommand\Pourcentage[3][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex
index dc6a39b7a57..e3a5f04b628 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex
@@ -1,6 +1,10 @@
%%%
% Probabilité et fréquence
%%%
+\def\filedateProbaFrequence{2024/08/04}%
+\def\fileversionProbaFrequence{0.1}%
+\message{-- \filedateProbaFrequence\space v\fileversionProbaFrequence}%
+%
\setKVdefault[PfCFrequence]{Couleur=false,Lancers=1,Legende=false}%
\defKV[PfCFrequence]{ListeCouleurs=\setKV[PfCFrequence]{Couleur}}%
\defKV[PfCFrequence]{Legendes=\setKV[PfCFrequence]{Legende}\setsepchar{,}\reademptyitems\readlist*\PfMListeLegendes{#1}\reademptyitems}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex
index 7ed834a61ea..73bafa9ba27 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex
@@ -1,7 +1,11 @@
%%%
% Proba
%%%
-\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1,Incline}
+\def\filedateProba{2024/08/15}%
+\def\fileversionProba{0.1a}%
+\message{-- \filedateProba\space v\fileversionProba}%
+%
+\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1,Incline,SansProba=false}
\def\Updatetoksproba#1/#2\nil{\addtotok\toklistepointproba{"#1","\footnotesize #2",}}
\def\Updatetoksprobapdf#1/#2\nil{\addtotok\toklistepointproba{"#1","\noexpand\footnotesize #2",}}
@@ -35,6 +39,8 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
+ boolean SansProba;
+ SansProba=\useKV[ClesProba]{SansProba};
pair A,B,C[],D[];%les noeuds de l'arbre
%Figure(-10u,-10u,10u,10u);
A=u*(1,1);
@@ -58,8 +64,10 @@
fi;
marque_s:=marque_s*2;
labeloffset:=labeloffset*3;
+ if SansProba=false:
label.bot(btex 0 etex,A);
label.bot(btex 1 etex,B);
+ fi;
labeloffset:=labeloffset/3;
n:=1;%compter les informations
k:=1;% compter les informations noeud pour les placer
@@ -93,7 +101,7 @@
toto(#2);
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={input PfCGeometrie;}]
+ \begin{mpost}[mpsettings={input PfCGeometrie;boolean SansProba;SansProba=\useKV[ClesProba]{SansProba};}]
pair A,B,C[],D[];%les noeuds de l'arbre
Figure(-10u,-10u,10u,10u);
A=u*(1,1);
@@ -117,8 +125,10 @@
fi;
marque_s:=marque_s*2;
labeloffset:=labeloffset*3;
+ if SansProba=false:
label.bot(btex 0 etex,A);
label.bot(btex 1 etex,B);
+ fi;
labeloffset:=labeloffset/3;
n:=1;%compter les informations
k:=1;% compter les informations noeud pour les placer
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex
index f1bdc0307fe..871f80d6508 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex
@@ -1,6 +1,10 @@
%%%%
% Prog de calculs "simples"
%%%%
+\def\filedateProgCalcul{2024/08/04}%
+\def\fileversionProgCalcul{0.1}%
+\message{-- \filedateProgCalcul\space v\fileversionProgCalcul}%
+%
\setKVdefault[ClesProg]{%
Ecart=2em,%
Direct,%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex
index 1e6526f41b0..1c8aba3324b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex
@@ -1,6 +1,10 @@
%%%
% Proportionnalit\'e
%%%
+\def\filedatePropor{2024/09/04}%
+\def\fileversionPropor{0.1a}%
+\message{-- \filedatePropor\space v\fileversionPropor}%
+%
\setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white,CouleurTab=gray!15,Vertical=false,Simple=false,Condense=false}%
\tikzstyle{FlechePropor}=[-stealth]
@@ -201,49 +205,51 @@
\NewDocumentCommand\FlechePCG{mm}{%
\begin{tikzpicture}[remember picture,overlay,node distance=\getstrut\ht]%
- \node[inner sep=0pt] (MilieuH-#1) at ($(ProporG-#1)!0.25!(ProporD-#1)$) {};%
- \node[inner sep=0pt] (MilieuH-#2) at ($(ProporG-#2)!0.25!(ProporD-#2)$) {};%
- \node[inner sep=0pt] (MilieuB-#1) at ($(ProporG-#1)!0.75!(ProporD-#1)$) {};%
- \node[inner sep=0pt] (MilieuB-#2) at ($(ProporG-#2)!0.75!(ProporD-#2)$) {};%
+ \node[inner sep=0pt] (MilieuH-#1) at ($(ProporH-#1)!\PfCCoeffH!(ProporB-#1)$) {};%
+ \node[inner sep=0pt] (MilieuH-#2) at ($(ProporH-#2)!\PfCCoeffH!(ProporB-#2)$) {};%
+ \node[inner sep=0pt] (MilieuB-#1) at ($(ProporH-#1)!\PfCCoeffB!(ProporB-#1)$) {};%
+ \node[inner sep=0pt] (MilieuB-#2) at ($(ProporH-#2)!\PfCCoeffB!(ProporB-#2)$) {};%
\xintifboolexpr{#1<#2}{%
\coordinate[right of=MilieuH-#1] (aux1);%
- \coordinate[right of=MilieuH-#2] (aux2);%
- \coordinate[left of=MilieuB-#1] (aux3);%
+ \coordinate[left of=MilieuH-#2] (aux2);%
+ \coordinate[right of=MilieuB-#1] (aux3);%
\coordinate[left of=MilieuB-#2] (aux4);%
- \draw[out=30,in=-30,gray] (aux3) to (aux4);
+ \draw[FlechePropor,gray] (aux4) -- (aux1);
+ \draw[out=-30,in=30,gray] (aux2) to (aux4);
}{%
- \coordinate[right of=MilieuH-#1] (aux1);%
+ \coordinate[left of=MilieuH-#1] (aux1);%
\coordinate[right of=MilieuH-#2] (aux2);%
\coordinate[left of=MilieuB-#1] (aux3);%
- \coordinate[left of=MilieuB-#2] (aux4);%
- \draw[out=-30,in=30,gray] (aux3) to (aux4);
+ \coordinate[right of=MilieuB-#2] (aux4);%
+ \draw[FlechePropor,gray] (aux1) -- (aux4);
+ \draw[out=30,in=-30,gray] (aux3) to (aux1);
}%
\draw[gray] (aux2) -- (aux3);
- \draw[FlechePropor,gray] (aux4) -- (aux1);
\end{tikzpicture}%
}%
\NewDocumentCommand\FlechePCD{mm}{%
\begin{tikzpicture}[remember picture,overlay,node distance=\getstrut\ht]%
- \node[inner sep=0pt] (MilieuH-#1) at ($(ProporG-#1)!0.25!(ProporD-#1)$) {};%
- \node[inner sep=0pt] (MilieuH-#2) at ($(ProporG-#2)!0.25!(ProporD-#2)$) {};%
- \node[inner sep=0pt] (MilieuB-#1) at ($(ProporG-#1)!0.75!(ProporD-#1)$) {};%
- \node[inner sep=0pt] (MilieuB-#2) at ($(ProporG-#2)!0.75!(ProporD-#2)$) {};%
+ \node[inner sep=0pt] (MilieuH-#1) at ($(ProporH-#1)!\PfCCoeffH!(ProporB-#1)$) {};%
+ \node[inner sep=0pt] (MilieuH-#2) at ($(ProporH-#2)!\PfCCoeffH!(ProporB-#2)$) {};%
+ \node[inner sep=0pt] (MilieuB-#1) at ($(ProporH-#1)!\PfCCoeffB!(ProporB-#1)$) {};%
+ \node[inner sep=0pt] (MilieuB-#2) at ($(ProporH-#2)!\PfCCoeffB!(ProporB-#2)$) {};%
\xintifboolexpr{#1<#2}{%
\coordinate[right of=MilieuH-#1] (aux1);%
- \coordinate[right of=MilieuH-#2] (aux2);%
- \coordinate[left of=MilieuB-#1] (aux3);%
+ \coordinate[left of=MilieuH-#2] (aux2);%
+ \coordinate[right of=MilieuB-#1] (aux3);%
\coordinate[left of=MilieuB-#2] (aux4);%
- \draw[out=150,in=-150,gray] (aux1) to (aux2);
+ \draw[FlechePropor,gray] (aux3) -- (aux2);
+ \draw[out=-150,in=150,gray] (aux1) to (aux3);
}{%
- \coordinate[right of=MilieuH-#1] (aux1);%
+ \coordinate[left of=MilieuH-#1] (aux1);%
\coordinate[right of=MilieuH-#2] (aux2);%
\coordinate[left of=MilieuB-#1] (aux3);%
- \coordinate[left of=MilieuB-#2] (aux4);%
- \draw[out=-150,in=150,gray] (aux1) to (aux2);
+ \coordinate[right of=MilieuB-#2] (aux4);%
+ \draw[FlechePropor,gray] (aux2) -- (aux3);
+ \draw[out=-150,in=150,gray] (aux2) to (aux4);
}%
\draw[gray] (aux4) -- (aux1);
- \draw[FlechePropor,gray] (aux2) -- (aux3);
\end{tikzpicture}%
}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex
index ad9f1b0edbe..fc74fea9c5a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex
@@ -1,6 +1,10 @@
%%%
% Ppt\'es des droites (6eme)
%%%
+\def\filedatePptesDroites{2024/08/04}%
+\def\fileversionPptesDroites{0.1}%
+\message{-- \filedatePptesDroites\space v\fileversionPptesDroites}%
+%
\setKVdefault[ClesDroites]{Brouillon=false,CitePropriete=false,Num=1,Figure=false,Remediation=false,FigureSeule=false}
\newcommand\Redaction[4][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex
index 1d8a9299390..d51387cd78f 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex
@@ -1,30 +1,40 @@
%%%
% Puissances 4
%%%
-\setKVdefault[ClesPQuatre]{Couleur=Gray,Largeur=2cm,LargeurUn=2cm,Multiplication,Entier,Nombre,Exposant=false,Libre=false,Texte=false,Echelle=2}%
+\def\filedatePquatre{2024/08/04}%
+\def\fileversionPquatre{0.1}%
+\message{-- \filedatePquatre\space v\fileversionPquatre}%
+%
+\setKVdefault[ClesPQuatre]{Couleur=Gray,Largeur=2cm,LargeurUn=2cm,Multiplication,Entier,Nombre,Exposant=false,Libre=false,Texte=false,Echelle=2,Correction=false}%
\defKV[ClesPQuatre]{Addition=\setKV[ClesPQuatre]{Multiplication=false}}%
\defKV[ClesPQuatre]{Relatif=\setKV[ClesPQuatre]{Entier=false}}%
\defKV[ClesPQuatre]{Puissance=\setKV[ClesPQuatre]{Exposant}}%
\defKV[ClesPQuatre]{Autre=\setKV[ClesPQuatre]{Nombre=false}\setKV[ClesPQuatre]{Libre}}%
\defKV[ClesPQuatre]{Consignes=\setKV[ClesPQuatre]{Texte}}%
+\defKV[ClesPQuatre]{Solution=\setKV[ClesPQuatre]{Correction}\setsepchar{,}\ignoreemptyitems\readlist*\PQuatreListeS{#1}\reademptyitems}%
+\defKV[ClesPQuatre]{Graine=\PfCGraineAlea{#1}}%
\newtoks\toklistePQuatreh%
\newtoks\toklistePQuatrev%
+\newtoks\toklistePQuatres%
\def\UpdatetoksPQuatreh#1\nil{\addtotok\toklistePQuatreh{"#1",}}%
\def\UpdatetoksPQuatrev#1\nil{\addtotok\toklistePQuatrev{"#1",}}%
+\def\UpdatetoksPQuatres#1\nil{\addtotok\toklistePQuatres{"#1",}}%
\NewDocumentCommand\PQuatre{o +m}{%
\useKVdefault[ClesPQuatre]%
\toklistePQuatreh{}%
\toklistePQuatrev{}%
+ \toklistePQuatres{}%
\setKV[ClesPQuatre]{#1}%
\ifboolKV[ClesPQuatre]{Nombre}{%
\ifboolKV[ClesPQuatre]{Exposant}{%
- \def\PQuatreListe{$10^{-10}$,$10^{-9}$,$10^{-8}$,$10^{-7}$,$10^{-6}$,$10^{-5}$,$10^{-4}$,$10^{-3}$,$10^{-2}$,$10^{2}$,$10^{3}$,$10^{4}$,$10^{5}$,$10^{6}$,$10^{7}$,$10^{8}$,$10^{9}$,$10^{10}$}%
+ \def\PQuatreListe{-10,-9,-8,-7,-6,-5,-4,-3,-2,2,3,4,5,6,7,8,9,10}%
\MelangeListe{\PQuatreListe}{7}%
- \readlist*\PQuatreListeH{\faa}%
+ \ignoreemptyitems\readlist*\PQuatreListeH{\faa}%
\MelangeListe{\PQuatreListe}{7}%
- \readlist*\PQuatreListeV{\faa}%
+ \ignoreemptyitems\readlist*\PQuatreListeV{\faa}%
+ \reademptyitems
\foreachitem\compteur\in\PQuatreListeH{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
\foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
}{%
@@ -39,7 +49,7 @@
\foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
}{%
% On choisit aléatoirement les listes de nombres de -10 à -2 union 2 à 10 en faisant deux listes : horizontale et verticale
- \def\PQuatreListe{$-10$,$-9$,$-8$,$-7$,$-6$,$-5$,$-4$,$-3$,$-2$,2,3,4,5,6,7,8,9,10}%
+ \def\PQuatreListe{-10,-9,-8,-7,-6,-5,-4,-3,-2,2,3,4,5,6,7,8,9,10}%
\MelangeListe{\PQuatreListe}{7}%
\readlist*\PQuatreListeH{\faa}%
\MelangeListe{\PQuatreListe}{7}%
@@ -55,6 +65,10 @@
\setsepchar{,}%
\foreachitem\compteur\in\PQuatreListes[1]{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
\foreachitem\compteur\in\PQuatreListes[2]{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
+ % On crée éventuellement la liste des solutions
+ \ifboolKV[ClesPQuatre]{Correction}{%
+ \foreachitem\compteur\in\PQuatreListeS{\expandafter\UpdatetoksPQuatres\compteur\nil}%
+ }{}%
}%
% Une fois les listes construites, on dessine et on place les listes.
\PQuatreGrille{\the\toklistePQuatrev}{\the\toklistePQuatreh}%
@@ -69,10 +83,12 @@
PQEchelle=\useKV[ClesPQuatre]{Echelle};
color PQfond;
PQfond=\useKV[ClesPQuatre]{Couleur};
- boolean PQLibre,PQMultiplication,PQTexte;
+ boolean PQLibre,PQMultiplication,PQTexte,Correction,Exposant;
PQLibre:=\useKV[ClesPQuatre]{Libre};
PQMultiplication=\useKV[ClesPQuatre]{Multiplication};
PQTexte:=\useKV[ClesPQuatre]{Texte};
+ Correction=\useKV[ClesPQuatre]{Correction};
+ Exposant=\useKV[ClesPQuatre]{Exposant};
if PQTexte:
string PQConsignes;
@@ -111,6 +127,12 @@
if PQLibre:
if PQTexte:
label.llft(TEX("\begin{minipage}{"&decimal(PQLargeurUn)&"pt}"&PQConsignes&"\end{minipage}") scaled PQEchelle,A);
+ else:
+ if PQMultiplication:
+ label.llft(TEX("$\times$") scaled PQEchelle,A);
+ else:
+ label.llft(TEX("$+$") scaled PQEchelle,A);
+ fi;
fi;
else:
if PQMultiplication:
@@ -119,24 +141,72 @@
label.llft(TEX("$+$") scaled PQEchelle,A);
fi;
fi;
+ %
+ string Textev[];
+ string Texteh[];
labeloffset:=labeloffset/2;
vardef Vertical(text t)=
n:=0;
for p_=t:
+ if PQLibre:
label.lft(TEX(p_) scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2));
+ else:
+ if Exposant:
+ label.lft(TEX("$10^{"&p_&"}$") scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2));
+ else:
+ label.lft(TEX("\num{"&p_&"}") scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2));
+ fi;
+ Textev[n]=p_;
+ fi;
n:=n+1;
endfor;
enddef;
vardef Horizontal(text t)=
n:=0;
for p_=t:
+ if PQLibre:
label.bot(TEX(p_) scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0));
+ else:
+ if Exposant:
+ label.bot(TEX("$10^{"&p_&"}$") scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0));
+ else:
+ label.bot(TEX("\num{"&p_&"}") scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0));
+ fi;
+ Texteh[n]=p_;
+ fi;
n:=n+1;
endfor;
enddef;
labeloffset:=labeloffset*4;
Vertical(#1);
Horizontal(#2);
+ % on affiche la solution
+ vardef AfficheSolution(text t)=
+ n:=0;
+ for p_=t:
+ label(TEX(p_),M[n mod nclargeur][n div nchauteur]);
+ n:=n+1;
+ endfor;
+ enddef;
+ if Correction:
+ if PQLibre=false:
+ for k=0 upto (nclargeur-1):
+ for l=0 upto (nchauteur-1):
+ if Exposant:
+ label(TEX("\Large$10^{\fpeval{"&Texteh[k]&"+"&Textev[l]&"}}$"),M[k][l]);
+ else:
+ if PQMultiplication:
+ label(TEX("\Huge\num{\fpeval{"&Texteh[k]&"*"&Textev[l]&"}}"),M[k][l]);
+ else:
+ label(TEX("\Huge\num{\fpeval{"&Texteh[k]&"+"&Textev[l]&"}}"),M[k][l]);
+ fi;
+ fi;
+ endfor;
+ endfor;
+ else:
+ AfficheSolution(\the\toklistePQuatres);
+ fi;
+ fi;
\end{mplibcode}
\else%
\begin{mpost}[mpsettings={Largeur=\useKV[ClesPQuatre]{Largeur};Largeur=\useKV[ClesPQuatre]{Largeur};LargeurUn=\useKV[ClesPQuatre]{LargeurUn};Echelle=\useKV[ClesPQuatre]{Echelle};color fond;fond=\useKV[ClesPQuatre]{Couleur};boolean Libre,Multiplication,Texte;Libre:=\useKV[ClesPQuatre]{Libre};Multiplication=\useKV[ClesPQuatre]{Multiplication};Texte:=\useKV[ClesPQuatre]{Texte};if Texte:string Consignes;Consignes=\useKV[ClesPQuatre]{Consignes};fi;}]
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex
index 7f00ac287e1..865982ee356 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex
@@ -1,6 +1,10 @@
%%%
% Puzzle Somme Pyramide
%%%
+\def\filedatePuzzleSommePyramide{2024/08/04}%
+\def\fileversionPuzzleSommePyramide{0.1}%
+\message{-- \filedatePuzzleSommePyramide\space v\fileversionPuzzleSommePyramide}%
+%
\setKVdefault[ClesPuzzleP]{Largeur=40pt,Etages=4,Graines=false,Solutions=false,Jeu,EnonceQuestion=false,NbLignes=7}
\defKV[ClesPuzzleP]{Graine=\setKV[ClesPuzzleP]{Graines}}%
\defKV[ClesPuzzleP]{Solution=\setKV[ClesPuzzleP]{Solutions}\setKV[ClesPuzzleP]{Jeu=false}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex
index bfda6963006..983a8b1eb95 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex
@@ -1,6 +1,10 @@
%%%
% PyraVoca
%%%
+\def\filedatePyraVoca{2024/08/04}%
+\def\fileversionPyraVoca{0.1}%
+\message{-- \filedatePyraVoca\space v\fileversionPyraVoca}%
+%
\newlength{\PfCPyraVocaHauteur}
\setKVdefault[PyraVoca]{Solution=false,Largeur=15pt}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex
index fdd5c7b6852..0b00e0e4acc 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex
@@ -1,6 +1,10 @@
%%%
% Pyramide de calculs
%%%
+\def\filedatePyraCalc{2024/08/04}%
+\def\fileversionPyraCalc{0.1}%
+\message{-- \filedatePyraCalc\space v\fileversionPyraCalc}%
+%
\newcommand\DessinePyramideNombreMul[1]{%
\ifluatex
\mplibforcehmode
@@ -241,7 +245,7 @@
\fi
}%
-\setKVdefault[ClesPyramide]{Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false,Couleur=Crimson,Multiplication=false,CouleurNombre=blue,Produit=false,Solution=false,Aide=false,Cote=4cm}%
+\setKVdefault[ClesPyramide]{ToutesOperations=false,Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false,Couleur=Crimson,Multiplication=false,CouleurNombre=blue,Produit=false,Solution=false,Aide=false,Cote=4cm}%
\newtoks\toklistecaseP%
\def\UpdatetoksPyramide#1\nil{\addtotok\toklistecaseP{"#1",}}%
@@ -250,6 +254,9 @@
\NewDocumentCommand\PyramideNombre{o m}{%
\useKVdefault[ClesPyramide]%
\setKV[ClesPyramide]{#1}%
+ \ifboolKV[ClesPyramide]{ToutesOperations}{%
+ \PyramideOp[#1]{#2}%
+ }{%
\ifboolKV[ClesPyramide]{Multiplication}{%
\ifx\bla#2\bla%
\setKV[ClesPyramide]{Vide=true}%
@@ -278,4 +285,302 @@
}{Le nombre d'éléments dans la liste des propositions n'est pas compatible avec le nombre d'étages choisi.}%
\fi%
}%
+}%
+}%
+
+\setKVdefault[PyramideOp]{Rayon=5mm,Graines=false,Etages=5,Solution=false,Relatifs=false,Case=-1}
+\defKV[PyramideOp]{Graine=\setKV[PyramideOp]{Graines}}
+\defKV[PyramideOp]{CouleurSolution=\setKV[PyramideOp]{Solution}}
+
+\NewDocumentCommand\PyramideOp{om}{%
+ \useKVdefault[PyramideOp]%
+ \setKV[PyramideOp]{#1}%
+ \ifboolKV[PyramideOp]{Relatifs}{%
+ \BuildPyramideOpRelatifs{#2}%
+ }{%
+ \BuildPyramideOp{#2}%
+ }%
+}%
+
+\NewDocumentCommand\BuildPyramideOp{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \mplibnumbersystem{double}
+ \begin{mplibcode}
+ Etages=\useKV[PyramideOp]{Etages};
+ Rayon=\useKV[PyramideOp]{Rayon};
+ Case=\useKV[PyramideOp]{Case};
+
+ boolean Graines,Solution,Allume[][];
+
+ Graines=\useKV[PyramideOp]{Graines};
+ if Graines:
+ randomseed:=\useKV[PyramideOp]{Graine};
+ fi;
+
+ Solution=\useKV[PyramideOp]{Solution};
+ if Solution:
+ color CouleurSolution;
+ CouleurSolution=\useKV[PyramideOp]{CouleurSolution};
+ fi;
+
+ vardef ChoixOperation(expr Nba,Nbb)=
+ if (Nba<Nbb) or (Nba=Nbb):
+ if Nba*Nbb>200:
+ ChoixOp:=ceiling(uniformdeviate(1));
+ else:
+ ChoixOp:=ceiling(uniformdeviate(2));
+ fi;
+ else:
+ if (Nba mod Nbb)<>0:
+ if Nba*Nbb>200:
+ ChoixAlea:=uniformdeviate(1);
+ if ChoixAlea<0.5:
+ ChoixOp:=1;
+ else:
+ ChoixOp:=3;
+ fi;
+ else:
+ ChoixOp:=ceiling(uniformdeviate(3));
+ fi;
+ else:
+ if Nba*Nbb>200:
+ ChoixAlea:=uniformdeviate(1);
+ if ChoixAlea<0.5:
+ ChoixOp:=1;
+ else:
+ ChoixOp:=ceiling(2+uniformdeviate(2));
+ fi;
+ else:
+ ChoixOp:=ceiling(uniformdeviate(4));
+ fi;
+ fi;
+ fi;
+ enddef;
+
+ numeric Nb[][],ChoixOp[][];
+
+ pair M[][],N[][];
+
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-1-k:
+ M[k][l]=Rayon*(1,1)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30));
+ Allume[k][l]=false;
+ endfor;
+ endfor;
+ for k=0 upto Etages-2:
+ for l=0 upto Etages-2-k:
+ N[k][l]=Rayon*(1,1)+(Rayon,0)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30));
+ endfor;
+ endfor;
+
+ n:=0;
+
+ for p_=#1:
+ Nb[0][n]=p_;
+ if n=Case:
+ if n<Etages-1:
+ Allume[1][n]:=true;
+ else:
+ Allume[1][n-1]:=true;
+ fi;
+ else:
+ Allume[0][n]:=true;
+ fi;
+ n:=n+1;
+ endfor;
+
+ string Op[][];
+
+ % Détermination des opérations et des valeurs à indiquer.
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-2-k:
+ ChoixOperation(Nb[k][l],Nb[k][l+1]);
+ if ChoixOp=1:
+ Op[k][l]="$+$";
+ Nb[k+1][l]=Nb[k][l]+Nb[k][l+1];
+ elseif ChoixOp=2:
+ Op[k][l]="$\times$";
+ Nb[k+1][l]=Nb[k][l]*Nb[k][l+1];
+ elseif ChoixOp=3:
+ Op[k][l]="$\_$";
+ Nb[k+1][l]=Nb[k][l]-Nb[k][l+1];
+ elseif ChoixOp=4:
+ Op[k][l]="$\div$";
+ Nb[k+1][l]=Nb[k][l]/Nb[k][l+1];
+ fi;
+ endfor;
+ endfor;
+ %Affichage
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-1-k:
+ if Allume[k][l]=false:
+ if Solution:
+ fill cercles(M[k][l],Rayon) withcolor CouleurSolution;
+ label(decimal(Nb[k][l]),M[k][l]);
+ fi;
+ else:
+ label(decimal(Nb[k][l]),M[k][l]);
+ fi;
+ trace cercles(M[k][l],Rayon);
+ endfor;
+ endfor;
+ for k=0 upto Etages-2:
+ for l=0 upto Etages-2-k:
+ fill cercles(N[k][l],2mm) withcolor 0.8white;
+ trace cercles(N[k][l],2mm);
+ label(TEX(Op[k][l]),N[k][l]);
+ endfor;
+ endfor;
+ \end{mplibcode}
+ \mplibnumbersystem{scaled}
+ \fi
+}
+
+\NewDocumentCommand\BuildPyramideOpRelatifs{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \mplibnumbersystem{double}
+ \begin{mplibcode}
+ Etages=\useKV[PyramideOp]{Etages};
+ Rayon=\useKV[PyramideOp]{Rayon};
+ Case=\useKV[PyramideOp]{Case};
+
+ boolean Graines,Solution,Allume[][];
+
+ Graines=\useKV[PyramideOp]{Graines};
+ if Graines:
+ randomseed:=\useKV[PyramideOp]{Graine};
+ fi;
+
+ Solution=\useKV[PyramideOp]{Solution};
+ if Solution:
+ color CouleurSolution;
+ CouleurSolution=\useKV[PyramideOp]{CouleurSolution};
+ fi;
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ vardef ChoixOperation(expr Nba,Nbb)=
+ if (Nba=Nbb):
+ if Nba*Nbb>200:
+ ChoixOp:=ceiling(uniformdeviate(1));
+ else:
+ ChoixOp:=ceiling(uniformdeviate(2));
+ fi;
+ elseif (Nba+Nbb=0):
+ if abs(Nba*Nbb)>200:
+ ChoixOp:=3;
+ else:
+ ChoixAlea:=uniformdeviate(1);
+ if ChoixAlea<0.5:
+ ChoixOp:=2;
+ else:
+ ChoixOp:=3;
+ fi;
+ fi;
+ else:
+ if (abs(Nba) mod abs(Nbb))<>0:
+ if abs(Nba*Nbb)>200:
+ ChoixAlea:=uniformdeviate(1);
+ if ChoixAlea<0.5:
+ ChoixOp:=1;
+ else:
+ ChoixOp:=3;
+ fi;
+ else:
+ ChoixOp:=ceiling(uniformdeviate(3));
+ fi;
+ else:
+ if abs(Nba*Nbb)>200:
+ ChoixAlea:=uniformdeviate(1);
+ if ChoixAlea<0.5:
+ ChoixOp:=1;
+ else:
+ ChoixOp:=ceiling(2+uniformdeviate(2));
+ fi;
+ else:
+ ChoixOp:=ceiling(uniformdeviate(4));
+ fi;
+ fi;
+ fi;
+ enddef;
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ numeric Nb[][],ChoixOp[][];
+
+ pair M[][],N[][];
+
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-1-k:
+ M[k][l]=Rayon*(1,1)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30));
+ Allume[k][l]=false;
+ endfor;
+ endfor;
+ for k=0 upto Etages-2:
+ for l=0 upto Etages-2-k:
+ N[k][l]=Rayon*(1,1)+(Rayon,0)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30));
+ endfor;
+ endfor;
+
+ n:=0;
+
+ for p_=#1:
+ Nb[0][n]=p_;
+ if n=Case:
+ if n<Etages-1:
+ Allume[1][n]:=true;
+ else:
+ Allume[1][n-1]:=true;
+ fi;
+ else:
+ Allume[0][n]:=true;
+ fi;
+ n:=n+1;
+ endfor;
+
+ string Op[][];
+
+ % Détermination des opérations et des valeurs à indiquer.
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-2-k:
+ ChoixOperation(Nb[k][l],Nb[k][l+1]);
+ if ChoixOp=1:
+ Op[k][l]="$+$";
+ Nb[k+1][l]=Nb[k][l]+Nb[k][l+1];
+ elseif ChoixOp=2:
+ Op[k][l]="$\times$";
+ Nb[k+1][l]=Nb[k][l]*Nb[k][l+1];
+ elseif ChoixOp=3:
+ Op[k][l]="$\_$";
+ Nb[k+1][l]=Nb[k][l]-Nb[k][l+1];
+ elseif ChoixOp=4:
+ Op[k][l]="$\div$";
+ Nb[k+1][l]=Nb[k][l]/Nb[k][l+1];
+ fi;
+ endfor;
+ endfor;
+ %Affichage
+ for k=0 upto Etages-1:
+ for l=0 upto Etages-1-k:
+ if Allume[k][l]=false:
+ if Solution:
+ fill cercles(M[k][l],Rayon) withcolor CouleurSolution;
+ label(TEX("\num{"&decimal(Nb[k][l])&"}"),M[k][l]);
+ fi;
+ else:
+ label(TEX("\num{"&decimal(Nb[k][l])&"}"),M[k][l]);
+ fi;
+ trace cercles(M[k][l],Rayon);
+ endfor;
+ endfor;
+ for k=0 upto Etages-2:
+ for l=0 upto Etages-2-k:
+ fill cercles(N[k][l],2mm) withcolor 0.8white;
+ trace cercles(N[k][l],2mm);
+ label(TEX(Op[k][l]),N[k][l]);
+ endfor;
+ endfor;
+ \end{mplibcode}
+ \mplibnumbersystem{scaled}
+ \fi
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex
index 5c922d98b04..f5c95d91e42 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex
@@ -1,6 +1,10 @@
%%%
% Le th\'eor\`eme de Pythagore
%%%
+\def\filedatePythagore{2024/08/04}%
+\def\fileversionPythagore{0.1}%
+\message{-- \filedatePythagore\space v\fileversionPythagore}%
+%
\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,Perso=false,AllPerso=false,SansMots=false,Decalage=5mm,ModeleCouleur=5}%
\defKV[ClesPythagore]{ValeurA=\setKV[ClesPythagore]{EnchaineA}}%
\defKV[ClesPythagore]{ValeurB=\setKV[ClesPythagore]{EnchaineB}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex
index 8edee39f164..5bcf626ddcf 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex
@@ -1,6 +1,10 @@
%%%
% Questions Flash
%%%
+\def\filedateQFlash{2024/08/04}%
+\def\fileversionQFlash{0.1}%
+\message{-- \filedateQFlash\space v\fileversionQFlash}%
+%
\tcbset{Expression/.style={colback=white,valign=center,left=0mm,right=0mm,top=1mm,bottom=1mm,colframe=white}}%
\tcbset{ExpressionSerie1/.style={colback=\useKV[ClesFlash]{Couleur1},left=0mm,right=0mm,top=1mm,bottom=1mm}}%
\tcbset{ExpressionSerie2/.style={colback=\useKV[ClesFlash]{Couleur2},left=0mm,right=0mm,top=1mm,bottom=1mm}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
index aaf9a67f20b..8aee438e624 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex
@@ -1,6 +1,10 @@
%%%
% R\'eponses \`a relier
%%%
+\def\filedateQRelier{2024/08/04}%
+\def\fileversionQRelier{0.1}%
+\message{-- \filedateQRelier\space v\fileversionQRelier}%
+%
\setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm,Couleur=black}%
\defKV[ClesRelie]{Graine=\PfCGraineAlea{#1}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex
index aa896d11856..119b5d0944c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex
@@ -1,6 +1,10 @@
%%%
% Qui suis-je
%%%
+\def\filedateQsuisuisje{2024/08/04}%
+\def\fileversionQsuisuisje{0.1}%
+\message{-- \filedateQsuisuisje\space v\fileversionQsuisuisje}%
+%
\setKVdefault[Quisuisje]{Solution=false,Largeur=5mm,Colonnes=5,CodePerso=false,TexteA=Lettre,TexteB=R\'esultat du calcul}%
\newcommand\QuisuisjeEnonce{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex
index a8f035a577c..8fabde9116c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex
@@ -1,6 +1,10 @@
%%%
% Codage RLE
%%%
+\def\filedateRLE{2024/08/04}%
+\def\fileversionRLE{0.1}%
+\message{-- \filedateRLE\space v\fileversionRLE}%
+%
\setKVdefault[RLE]{Largeur=10pt,Taille=5,Unite=1cm,Solution=false,Enonce=true}
\newtoks\toklisterle
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex
index 1c48ab8efcc..ca58c321fdb 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex
@@ -1,6 +1,10 @@
%%%
% Rangement des nombres
%%%
+\def\filedateRgtNb{2024/08/04}%
+\def\fileversionRgtNb{0.1}%
+\message{-- \filedateRgtNb\space v\fileversionRgtNb}%
+%
\setKVdefault[ClesRgt]{Croissant,Decroissant=false,Strict,Fraction=false,Details=false,Seul=false}%
\dtlexpandnewvalue%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex
index fa3a16bf7e7..cb24c2b4043 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex
@@ -1,6 +1,10 @@
%%%
% Rapido
%%%
+\def\filedateRapido{2024/08/04}%
+\def\fileversionRapido{0.1}%
+\message{-- \filedateRapido\space v\fileversionRapido}%
+%
%% D'après https://www.facebook.com/groups/994675223903586/user/100017057226847
%% et une programmation de Laurent Lassale-Carrere
\newcounter{PfCnexo}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex
index c2a4d959541..1d204baf909 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex
@@ -1,6 +1,10 @@
%%%
% Formules
%%%
+\def\filedateRapFormules{2024/08/04}%
+\def\fileversionRapFormules{0.1}%
+\message{-- \filedateRapFormules\space v\fileversionRapFormules}%
+%
\setKVdefault[ClesFormule]{Perimetre=false,Aire=false,Volume=false,Surface=carr\'e,Solide=pav\'e,Angle=0,Ancre={(0,0)},Largeur=5cm,Couleur=white,EchelleEspace=70,Echelle=1cm}
\def\MPFigureCarreCode{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex
index 371688f120c..f99ced507ff 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex
@@ -1,6 +1,10 @@
%%%
% Logos Recyclage
%%%
+\def\filedateRecyclage{2024/08/04}%
+\def\fileversionRecyclage{0.1}%
+\message{-- \filedateRecyclage\space v\fileversionRecyclage}%
+%
\setKVdefault[Recyclage]{Ticket,Papier=false,Verre=false,Bouteille=false,Carton=false,Couleurs}%
\defKV[Recyclage]{Couleur=\setKV[Recyclage]{Couleurs=false}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex
index 23e7bd2775b..d2dec508171 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex
@@ -1,6 +1,10 @@
%%%
% Reperage
%%%
+\def\filedateReperage{2024/08/04}%
+\def\fileversionReperage{0.1}%
+\message{-- \filedateReperage\space v\fileversionReperage}%
+%
\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageUnites=true,MarquePrimaire=true,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,ValeurMiny=-4000,ValeurMaxy=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp",Niveaux=false,Decale=false,Tiret=false,Cadre=false,ModeleCouleur=5,EchelleCroix=1,CouleurCroix=black}
\defKV[ClesReperage]{Traces=\setKV[ClesReperage]{Code}}%
\defKV[ClesReperage]{Niveau=\setKV[ClesReperage]{Etages=#1}\setKV[ClesReperage]{Niveaux}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex
index 390c1a9caac..47ed10c3761 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex
@@ -1,7 +1,11 @@
%%%
% Diff\'erentes représentations graphiques
%%%
-\setKVdefault[TraceG]{Millimetre=false,Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LegendeX=false,LegendeY=false,LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Epaisseur=1,Relie=false,RelieSegment=false,Marque=dot,Code=false,Vide=false,NbPointsCourbe=100,Tiret=false}%
+\def\filedateRepGraph{2024/08/20}%
+\def\fileversionRepGraph{0.1a}%
+\message{-- \filedateRepGraph\space v\fileversionRepGraph}%
+%
+\setKVdefault[TraceG]{Millimetre=false,Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LegendeX=false,LegendeY=false,LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Epaisseur=1,Relie=false,RelieSegment=false,Marque=dot,Code=false,Vide=false,NbPointsCourbe=100,Tiret=false,StyleTrace=0,Date=false}%
\defKV[TraceG]{Traces=\setKV[TraceG]{Code}}%
\defKV[TraceG]{LabelX=\setKV[TraceG]{LegendeX}}%
\defKV[TraceG]{LabelY=\setKV[TraceG]{LegendeY}}%
@@ -35,6 +39,8 @@
y.u=1cm/\useKV[TraceG]{Ystep};
grillex=\useKV[TraceG]{PasGrilleX};
grilley=\useKV[TraceG]{PasGrilleY};
+ pasgradx=\useKV[TraceG]{PasGradX};
+ pasgrady=\useKV[TraceG]{PasGradY};
pos=\useKV[TraceG]{LabelC};
marque_p:=str \useKV[TraceG]{Marque};
@@ -49,6 +55,9 @@
LegendeX:=\useKV[TraceG]{LegendeX};
LegendeY:=\useKV[TraceG]{LegendeY};
+ boolean Date;
+ Date=\useKV[TraceG]{Date};
+
boolean Relie;
Relie=\useKV[TraceG]{Relie};
@@ -73,12 +82,16 @@
fi;
if Graduations:
- for k=0 step grillex until (xmax-xmin):
+ for k=0 step pasgradx until (xmax-xmin):
trace ((0,-0.5mm)--(0,0.5mm)) shifted ((k*x.u,0) shifted Origine) withpen pencircle scaled1.25;
+ if Date:
+ label.bot(TEX(decimal(xmin+k)),(k*x.u,0) shifted Origine);
+ else:
label.bot(TEX("\num{"&decimal(xmin+k)&"}"),(k*x.u,0) shifted Origine);
+ fi;
endfor;
label.ulft(TEX("\num{"&decimal(ymin)&"}"),(0,0) shifted Origine);
- for k=grilley step grilley until (ymax-ymin):
+ for k=pasgrady step pasgrady until (ymax-ymin):
trace ((-0.5mm,0)--(0.5mm,0)) shifted ((0,k*y.u) shifted Origine) withpen pencircle scaled1.25;
label.lft(TEX("\num{"&decimal(ymin+k)&"}"),(0,k*y.u) shifted Origine);
endfor;
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex
index 9ab7b24341f..15f69191319 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex
@@ -1,6 +1,10 @@
%%%
% Représenter un entier dans une base
%%%
+\def\filedateRepEntier{2024/08/04}%
+\def\fileversionRepEntier{0.1}%
+\message{-- \filedateRepEntier\space v\fileversionRepEntier}%
+%
\setKVdefault[ClesRBase]{Base=10,Echelle=1,Unite=false,Compact=false,Impression=false,ListeCouleurs={Tomato,LightSteelBlue,LightGreen,Cornsilk}}%
\newcommand\RepresenterEntier[2][]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex
index 6660693348a..2beb3ee5ed3 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex
@@ -1,7 +1,11 @@
%%%
% Fractions
%%%
-\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Triangle=false,Parts=3,Eprouvette=false,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1}
+\def\filedateRepFrac{2024/08/30}%
+\def\fileversionRepFrac{0.1a}%
+\message{-- \filedateRepFrac\space v\fileversionRepFrac}%
+%
+\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Triangle=false,Parts=3,Eprouvette=false,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1,Aleatoire=false}
\def\MPFractionEprouvetteCode{%
Hauteur=\useKV[ClesFraction]{Longueur};
@@ -80,6 +84,7 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
+ % Pas d'aléa ici : l'eau ne peut pas être en lévitation :)
\MPFractionEprouvetteCode
trace eprouvette(#2,#1);
\end{mplibcode}
@@ -90,6 +95,107 @@
\fi
}
+\def\MPFractionRegulierCodeAlea{%
+ Rayon=\useKV[ClesFraction]{Rayon};
+ Cotes=\useKV[ClesFraction]{Cotes};
+ color ColPolyReg;
+ ColPolyReg=\useKV[ClesFraction]{Couleur};
+ boolean Hachures,Reponse;
+ Reponse=\useKV[ClesFraction]{Reponse};
+ Hachures=\useKV[ClesFraction]{Hachures};
+ Epaisseur=\useKV[ClesFraction]{Epaisseur};
+ pair O,A[],B[];
+ O=u*(0,0);
+ path cc,cd;
+ cc=cercles(O,Rayon);
+ for k=0 upto Cotes:
+ A[k]=pointarc(cc,k*(360/Cotes));
+ endfor;
+ cd=polygone(A0 for k=1 upto Cotes-1:,A[k] endfor);
+ path part[];
+ vardef FractionPolyReg(expr nume,deno)=
+ for k=0 upto deno:
+ B[k]=point(k*(Cotes/deno)) of cd;
+ dotlabel("",B[k]);
+ endfor;
+ for k=0 upto deno-1:
+ part[k]=O--B[k] for l=1 upto Cotes-1:if (B[k]--B[k+1]) intersectiontimes (O--A[l])<>(-1,-1):--A[l] fi endfor --B[k+1]--cycle;%O--arccercle(B[k],B[k+1],O)--cycle;
+ endfor;
+ m=(nume div deno);
+ if (nume mod deno)=0:m:=m-1; fi;
+ picture RetourFraction;
+ RetourFraction=image(%
+ Reste=((nume div deno)+1)*deno;
+ RetiensPart=0;
+ if Reponse:
+ if m>0:
+ for l=0 upto (m-1):
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg;
+ else:
+ fill part[k] shifted(l*(2*Rayon+0.5cm,0)) withcolor ColPolyReg;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg;
+ else:
+ fill part[k] shifted(l*(2*Rayon+0.5cm,0)) withcolor ColPolyReg;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ endfor;
+ fi;
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg;
+ else:
+ fill part[k] shifted(m*(2*Rayon+0.5cm,0)) withcolor ColPolyReg;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg;
+ else:
+ fill part[k] shifted(m*(2*Rayon+0.5cm,0)) withcolor ColPolyReg;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ fi;
+ drawoptions(withpen pencircle scaled Epaisseur);
+ for l=0 upto m:
+ draw cd shifted(l*(2*Rayon+0.5cm,0));
+ for k=0 upto (deno-1):
+ draw segment(O,B[k]) shifted(l*(2*Rayon+0.5cm,0));
+ endfor;
+ endfor;
+ drawoptions();
+ );
+ RetourFraction
+ enddef;
+}%
+
\def\MPFractionRegulierCode{%
Rayon=\useKV[ClesFraction]{Rayon};
Cotes=\useKV[ClesFraction]{Cotes};
@@ -168,7 +274,13 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
+ boolean Alea;
+ Alea=\useKV[ClesFraction]{Aleatoire};
+ if Alea:
+ \MPFractionRegulierCodeAlea;
+ else:
\MPFractionRegulierCode
+ fi;
trace FractionPolyReg(#1,#2);
\end{mplibcode}
\else
@@ -178,6 +290,122 @@
\fi
}%
+\def\MPFractionTriangleCodeAlea{%
+ Longueur:=\useKV[ClesFraction]{Longueur};
+ nbparts:=\useKV[ClesFraction]{Parts};
+ color ColTriangle;
+ ColTriangle=\useKV[ClesFraction]{Couleur};
+ boolean Hachures,Reponse;
+ Reponse=\useKV[ClesFraction]{Reponse};
+ Hachures=\useKV[ClesFraction]{Hachures};
+ Epaisseur=\useKV[ClesFraction]{Epaisseur};
+ nbtriangle=0;
+ %
+ vardef Ligne(expr longueur)=
+ for k=0 upto 2*(longueur-1):
+ nbtriangle:=nbtriangle+1;
+ if (k mod 2)=0:
+ M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A));
+ else:
+ M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A));
+ fi;
+ endfor;
+ enddef;
+ %
+ pair A,B,C;
+ A=u*(0.5,0.5);
+ B-A=(Longueur,0);
+ C=rotation(B,A,60);
+ %
+ path Tria,Trir,M[];
+ Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]);
+ Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]);
+ %
+ for k=nbparts downto 1:
+ Ligne(k);
+ endfor;
+ %
+ picture FondTriangle;
+ FondTriangle=image(
+ for k=1 upto nbtriangle:
+ trace M[k];
+ endfor;
+ );
+ %
+ vardef FractionTriangle(expr nume,deno)=
+ m:=nume div deno;
+ if (nume mod deno)=0:
+ m:=m-1;
+ fi;
+ picture RetourFraction;
+ RetourFraction=image(
+ Reste=((nume div deno)+1)*deno;
+ RetiensPart=0;
+ if Reponse:
+ if m>0:
+ for l=0 upto (m-1):
+ for k=1 upto nbtriangle:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(M[k] shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle;
+ else:
+ fill M[k] shifted(l*(Longueur+1cm,0)) withcolor ColTriangle;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(M[k] shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle;
+ else:
+ fill M[k] shifted(l*(Longueur+1cm,0)) withcolor ColTriangle;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ endfor;
+ fi;
+ for k=1 upto nbtriangle:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(M[k] shifted(m*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle;
+ else:
+ fill M[k] shifted(m*(Longueur+1cm,0)) withcolor ColTriangle;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(M[k] shifted(m*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle;
+ else:
+ fill M[k] shifted(m*(Longueur+1cm,0)) withcolor ColTriangle;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ fi;
+ drawoptions(withpen pencircle scaled Epaisseur);
+ for l=0 upto m:
+ trace FondTriangle shifted(l*(Longueur+1cm,0));
+ endfor;
+ );
+ RetourFraction
+enddef;
+}%
+
\def\MPFractionTriangleCode{%
Longueur:=\useKV[ClesFraction]{Longueur};
nbparts:=\useKV[ClesFraction]{Parts};
@@ -241,7 +469,7 @@
trace hachurage(polygone(A,B,C) shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle;
drawoptions(withpen pencircle scaled Epaisseur);
else:
- remplis polygone(A,B,C) withcolor ColRectangle;
+ remplis polygone(A,B,C) withcolor ColTriangle;
fi;
fi;
for k=1 upto nbparts:
@@ -260,7 +488,13 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
- \MPFractionTriangleCode
+ boolean Alea;
+ Alea=\useKV[ClesFraction]{Aleatoire};
+ if Alea:
+ \MPFractionTriangleCodeAlea;
+ else:
+ \MPFractionTriangleCode;
+ fi;
draw FractionTriangle(#1,#2);
\end{mplibcode}
\else
@@ -270,6 +504,117 @@
\fi
}%
+\def\MPFractionRectangleCodeAlea{%
+ Longueur=\useKV[ClesFraction]{Longueur};
+ Largeur=\useKV[ClesFraction]{Largeur};
+ color ColRectangle;
+ ColRectangle=\useKV[ClesFraction]{Couleur};
+ boolean Hachures,Reponse;
+ Reponse=\useKV[ClesFraction]{Reponse};
+ Hachures=\useKV[ClesFraction]{Hachures};
+ Epaisseur=\useKV[ClesFraction]{Epaisseur};
+ Multiple=\useKV[ClesFraction]{Multiple};
+ %
+ pair A,B,C,D,M[],N[],R[],S[];
+ A=(0,0);
+ B-A=(Longueur,0);
+ C-B=(0,Largeur);
+ D-C=A-B;
+ vardef FractionRectangle(expr nume,deno)=
+ m=nume div deno;
+ if (nume mod deno)=0:
+ m:=m-1;
+ fi;
+ numeric parts;
+ parts=(deno div Multiple);
+ for k=0 upto parts:
+ M[k]=(k/parts)[A,B];
+ N[k]=(k/parts)[D,C];
+ endfor;
+ if Multiple>1:
+ for k=0 upto Multiple:
+ R[k]=(k/Multiple)[A,D];
+ S[k]=(k/Multiple)[B,C];
+ endfor;
+ fi;
+ picture FondRectangle;
+ FondRectangle=image(%
+ path case[];
+ for k=0 upto Multiple-1:
+ for l=0 step Multiple until (deno-1):
+ case[k*(deno div Multiple)+(l div Multiple)]=(unitsquare xscaled (Multiple*abs(A-B)/deno) yscaled (abs(D-A)/Multiple)) shifted (((l/deno)[A,B]-A)+((k/Multiple)[A,D]-A));
+ trace case[k*(deno div Multiple)+(l div Multiple)];
+ endfor;
+ endfor;
+ );
+ picture RetourRectangle;
+ RetourRectangle=image(
+ Reste=((nume div deno)+1)*deno;
+ RetiensPart=0;
+ if Reponse:
+ if m>0:
+ for l=0 upto (m-1):
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(case[k] shifted(l*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle;
+ else:
+ fill case[k] shifted(l*(Longueur+1cm,0)) withcolor ColRectangle;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(case[k] shifted(l*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle;
+ else:
+ fill case[k] shifted(l*(Longueur+1cm,0)) withcolor ColRectangle;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ endfor;
+ fi;
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(case[k] shifted(m*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle;
+ else:
+ fill case[k] shifted(m*(Longueur+1cm,0)) withcolor ColRectangle;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(case[k] shifted(m*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle;
+ else:
+ fill case[k] shifted(m*(Longueur+1cm,0)) withcolor ColRectangle;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ fi;
+ for l=0 upto m:
+ trace FondRectangle shifted(l*(Longueur+1cm,0));
+ endfor;
+ );
+ RetourRectangle
+ enddef;
+}%
+
\def\MPFractionRectangleCode{%
Longueur=\useKV[ClesFraction]{Longueur};
Largeur=\useKV[ClesFraction]{Largeur};
@@ -378,7 +723,13 @@
\ifluatex%
\mplibforcehmode%
\begin{mplibcode}
- \MPFractionRectangleCode
+ boolean Alea;
+ Alea=\useKV[ClesFraction]{Aleatoire};
+ if Alea:
+ \MPFractionRectangleCodeAlea;
+ else:
+ \MPFractionRectangleCode;
+ fi;
trace FractionRectangle(#1,#2);
\end{mplibcode}
\else%
@@ -388,6 +739,101 @@
\fi%
}%
+\def\MPFractionDisqueCodeAlea{%
+ Rayon=\useKV[ClesFraction]{Rayon};
+ Epaisseur=\useKV[ClesFraction]{Epaisseur};
+ color ColDisque;
+ ColDisque=\useKV[ClesFraction]{Couleur};
+ boolean Hachures,Reponse;
+ Hachures=\useKV[ClesFraction]{Hachures};
+ Reponse:=\useKV[ClesFraction]{Reponse};
+ %
+ pair A,B[];
+ A=(0,0);
+ path cc,part[];
+ cc=cercles(A,Rayon);
+ vardef FractionDisque(expr nume,deno)=
+ for k=0 upto deno+1:
+ B[k]=pointarc(cc,(360/deno)*k);
+ endfor;
+ for k=0 upto deno-1:
+ part[k]=A--arccercle(B[k],B[k+1],A)--cycle;
+ endfor;
+ m=(nume div deno);
+ if (nume mod deno)=0:m:=m-1; fi;
+ picture RetourFraction;
+ RetourFraction=image(%
+ Reste=((nume div deno)+1)*deno;
+ RetiensPart=0;
+ if Reponse:
+ if m>0:
+ for l=0 upto (m-1):
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque;
+ else:
+ fill part[k] shifted(l*(2*Rayon+1cm,0)) withcolor ColDisque;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque;
+ else:
+ fill part[k] shifted(l*(2*Rayon+1cm,0)) withcolor ColDisque;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ endfor;
+ fi;
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque;
+ else:
+ fill part[k] shifted(m*(2*Rayon+1cm,0)) withcolor ColDisque;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque;
+ else:
+ fill part[k] shifted(m*(2*Rayon+1cm,0)) withcolor ColDisque;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ fi;
+ drawoptions(withpen pencircle scaled Epaisseur);
+ for l=0 upto m:
+ draw cc shifted(l*(2*Rayon+1cm,0));
+ for k=0 upto (deno-1):
+ draw segment(A,B[k]) shifted(l*(2*Rayon+1cm,0));
+ endfor;
+ endfor;
+ drawoptions();
+ );
+ RetourFraction
+ enddef;
+}%
+
\def\MPFractionDisqueCode{%
Rayon=\useKV[ClesFraction]{Rayon};
Epaisseur=\useKV[ClesFraction]{Epaisseur};
@@ -444,7 +890,13 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
+ boolean Alea;
+ Alea=\useKV[ClesFraction]{Aleatoire};
+ if Alea:
+ \MPFractionDisqueCodeAlea;
+ else:
\MPFractionDisqueCode
+ fi;
trace FractionDisque(#1,#2);
\end{mplibcode}
\else
@@ -454,6 +906,115 @@
\fi
}
+\def\MPFractionSegmentCodeAlea{%
+ Longueur=\useKV[ClesFraction]{Longueur};
+ color ColSegment;
+ ColSegment=\useKV[ClesFraction]{Couleur};
+ boolean Hachures,Reponse;
+ Reponse=\useKV[ClesFraction]{Reponse};
+ Hachures=\useKV[ClesFraction]{Hachures};
+ Epaisseur=\useKV[ClesFraction]{Epaisseur};
+ %
+ pair A,C,B[];
+ A=(0,0);
+ C-A=(Longueur,0);
+ %
+ path part[];
+ %
+ vardef FractionSegment(expr nume,deno)=
+ for k=0 upto deno:
+ B[k]=(k/deno)[A,C];
+ endfor;
+ for k=0 upto deno-1:
+ part[k]=polygone(B[k]+u*(0,-0.15),B[k+1]+u*(0,-0.15),B[k+1]+u*(0,0.15),B[k]+u*(0,0.15));
+ endfor;
+ m=nume div deno;
+ picture RetourFraction;
+ RetourFraction=image(
+ Reste=((nume div deno)+1)*deno;
+ RetiensPart=0;
+ % Reponse
+ if Reponse:
+ if m>0:
+ for l=0 upto (m-1):
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment;
+ drawoptions();
+ else:
+ draw (segment(B[k],B[k+1]) shifted(l*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(l*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment;
+ drawoptions();
+ else:
+ draw (segment(B[k],B[k+1]) shifted(l*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ endfor;
+ fi;
+ for k=0 upto deno-1:
+ if RetiensPart<nume:
+ if Reste>(nume-RetiensPart):
+ test:=uniformdeviate(1);
+ if test>0.5:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment;
+ drawoptions();
+ else:
+ draw (segment(B[k],B[k+1]) shifted(m*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment;
+ fi;
+ fi;
+ else:
+ RetiensPart:=RetiensPart+1;
+ if Hachures:
+ drawoptions(withpen pencircle scaled Epaisseur);
+ draw hachurage(part[k] shifted(m*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment;
+ else:
+ draw (segment(B[k],B[k+1]) shifted(m*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment;
+ fi;
+ fi;
+ fi;
+ Reste:=Reste-1;
+ endfor;
+ fi;
+ %fin Reponse
+ if Hachures:drawoptions(withpen pencircle scaled Epaisseur);fi;
+ % draw (segment(B[0],B[nume mod deno]) shifted(m*(Longueur+1cm,0)));
+ for l=0 upto m:
+ draw segment(A,C) shifted(l*(Longueur+1cm,0));
+ endfor;
+ marque_p:="tiretv";
+ for l=0 upto m-1:
+ for k=0 upto deno:
+ pointe(B[k] shifted(l*(Longueur+1cm,0)));
+ endfor;
+ endfor;
+ if (nume mod deno)<>0:
+ for k=0 upto deno:
+ pointe(B[k] shifted(m*(Longueur+1cm,0)));
+ endfor;
+ fi;
+ );
+ RetourFraction
+ enddef;
+}
+
\def\MPFractionSegmentCode{%
Longueur=\useKV[ClesFraction]{Longueur};
color ColSegment;
@@ -525,7 +1086,13 @@
\ifluatex
\mplibforcehmode
\begin{mplibcode}
+ boolean Alea;
+ Alea=\useKV[ClesFraction]{Aleatoire};
+ if Alea:
+ \MPFractionSegmentCodeAlea;
+ else:
\MPFractionSegmentCode
+ fi;
trace FractionSegment(#1,#2);
\end{mplibcode}
\else
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex
index 0e6162aa765..9b1bcaa8b1b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex
@@ -1,9 +1,15 @@
%%%
% Tableur
%%%
-\setKVdefault[Tableur]{Colonnes=4,Largeur=30pt,LargeurUn=30pt,Bandeau=true,Formule={},Cellule=A1,Ligne=0,Colonne=0,PasL=1,PasC=1,Selection=false,DebutColonnes=0,DebutLignes=0,LargeurNombre=10pt}%
+\def\filedateRepTab{2024/08/21}%
+\def\fileversionRepTab{0.1a}%
+\message{-- \filedateRepTab\space v\fileversionRepTab}%
+%
+\setKVdefault[Tableur]{Colonnes=4,Largeur=30pt,LargeurUn=30pt,Bandeau=true,Formule={},Cellule=A1,Ligne=0,Colonne=0,PasL=1,PasC=1,Selection=false,DebutColonnes=0,DebutLignes=0,LargeurNombre=10pt,Apres=false,ApresBandeau=false}%
%Idee de P. Nuns
\defKV[Tableur]{Couleur=\setKV[Tableur]{Selection}}%
+\defKV[Tableur]{CodeAfter=\setKV[Tableur]{Apres}}%
+\defKV[Tableur]{CodeAfterBandeau=\setKV[Tableur]{ApresBandeau}}%
%
%Bas\'e sur un code de Christian T\'ell\'ech\'ea.
@@ -20,6 +26,9 @@
\ifremain@lines#2\\\@nil{\addtot@b&\subst@eol#2\@nil}{\addtot@b{#2\CodeAfter\xintifboolexpr{\useKV[Tableur]{Ligne}==0 || \useKV[Tableur]{Colonne}==0}{}{%
\tikz\node at (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}}) {\tiny$\blacksquare$};%
}%
+ \ifboolKV[Tableur]{Apres}{%
+ \useKV[Tableur]{CodeAfter}%
+ }{}%
\end{NiceTabular}}}}%
\long\def\collectcp@body#1\end{\subst@eol#1\@nil\end}%
@@ -103,6 +112,10 @@
\ifboolKV[Tableur]{Bandeau}{%
\begin{NiceTabular}{p{\PfCTableurLargeur}p{10pt}p{50pt}p{\PfCLongInter}}%
\Block[draw,l]{}{\useKV[Tableur]{Cellule}}&\Block[draw]{}{\scriptsize$\blacktriangledown$}&\Block{}{$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$}&\Block[draw]{}{\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$}\\
+ \CodeAfter
+ \ifboolKV[Tableur]{ApresBandeau}{%
+ \useKV[Tableur]{CodeAfterBandeau}%
+ }{}%
\end{NiceTabular}%
\nopagebreak%
\\%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex
index 996e33c0265..2ccc0748f66 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex
@@ -1,6 +1,10 @@
%%%
% Twitter
%%%
+\def\filedateReseaux{2024/08/04}%
+\def\fileversionReseaux{0.1}%
+\message{-- \filedateReseaux\space v\fileversionReseaux}%
+%
\setKVdefault[Twitter]{Largeur=0.95\linewidth,Auteur=Christophe,Date=\today,Url=ViveLaTeX,EchelleLogo=0.035,Logo=DrStrange,Publie=false}%
\NewDocumentEnvironment{Twitter}{o+b}{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex b/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex
index a5ce8ebf635..795a79e833e 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex
@@ -1,6 +1,10 @@
%%%
% Equations
%%%
+\def\filedateEquation{2024/08/04}%
+\def\fileversionEquation{0.1}%
+\message{-- \filedateEquation\space v\fileversionEquation}%
+%
\setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,ModeleBarre=false,Decimal=false,Entier=false,Lettre=x,Solution=false,LettreSol=true,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Exact=false,Pose=false,Equivalence=false}
\newcommand\rightcomment[4]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex
index 9fc7f3446d6..26a78fcc2f6 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex
@@ -1,6 +1,10 @@
%%%
% Ronde infernale
%%%
+\def\filedateRondeI{2024/08/04}%
+\def\fileversionRondeI{0.1}%
+\message{-- \filedateRondeI\space v\fileversionRondeI}%
+%
\newcommand\TestNombrePremier[1]{%
% #1 le nombre \`a tester
\newcount\anp\newcount\bnp\newcount\cnp%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex
index d6059cdd7ec..3798a26f748 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex
@@ -1,6 +1,10 @@
%%%
% Rose
%%%
+\def\filedateRose{2024/08/04}%
+\def\fileversionRose{0.1}%
+\message{-- \filedateRose\space v\fileversionRose}%
+%
\setKVdefault[ClesRose]{Vide=false,Couleur=white,Produits=false,Solution=false,Rayon=2cm,Petales=7,Aide=false,FacteurMin=2,FacteurMax=10,ProduitVide=false,CaseVide=false,Polygone=false,Nom=Rose1,Creation=false,Addition=false,Melange=false,CDot=false}%
\defKV[ClesRose]{LesNombres=\setKV[ClesRose]{Creation}}%
\defKV[ClesRose]{LesProduits=\setKV[ClesRose]{Creation}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex b/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex
index 0315d8d3a87..778ee151749 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex
@@ -1,6 +1,10 @@
%%%%
% Scratch
%%%%
+\def\filedateScratch{2024/08/04}%
+\def\fileversionScratch{0.1}%
+\message{-- \filedateScratch\space v\fileversionScratch}%
+%
\newlength{\longbarreheight}
\setlength{\longbarreheight}{2.1ex+3pt}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex
index cd38bd90a25..e4352613d7e 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex
@@ -1,10 +1,14 @@
%%%
% Serpent
%%%
+\def\filedateSerpent{2024/08/04}%
+\def\fileversionSerpent{0.1}%
+\message{-- \filedateSerpent\space v\fileversionSerpent}%
+%
\newtoks\tokListeSerpentPerso{}%
\def\UpdatetoksSerpent#1\nil{\addtotok\tokListeSerpentPerso{"#1"}}%
-\setKVdefault[Serpent]{Cases=9,Case=1,Solution=false,PasQuad=7mm,ValeurMin=2,ValeurMax=10,Creation=false,Graines=false}
+\setKVdefault[Serpent]{Cases=9,Case=1,Solution=false,PasQuad=7mm,ValeurMin=2,ValeurMax=10,Creation=false,Graines=false,Direct=false,Disque=false,Spirale=false}
\defKV[Serpent]{CouleurSolution=\setKV[Serpent]{Solution}}%
\defKV[Serpent]{Perso=\setKV[Serpent]{Creation}\xdef\PfCFooCheminSerpent{#1}}%+Liste des déplacements
\defKV[Serpent]{Graine=\setKV[Serpent]{Graines}}%
@@ -19,7 +23,14 @@
\BuildSerpent{\the\tokListeSerpentPerso}%
\reademptyitems%
}{%
- \BuildSerpent{}%
+ \ifboolKV[Serpent]{Direct}{%
+ \BuildSerpentDirect{}%
+ }{\ifboolKV[Serpent]{Spirale}{%
+ %\BuildSerpentSpirale{}%
+ }{%
+ \BuildSerpent{}%
+ }%
+ }%
}%
}%
@@ -29,10 +40,11 @@
\mplibnumbersystem{double}%
\begin{mplibcode}
%
- boolean Solution,Perso,Graines;
+ boolean Solution,Perso,Graines,Disque;
Solution=\useKV[Serpent]{Solution};
Perso=\useKV[Serpent]{Creation};
Graines=\useKV[Serpent]{Graines};
+ Disque=\useKV[Serpent]{Disque};
%
if Graines:
randomseed:=\useKV[Serpent]{Graine};
@@ -210,7 +222,11 @@
fi;
fi;
for k=1 upto LongueurChemin:
+ if Disque:
+ trace (fullcircle scaled (2*PasQuad)) shifted (N[k]+PasQuad*(1,1));
+ else:
trace (unitsquare scaled (2*PasQuad)) shifted N[k];
+ fi;
endfor;
for k=1 upto LongueurChemin-1:
drawarrow (center (unitsquare scaled (2*PasQuad)) shifted N[k])--(center (unitsquare scaled (2*PasQuad)) shifted N[k+1]) cutbefore ((unitsquare scaled (2*PasQuad)) shifted N[k]) cutafter ((unitsquare scaled (2*PasQuad)) shifted N[k+1]);
@@ -363,4 +379,193 @@
\end{mplibcode}
\mplibnumbersystem{scaled}%
\fi
+}%
+
+\NewDocumentCommand\BuildSerpentDirect{m}{%
+ \ifluatex%
+ \mplibforcehmode%
+ \mplibnumbersystem{double}%
+ \begin{mplibcode}
+ %
+ boolean Solution,Graines,Disque;
+ Solution=\useKV[Serpent]{Solution};
+ Graines=\useKV[Serpent]{Graines};
+ Disque=\useKV[Serpent]{Disque};
+ %
+ if Graines:
+ randomseed:=\useKV[Serpent]{Graine};
+ fi;
+ %
+ color CoulSolution;
+ if Solution:
+ CoulSolution=\useKV[Serpent]{CouleurSolution};
+ fi;
+ %
+ numeric LongueurChemin,Depart;
+ LongueurChemin=\useKV[Serpent]{Cases};
+ ValeurMin=\useKV[Serpent]{ValeurMin};
+ ValeurMax=\useKV[Serpent]{ValeurMax};
+ CaseDepart=\useKV[Serpent]{Case};
+ Depart=ValeurMin+floor(uniformdeviate(ValeurMax-ValeurMin+1));
+ %
+ PasQuad=5mm;%\useKV[Serpent]{PasQuad};
+ %
+ pair N[];
+ N[1]:=4*PasQuad*(0,0);
+ for k=2 upto LongueurChemin:
+ N[k]=N[k-1]+4*PasQuad*(1,0);
+ endfor;
+ % Tracage
+ if CaseDepart=1:
+ label(TEX("\Large"&decimal(Depart)),N[1] shifted(PasQuad*(1,1)));
+ else:
+ if Solution:
+ label(TEX("\Large"&decimal(Depart)),N[1] shifted(PasQuad*(1,1))) withcolor CoulSolution;
+ fi;
+ fi;
+ for k=1 upto LongueurChemin:
+ if Disque:
+ trace (fullcircle scaled (2*PasQuad)) shifted (N[k]+PasQuad*(1,1));
+ else:
+ trace (unitsquare scaled (2*PasQuad)) shifted N[k];
+ fi;
+ endfor;
+ %
+ path cheminfleche[];
+ path CheminFlecheBase;
+ CheminFlecheBase=(0,2*PasQuad){dir45}..(4*PasQuad,2*PasQuad);
+ for k=1 upto LongueurChemin-1:
+ cheminfleche[k]=CheminFlecheBase shifted (N[k]+(PasQuad,0));
+ %cheminfleche[k]=(center (unitsquare scaled (2*PasQuad)) shifted N[k]){dir45}..(center (unitsquare scaled (2*PasQuad)) shifted N[k+1]) cutbefore ((unitsquare scaled (2*PasQuad)) shifted N[k]) cutafter ((unitsquare scaled (2*PasQuad)) shifted N[k+1]);
+ drawarrow cheminfleche[k];
+ endfor;
+ %%drawoptions();
+ boolean PremierChiffre;
+ PremierChiffre=true;
+ %% Test Premier
+ vardef TestPremier(expr nombre)=
+ nbdiviseur:=0;
+ nbdiv:=0;
+ for k=2 upto nombre:
+ if (nombre mod k)=0:
+ nbdiviseur:=nbdiviseur+1;
+ if k<11:
+ nbdiv:=nbdiv+1;
+ Diviseur[nbdiv]:=k;
+ fi;
+ fi;
+ endfor;
+ if nbdiviseur>1:
+ PremierChiffre:=false;
+ else:
+ PremierChiffre:=true;
+ fi;
+ enddef;
+ % Les opérations
+ numeric Chiffre[];
+ pair St[];
+ Chiffre[1]=Depart;
+ %
+ vardef EcrireSomme(expr tt)=
+ Somme:=5+ceiling(uniformdeviate(10));
+ Chiffre[tt]=Chiffre[tt-1]+Somme;
+ St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1];
+ label.top(TEX("$+"&decimal(Somme)&"$"),St[tt]);
+ enddef;
+ %
+ vardef EcrireProduit(expr tt)=
+ Multiple:=1+ceiling(uniformdeviate(8));
+ Chiffre[tt]=Chiffre[tt-1]*Multiple;
+ St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1];
+ label.top(TEX("$\PfCSymbolTimes"&decimal(Multiple)&"$"),St[tt]);
+ enddef;
+ %
+ vardef EcrireDifferenceCent(expr tt)=
+ Difference:=ceiling(Chiffre[tt-1]-15+uniformdeviate(10));
+ Chiffre[tt]=Chiffre[tt-1]-Difference;
+ St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1];
+ label.top(TEX("$-"&decimal(Difference)&"$"),St[tt]);
+ enddef;
+ %
+ vardef EcrireDifference(expr tt)=
+ Difference:=if Chiffre[tt-1]<20:1+floor(uniformdeviate(Chiffre[tt-1]-1)) else: 5+ceiling(uniformdeviate(10)) fi;
+ Chiffre[tt]=Chiffre[tt-1]-Difference;
+ St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1];
+ label.top(TEX("$-"&decimal(Difference)&"$"),St[tt]);
+ enddef;
+ %
+ vardef EcrireQuotient(expr tt)=
+ choixdiv:=ceiling(nbdiv);
+ Quotient:=Diviseur[choixdiv];
+ Chiffre[tt]=Chiffre[tt-1] div Quotient;
+ St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1];
+ label.top(TEX("$\PfCSymbolDiv"&decimal(Quotient)&"$"),St[tt]);
+ enddef;
+ %
+ for k=2 upto LongueurChemin:
+ if (Chiffre[k-1]=1) or (Chiffre[k-1]=0):
+ % On additionne ou on multiplie si c'est un
+ if Chiffre[k-1]=1:
+ alea:=ceiling(uniformdeviate(2));
+ if alea=1:
+ EcrireSomme(k);
+ else:
+ EcrireProduit(k);
+ fi;
+ else:
+ EcrireSomme(k);
+ fi;
+ else:
+ TestPremier(Chiffre[k-1]);
+ if PremierChiffre:
+ if Chiffre[k-1]>100:
+ EcrireDifferenceCent(k);
+ else:
+ alea:=ceiling(uniformdeviate(3));
+ if alea=1:
+ EcrireSomme(k);
+ elseif alea=2:
+ EcrireDifference(k);
+ elseif alea=3:
+ EcrireProduit(k);
+ fi;
+ fi;
+ if k=CaseDepart:
+ label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1)));
+ elseif Solution:
+ label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))) withcolor CoulSolution;
+ fi;
+ else:
+ if Chiffre[k-1]>100:
+ alea:=ceiling(uniformdeviate(2));
+ if alea=1:
+ EcrireDifferenceCent(k);
+ else:
+ EcrireQuotient(k);
+ fi;
+ else:
+ alea:=ceiling(uniformdeviate(4));
+ if alea=1:
+ EcrireSomme(k);
+ elseif alea=2:
+ EcrireDifference(k);
+ elseif alea=3:
+ EcrireProduit(k);
+ elseif alea=4:
+ EcrireQuotient(k);
+ fi;
+ fi;
+ fi;
+ fi;
+ if k=CaseDepart:
+ label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1)));
+ else:
+ if Solution:
+ label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))) withcolor CoulSolution;
+ fi;
+ fi;
+ endfor;
+ \end{mplibcode}
+ \mplibnumbersystem{scaled}%
+ \fi
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex
index 04084cadcae..8f6616ff3e0 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex
@@ -1,6 +1,10 @@
%%%
% Shikaku
%%%
+\def\filedateShikaku{2024/08/04}%
+\def\fileversionShikaku{0.1}%
+\message{-- \filedateShikaku\space v\fileversionShikaku}%
+%
\newcounter{PfCShikakuNom}
\setcounter{PfCShikakuNom}{0}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex
index 94429def365..9fb16f325df 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex
@@ -1,6 +1,10 @@
%%%
% Simplification
%%%
+\def\filedateSimpFraction{2024/08/13}%
+\def\fileversionSimpFraction{0.1a}%
+\message{-- \filedateSimpFraction\space v\fileversionSimpFraction}%
+%
\makeatletter%by christian Tellechea
% Calcul du PGCD de #1 et #2
\newcount\cnt@a\newcount\cnt@b\newcount\pgcd
@@ -160,7 +164,7 @@
\ifboolKV[ClesSimplification]{Debut}{%
\ensuremath{%
\whiledo{\PfCDivCom>1}{%
- \frac{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}%
+ \frac{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}}{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}}=\frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}}%
\xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}%
\xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}%
\DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}%
@@ -170,7 +174,7 @@
}{%
\ensuremath{%
\whiledo{\PfCDivCom>1}{%
- \frac{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}%
+ \frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}=\frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}}%
\xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}%
\xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}%
\DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}%
@@ -180,7 +184,7 @@
}%
}%
-\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false,Decomposition=false,DecompositionSeule=false}%
+\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false,Decomposition=false,DecompositionSeule=false,ACompleter=false}%
\defKV[ClesSimplification]{Nombre=\setKV[ClesSimplification]{Impose}}%
\newcounter{NbFrac}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
index 037b80e50f0..8ed8899a371 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex
@@ -1,6 +1,10 @@
%%%
% Solide et sections
%%%
+\def\filedateSolides{2024/08/20}%
+\def\fileversionSolides{0.1a}%
+\message{-- \filedateSolides\space v\fileversionSolides}%
+%
\setKVdefault[ClesSolides]{Nom=cube,Aretes,Sommets,Pointilles,Largeur=1.5,Hauteur=1,Profondeur=0.75,ListeSommets={A,B,C,D,E,F,G,H},Rho=1500,Phi=30,Theta=20,Distance=50,Code=false,Couleur=white,Anglex=0,Arete=1,RayonCone=1,HauteurCone=2,HauteurPrisme=2,SommetsPrisme=6,HauteurPyramide=2,SommetsPyramide=5,Reguliere=false,DecalageSommet={(0,0,0)},RayonCylindre=1,HauteurCylindre=2,RayonSphere=1,AutoLabel=true,Sections=false,CoefSection=0.3,Axes=false,PointsSection={M,N,O,P},RemplisSection=false,ObjetSection={0.5,E,H,0.25,F,G,G,B}}%
\defKV[ClesSolides]{Traces=\setKV[ClesSolides]{Code}}%
\defKV[ClesSolides]{Section=\setKV[ClesSolides]{Sections}}%
@@ -101,6 +105,7 @@
%Fc[101]:=1;Fc[102]:=2;Fc[103]:=6;Fc[104]:=5;
%endfor;
endfor;
+ DefinirSommets(#1);
DessineObjet;
% picture Depart;
% Depart=currentpicture;
@@ -108,6 +113,10 @@
% for k=1 upto 8:
% dotlabel.top(decimal(k),Projette(TS[k]));
% endfor;
+ u:=1cm;
+ if Code:
+ \useKV[ClesSolides]{Traces};
+ fi;
\end{mplibcode}
\mplibnumbersystem{scaled}
\fi
@@ -487,7 +496,6 @@
if Code:
\useKV[ClesSolides]{Traces};
fi;
-
\end{mplibcode}
\mplibnumbersystem{scaled}
\fi
@@ -729,7 +737,7 @@
% trace polygone(MSection1,MSection2,MSection3,MSection4);
color dcer,ccer;
% 1er cote -> ok
- DotLabel("",RetiensDefSection[4]);
+ %DotLabel("",RetiensDefSection[4]);
dcer:=Oeil-RetiensDefSection[4];
ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]);
draw chemin(MSection1,MSection2) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex
index df62edfbce7..f0a1e12cc9b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex
@@ -1,6 +1,10 @@
%%%
% Somme des angles
%%%
+\def\filedateSommeAngles{2024/08/04}%
+\def\fileversionSommeAngles{0.1}%
+\message{-- \filedateSommeAngles\space v\fileversionSommeAngles}%
+%
\setKVdefault[ClesSommeAngle]{Detail=true,Isocele=false,Rectangle=false,Figure=false,FigureSeule=false,Angle=0,Perso=false,Echelle=1cm}%
\def\MPFigureSommeAngle#1#2#3#4#5{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex
index 9de4a7afdf9..7afe0e55fb0 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex
@@ -1,10 +1,21 @@
%%%
% Squaro
%%%
-\setKVdefault[Squaro]{Solution=false,Longueur=8,Largeur=8,Echelle=8mm,Nom=Jeu1,Graines=false}
+\def\filedateSquarO{2024/08/04}%
+\def\fileversionSquarO{0.1}%
+\message{-- \filedateSquarO\space v\fileversionSquarO}%
+%
+\newtoks\tokPfCSquaro%
+\def\UpdatetoksSquaro#1\nil{\addtotok\tokPfCSquaro{#1,}}%
+
+\setKVdefault[Squaro]{Solution=false,Longueur=8,Largeur=8,Echelle=8mm,Nom=Jeu1,Graines=false,Persos=false}
\defKV[Squaro]{Graine=\setKV[Squaro]{Graines}}%
+\defKV[Squaro]{Perso=\setKV[Squaro]{Persos}\setsepchar{,}\ignoreemptyitems\readlist*\ListeSquaroPerso{#1}\reademptyitems%
+ \foreachitem\compteur\in\ListeSquaroPerso{\expandafter\UpdatetoksSquaro\compteur\nil}%
+}%
\NewDocumentCommand\SquarO{o}{%
+ \tokPfCSquaro{}%
\useKVdefault[Squaro]%
\setKV[Squaro]{#1}%
\BuildSquaro%
@@ -14,9 +25,10 @@
numeric Longueur,Largeur;
Longueur=\useKV[Squaro]{Longueur};
Largeur=\useKV[Squaro]{Largeur};
- boolean Solution,Graines;
+ boolean Solution,Graines,Persos;
Solution=\useKV[Squaro]{Solution};
Graines=\useKV[Squaro]{Graines};
+ Persos=\useKV[Squaro]{Persos};
if Graines:
randomseed:=\useKV[Squaro]{Graine};
fi;
@@ -26,13 +38,35 @@
p:=0;
pair A[];%centre des carrés.
boolean Allume[][];
-}
+ %
+ if Persos:
+ n:=0;
+ for p_=\the\tokPfCSquaro:
+ n:=n+1;
+ ligne:=(n-1) div (Largeur+2);
+ colonne:=(n-1) mod (Longueur+1);
+ Allume[ligne][colonne]=if p_=1:true else:false fi;
+ endfor;
+ else:
+ for k=0 upto Largeur:
+ for l=0 upto Longueur:
+ m:=uniformdeviate(1);
+ if m<0.5:
+ Allume[k][l]=true;
+ else:
+ Allume[k][l]=false;
+ fi;
+ endfor;
+ endfor;
+ fi;
+}%
\NewDocumentCommand\BuildSquaro{}{%
\ifluatex
\mplibforcehmode
\begin{mplibcode}
\BuildSquarobase
+ %
for k=0 upto Longueur-1:
for l=0 upto Largeur-1:
p:=p+1;
@@ -40,21 +74,18 @@
trace (unitsquare scaled u) shifted A[p];
endfor;
endfor;
-
+ %
for k=0 upto Largeur:
for l=0 upto Longueur:
- m:=uniformdeviate(1);
- if m<0.5:
- Allume[k][l]=true;
+ if Allume[k][l]:
fill cercles(u*(l,-k+1),1mm) if Solution=false:withcolor white fi;
else:
- Allume[k][l]=false;
fill cercles(u*(l,-k+1),1mm) withcolor white;
fi;
trace cercles(u*(l,-k+1),1mm);
endfor;
endfor;
-
+ %
for k=0 upto Largeur-1:
for l=0 upto Longueur-1:
Retiens:=0;
@@ -67,29 +98,28 @@
endfor;
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={\BuildSquarobase}]
- for k=0 upto Longueur-1:
+ \begin{mpost}[mpsettings={\BuildSquarobase}]
+ %
+ %
+ for k=0 upto Longueur-1:
for l=0 upto Largeur-1:
p:=p+1;
A[p]=u*(k,-l);
trace (unitsquare scaled u) shifted A[p];
- endfor;
- endfor;
-
- for k=0 upto Largeur:
- for l=0 upto Longueur:
- m:=uniformdeviate(1);
- if m<0.5:
- Allume[k][l]=true;
+ endfor;
+ endfor;
+ %
+ for k=0 upto Largeur:
+ for l=0 upto Longueur:
+ if Allume[k][l]:
fill cercles(u*(l,-k+1),1mm) if Solution=false:withcolor white fi;
else:
- Allume[k][l]=false;
fill cercles(u*(l,-k+1),1mm) withcolor white;
fi;
trace cercles(u*(l,-k+1),1mm);
- endfor;
- endfor;
-
+ endfor;
+ endfor;
+ %
for k=0 upto Largeur-1:
for l=0 upto Longueur-1:
Retiens:=0;
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex b/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex
index 98566be426a..5d7b786d8e4 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex
@@ -1,6 +1,10 @@
%%%
% Statistiques
%%%
+\def\filedateStat{2024/08/04}%
+\def\fileversionStat{0.1}%
+\message{-- \filedateStat\space v\fileversionStat}%
+%
\newcommand\NbDonnees{}%
\newcommand\SommeDonnees{}%
\newcommand\EffectifTotal{}%
@@ -18,7 +22,7 @@ Tableau=false,Stretch=1,Frequence=false,EffectifTotal=false,%
Etendue=false,Moyenne=false,SET=false,ValeurExacte=false,MoyenneA,Somme,Mediane=false,DetailsMediane=false,UneMediane=false,QuartileUn=false,QuartileTrois=false,Total=false,Concret=false,%
Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=false,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,Classes=false,TableauVide=false,ECC=false,Coupure=10,CouleurTab=gray!15,Graphique=false,Batons=true,Centre=false,CentreVide=false,Crochets=false,%
% Pour les diags batons
-EpaisseurBatons=1,ListeCouleursB={a},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,AngleRotationAbscisse=0,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,Depart=0,CouleurDefaut=black,Date=false,GrandNombrey=false,GrandNombrex=false,PasGrillex=1,PasGrilley=1,%
+EpaisseurBatons=1,ListeCouleursB={a},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,Depart=0,CouleurDefaut=black,Date=false,GrandNombrey=false,GrandNombrex=false,PasGrillex=1,PasGrilley=1,%
% Pour les diags circulaires
Rayon=3cm,AffichageAngle=false,AffichageDonnee=false,ListeCouleurs={white},Hachures=false,ListeHachures={60},LectureInverse=false,EcartHachures=0.25,EpaisseurHachures=1,Legende,LegendeVide=false,ACompleter=false,DebutAngle=0,%on utilisera également la clé CouleurDefaut
%Pour les représentations
@@ -466,7 +470,6 @@ ModeleCouleur=5%
unitex:=\useKV[ClesStat]{Unitex}*cm;
unitey:=\useKV[ClesStat]{Unitey}*cm;
xpartorigine:=\useKV[ClesStat]{Origine};
- AngleRotation=\useKV[ClesStat]{AngleRotationAbscisse};
boolean Rotation,Lecture,LectureFine,AideLecture,DonneesSup,Reponses,Qualitatif,Tiret,LegendeVide,Retour,GrandNombrex,GrandNombrey,Date,Grille;
GrandNombrex=\useKV[ClesStat]{GrandNombrex};
GrandNombrey=\useKV[ClesStat]{GrandNombrey};
@@ -478,6 +481,11 @@ ModeleCouleur=5%
fi;
Date:=\useKV[ClesStat]{Date};
Rotation=\useKV[ClesStat]{AbscisseRotation};
+ if Rotation:
+ AngleRotation=\useKV[ClesStat]{AngleRotationAbscisse};
+ else:
+ AngleRotation=0;
+ fi;
Lecture:=\useKV[ClesStat]{Lecture};
LectureFine:=\useKV[ClesStat]{LectureFine};
AideLecture:=\useKV[ClesStat]{AideLecture};
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex
new file mode 100644
index 00000000000..f13fe2fad5b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex
@@ -0,0 +1,62 @@
+%%%
+% Tableau Double Entree
+%%%
+\def\filedateTDE{2024/08/15}%
+\def\fileversionTDE{0.1a}%
+\message{-- \filedateTDE\space v\fileversionTDE}%
+
+\setKVdefault[TDE]{Colonnes=5,Lignes=4,Legende={},LegendesH={B,C,D,Total},LegendesV={1,2,Total},Couleur=Cornsilk,Vide=false,Totaux,Questions=false,Stretch=1}%
+
+\NewDocumentCommand\TableauDoubleEntree{om}{%
+ \useKVdefault[TDE]%
+ \setKV[TDE]{#1}%
+ \xdef\PfCFooH{\useKV[TDE]{LegendesH}}%
+ \xdef\PfCFooV{\useKV[TDE]{LegendesV}}%
+ \setsepchar{,}\reademptyitems%
+ \readlist*\ListeH{\PfCFooH}%
+ \readlist*\ListeV{\PfCFooV}%
+ \readlist*\ListeDonnees{#2}%
+ \ifboolKV[TDE]{Totaux}{}{%
+ % Vider les lignes du total
+ \xintFor* ##1 in{\xintSeq{1}{\fpeval{\ListeVlen-1}}}\do{%
+ \xintFor* ##2 in{\xintSeq{1}{\fpeval{\ListeHlen-0}}}\do{%
+ \modulo{\fpeval{##2+(##1-1)*(\ListeHlen-0)}}{\fpeval{\ListeHlen-0}}%
+ \ifnum\remainder=0\relax%
+ \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,}%
+ \else%
+ \ifnum\fpeval{##2+(##1-1)*(\ListeHlen-0)}=1\relax%
+ \xdef\ListeDonneesSansTotauxAv{\ListeDonnees[\fpeval{##2+(##1-1)*(\ListeHlen-0)}]}%
+ \else%
+ \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,\ListeDonnees[\fpeval{##2+(##1-1)*(\ListeHlen-0)}]}%
+ \fi%
+ \fi%
+ }%
+ }%
+ % On ajoute la dernière ligne qui est vide
+ \xintFor* ##2 in{\xintSeq{1}{\fpeval{\ListeHlen-0}}}\do{%
+ \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,}%
+ }%
+ % On relit la liste des données.
+ \setsepchar{,}\reademptyitems%
+ \readlist*\ListeDonnees{\ListeDonneesSansTotauxAv}%
+ \reademptyitems%
+ }%
+ %
+ % Pour vider le tableau, on utilise la clé <Vide>.
+ % On choisit quelques éléments ^^ à écrire
+ \ifboolKV[TDE]{Questions}{%
+ %en réflexion (voir v5)
+ }{}%
+ %
+ \colorlet{PfCColorTDE}{\useKV[TDE]{Couleur}}%
+ \renewcommand{\arraystretch}{\useKV[TDE]{Stretch}}%
+ \begin{tabular}{|*{\fpeval{\ListeHlen+1}}{c|}}
+ \hline
+ \cellcolor{PfCColorTDE}\useKV[TDE]{Legende}\xintFor*##1 in{\xintSeq{1}{\ListeHlen}}\do{\uppercase{&}\cellcolor{PfCColorTDE}\ListeH[##1]}\\
+ \hline
+ \xintFor* ##1 in{\xintSeq{1}{\ListeVlen}}\do{
+ \cellcolor{PfCColorTDE}\ListeV[##1]\xintFor*##2 in{\xintSeq{1}{\ListeHlen}}\do{\uppercase{&}\ifboolKV[TDE]{Vide}{}{\ListeDonnees[\fpeval{(##2-0)+(##1-1)*(\ListeHlen-0)}]}}\\
+ \hline
+ }
+ \end{tabular}
+}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex
index 75270180d37..933fcb80a2b 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex
@@ -1,7 +1,11 @@
%%%
% Tableaux d'unit\'es
%%%
-\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false,Condense=false}%
+\def\filedateTableaux{2024/08/15}%
+\def\fileversionTableaux{0.1a}%
+\message{-- \filedateTableaux\space v\fileversionTableaux}%
+\message{`PfCTableauxUnites.tex' v\fileversionTableaux\space (\filedateTableaux)}
+\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false,Condense=false,DoubleEntree=false}%
\defKV[ClesTableaux]{ColonnesSup=\setKV[ClesTableaux]{Exterieur}}%
%
\newcommand\PfCTBstrut{\rule[-1.2ex]{0pt}{3.8ex}}% Top and Bottom strut
@@ -52,7 +56,10 @@
\xdef\PfCCoefConversion{10}%
}{}%
\PfCTableauIncline%
- }{%
+ }{%Fin Escalier
+ \ifboolKV[ClesTableaux]{DoubleEntree}{%
+ \TableauDoubleEntree[#1]{#2}%
+ }{}%
%
%%% Clé Octet
%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex
index 3399cbecff9..df109d964a8 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex
@@ -1,6 +1,10 @@
%%%
% Tables Addition-Multiplication
%%%
+\def\filedateTableOp{2024/08/04}%
+\def\fileversionTableOp{0.1}%
+\message{-- \filedateTableOp\space v\fileversionTableOp}%
+%
\setKVdefault[Tables]{Addition=false,Soustraction=false,Multiplication,Seul=false,Debut=0,Fin=10,Couleur=white,Inverse=false}
% pour m\'emoire
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex
index df859b0453b..3026bf9be0a 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex
@@ -1,6 +1,10 @@
%%%
% Tectonic
%%%
+\def\filedateTectonic{2024/08/04}%
+\def\fileversionTectonic{0.1}%
+\message{-- \filedateTectonic\space v\fileversionTectonic}%
+%
\setKVdefault[ClesTectonic]{CouleurCase=LightGray,TLargeur=5,THauteur=5,Solution=false,Largeur=25pt,CouleurSolution=black,Tailles=false,Aide=false}%
\defKV[ClesTectonic]{Taille=\setKV[ClesTectonic]{Tailles}}%
\defKV[ClesTectonic]{ListeNombres=\setKV[ClesTectonic]{Aide}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex b/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex
index d4adb5be013..140bde3f234 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex
@@ -1,6 +1,10 @@
%%%
% Thales
%%%
+\def\filedateThales{2024/08/04}%
+\def\fileversionThales{0.1}%
+\message{-- \filedateThales\space v\fileversionThales}%
+%
\newcount\ppcm%
\newcommand\PPCM[2]{%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex
index 1c460e36939..2286b083329 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex
@@ -1,8 +1,16 @@
%%%
% Ticket de caisse
%%%
+\def\filedateTicketCaisse{2024/08/04}%
+\def\fileversionTicketCaisse{0.1}%
+\message{-- \filedateTicketCaisse\space v\fileversionTicketCaisse}%
+%
\newcounter{PfCNbInsulte}%
+\newcounter{PfCChoixService}%
\setcounter{PfCNbInsulte}{0}%
+\setcounter{PfCChoixService}{0}%
+%
+\newlength\PfCTicketLarg
\NewDocumentCommand\PfCPrixInsulte{sm}{%
\setsepchar{,}\ignoreemptyitems%
@@ -67,15 +75,17 @@
}%
\makeatother
-\setKVdefault[TicketCaisse]{Largeur=222,Especes=50,Enseigne=Au comptoir des maths,DateAchat=\today,HeureAchat=15:13:34,Taches=false,Rendu,Total,UK=false,US=false,CFA=false,CFP=false,CHF=false,Euro=false,Solution=false}
+\setKVdefault[TicketCaisse]{Largeur=222pt,Especes=50,Simple=false,Taxes=false,SansRendu=false,Enseigne=Au comptoir des maths,DateAchat=\today,HeureAchat=15:13:34,Taches=false,Rendu,Total,SousTotal=false,UK=false,US=false,CFA=false,CFP=false,CHF=false,Euro=false,Solution=false}
\defKV[TicketCaisse]{Couleur=\colorlet{PfCTicketCouleurSolution}{#1}\setKV[TicketCaisse]{Solution}}
+\defKV[TicketCaisse]{Service=\setKV[TicketCaisse]{Taxes}}
-\NewDocumentCommand\TicketCaisse{om}{%
+\NewDocumentCommand\TicketCaisse{som}{%
\setcounter{PfCNbInsulte}{0}%
\useKVdefault[TicketCaisse]%
- \setKV[TicketCaisse]{#1}%
+ \setKV[TicketCaisse]{#2}%
+ \setlength{\PfCTicketLarg}{\useKV[TicketCaisse]{Largeur}}%
\setsepchar[*]{,*/}%
- \readlist*\ListeAchats{#2}%
+ \readlist*\ListeAchats{#3}%
% On fait trois listes pour les retenir
% Liste Quantités
\xdef\PfCFooQuantites{}%
@@ -122,9 +132,123 @@
\xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{%
\xdef\PfCTCTotal{\fpeval{\PfCTCTotal+\ListeQuantites[##1]*\ListePUnitaires[##1]}}%
}%
-% Le coût total est \PfCTCTotal\\
+ \ifboolKV[TicketCaisse]{Taxes}{%
+ % On décompose la clé
+ \StrChar{\useKV[TicketCaisse]{Service}}{1}[\MyLetter]%
+ % Si le premier caractère est !, il faut regarder si le deuxième caractère est une étoile
+ \IfStrEq{\MyLetter}{!}{%
+ \StrChar{\useKV[TicketCaisse]{Service}}{2}[\MyLettera]%
+ \IfStrEq{\MyLettera}{*}{%
+ \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{2}[\PfCTCValeurService]
+ \setcounter{PfCChoixService}{3}%
+ }{%
+ \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{1}[\PfCTCValeurService]
+ \setcounter{PfCChoixService}{1}%
+ }%
+ }{%il faut regarder si c'est une étoile
+ \StrChar{\useKV[TicketCaisse]{Service}}{1}[\MyLettera]%
+ \IfStrEq{\MyLettera}{*}{%
+ \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{1}[\PfCTCValeurService]
+ \setcounter{PfCChoixService}{2}
+ }{%
+ \xdef\PfCTCValeurService{\useKV[TicketCaisse]{Service}}%
+ \setcounter{PfCChoixService}{0}
+ }%
+ }%
+ % On fait les calculs associés à la clé.
+ \xdef\PfCTCSousTotal{\PfCTCTotal}%
+ \xdef\PfCTCService{\fpeval{\PfCTCValeurService*\PfCTCSousTotal/100}}%
+ \xdef\PfCTCTotal{\fpeval{\PfCTCSousTotal+\PfCTCService}}%
+ }{}%
+ % Le coût total est \PfCTCTotal\\
+ \IfBooleanTF{#1}{%
+ \ttfamily
+ \begin{tabular}{|m{0.48\PfCTicketLarg}m{0.13\PfCTicketLarg}m{0.165\PfCTicketLarg}m{0.225\PfCTicketLarg}|}%
+ \hline
+ &&&\\%
+ \multicolumn{4}{|c|}{\Large\bfseries\useKV[TicketCaisse]{Enseigne}}\\%
+ &&&\\%
+ \hline%
+ &&&\\%
+ \footnotesize\sc Description&\centering \footnotesize\sc Qte.&\centering\footnotesize\sc P.u.&\hfill\footnotesize\sc Prix \ifboolKV[TicketCaisse]{Taxes}{H.T.}{Net}\\%
+ &&&\\%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{%
+ \ListeElements[##1]&%
+ \centering
+ \footnotesize%
+ \StrChar{\ListeAchats[##1,1]}{1}[\MyLetter]%
+ \IfStrEq{\MyLetter}{!}{\PfCPrixInsulte*{\ListeQuantites[##1]}}{\xintifboolexpr{\fpeval{\ListeQuantites[##1]}==1}{}{\num{\ListeQuantites[##1]}}}%
+ &
+ \hfill
+ \footnotesize
+ %Savoir si le nombre d'articles est affiché
+ \StrChar{\ListeAchats[##1,1]}{1}[\MyLetter]%
+ % Si le nombre d'articles n'est pas affiché, il faut impérativement afficher le prix unitaire
+ \IfStrEq{\MyLetter}{!}{%
+ \PrixTicket{\ListePUnitaires[##1]}%
+ }{%
+ % On regarde si on affiche le prix unitaire
+ \StrChar{\ListeAchats[##1,3]}{1}[\MyLettera]%
+ % Si c'est un !, on affiche pas
+ % Sinon, on affiche
+ \IfStrEq{\MyLettera}{!}{%
+ \PfCPrixInsulte*{\PrixTicket{\ListePUnitaires[##1]}}%
+ }{%
+ \xintifboolexpr{\fpeval{\ListeQuantites[##1]}==1}{}{%
+ \PrixTicket{\ListePUnitaires[##1]}%
+ }%
+ }%
+ }%
+ &\hfill
+ \StrChar{\ListeAchats[##1,3]}{1}[\MyLetter]%
+ % Si le premier caractère est !, il faut regarder si le deuxième caractère est une étoile
+ \IfStrEq{\MyLetter}{!}{%
+ \StrChar{\ListeAchats[##1,3]}{2}[\MyLettera]%
+ \IfStrEq{\MyLettera}{*}{%
+ \PfCPrixInsulte*{\PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}}%
+ }{%
+ \PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}%
+ }%
+ }{%il faut regarder si c'est une étoile
+ \StrChar{\ListeAchats[##1,3]}{1}[\MyLettera]%
+ \IfStrEq{\MyLettera}{*}{%
+ \PfCPrixInsulte{\PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}}%
+ }{%
+ \PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}%
+ }%
+ }%
+ \\
+ }%
+ &&&\\%
+ \hline%
+ &&&\\
+ % Partie Service
+ \ifboolKV[TicketCaisse]{Taxes}{%
+ Total H.T.\uppercase{&}\uppercase{&}\uppercase{&}\hfill\ifboolKV[TicketCaisse]{SousTotal}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCSousTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}}
+ \\%
+ Service %
+ \ifodd\thePfCChoixService\relax \PfCPrixInsulte{\num{\PfCTCValeurService}}\else\num{\PfCTCValeurService}\fi~\si{\percent}%
+ &&&\hfill
+ \ifnum\thePfCChoixService>1\relax \PfCPrixInsulte{\PrixTicket{\PfCTCService}}\else\PrixTicket{\PfCTCService}\fi%
+ \\
+ &&&\\
+ \hline
+ &&&\\
+ }{}%
+ \ifboolKV[TicketCaisse]{Simple}{}{%
+ Total\ifboolKV[TicketCaisse]{Taxes}{ T.T.C.}{}&&&\hfill\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}\\%
+ \ifboolKV[TicketCaisse]{SansRendu}{}{%
+ Espèces&&&\hfill\PrixTicket{\useKV[TicketCaisse]{Especes}}\\%
+ Rendu&&&\hfill\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}\\%
+ }
+ &&&\\%
+ }%
+ \multicolumn{4}{|c|}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}\\%
+ \hline
+ \end{tabular}
+ }{%
{\ttfamily%
- \begin{NiceTabular}{m{107pt}m{29pt}m{36pt}m{50pt}}%
+ \begin{NiceTabular}{m{0.48\PfCTicketLarg}m{0.13\PfCTicketLarg}m{0.165\PfCTicketLarg}m{0.225\PfCTicketLarg}}%
\CodeBefore
\tikz\node[opacity=0.2,yshift=-1.5cm] at ($(1-|1)!0.5!(1-|last)$) {\Large\bfseries\reflectbox{
\begin{tabular}{c}
@@ -148,7 +272,7 @@
\\%
\Cdots\\%
\\%
- \Block[l]{}{\footnotesize\sc Description}&\Block{}{\footnotesize\sc Qte.}&\Block{}{\footnotesize\sc P.u.}&\Block[r]{}{\footnotesize\sc Prix Net}\\%
+ \Block[l]{}{\footnotesize\sc Description}&\Block{}{\footnotesize\sc Qte.}&\Block{}{\footnotesize\sc P.u.}&\Block[r]{}{\footnotesize\sc Prix \ifboolKV[TicketCaisse]{Taxes}{H.T.}{Net}}\\%
\\%
\xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{%
\ListeElements[##1]&%
@@ -200,11 +324,28 @@
}%
\\%
\Cdots\\%
- Total&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}}\\%
- Espèces&&&\Block[r]{}{\PrixTicket{\useKV[TicketCaisse]{Especes}}}\\%
- Rendu&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}}\\%
+ % Partie Service
+ \ifboolKV[TicketCaisse]{Taxes}{%
+ Total H.T.&&&\Block[r]{}{\ifboolKV[TicketCaisse]{SousTotal}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCSousTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}}
+ }\\%
+ Service %
+ \ifodd\thePfCChoixService\relax \PfCPrixInsulte{\num{\PfCTCValeurService}}\else\num{\PfCTCValeurService}\fi~\si{\percent}%
+ &&&\Block[r]{}{%
+ \ifnum\thePfCChoixService>1\relax \PfCPrixInsulte{\PrixTicket{\PfCTCService}}\else\PrixTicket{\PfCTCService}\fi%
+ }\\
+ \Cdots\\
+ \\
+ }{}%
+ \ifboolKV[TicketCaisse]{Simple}{}{%
+ Total\ifboolKV[TicketCaisse]{Taxes}{ T.T.C.}{}&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}}\\%
+ \ifboolKV[TicketCaisse]{SansRendu}{}{%
+ Espèces&&&\Block[r]{}{\PrixTicket{\useKV[TicketCaisse]{Especes}}}\\%
+ Rendu&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}}\\%
+ }
\\%
- \Block{1-4}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}&&&\\%
+ }%
+ \Block{1-4}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}&&&\\%
\end{NiceTabular}
}%
+ }
}% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
index 461a42fb717..05a6524e987 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex
@@ -1,6 +1,10 @@
%%%
% Tortue
%%%
+\def\filedateTortue{2024/08/04}%
+\def\fileversionTortue{0.1}%
+\message{-- \filedateTortue\space v\fileversionTortue}%
+%
\setKVdefault[Tortue]{%
Pas=0.2mm,%Déplacement,
Etapes=false,%Pour arrêter la construction à une étape particulière
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex
index 38fe05ce606..0bd7a90da63 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex
@@ -1,6 +1,10 @@
%%%
% Trigonom\'etrie
%%%
+\def\filedateTrigo{2024/08/04}%
+\def\fileversionTrigo{0.1}%
+\message{-- \filedateTrigo\space v\fileversionTrigo}%
+%
\def\MPFigTrigo#1#2#3#4#5#6#7#8{%
\ifluatex
% \mplibcodeinherit{enable}
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex
index 560258ff59d..06c0a77e3bc 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex
@@ -1,3 +1,10 @@
+%%%
+%Trio
+%%%
+\def\filedateTrio{2024/08/04}%
+\def\fileversionTrio{0.1}%
+\message{-- \filedateTrio\space v\fileversionTrio}%
+%
\newlength\PfCTrioHauteur%
\newcounter{PfCTrioLettre}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex
index efc6cd24b31..b2ece6c0d49 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex
@@ -1,6 +1,10 @@
%%%
% Triominos
%%%
+\def\filedateTriominos{2024/08/04}%
+\def\fileversionTriominos{0.1}%
+\message{-- \filedateTriominos\space v\fileversionTriominos}%
+%
\setKVdefault[ClesTriomino]{Longueur=5cm,Etages=3,Ecart=0.6,AffichagePiece=false,Hexagone=false,Recapitulatif=false,Colonnes=2}%
\defKV[ClesTriomino]{Piece=\setKV[ClesTriomino]{AffichagePiece=true}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex
index 895f96136c2..0d00e039c41 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex
@@ -1,6 +1,10 @@
%%%
% Urne et probabilités
%%%
+\def\filedateUrneProba{2024/08/04}%
+\def\fileversionUrneProba{0.1}%
+\message{-- \filedateUrneProba\space v\fileversionUrneProba}%
+%
\newtoks\tokUrneListeCouleurs%
\newtoks\tokUrneListeColonnes%
\newtoks\tokUrneListeNombres%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex
index 54a1a079cc6..99024a43586 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex
@@ -1,6 +1,10 @@
%%%
% Visualisation Multiplication Décimaux
%%%
+\def\filedateVisuMulDeci{2024/08/04}%
+\def\fileversionVisuMulDeci{0.1}%
+\message{-- \filedateVisuMulDeci\space v\fileversionVisuMulDeci}%
+%
\setKVdefault[VisMulDec]{Couleur=Orange,CouleurUnite=DarkGreen,Dixiemes=false,Unite=2}%
\newtoks\toksvismuldec%
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex
index 9365b7e6216..196358d9bf8 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex
@@ -1,6 +1,10 @@
%%%
% Vue Cubes
%%%
+\def\filedateVueCubes{2024/08/26}%
+\def\fileversionVueCubes{0.1a}%
+\message{-- \filedateVueCubes\space v\fileversionVueCubes}%
+%
\setKVdefault[VueCubes]{Solution=false,Hauteur=5,Profondeur=4,Largeur=3,Angle=60,Nom=Ex1,Trou=false,Echelle=0.25,CouleurCube=LightSteelBlue,CouleurFleche=LightGray,Face=false,Creation=false,Grilles=false,Seul=false,Perso=false,EclateX=0,EclateZ=0,EclateY=0}
\newtoks\toklisteVueCube%
@@ -30,9 +34,9 @@
\readlist*\PfCListeHauteursCubes{#2}%
\reademptyitems%
\foreachitem\compteur\in\PfCListeHauteursCubes{\expandafter\UpdatetoksVueCube\compteur\nil}%
- \BuildVueCubes{\useKV[VueCubes]{Angle}}{\the\toklisteVueCube}%
+ \BuildVueCubes{\useKV[VueCubes]{Angle}}{\the\toklisteVueCube}{\useKV[VueCubes]{Nom}}%
}{%
- \BuildVueCubes{\useKV[VueCubes]{Angle}}{}%
+ \BuildVueCubes{\useKV[VueCubes]{Angle}}{}{\useKV[VueCubes]{Nom}}%
}%
}%
}%
@@ -100,11 +104,13 @@
\fi
}
-\NewDocumentCommand\BuildVueCubes{m m}{%
+\NewDocumentCommand\BuildVueCubes{m m m}{%
\ifluatex
\mplibforcehmode
\xdef\PfCVueCubeNom{\useKV[VueCubes]{Nom}}%
\begin{mplibcode}[\PfCVueCubeNom]
+ string NomRetenu;
+ NomRetenu=str #3;
input PfCSolid;
intensite:=1.5;
@@ -176,6 +182,9 @@
endfor;
fi;
+ write decimal(TotalObj) to "PfCNombreCubes"&NomRetenu&".tex";%
+ write EOF to "PfCNombreCubes"&NomRetenu&".tex";%
+
% Pour la fleche
path Fleche;
color A[];
diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex
index c710834b934..942e66c111c 100644
--- a/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex
+++ b/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex
@@ -1,6 +1,10 @@
%%%
% Yohaku
%%%
+\def\filedateYohaku{2024/08/04}%
+\def\fileversionYohaku{0.1}%
+\message{-- \filedateYohaku\space v\fileversionYohaku}%
+%
\setKVdefault[Yohaku]{Taille=2,Largeur=1cm,Hauteur=1cm,Addition,Multiplication=false,Perso=false,Limite=50,Relatif=false,Negatif=false,Pair=false,Impair=false,Premier=false,Solution=false,Visible=false,Bordure=false,CouleurResultat=gray!15,Ligne=0,Colonne=0,PasL=0,PasC=0,CouleurZone=gray!25}%
\defKV[Yohaku]{Case=\setKV[Yohaku]{Visible}}%
diff --git a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
index a6b767a3bf1..df794a8d866 100644
--- a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
+++ b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty
@@ -2,9 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2024/07/03}%
+\def\filedate{2024/09/04}%
\let\PfCfiledate\filedate%
-\def\fileversion{0.99-A-g}%
+\def\fileversion{0.99-A-j}%
\let\PfCfileversion\fileversion%
\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]%
@@ -340,6 +340,37 @@
\fi
}%
+\newlength{\PfCLongueurBarreHor}
+\setKVdefault[PfCLigneCompleter]{Ecart=20pt,Couleurs=false}%
+\defKV[PfCLigneCompleter]{Couleur=\setKV[PfCLigneCompleter]{Couleurs}}%
+
+\NewDocumentCommand\ListeACompleter{som}{%
+ \useKVdefault[PfCLigneCompleter]%
+ \setKV[PfCLigneCompleter]{#2}%
+ \ifboolKV[PfCLigneCompleter]{Couleurs}{\colorlet{PfCLC}{\useKV[PfCLigneCompleter]{Couleur}}}{}%
+ \setlength{\PfCLongueurBarreHor}{\useKV[PfCLigneCompleter]{Ecart}}%
+ \setsepchar{,}\reademptyitems%
+ \readlist*\ListeTiti{#3}%
+ \foreachitem\compteur\in\ListeTiti{%
+ \itemtomacro\ListeTiti[\compteurcnt]\PfCCaractere%
+ \StrChar{\PfCCaractere}{1}[\RetiensElmt]%
+ \IfStrEq{\RetiensElmt}{!}{%
+ \IfBooleanTF{#1}{%
+ \ifboolKV[PfCLigneCompleter]{Couleurs}{\colorlet{saved}{.}\color{PfCLC}}{}\StrGobbleLeft{\PfCCaractere}{1}\ifboolKV[PfCLigneCompleter]{Couleurs}{\color{saved}}{}%
+ }{%
+ \hbox to \PfCLongueurBarreHor{\hrulefill}%
+ }
+ }{%
+ \ListeTiti[\compteurcnt]%
+ }%
+ \ifnum\compteurcnt=\ListeTitilen\relax%
+ .%
+ \else%
+ ,
+ \fi%
+ }%
+}%
+
%https://tex.stackexchange.com/questions/128991/frac-or-inference-rule-with-dotted-line
\newcommand\PfCfrac[2]{%
\ooalign{$\genfrac{}{}{0pt}{0}{#1}{#2}$\cr\PfCdotover\cr}%
@@ -825,6 +856,9 @@
\def\PfCSymbolTimes{\times}%
\def\PfCSymbolDiv{\div}%
+\input{PfCCheque}
+\input{PfCCalculsDetailles}
+\input{PfCTableauDoubleEntree}
\input{PfCUrneProba}
\input{PfCProbaFrequence}
\input{PfCVisualisationMulDeci}
@@ -975,8 +1009,5 @@
\input{PfCScratch}
\RequirePackage{PfCInfixRPN}
-%\makeatletter
-%\let\@nil\@empty
-%\makeatother
\input{PfCArbreCalcul} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
index e37ce44eeb0..238b07908d1 100644
--- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
+++ b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty
@@ -1,9 +1,14 @@
-% Author : C. Pierquet
-% licence : Released under the LaTeX Project Public License v1.3c
-% or later, see http://www.latex-project.org/lppl.txtf
+% Author.............: C. Pierquet
+% licence............: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+% licence cliparts...: CC0 from openclipart
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2024/07/13 3.04d Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2024/09/27 3.05b Aide pour l'utilisation de LaTeX en lycee]
+% 3.05b Mise en standby des commandes liées à minted (attente de compatibilité complète avec tcblisting) + Clé [ValeursTan] pour les cercles trigo
+% 3.05a Conversions entre bases + vectorial clipart (de openclipart)
+% 3.04g Ajout de clés pour les arbres de probas
+% 3.04f Ajout de clés pour la coloration des nombres et Piton
+% 3.04e Commandes prix/angle/pourcent en lien avec siunitx
% 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
@@ -168,15 +173,15 @@
\input{proflycee-tools-espace.tex}
}%
{}%
- \IfSubStr{#1}{minted}%
- {%
- \if@build
- \RequirePackage[outputdir=build]{minted} %on charge minted avec le répertoire build
- \fi
- \tcbuselibrary{minted} %on charge minted via la librairie tcbox
- \input{proflycee-tools-minted.tex}
- }%
- {}%
+ % \IfSubStr{#1}{minted}%
+ % {%
+ % \if@build
+ % \RequirePackage[outputdir=build]{minted} %on charge minted avec le répertoire build
+ % \fi
+ % \tcbuselibrary{minted} %on charge minted via la librairie tcbox
+ % \input{proflycee-tools-minted.tex}
+ % }%
+ % {}%
\IfSubStr{#1}{pythontex}%
{%
\RequirePackage[gobble=auto]{pythontex}
@@ -233,5 +238,7 @@
\input{proflycee-tools-competences.tex}
%%------Examens
\input{proflycee-tools-exams.tex}
+%%------Cliparts
+\input{proflycee-tools-cliparts.tex}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-cup.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-cup.pdf
new file mode 100644
index 00000000000..3ca7af1aacd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-cup.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal-flat.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal-flat.pdf
new file mode 100644
index 00000000000..83f7d914898
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal-flat.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal.pdf
new file mode 100644
index 00000000000..0e4712cece9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-bronze-medal.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-checked.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-checked.pdf
new file mode 100644
index 00000000000..238d76df4ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-checked.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-crossed.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-crossed.pdf
new file mode 100644
index 00000000000..94f04537b2d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-crossed.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-cup.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-cup.pdf
new file mode 100644
index 00000000000..e1b1a5fb464
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-cup.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal-flat.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal-flat.pdf
new file mode 100644
index 00000000000..424fc345ab1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal-flat.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal.pdf
new file mode 100644
index 00000000000..3246c386930
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-gold-medal.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-center.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-center.pdf
new file mode 100644
index 00000000000..bc036614218
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-center.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-left.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-left.pdf
new file mode 100644
index 00000000000..40f843b8643
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-left.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-right.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-right.pdf
new file mode 100644
index 00000000000..323710e0976
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse-right.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse.pdf
new file mode 100644
index 00000000000..b8e69cd5243
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-mouse.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-notok.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-notok.pdf
new file mode 100644
index 00000000000..0fed35ca1eb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-notok.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-ok.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-ok.pdf
new file mode 100644
index 00000000000..43cac49c385
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-ok.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-cup.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-cup.pdf
new file mode 100644
index 00000000000..9ba7602d269
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-cup.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal-flat.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal-flat.pdf
new file mode 100644
index 00000000000..70d0ca8d8bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal-flat.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal.pdf b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal.pdf
new file mode 100644
index 00000000000..ced83f9d17f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/pflcliparts/pfl-silver-medal.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-arithm.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-arithm.tex
index a021fea9374..a2008c15df8 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-arithm.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-arithm.tex
@@ -1902,4 +1902,65 @@
}%
}
+%====CONVERSIONS ENTRE BASES
+\ExplSyntaxOn
+%commande interne (stockage ou non)
+\NewDocumentCommand\pflbasetobase{ m m m }{%
+ %1=init
+ %2=fin
+ %3=nb
+ \ifnum#2=10%
+ \int_from_base:nn {#3}{#1}%
+ \else%
+ \int_to_Base:nn {\int_from_base:nn {#3}{#1}}{#2}%
+ \fi%
+}
+
+\NewDocumentCommand\tmpresconvbases{ m m m O{\tmpconvres} }{%
+ %1=init
+ %2=fin
+ %3=nb
+ \ifnum#2=10%
+ \xdef#4{\int_from_base:nn {#3}{#1}}%
+ \else%
+ \xdef#4{\int_to_Base:nn {\int_from_base:nn {#3}{#1}}{#2}}%
+ \fi%
+}
+\ExplSyntaxOff
+
+%commande interne split adaptée de https://tex.stackexchange.com/questions/171007/split-a-character-string-n-by-n // unbonpetit // CC BY-SA 3.0
+\NewDocumentCommand\tmpStrSplit{ O{\,} m m O{\tmpsplitres} }{%
+ %1=espace / %2=nb caract / %3=chaîne / %4=macro de stockage
+ \xdef\splitstring{#3}\let\splitresult\empty%
+ \loop%
+ \StrLen\splitstring[\tempa]%
+ \StrSplit\splitstring{\number\numexpr\tempa-#2}\splitstring\tempb%
+ \xdef\splitresult{\unless\ifx\splitstring\empty#1\fi\tempb\splitresult}%
+ \unless\ifx\splitstring\empty%
+ \repeat%
+ \xdef#4{\splitresult}%
+}
+
+\NewDocumentCommand\ConversionEntreBases{ s O{\,} m m }{%
+ %calculs internes
+ \StrCut{#3}{->}{\tmpbaseinit}{\tmpbasefin}%
+ \tmpresconvbases{\tmpbaseinit}{\tmpbasefin}{#4}%\tmpconvres
+ %affichage
+ \ensuremath{%
+ \ifnum\tmpbaseinit=2%
+ \tmpStrSplit{4}{#4}%
+ {\tmpsplitres}\IfBooleanT{#1}{_{\tmpbaseinit}}%
+ \else%
+ {#4}\IfBooleanT{#1}{_{\tmpbaseinit}}%
+ \fi%
+ =%
+ \ifnum\tmpbasefin=2%
+ \tmpStrSplit[#2]{4}{\tmpconvres}%
+ {\tmpsplitres}\IfBooleanT{#1}{_{\tmpbasefin}}%
+ \else%
+ {\tmpconvres}\IfBooleanT{#1}{_{\tmpbasefin}}%
+ \fi%
+ }%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-cliparts.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-cliparts.tex
new file mode 100644
index 00000000000..13645695a7d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-cliparts.tex
@@ -0,0 +1,126 @@
+% proflycee-tools-cliparts.tex
+% Copyright 2024 Cédric Pierquet
+% Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+% logos from CC0 opencliparts (users Firkin & Juhele & qubodup & TzeenieWheenie & jetxee)
+
+%====DIMENSIONS
+\newlength{\tmpcharacterheightinline}
+\newlength{\tmpcharacterdepthinline}
+
+%====MACRO PRINCIPALE
+\NewDocumentCommand\InsererClipart{ s O{} m }{%
+ \IfBooleanTF{#1}%
+ {%
+ \IfFileExists{pfl-#3.pdf}{\includegraphics[#2]{pfl-#3.pdf}}{}%
+ }%
+ {%
+ \settototalheight{\tmpcharacterheightinline}{\hbox{AZERTYUIOPQSDFGHJKLMWXCVBNazertyuiopqsdfghjklmwxcvbn}}%
+ \settodepth{\tmpcharacterdepthinline}{\hbox{AZERTYUIOPQSDFGHJKLMWXCVBNazertyuiopqsdfghjklmwxcvbn}}%
+ \IfFileExists{pfl-#3.pdf}{\raisebox{-\tmpcharacterdepthinline}{\includegraphics[height=\tmpcharacterheightinline]{pfl-#3.pdf}}}{}%
+ }%
+}
+
+%====ALIASES
+\NewDocumentCommand\pflimgcoupeb{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{bronze-cup}}%
+ {\InsererClipart{bronze-cup}}%
+}
+
+\NewDocumentCommand\pflimgmedb{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{bronze-medal}}%
+ {\InsererClipart{bronze-medal}}%
+}
+
+\NewDocumentCommand\pflimgmedbp{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{bronze-medal-flat}}%
+ {\InsererClipart{bronze-medal-flat}}%
+}
+
+\NewDocumentCommand\pflimgverif{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{checked}}%
+ {\InsererClipart{checked}}%
+}
+
+\NewDocumentCommand\pflimgnonverif{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{crossed}}%
+ {\InsererClipart{crossed}}%
+}
+
+\NewDocumentCommand\pflimgcoupeo{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{gold-cup}}%
+ {\InsererClipart{gold-cup}}%
+}
+
+\NewDocumentCommand\pflimgmedo{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{gold-medal}}%
+ {\InsererClipart{gold-medal}}%
+}
+
+\NewDocumentCommand\pflimgmedop{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{gold-medal-flat}}%
+ {\InsererClipart{gold-medal-flat}}%
+}
+
+\NewDocumentCommand\pflimgsouris{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{mouse}}%
+ {\InsererClipart{mouse}}%
+}
+
+\NewDocumentCommand\pflimgsourisg{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{mouse-left}}%
+ {\InsererClipart{mouse-left}}%
+}
+
+\NewDocumentCommand\pflimgsourisc{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{mouse-center}}%
+ {\InsererClipart{mouse-center}}%
+}
+
+\NewDocumentCommand\pflimgsourisd{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{mouse-right}}%
+ {\InsererClipart{mouse-right}}%
+}
+
+\NewDocumentCommand\pflimgko{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{notok}}%
+ {\InsererClipart{notok}}%
+}
+
+\NewDocumentCommand\pflimgok{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{ok}}%
+ {\InsererClipart{ok}}%
+}
+
+\NewDocumentCommand\pflimgcoupea{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{silver-cup}}%
+ {\InsererClipart{silver-cup}}%
+}
+
+\NewDocumentCommand\pflimgmeda{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{silver-medal}}%
+ {\InsererClipart{silver-medal}}%
+}
+
+\NewDocumentCommand\pflimgmedap{ s O{} }{%
+ \IfBooleanTF{#1}%
+ {\InsererClipart*[#2]{silver-medal-flat}}%
+ {\InsererClipart{silver-medal-flat}}%
+}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex
index 0a1555c4e96..f524c41cf31 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex
@@ -10,6 +10,39 @@
\RequirePackage{mleftright} %pour une meilleure gestion des espacements avec \left \right :-)
%\RequirePackage{mathrsfs}%pour \mathscr (à voir...)
+%===UNITÉS
+
+\NewDocumentCommand\pflprix{ o m }{%
+ \IfValueTF{#1}%
+ {%
+ \num[round-mode=places,round-precision=#1]{#2}\,\text{€}%
+ }%
+ {%
+ \num{#2}\,\text{€}%
+ }%
+}
+
+\NewDocumentCommand\pflangle{ o m }{%
+ \IfValueTF{#1}%
+ {%
+ \num[round-mode=places,round-precision=#1]{#2}\text{\textdegree}%
+ }%
+ {%
+ \num{#2}\text{\textdegree}%
+ }%
+}
+
+\NewDocumentCommand\pflpcent{ o m }{%
+ \IfValueTF{#1}%
+ {%
+ \num[round-mode=places,round-precision=#1]{#2}\,\%%
+ }%
+ {%
+ \num{#2}\,\%%
+ }%
+}
+
+
%===ENSEMBLES CLASSIQUES
\ifthenelse{\isundefined{\N}}%
{%
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex
index af4aebf3846..42b23be551e 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-minted.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.05b En standy pour le moment...
%3.00g Modif mineure pour la marge gauche
%2.7.5 Argument optionnel pour les numéros de lignes + changement déclaration environnements
%2.7.3 Correction de la couleur des bordures
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 0cb6600617a..52ef7389550 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.04f Ajout de clés pour la coloration des nombres et Piton
%3.04d PitonInputFile et styles, pour compatibilité pfm
%3.03c Thonny via piton + modification clé gobble ?
%3.01f PseudoCode via piton (?)
@@ -42,7 +43,7 @@
BarreTitre=true,%
Titre={{\scriptsize\faCode}~~Code Python},%
EspacementV=0.5\baselineskip,%
- CouleurNombres=orange
+ CouleurNombres={orange!75!black}
}
%==Style Moderne
@@ -160,7 +161,7 @@
\useKVdefault[envpiton]%
\setKV[envpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
%------les styles piton
- \SetPitonStyle{ Number = \color{\CODPITcolnb} }
+ \SetPitonStyle[Python]{ Number = \color{\CODPITcolnb} }
\ifboolKV[envpiton]{Lignes}%si lignes=true
{\PitonOptions{left-margin=0.75em,line-numbers={skip-empty-lines=false,label-empty-lines=true,#3}}}%left-margin=auto,
{}%
@@ -227,7 +228,7 @@
\useKVdefault[envpiton]%
\setKV[envpiton]{#1}% on paramètres les nouvelles clés et on les simplifie
%------les styles piton
- \SetPitonStyle{ Number = \color{\CODPITcolnb} }
+ \SetPitonStyle[Python]{ 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,
{}%
@@ -477,12 +478,14 @@
\defKV[consolepyluatex]{%
Largeur=\def\ConsPyluaLarg{#1},
- Alignement=\def\ConsPyluaAlign{#1}
+ Alignement=\def\ConsPyluaAlign{#1},%
+ CouleurNombres=\def\CODPITcolnb{#1}
}
\setKVdefault[consolepyluatex]{%
Logo=true,%
Largeur=\linewidth,%
- Alignement=flush left
+ Alignement=flush left,%
+ CouleurNombres={orange!75!black}
}
\NewDocumentEnvironment{ConsolePiton}{ O{} D<>{} m }%
@@ -492,6 +495,7 @@
{
\restoreKV[consolepyluatex]% revenir au valeurs par défaut
\setKV[consolepyluatex]{#2}% lit les arguments optionnels
+ \SetPitonStyle[Python]{ Number = \color{\CODPITcolnb} }
\PitonOptions{width={\ConsPyluaLarg-5mm},break-lines,end-of-broken-line={\,},continuation-symbol={\;},#1}
%\PitonOptions{width={\ConsPyluaLarg-5mm},#1}
\PyLTVerbatimEnv
@@ -524,14 +528,16 @@
NomFichier=\def\thonnypitonfilename{#1},%
NomConsole=\def\thonnypitonshellname{#1},%
IntroConsole=\def\thonnypitonintroconsole{#1},%
- Gobble=\def\thonnypitongobble{#1}
+ Gobble=\def\thonnypitongobble{#1},%
+ CouleurNombres=\def\CODPITcolnb{#1}
}
\setKVdefault[pitonthonny]{%
NomFichier=script.py,%
NomConsole=console,%
IntroConsole={Python 3.11.6 /usr/bin/python},%
- Gobble={}
+ Gobble={},%
+ CouleurNombres={orange!75!black}
}
\NewPitonEnvironment{PitonThonnyEditor}{ D<>{} O{} m }%
@@ -539,6 +545,7 @@
\restoreKV[pitonthonny]%
\setKV[pitonthonny]{#1}%
\settowidth{\LargeurNumbersThonny}{\footnotesize\texttt{00}}%
+ \SetPitonStyle[Python]{Number=\color{\CODPITcolnb}}
\PitonOptions{left-margin=\LargeurNumbersThonny+1mm,line-numbers={skip-empty-lines=false,label-empty-lines=true},break-lines,indent-broken-lines,continuation-symbol={}}%
%--gestion du gobble
\IfStrEqCase{\thonnypitongobble}{%
@@ -564,6 +571,7 @@
{\restoreKV[pitonthonny]%
\setKV[pitonthonny]{#1}%
\settowidth{\LargeurNumbersThonny}{\footnotesize\texttt{00}}%
+ \SetPitonStyle[Python]{Number=\color{\CODPITcolnb}}
\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,
@@ -579,6 +587,7 @@
\PyLTVerbatimEnv%
\tcbset{tcbthonnypitonconsole/.style={title=\vphantom{pf}\thonnypitonshellname\:\textcolor{gray}{×}},before skip=0.33\baselineskip,after skip=0.33\baselineskip}%
\noindent%
+ \SetPitonStyle[Python]{Number=\color{\CODPITcolnb}}
%--gestion du gobble
\IfStrEqCase{\thonnypitongobble}{%
{auto}{\PitonOptions{auto-gobble}}%
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex
index 92cff337721..e80cbb4d4c6 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-probas.tex
@@ -245,7 +245,10 @@
StyleTrait=\def\PLAPtypetrait{#1},%
EpaisseurTrait=\def\PLAPeptrait{#1},%
PositionProbas=\def\PLAPposprob{#1},%
- CouleurFond=\def\PLAPcolback{#1}
+ CouleurFond=\def\PLAPcolback{#1},%
+ CouleurTraits=\def\PLAPcolarc{#1},%
+ CouleurProbas=\def\PLAPcolprobas{#1},%
+ CouleurNoeuds=\def\PLAPcolnoeuds{#1}
}
\setKVdefault[PLTIKZARBRE]{%
@@ -260,7 +263,10 @@
StyleTrait={},%
EpaisseurTrait=semithick,%
PositionProbas={},%
- CouleurFond=white
+ CouleurFond=white,%
+ CouleurTraits=black,%
+ CouleurProbas=black,%
+ CouleurNoeuds=black
}
\NewDocumentCommand\IntPlaceProbasArbre{ m m m m m }{%
@@ -285,14 +291,14 @@
\readlist*\PLARBREDONNES{#2}%
\begin{tikzpicture}[x=\PLAPunite,y=\PLAPunite]
%styles
- \tikzstyle{noeud} = [font=\PLAPfont]
- \tikzstyle{probas}= [font=\PLAPfontproba]
+ \tikzstyle{noeud} = [font=\PLAPfont,text=\PLAPcolnoeuds]
+ \tikzstyle{probas}= [font=\PLAPfontproba,text=\PLAPcolprobas]
\ifboolKV[PLTIKZARBRE]{InclineProbas}
{\tikzstyle{PLetiquette}=[pos=0.525,sloped,inner sep=2pt,outer sep=2pt,rectangle]}
{\tikzstyle{PLetiquette}=[pos=0.525,inner sep=2pt,outer sep=2pt,rectangle]}
\ifboolKV[PLTIKZARBRE]{Fleche}
- {\tikzstyle{PLfleche}=[->,>=latex,\PLAPtypetrait,\PLAPeptrait]}
- {\tikzstyle{PLfleche}=[\PLAPtypetrait,\PLAPeptrait]}
+ {\tikzstyle{PLfleche}=[->,>=latex,\PLAPtypetrait,\PLAPeptrait,\PLAPcolarc]}
+ {\tikzstyle{PLfleche}=[\PLAPtypetrait,\PLAPeptrait,\PLAPcolarc]}
%arbre2x2
\IfEq{\PLAPtype}{2x2}
{%
@@ -576,14 +582,14 @@
\readlist*\PLARBREDONNES{#2}
\begin{tikzpicture}[x=\PLAPunite,y=\PLAPunite]
%styles
- \tikzstyle{noeud} = [font=\PLAPfont]
- \tikzstyle{probas}= [font=\PLAPfontproba]
+ \tikzstyle{noeud} = [font=\PLAPfont,text=\PLAPcolnoeuds]
+ \tikzstyle{probas}= [font=\PLAPfontproba,text=\PLAPcolprobas]
\ifboolKV[PLTIKZARBRE]{InclineProbas}
{\tikzstyle{PLetiquette}=[pos=0.525,sloped,inner sep=2pt,outer sep=2pt,rectangle]}
{\tikzstyle{PLetiquette}=[pos=0.525,inner sep=2pt,outer sep=2pt,rectangle]}
\ifboolKV[PLTIKZARBRE]{Fleche}
- {\tikzstyle{PLfleche}=[->,>=latex,\PLAPtypetrait,\PLAPeptrait]}
- {\tikzstyle{PLfleche}=[\PLAPtypetrait,\PLAPeptrait]}
+ {\tikzstyle{PLfleche}=[->,>=latex,\PLAPtypetrait,\PLAPeptrait,\PLAPcolarc]}
+ {\tikzstyle{PLfleche}=[\PLAPtypetrait,\PLAPeptrait,\PLAPcolarc]}
%arbre2x2
\IfEq{\PLAPtype}{2x2}
{%
diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-trigo.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-trigo.tex
index 6efa608f731..f47c9a33bfd 100644
--- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-trigo.tex
+++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-trigo.tex
@@ -35,7 +35,8 @@
Equationsin=false,%
cos=45,%
sin=30,%
- CouleurSol=blue
+ CouleurSol=blue,%
+ ValeursTan=false
}
\newcommand\CercleTrigo[1][]{%
@@ -43,6 +44,28 @@
\setKV[cercletrigo]{#1}
\tikzset{PLval/.style={inner sep=1pt,font=\PLcerclevaleurs,fill=\PLcerclefond}}
\tikzset{PLagl/.style={inner sep=1pt,font=\PLcercleangles,fill=\PLcerclefond}}
+ %tangente ?
+ \ifboolKV[cercletrigo]{ValeursTan}%
+ {%
+ \draw[\PLcerclethick,dotted,gray] (30:\PLcerclerayon)--({\PLcerclerayon},{sqrt(3)/3*\PLcerclerayon}) ;
+ \draw[\PLcerclethick,dotted,gray] (45:\PLcerclerayon)--({\PLcerclerayon},{\PLcerclerayon}) ;
+ \draw[\PLcerclethick,dotted,gray] (60:\PLcerclerayon)--({\PLcerclerayon},{sqrt(3)*\PLcerclerayon}) ;
+ \draw[\PLcerclethick,dotted,gray] (-30:\PLcerclerayon)--({\PLcerclerayon},{-sqrt(3)/3*\PLcerclerayon}) ;
+ \draw[\PLcerclethick,dotted,gray] (-45:\PLcerclerayon)--({\PLcerclerayon},{-\PLcerclerayon}) ;
+ \draw[\PLcerclethick,dotted,gray] (-60:\PLcerclerayon)--({\PLcerclerayon},{-sqrt(3)*\PLcerclerayon}) ;
+ \draw[\PLcerclethick] ({\PLcerclerayon},{-1.8*\PLcerclerayon}) -- ({\PLcerclerayon},{1.8*\PLcerclerayon}) ;
+ \ifboolKV[cercletrigo]{AffValeurs}
+ {%
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$1$} ;
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{-\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$-1$} ;
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{sqrt(3)*\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$\sqrt{3}$} ;
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{-sqrt(3)*\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$-\sqrt{3}$} ;
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{sqrt(3)/3*\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$\tfrac{\sqrt{3}}{3}$} ;
+ \draw[] ([xshift=-2pt]{\PLcerclerayon},{-sqrt(3)/3*\PLcerclerayon})--++(4pt,0) node[right=2pt,PLval] {$-\tfrac{\sqrt{3}}{3}$} ;
+ }%
+ {}%
+ }%
+ {}%
%valeurs remarquables
\ifboolKV[cercletrigo]{AffAngles}
{%valeursdudessus
diff --git a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
index 9aa462bb76f..06a082376d5 100644
--- a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
+++ b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty
@@ -2,20 +2,33 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2024/05/02}%
+\def\filedate{2024/09/17}%
\let\PfMfiledate\filedate%
-\def\fileversion{0.94}%
+\def\fileversion{0.99}%
\let\PfMfileversion\fileversion%
\ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]%
\newif\if@Dyslexie \@Dyslexiefalse
+\newif\if@CAN \@CANfalse
+\newif\if@Revision \@Revisionfalse
+\newif\if@AssembleCorrections \@AssembleCorrectionsfalse
+\newif\if@Personnel \@Personnelfalse
\DeclareOption{Dyslexie}{\@Dyslexietrue}
+\DeclareOption{CAN}{\@CANtrue}
+\DeclareOption{Revision}{\@Revisiontrue}
+\DeclareOption{AssembleCorrections}{\@AssembleCorrectionstrue}
+\DeclareOption{Personnel}{\@Personneltrue}
\ProcessOptions\relax
+
+\if@AssembleCorrections
+ \AddToHook{env/document/end}[AC]{\PfMAffichageTousCorriges}%
+\fi
+
% packages nécessaires
\RequirePackage{verbatim}%
-
+\RequirePackage{xintexpr}
\RequirePackage{calc}%
\RequirePackage{xlop}%
@@ -34,31 +47,33 @@
\RequirePackage{modulus}%
\RequirePackage{ragged2e}%
-
+\RequirePackage{fontawesome5}
\makeatletter
\gdef\PfMFontSize{\@ptsize}
%\gdef\PfMFontSize{\f@size}
\makeatother
%définition des clés
\RequirePackage{simplekv}%
-\setKVdefault[Boulot]{Dys=false,Taille=14,Cours=false,Base=false,BaseHTML=false,CAN=false,Fiche=false,DM=false,DS=false,IE=false,Kholle=false,RecapBrevet=false,PdT=false,Parcours=false,Contrat=false,FdR=false,ParcoursPerso=false,OlympiadesAPMEP=false,CorrigeInverse=false,CorrigeSeul=false,CorrigeApres=false,CorrigeFin=false,CorrigeAll=false,Brevet=false,BaremeComplet=false,BaremeGlobal=false,CorrectionColonnes=false,Epaisseur=0pt,VersSolution=false,AvecEntrainement=false,Small=false,Footnotesize=false,Scriptsize=false,AllDirect=false,AllPouce=false}%Les deux derniers pour essayer de mettre tous les exercices d'un même fichier en mode Reponse, en mode Indice. Pas implanté, pas testé
+\setKVdefault[Boulot]{Graine=1,Dys=false,Taille=14,Cours=false,Base=false,BaseHTML=false,CAN=false,Fiche=false,DM=false,DS=false,IE=false,Kholle=false,RecapBrevet=false,PdT=false,Parcours=false,Contrat=false,FdR=false,ParcoursPerso=false,OlympiadesAPMEP=false,LivreHeros=false,CorrigeInverse=false,CorrigeSeul=false,CorrigeApres=false,CorrigeFin=false,CorrigeAll=false,Brevet=false,BaremeComplet=false,BaremeGlobal=false,CorrectionColonnes=false,EntrainementColonnes=false,Epaisseur=0pt,EEpaisseur=0pt,ESansSaut=false,VersSolution=false,AvecEntrainement=false,Small=false,Footnotesize=false,Scriptsize=false,AllDirect=false,AllPouce=false,Input=false}%Les deux derniers pour essayer de mettre tous les exercices d'un même fichier en mode Reponse, en mode Indice. Pas implanté, pas testé
\defKV[Boulot]{Colonnes=\setKV[Boulot]{CorrectionColonnes}}%
-\setKVdefault[Cours]{Couleur=Crimson,Theme=Trace écrite,NomExercice=Exercice}%
+\defKV[Boulot]{EColonnes=\setKV[Boulot]{EntrainementColonnes}}%
+\setKVdefault[Cours]{Couleur=Crimson,Theme=Trace \'ecrite,NomExercice=Exercice}%
\setKVdefault[DM]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname}%
\setKVdefault[DS]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false,Sujet=A}%
-\setKVdefault[Fiche]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,}%
-\setKVdefault[PdT]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
-\setKVdefault[FdR]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
-\setKVdefault[Parcours]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,Vertical=false}%
-\setKVdefault[Contrat]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
+\setKVdefault[Fiche]{Theme=Les nombres d\'ecimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,}%
+\setKVdefault[PdT]{Theme=Les nombres d\'ecimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
+\setKVdefault[FdR]{Theme=Les nombres d\'ecimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
+\setKVdefault[Parcours]{Theme=Les nombres d\'ecimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,Vertical=false,Plan=false,Court=false}%
+\setKVdefault[Contrat]{Theme=Les nombres d\'ecimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}%
+\setKVdefault[OlympiadesAPMEP]{Theme=Les nombres d\'ecimaux}%
\setKVdefault[ParcoursPerso]{Fichier={}}%
\setKVdefault[IE]{Nom=\'Evaluation,Sujets=false,Theme={},Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false}%
\defKV[IE]{Sujet=\setKV[IE]{Sujets}}%
-\setKVdefault[RecapBrevet]{Theme=Les nombres décimaux,Date=\today,Code={},NomExercice=Exercice}%
-\setKVdefault[Kholle]{Sujet=1,Numero=1,Date=15,Niveau=TSI-1,Code=\jobname,Lieu=Lycée
+\setKVdefault[RecapBrevet]{Theme=Les nombres d\'ecimaux,Date=\today,Code={},NomExercice=Exercice}%
+\setKVdefault[Kholle]{Sujet=1,Numero=1,Date=15,Niveau=TSI-1,Code=\jobname,Lieu=Lyc\'ee
du Hainaut (Valenciennes),NomEleve=Albert Einstein,CR=false}%
\setKVdefault[CAN]{Date=\today,Niveau=6,Duree=9,CoefQ=0.4,CoefR=0.35,CoefJ=0.1}%
-\setKVdefault[ClesExercices]{NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,TitreSol=false,NonUtilise=false,Profile=false,PasEntrainement=false}%
+\setKVdefault[ClesExercices]{NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,Grilles=false,Cinq=false,Huit=false,TitreSol=false,NonUtilise=false,Profile=false,AEntretenir=false,Fragile=false,AvecIndications=false,ACompleter=false,Aide=0,Score=0,EchelleSeyes=8,Ajout={},TitreCorrige=Corrigé de l'exercice}%
\defKV[ClesExercices]{TitreSolution=\setKV[ClesExercices]{TitreSol}}%
\defKV[ClesExercices]{Source=\setKV[ClesExercices]{AffichageSource}}%
\defKV[ClesExercices]{Titre=\setKV[ClesExercices]{AffichageTitre}}%
@@ -69,18 +84,28 @@
\defKV[ClesExercices]{Stop=\setKV[ClesExercices]{Stops}}%
\defKV[ClesExercices]{Lignes=\setKV[ClesExercices]{Ligne}}%
\defKV[ClesExercices]{Encart=\setKV[ClesExercices]{Cadres}}%
+\defKV[ClesExercices]{CinqCinq=\setKV[ClesExercices]{Grilles}\setKV[ClesExercices]{Cinq}}%
+\defKV[ClesExercices]{Seyes=\setKV[ClesExercices]{Grilles}\setKV[ClesExercices]{Huit}}%
\def\PfMTexteEncart{Indique ton travail ci-dessous.}%
-\setKVdefault[SchemaParcours]{Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=LightSteelBlue,Csv=false}%
+\setKVdefault[SchemaParcours]{Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=gray!70}%,Csv=false}%
\setKVdefault[SchemaContrat]{Ecart=7mm,Rayon=2.5mm}%
-\setKVdefault[SchemaFdR]{Ecart=7mm,Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=LightSteelBlue,Csv=false}%
+\setKVdefault[SchemaFdR]{Ecart=7mm,Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=gray!70}%,Csv=false}%
+% Commande pour retenir le nombre d'exercices par maquette.Utile seulement pour la clé AssembleCorrection
+\xdef\PfMRetiensLienExoMa{}%
+\xdef\PfMRetiensLienDefMa{}%
+% Commande pour passer des options à travers la clé Input. Elle remplace \input :)
+\NewDocumentCommand\Input{om}{%
+ \def\Relecture{\setKV[ClesExercices]{#1}}%
+ \input{#2}%
+ \def\Relecture{}%
+}%
% Sucres
\makeatletter%
\NewDocumentCommand\PfMDotfill{}{%
\leavevmode%
\cleaders\hb@xt@.44em{\hss\xleaders\hrule width0.33em\hss}\hfill%
\kern\z@}%
-
-%\makeatother%
+\makeatother%
%
\NewDocumentCommand\PfMpointilles{o}{%
\IfNoValueTF{#1}{\PfMDotfill}{\makebox[#1]{\PfMDotfill}}%
@@ -88,7 +113,15 @@
%
\NewDocumentCommand\PfMNbLignesRestantes{}{%
\edef\measurepage{\dimexpr\pagegoal-\pagetotal\relax}%
+ \edef\measurepagemax{\dimexpr\textheight\relax}%
+ % \edef\measurepage{\dimeval{\pagegoal-\pagetotal-\baselineskip}}%
\xdef\PfMResteLignes{\fpeval{trunc((\the\measurepage)/(\baselineskip),0)}}%
+ \xdef\PfMResteLignesMax{\fpeval{trunc((\the\measurepagemax)/(\baselineskip),0)}}%
+ \ifnum\PfMResteLignesMax<\PfMResteLignes\relax
+ \xdef\PfMResteLignes{\PfMResteLignesMax}
+ \fi
+ %\xdef\PfMResteLignes{\dimeval{trunc((\the\measurepage)/(\baselineskip),0)}}%
+ %Il reste \PfMResteLignes{} lignes alors que le nombre maximal de lignes sur une page est \PfMResteLignesMax{}.
}%
\NewDocumentCommand\PfMLignesFinales{}{%
@@ -123,28 +156,37 @@
\newlength\PfMLargeurJury%
\newlength\PfMEspaceAvantLignes%
\newlength\PfMEspaceApresLignes%
-\newlength\PfMLargeurComp
+\newlength\PfMLargeurComp%
\newlength\CRRHauteur%
\newlength\PfMEcartSupInterMots%
-\setlength{\CRRHauteur}{10cm}
+\newlength\PfMCoefcompetences%
+\def\PfMCoefCompetences{0.85}%
+\setlength{\CRRHauteur}{10cm}%
\setlength{\PfMHauteurAppreciation}{5cm}%
\setlength{\PfMHauteurRemarque}{5cm}%
-\setlength{\PfMEspaceAvantLignes}{1em}
-\setlength{\PfMEspaceApresLignes}{1em}
+\setlength{\PfMEspaceAvantLignes}{1em}%
+\setlength{\PfMEspaceApresLignes}{1em}%
\setlength{\PfMEcartSupInterMots}{1pt}%
+\setlength{\PfMCoefcompetences}{0.7\linewidth}%
% définition des compteurs
\newcounter{PfMMaquette}%Pour compter le nombres de "travaux"
\setcounter{PfMMaquette}{0}%
+\newcounter{PfMMaquetteSol}[PfMMaquette]%Pour compter le nombres de "travaux" dans les corrections
+\setcounter{PfMMaquetteSol}{0}%
\newcounter{PfMSection}%Pour le barème et ne pas faire obstruction à section
\setcounter{PfMSection}{0}%
\newcounter{PfMExo}[PfMMaquette]%Numéro des exercices
\setcounter{PfMExo}{0}%
-\newcounter{PfMExoSol}%Pour repérer les valeurs aléatoires construites automatiquement dans la solution
+%\newcounter{PfMExoSolAlea}%Pour repérer les valeurs aléatoires construites automatiquement dans la solution
+%\setcounter{PfMExoSolAlea}{0}%
+\newcounter{PfMExoSol}[PfMMaquette]%
\setcounter{PfMExoSol}{0}%
\newcounter{PfMExoEntrai}%Pour repérer les entrainements
\setcounter{PfMExoEntrai}{0}%
\newcounter{PfMCorrigeParcoursPerso}%affichage des solutions ou pas dans le cadre d'un parcours perso
\setcounter{PfMCorrigeParcoursPerso}{0}%
+\newcounter{PfMRetiensMapourPP}%Pour retenir le numéro de la maquette de référence pour les parcours perso
+\setcounter{PfMRetiensMapourPP}{0}%
\newcounter{PfMSOS}%Numéro des SOS dans les parcours fléchés
\setcounter{PfMSOS}{0}%
\newcounter{PfMAlea}%Pour repérer les valeurs aléatoires construites automatiquement
@@ -152,12 +194,17 @@
\newcounter{RetiensSol}%Pour l'affichage des solutions
\newcounter{RetiensRep}%Pour l'affichage des reponses.
\newcounter{RetiensInd}%Pour l'affichage des indices.
+\newcounter{RetiensIndic}%Pour l'affichage des indications.
+\newcounter{PfMRetiensQr}%Pour l'affichage des entrainements
\setcounter{RetiensSol}{0}%
\setcounter{RetiensRep}{0}%
\setcounter{RetiensInd}{0}%
+\setcounter{RetiensIndic}{0}%
+\setcounter{PfMRetiensQr}{0}%
\newcounter{PfMNbLogo}%Pour décaler les logos sur la ligne haute de tcolorbox
\setcounter{PfMNbLogo}{0}%
\newcount\Orientation%Pour le schéma des parcours
+\newcount\TotalParcoursTikz%Pour le total des exos à utiliser dans l'affichage des parcours tikz
\newcounter{PfMCNNumQ}%
\newcounter{Nbcolonnes}
@@ -166,6 +213,8 @@
\newif\ifPfMDeuxColonnes
\newif\ifPfMRectoVerso
+\newif\ifPfMRevision
+
\makeatletter
\if@twocolumn
\PfMDeuxColonnestrue
@@ -179,6 +228,11 @@
\else
\PfMRectoVersofalse
\fi
+\if@Revision
+ \PfMRevisiontrue
+\else
+ \PfMRevisionfalse
+\fi
\makeatother
% couleurs
@@ -228,6 +282,22 @@
\ifboolKV[Boulot]{CAN}{}{\end{tcolorbox}}%
}%
+\tcbset{%
+ indications/.style={
+ empty,
+ right=0pt,
+ left=0mm,
+ top=0pt,
+ bottom=0pt,
+ frame engine=path,
+ % colframe=Crimson!10,
+ frame hidden,
+ notitle,
+ sharp corners=west,
+ borderline west={3pt}{0pt}{black!50}
+ }
+}
+
%% Option french pour les mathématiques
% By CT
\NewDocumentCommand\TypoMathFrance{}{%
@@ -291,7 +361,7 @@
\NewDocumentCommand\RepartirEffectifTotal{mmm}{%
% #1 valeur de l'effectif total
% #2 nombre de valeurs à obtenir
- % #3 écart acceptable :) autour de la moyenen
+ % #3 écart acceptable :) autour de la moyenne
\xdef\PfCSLEffectifs{}%
\xdef\PfCValeurMoyenneTemp{\fpeval{floor(#1/#2)}}%
\xdef\PfCRetiensRETSomme{}%
@@ -405,7 +475,6 @@
\RenewDocumentCommand\ChoixAlea{s o m m m}{%
\IfBooleanTF{#1}{%
\stepcounter{PfMAlea}%
-% je sauvegarde la valeur \thePfMExo-\thePfMAlea
\IfNoValueTF{#2}{%
\expandafter\xdef\csname valeur\Roman{PfMExo}\roman{PfMAlea}\endcsname{\fpeval{randint(#3,#4)}}%
\expandafter\xdef\csname #5\endcsname{\csname valeur\Roman{PfMExo}\roman{PfMAlea}\endcsname}%
@@ -791,7 +860,8 @@
\setcounter{Melquestions}{0}%
\setsepchar{\item}\ignoreemptyitems%
\readlist*\ListeTest{#2}%
-% La liste des éléments retenus est \showitems*\ListeTest[]
+ \reademptyitems
+ % La liste des éléments retenus est \showitems*\ListeTest[]\par
\IfNoValueTF{#1}{%
\ChoixAleaMultiMix{\ListeTestlen}{1}{\ListeTestlen}{0}{\ListeShuffleA}%
\xdef\MelangeValeurTotale{\ListeTestlen}%
@@ -802,6 +872,8 @@
\ExporteListe{ListeShuffle}{\ListeShuffleA}%
\setsepchar{,}\ignoreemptyitems%
\readlist*\ListeNumQ{\ListeShuffleA}%
+ \reademptyitems
+ % L'ordre des questions est \ListeNumQ[]
\setcounter{Comptequestions}{1}%
\begin{enumerate}
\loop%
@@ -815,11 +887,15 @@
\NewDocumentEnvironment{Enumelangesol}{b}{%
\setcounter{Melquestions}{0}%
- \setsepchar{\item}%
+ \setsepchar{\item}\ignoreemptyitems%
\readlist*\ListeTest{#1}%
+ \reademptyitems
\RestoreListe{ListeShuffle}%
\setsepchar{,}\ignoreemptyitems%
\readlist*\ListeNumQ{\ListeShuffle}%
+ \reademptyitems
+% la liste des éléments retenus est \showitems*\ListeTest[]\par
+% L'ordre des questions est \ListeNumQ[]\par
\setcounter{Comptequestions}{1}%
\begin{enumerate}
\loop%
@@ -882,7 +958,7 @@
}
\def\buildtabcompetences{%
- \[\begin{tabular}{|p{0.70\linewidth}|*{3}{>{\centering\arraybackslash}p{0.05\linewidth}|}}
+ \[\begin{tabular}{|p{\PfMCoefcompetences}|*{3}{>{\centering\arraybackslash}p{0.05\linewidth}|}}
\cline{2-4}
\multicolumn{1}{c|}{}&\PfMCompNA&\PfMCompECA&\PfMCompA\\
\hline
@@ -892,7 +968,7 @@
}%
\def\Buildtabcompetences#1#2{%
- \setlength{\PfMLargeurComp}{\fpeval{0.85-0.05*#1}\linewidth-\fpeval{2*(#1-3)}\tabcolsep}%
+ \setlength{\PfMLargeurComp}{\fpeval{\PfMCoefCompetences-0.05*#1}\linewidth-\fpeval{2*(#1-3)}\tabcolsep}%
\[\begin{tabular}{|p{\PfMLargeurComp}|*{#1}{>{\centering\arraybackslash}p{0.05\linewidth}|}}%
\cline{2-\fpeval{1+#1}}%
\multicolumn{1}{c|}{}\xintFor* ##1 in{\xintSeq{1}{#1}}\do{%
@@ -914,7 +990,7 @@
\def\SolutionWrite{%
\setcounter{PfMAlea}{0}%
\@bsphack%
- \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.sol"%
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.sol"%
\let\do\@makeother\dospecials%
\catcode`\^^M\active%
\def\verbatim@processline{%
@@ -924,7 +1000,7 @@
\def\SolutionWritePP{%
\@bsphack
- \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.sol" %
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-PPEx\thePfMExo.sol" %
\let\do\@makeother\dospecials
\catcode`\^^M\active
\def\verbatim@processline{%
@@ -934,7 +1010,7 @@
\def\ReponseWrite{%
\@bsphack
- \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.rep" %
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.rep" %
\let\do\@makeother\dospecials
\catcode`\^^M\active
\def\verbatim@processline{%
@@ -944,7 +1020,7 @@
\def\IndiceWrite{%
\@bsphack
- \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.cdp" %coup de pouce
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.cdp" %coup de pouce
\let\do\@makeother\dospecials
\catcode`\^^M\active
\def\verbatim@processline{%
@@ -953,7 +1029,7 @@
\def\endIndiceWrite{\immediate\closeout\verbatim@out\@esphack}
\makeatother
-\def\SolutionNow{\textbf{Correction de l'exercice --}\par\nopagebreak\setcounter{PfMExoSol}{\thePfMExo}\setcounter{PfMAlea}{0}\PfMAffichageHideItemSolution}
+\def\SolutionNow{\textbf{\csname PfMTNomSol\Roman{PfMExo}\endcsname~--}\par\nopagebreak\setcounter{PfMExoSol}{\thePfMExo}\setcounter{PfMAlea}{0}\PfMAffichageHideItemSolution}%\setcounter{PfMExoSolAlea}{\thePfMExo}
\def\endSolutionNow{\par\goodbreak\PfMshowitems}
\def\ReponseNow{\textbf{Réponse(s) de l'exercice --}\par\nopagebreak\PfMAffichageHideItemSolution}
@@ -965,6 +1041,48 @@
\NewDocumentEnvironment{Solution}{}{}{}%
\NewDocumentEnvironment{Reponse}{}{}{}%
\NewDocumentEnvironment{Indice}{}{}{}%
+\NewDocumentEnvironment{PfMHide}{+b}{}{}%
+\NewDocumentEnvironment{PfMSeek}{+b}{#1}{}%
+
+\NewDocumentEnvironment{AideA}{+b}{%
+ \ifnum\fpeval{\useKV[ClesExercices]{Aide}}>0\relax%
+ \begin{PfMSeek}%
+ #1
+ \end{PfMSeek}%
+ \else%
+ \begin{PfMHide}%
+ #1
+ \end{PfMHide}
+ \fi%
+}{%
+}%
+
+\NewDocumentEnvironment{AideB}{+b}{%
+ \ifnum\fpeval{\useKV[ClesExercices]{Aide}}>1\relax%
+ \begin{PfMSeek}%
+ #1
+ \end{PfMSeek}
+ \else%
+ \begin{PfMHide}%
+ #1
+ \end{PfMHide}
+ \fi%
+}{%
+}%
+
+\NewDocumentEnvironment{Indications}{+b}{%
+ \ifnum\theRetiensIndic=1\relax%
+ \textbf{\PfMTexteDesIndications :}\par%
+ \else%
+ \begin{PfMHide}%
+ \fi%
+ #1
+}{%
+ \ifnum\theRetiensIndic=1\relax%
+ \else
+ \end{PfMHide}%
+ \fi%
+}%
\NewDocumentCommand\PfMChoixAffichageCorrection{}{%
\ifboolKV[Boulot]{CorrigeAll}{%
@@ -1050,28 +1168,76 @@
}%
}%
-\def\PfMTexteDuCorrige{Corrigé de l'exercice}
-\def\PfMTexteDeLEntrainement{Automatisme(s) lié(s) à l'exercice}
+\NewDocumentCommand\PfMChoixEntrainement{}{%
+ \setcounter{PfMRetiensQr}{0}%
+ \ifboolKV[ClesExercices]{AEntretenir}{\setcounter{PfMRetiensQr}{1}}{}%
+}%
+
+\NewDocumentCommand\PfMChoixAffichageEntrainement{}{%
+ \ifnum\thePfMRetiensQr=1\relax%
+ \let\Entrainement\EntrainementWrite\let\endEntrainement\endEntrainementWrite%
+ \else%
+ \let\Entrainement\comment\let\endEntrainement\endcomment
+ \fi%
+}%
+
+\def\PfMTexteDuCorrige{Corrigé de l'exercice}%
+\def\PfMTexteDeLEntrainement{Automatisme(s) lié(s) à l'exercice}%
+\def\PfMTexteDesIndications{Indications}%
\NewDocumentCommand\PfMAffichageCorrige{}{%
\ifboolKV[Boulot]{CAN}{%
\xintFor* ##1 in{\xintSeq{1}{\PfMCANTotalExo}}\do{%
\setcounter{PfMExoSol}{##1}%
\setcounter{PfMAlea}{0}%
- \IfFileExists{\jobname-Ex##1.sol}{\textbf{Question\ifnum\PfMCANTotalExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{TestCAN-##1}}:\fi}~\input{\jobname-Ex##1.sol}\par\goodbreak}{}%page-\thePfMMaquette-##1
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\textbf{Question\ifnum\PfMCANTotalExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{TestCAN-##1}}:\fi}~\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{}%
}%
}{%
\setcounter{PfMExoSol}{0}%
+ %\setcounter{PfMExoSolAlea}{0}%
\xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
- \refstepcounter{PfMExoSol}%{##1}%
- \label{pagesol-\thePfMMaquette-\thePfMExoSol}
+ \refstepcounter{PfMExoSol}%
+ %\stepcounter{PfMExoSolAlea}%
+ \label{pagesol-\thePfMMaquette-\thePfMExoSol}%
+ \setcounter{PfMAlea}{0}%
+ \def\PfMTexteDuCorrige{\csname PfMTNomSol\Roman{PfMExoSol}\endcsname}
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.rep}\par\goodbreak}{%
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.cdp}\par\goodbreak}{}%
+ }%
+ }%
+ \PfMshowitems%
+ }%
+ }%
+}%
+
+% Tous les corrigés
+\NewDocumentCommand\PfMAffichageTousCorriges{}{%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeNombreExoMq{\PfMRetiensLienExoMa}%
+ \reademptyitems%
+ \xintFor* ##2 in{\xintSeq{1}{\thePfMMaquette}}\do{%
+ \refstepcounter{PfMMaquetteSol}%
+ \setcounter{PfMExoSol}{0}%
+ %\setcounter{PfMExoSolAlea}{0}%
+ \ifPfMRectoVerso%
+ \cleardoublepage%
+ \else%
+ \clearpage%
+ \fi%
+ \input{\jobname-DefiMq-##2}
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \xintFor* ##1 in{\xintSeq{1}{\ListeNombreExoMq[##2]}}\do{%
+ \stepcounter{PfMExoSol}%
+ %\stepcounter{PfMExoSolAlea}%
+ \label{pagesol-\thePfMMaquetteSol-\thePfMExoSol}%
\setcounter{PfMAlea}{0}%
- \IfFileExists{\jobname-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ex##1.rep}\par\goodbreak}{%
- \IfFileExists{\jobname-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ex##1.cdp}\par\goodbreak}{}%
+ \IfFileExists{\jobname-Ma##2-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ma##2-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.rep}\par\goodbreak}{%
+ \IfFileExists{\jobname-Ma##2-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.cdp}\par\goodbreak}{}%
}%
}%
\PfMshowitems%
}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
}%
}%
@@ -1080,28 +1246,40 @@
\makeatletter
\def\EntrainementWrite{%
\@bsphack%
- \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.qrc"%
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.qrc"%
\let\do\@makeother\dospecials%
\catcode`\^^M\active%
\def\verbatim@processline{%
\immediate\write\verbatim@out{\the\verbatim@line}}%
\verbatim@start}%
\def\endEntrainementWrite{\immediate\closeout\verbatim@out\@esphack}%
-
-\let\Entrainement\EntrainementWrite\let\endEntrainement\endEntrainementWrite%
\makeatother
\NewDocumentCommand\PfMAffichageEntrainement{}{%
- \clearpage
+ \ifboolKV[Boulot]{ESansSaut}{\vfill}{%
+ \ifPfMDeuxColonnes
+ \newpage
+ \else
+ \ifPfMRectoVerso
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \fi
+ }%
\TikzAutomatismes
+ \setlength{\columnseprule}{\useKV[Boulot]{EEpaisseur}}%
+ \ifboolKV[Boulot]{EntrainementColonnes}{\begin{multicols}{\useKV[Boulot]{EColonnes}}}{}%
\setcounter{PfMExoEntrai}{0}%
\xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
\refstepcounter{PfMExoEntrai}%
- \IfFileExists{\jobname-Ex##1.qrc}{%
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.qrc}{%
\begin{center}
- \label{pageentrai-\thePfMMaquette-\thePfMExoEntrai}%
- \textbf{\PfMTexteDeLEntrainement\ifnum\thePfMExo=1\relax\else~\ref{page-\thePfMMaquette-##1}\fi}\par\nopagebreak\input{\jobname-Ex##1.qrc}\end{center}}{}%
+ \label{pageentrai-\thePfMMaquette-\thePfMExoEntrai}%
+ \textbf{\PfMTexteDeLEntrainement\ifnum\thePfMExo=1\relax\else~\ref{page-\thePfMMaquette-##1}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.qrc}\end{center}%
+ }{}%
}%
+ \ifboolKV[Boulot]{EntrainementColonnes}{\end{multicols}}{}%
}%
\NewDocumentCommand\TikzAutomatismes{}{%
@@ -1111,6 +1289,7 @@
\end{center}
\end{tcolorbox}%
}%
+
%%%%%%%% BAREME %%%%%%%%%%%
%% Bareme
\newlength{\brouillon}
@@ -1128,17 +1307,23 @@
\newcommand*\brm[1]{%
\ifboolKV[Boulot]{Fiche}{}{%
- \immediate\write\@auxout{%
- \string\opadd*{#1}%
- {total\the\c@PfMSection-\the\c@PfMExo}%
- {total\the\c@PfMSection-\the\c@PfMExo}%
- \string\opcopy{\thePfMExo}{TotalExo}%
+ \ifboolKV[Boulot]{FdR}{}{%
+ \ifboolKV[Boulot]{Contrat}{}{%
+ \ifboolKV[Boulot]{Parcours}{}{%
+ \immediate\write\@auxout{%
+ \string\opadd*{#1}%
+ {total\the\c@PfMSection-\the\c@PfMExo}%
+ {total\the\c@PfMSection-\the\c@PfMExo}%
+ \string\opcopy{\thePfMExo}{TotalExo}%
+ }%
+ \ifboolKV[ClesExercices]{BaremeDetaille}{%
+ \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}%
+ \makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}%
+ \ignorespaces%
+ }{}%
+ }%
+ }%
}%
- \ifboolKV[ClesExercices]{BaremeDetaille}{%
- \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}%
- \makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}%
- \ignorespaces%
- }{}%
}%
}%
@@ -1178,11 +1363,25 @@
\@ifundefined{Op@total#1}{recompilez}%
{%
\opunzero{total#1}% on ne sait jamais
- \opset{decimalsepsymbol={,}}
+ \opset{decimalsepsymbol={,}}%
\opprint{total#1}~%
- \opset{decimalsepsymbol={.}}
+ \opset{decimalsepsymbol={.}}%
+ \useKV[ClesExercices]{MotPoint}%
\opcmp{total#1}{2}%
- \ifopge \useKV[ClesExercices]{MotPoint}s\else \useKV[ClesExercices]{MotPoint}\fi
+ \ifopge s\fi%
+ }%
+}
+
+\newcommand\ScoreMaximal{%
+ \@ifundefined{Op@ScoreTotal\thePfMMaquette}{recompilez}%
+ {%
+ \opunzero{ScoreTotal\thePfMMaquette}% on ne sait jamais
+ \opset{decimalsepsymbol={,}}%
+ \opprint{ScoreTotal\thePfMMaquette}~%
+ \opset{decimalsepsymbol={.}}%
+ \useKV[ClesExercices]{MotPoint}%
+ \opcmp{ScoreTotal\thePfMMaquette}{2}%
+ \ifopge s\fi%
}%
}
@@ -1251,12 +1450,12 @@
\NewDocumentCommand{\PfMLienVersEntrainement}{}{%
\ifboolKV[Boulot]{AvecEntrainement}{%
- \ifboolKV[ClesExercices]{PasEntrainement}{}{%
+ \ifboolKV[ClesExercices]{AEntretenir}{%
\node[%
fill=tcbcolback,%
anchor=center,rotate=45%
] at ($(frame.north east)!0.75!(frame.south east)$){\hyperref[pageentrai-\thePfMMaquette-\thePfMExo]{\faDumbbell}};%
- }%
+ }{}%
}{}%
}%
@@ -1288,6 +1487,7 @@
colback=LightSteelBlue,
colbacklower=white,
frame hidden,
+ overlay=\useKV[ClesExercices]{Ajout}%
}%
}%
@@ -1300,6 +1500,7 @@
title=\ifboolKV[ClesExercices]{AffichageTitre}{\useKV[ClesExercices]{Titre}}{},%
coltitle=black,
frame hidden,
+ overlay=\useKV[ClesExercices]{Ajout}%
}
}
@@ -1307,7 +1508,6 @@
%%% Base des exercices DM
\tcbset{%
tikzdm/.style={%
- %lowerbox=ignored,
enhanced,
breakable,
colback=white,
@@ -1328,6 +1528,8 @@
},%
overlay unbroken and first={%
%
+ \useKV[ClesExercices]{Ajout}%
+ %
\PfMAffichageSource%
%
\ifboolKV[ClesExercices]{BaremeTotal}{%
@@ -1346,21 +1548,23 @@
}%
}%
-\NewDocumentEnvironment{exerciceDM}{so+b}{%
+\NewDocumentEnvironment{exerciceDM}{so}{%
\setcounter{PfMAlea}{0}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
- \refstepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\PfMChoixTitreSolution%
\immediate\write\@auxout{%
@@ -1376,12 +1580,11 @@
label=page-\thePfMMaquette-\thePfMExo,%
]%
\ifboolKV[Boulot]{Dys}{\raggedright}{}%
- #3
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{
\end{tcolorbox}%
\PfMApresLesExercices%
}%
@@ -1508,24 +1711,25 @@
\immediate\write\@auxout{\noexpand\expandafter\gdef\noexpand\csname \Roman{PfMMaquette}Contrat#1\endcsname{\csname \Roman{PfMMaquette}confiance#1\endcsname}}%
}%
-
-\NewDocumentEnvironment{exerciceContrat}{so+b}{%
+\NewDocumentEnvironment{exerciceContrat}{so}{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
- \refstepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\PfMChoixTitreSolution%
\immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-ContratTotalExo}}%
@@ -1546,18 +1750,16 @@
label=page-\thePfMMaquette-\thePfMExo
]
\ifboolKV[Boulot]{Dys}{\raggedright}{}%
- #3
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\end{tcolorbox}
\PfMApresLesExercices%
}%
}%
}%
-
%%% Contrat %%%
\tcbset{%
usercontrat/.style={%
@@ -1606,7 +1808,9 @@
anchor=west,
xshift=10pt,
] at (frame.north west){\bfseries\sffamily \useKV[Contrat]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}};
- %%
+ %%
+ \useKV[ClesExercices]{Ajout}%
+ %%
\PfMAffichageLogos%
%%
\PfMAffichageCompetencesTravaillees%
@@ -1799,7 +2003,7 @@
\xdef\RetiensLeDepart{0}%
\xdef\RetiensLesReponses{0}%
\xdef\RetiensNonAffichees{0}%
- \xdef\RetiensEtage{0}
+ \xdef\RetiensEtage{0}%
\xintFor* ##1 in{\xintSeq{1}{\ListeRouteHautelen}}\do{%
\xintifboolexpr{\ListeRouteHaute[##1]==0}{%
\xdef\RetiensEtage{\fpeval{\RetiensEtage+1}}%
@@ -1814,7 +2018,7 @@
\xintifboolexpr{\fpeval{\RetiensLesReponses-1}==\RetiensNonAffichees}{%
% %
}{%
- \xintFor* ##2 in{\xintSeq{\fpeval{\RetiensLeDepart+1}}{\fpeval{\RetiensLeDepart+\RetiensLesReponses}}}\do{
+ \xintFor* ##2 in{\xintSeq{\fpeval{\RetiensLeDepart+1}}{\fpeval{\RetiensLeDepart+\RetiensLesReponses}}}\do{%
\xintifboolexpr{\ListeRouteHaute[##2]<0}{%
\draw (B-##2) to (B-\fpeval{##2+1});%
}{%
@@ -1863,24 +2067,28 @@
\fi
\immediate\write\@auxout{\noexpand\expandafter\gdef\noexpand\csname \Roman{PfMMaquette}FdR#1\endcsname{\csname \Roman{PfMMaquette}route#1\endcsname}}%
}%
-
-\NewDocumentEnvironment{exerciceFdR}{so+b}{%
+
+\def\Relecture{}%
+
+\NewDocumentEnvironment{exerciceFdR}{so}{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
- \stepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\PfMChoixTitreSolution%
\immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-FdRTotalExo}}%
@@ -1914,11 +2122,10 @@
label=page-\thePfMMaquette-\thePfMExo
]
\ifboolKV[Boulot]{Dys}{\raggedright}{}%
- #3
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\end{tcolorbox}
\PfMApresLesExercices%
@@ -1945,7 +2152,7 @@
\string\opcopy{\thePfMExo}{TotalExo}%
}%
\@bsphack%
- \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.can"%
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.can"%
\let\do\@makeother\dospecials%
\catcode`\^^M\active%
\def\verbatim@processline{\immediate\write\verbatim@out{\the\verbatim@line}}%
@@ -1970,7 +2177,6 @@
\tcbset{%
usercan/.style={%
enhanced,
- % spread upwards=-1cm,colback=gray!5%
frame hidden,
colback=white,
middle=24pt,
@@ -2030,7 +2236,6 @@
\Large\sffamily Course aux nombres (Correction)
\end{center}
\hfill\useKV[CAN]{Niveau}%
- %\par{\tiny\useKV[CAN]{Code}}\hfill{\scriptsize\useKV[CAN]{Date}}%
\end{tcolorbox}%
}
%%% FdR %%%
@@ -2080,7 +2285,9 @@
anchor=west,
xshift=10pt,
] at (frame.north west){\bfseries\sffamily \useKV[FdR]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}};
- %%
+ %%
+ \useKV[ClesExercices]{Ajout}%
+ %%
\PfMAffichageLogos
%%
\PfMAffichageCompetencesTravaillees%
@@ -2112,19 +2319,33 @@
\reademptyitems%
\xdef\PfMFooTestA{\ListeExercicesPA[1]}%
\ifnum\ListeExercicesPAlen>1\relax%
- \xintFor* ##1 in{\xintSeq{2}{\ListeExercicesPAlen}}\do{%
- \xdef\PfMFooTestA{\PfMFooTestA,\ListeExercicesPA[##1]}%
- }%
+ \xintFor* ##1 in{\xintSeq{2}{\ListeExercicesPAlen}}\do{%
+ \xdef\PfMFooTestA{\PfMFooTestA,\ListeExercicesPA[##1]}%
+ }%
\fi%
- \ifboolKV[Parcours]{Vertical}{%
- \BuildParcoursTikzV{\ParcoursTotalExo}{\PfMFooTestA}%
+ \ifboolKV[Parcours]{Plan}{%
+ \BuildParcoursPlan{\ParcoursTotalExo}{\PfMFooTestA}%
}{%
- \BuildParcoursTikz{\ParcoursTotalExo}{\PfMFooTestA}%
+ \ifboolKV[Parcours]{Vertical}{%
+ \BuildParcoursTikzV{\ParcoursTotalExo}{\PfMFooTestA}%
+ }{%
+ \BuildParcoursTikz{\ParcoursTotalExo}{\PfMFooTestA}%
+ }%
}%
}%
}%
%\makeatother
+\NewDocumentCommand\BuildParcoursPlan{mm}{%
+ \setsepchar{,}%
+ \readlist*\ListeRetiens{#2}%
+ \begin{enumerate}
+ \foreachitem\compteur\in\ListeRetiens{%
+ \item[$\square$] Exercice \ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}%
+ }%
+ \end{enumerate}
+}%
+
\NewDocumentCommand\BuildParcoursTikzV{mm}{%
\setsepchar{,}%
\readlist*\ListeRetiens{#2}%
@@ -2155,8 +2376,13 @@
\begin{tikzpicture}[anchor=center,baseline=-1.25mm]
% On place les points
\Orientation=1\relax
+ \ifboolKV[Parcours]{Court}{%
+ \TotalParcoursTikz=\ListeRetienslen%
+ }{%
+ \TotalParcoursTikz=#1%
+ }%
\coordinate[anchor=base,baseline=-1.25mm] (A-1) at (0,0);%
- \xintFor* ##1 in{\xintSeq{2}{\fpeval{#1+1}}}\do{%
+ \xintFor* ##1 in{\xintSeq{2}{\fpeval{\the\TotalParcoursTikz+1}}}\do{%
\modulo{##1}{\useKV[SchemaParcours]{Colonnes}}%
\ifnum\remainder=0\relax%
\Orientation=\numexpr\Orientation*(-1)\relax%
@@ -2165,17 +2391,23 @@
\coordinate[xshift=\the\Orientation*\PfMLargeurSchemaParcours] (A-##1) at (A-\fpeval{##1-1});%
\fi%
}%
- \foreach\i in{2,...,#1}{%
- \draw[line width=1pt] (A-\fpeval{\i-1}) -- (A-\i);%
- }%
- %
- \draw[line width=1pt,>=latex,->] (A-#1)--(A-\fpeval{#1+1});
- %
- \xintFor* ##1 in{\xintSeq{1}{#1}}\do{%
- \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};%
+ \foreach\i in{1,...,\the\TotalParcoursTikz}{%
+ \draw[line width=1pt] (A-\i) -- (A-\fpeval{\i+1});%
}%
- \foreachitem\compteur\in\ListeRetiens{%
- \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};%
+% %
+ \draw[line width=1pt,>=latex,->] (A-\the\TotalParcoursTikz)--(A-\fpeval{\the\TotalParcoursTikz+1});
+% %
+ \ifboolKV[Parcours]{Court}{%
+ \foreachitem\compteur\in\ListeRetiens{%
+ \draw[fill=PfMCouleurSP](A-\compteurcnt) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};%
+ }%
+ }{%
+ \xintFor* ##1 in{\xintSeq{1}{\the\TotalParcoursTikz}}\do{%
+ \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};%
+ }%
+ \foreachitem\compteur\in\ListeRetiens{%
+ \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};%
+ }%
}%
\end{tikzpicture}%
}%
@@ -2195,7 +2427,7 @@
\stepcounter{PfMExo}%
\PfMChoixCorrection%
\@bsphack%
- \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.tex" %
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-PPEx\thePfMExo.tex" %
\immediate\write\verbatim@out{\string\begin{exercice}}
\let\do\@makeother\dospecials%
\catcode`\^^M\active%
@@ -2205,23 +2437,25 @@
\def\endexerciceParcoursPerso{\immediate\write\verbatim@out{\string\end{exercice}}\immediate\closeout\verbatim@out\@esphack}%
-\NewDocumentEnvironment{exerciceParcours}{so+b}{%
+\NewDocumentEnvironment{exerciceParcours}{so}{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
- \refstepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\PfMChoixTitreSolution%
\immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-ParcoursTotalExo}}%
@@ -2242,11 +2476,10 @@
label=page-\thePfMMaquette-\thePfMExo
]
\ifboolKV[Boulot]{Dys}{\raggedright}{}%
- #3
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\end{tcolorbox}
\PfMApresLesExercices%
@@ -2310,17 +2543,158 @@
}%
}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand\PfMScore{m}{%
+ \immediate\write\@auxout{%
+ \string\opadd*{#1}{ScoreTotal\thePfMMaquette}{ScoreTotal\thePfMMaquette}%
+ }%
+ \num{#1} pt\xintifboolexpr{#1>2 || #1==2}{s}{}%
+}%
+
+\def\PfMMPGrilleCode{%
+ PapierLargeur=floor(\mpdim{\linewidth}/(5mm));
+ color PapierCouleur;
+ PapierCouleur=0.8white;
+ %
+ vardef Papier(expr nb,score)=
+ path horizon,verticon;
+ horizon=(0,0)--(PapierLargeur*5mm,0);
+ verticon=(0,0)--(0,abs(nb)*5mm);
+ picture Papiers;
+ Papiers=image(
+ drawoptions(withcolor PapierCouleur);
+ for k=0 upto PapierLargeur:
+ draw verticon shifted((k*5mm,0));
+ endfor;
+ for k=0 upto abs(nb):
+ draw horizon shifted((0,k*5mm));
+ endfor;
+ drawoptions();
+ if nb<0:
+ path cc,cd,ce;
+ cd=(unitsquare xscaled (3*5mm) yscaled (abs(nb)*5mm)) shifted(5mm*(PapierLargeur-3,0));
+ ce=(unitsquare scaled (2*5mm)) shifted(5mm*(PapierLargeur-2.5,1));
+ cc=(unitsquare xscaled (6*5mm) yscaled (2*5mm)) shifted(5mm*(PapierLargeur-10,1));
+ fill cd withcolor PapierCouleur;
+ fill ce withcolor white;
+ fill cc withcolor white;
+ %drawoptions(withpen pencircle scaled 1);
+ draw ce;
+ draw cc;
+ draw cd;
+ draw polygone((0,0),(PapierLargeur*5mm,0),5mm*(PapierLargeur,abs(nb)),5mm*(0,abs(nb)));
+ if score>0:
+ label.bot(TEX("\PfMScore{"&decimal(score)&"}"),5mm*(PapierLargeur-1.5,1));
+ fi;
+ fi;
+ );
+ Papiers
+ enddef;
+}%
+
+\def\PfMPapierCinqCinq#1#2{%
+ \begin{center}
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}%
+ \PfMMPGrilleCode
+ trace Papier(#1,#2);
+ \end{mplibcode}%
+ \else%
+ \begin{mpost}[mpsettings={\PfMMPGrilleCode}]
+ trace Papier(#1,#2);
+ \end{mpost}%
+ \fi%
+ \end{center}
+}%
+
+\def\PfMMPSeyesCode{%
+ u:=\useKV[ClesExercices]{EchelleSeyes}*1mm;
+ PapierLargeur=floor(\mpdim{\linewidth}/(u));
+ color PapierCouleur;
+ PapierCouleur=0.8white;%\useKV[Papiers]{Couleur};
+ vardef Seyes(expr nb,score)=
+ path horizon,verticon;
+ horizon=(0,0)--u*(PapierLargeur,0);
+ verticon=(0,0)--u*(0,abs(nb));
+ picture PapierSeyes;
+ PapierSeyes=image(
+ drawoptions(withcolor PapierCouleur);
+ for k=0 upto (PapierLargeur):
+ draw verticon shifted((k*u,0));
+ endfor;
+ for k=0 step 0.25 until abs(nb):
+ draw horizon shifted((0,k*u)) withpen pencircle scaled 0.5;
+ endfor;
+ for k=0 upto abs(nb):
+ draw horizon shifted((0,k*u)) withpen pencircle scaled 1.25;
+ endfor;
+ drawoptions();
+ if nb<0:
+ path cc,cd,ce;
+ cd=(unitsquare xscaled (2*u) yscaled (abs(nb)*u)) shifted(u*(PapierLargeur-2,0));
+ ce=(unitsquare scaled (1*u)) shifted(u*(PapierLargeur-1.5,1));
+ cc=(unitsquare xscaled (4*u) yscaled (1*u)) shifted(u*(PapierLargeur-7,1));
+ fill cd withcolor PapierCouleur;
+ fill ce withcolor white;
+ fill cc withcolor white;
+ draw cc;
+ draw cd;
+ draw ce;
+ draw polygone((0,0),(PapierLargeur*u,0),u*(PapierLargeur,abs(nb)),u*(0,abs(nb)));
+ if score>0:
+ label.bot(TEX("\PfMScore{"&decimal(score)&"}"),u*(PapierLargeur-1,1));
+ fi;
+ fi;
+ );
+ PapierSeyes
+ enddef;
+}%
+
+\def\PfMPapierSeyes#1#2{%
+ \begin{center}
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}%
+ \PfMMPSeyesCode
+ trace Seyes(#1,#2);
+ \end{mplibcode}%
+ \else%
+ \begin{mpost}[mpsettings={\PfMMPSeyesCode}]%
+ trace Seyes(#1,#2);
+ \end{mpost}
+ \fi%
+ \end{center}
+}%
+
\NewDocumentCommand\PfMApresLesExercices{}{%
\ifboolKV[ClesExercices]{Ligne}{%
- % \vspace{\PfMEspaceAvantLignes}
- \PfMSetStretch\PfMLignespointilles{\useKV[ClesExercices]{Lignes}}%
+ \vspace*{\PfMEspaceAvantLignes}%
+ \PfMSetStretch\PfMLignespointilles{\useKV[ClesExercices]{Lignes}}%
\par\vspace*{\PfMEspaceApresLignes}\par%
}{}%
\par%
\ifboolKV[ClesExercices]{Cadres}{%
- \begin{PfMtcbEncart}%
- %
- \end{PfMtcbEncart}%
+ \begin{PfMtcbEncart}%
+ %
+ \end{PfMtcbEncart}%
+ }{}%
+ \ifboolKV[ClesExercices]{Grilles}{%
+ \ifboolKV[ClesExercices]{Cinq}{%
+ \PfMPapierCinqCinq{\useKV[ClesExercices]{CinqCinq}}{\useKV[ClesExercices]{Score}}%
+ }{}%
+ \ifboolKV[ClesExercices]{Huit}{%
+ \PfMPapierSeyes{\useKV[ClesExercices]{Seyes}}{\useKV[ClesExercices]{Score}}%
+ }{}%
+ }{}%
+ \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}%
+ \ifboolKV[ClesExercices]{ACompleter}{%
+ \IfHookExistsTF{env/center/begin}{\RemoveFromHook{env/center/begin}[*]}{}%
+ \IfHookExistsTF{env/center/end}{\RemoveFromHook{env/center/end}[*]}{}%
+ \IfHookExistsTF{env/itemize/begin}{\RemoveFromHook{env/itemize/begin}[*]}{}%
+ \IfHookExistsTF{env/itemize/end}{\RemoveFromHook{env/itemize/end}[*]}{}%
+ \IfHookExistsTF{env/description/begin}{\RemoveFromHook{env/description/begin}[*]}{}%
+ \IfHookExistsTF{env/description/end}{\RemoveFromHook{env/description/end}[*]}{}%
}{}%
}%
@@ -2329,7 +2703,7 @@
\expandafter\xdef\csname PfMEcrireTitreSol\endcsname{\csname PfMTSol\Roman{PfMExoSol}\endcsname}%
\ifx\bla\PfMEcrireTitreSol\bla%
\else
- \PfMEcrireTitreSol%
+ ~:~\PfMEcrireTitreSol%
\fi%
}%
@@ -2342,6 +2716,10 @@
}%
}%
+\NewDocumentCommand\PfMChoixNomCorrection{}{%
+ \expandafter\xdef\csname PfMTNomSol\Roman{PfMExo}\endcsname{\useKV[ClesExercices]{TitreCorrige}}
+}%
+
\NewDocumentCommand\PfMChoixHideItemSolution{}{%
\ifboolKV[ClesExercices]{Profile}{%
% J'ai un élève à profil : Je dois me souvenir que la correction doit être profilée. Le compteur PfMExo vaut \thePfMExo
@@ -2361,68 +2739,106 @@
\fi%
}%
-\newbox\PfMBoxSauvegarde%
+\NewDocumentCommand\PfMAvantLesExercices{}{%
+ \ifboolKV[ClesExercices]{AvecIndications}{\setcounter{RetiensIndic}{1}}{}%
+ \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}%
+ \refstepcounter{PfMSection}%
+ \PfMChoixCorrection%
+ \PfMChoixEntrainement%
+ \refstepcounter{PfMExo}%
+ \PfMChoixNomCorrection%
+ \ifboolKV[ClesExercices]{ACompleter}{%
+ \let\oldenumerate\enumerate%
+ \let\oldendenumerate\endenumerate%
+ \let\enumerate\autoenumerate%
+ \let\endenumerate\endautoenumerate%
+ \AddToHook{env/center/begin}[Bcenter]{\let\item\olditem}%
+ \AddToHook{env/center/end}[Ecenter]{\let\item\litem}%
+ \AddToHook{env/description/begin}[Bdescription]{\let\item\olditem}%
+ \AddToHook{env/description/end}[Edescription]{\let\item\litem}%
+ \AddToHook{env/itemize/begin}[Bitemize]{\let\item\olditem}%
+ \AddToHook{env/itemize/end}[Eitemize]{\let\item\litem}%
+ }{}%
+}%
-\NewDocumentEnvironment{exerciceFiche}{so+b}{%
+\NewDocumentEnvironment{exerciceFiche}{so}{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
- \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}%
\colorlet{ColExoFiche}{\useKV[ClesExercices]{Background}}%
\colorlet{PfMCadreFiche}{\useKV[ClesExercices]{Cadre}}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
- \refstepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
- \PfMChoixTitreSolution%
- \PfMChoixHideItemSolution%
- \begin{tcolorbox}[%
- tikzfiche,
- label is label,
- label=page-\thePfMMaquette-\thePfMExo
- ]
- \ifboolKV[Boulot]{Dys}{\raggedright}{}%
- %
- #3
+ \PfMChoixTitreSolution%
+ \PfMChoixHideItemSolution%
+ \begin{tcolorbox}[%
+ tikzfiche,
+ label is label,
+ label=page-\thePfMMaquette-\thePfMExo
+ ]
+ \ifboolKV[Boulot]{Dys}{\raggedright}{}%
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\ifboolKV[Boulot]{CorrigeSeul}{}{
\end{tcolorbox}%
- \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}%
+ % \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}%
\PfMApresLesExercices%
}%
}%
}%
+%\makeatletter
+\NewDocumentCommand\TikzOlympiadesAPMEPCor{m}{%
+ \ifPfMRectoVerso%
+ \cleardoublepage%
+ \else%
+ \clearpage%
+ \fi%
+ \setKV[OlympiadesAPMEP]{#1}%
+ \begin{tcolorbox}[colback=colLogo]
+ \begin{Dispo}*{\normalsize\logoapmep{\scale@logo}}
+ \Large\sffamily \useKV[OlympiadesAPMEP]{Theme}
+
+ (Correction)%
+ \end{Dispo}
+ \end{tcolorbox}%
+}%
+%\makeatother
+
\NewDocumentEnvironment{exerciceOlympiadesAPMEP}{so}{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
- \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}%
- \colorlet{ColExoFiche}{\useKV[ClesExercices]{Background}}%
- \colorlet{PfMCadreFiche}{\useKV[ClesExercices]{Cadre}}%
- \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
+ \PfMAvantLesExercices%
\refstepcounter{PfMSection}%
\PfMChoixCorrection%
\refstepcounter{PfMExo}%
@@ -2438,29 +2854,30 @@
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\end{tcolorbox}%
- \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}%
+ %\ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}%
\PfMApresLesExercices%
- }
+ }%
}%
-\NewDocumentEnvironment{exerciceDS}{so+b}{%
+\NewDocumentEnvironment{exerciceDS}{so}{%
\setcounter{PfMAlea}{0}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\ifboolKV[ClesExercices]{NonUtilise}{%
% Mettre la correction hors-jeu
\setKV[ClesExercices]{PasCorrige}%
\PfMChoixCorrection%
+ \begin{PfMHide}
}{%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
- \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}%
- \refstepcounter{PfMSection}%
- \PfMChoixCorrection%
- \refstepcounter{PfMExo}%
+ \PfMAvantLesExercices
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\PfMChoixTitreSolution%
\immediate\write\@auxout{%
@@ -2476,11 +2893,10 @@
label=page-\thePfMMaquette-\thePfMExo
]
\ifboolKV[Boulot]{Dys}{\raggedright}{}%
- #3
}%
}%
}{%
- \ifboolKV[ClesExercices]{NonUtilise}{}{%
+ \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{%
\ifboolKV[Boulot]{CorrigeSeul}{}{%
\end{tcolorbox}%
\PfMApresLesExercices%
@@ -2490,8 +2906,11 @@
\NewDocumentEnvironment{ExerciceRecapBrevet}{so}{%
\setcounter{PfMAlea}{0}%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#2}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\IfBooleanTF{#1}{%
\setKV[ClesExercices]{Numerote=false}%
}{}%
@@ -2518,6 +2937,7 @@
}%
\makeatother
+
%%% Recap Brevet
%%% Style Brevet
\tcbset{%
@@ -2575,6 +2995,7 @@
at (frame.north east)%
{\footnotesize\sffamily \total{\the\c@PfMSection-\the\c@PfMExo}};%
}{}%
+ \useKV[ClesExercices]{Ajout}%
}%
}%
}%
@@ -2608,6 +3029,8 @@
xshift=10pt,
] at (frame.north west){\bfseries\sffamily \useKV[PdT]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}};
}
+ %%
+ \useKV[ClesExercices]{Ajout}%
%%
\PfMAffichageLogos%
%
@@ -2655,8 +3078,11 @@
\newenvironment{exercicePdT}[1][]{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#1}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
\refstepcounter{PfMSection}%
\PfMChoixCorrection%
@@ -2704,6 +3130,17 @@
\end{tikzpicture}%
}%
+\NewDocumentCommand\CheminNeutre{m}{%
+ \setsepchar[*]{,*/}%
+ \readlist*\ListeCheminVrai{#1}%
+ \setsepchar{,}%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \foreachitem\compteur\in\ListeCheminVrai{%
+ \draw[cheminPdT] (\ListeCheminVrai[\compteurcnt,1]) to (\ListeCheminVrai[\compteurcnt,2]);%
+ }%
+ \end{tikzpicture}%
+}%
+
\NewDocumentCommand\CheminFaux{m}{%
\setsepchar[*]{,*/}%
\readlist*\ListeCheminVrai{#1}%
@@ -2785,8 +3222,11 @@
}%
\NewDocumentEnvironment{exerciceKholle}{o}{%
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]%
\setKV[ClesExercices]{#1}%
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}%
\PfMChoixCorrection%
\refstepcounter{PfMExo}%
@@ -2803,8 +3243,11 @@
\newenvironment{exerciceBase}[1][]{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]
\setKV[ClesExercices]{#1}
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}
\refstepcounter{PfMExo}
\tcolorbox[%
@@ -2816,8 +3259,11 @@
\newenvironment{exerciceBaseHTML}[1][]{%
\setcounter{PfMAlea}{0}%
\setcounter{PfMNbLogo}{1}
+ % Mettre les indications hors-jeu
+ \setcounter{RetiensIndic}{0}
\useKVdefault[ClesExercices]
\setKV[ClesExercices]{#1}
+ \ifboolKV[Boulot]{Input}{\Relecture}{}%
\setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}
\refstepcounter{PfMExo}
\tcolorbox[%
@@ -3056,6 +3502,8 @@
anchor=west,
xshift=\kvtcb@leftlower,
] at (frame.north west){\bfseries\sffamily\useKV[Fiche]{NomExercice}\ifboolKV[ClesExercices]{Numerote}{ \thePfMExo}{}\ifboolKV[ClesExercices]{AffichageTitre}{\ifboolKV[ClesExercices]{Numerote}{~:~}{\xdef\PfMTitiLgNE{\useKV[Fiche]{NomExercice}}\IfStrEq{\PfMTitiLgNE}{}{}{~:~}}\useKV[ClesExercices]{Titre}}{}};
+ %%
+ \useKV[ClesExercices]{Ajout}%
%%
\PfMAffichageLogos%
%
@@ -3083,14 +3531,16 @@
% colframe=PfMCadreFiche,
frame hidden,
overlay unbroken and first={%
- \draw[colLogo,line width=1pt] ([yshift=-10pt]frame.north west)--([yshift=-10pt]frame.north east);
+ \draw[colLogo,line width=1pt] ([yshift=-12pt]frame.north west)--([yshift=-12pt]frame.north east);
\node[%
name=A,
fill=ColExoFiche,
anchor=west,
xshift=\kvtcb@leftlower,
] at (frame.north west){\color{colLogo}\resizebox{1em}{!}{\carreEntoure{}}~\Large\bfseries\sffamily\useKV[Fiche]{NomExercice}\ifboolKV[ClesExercices]{Numerote}{ \thePfMExo}{}\ifboolKV[ClesExercices]{AffichageTitre}{\ifboolKV[ClesExercices]{Numerote}{.~}{\xdef\PfMTitiLgNE{\useKV[Fiche]{NomExercice}}\IfStrEq{\PfMTitiLgNE}{}{}{.~}}\useKV[ClesExercices]{Titre}}{}};
- %%
+ %%
+ \useKV[ClesExercices]{Ajout}%
+ %%
\PfMAffichageLogos%
%
\PfMAffichageCompetencesTravaillees%
@@ -3149,7 +3599,9 @@
anchor=west,
xshift=10pt,
] at (frame.north west){\bfseries\sffamily \useKV[Parcours]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}};
- %%
+ %%
+ \useKV[ClesExercices]{Ajout}%
+ %%
\PfMAffichageLogos%
%%
\PfMAffichageCompetencesTravaillees%
@@ -3230,6 +3682,8 @@
title=Exercice\ifboolKV[ClesExercices]{Numerote}{ \thePfMExo}{}\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{},
overlay unbroken and first={%
%
+ \useKV[ClesExercices]{Ajout}%
+ %
\PfMAffichageSource%
%
\ifboolKV[ClesExercices]{BaremeTotal}{%
@@ -3274,7 +3728,7 @@
\clearpage
\begin{minipage}{0.6\linewidth}
\begin{tcolorbox}[userie]%
- \sffamily \useKV[IE]{Nom} \useKV[IE]{Numero} : \useKV[IE]{Theme} \ifboolKV[IE]{Sujets}{\scriptsize(Sujet \useKV[IE]{Sujet})}{}
+ \sffamily \useKV[IE]{Nom} \useKV[IE]{Numero} : \useKV[IE]{Theme} \ifboolKV[IE]{Sujets}{{\scriptsize(Sujet \useKV[IE]{Sujet})}}{}
\vspace{1em}
\par{\tiny\useKV[IE]{Code}}\hfill{\scriptsize\useKV[IE]{Date}}
\end{tcolorbox}%
@@ -3299,42 +3753,39 @@
\end{tcolorbox}%
}%
-\NewDocumentCommand\Recapitulatif{mm}{%
- \setKV[Boulot]{#1}%
- \DTLforeach*{dataperso}{\Prenom=PrenomEleve,\Nom=NomEleve,\RecapListeExo=ListeExo}{%
- \ifboolKV[Boulot]{Dys}{%
- \begin{Maquette}[Fiche,Dys]{#2,Code=\normalsize\Prenom~\Nom}%
- }{%
- \begin{Maquette}[Fiche]{#2,Code=\normalsize\Prenom~\Nom}%
- }%
+\NewDocumentCommand\PfMRecapitulatif{mm}{%
+ \setKV[Boulot]{#1}%
+ \setcounter{PfMRetiensMapourPP}{\thePfMMaquette}%
+ \DTLforeach*{dataperso}{\Prenom=PrenomEleve,\Nom=NomEleve,\RecapListeExo=ListeExo}{%
+ \ifboolKV[Boulot]{Dys}{%
+ \begin{Maquette}[Fiche,Dys]{#2,Code=\normalsize\Prenom~\Nom}%
+ }{%
+ \begin{Maquette}[Fiche]{#2,Code=\normalsize\Prenom~\Nom}%
+ }%
+ \readlist*\ListeExercices{\RecapListeExo}%
+ \ifnum\fpeval{\ListeExerciceslen}=1\relax{}
+ \setKVdefault[ClesExercices]{Numerote=false}
+ \input{\jobname-Ma\thePfMRetiensMapourPP-PPEx\ListeExercices[1].tex}%
+ \setKVdefault[ClesExercices]{Numerote}
+ \else
+ \foreach\i in{1,...,\ListeExerciceslen}{%
+ \input{\jobname-Ma\thePfMRetiensMapourPP-PPEx\ListeExercices[\i].tex}%
+ }
+ \fi
+ \ifnum\thePfMCorrigeParcoursPerso=1\relax%
+ % \RecapitulatifCorrection{#2}%
+ \clearpage
+ \TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}%
\readlist*\ListeExercices{\RecapListeExo}%
\ifnum\fpeval{\ListeExerciceslen}=1\relax{}
- \setKVdefault[ClesExercices]{Numerote=false}
-% \begin{exercice}*
- \input{\jobname-PPEx\ListeExercices[1].tex}%
- % \end{exercice}%
- \setKVdefault[ClesExercices]{Numerote}
+ \textbf{Corrigé de l'exercice} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[1].sol}\par\goodbreak%
\else
\foreach\i in{1,...,\ListeExerciceslen}{%
- % \begin{exercice}
- \input{\jobname-PPEx\ListeExercices[\i].tex}%
- % \end{exercice}%
- }
- \fi
- \ifnum\thePfMCorrigeParcoursPerso=1\relax%
- % \RecapitulatifCorrection{#2}%
- \clearpage
- \TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}%
- \readlist*\ListeExercices{\RecapListeExo}%
- \ifnum\fpeval{\ListeExerciceslen}=1\relax{}
- \textbf{Corrigé de l'exercice} : \input{\jobname-PPEx\ListeExercices[1].sol}\par\goodbreak%
- \else
- \foreach\i in{1,...,\ListeExerciceslen}{%
- \textbf{Corrigé de l'exercice \i} : \input{\jobname-PPEx\ListeExercices[\i].sol}\par\goodbreak%
- }%
- \fi%
+ \textbf{Corrigé de l'exercice \i} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[\i].sol}\par\goodbreak%
+ }%
\fi%
- \end{Maquette}%
+ \fi%
+ \end{Maquette}%
}%
}%
@@ -3344,7 +3795,7 @@
\TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}%
\readlist*\ListeExercices{\RecapListeExo}%
\foreach\i in{1,...,\ListeExerciceslen}{%
- \IfFileExists{\jobname-PPEx\ListeExercices[\i].sol}{\textbf{Corrigé de l'exercice \i} : \input{\jobname-PPEx\ListeExercices[\i].sol}\par\goodbreak}{}%
+ \IfFileExists{\jobname-PPEx\ListeExercices[\i].sol}{\textbf{Corrigé de l'exercice \i} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[\i].sol}\par\goodbreak}{}%
}%
}%
}%
@@ -3363,14 +3814,6 @@
}{%
\ifnum\thePfMMaquette=1\relax%
\else%
- %\ifnum\PfMFontSize=0\relax%
- % \fontsize{10}{\fpeval{1.2*10}}%
- %\else\ifnum\PfMFontSize=1\relax%
- % \fontsize{11}{\fpeval{1.2*11}}%
- % \else%
- % \fontsize{12}{\fpeval{1.2*12}}%
- % \fi%
- %\fi%
\fontsize{\fpeval{10+\PfMFontSize}}{\fpeval{1.2*(10+\PfMFontSize)}}%
\selectfont%
\renewcommand{\JustifyingParindent}{\parindent}
@@ -3395,9 +3838,17 @@
}%
%% Pour factoriser l'appel aux corrections dans l'environnement Maquette
+\makeatletter
\NewDocumentCommand\PfMPrepareCorrection{m}{%
\useKVdefault[Boulot]%
\setKV[Boulot]{#1}%
+ \if@CAN
+ \ifnum\thepage<5\relax
+ \xintFor* ##1 in{\xintSeq{1}{\fpeval{5-\thepage}}}\do{%
+ ~\clearpage%
+ }%
+ \fi%
+ \fi%
\if@Dyslexie%
\setKV[Boulot]{Dys}%
\fi%
@@ -3405,6 +3856,7 @@
\setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
\PfMChangerTailleCorrection%
}%
+\makeatother
\NewDocumentCommand\PfMAffichageCorrectionColonnes{}{%
\ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
@@ -3418,9 +3870,95 @@
\ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
}%
+% GameBook
+\tcbset{%
+ userlivreheros/.style={%
+ spread upwards=-1cm,colback=Ivory,colframe=black!25!Ivory%
+ }%
+}%
+
+\setKVdefault[LivreHeros]{Theme=Les nombres d\'ecimaux}
+
+\NewDocumentCommand\vaen{m}{\ref{#1}}%
+
+\NewDocumentCommand\TikzLivreHeros{}{%
+ \begin{tcolorbox}[userlivreheros]%
+ \begin{center}
+ \Large\sffamily \useKV[LivreHeros]{Theme}
+ \end{center}
+ \end{tcolorbox}%
+}%
+
+\tcbset{%
+ tikzLH/.style={%
+ before skip=1em,
+ enhanced,
+ coltitle=black,
+ colbacktitle=black!10!Ivory,
+ colframe=white,
+ colback=white,
+ attach boxed title to top center={yshift=-2mm},
+ label is label
+ }%
+}%
+
+\newcounter{PfMGameBook}[PfMMaquette]
+\setcounter{PfMGameBook}{0}
+
+\makeatletter
+\def\ExoGBWrite{%
+ \setcounter{PfMAlea}{0}%
+ \PfMChoixCorrection%
+ \stepcounter{PfMExo}%
+ \immediate\write\@auxout{%
+ \string\opcopy{\thePfMExo}{TotalExo}%
+ }%
+ \@bsphack%
+ \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.gb"%
+ \let\do\@makeother\dospecials%
+ \catcode`\^^M\active%
+ \def\verbatim@processline{\immediate\write\verbatim@out{\the\verbatim@line}}%
+ \verbatim@start}%
+\def\endExoGBWrite{\immediate\closeout\verbatim@out\@esphack}%
+\makeatother
+%%%%
+
%%%%%%%%%%%%%%% Debut Maquette %%%%%%%
% Environnement englobant le tout.
\makeatletter
+\newwrite\PfMfile@out%
+
+\IfClassLoadedTF{beamer}{%
+ %-> tex.stackexchange.com/questions/605282/beamer-custom-frame-environment-with-options
+ \NewDocumentEnvironment{Maquette}{om}{%
+ \setcounter{RetiensSol}{0}%
+ \setcounter{RetiensRep}{0}%
+ \setcounter{RetiensInd}{0}%
+ % on remet à zéro le compteur des exercices
+ %\setcounter{PfMExo}{0}%
+ \setcounter{PfMSOS}{0}%
+ % nouvelles valeurs.
+ \stepcounter{PfMMaquette}%
+ \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}%
+ \useKVdefault[FdR]%
+ \setKV[FdR]{#1}%
+ \let\exercice\exerciceBeamer\let\endexercice\endexerciceBeamer%
+ \begin{frame}[environment=Maquette,fragile]
+ \setcounter{PfMExo}{10}%
+ \PfCGraineAlea{\useKV[Boulot]{Graine}}%
+ \frametitle{\useKV[FdR]{Theme}\hfill\raisebox{-0.25\height}{\mplibforcehmode\begin{mplibcode}
+ labeloffset:=1pt;
+ fill cercle((0,0),4mm) withcolor white;
+ trace cercle((0,0),4mm) withcolor \mpcolor{Evidence!50};
+ drawoptions(withcolor 0.5white);
+ label.top(TEX("\tiny alea\TeX"),(0,0));
+ drawoptions(withcolor \mpcolor{Evidence});
+ label.bot(TEX("\tiny SL \& CP$^2$"),(0,0));
+ \end{mplibcode}}~\phantom{t}}
+ }{%
+ \end{frame}
+ }
+}{
\NewDocumentEnvironment{Maquette}{om}{%
% on remet à zéro les compteurs de solutions : inutile ?
\setcounter{RetiensSol}{0}%
@@ -3431,43 +3969,58 @@
\setcounter{PfMSOS}{0}%
% nouvelles valeurs.
\stepcounter{PfMMaquette}%
+ \immediate\write\@auxout{%
+ \string\opcopy{0}{ScoreTotal\thePfMMaquette}
+ }%
+ %%\opadd*{#1}{ScoreTotal\thePfMMaquette}{ScoreTotal\thePfMMaquette}%
+ \if@AssembleCorrections
+ \immediate\openout\PfMfile@out \jobname-DefiMq-\thePfMMaquette.tex%
+ \immediate\write\PfMfile@out{\unexpanded{\useKVdefault[Boulot]}}%
+ \immediate\write\PfMfile@out{\unexpanded{\setKV[Boulot]{#1}}}%
+ \immediate\write\PfMfile@out{\TikzFicheCor{\unexpanded{#2}}}%
+ \immediate\closeout\PfMfile@out%
+ \fi
% options de boulot
\IfHookExistsTF{env/Maquette/after}{\RemoveFromHook{env/Maquette/after}[*]}{}%
- %\IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]}{}%
- % \AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}%
+ \AddToHook{env/Maquette/after}[RetiensExo]{\xdef\PfMRetiensLienExoMa{\PfMRetiensLienExoMa,\thePfMExo}}
+ %--------------
\useKVdefault[Boulot]%
\setKV[Boulot]{#1}%
\ifboolKV[Boulot]{CorrigeSeul}{\setKV[Boulot]{CorrigeFin}}{}%
- \if@Dyslexie
- \setKV[Boulot]{Dys}
- \fi
+ \if@Dyslexie%
+ \setKV[Boulot]{Dys}%
+ \fi%
\PfMBasculeDys%
- \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}%
+ \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}%
% Test
\IfHookExistsTF{env/exercice/begin}{\RemoveFromHook{env/exercice/begin}[*]}{}%
\IfHookExistsTF{env/Maquette/end}{\RemoveFromHook{env/Maquette/end}[*]}{}%
+% \ifboolKV[Boulot]{Diaporama}{%
+% }{%
\ifboolKV[Boulot]{OlympiadesAPMEP}{%
- \setKV[OlympiadesAPMEP]{#2}%\TikzOlympiadesAPMEP%
- \let\exercice\exerciceOlympiadesAPMEP\let\endexercice\endexerciceOlympiadesAPMEP%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \PfMAffichageCorrectionColonnes%
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{CAN}{%
+ % \input{PfMMaquetteOlympAPMEP}%
+ \setKV[OlympiadesAPMEP]{#2}%\TikzOlympiadesAPMEP%
+ \let\exercice\exerciceOlympiadesAPMEP\let\endexercice\endexerciceOlympiadesAPMEP%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzOlympiadesAPMEPCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{CAN}{%
+ % \input{PfMMaquetteCAN.tex}
\setKV[CAN]{#2}%
- %\ifboolKV[Boulot]{CorrigeSeul}{}{\TikzCAN}%
\setcounter{PfMCNNumQ}{0}%
\setlength{\PfMLargeurQuestion}{\useKV[CAN]{CoefQ}\linewidth}\setlength{\PfMLargeurReponse}{\useKV[CAN]{CoefR}\linewidth}\setlength{\PfMLargeurJury}{\useKV[CAN]{CoefJ}\linewidth}%
\let\exercice\ExoCANWrite\let\endexercice\endExoCANWrite%
\AddToHook{env/exercice/begin}{\setcounter{PfMAlea}{0}}%
\AddToHook{env/Maquette/end}{%
- \xdef\PfMAncienneGraine{\PfMChoisisGraineAlea{123456789}}
+ \xdef\PfMAncienneGraine{\PfMChoisisGraineAlea{123456789}}%
\xdef\PfMCANTotalExo{\thePfMExo}%
\setbox\PfMSauvegardeBox\vbox{%
- \PfMGraineAlea{\thePfMMaquette}
+ \PfMGraineAlea{\thePfMMaquette}%
\setcounter{PfMExo}{0}%
\renewcommand{\arraystretch}{2}%
\begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
@@ -3476,21 +4029,21 @@
\hline%
\endhead%
\xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{%
- \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\
+ \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\
\hline%
}%
\end{longtable}%
\renewcommand{\arraystretch}{1}%
- }
+ }%
\ifboolKV[Boulot]{CorrigeInverse}{%
- \PfMPrepareCorrection{#1}%
- \TikzCANCor{#2}%
- \PfMAffichageCorrectionColonnes%
- \clearpage
- \normalsize%
- \TikzCAN%
- \PfMGraineAlea{\thePfMMaquette}%
- \setcounter{PfMCNNumQ}{0}%
+ \PfMPrepareCorrection{#1}%
+ \TikzCANCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ \clearpage
+ \normalsize%
+ \TikzCAN%
+ \PfMGraineAlea{\thePfMMaquette}%
+ \setcounter{PfMCNNumQ}{0}%
\setcounter{PfMExo}{0}%
\renewcommand{\arraystretch}{2}%
\begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
@@ -3499,7 +4052,7 @@
\hline%
\endhead%
\xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{%
- \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\
+ \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\
\hline%
}%
\end{longtable}%
@@ -3508,7 +4061,7 @@
\PfMGraineAlea{\PfMAncienneGraine}%
\TikzCAN%
\setcounter{PfMCNNumQ}{0}%
- \setcounter{PfMExo}{0}%
+ \setcounter{PfMExo}{0}%
\renewcommand{\arraystretch}{2}%
\begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}%
\hhline{~---}%
@@ -3516,233 +4069,279 @@
\hline%
\endhead%
\xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{%
- \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\
+ \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\
\hline%
}%
\end{longtable}%
\renewcommand{\arraystretch}{1}%
- \ifboolKV[Boulot]{CorrigeFin}{\ifboolKV[Boulot]{CorrigeInverse}{}{\clearpage
- \PfMPrepareCorrection{#1}%
- \TikzCANCor{#2}%
- \PfMAffichageCorrectionColonnes%
- }
- }{}
- }
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \ifboolKV[Boulot]{CorrigeInverse}{}{%
+ \clearpage
+ \PfMPrepareCorrection{#1}%
+ \TikzCANCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
+ }{}%
+ }%
}%
}{%
\ifboolKV[Boulot]{FdR}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[FdR]{#2}\TikzFdR%
- }
- \let\exercice\exerciceFdR\let\endexercice\endexerciceFdR%
- \ifboolKV[Boulot]{AvecEntrainement}{%
- \AddToHook{env/Maquette/end}[Haltere]{%
- \PfMAffichageEntrainementColonnes%
- }%
- }{}%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzFdRCor{#2}%
- \PfMAffichageCorrectionColonnes
+ % \input{PfMMaquetteFdR.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[FdR]{#2}\TikzFdR%
}%
- }{}%
- }{%
- \ifboolKV[Boulot]{Contrat}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[Contrat]{#2}\TikzContrat%
- }
- \let\exercice\exerciceContrat\let\endexercice\endexerciceContrat%
- \ifboolKV[Boulot]{AvecEntrainement}{%
- \AddToHook{env/Maquette/end}[Haltere]{%
- \PfMAffichageEntrainementColonnes%
- }%
- }{}%
- \ifboolKV[Boulot]{CorrigeFin}{%
+ \let\exercice\exerciceFdR\let\endexercice\endexerciceFdR%
+ \ifboolKV[Boulot]{AvecEntrainement}{%
+ \AddToHook{env/Maquette/end}[Haltere]{%
+ \PfMAffichageEntrainementColonnes%
+ }%
+ }{}%
+ \ifboolKV[Boulot]{CorrigeFin}{%
\AddToHook{env/Maquette/after}[Correction]{%
\PfMPrepareCorrection{#1}%
- \TikzContratCor{#2}%
- \PfMAffichageCorrectionColonnes%
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{Cours}{%
- \setKV[Cours]{#2}%
- \TikzCours%
- \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzFicheCor{#2}%
- \PfMAffichageCorrectionColonnes
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{RecapBrevet}{%
- \setKV[RecapBrevet]{#2}%
- \TikzRecapBrevet%
- \let\exercice\ExerciceRecapBrevet\let\endexercice\endExerciceRecapBrevet%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzRecapBrevetCor{#2}%
- \PfMAffichageCorrectionColonnes%
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{ParcoursPerso}{%
- \setKV[ParcoursPerso]{#2}%
- \DTLloaddb[noheader,keys={PrenomEleve,NomEleve,ListeExo}]{dataperso}{\useKV[ParcoursPerso]{Fichier}.csv}%
- \let\exercice\exerciceParcoursPerso\let\endexercice\endexerciceParcoursPerso%
- \ifboolKV[Boulot]{CorrigeFin}{\setcounter{PfMCorrigeParcoursPerso}{1}}{}%
- \setcounter{PfMExo}{0}%
- \AtEndDocument{%
- \Recapitulatif{#1}{#2}%
- }%
- }{%
- \ifboolKV[Boulot]{Parcours}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[Parcours]{#2}\TikzParcours%
- }
- \let\exercice\exerciceParcours\let\endexercice\endexerciceParcours%
- \ifboolKV[Boulot]{AvecEntrainement}{%
- \AddToHook{env/Maquette/end}[Haltere]{%
- \PfMAffichageEntrainementColonnes%
- }%
- }{}%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzParcoursCor{#2}
- \PfMAffichageCorrectionColonnes
- }%
+ \TikzFdRCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
}{}%
}{%
- \ifboolKV[Boulot]{PdT}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[PdT]{#2}\TikzPdT%
- }
- \let\exercice\exercicePdT\let\endexercice\endexercicePdT%
+ \ifboolKV[Boulot]{Contrat}{%
+ % \input{PfMMaquetteContrat.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[Contrat]{#2}\TikzContrat%
+ }%
+ \let\exercice\exerciceContrat\let\endexercice\endexerciceContrat%
+ \ifboolKV[Boulot]{AvecEntrainement}{%
+ \AddToHook{env/Maquette/end}[Haltere]{%
+ \PfMAffichageEntrainementColonnes%
+ }%
+ }{}%
\ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzPdTCor{#2}%
- \PfMAffichageCorrectionColonnes%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzContratCor{#2}%
+ \PfMAffichageCorrectionColonnes%
}%
}{}%
}{%
- \ifboolKV[Boulot]{DM}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[DM]{#2}\TikzDM%
- }
- \let\exercice\exerciceDM\let\endexercice\endexerciceDM%
+ \ifboolKV[Boulot]{Cours}{%
+ % \input{PfMMaquetteCours.tex}%
+ \setKV[Cours]{#2}%
+ \TikzCours%
+ \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche%
\ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzDMCor{#2}%
- \PfMAffichageCorrectionColonnes%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzFicheCor{#2}%
+ \PfMAffichageCorrectionColonnes%
}%
}{}%
}{%
- \ifboolKV[Boulot]{Fiche}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[Fiche]{#2}%
- \TikzFiche%
+ \ifboolKV[Boulot]{RecapBrevet}{%
+ % \input{PfMMaquetteRecapBrevet.tex}%
+ \setKV[RecapBrevet]{#2}%
+ \TikzRecapBrevet%
+ \let\exercice\ExerciceRecapBrevet\let\endexercice\endExerciceRecapBrevet%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzRecapBrevetCor{#2}%
+ \PfMAffichageCorrectionColonnes%
}%
- \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche%
- \ifboolKV[Boulot]{AvecEntrainement}{%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{ParcoursPerso}{%
+ % \input{PfMMaquetteParcoursPerso.tex}%
+ \setKV[ParcoursPerso]{#2}%
+ \DTLloaddb[noheader,keys={PrenomEleve,NomEleve,ListeExo}]{dataperso}{\useKV[ParcoursPerso]{Fichier}.csv}%
+ \let\exercice\exerciceParcoursPerso\let\endexercice\endexerciceParcoursPerso%
+ \ifboolKV[Boulot]{CorrigeFin}{\setcounter{PfMCorrigeParcoursPerso}{1}}{}%
+ \setcounter{PfMExo}{0}%
+ \AtEndDocument{%
+ \PfMRecapitulatif{#1}{#2}%
+ }%
+ }{%
+ \ifboolKV[Boulot]{Parcours}{%
+ % \input{PfMMaquetteParcours.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[Parcours]{#2}\TikzParcours%
+ }%
+ \let\exercice\exerciceParcours\let\endexercice\endexerciceParcours%
+ \ifboolKV[Boulot]{AvecEntrainement}{%
\AddToHook{env/Maquette/end}[Haltere]{%
\PfMAffichageEntrainementColonnes%
}%
}{}%
- \ifboolKV[Boulot]{CorrigeFin}{%
- \ifboolKV[Boulot]{CorrigeAll}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}%
- \TikzFicheCor{#2}%
- \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
- \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
- \IfFileExists{\jobname-Ex##1.sol}{\textbf{Corrigé de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.sol}\par\goodbreak}{}%
- }%
- \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
- \TikzFicheCorRep{#2}%
- \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
- \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
- \IfFileExists{\jobname-Ex##1.rep}{\textbf{Réponse(s) de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.rep}\par\goodbreak}{}%
- }%
- \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
- \TikzFicheCorInd{#2}%
- \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
- \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
- \IfFileExists{\jobname-Ex##1.cdp}{\textbf{Indice(s) pour l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.cdp}\par\goodbreak}{}%
- }%
- \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
- }%
- }{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \useKVdefault[Boulot]%
- \setKV[Boulot]{#1}%
- %%
- \if@Dyslexie
- \setKV[Boulot]{Dys}
- \fi
- \PfMBasculeDys%
- \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
- \TikzFicheCor{#2}%
- \PfMChangerTailleCorrection%
- \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
- \PfMAffichageCorrige%
- \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
- }%
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{DS}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[DS]{#2}\TikzDS%
- }%
- \let\exercice\exerciceDS\let\endexercice\endexerciceDS%
- \ifboolKV[Boulot]{BaremeComplet}{%
- \begin{center}
- \TableauRecapitulatif
- \end{center}
- }{}%
- \ifboolKV[Boulot]{CorrigeFin}{%
+ \ifboolKV[Boulot]{CorrigeFin}{%
\AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}
- \TikzDSCor{#2}%
+ \PfMPrepareCorrection{#1}%
+ \TikzParcoursCor{#2}%
\PfMAffichageCorrectionColonnes%
- }%
- }{}%
- }{%
- \ifboolKV[Boulot]{IE}{%
- \ifboolKV[Boulot]{CorrigeSeul}{}{%
- \setKV[IE]{#2}\TikzIE%
- }
- \let\exercice\exerciceDS\let\endexercice\endexerciceDS%On garde exerciceDS
- \ifboolKV[Boulot]{CorrigeFin}{%
- \AddToHook{env/Maquette/after}[Correction]{%
- \PfMPrepareCorrection{#1}
- \TikzIECor{#2}%
- \PfMAffichageCorrectionColonnes
}%
}{}%
}{%
- \ifboolKV[Boulot]{Kholle}{%
- \setKV[Kholle]{#2}%
- \TikzKholle%
- \let\exercice\exerciceKholle\let\endexercice\endexerciceKholle%
- \ifboolKV[Kholle]{CR}{}{%
+ \ifboolKV[Boulot]{PdT}{%
+ % \input{PfMMaquettePdT.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[PdT]{#2}\TikzPdT%
+ }%
+ \let\exercice\exercicePdT\let\endexercice\endexercicePdT%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzPdTCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{DM}{%
+ % \input{PfMMaquetteDM.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[DM]{#2}\TikzDM%
+ }%
+ \let\exercice\exerciceDM\let\endexercice\endexerciceDM%
\ifboolKV[Boulot]{CorrigeFin}{%
\AddToHook{env/Maquette/after}[Correction]{%
- \TikzKholleCor{#2}%
- \TikzKholleCor{#2}%
- \TikzKholleCor{#2}%
- \PfMAffichageCorrige%
+ \PfMPrepareCorrection{#1}%
+ \TikzDMCor{#2}%
+ \PfMAffichageCorrectionColonnes%
}%
}{}%
+ }{%
+ \ifboolKV[Boulot]{Fiche}{%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[Fiche]{#2}%
+ \TikzFiche%
+ }%
+ \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche%
+ \ifboolKV[Boulot]{AvecEntrainement}{%
+ \AddToHook{env/Maquette/end}[Haltere]{%
+ \PfMAffichageEntrainementColonnes%
+ }%
+ }{}%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \ifboolKV[Boulot]{CorrigeAll}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzFicheCor{#2}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\textbf{Corrigé de l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{}%
+ }%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
+ \TikzFicheCorRep{#2}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.rep}{\textbf{Réponse(s) de l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.rep}\par\goodbreak}{}%
+ }%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
+ \TikzFicheCorInd{#2}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
+ \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.cdp}{\textbf{Indice(s) pour l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.cdp}\par\goodbreak}{}%
+ }%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
+ }%
+ }{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+% \useKVdefault[Boulot]%
+% \setKV[Boulot]{#1}%
+% %%
+% \if@Dyslexie
+% \setKV[Boulot]{Dys}%
+% \fi
+% \PfMBasculeDys%
+% \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
+ \if@AssembleCorrections
+ \else
+ \PfMPrepareCorrection{#1}%
+ \TikzFicheCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ \fi%
+ }%
+ }%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{DS}{%
+ % \input{PfMMaquetteDS.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[DS]{#2}\TikzDS%
+ }%
+ \let\exercice\exerciceDS\let\endexercice\endexerciceDS%
+ \ifboolKV[Boulot]{BaremeComplet}{%
+ \begin{center}
+ \TableauRecapitulatif
+ \end{center}
+ }{}%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzDSCor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{IE}{%
+ % \input{PfMMaquetteIE.tex}%
+ \ifboolKV[Boulot]{CorrigeSeul}{}{%
+ \setKV[IE]{#2}\TikzIE%
+ }%
+ \let\exercice\exerciceDS\let\endexercice\endexerciceDS%On garde exerciceDS
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \PfMPrepareCorrection{#1}%
+ \TikzIECor{#2}%
+ \PfMAffichageCorrectionColonnes%
+ }%
+ }{}%
+ }{%
+ \ifboolKV[Boulot]{Kholle}{%
+ % \input{PfMMaquetteKholle.tex}%
+ \setKV[Kholle]{#2}%
+ \TikzKholle%
+ \let\exercice\exerciceKholle\let\endexercice\endexerciceKholle%
+ \ifboolKV[Kholle]{CR}{}{%
+ \ifboolKV[Boulot]{CorrigeFin}{%
+ \AddToHook{env/Maquette/after}[Correction]{%
+ \TikzKholleCor{#2}%
+ \TikzKholleCor{#2}%
+ \TikzKholleCor{#2}%
+ \PfMAffichageCorrige%
+ }%
+ }{}%
+ }%
+ }{%
+ \ifboolKV[Boulot]{LivreHeros}{%
+ \setKV[LivreHeros]{#2}%
+ \TikzLivreHeros%
+ \let\exercice\ExoGBWrite\let\endexercice\endExoGBWrite%
+ \AddToHook{env/Maquette/end}{%
+ \xdef\PfMListeExoGB{}%
+ \xintFor* ##1 in{\xintSeq{2}{\thePfMExo}}\do{%
+ \xdef\PfMListeExoGB{\PfMListeExoGB,##1}%
+ }%
+ \MelangeListe{\PfMListeExoGB}{\fpeval{\thePfMExo-1}}%
+ \xdef\PfMFooMelange{1,\faa}%
+ \setsepchar{,}\ignoreemptyitems\readlist*\ListePerm{\PfMFooMelange}\reademptyitems%
+ \phantomsection{}
+ \addcontentsline{toc}{section}{\useKV[LivreHeros]{Theme}}%
+ \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{%
+ \itemtomacro\ListePerm[##1]\PfMPermute%
+ \begin{tcolorbox}[tikzLH,title=##1]%
+ \refstepcounter{PfMGameBook}%
+ \input{\jobname-Ma\thePfMMaquette-Ex\PfMPermute.gb}%
+ \end{tcolorbox}%
+ }%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
+ }%
+ }{}%
+ }%
+ }%
+ }%
+ }%
}%
- }{}%
+ }%
}%
}%
}%
@@ -3751,11 +4350,7 @@
}%
}%
}%
-}%
-}%
-}%
-}%
-}%
+}
}{}%
\makeatother
%D'après JCC
@@ -4391,8 +4986,9 @@
\BaremeEspaceMarge{-82pt}
}
-\AddToHook{env/multicols/begin}{\setcounter{Nbcolonnes}{2}}%
-\AddToHook{env/multicols/after}{\setcounter{Nbcolonnes}{4}}%
+%\AddToHook{env/multicols/begin}{\setcounter{Nbcolonnes}{2}}%
+%\AddToHook{env/multicols/after}{\setcounter{Nbcolonnes}{4}}%
+
\NewDocumentEnvironment{Dispo}{sm+b}{%
\ifPfMDeuxColonnes
\IfBooleanTF{#1}{%
@@ -4468,4 +5064,117 @@
}%
\fi%
\end{align*}
-}{}% \ No newline at end of file
+}{}%
+
+\def\RetiensEchelle{1cm}
+\def\ChoixNbQuestions{3}
+\makeatletter
+\if@CAN
+ \AddToHook{env/document/before}{%
+ \ProvidesPackage{ProfMaquette}[Mode CAN (CP)]%
+ \RequirePackage{pgfmorepages}
+ \pgfmorepagesloadextralayouts
+ \pgfpagesuselayout{4 on 2, book format}[a4paper,landscape]
+ }
+\fi
+
+\if@Revision
+ \AddToHook{env/document/before}{%
+ \ProvidesPackage{ProfMaquette}[Mode Revision (CP)]%
+ \setcounter{Nbcolonnes}{2}%
+ \def\RetiensEchelle{0.5cm}
+ \RequirePackage{pgfmorepages}
+ \pgfmorepagesloadextralayouts
+ \pgfpagesuselayout{4 on 2, book format}[a4paper]
+ }
+\fi
+
+\if@Personnel
+ \input{PfMPerso.cfg}
+\fi
+\makeatother
+
+\IfClassLoadedTF{beamer}{}{%
+ % enumitem obligatoire ^^
+% mais pas compatible beamer
+\RequirePackage{enumitem}
+% d'après https://tex.stackexchange.com/questions/164613/adding-code-at-the-end-of-each-list-item
+\newif\iffirstlegal\firstlegalfalse% We need a toggle to track whether the item is first in the list or not
+
+\newlist{Test}{enumerate}{3}
+
+\def\PfMPar{\par}
+
+\NewDocumentCommand\litem{}{}
+
+\let\olditem\item% save the standard definition of \item in a macro, \olditem
+
+\setlist[Test,1]{%
+ leftmargin=*,
+ label=\arabic*.,
+ before={%
+ \setcounter{PfMProfondeur}{1}%
+ \setcounter{PfMNbLignesFinitem}{0}
+ \firstlegaltrue% set the toggle for first item in the list to true
+ \def\Primeitem{\iffirstlegal\olditem\stepcounter{PfMNbLignesFinitem}%
+ \firstlegalfalse
+ \else
+ \ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]}\else\ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]=1\relax\PfMPar\pointilles\fi\fi%
+ \olditem\stepcounter{PfMNbLignesFinitem}%
+ \fi
+ }% new, temporary defition of \item
+ \let\litem\Primeitem
+ \let\item\litem
+ },
+ after={%
+ \ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]>0\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]}\else\ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]=1\relax\PfMPar\pointilles\fi\fi%
+ % fill for final item in list
+ \let\litem\olditem% restore standard definition of \item
+ \let\item\olditem
+ \setcounter{PfMProfondeur}{0}%
+ }%
+}%
+
+\setlist[Test,2]{%
+ leftmargin=*,
+ label=(\alph*),
+ before={%
+ \setcounter{PfMProfondeur}{2}%
+ \setcounter{PfMNbLignesFinitemi}{0}
+ \firstlegaltrue%
+ \def\Seconditem{\iffirstlegal\olditem\stepcounter{PfMNbLignesFinitemi}\firstlegalfalse\else%
+ \ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]}\else\ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]=1\relax\PfMPar\pointilles\fi
+ \fi%
+ \olditem\stepcounter{PfMNbLignesFinitemi}
+ \fi
+ }% new, temporary defition of \item
+ \let\litem\Seconditem
+ \let\item\litem
+ },
+ after={%
+ \ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]}\else\ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]=1\relax\PfMPar\pointilles\fi
+ \fi%
+% % fill for final item in list
+ \let\litem\Primeitem%
+ \let\item\litem
+ \setcounter{PfMProfondeur}{1}%
+ }%
+}
+
+\newcounter{PfMNbLignesFinitem}
+\newcounter{PfMNbLignesFinitemi}
+\newcounter{PfMProfondeur}
+\setcounter{PfMProfondeur}{0}%
+
+\NewDocumentEnvironment{autoenumerate}{O{}m +b}{%
+ \setsepchar{,}\ignoreemptyitems%
+ \ifnum\thePfMProfondeur=0\relax%
+ \readlist*\PfMListeDesAjoutsdeLignes{#2}%
+ \else%
+ \readlist*\PfMListeDesAjoutsdeLignesi{#2}%
+ \fi%
+ \begin{Test}[#1]%
+ #3
+ \end{Test}%
+}{}%
+} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/quizztex/quizztex.sty b/Master/texmf-dist/tex/latex/quizztex/quizztex.sty
index ee18c46d0d9..fc199309aeb 100644
--- a/Master/texmf-dist/tex/latex/quizztex/quizztex.sty
+++ b/Master/texmf-dist/tex/latex/quizztex/quizztex.sty
@@ -4,7 +4,9 @@
% : 'Tout le monde veut prendre sa place' is a Tradematk from Air Productions.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{quizztex}[2023/11/05 0.1.2 Construire des quizz 'comme dans les jeux' ]
+\ProvidesPackage{quizztex}[2024/09/10 0.1.4 Construire des quizz 'comme dans les jeux' ]
+%0.1.4 Macro pour modifier les paramètres par défaut des clés
+%0.1.3 Annulation du chargement de tikz.babel
%0.1.2 Passage \tikzstyle vers \tikzset (merci à Sam C.)
%0.1.1 Amélioration de la gestion des réponses dans WWTBAM + Position des Jokers (cc P. Bideault ;-))
%0.1.0 Version initiale
@@ -18,7 +20,8 @@
\RequirePackage{calc}
\RequirePackage{varwidth}
%------Librairies
-\usetikzlibrary{calc,positioning,shapes.geometric,babel,fadings}
+\usetikzlibrary{calc,positioning,shapes.geometric,fadings}
+%\usetikzlibrary{babel}
%------Longueurs globales
\newlength{\HauteurQuest}
@@ -120,6 +123,8 @@
PositionJokers=centre
}
+\newcommand\SetDefautMillions[1]{\setKVdefault[wwtbam]{#1}}
+
\NewDocumentCommand\LettreChoixMillions{ m }{%
\textcolor{\CouleurLettreWWTBAM}{\large\sffamily\bfseries{\vphantom{Q}#1}\,:}%
}
@@ -565,6 +570,8 @@
EchellePoints=1
}
+\newcommand\SetDefautPlace[1]{\setKVdefault[TLMVPSP]{#1}}
+
\NewDocumentCommand\QuizzPrendrePlace{ O{} m m m m m }{%clés + questions + 4 réponses
\useKVdefault[TLMVPSP]%
\setKV[TLMVPSP]{#1}%
diff --git a/Master/texmf-dist/tex/latex/quran/quran-transde.def b/Master/texmf-dist/tex/latex/quran/quran-transde.def
index ab355f920a2..b243a37ea86 100644
--- a/Master/texmf-dist/tex/latex/quran/quran-transde.def
+++ b/Master/texmf-dist/tex/latex/quran/quran-transde.def
@@ -1,6 +1,6 @@
%% This is file `quran-transde.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\let\qt@doqt@orig\qt@doqt
\let\ToggleBasmalah@orig\ToggleBasmalah
diff --git a/Master/texmf-dist/tex/latex/quran/quran-transen.def b/Master/texmf-dist/tex/latex/quran/quran-transen.def
index 7cdc00da00b..bc6ef6534d5 100644
--- a/Master/texmf-dist/tex/latex/quran/quran-transen.def
+++ b/Master/texmf-dist/tex/latex/quran/quran-transen.def
@@ -1,6 +1,6 @@
%% This is file `quran-transen.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\let\qt@doqt@orig\qt@doqt
\let\ToggleBasmalah@orig\ToggleBasmalah
diff --git a/Master/texmf-dist/tex/latex/quran/quran-transfa.def b/Master/texmf-dist/tex/latex/quran/quran-transfa.def
index 3fb57246611..3a0b0e2f44e 100644
--- a/Master/texmf-dist/tex/latex/quran/quran-transfa.def
+++ b/Master/texmf-dist/tex/latex/quran/quran-transfa.def
@@ -1,6 +1,6 @@
%% This is file `quran-transfa.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\let\qt@doqt@orig\qt@doqt%
\let\ToggleBasmalah@orig\ToggleBasmalah%
diff --git a/Master/texmf-dist/tex/latex/quran/quran-transfr.def b/Master/texmf-dist/tex/latex/quran/quran-transfr.def
index 15f36dc79e3..e4de0642941 100644
--- a/Master/texmf-dist/tex/latex/quran/quran-transfr.def
+++ b/Master/texmf-dist/tex/latex/quran/quran-transfr.def
@@ -1,6 +1,6 @@
%% This is file `quran-transfr.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\let\qt@doqt@orig\qt@doqt%
\let\ToggleBasmalah@orig\ToggleBasmalah%
diff --git a/Master/texmf-dist/tex/latex/quran/quran-translt.def b/Master/texmf-dist/tex/latex/quran/quran-translt.def
index 4517366824a..e4e1403d9fc 100644
--- a/Master/texmf-dist/tex/latex/quran/quran-translt.def
+++ b/Master/texmf-dist/tex/latex/quran/quran-translt.def
@@ -1,6 +1,6 @@
%% This is file `quran-translt.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\bidi@newrobustcmd\q@b[1]{\textbf{#1}}%
\bidi@newrobustcmd\q@i[1]{\textit{#1}}%
diff --git a/Master/texmf-dist/tex/latex/quran/quran.sty b/Master/texmf-dist/tex/latex/quran/quran.sty
index bbd4b9fec8a..f63cd80b3cb 100644
--- a/Master/texmf-dist/tex/latex/quran/quran.sty
+++ b/Master/texmf-dist/tex/latex/quran/quran.sty
@@ -1,6 +1,6 @@
%% This is file `quran.sty',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,11 +17,11 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\NeedsTeXFormat{LaTeX2e}
-\def\qurandate{2023/08/01}
-\def\quranversion{2.2}
+\def\qurandate{2024/09/07}
+\def\quranversion{2.3}
\ProvidesPackage{quran}[\qurandate\space v\quranversion^^JAn easy way to typeset the whole or any parts of the holy Quran]
\RequirePackage{ifxetex}
\RequirePackage{biditools}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-de.translation.def b/Master/texmf-dist/tex/latex/quran/qurantext-de.translation.def
index ba64f29d5dd..9e2b2029227 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-de.translation.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-de.translation.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-de.translation.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantrans@de@i{Im Namen Allahs, des Allerbarmers, des Barmherzigen!\qt@no{(1)}}
\qt@newcmd\qurantrans@de@ii{Alles Lob gebührt Allah, dem Herrn der Welten\qt@no{(2)}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-en.translation.def b/Master/texmf-dist/tex/latex/quran/qurantext-en.translation.def
index b75d7b21eae..bdb5965e6fd 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-en.translation.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-en.translation.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-en.translation.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantrans@en@i{In the name of Allah, most benevolent, ever-merciful.\qt@no{(1)}}
\qt@newcmd\qurantrans@en@ii{ALL PRAISE BE to Allah, Lord of all the worlds,\qt@no{(2)}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-en.transliteration.def b/Master/texmf-dist/tex/latex/quran/qurantext-en.transliteration.def
index 33298a42d9d..efeab9a81e1 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-en.transliteration.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-en.transliteration.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-de.transliteration.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantrans@lt@i{Bismi All\q@u{a}hi a\q@b{l}rra\q@u{h}m\q@u{a}ni a\q@b{l}rra\q@u{h}eem\q@b{i}\qt@no{(1)}}
\qt@newcmd\qurantrans@lt@ii{Al\q@u{h}amdu lill\q@u{a}hi rabbi alAA\q@u{a}lameen\q@b{a}\qt@no{(2)}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-fa.translation.def b/Master/texmf-dist/tex/latex/quran/qurantext-fa.translation.def
index 4fd97196e7f..beaee873b88 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-fa.translation.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-fa.translation.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-fa.translation.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantrans@fa@i{به نام خداوند رحمتگر مهربان\qt@no{(1)}}
\qt@newcmd\qurantrans@fa@ii{ستايش خدايى را كه پروردگار جهانيان،\qt@no{(2)}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-fr.translation.def b/Master/texmf-dist/tex/latex/quran/qurantext-fr.translation.def
index b214969da28..d5b63cef6fd 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-fr.translation.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-fr.translation.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-fr.translation.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantrans@fr@i{Au nom d'Allah, le Tout Miséricordieux, le Très Miséricordieux.\qt@no{(1)}}
\qt@newcmd\qurantrans@fr@ii{Louange à Allah, Seigneur de l'univers.\qt@no{(2)}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-simple.def b/Master/texmf-dist/tex/latex/quran/qurantext-simple.def
index 6df9b7a3a41..71f1109b6ea 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-simple.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-simple.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-simple.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantext@i{بِسمِ اللَّهِ الرَّحمـٰنِ الرَّحيمِ\qt@no{﴿١﴾}}
\qt@newcmd\qurantext@ii{الحَمدُ لِلَّهِ رَبِّ العالَمينَ\qt@no{﴿٢﴾}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-uthmani-min.def b/Master/texmf-dist/tex/latex/quran/qurantext-uthmani-min.def
index 2d35cc582f7..0c3e6ea1861 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-uthmani-min.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-uthmani-min.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-uthmani-min.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantext@i{بِسمِ اللَّهِ الرَّحمـٰنِ الرَّحيمِ\qt@no{﴿١﴾}}
\qt@newcmd\qurantext@ii{الحَمدُ لِلَّهِ رَبِّ العـٰلَمينَ\qt@no{﴿٢﴾}}
diff --git a/Master/texmf-dist/tex/latex/quran/qurantext-uthmani.def b/Master/texmf-dist/tex/latex/quran/qurantext-uthmani.def
index 387ce7f3643..e5bc607cd38 100644
--- a/Master/texmf-dist/tex/latex/quran/qurantext-uthmani.def
+++ b/Master/texmf-dist/tex/latex/quran/qurantext-uthmani.def
@@ -1,6 +1,6 @@
%% This is file `qurantext-uthmani.def',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\qt@newcmd\qurantext@i{بِسْمِ ٱللَّهِ ٱلرَّحْمَـٰنِ ٱلرَّحِيمِ\qt@no{﴿١﴾}}
\qt@newcmd\qurantext@ii{ٱلْحَمْدُ لِلَّهِ رَبِّ ٱلْعَـٰلَمِينَ\qt@no{﴿٢﴾}}
diff --git a/Master/texmf-dist/tex/latex/randintlist/randintlist.sty b/Master/texmf-dist/tex/latex/randintlist/randintlist.sty
new file mode 100644
index 00000000000..4c15af336e6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/randintlist/randintlist.sty
@@ -0,0 +1,246 @@
+% Author : C. Pierquet
+% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{randintlist}[2024/09/24 0.1.1 Create a list of random numbers with or without multiple values]
+
+%------History
+% 0.1.1 Possibility to exclude values
+% 0.1.0 Initial version
+
+%------Packages
+\RequirePackage{simplekv}
+\RequirePackage{listofitems}
+\RequirePackage{randomlist}
+\RequirePackage{xintexpr}
+\RequirePackage{xstring}
+\RequirePackage{ifthen}
+
+%-----Macros (latex3) for sorting and seed
+\ExplSyntaxOn
+\cs_new_eq:NN \randintseed \sys_gset_rand_seed:n
+\NewDocumentCommand\intascsortlist{m}
+{
+ \clist_sort:Nn #1
+ {
+ \fp_compare:nNnTF {##1} > {##2}
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+}
+\NewDocumentCommand\intdessortlist{m}
+{
+ \clist_sort:Nn #1
+ {
+ \fp_compare:nNnTF {##1} < {##2}
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+}
+\ExplSyntaxOff
+
+%----Internal macro (latex2) for testing if element is in list
+\newcommand\ifintvalueinlist[2]{\IfSubStr{,#2,}{,#1,}}
+
+\newcommand\boolvalueinlist[2]{\IfSubStr{,#2,}{,#1,}{\def\resisinlist{1}}{\def\resisinlist{0}}}
+
+\newcommand\xintifintvalueinlist[4]{%
+ \IfSubStr{,#2,}{,#1,}{\xdef\RESTMPVALUE{1}}{\xdef\RESTMPVALUE{0}}%
+ \xintifboolexpr{ \RESTMPVALUE == 1}{#3}{#4}%
+}
+
+%----Macro for generating
+\defKV[randomlistintegers]{%
+ min=\def\TAEEmin{#1},%
+ max=\def\TAEEmax{#1},%
+ nb=\def\TAEEnb{#1},%
+ sep=\def\TAEEsep{#1},%
+ sort=\def\TAEEtri{#1},%
+ seed=\def\TAEEseed{#1},%
+ exclude=\def\TAEEexcluded{#1}
+}
+
+\setKVdefault[randomlistintegers]{%
+ min=1,%
+ max=50,%
+ nb=6,%
+ sep={,},%
+ sort=no,%
+ repeat=false,%
+ seed={-},%
+ exclude={}
+}
+
+\NewList{tmprandintlist}
+
+\NewDocumentCommand\randintlist{ O{} m }{%1=keys,2=listname
+ \useKVdefault[randomlistintegers]%
+ \setKV[randomlistintegers]{#1}%
+ \ifboolKV[randomlistintegers]{repeat}%repeat or not
+ {%repeat allowed
+ \IfStrEq{\TAEEseed}{-}%
+ {}%
+ {%
+ \randintseed{\TAEEseed}%
+ }%
+ %list creation of first element
+ \def\resisinlist{1}%
+ \whiledo{\resisinlist=1}{%
+ \xdef\tmpresrandint{\fpeval{randint(\TAEEmin,\TAEEmax)}}%
+ \boolvalueinlist{\tmpresrandint}{\TAEEexcluded}%
+ }%
+ \xdef#2{\tmpresrandint}%
+ %list creation of other elements
+ \xintFor* ##1 in {\xintSeq{2}{\TAEEnb}}%
+ \do{%
+ \def\resisinlist{1}%
+ \whiledo{\resisinlist=1}{%
+ \xdef\tmpresrandint{\fpeval{randint(\TAEEmin,\TAEEmax)}}%
+ \boolvalueinlist{\tmpresrandint}{\TAEEexcluded}%
+ }%
+ \xdef#2{#2,\tmpresrandint}%
+ }%
+ }%
+ {%no repeating
+ %randomize numbers
+ \IfStrEq{\TAEEseed}{-}%
+ {}%
+ {%
+ \RLsetrandomseed{\TAEEseed}%
+ }%
+ \ClearList{tmprandintlist}%clearing the list
+ \xintFor* ##1 in {\xintSeq{\TAEEmin}{\TAEEmax}}%
+ \do{%
+ \ifintvalueinlist{##1}{\TAEEexcluded}%
+ {}%
+ {%
+ \InsertRandomItem{tmprandintlist}{##1}%
+ }%
+ }%
+ %list creation (first then other)
+ \xdef#2{\tmprandintlist[0]}%
+ \xintFor* ##1 in {\xintSeq{1}{\TAEEnb-1}}%
+ \do{%
+ \xdef#2{#2,\tmprandintlist[##1]}%
+ }%
+ }%
+ %sorting
+ \IfStrEq{\TAEEtri}{asc}%if ascending
+ {\intascsortlist{#2}}%
+ {}%
+ \IfStrEq{\TAEEtri}{des}%if descending
+ {\intdessortlist{#2}}%
+ {}%
+ \StrSubstitute{#2}{,}{\TAEEsep}[#2]%swipping separator if necessary
+}
+
+%-----Macro for extracting
+\NewDocumentCommand\getitemfromrandintlist{ O{,} m m }{%
+ \IfEq{#1}{/}%
+ {%
+ \setsepchar[.]{#1}%
+ }%
+ {%
+ \setsepchar{#1}%
+ }%
+ \readlist*\TMPLISTRANDINT{#2}%
+ \TMPLISTRANDINT[#3]%
+}
+
+%-----french version
+\defKV[randomlisteentiers]{%
+ Min=\def\TAEEmin{#1},%
+ Max=\def\TAEEmax{#1},%
+ Nb=\def\TAEEnb{#1},%
+ Sep=\def\TAEEsep{#1},%
+ Tri=\def\TAEEtri{#1},%
+ Graine=\def\TAEEseed{#1},%
+ Exclure=\def\TAEEexcluded{#1}
+}
+
+\setKVdefault[randomlisteentiers]{%
+ Min=1,%
+ Max=50,%
+ Nb=6,%
+ Sep={,},%
+ Tri=non,%
+ Repet=false,%
+ Graine={-},%
+ Exclure={}
+}
+
+\NewDocumentCommand\ListeRandint{ O{} m }{%1=keys,2=listname
+ \useKVdefault[randomlisteentiers]%
+ \setKV[randomlisteentiers]{#1}%
+ \ifboolKV[randomlisteentiers]{Repet}%repeat or not
+ {%repeat allowed
+ \IfStrEq{\TAEEseed}{-}%
+ {}%
+ {%
+ \randintseed{\TAEEseed}%
+ }%
+ %list creation of first element
+ \def\resisinlist{1}%
+ \whiledo{\resisinlist=1}{%
+ \xdef\tmpresrandint{\fpeval{randint(\TAEEmin,\TAEEmax)}}%
+ \boolvalueinlist{\tmpresrandint}{\TAEEexcluded}%
+ }%
+ \xdef#2{\tmpresrandint}%
+ %list creation of other elements
+ \xintFor* ##1 in {\xintSeq{2}{\TAEEnb}}%
+ \do{%
+ \def\resisinlist{1}%
+ \whiledo{\resisinlist=1}{%
+ \xdef\tmpresrandint{\fpeval{randint(\TAEEmin,\TAEEmax)}}%
+ \boolvalueinlist{\tmpresrandint}{\TAEEexcluded}%
+ }%
+ \xdef#2{#2,\tmpresrandint}%
+ }%
+ }%
+ {%no repeating
+ %randomize numbers
+ \IfStrEq{\TAEEseed}{-}%
+ {}%
+ {%
+ \RLsetrandomseed{\TAEEseed}%
+ }%
+ \ClearList{tmprandintlist}%clearing the list
+ \xintFor* ##1 in {\xintSeq{\TAEEmin}{\TAEEmax}}%
+ \do{%
+ \ifintvalueinlist{##1}{\TAEEexcluded}%
+ {}%
+ {%
+ \InsertRandomItem{tmprandintlist}{##1}%
+ }%
+ }%
+ %list creation (first then other)
+ \xdef#2{\tmprandintlist[0]}%
+ \xintFor* ##1 in {\xintSeq{1}{\TAEEnb-1}}%
+ \do{%
+ \xdef#2{#2,\tmprandintlist[##1]}%
+ }%
+ }%
+ %sorting
+ \IfStrEq{\TAEEtri}{croiss}%if ascending
+ {\intascsortlist{#2}}%
+ {}%
+ \IfStrEq{\TAEEtri}{decroiss}%if descending
+ {\intdessortlist{#2}}%
+ {}%
+ \StrSubstitute{#2}{,}{\TAEEsep}[#2]%swipping separator if necessary
+}
+
+%-----Macro for extracting
+\NewDocumentCommand\ExtraireEltListeRandint{ O{,} m m }{%
+ \IfEq{#1}{/}%
+ {%
+ \setsepchar[.]{#1}%
+ }%
+ {%
+ \setsepchar{#1}%
+ }%
+ \readlist*\TMPLISTRANDINT{#2}%
+ \TMPLISTRANDINT[#3]%
+}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/regulatory/regulatory.sty b/Master/texmf-dist/tex/latex/regulatory/regulatory.sty
index 2e89a19a376..2755a8ac9bd 100644
--- a/Master/texmf-dist/tex/latex/regulatory/regulatory.sty
+++ b/Master/texmf-dist/tex/latex/regulatory/regulatory.sty
@@ -19,9 +19,9 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{regulatory}[2024/01/27 0.0.3 Xerdi's Regulatory Package]
+\ProvidesPackage{regulatory}[2024/09/04 0.0.4 Xerdi's Regulatory Package]
\RequirePackage{pgfopts}
\RequirePackage{xifthen}
diff --git a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
index 8faae5eb735..ea3a91171b8 100644
--- a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
+++ b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
@@ -18,14 +18,14 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Jesse Sraat.
+%% The Current Maintainer of this work is Jesse Straat.
%%
%% This work consists of the main file reptheorem.dtx
%% and the derived files
%% reptheorem.sty, reptheorem.pdf, reptheorem.ins
%%
-\ProvidesPackage{reptheorem}[2024-08-12 v1.1 Reptheorem package]
+\ProvidesPackage{reptheorem}[2024-09-22 v1.2 Reptheorem package]
\def\reptheorem@theoremfile{\relax}
\NewDocumentCommand{\theoremfile}{ O{\jobname.thm} }{
\def\reptheorem@theoremfile{#1}
@@ -49,25 +49,29 @@ File #1 not found. I will not import any theorems.%
\begin{#1}\label{#2}
}
#4
-\end{#1}
-\expandafter\gdef\csname thmtype@#2\endcsname{#1}
+\expandafter\gdef\csname thmtype@#2\endcsname{#1}%
\expandafter\long\expandafter\gdef\csname thm@#2\endcsname{#4}%
+\IfValueT{#3}{% Only save theorem name if it exists
\expandafter\gdef\csname thmdesc@#2\endcsname{#3}%
-\long\gdef\@thmoutput{%
+}
+\expandafter\long\expandafter\gdef\csname thmoutput@#2\endcsname{%
\string\expandafter\string\gdef\noexpand%
\csname thmtype@#2\string\endcsname{#1}%
^^J%
\string\expandafter\string\long\string\expandafter%
\string\gdef\noexpand\csname thm@#2\string\endcsname{#4}%
+\IfValueT{#3}{
^^J%
\string\expandafter\string\gdef\noexpand%
\csname thmdesc@#2\string\endcsname{#3}%
}
-\write\@auxout{\@thmoutput}
+}
+\write\@auxout{\csname thmoutput@#2\endcsname}
\if\reptheorem@theoremfile\relax
\else
-\write\@thmlist{\@thmoutput}
+\write\@thmlist{\csname thmoutput@#2\endcsname}
\fi
+\end{#1}
}{}
\newcounter{old@counter}
\NewDocumentCommand{\repthm}{ m +o }{
@@ -81,17 +85,16 @@ File #1 not found. I will not import any theorems.%
\def\thetheorem{\ref{#1}}
\let\@@theoremnotdefined\relax
\ifcsname thm@#1\endcsname% Check if theorem is even defined
-\expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#1\endcsname}%
\expandafter\let\expandafter\@@thm\csname thm@#1\endcsname
-\IfValueTF{\@@thmdesc}{% Check if theorem has name
-\begin{\@@thmtype}[\@@thmdesc]
+\ifcsname thmdesc@#1\endcsname % Check if theorem has name
+\begin{\@@thmtype}[\csname thmdesc@#1\endcsname]
\@@thm
\end{\@@thmtype}
-}{% No optionals
+\else % No optionals
\begin{\@@thmtype}
\@@thm
\end{\@@thmtype}
-}
+\fi
\else
\IfValueTF{#2}{
\begin{\@@thmtype}
@@ -111,7 +114,6 @@ using the optional parameter%
\setcounter{\@@thmtype}{\value{old@counter}}
\endgroup
}
-
\endinput
%%
%% End of file `reptheorem.sty'.
diff --git a/Master/texmf-dist/tex/latex/romande/romande.sty b/Master/texmf-dist/tex/latex/romande/romande.sty
deleted file mode 100644
index f4c8068795b..00000000000
--- a/Master/texmf-dist/tex/latex/romande/romande.sty
+++ /dev/null
@@ -1,21 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{romande}[2010/06/27 v2.1 romande]
-\RequirePackage{xkeyval}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
-%:boolkey for alternative encoding as default
-\define@boolkey{romande.sty}[romande@]{alt}[true]{%
- \relax}
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{alt=false}
-%:options override defaults
-\ProcessOptionsX
-%:make RomandeADF default roman font, implementing option for alternative encoding as applicable
-\ifromande@alt
- \renewcommand{\rmdefault}{yrda}%
-\else
- \renewcommand{\rmdefault}{yrd}%
-\fi
-\endinput
-%% end romande.sty
diff --git a/Master/texmf-dist/tex/latex/romandeadf/romande.sty b/Master/texmf-dist/tex/latex/romandeadf/romande.sty
new file mode 100644
index 00000000000..3ffee072c45
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/romandeadf/romande.sty
@@ -0,0 +1,64 @@
+%%
+%% This is file `romande.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% romandeadf.dtx (with options: `sty')
+%% Copyright (C) 2010-2024 Clea F. Rees.
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% romandeadf. You may however distribute the package romandeadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[romande.sty]{$Id: romandeadf.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v2.1 \revinfo]
+\DefineFileInfoSVN[romande]
+\RequirePackage[T1]{fontenc}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yrd}{1}%
+ \DeclareEncodingSubset{TS1}{yrda}{1}%
+ \DeclareEncodingSubset{TS1}{yrdw}{1}%
+ \DeclareEncodingSubset{TS1}{yrdaw}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { romande }
+{
+ alt .bool_set:N = \g__romande_alt_bool,
+ alt .default:n = true,
+ alt .initial:n = false,
+ scale .tl_set:N = \yrd@scale,
+ scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[romande]
+\tl_new:N \g__romande_rm_tl
+\tl_gset:Nn \g__romande_rm_tl {yrd}
+\bool_if:NT \g__romande_alt_bool
+{
+ \tl_gput_right:Nn \g__romande_rm_tl {a}
+}
+\renewcommand{\rmdefault}{\g__romande_rm_tl}
+\ExplSyntaxOff
+%% end romande.sty
+\endinput
+%%
+%% End of file `romande.sty'.
diff --git a/Master/texmf-dist/tex/latex/romande/t1yrd.fd b/Master/texmf-dist/tex/latex/romandeadf/t1yrd.fd
index 2c135c8cad3..23e3edf286d 100644
--- a/Master/texmf-dist/tex/latex/romande/t1yrd.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/t1yrd.fd
@@ -5,43 +5,58 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yrd.fd}
- [2010/07/10 Fontinst v1.933 font definitions for T1/yrd.]
+ [2024/08/12 Fontinst v1.933 font definitions for T1/yrd.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yrd}{}
\DeclareFontShape{T1}{yrd}{m}{n}{
- <-> yrdr8t
+ <-> \yrd@@scale yrdr8t
}{}
\DeclareFontShape{T1}{yrd}{m}{sc}{
- <-> yrdrc8t
+ <-> \yrd@@scale yrdrc8t
}{}
\DeclareFontShape{T1}{yrd}{m}{it}{
- <-> yrdri8t
+ <-> \yrd@@scale yrdri8t
}{}
\DeclareFontShape{T1}{yrd}{m}{sl}{
- <-> yrdri8t
+ <-> \yrd@@scale yrdri8t
}{}
\DeclareFontShape{T1}{yrd}{db}{n}{
- <-> yrdd8t
+ <-> \yrd@@scale yrdd8t
}{}
\DeclareFontShape{T1}{yrd}{db}{sc}{
- <-> yrddc8t
+ <-> \yrd@@scale yrddc8t
}{}
\DeclareFontShape{T1}{yrd}{db}{it}{
- <-> yrddi8t
+ <-> \yrd@@scale yrddi8t
}{}
\DeclareFontShape{T1}{yrd}{db}{sl}{
- <-> yrddi8t
+ <-> \yrd@@scale yrddi8t
}{}
-\DeclareFontShape{T1}{yrd}{m}{si}{<->ssub * yrd/m/sc}{}
+\DeclareFontShape{T1}{yrd}{m}{scit}{<->ssub * yrd/m/sc}{}
+\DeclareFontShape{T1}{yrd}{db}{scit}{<->ssub * yrd/m/scit}{}
+\DeclareFontShape{T1}{yrd}{b}{scit}{<->ssub * yrd/db/scit}{}
+\DeclareFontShape{T1}{yrd}{bx}{scit}{<->ssub * yrd/b/scit}{}
+\DeclareFontShape{T1}{yrd}{m}{scsl}{<->ssub * yrd/m/scit}{}
+\DeclareFontShape{T1}{yrd}{db}{scsl}{<->ssub * yrd/m/scsl}{}
+\DeclareFontShape{T1}{yrd}{b}{scsl}{<->ssub * yrd/db/scsl}{}
+\DeclareFontShape{T1}{yrd}{bx}{scsl}{<->ssub * yrd/b/scsl}{}
+\DeclareFontShape{T1}{yrd}{m}{si}{<->ssub * yrd/m/scsl}{}
\DeclareFontShape{T1}{yrd}{db}{si}{<->ssub * yrd/m/si}{}
\DeclareFontShape{T1}{yrd}{b}{si}{<->ssub * yrd/db/si}{}
\DeclareFontShape{T1}{yrd}{bx}{si}{<->ssub * yrd/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/t1yrda.fd b/Master/texmf-dist/tex/latex/romandeadf/t1yrda.fd
index fcaeb4673c3..c333ce1ce09 100644
--- a/Master/texmf-dist/tex/latex/romande/t1yrda.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/t1yrda.fd
@@ -5,35 +5,50 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yrda.fd}
- [2010/07/10 Fontinst v1.933 font definitions for T1/yrda.]
+ [2024/08/12 Fontinst v1.933 font definitions for T1/yrda.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yrda}{}
\DeclareFontShape{T1}{yrda}{m}{n}{
- <-> yrdra8t
+ <-> \yrd@@scale yrdra8t
}{}
\DeclareFontShape{T1}{yrda}{m}{sc}{
- <-> yrdrc8t
+ <-> \yrd@@scale yrdrc8t
}{}
\DeclareFontShape{T1}{yrda}{m}{it}{
- <-> yrdrai8t
+ <-> \yrd@@scale yrdrai8t
}{}
\DeclareFontShape{T1}{yrda}{db}{n}{
- <-> yrdda8t
+ <-> \yrd@@scale yrdda8t
}{}
\DeclareFontShape{T1}{yrda}{db}{sc}{
- <-> yrddc8t
+ <-> \yrd@@scale yrddc8t
}{}
\DeclareFontShape{T1}{yrda}{db}{it}{
- <-> yrddai8t
+ <-> \yrd@@scale yrddai8t
}{}
-\DeclareFontShape{T1}{yrda}{m}{si}{<->ssub * yrda/m/sc}{}
+\DeclareFontShape{T1}{yrda}{m}{scit}{<->ssub * yrda/m/sc}{}
+\DeclareFontShape{T1}{yrda}{db}{scit}{<->ssub * yrda/m/scit}{}
+\DeclareFontShape{T1}{yrda}{b}{scit}{<->ssub * yrda/db/scit}{}
+\DeclareFontShape{T1}{yrda}{bx}{scit}{<->ssub * yrda/b/scit}{}
+\DeclareFontShape{T1}{yrda}{m}{scsl}{<->ssub * yrda/m/scit}{}
+\DeclareFontShape{T1}{yrda}{db}{scsl}{<->ssub * yrda/m/scsl}{}
+\DeclareFontShape{T1}{yrda}{b}{scsl}{<->ssub * yrda/db/scsl}{}
+\DeclareFontShape{T1}{yrda}{bx}{scsl}{<->ssub * yrda/b/scsl}{}
+\DeclareFontShape{T1}{yrda}{m}{si}{<->ssub * yrda/m/scsl}{}
\DeclareFontShape{T1}{yrda}{db}{si}{<->ssub * yrda/m/si}{}
\DeclareFontShape{T1}{yrda}{b}{si}{<->ssub * yrda/db/si}{}
\DeclareFontShape{T1}{yrda}{bx}{si}{<->ssub * yrda/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/t1yrdaw.fd b/Master/texmf-dist/tex/latex/romandeadf/t1yrdaw.fd
index d3cdb3d3ec6..48757d9f46d 100644
--- a/Master/texmf-dist/tex/latex/romande/t1yrdaw.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/t1yrdaw.fd
@@ -5,20 +5,27 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yrdaw.fd}
- [2010/07/10 Fontinst v1.933 font definitions for T1/yrdaw.]
+ [2024/08/12 Fontinst v1.933 font definitions for T1/yrdaw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yrdaw}{}
\DeclareFontShape{T1}{yrdaw}{m}{it}{
- <-> yrdraiw8t
+ <-> \yrd@@scale yrdraiw8t
}{}
\DeclareFontShape{T1}{yrdaw}{m}{n}{
- <-> yrdraiw8t
+ <-> \yrd@@scale yrdraiw8t
}{}
\DeclareFontShape{T1}{yrdaw}{m}{sc}{
- <-> yrdraiw8t
+ <-> \yrd@@scale yrdraiw8t
}{}
\DeclareFontShape{T1}{yrdaw}{db}{it}{<->ssub * yrdaw/m/it}{}
@@ -34,7 +41,15 @@
\DeclareFontShape{T1}{yrdaw}{db}{sc}{<->ssub * yrdaw/m/sc}{}
\DeclareFontShape{T1}{yrdaw}{b}{sc}{<->ssub * yrdaw/db/sc}{}
\DeclareFontShape{T1}{yrdaw}{bx}{sc}{<->ssub * yrdaw/b/sc}{}
-\DeclareFontShape{T1}{yrdaw}{m}{si}{<->ssub * yrdaw/m/sc}{}
+\DeclareFontShape{T1}{yrdaw}{m}{scit}{<->ssub * yrdaw/m/sc}{}
+\DeclareFontShape{T1}{yrdaw}{db}{scit}{<->ssub * yrdaw/m/scit}{}
+\DeclareFontShape{T1}{yrdaw}{b}{scit}{<->ssub * yrdaw/db/scit}{}
+\DeclareFontShape{T1}{yrdaw}{bx}{scit}{<->ssub * yrdaw/b/scit}{}
+\DeclareFontShape{T1}{yrdaw}{m}{scsl}{<->ssub * yrdaw/m/scit}{}
+\DeclareFontShape{T1}{yrdaw}{db}{scsl}{<->ssub * yrdaw/m/scsl}{}
+\DeclareFontShape{T1}{yrdaw}{b}{scsl}{<->ssub * yrdaw/db/scsl}{}
+\DeclareFontShape{T1}{yrdaw}{bx}{scsl}{<->ssub * yrdaw/b/scsl}{}
+\DeclareFontShape{T1}{yrdaw}{m}{si}{<->ssub * yrdaw/m/scsl}{}
\DeclareFontShape{T1}{yrdaw}{db}{si}{<->ssub * yrdaw/m/si}{}
\DeclareFontShape{T1}{yrdaw}{b}{si}{<->ssub * yrdaw/db/si}{}
\DeclareFontShape{T1}{yrdaw}{bx}{si}{<->ssub * yrdaw/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/t1yrdw.fd b/Master/texmf-dist/tex/latex/romandeadf/t1yrdw.fd
index b3a26bde38e..bdeb1497978 100644
--- a/Master/texmf-dist/tex/latex/romande/t1yrdw.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/t1yrdw.fd
@@ -5,20 +5,27 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yrdw.fd}
- [2010/07/10 Fontinst v1.933 font definitions for T1/yrdw.]
+ [2024/08/12 Fontinst v1.933 font definitions for T1/yrdw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yrdw}{}
\DeclareFontShape{T1}{yrdw}{m}{it}{
- <-> yrdriw8t
+ <-> \yrd@@scale yrdriw8t
}{}
\DeclareFontShape{T1}{yrdw}{m}{n}{
- <-> yrdriw8t
+ <-> \yrd@@scale yrdriw8t
}{}
\DeclareFontShape{T1}{yrdw}{m}{sc}{
- <-> yrdriw8t
+ <-> \yrd@@scale yrdriw8t
}{}
\DeclareFontShape{T1}{yrdw}{db}{it}{<->ssub * yrdw/m/it}{}
@@ -34,7 +41,15 @@
\DeclareFontShape{T1}{yrdw}{db}{sc}{<->ssub * yrdw/m/sc}{}
\DeclareFontShape{T1}{yrdw}{b}{sc}{<->ssub * yrdw/db/sc}{}
\DeclareFontShape{T1}{yrdw}{bx}{sc}{<->ssub * yrdw/b/sc}{}
-\DeclareFontShape{T1}{yrdw}{m}{si}{<->ssub * yrdw/m/sc}{}
+\DeclareFontShape{T1}{yrdw}{m}{scit}{<->ssub * yrdw/m/sc}{}
+\DeclareFontShape{T1}{yrdw}{db}{scit}{<->ssub * yrdw/m/scit}{}
+\DeclareFontShape{T1}{yrdw}{b}{scit}{<->ssub * yrdw/db/scit}{}
+\DeclareFontShape{T1}{yrdw}{bx}{scit}{<->ssub * yrdw/b/scit}{}
+\DeclareFontShape{T1}{yrdw}{m}{scsl}{<->ssub * yrdw/m/scit}{}
+\DeclareFontShape{T1}{yrdw}{db}{scsl}{<->ssub * yrdw/m/scsl}{}
+\DeclareFontShape{T1}{yrdw}{b}{scsl}{<->ssub * yrdw/db/scsl}{}
+\DeclareFontShape{T1}{yrdw}{bx}{scsl}{<->ssub * yrdw/b/scsl}{}
+\DeclareFontShape{T1}{yrdw}{m}{si}{<->ssub * yrdw/m/scsl}{}
\DeclareFontShape{T1}{yrdw}{db}{si}{<->ssub * yrdw/m/si}{}
\DeclareFontShape{T1}{yrdw}{b}{si}{<->ssub * yrdw/db/si}{}
\DeclareFontShape{T1}{yrdw}{bx}{si}{<->ssub * yrdw/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/ts1yrd.fd b/Master/texmf-dist/tex/latex/romandeadf/ts1yrd.fd
index 4a5f6cf09db..f98ca7f1e05 100644
--- a/Master/texmf-dist/tex/latex/romande/ts1yrd.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/ts1yrd.fd
@@ -5,35 +5,50 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yrd.fd}
- [2010/07/10 Fontinst v1.933 font definitions for TS1/yrd.]
+ [2024/08/12 Fontinst v1.933 font definitions for TS1/yrd.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yrd}{}
\DeclareFontShape{TS1}{yrd}{m}{n}{
- <-> yrdr8c
+ <-> \yrd@@scale yrdr8c
}{}
\DeclareFontShape{TS1}{yrd}{m}{sc}{
- <-> yrdr8c
+ <-> \yrd@@scale yrdr8c
}{}
\DeclareFontShape{TS1}{yrd}{m}{it}{
- <-> yrdri8c
+ <-> \yrd@@scale yrdri8c
}{}
\DeclareFontShape{TS1}{yrd}{db}{n}{
- <-> yrdd8c
+ <-> \yrd@@scale yrdd8c
}{}
\DeclareFontShape{TS1}{yrd}{db}{sc}{
- <-> yrdd8c
+ <-> \yrd@@scale yrdd8c
}{}
\DeclareFontShape{TS1}{yrd}{db}{it}{
- <-> yrddi8c
+ <-> \yrd@@scale yrddi8c
}{}
-\DeclareFontShape{TS1}{yrd}{m}{si}{<->ssub * yrd/m/sc}{}
+\DeclareFontShape{TS1}{yrd}{m}{scit}{<->ssub * yrd/m/sc}{}
+\DeclareFontShape{TS1}{yrd}{db}{scit}{<->ssub * yrd/m/scit}{}
+\DeclareFontShape{TS1}{yrd}{b}{scit}{<->ssub * yrd/db/scit}{}
+\DeclareFontShape{TS1}{yrd}{bx}{scit}{<->ssub * yrd/b/scit}{}
+\DeclareFontShape{TS1}{yrd}{m}{scsl}{<->ssub * yrd/m/scit}{}
+\DeclareFontShape{TS1}{yrd}{db}{scsl}{<->ssub * yrd/m/scsl}{}
+\DeclareFontShape{TS1}{yrd}{b}{scsl}{<->ssub * yrd/db/scsl}{}
+\DeclareFontShape{TS1}{yrd}{bx}{scsl}{<->ssub * yrd/b/scsl}{}
+\DeclareFontShape{TS1}{yrd}{m}{si}{<->ssub * yrd/m/scsl}{}
\DeclareFontShape{TS1}{yrd}{db}{si}{<->ssub * yrd/m/si}{}
\DeclareFontShape{TS1}{yrd}{b}{si}{<->ssub * yrd/db/si}{}
\DeclareFontShape{TS1}{yrd}{bx}{si}{<->ssub * yrd/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/ts1yrda.fd b/Master/texmf-dist/tex/latex/romandeadf/ts1yrda.fd
index 1bc227e625f..39ae7bbf20a 100644
--- a/Master/texmf-dist/tex/latex/romande/ts1yrda.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/ts1yrda.fd
@@ -5,35 +5,50 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yrda.fd}
- [2010/07/10 Fontinst v1.933 font definitions for TS1/yrda.]
+ [2024/08/12 Fontinst v1.933 font definitions for TS1/yrda.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yrda}{}
\DeclareFontShape{TS1}{yrda}{m}{n}{
- <-> yrdr8c
+ <-> \yrd@@scale yrdr8c
}{}
\DeclareFontShape{TS1}{yrda}{m}{sc}{
- <-> yrdr8c
+ <-> \yrd@@scale yrdr8c
}{}
\DeclareFontShape{TS1}{yrda}{m}{it}{
- <-> yrdri8c
+ <-> \yrd@@scale yrdri8c
}{}
\DeclareFontShape{TS1}{yrda}{db}{n}{
- <-> yrdd8c
+ <-> \yrd@@scale yrdd8c
}{}
\DeclareFontShape{TS1}{yrda}{db}{sc}{
- <-> yrdd8c
+ <-> \yrd@@scale yrdd8c
}{}
\DeclareFontShape{TS1}{yrda}{db}{it}{
- <-> yrddi8c
+ <-> \yrd@@scale yrddi8c
}{}
-\DeclareFontShape{TS1}{yrda}{m}{si}{<->ssub * yrda/m/sc}{}
+\DeclareFontShape{TS1}{yrda}{m}{scit}{<->ssub * yrda/m/sc}{}
+\DeclareFontShape{TS1}{yrda}{db}{scit}{<->ssub * yrda/m/scit}{}
+\DeclareFontShape{TS1}{yrda}{b}{scit}{<->ssub * yrda/db/scit}{}
+\DeclareFontShape{TS1}{yrda}{bx}{scit}{<->ssub * yrda/b/scit}{}
+\DeclareFontShape{TS1}{yrda}{m}{scsl}{<->ssub * yrda/m/scit}{}
+\DeclareFontShape{TS1}{yrda}{db}{scsl}{<->ssub * yrda/m/scsl}{}
+\DeclareFontShape{TS1}{yrda}{b}{scsl}{<->ssub * yrda/db/scsl}{}
+\DeclareFontShape{TS1}{yrda}{bx}{scsl}{<->ssub * yrda/b/scsl}{}
+\DeclareFontShape{TS1}{yrda}{m}{si}{<->ssub * yrda/m/scsl}{}
\DeclareFontShape{TS1}{yrda}{db}{si}{<->ssub * yrda/m/si}{}
\DeclareFontShape{TS1}{yrda}{b}{si}{<->ssub * yrda/db/si}{}
\DeclareFontShape{TS1}{yrda}{bx}{si}{<->ssub * yrda/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/ts1yrdaw.fd b/Master/texmf-dist/tex/latex/romandeadf/ts1yrdaw.fd
index 777c6c38a22..9c6851807bf 100644
--- a/Master/texmf-dist/tex/latex/romande/ts1yrdaw.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/ts1yrdaw.fd
@@ -5,20 +5,27 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yrdaw.fd}
- [2010/07/10 Fontinst v1.933 font definitions for TS1/yrdaw.]
+ [2024/08/12 Fontinst v1.933 font definitions for TS1/yrdaw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yrdaw}{}
\DeclareFontShape{TS1}{yrdaw}{m}{it}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdaw}{m}{n}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdaw}{m}{sc}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdaw}{db}{it}{<->ssub * yrdaw/m/it}{}
@@ -34,7 +41,15 @@
\DeclareFontShape{TS1}{yrdaw}{db}{sc}{<->ssub * yrdaw/m/sc}{}
\DeclareFontShape{TS1}{yrdaw}{b}{sc}{<->ssub * yrdaw/db/sc}{}
\DeclareFontShape{TS1}{yrdaw}{bx}{sc}{<->ssub * yrdaw/b/sc}{}
-\DeclareFontShape{TS1}{yrdaw}{m}{si}{<->ssub * yrdaw/m/sc}{}
+\DeclareFontShape{TS1}{yrdaw}{m}{scit}{<->ssub * yrdaw/m/sc}{}
+\DeclareFontShape{TS1}{yrdaw}{db}{scit}{<->ssub * yrdaw/m/scit}{}
+\DeclareFontShape{TS1}{yrdaw}{b}{scit}{<->ssub * yrdaw/db/scit}{}
+\DeclareFontShape{TS1}{yrdaw}{bx}{scit}{<->ssub * yrdaw/b/scit}{}
+\DeclareFontShape{TS1}{yrdaw}{m}{scsl}{<->ssub * yrdaw/m/scit}{}
+\DeclareFontShape{TS1}{yrdaw}{db}{scsl}{<->ssub * yrdaw/m/scsl}{}
+\DeclareFontShape{TS1}{yrdaw}{b}{scsl}{<->ssub * yrdaw/db/scsl}{}
+\DeclareFontShape{TS1}{yrdaw}{bx}{scsl}{<->ssub * yrdaw/b/scsl}{}
+\DeclareFontShape{TS1}{yrdaw}{m}{si}{<->ssub * yrdaw/m/scsl}{}
\DeclareFontShape{TS1}{yrdaw}{db}{si}{<->ssub * yrdaw/m/si}{}
\DeclareFontShape{TS1}{yrdaw}{b}{si}{<->ssub * yrdaw/db/si}{}
\DeclareFontShape{TS1}{yrdaw}{bx}{si}{<->ssub * yrdaw/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/romande/ts1yrdw.fd b/Master/texmf-dist/tex/latex/romandeadf/ts1yrdw.fd
index 77c8aa7b0dd..afd23b69b8c 100644
--- a/Master/texmf-dist/tex/latex/romande/ts1yrdw.fd
+++ b/Master/texmf-dist/tex/latex/romandeadf/ts1yrdw.fd
@@ -5,20 +5,27 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yrdw.fd}
- [2010/07/10 Fontinst v1.933 font definitions for TS1/yrdw.]
+ [2024/08/12 Fontinst v1.933 font definitions for TS1/yrdw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yrd@scale\endcsname\relax
+ \let\yrd@@scale\@empty
+\else
+ \edef\yrd@@scale{s*[\csname yrd@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yrdw}{}
\DeclareFontShape{TS1}{yrdw}{m}{it}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdw}{m}{n}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdw}{m}{sc}{
- <-> yrdriw8c
+ <-> \yrd@@scale yrdriw8c
}{}
\DeclareFontShape{TS1}{yrdw}{db}{it}{<->ssub * yrdw/m/it}{}
@@ -34,7 +41,15 @@
\DeclareFontShape{TS1}{yrdw}{db}{sc}{<->ssub * yrdw/m/sc}{}
\DeclareFontShape{TS1}{yrdw}{b}{sc}{<->ssub * yrdw/db/sc}{}
\DeclareFontShape{TS1}{yrdw}{bx}{sc}{<->ssub * yrdw/b/sc}{}
-\DeclareFontShape{TS1}{yrdw}{m}{si}{<->ssub * yrdw/m/sc}{}
+\DeclareFontShape{TS1}{yrdw}{m}{scit}{<->ssub * yrdw/m/sc}{}
+\DeclareFontShape{TS1}{yrdw}{db}{scit}{<->ssub * yrdw/m/scit}{}
+\DeclareFontShape{TS1}{yrdw}{b}{scit}{<->ssub * yrdw/db/scit}{}
+\DeclareFontShape{TS1}{yrdw}{bx}{scit}{<->ssub * yrdw/b/scit}{}
+\DeclareFontShape{TS1}{yrdw}{m}{scsl}{<->ssub * yrdw/m/scit}{}
+\DeclareFontShape{TS1}{yrdw}{db}{scsl}{<->ssub * yrdw/m/scsl}{}
+\DeclareFontShape{TS1}{yrdw}{b}{scsl}{<->ssub * yrdw/db/scsl}{}
+\DeclareFontShape{TS1}{yrdw}{bx}{scsl}{<->ssub * yrdw/b/scsl}{}
+\DeclareFontShape{TS1}{yrdw}{m}{si}{<->ssub * yrdw/m/scsl}{}
\DeclareFontShape{TS1}{yrdw}{db}{si}{<->ssub * yrdw/m/si}{}
\DeclareFontShape{TS1}{yrdw}{b}{si}{<->ssub * yrdw/db/si}{}
\DeclareFontShape{TS1}{yrdw}{bx}{si}{<->ssub * yrdw/b/si}{}
diff --git a/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls b/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls
index ce7e04a509a..55e34820747 100644
--- a/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls
+++ b/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls
@@ -30,9 +30,45 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesClass{rub-kunstgeschichte}
- [2024-05-26 v0.1.0 RUB KGI class]
+ [2024-09-06 v0.2.0 RUB Kunstgeschichte class]
+%% Class options
+\DeclareKeys[rubkgi]{
+ biblatex.store = \@rubkgi@biblatexOptions,
+ biblatex.usage = load
+}
+\DeclareKeys[rubkgi]{
+ hyperref.code = \PassOptionsToPackage{#1}{hyperref},
+ hyperref.usage = load
+}
+%% TeX switch to decide wether to load the parskip package
+\newif\if@rubkgi@parskip
+\@rubkgi@parskiptrue
+\DeclareKeys[rubkgi]{
+ parskip.if = @rubkgi@parskip,
+ parskip.usage = load,
+ noparskip.ifnot = @rubkgi@parskip,
+ noparskip.usage = load
+}
+\ProcessKeyOptions[rubkgi]
%% Load base class with 12pt base font size
\LoadClass[12pt]{article}
+%% biblatex options
+\PassOptionsToPackage{
+ backend=biber,
+ singletitle=true,
+ autocite=footnote,
+ autopunct=false
+}{biblatex}
+%% biblatex-dw package
+\PassOptionsToPackage{
+ style=authortitle-dw,
+ firstfull=true,
+ addyear=true
+}{biblatex}
+%% pass biblatex class options along
+\PassOptionsToPackage{\@rubkgi@biblatexOptions}{biblatex}
+%% load biblatex
+\RequirePackage{biblatex}
%% Set 1.5 times line spacing
\RequirePackage[onehalfspacing]{setspace}
%% Set a4 paper size and margins
@@ -40,6 +76,14 @@
a4paper,
top=2cm,left=2cm,bottom=2cm,right=4cm
]{geometry}
+%% Avoid paragraph indentation
+\if@rubkgi@parskip
+ \RequirePackage{parskip}
+\fi
+%% Hyperref
+\RequirePackage{hyperref}
+\hypersetup{hidelinks=true}
+
\endinput
%%
%% End of file `rub-kunstgeschichte.cls'.
diff --git a/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty b/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty
new file mode 100644
index 00000000000..9c5eb1b3b73
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty
@@ -0,0 +1,190 @@
+%%
+%% This is file `scrhack-2023-07-07.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `package,identify')
+%% scrhack-2023-07-07.dtx (with options: `package,option')
+%% scrhack-2023-07-07.dtx (with options: `package,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from scrhack-2023-07-07.sty.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%%% using: package,identify
+\ProvidesPackage{scrhack}[%
+ 2024-04-17 v3.42
+ legacy version of package scrhack%
+]
+%%% using: package,option
+\RequirePackage{scrkbase}[2022-11-11]
+\@ifpackagelater{scrkbase}{2023-07-14}{%
+ \PackageInfo{scrhack}{KOMA-Script >= 3.42 detected.\MessageBreak
+ In this case you should not use this legacy version of\MessageBreak
+ scrhack, but should be able to use the current version\MessageBreak
+ or even replace loading scrhack by loading really\MessageBreak
+ needed third-party patches, e.g., floatbytocbasic.\MessageBreak
+ But you are the boss ..}%
+}{%
+ \@ifpackagelater{scrkbase}{2022-11-11}{%
+ \PackageWarningNoLine{scrhack}{KOMA-Script < 3.42 detected.\MessageBreak
+ In this case the original scrhack of that version\MessageBreak
+ should also be installed and used instead of this\MessageBreak
+ legacy package}%
+ }{%
+ \PackageError{scrhack}{incompatible KOMA-Script < v3.39 detected}{%
+ This error is fatal!\MessageBreak
+ Loading of scrhack will be aborted!}%
+ \expandafter\let\csname ver@scrhack.sty\endcsname\undefined
+ \endinput
+ }%
+}
+\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
+\KOMAExecuteOptions{hyperref=true}%
+\KOMA@ifkey{floatrow}{@scrhack@floatrow}
+\KOMAExecuteOptions{floatrow=true}
+\KOMA@ifkey{float}{@scrhack@float}%
+\KOMAExecuteOptions{float=true}%
+\KOMA@ifkey{listings}{@scrhack@listings}
+\KOMAExecuteOptions{listings=true}
+\RequirePackage{xpatch}%
+\KOMA@ifkey{nomencl}{@scrhack@nomencl}
+\KOMAExecuteOptions{nomencl=true}
+\KOMA@ifkey{setspace}{@scrhack@setspace}
+\KOMAExecuteOptions{setspace=true}
+\RequirePackage{xpatch}%
+\KOMA@ifkey{lscape}{@scrhack@lscape}%
+\KOMAExecuteOptions{lscape=true}%
+\KOMA@ifkey{standardsections}{@scrhack@standardsections}
+\KOMAExecuteOptions{standardsections=false}
+\KOMAProcessOptions\relax
+%%% using: package,body
+\newcommand{\scr@ifexpected}[2]{%
+ \begingroup
+ \let\@tempa#1
+ #2
+ \ifx\@tempa#1
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
+}
+\newcommand*{\scr@hack@load}[2]{%
+ \expandafter\ifx\csname ver@#2.#1\endcsname\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\ifx\csname ver@#2.hak\endcsname\relax
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
+ \fi
+ {%
+ \PackageInfo{scrhack}{loading #2 hack}%
+ \edef\reserved@a{%
+ \noexpand\makeatletter\noexpand\input{#2.hak}%
+ \noexpand\catcode`\noexpand\@\the\catcode`\@\relax
+ }\reserved@a
+ }{%
+ \PackageInfo{scrhack}{ignorring #2 hack}%
+ }%
+}
+\BeforePackage{hyperref}{%
+ \scr@ifundefinedorrelax{hy@insteadofrefstepcounter}{}{%
+ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
+ detection of KOMA-Script class, that doesn't\MessageBreak
+ need that hack,}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
+ }%
+}
+\AfterPackage*{hyperref}{%
+ \if@scrhack@hyperref
+ \@ifpackagelater{hyperref}{2009/11/24}{%
+ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
+ detection of hyperref version, that doesn't\MessageBreak
+ need that hack,}%
+ \KOMAExecuteOptions[scrhack.sty]{hyperref=false}%
+ }{%
+ \AtEndOfPackage{%
+ \KOMA@key[scrhack.sty]{hyperref}[true]{%
+ \PackageWarning{scrhack}{option `hyperref=#1' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
+ }%
+ }%
+ \fi
+}
+\AfterPackage*{floatrow}{%
+ \KOMAoptions{float=false}%
+ \PackageInfo{scrhack}{option `float' deactivated}%
+ \KOMA@key[scrhack.sty]{floatrow}{%
+ \PackageWarning{scrhack}{option `floatrow' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi
+}
+\AfterPackage*{float}{%
+ \KOMA@key[scrhack.sty]{float}{%
+ \PackageWarning{scrhack}{option `float' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
+}
+\AfterPackage*{listings}{%
+ \@ifpackagelater{lstmisc}{2024/02/15}{%
+ \PackageInfo{scrhack}{listings hack deactivated because of\MessageBreak
+ detection of listings version, that doesn't\MessageBreak
+ need that hack,}%
+ \KOMAExecuteOptions[scrhack.sty]{listings=false}%
+ }{%
+ \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
+ }%
+ \KOMA@key[scrhack.sty]{listings}[true]{%
+ \PackageWarning{scrhack}{option `listings=#1' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+}
+\AfterPackage*{nomencl}{%
+ \KOMA@key[scrhack.sty]{nomencl}{%
+ \PackageWarning{scrhack}{option `nomencl' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@nomencl\scr@hack@load\@pkgextension{nomencl}\fi
+}
+\AfterPackage*{setspace}{%
+ \KOMA@key[scrhack.sty]{setspace}{%
+ \PackageWarning{scrhack}{option `setspace' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi
+}
+\AfterPackage*{lscape}{%
+ \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else
+ \KOMA@key[scrhack.sty]{lscape}{%
+ \PackageWarning{scrhack}{option `lscape' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \fi
+}
+\AtEndOfPackage{%
+ \if@scrhack@standardsections
+ \PackageInfo{scrhack}{loading standard classes sections hack}%
+ \input{standardsections.hak}%
+ \fi
+}
+\endinput
+%%
+%% End of file `scrhack-2023-07-07.sty'.
diff --git a/Master/texmf-dist/tex/latex/scrhack/scrhack.sty b/Master/texmf-dist/tex/latex/scrhack/scrhack.sty
new file mode 100644
index 00000000000..82ab328aaf5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/scrhack/scrhack.sty
@@ -0,0 +1,390 @@
+%%
+%% This is file `scrhack.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack.dtx (with options: `package')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from scrhack.sty.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+\DeclareRelease{v3.41}{2023-07-07}{scrhack-2023-07-07.sty}
+\DeclareCurrentRelease{}{2023-07-15}
+\ProvidesPackage{scrhack}
+ [2024-09-04 v3.42
+ scrhack emulation package]
+\ifnum 0=\ifcsname IfFormatAtLeastTF\endcsname
+ \IfFormatAtLeastTF{2022-06-01}{1}{0}%
+ \else
+ 0%
+ \fi\relax
+ \PackageError{scrhack}{LaTeX kernel too old}{%
+ The package needs at least LaTeX 2022-06-01.\MessageBreak
+ This error is fatal. Loading will be aborted.%
+ }%
+ \endinput
+\fi
+\ExplSyntaxOn
+\msg_new:nnn { scrhack } { option-too-late }
+ {
+ option~`#1'~after~loading~package~`#2'~ignored.
+ }
+\msg_new:nnn { scrhack } { deprecated-option }
+ {
+ deprecated~option~`#1'~ignored.
+ }
+\DeclareKeys{%
+ float .code = \__scrhack_switch_float:n { #1 },
+ float .default:n = true,
+ float .usage = preamble,
+}
+\bool_new:N \__scrhack_float_bool
+
+\cs_new:Nn \__scrhack_switch_float:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \@ifpackageloaded { floatbytocbasic }
+ {
+ \msg_info:nnnn { scrhack } { option-too-late }
+ { float = true } { floatbytocbasic }
+ }
+ {
+ \bool_if:NF \__scrhack_float_bool
+ {
+ \hook_gput_code:nnn { package/float/after } { scrhack }
+ {
+ \RequirePackage { floatbytocbasic }
+ }
+ \bool_gset_true:N \__scrhack_float_bool
+ }
+ }
+ }
+ {false} {
+ \@ifpackageloaded { floatbytocbasic }
+ {
+ \msg_warning:nnnn { scrhack } { option-too-late }
+ { float=false } { floatbytocbasic }
+ }
+ {
+ \bool_if:NT \__scrhack_float_bool
+ {
+ \hook_gremove_code:nn { package/float/after } { scrhack }
+ }
+ \bool_gset_false:N \@s@_float_bool
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { float }
+ }
+ }
+\SetKeys{float=true}
+\DeclareKeys{%
+ floatrow .code = \__scrhack_switch_floatrow:n { #1 },
+ floatrow .default:n = true,
+ floatrow .usage = preamble,
+}
+\bool_new:N \__scrhack_floatrow_bool
+
+\cs_new:Nn \__scrhack_switch_floatrow:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \@ifpackageloaded { floatrowbytocbasic }
+ {
+ \msg_info:nnnn { scrhack } { option-too-late }
+ { floatrow = true } { floatrowbytocbasic }
+ }
+ {
+ \bool_if:NF \__scrhack_floatrow_bool
+ {
+ \hook_gput_code:nnn { package/floatrow/after }
+ { scrhack }
+ {
+ \RequirePackage { floatrowbytocbasic }
+ }
+ \bool_gset_true:N \__scrhack_floatrow_bool
+ }
+ }
+ }
+ {false} {
+ \@ifpackageloaded { floatrowbytocbasic }
+ {
+ \msg_warning:nnnn { scrhack } { option-too-late }
+ { floatrow=false } { floatrowbytocbasic }
+ }
+ {
+ \bool_if:NT \__scrhack_floatrow_bool
+ {
+ \hook_gremove_code:nn { package/floatrow/after }
+ { scrhack }
+ }
+ \bool_gset_false:N \@s@_floatrow_bool
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { floatrow }
+ }
+ }
+\SetKeys{floatrow=true}
+\DeclareKeys{%
+ hyperref .code = \__scrhack_switch_hyperref:n { #1 },
+ hyperref .default:n = true,
+ hyperref .usage = preamble,
+}
+\cs_new:Nn \__scrhack_switch_hyperref:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \msg_warning:nnn { scrhack } { deprecated-option }
+ { hyperref=#1 }
+ }
+ {false} {
+ \msg_info:nnn { scrhack } { deprecated-option }
+ { hyperref=#1 }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { hyperref }
+ }
+ }
+\DeclareKeys{%
+ listings .code = \__scrhack_switch_listings:n { #1 },
+ listings .default:n = true,
+ listings .usage = preamble,
+}
+\cs_new:Nn \__scrhack_switch_listings:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \msg_warning:nnn { scrhack } { deprecated-option }
+ { listings=#1 }
+ }
+ {false} {
+ \msg_info:nnn { scrhack } { deprecated-option }
+ { listings=#1 }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { listings }
+ }
+ }
+\DeclareKeys{%
+ lscape .code = \__scrhack_switch_lscape:n { #1 },
+ lscape .default:n = true,
+ lscape .usage = preamble,
+}
+\bool_new:N \__scrhack_lscape_bool
+
+\cs_new:Nn \__scrhack_switch_lscape:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \@ifpackageloaded { lscapeenhanced }
+ {
+ \msg_info:nnnn { scrhack } { option-too-late }
+ { lscape = true } { lscapeenhanced }
+ }
+ {
+ \bool_if:NF \__scrhack_lscape_bool
+ {
+ \hook_gput_code:nnn { package/lscape/after }
+ { scrhack }
+ {
+ \RequirePackage { lscapeenhanced }
+ }
+ \bool_gset_true:N \__scrhack_lscape_bool
+ }
+ }
+ }
+ {false} {
+ \@ifpackageloaded { lscapeenhanced }
+ {
+ \msg_warning:nnnn { scrhack } { option-too-late }
+ { lscape=false } { lscapeenhanced }
+ }
+ {
+ \bool_if:NT \__scrhack_lscape_bool
+ {
+ \hook_gremove_code:nn { package/lscape/after }
+ { scrhack }
+ }
+ \bool_gset_false:N \@s@_lscape_bool
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { lscape }
+ }
+ }
+\SetKeys{lscape=true}
+\DeclareKeys{%
+ nomencl .code = \__scrhack_switch_nomencl:n { #1 },
+ nomencl .default:n = true,
+ nomencl .usage = preamble,
+}
+\cs_new:Nn \__scrhack_switch_nomencl:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \msg_warning:nnn { scrhack } { deprecated-option }
+ { nomencl=#1 }
+ }
+ {false} {
+ \msg_info:nnn { scrhack } { deprecated-option }
+ { nomencl=#1 }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { nomencl }
+ }
+ }
+\DeclareKeys{%
+ setspace .code = \__scrhack_switch_setspace:n { #1 },
+ setspace .default:n = true,
+ setspace .usage = preamble,
+}
+\bool_new:N \__scrhack_setspace_bool
+
+\cs_new:Nn \__scrhack_switch_setspace:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \@ifpackageloaded { setspaceenhanced }
+ {
+ \msg_info:nnnn { scrhack } { option-too-late }
+ { setspace = true } { setspaceenhanced }
+ }
+ {
+ \bool_if:NF \__scrhack_setspace_bool
+ {
+ \hook_gput_code:nnn { package/setspace/after } { scrhack }
+ {
+ \exp_last_unbraced:Ne \RequirePackage
+ {
+ [ \use:c { @raw@opt@setspace.sty },
+ byselectfont,
+ keepfontsize ]
+ }
+ { setspaceenhanced }
+ }
+ \bool_gset_true:N \__scrhack_setspace_bool
+ }
+ }
+ }
+ {false} {
+ \@ifpackageloaded { setspaceenhanced }
+ {
+ \msg_warning:nnnn { scrhack } { option-too-late }
+ { setspace=false } { setspaceenhanced }
+ }
+ {
+ \bool_if:NT \__scrhack_setspace_bool
+ {
+ \hook_gremove_code:nn { package/setspace/after } { scrhack }
+ }
+ \bool_gset_false:N \@s@_setspace_bool
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { setspace }
+ }
+ }
+\SetKeys{setspace=true}
+\DeclareKeys{%
+ standardsections .code = \__scrhack_switch_standardsectioning:n { #1 },
+ standardsections .default:n = true,
+ standardsections .usage = preamble,
+}
+\bool_new:N \__scrhack_standardsectioning_bool
+
+\cs_new:Nn \__scrhack_switch_standardsectioning:n
+ {
+ \str_case_e:nnF { \str_foldcase:n { #1 } }
+ {
+ {true} {
+ \@ifpackageloaded { standardsectioning }
+ {
+ \msg_info:nnnn { scrhack } { option-too-late }
+ { standardsectioning = true } { standardsectioning }
+ }
+ {
+ \bool_if:NF \__scrhack_standardsectioning_bool
+ {
+ \str_set:Nx \l_tmpa_str { \cs_meaning:N \normalsize }
+ \str_if_in:NnTF
+ \l_tmpa_str
+ { \@latex@error }
+ {
+ \hook_gput_code:nnn { class/after } { scrhack }
+ {
+ \RequirePackage { standardsectioning }
+ \exp_args:Nnnx \hook_gput_code:nnn
+ { begindocument/before } { scrhack }
+ {
+ \exp_not:N \cs_gset:Npn
+ \exp_after:wN \exp_not:N
+ \cs:w ver@standardsectioning.sty \cs_end:
+ {
+ \cs:w ver@standardsectioning.sty \cs_end:
+ }
+ }
+ \cs_undefine:c { var@standardsectioning.sty }
+ }
+ \bool_gset_true:N \__scrhack_standardsectioning_bool
+ }
+ {
+ \RequirePackage{ standardsectioning }
+ \bool_gset_false:N \__scrhack_standardsectioning_bool
+ }
+ }
+ }
+ }
+ {false} {
+ \@ifpackageloaded { standardsectioning }
+ {
+ \msg_warning:nnnn { scrhack } { option-too-late }
+ { standardsectioning=false } { standardsectioning }
+ }
+ {
+ \bool_if:NT \__scrhack_standardsectioning_bool
+ {
+ \hook_gremove_code:nn { class/after } { scrhack }
+ }
+ \bool_gset_false:N \@s@_standardsectioning_bool
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { keys } { boolean-values-only } { standardsectioning }
+ }
+ }
+\ExplSyntaxOff
+\ProcessKeyOptions\relax
+\endinput
+%%
+%% End of file `scrhack.sty'.
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty
index 1ac9a8c7cbd..eb255fb341e 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-08-12} {4.3.2}
+\ProvidesExplPackage {se2colors} {2024-09-19} {4.3.4}
{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 e86497c76be..a6fceb645c0 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-08-12} {4.3.2}
+\ProvidesExplPackage {se2fonts} {2024-09-19} {4.3.4}
{A font-selection support package for the se2thesis bundle}
\msg_new:nnnn { seiifonts } { pdflatex-used }
{ You~ are~ using~ pdfLaTeX~ with~ the~ se2fonts~ packages.}
@@ -78,6 +78,7 @@
{ Switch~ to~ pdfTeX~ or~ (preferably)~ LuaTeX. }
\msg_error:nn { seiifonts } { xetex-not-supported }
}
+\RequirePackage{mismath}
\ifengineTF { \luatexengine }
{
\RequirePackage{fontspec}
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty
index ae26465fee6..afbe012bdd7 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-08-12} {4.3.2}
+\ProvidesExplPackage {se2packages} {2024-09-19} {4.3.4}
{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 7893d3da55c..72836dca419 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-08-12} {4.3.2}
+\ProvidesExplClass {se2thesis} {2024-09-19} {4.3.4}
{A thesis class for the Chair of Software Engineering II}
\prg_new_conditional:Nnn \slcd_package_if_loaded:n { p, T, F, TF }
{
@@ -335,10 +335,9 @@
\DeclareNewLayer[
mode=picture,
foreground,
- align=tr,
- hoffset=\oddsidemargin+1.5in+\textwidth,
+ hoffset=\paperwidth-\coverpagerightmargin-\box_wd:N \l__slcd_logo_box,
voffset=\coverpagetopmargin+1.5in+\ht\strutbox,
- width=\textwidth - \box_wd:N \l__slcd_logo_box,
+ width=\box_wd:N \l__slcd_logo_box,
height=\box_ht:N \l__slcd_logo_box,
contents={\putUL{\box_use:N \l__slcd_logo_box}},
]{title.seii.logo}
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl
index 734d6f34a1f..beb56a91447 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/08/12]
+\ProvideDictionaryFor{English}{se2translations}[2024/09/19]
\ProvideDictTranslation{abstract}{abstract}
\ProvideDictTranslation{Abstract}{Abstract}
\ProvideDictTranslation{acknowledgement}{acknowledgement}
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl
index 867b6e3b1aa..5cf14e800fe 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/08/12]
+\ProvideDictionaryFor{German}{se2translations}[2024/09/19]
\ProvideDictTranslation{abstract}{Zusammenfassung}
\ProvideDictTranslation{Abstract}{Zusammenfassung}
\ProvideDictTranslation{acknowledgement}{Danksagung}
diff --git a/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls b/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
index 685f736aefa..c1f24a16ad3 100644
--- a/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
+++ b/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
@@ -1,20 +1,13 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{caesar_book.cls}[2020/03/24 v1.00a Caesar book]
-% Load the amsmath and the mhchem package before loading microtype
-\RequirePackage{amsmath}% better math handling
-\RequirePackage[version=3]{mhchem}% chemical formulas
+\ProvidesFile{caesar_book.cls}[2024/09/12 v1.20 Caesar book]
\LoadClassWithOptions{book}% this is derived from the book class
\RequirePackage{sidenotes}% put annotations, tables and figures in the margin
-\captionsetup{font=footnotesize, skip=4pt}
-\RequirePackage[maxfloats=45]{morefloats}% a lot of marginals need more float 'memory'
+\captionsetup{font=footnotesize, skip=4pt} % use values matching the style
+\extrafloats{45}% a lot of marginals need more float 'memory'
\RequirePackage{marginfix}% automatically adjust the side-floats nicely
-\newcommand{\caesar@letterspace}[1]{#1}% allow LuaLaTeX, LaTeX letterspacing
\RequirePackage{microtype}% microtypography
-\@ifpackagelater{microtype}{2011/08/18}% xxx allow LaTeX and earlier microtype
-{\renewcommand{\caesar@letterspace}[1]{\textls{#1}}}%
-{\AtEndDocument{\ClassWarningNoLine{caesar_book}{Need newest microtype for letterspacing.}}}
%
-% Set page layout geometry -- default is science-book format
+% Set page layout geometry - default is science-book format
% this means a (portrait) paper size of 170mm x 240mm
%
\RequirePackage{geometry}
@@ -24,7 +17,9 @@
%
\renewcommand{\normalsize}{\fontsize{10pt}{13pt}\selectfont}%
\renewcommand{\footnotesize}{\fontsize{8pt}{10pt}\selectfont}%
-% fullwidth environment, text across textwidth+marginparsep+marginparwidth
+%
+% fullwidth environment, text across textwidth + marginparsep + marginparwidth
+%
\newlength{\overhang}
\setlength{\overhang}{\marginparwidth}
\addtolength{\overhang}{\marginparsep}
@@ -38,7 +33,9 @@
{\end{adjustwidth*}}%
{\end{adjustwidth}}%
}
+%
% set up the fonts
+%
\RequirePackage{ifluatex}
\ifluatex% in LuaLateX we use fontspec
\RequirePackage{fontspec}%
@@ -47,14 +44,15 @@
\setmainfont[Ligatures=TeX, Numbers=OldStyle]{Tex Gyre Pagella}% free Palatino clone
\setmonofont{Tex Gyre Cursor}% works okay with palatino
\setsansfont{Tex Gyre Heros}% work okay with palatino
- \mhchemoptions{textfontcommand=\addfontfeature{Numbers=Lining}} % use lining numbers for chemical formulas
\else% in LaTeX we load fonts differently
\IfFileExists{mathpazo.sty}{\RequirePackage[osf,sc]{mathpazo}}{}% palatino clone for math
\IfFileExists{helvet.sty}{\RequirePackage[scaled=0.90]{helvet}}{}% helvetica is sans serif font
\IfFileExists{beramono.sty}{\RequirePackage[scaled=0.85]{beramono}}{}% beramono is tt font
\RequirePackage[T1]{fontenc}% finally load fontenc
\fi
-% nice headings and TOC
+%
+% nice headings, TOC, page numbering ...
+%
\RequirePackage{titlesec,titletoc}% load the helper package
\setcounter{secnumdepth}{-1}% no numbering at all
\titleformat{\chapter}[display]{\relax\itshape\huge}{}{0pt}{\huge\rmfamily\itshape}[]% chapter format
@@ -75,7 +73,7 @@
\renewcommand{\headrulewidth}{0pt}% The running heads and feet do not have rules
\renewcommand{\footrulewidth}{0pt}
\fancyhf{}% set up the page numbering
-{\fancyfoot[LE,RO]{\thepage}}
+\fancyfoot[LE,RO]{\thepage}
\fancypagestyle{plain}{%
\fancyhf{}
}
@@ -87,14 +85,13 @@
\@savemarbox\@marbox{\marginparstyle#1}% marginparstyle is a prefix to the marginpar text now
\global\setbox\@currbox\copy\@marbox % the rest of the definition is taken from original LaTeX
\@xympar}
-\renewcommand*{\marginfont}{\marginparstyle}
+\@ifpackageloaded{marginnote}{\renewcommand*{\marginfont}{\marginparstyle}}{} % adjust marginnote font in the same way
% setup itemize and enumerate
\RequirePackage{enumitem}
\setlist[itemize]{leftmargin=*}
-%\renewcommand{\labelitemi}{}
-% compatibility with T-L
%
% titlepage
+%
\RequirePackage{ifthen}
\newcommand{\publisher}[1]{\gdef\caesar@publisher{#1}}
\gdef\caesar@thesis{}
@@ -106,7 +103,7 @@
% first count the number of lines in the title
\begin{fullwidth}
\raggedright%
- \setbox0\vbox{\noindent\fontsize{30}{38}\selectfont\caesar@letterspace{\MakeTextUppercase{\@title}}\par
+ \setbox0\vbox{\noindent\fontsize{30}{38}\selectfont\textls{\MakeTextUppercase{\@title}}\par
\count@\z@
\loop
\unskip\unpenalty\unskip\unpenalty\unskip
@@ -124,12 +121,12 @@
\sffamily%
%\begin{fullwidth}%
\vspace*{0em}% one line extra space
- \noindent\LARGE\caesar@letterspace{\MakeTextUppercase{\@author}}\par
+ \noindent\LARGE\textls{\MakeTextUppercase{\@author}}\par
\vfill%
- \noindent\fontsize{30}{38}\selectfont\textcolor{darkgray}{\caesar@letterspace{\MakeTextUppercase{\@title}}}\par
+ \noindent\fontsize{30}{38}\selectfont\textcolor{darkgray}{\textls{\MakeTextUppercase{\@title}}}\par
\vfill%
\vspace{\caesar@titlespace}%
- \noindent\Large\caesar@letterspace{\MakeTextUppercase{\caesar@publisher}}\par
+ \noindent\Large\textls{\MakeTextUppercase{\caesar@publisher}}\par
%\end{fullwidth}%
}%
\thispagestyle{empty}%
@@ -146,6 +143,9 @@
\section*{\caesar@thesis\@author}
%
}
+%
+% higher level macros go here
+%
\newcommand\newthought[1]{%
\addvspace{1.0\baselineskip plus 0.5ex minus 0.2ex}%
\noindent\textsc{#1}%
diff --git a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
index 7b21e85bd06..c517b817c68 100644
--- a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
+++ b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
@@ -13,10 +13,10 @@
%% about the files the work consists of.
%%
\RequirePackage{l3keys2e}%
-\ProvidesExplPackage{sidenotes}{2016/04/21}{1.00}{rich text in the margin for LaTeX}
-\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
-\RequirePackage{caption} % handles the captions (in the margin)
-\RequirePackage{xparse} % new LaTeX3 syntax to define macros and environments
+\ProvidesExplPackage{sidenotes}{2024/09/12}{1.20}{Rich text in the margin for LaTeX}
+\RequirePackage{marginnote} % Provides an offset option for the marginals instead of a float
+\RequirePackage{caption} % Handles the captions (in the margin)
+\RequirePackage{xparse} % New LaTeX3 syntax to define macros and environments
\RequirePackage[strict]{changepage} % Changepage package for symmetric twoside handling
\ExplSyntaxOn
\keys_define:nn { sidenotes }
@@ -26,7 +26,7 @@
\ProcessKeysOptions { sidenotes }
\newcounter{sidenote} % make a counter
\setcounter{sidenote}{1} % init the counter
-\DeclareExpandableDocumentCommand{\IfNoValueOrEmptyTF}{ m m m }
+\DeclareExpandableDocumentCommand{\IfNoValueOrEmptyTF}{ m +m +m }
{
\IfNoValueTF{#1}
{#2}
@@ -57,7 +57,7 @@
{\@sidenotes@thesidenotemark{,}}
{}
}
-\NewDocumentCommand \@sidenotes@placemarginal { m m }
+\NewDocumentCommand \@sidenotes@placemarginal { +m +m }
{
\IfNoValueOrEmptyTF{#1}
{\marginpar{#2}}
@@ -159,9 +159,11 @@
{
\begin{figure}[#1]
\begin{autoadjustwidth}{}{-\@sidenotes@extrawidth}
+ \begin{minipage}{\linewidth}
\captionsetup{style=widefigure}
}
{
+\end{minipage}
\end{autoadjustwidth}
\end{figure}
}
@@ -170,9 +172,11 @@
{
\begin{table}[#1]
\begin{autoadjustwidth}{}{-\@sidenotes@extrawidth}
+ \begin{minipage}{\linewidth}
\captionsetup{style=widetable}
}
{
+\end{minipage}
\end{autoadjustwidth}
\end{table}
}
diff --git a/Master/texmf-dist/tex/latex/sim-os-menus/sim-os-menus.sty b/Master/texmf-dist/tex/latex/sim-os-menus/sim-os-menus.sty
index 01da065abb9..ee8a15a8eba 100644
--- a/Master/texmf-dist/tex/latex/sim-os-menus/sim-os-menus.sty
+++ b/Master/texmf-dist/tex/latex/sim-os-menus/sim-os-menus.sty
@@ -2,7 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sim-os-menus}[2023/11/14 0.1.1 Present 'context menu'/'terminal'/'windows', with TikZ or tcolorbox (en of fr commands)]
+\ProvidesPackage{sim-os-menus}[2024/09/28 0.1.3 Present 'context menu'/'terminal'/'windows', with TikZ or tcolorbox (en or fr commands)]
+% 0.1.3 DirTree avec forest
+% 0.1.2 Ajout d'une visionneuse type python
% 0.1.1 French version of the commands
% 0.1.0 Initial version
@@ -794,4 +796,180 @@
\endtcolorbox%
}
+%====PYVIEWER (OK) 0.1.2
+\tcbset{StylePYViewer/.style={%
+ enhanced,boxrule=1pt,arc=3pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=gray,colback=lightgray!5,colbacktitle=lightgray!15,colupper=black,coltitle=black,titlerule=0.4pt,left=3pt,top=2pt,bottom=2pt,right=2pt,middle=0pt,fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[PYVisionn]{Titre={Éditeur Python},Align={center},Largeur={\linewidth},AlignH={flush left},Icones=true}
+
+\NewDocumentCommand\PYVIewerTitre{ s }{%
+ \IfBooleanTF{#1}%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PYVisionn]{Titre} && \faPython \\
+ \end{tblr}
+ }%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]l|[1pt]l|[1pt]l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PYVisionn]{Titre} & \faFile*[regular]~~\faIcon[regular]
+ {file-code}~~\faSave&\faPlay~~\faStop&\faBug&& \faPython \\
+ \end{tblr}
+ }%
+}
+
+\NewDocumentEnvironment{VisionnPY}{ O{} m }
+{%
+ \restoreKV[PYVisionn]%
+ \setKV[PYVisionn]{#1}%
+ \tcolorbox[StylePYViewer,{\useKV[PYVisionn]{Align}},title={\ifboolKV[PYVisionn]{Icones}{\PYVIewerTitre}{\PYVIewerTitre*}},width={\useKV[PYVisionn]{Largeur}},halign={\useKV[PYVisionn]{AlignH}},#2]
+}%
+{%
+ \endtcolorbox%
+}
+
+\setKVdefault[PYViewer]{title={Python editor},align={center},width={\linewidth},halign={flush left},icons=true}
+
+\NewDocumentCommand\PYVIewerTitle{ s }{%
+ \IfBooleanTF{#1}%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PYViewer]{title} && \faPython \\
+ \end{tblr}
+ }%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]l|[1pt]l|[1pt]l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PYViewer]{title} & \faFile*[regular]~~\faIcon[regular]
+ {file-code}~~\faSave&\faPlay~~\faStop&\faBug&& \faPython \\
+ \end{tblr}
+ }%
+}
+
+\NewDocumentEnvironment{PYViewer}{ O{} m }
+{%
+ \restoreKV[PYViewer]%
+ \setKV[PYViewer]{#1}%
+ \tcolorbox[StylePYViewer,{\useKV[PYViewer]{align}},title={\ifboolKV[PYViewer]{icons}{\PYVIewerTitle}{\PYVIewerTitle*}},width={\useKV[PYViewer]{width}},halign={\useKV[PYViewer]{halign}},#2]
+}%
+{%
+ \endtcolorbox%
+}
+
+%====FOLDERTREEE (forest)
+\RequirePackage{forest}
+\useforestlibrary{edges}
+
+%\def\foldertreecolor{yellow!50!pink}
+%\def\filefoldertreecolor{gray}
+
+\NewDocumentCommand\dirforest{ s O{\foldertreecolor} }{%
+ \IfBooleanTF{#1}{}{\scalebox{0.85}[0.85]{\color{#2}\foldertreeiconfolder}\hspace{0.25em}}%
+}
+
+\NewDocumentCommand\fileforest{ s O{\filefoldertreecolor} }{%
+ \IfBooleanTF{#1}{}{\scalebox{0.85}[0.85]{\color{#2}\foldertreeiconfile}\hspace{0.25em}}%
+}
+
+\tikzset{FTdir/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest}}
+\tikzset{FTfile/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest}}
+\tikzset{FTedge/.style={semithick,darkgray}}
+
+\defKV[forestdirtree]{%
+ font=\def\forestditreefont{#1},%
+ coliconfolder=\def\foldertreecolor{#1},%
+ iconfolder=\def\foldertreeiconfolder{#1},%
+ coliconfile=\def\filefoldertreecolor{#1},%
+ vsep=\def\filefoldertreevsep{#1},%
+ iconfile=\def\foldertreeiconfile{#1}
+}
+
+\setKVdefault[forestdirtree]{%
+ font=\footnotesize\ttfamily,%
+ coliconfolder=gray,%
+ coliconfile=gray,%
+ iconfolders=true,%
+ iconfiles=false,%
+ vsep=0.15em,%
+ iconfolder={\faFolderOpen},%
+ iconfile={\faIcon*[regular]{file}}
+}
+
+\NewDocumentEnvironment{ForestDirTree}{ O{} m +b }
+{
+ \restoreKV[forestdirtree]%
+ \setKV[forestdirtree]{#1}%
+ \ifboolKV[forestdirtree]{iconfolders}%
+ {%
+ \tikzset{FTdir/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest}}%
+ }%
+ {%
+ \tikzset{FTdir/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest*}}%
+ }%
+ \ifboolKV[forestdirtree]{iconfiles}%
+ {%
+ \tikzset{FTfile/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest}}%
+ }%
+ {%
+ \tikzset{FTfile/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest*}}%
+ }%
+ \forest
+ for tree={s sep=\filefoldertreevsep,folder,grow'=0,folder indent=0.5em,fit=band,font=\forestditreefont,edge={FTedge},#2}
+ #3
+}%
+{%
+ \endforest%
+}
+
+\tikzset{ADdos/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest}}
+\tikzset{ADfic/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest}}
+\tikzset{ADtrait/.style={semithick,darkgray}}
+
+\defKV[forestarbor]{%
+ Police=\def\forestditreefont{#1},%
+ CoulIcoD=\def\foldertreecolor{#1},%
+ CoulIcoF=\def\filefoldertreecolor{#1},%
+ EspaceV=\def\filefoldertreevsep{#1},%
+ IcoD=\def\foldertreeiconfolder{#1},%
+ IcoF=\def\foldertreeiconfile{#1}
+}
+
+\setKVdefault[forestarbor]{%
+ Police=\footnotesize\ttfamily,%
+ CoulIcoD=gray,%
+ CoulIcoF=gray,%
+ AffIcoD=true,%
+ AffIcoF=false,%
+ EspaceV=0.15em,%
+ IcoD={\faFolderOpen},%
+ IcoF={\faIcon*[regular]{file}}
+}
+
+\NewDocumentEnvironment{ArborDossiers}{ O{} m +b }
+{
+ \restoreKV[forestarbor]%
+ \setKV[forestarbor]{#1}%
+ \ifboolKV[forestarbor]{AffIcoD}%
+ {%
+ \tikzset{ADdos/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest}}%
+ }%
+ {%
+ \tikzset{ADdos/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\dirforest*}}%
+ }%
+ \ifboolKV[forestarbor]{AffIcoF}%
+ {%
+ \tikzset{ADfic/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest}}%
+ }%
+ {%
+ \tikzset{ADfic/.style={inner sep=1pt,execute at begin node=\vphantom{(pL)}\fileforest*}}%
+ }%
+ \forest
+ for tree={s sep=\filefoldertreevsep,folder,grow'=0,folder indent=0.5em,fit=band,font=\forestditreefont,edge={ADtrait},#2}
+ #3
+}%
+{%
+ \endforest%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty
index c3e0756ef8a..849470e8326 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/08/16 13.5.0 Simple Icons 13.5.0 Logos]
+\ProvidesPackage{simpleicons}[2024/09/27 13.11.0 Simple Icons 13.11.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 ca8e6a9ed63..e3ab26aa171 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
@@ -5,3158 +5,3202 @@
\expandafter\def\csname simpleicon@1passwordicon\endcsname {\simpleiconsmapone\symbol{3}}
\expandafter\def\csname simpleicon@2fasicon\endcsname {\simpleiconsmapone\symbol{4}}
\expandafter\def\csname simpleicon@2kicon\endcsname {\simpleiconsmapone\symbol{5}}
- \expandafter\def\csname simpleicon@365datascienceicon\endcsname {\simpleiconsmapone\symbol{6}}
- \expandafter\def\csname simpleicon@3micon\endcsname {\simpleiconsmapone\symbol{7}}
- \expandafter\def\csname simpleicon@42icon\endcsname {\simpleiconsmapone\symbol{8}}
- \expandafter\def\csname simpleicon@4chanicon\endcsname {\simpleiconsmapone\symbol{9}}
- \expandafter\def\csname simpleicon@4dicon\endcsname {\simpleiconsmapone\symbol{10}}
- \expandafter\def\csname simpleicon@500pxicon\endcsname {\simpleiconsmapone\symbol{11}}
- \expandafter\def\csname simpleicon@7zipicon\endcsname {\simpleiconsmapone\symbol{12}}
- \expandafter\def\csname simpleicon@99designsicon\endcsname {\simpleiconsmapone\symbol{13}}
- \expandafter\def\csname simpleicon@9gagicon\endcsname {\simpleiconsmapone\symbol{14}}
- \expandafter\def\csname simpleicon@abbotticon\endcsname {\simpleiconsmapone\symbol{15}}
- \expandafter\def\csname simpleicon@abbrobotstudioicon\endcsname {\simpleiconsmapone\symbol{16}}
- \expandafter\def\csname simpleicon@abbvieicon\endcsname {\simpleiconsmapone\symbol{17}}
- \expandafter\def\csname simpleicon@aboutdotmeicon\endcsname {\simpleiconsmapone\symbol{18}}
- \expandafter\def\csname simpleicon@abstracticon\endcsname {\simpleiconsmapone\symbol{19}}
- \expandafter\def\csname simpleicon@abusedotchicon\endcsname {\simpleiconsmapone\symbol{20}}
- \expandafter\def\csname simpleicon@academiaicon\endcsname {\simpleiconsmapone\symbol{21}}
- \expandafter\def\csname simpleicon@accentureicon\endcsname {\simpleiconsmapone\symbol{22}}
- \expandafter\def\csname simpleicon@accusofticon\endcsname {\simpleiconsmapone\symbol{23}}
- \expandafter\def\csname simpleicon@acericon\endcsname {\simpleiconsmapone\symbol{24}}
- \expandafter\def\csname simpleicon@acmicon\endcsname {\simpleiconsmapone\symbol{25}}
- \expandafter\def\csname simpleicon@actigraphicon\endcsname {\simpleiconsmapone\symbol{26}}
- \expandafter\def\csname simpleicon@activisionicon\endcsname {\simpleiconsmapone\symbol{27}}
- \expandafter\def\csname simpleicon@activitypubicon\endcsname {\simpleiconsmapone\symbol{28}}
- \expandafter\def\csname simpleicon@actixicon\endcsname {\simpleiconsmapone\symbol{29}}
- \expandafter\def\csname simpleicon@acuraicon\endcsname {\simpleiconsmapone\symbol{30}}
- \expandafter\def\csname simpleicon@adafruiticon\endcsname {\simpleiconsmapone\symbol{31}}
- \expandafter\def\csname simpleicon@adblockicon\endcsname {\simpleiconsmapone\symbol{32}}
- \expandafter\def\csname simpleicon@adblockplusicon\endcsname {\simpleiconsmapone\symbol{33}}
- \expandafter\def\csname simpleicon@adguardicon\endcsname {\simpleiconsmapone\symbol{34}}
- \expandafter\def\csname simpleicon@adidasicon\endcsname {\simpleiconsmapone\symbol{35}}
- \expandafter\def\csname simpleicon@adminericon\endcsname {\simpleiconsmapone\symbol{36}}
- \expandafter\def\csname simpleicon@adobeicon\endcsname {\simpleiconsmapone\symbol{37}}
- \expandafter\def\csname simpleicon@adobeacrobatreadericon\endcsname {\simpleiconsmapone\symbol{38}}
- \expandafter\def\csname simpleicon@adobeaftereffectsicon\endcsname {\simpleiconsmapone\symbol{39}}
- \expandafter\def\csname simpleicon@adobeauditionicon\endcsname {\simpleiconsmapone\symbol{40}}
- \expandafter\def\csname simpleicon@adobecreativecloudicon\endcsname {\simpleiconsmapone\symbol{41}}
- \expandafter\def\csname simpleicon@adobedreamweavericon\endcsname {\simpleiconsmapone\symbol{42}}
- \expandafter\def\csname simpleicon@adobefontsicon\endcsname {\simpleiconsmapone\symbol{43}}
- \expandafter\def\csname simpleicon@adobeillustratoricon\endcsname {\simpleiconsmapone\symbol{44}}
- \expandafter\def\csname simpleicon@adobeindesignicon\endcsname {\simpleiconsmapone\symbol{45}}
- \expandafter\def\csname simpleicon@adobelightroomicon\endcsname {\simpleiconsmapone\symbol{46}}
- \expandafter\def\csname simpleicon@adobelightroomclassicicon\endcsname {\simpleiconsmapone\symbol{47}}
- \expandafter\def\csname simpleicon@adobephotoshopicon\endcsname {\simpleiconsmapone\symbol{48}}
- \expandafter\def\csname simpleicon@adobepremiereproicon\endcsname {\simpleiconsmapone\symbol{49}}
- \expandafter\def\csname simpleicon@adobexdicon\endcsname {\simpleiconsmapone\symbol{50}}
- \expandafter\def\csname simpleicon@adonisjsicon\endcsname {\simpleiconsmapone\symbol{51}}
- \expandafter\def\csname simpleicon@adpicon\endcsname {\simpleiconsmapone\symbol{52}}
- \expandafter\def\csname simpleicon@adrollicon\endcsname {\simpleiconsmapone\symbol{53}}
- \expandafter\def\csname simpleicon@adventofcodeicon\endcsname {\simpleiconsmapone\symbol{54}}
- \expandafter\def\csname simpleicon@adyenicon\endcsname {\simpleiconsmapone\symbol{55}}
- \expandafter\def\csname simpleicon@aegisauthenticatoricon\endcsname {\simpleiconsmapone\symbol{56}}
- \expandafter\def\csname simpleicon@aerlingusicon\endcsname {\simpleiconsmapone\symbol{57}}
- \expandafter\def\csname simpleicon@aerofloticon\endcsname {\simpleiconsmapone\symbol{58}}
- \expandafter\def\csname simpleicon@aeromexicoicon\endcsname {\simpleiconsmapone\symbol{59}}
- \expandafter\def\csname simpleicon@aerospikeicon\endcsname {\simpleiconsmapone\symbol{60}}
- \expandafter\def\csname simpleicon@aewicon\endcsname {\simpleiconsmapone\symbol{61}}
- \expandafter\def\csname simpleicon@affineicon\endcsname {\simpleiconsmapone\symbol{62}}
- \expandafter\def\csname simpleicon@affinityicon\endcsname {\simpleiconsmapone\symbol{63}}
- \expandafter\def\csname simpleicon@affinitydesignericon\endcsname {\simpleiconsmapone\symbol{64}}
- \expandafter\def\csname simpleicon@affinityphotoicon\endcsname {\simpleiconsmapone\symbol{65}}
- \expandafter\def\csname simpleicon@affinitypublishericon\endcsname {\simpleiconsmapone\symbol{66}}
- \expandafter\def\csname simpleicon@aframeicon\endcsname {\simpleiconsmapone\symbol{67}}
- \expandafter\def\csname simpleicon@afterpayicon\endcsname {\simpleiconsmapone\symbol{68}}
- \expandafter\def\csname simpleicon@agoraicon\endcsname {\simpleiconsmapone\symbol{69}}
- \expandafter\def\csname simpleicon@aibicon\endcsname {\simpleiconsmapone\symbol{70}}
- \expandafter\def\csname simpleicon@aidungeonicon\endcsname {\simpleiconsmapone\symbol{71}}
- \expandafter\def\csname simpleicon@aiohttpicon\endcsname {\simpleiconsmapone\symbol{72}}
- \expandafter\def\csname simpleicon@aiqfomeicon\endcsname {\simpleiconsmapone\symbol{73}}
- \expandafter\def\csname simpleicon@airasiaicon\endcsname {\simpleiconsmapone\symbol{74}}
- \expandafter\def\csname simpleicon@airbnbicon\endcsname {\simpleiconsmapone\symbol{75}}
- \expandafter\def\csname simpleicon@airbrakeicon\endcsname {\simpleiconsmapone\symbol{76}}
- \expandafter\def\csname simpleicon@airbusicon\endcsname {\simpleiconsmapone\symbol{77}}
- \expandafter\def\csname simpleicon@airbyteicon\endcsname {\simpleiconsmapone\symbol{78}}
- \expandafter\def\csname simpleicon@aircallicon\endcsname {\simpleiconsmapone\symbol{79}}
- \expandafter\def\csname simpleicon@aircanadaicon\endcsname {\simpleiconsmapone\symbol{80}}
- \expandafter\def\csname simpleicon@airchinaicon\endcsname {\simpleiconsmapone\symbol{81}}
- \expandafter\def\csname simpleicon@airfranceicon\endcsname {\simpleiconsmapone\symbol{82}}
- \expandafter\def\csname simpleicon@airindiaicon\endcsname {\simpleiconsmapone\symbol{83}}
- \expandafter\def\csname simpleicon@airplayaudioicon\endcsname {\simpleiconsmapone\symbol{84}}
- \expandafter\def\csname simpleicon@airplayvideoicon\endcsname {\simpleiconsmapone\symbol{85}}
- \expandafter\def\csname simpleicon@airtableicon\endcsname {\simpleiconsmapone\symbol{86}}
- \expandafter\def\csname simpleicon@airtelicon\endcsname {\simpleiconsmapone\symbol{87}}
- \expandafter\def\csname simpleicon@airtransaticon\endcsname {\simpleiconsmapone\symbol{88}}
- \expandafter\def\csname simpleicon@ajvicon\endcsname {\simpleiconsmapone\symbol{89}}
- \expandafter\def\csname simpleicon@akamaiicon\endcsname {\simpleiconsmapone\symbol{90}}
- \expandafter\def\csname simpleicon@akauntingicon\endcsname {\simpleiconsmapone\symbol{91}}
- \expandafter\def\csname simpleicon@akiflowicon\endcsname {\simpleiconsmapone\symbol{92}}
- \expandafter\def\csname simpleicon@alacrittyicon\endcsname {\simpleiconsmapone\symbol{93}}
- \expandafter\def\csname simpleicon@alamyicon\endcsname {\simpleiconsmapone\symbol{94}}
- \expandafter\def\csname simpleicon@albertheijnicon\endcsname {\simpleiconsmapone\symbol{95}}
- \expandafter\def\csname simpleicon@albyicon\endcsname {\simpleiconsmapone\symbol{96}}
- \expandafter\def\csname simpleicon@alchemyicon\endcsname {\simpleiconsmapone\symbol{97}}
- \expandafter\def\csname simpleicon@aldinordicon\endcsname {\simpleiconsmapone\symbol{98}}
- \expandafter\def\csname simpleicon@aldisudicon\endcsname {\simpleiconsmapone\symbol{99}}
- \expandafter\def\csname simpleicon@alfaromeoicon\endcsname {\simpleiconsmapone\symbol{100}}
- \expandafter\def\csname simpleicon@alfredicon\endcsname {\simpleiconsmapone\symbol{101}}
- \expandafter\def\csname simpleicon@algoliaicon\endcsname {\simpleiconsmapone\symbol{102}}
- \expandafter\def\csname simpleicon@algorandicon\endcsname {\simpleiconsmapone\symbol{103}}
- \expandafter\def\csname simpleicon@alibabacloudicon\endcsname {\simpleiconsmapone\symbol{104}}
- \expandafter\def\csname simpleicon@alibabadotcomicon\endcsname {\simpleiconsmapone\symbol{105}}
- \expandafter\def\csname simpleicon@alienwareicon\endcsname {\simpleiconsmapone\symbol{106}}
- \expandafter\def\csname simpleicon@aliexpressicon\endcsname {\simpleiconsmapone\symbol{107}}
- \expandafter\def\csname simpleicon@alipayicon\endcsname {\simpleiconsmapone\symbol{108}}
- \expandafter\def\csname simpleicon@allegroicon\endcsname {\simpleiconsmapone\symbol{109}}
- \expandafter\def\csname simpleicon@alliedmoddersicon\endcsname {\simpleiconsmapone\symbol{110}}
- \expandafter\def\csname simpleicon@allocineicon\endcsname {\simpleiconsmapone\symbol{111}}
- \expandafter\def\csname simpleicon@alltrailsicon\endcsname {\simpleiconsmapone\symbol{112}}
- \expandafter\def\csname simpleicon@almalinuxicon\endcsname {\simpleiconsmapone\symbol{113}}
- \expandafter\def\csname simpleicon@alpinedotjsicon\endcsname {\simpleiconsmapone\symbol{114}}
- \expandafter\def\csname simpleicon@alpinelinuxicon\endcsname {\simpleiconsmapone\symbol{115}}
- \expandafter\def\csname simpleicon@alteryxicon\endcsname {\simpleiconsmapone\symbol{116}}
- \expandafter\def\csname simpleicon@altiumdesignericon\endcsname {\simpleiconsmapone\symbol{117}}
- \expandafter\def\csname simpleicon@alwaysdataicon\endcsname {\simpleiconsmapone\symbol{118}}
- \expandafter\def\csname simpleicon@alxicon\endcsname {\simpleiconsmapone\symbol{119}}
- \expandafter\def\csname simpleicon@amazonicon\endcsname {\simpleiconsmapone\symbol{120}}
- \expandafter\def\csname simpleicon@amazonalexaicon\endcsname {\simpleiconsmapone\symbol{121}}
- \expandafter\def\csname simpleicon@amazonapigatewayicon\endcsname {\simpleiconsmapone\symbol{122}}
- \expandafter\def\csname simpleicon@amazoncloudwatchicon\endcsname {\simpleiconsmapone\symbol{123}}
- \expandafter\def\csname simpleicon@amazoncognitoicon\endcsname {\simpleiconsmapone\symbol{124}}
- \expandafter\def\csname simpleicon@amazondocumentdbicon\endcsname {\simpleiconsmapone\symbol{125}}
- \expandafter\def\csname simpleicon@amazondynamodbicon\endcsname {\simpleiconsmapone\symbol{126}}
- \expandafter\def\csname simpleicon@amazonec2icon\endcsname {\simpleiconsmapone\symbol{127}}
- \expandafter\def\csname simpleicon@amazonecsicon\endcsname {\simpleiconsmapone\symbol{128}}
- \expandafter\def\csname simpleicon@amazoneksicon\endcsname {\simpleiconsmapone\symbol{129}}
- \expandafter\def\csname simpleicon@amazonelasticacheicon\endcsname {\simpleiconsmapone\symbol{130}}
- \expandafter\def\csname simpleicon@amazonfiretvicon\endcsname {\simpleiconsmapone\symbol{131}}
- \expandafter\def\csname simpleicon@amazongamesicon\endcsname {\simpleiconsmapone\symbol{132}}
- \expandafter\def\csname simpleicon@amazoniamicon\endcsname {\simpleiconsmapone\symbol{133}}
- \expandafter\def\csname simpleicon@amazonlumberyardicon\endcsname {\simpleiconsmapone\symbol{134}}
- \expandafter\def\csname simpleicon@amazonlunaicon\endcsname {\simpleiconsmapone\symbol{135}}
- \expandafter\def\csname simpleicon@amazonmusicicon\endcsname {\simpleiconsmapone\symbol{136}}
- \expandafter\def\csname simpleicon@amazonpayicon\endcsname {\simpleiconsmapone\symbol{137}}
- \expandafter\def\csname simpleicon@amazonprimeicon\endcsname {\simpleiconsmapone\symbol{138}}
- \expandafter\def\csname simpleicon@amazonrdsicon\endcsname {\simpleiconsmapone\symbol{139}}
- \expandafter\def\csname simpleicon@amazonredshifticon\endcsname {\simpleiconsmapone\symbol{140}}
- \expandafter\def\csname simpleicon@amazonroute53icon\endcsname {\simpleiconsmapone\symbol{141}}
- \expandafter\def\csname simpleicon@amazons3icon\endcsname {\simpleiconsmapone\symbol{142}}
- \expandafter\def\csname simpleicon@amazonsimpleemailserviceicon\endcsname {\simpleiconsmapone\symbol{143}}
- \expandafter\def\csname simpleicon@amazonsqsicon\endcsname {\simpleiconsmapone\symbol{144}}
- \expandafter\def\csname simpleicon@amazonwebservicesicon\endcsname {\simpleiconsmapone\symbol{145}}
- \expandafter\def\csname simpleicon@amdicon\endcsname {\simpleiconsmapone\symbol{146}}
- \expandafter\def\csname simpleicon@amebaicon\endcsname {\simpleiconsmapone\symbol{147}}
- \expandafter\def\csname simpleicon@americanairlinesicon\endcsname {\simpleiconsmapone\symbol{148}}
- \expandafter\def\csname simpleicon@americanexpressicon\endcsname {\simpleiconsmapone\symbol{149}}
- \expandafter\def\csname simpleicon@amgicon\endcsname {\simpleiconsmapone\symbol{150}}
- \expandafter\def\csname simpleicon@ampicon\endcsname {\simpleiconsmapone\symbol{151}}
- \expandafter\def\csname simpleicon@amulicon\endcsname {\simpleiconsmapone\symbol{152}}
- \expandafter\def\csname simpleicon@anaicon\endcsname {\simpleiconsmapone\symbol{153}}
- \expandafter\def\csname simpleicon@anacondaicon\endcsname {\simpleiconsmapone\symbol{154}}
- \expandafter\def\csname simpleicon@analogueicon\endcsname {\simpleiconsmapone\symbol{155}}
- \expandafter\def\csname simpleicon@andelaicon\endcsname {\simpleiconsmapone\symbol{156}}
- \expandafter\def\csname simpleicon@androidicon\endcsname {\simpleiconsmapone\symbol{157}}
- \expandafter\def\csname simpleicon@androidautoicon\endcsname {\simpleiconsmapone\symbol{158}}
- \expandafter\def\csname simpleicon@androidstudioicon\endcsname {\simpleiconsmapone\symbol{159}}
- \expandafter\def\csname simpleicon@angularicon\endcsname {\simpleiconsmapone\symbol{160}}
- \expandafter\def\csname simpleicon@anilisticon\endcsname {\simpleiconsmapone\symbol{161}}
- \expandafter\def\csname simpleicon@animalplaneticon\endcsname {\simpleiconsmapone\symbol{162}}
- \expandafter\def\csname simpleicon@ankermakeicon\endcsname {\simpleiconsmapone\symbol{163}}
- \expandafter\def\csname simpleicon@ankiicon\endcsname {\simpleiconsmapone\symbol{164}}
- \expandafter\def\csname simpleicon@ansibleicon\endcsname {\simpleiconsmapone\symbol{165}}
- \expandafter\def\csname simpleicon@answericon\endcsname {\simpleiconsmapone\symbol{166}}
- \expandafter\def\csname simpleicon@ansysicon\endcsname {\simpleiconsmapone\symbol{167}}
- \expandafter\def\csname simpleicon@antaicon\endcsname {\simpleiconsmapone\symbol{168}}
- \expandafter\def\csname simpleicon@antdesignicon\endcsname {\simpleiconsmapone\symbol{169}}
- \expandafter\def\csname simpleicon@antena3icon\endcsname {\simpleiconsmapone\symbol{170}}
- \expandafter\def\csname simpleicon@anthropicicon\endcsname {\simpleiconsmapone\symbol{171}}
- \expandafter\def\csname simpleicon@anycubicicon\endcsname {\simpleiconsmapone\symbol{172}}
- \expandafter\def\csname simpleicon@anydeskicon\endcsname {\simpleiconsmapone\symbol{173}}
- \expandafter\def\csname simpleicon@anytypeicon\endcsname {\simpleiconsmapone\symbol{174}}
- \expandafter\def\csname simpleicon@aolicon\endcsname {\simpleiconsmapone\symbol{175}}
- \expandafter\def\csname simpleicon@apacheicon\endcsname {\simpleiconsmapone\symbol{176}}
- \expandafter\def\csname simpleicon@apacheairflowicon\endcsname {\simpleiconsmapone\symbol{177}}
- \expandafter\def\csname simpleicon@apacheanticon\endcsname {\simpleiconsmapone\symbol{178}}
- \expandafter\def\csname simpleicon@apachecassandraicon\endcsname {\simpleiconsmapone\symbol{179}}
- \expandafter\def\csname simpleicon@apachecloudstackicon\endcsname {\simpleiconsmapone\symbol{180}}
- \expandafter\def\csname simpleicon@apachecordovaicon\endcsname {\simpleiconsmapone\symbol{181}}
- \expandafter\def\csname simpleicon@apachecouchdbicon\endcsname {\simpleiconsmapone\symbol{182}}
- \expandafter\def\csname simpleicon@apachedruidicon\endcsname {\simpleiconsmapone\symbol{183}}
- \expandafter\def\csname simpleicon@apacheechartsicon\endcsname {\simpleiconsmapone\symbol{184}}
- \expandafter\def\csname simpleicon@apacheflinkicon\endcsname {\simpleiconsmapone\symbol{185}}
- \expandafter\def\csname simpleicon@apachefreemarkericon\endcsname {\simpleiconsmapone\symbol{186}}
- \expandafter\def\csname simpleicon@apachegroovyicon\endcsname {\simpleiconsmapone\symbol{187}}
- \expandafter\def\csname simpleicon@apacheguacamoleicon\endcsname {\simpleiconsmapone\symbol{188}}
- \expandafter\def\csname simpleicon@apachehadoopicon\endcsname {\simpleiconsmapone\symbol{189}}
- \expandafter\def\csname simpleicon@apachehbaseicon\endcsname {\simpleiconsmapone\symbol{190}}
- \expandafter\def\csname simpleicon@apachehiveicon\endcsname {\simpleiconsmapone\symbol{191}}
- \expandafter\def\csname simpleicon@apachejmetericon\endcsname {\simpleiconsmapone\symbol{192}}
- \expandafter\def\csname simpleicon@apachekafkaicon\endcsname {\simpleiconsmapone\symbol{193}}
- \expandafter\def\csname simpleicon@apachekylinicon\endcsname {\simpleiconsmapone\symbol{194}}
- \expandafter\def\csname simpleicon@apachemavenicon\endcsname {\simpleiconsmapone\symbol{195}}
- \expandafter\def\csname simpleicon@apachenetbeansideicon\endcsname {\simpleiconsmapone\symbol{196}}
- \expandafter\def\csname simpleicon@apacheopenofficeicon\endcsname {\simpleiconsmapone\symbol{197}}
- \expandafter\def\csname simpleicon@apacheparqueticon\endcsname {\simpleiconsmapone\symbol{198}}
- \expandafter\def\csname simpleicon@apachepulsaricon\endcsname {\simpleiconsmapone\symbol{199}}
- \expandafter\def\csname simpleicon@apacherocketmqicon\endcsname {\simpleiconsmapone\symbol{200}}
- \expandafter\def\csname simpleicon@apachesolricon\endcsname {\simpleiconsmapone\symbol{201}}
- \expandafter\def\csname simpleicon@apachesparkicon\endcsname {\simpleiconsmapone\symbol{202}}
- \expandafter\def\csname simpleicon@apachestormicon\endcsname {\simpleiconsmapone\symbol{203}}
- \expandafter\def\csname simpleicon@apachesuperseticon\endcsname {\simpleiconsmapone\symbol{204}}
- \expandafter\def\csname simpleicon@apachetomcaticon\endcsname {\simpleiconsmapone\symbol{205}}
- \expandafter\def\csname simpleicon@aparaticon\endcsname {\simpleiconsmapone\symbol{206}}
- \expandafter\def\csname simpleicon@apifoxicon\endcsname {\simpleiconsmapone\symbol{207}}
- \expandafter\def\csname simpleicon@apmterminalsicon\endcsname {\simpleiconsmapone\symbol{208}}
- \expandafter\def\csname simpleicon@apollographqlicon\endcsname {\simpleiconsmapone\symbol{209}}
- \expandafter\def\csname simpleicon@apostropheicon\endcsname {\simpleiconsmapone\symbol{210}}
- \expandafter\def\csname simpleicon@appianicon\endcsname {\simpleiconsmapone\symbol{211}}
- \expandafter\def\csname simpleicon@appiumicon\endcsname {\simpleiconsmapone\symbol{212}}
- \expandafter\def\csname simpleicon@appleicon\endcsname {\simpleiconsmapone\symbol{213}}
- \expandafter\def\csname simpleicon@applearcadeicon\endcsname {\simpleiconsmapone\symbol{214}}
- \expandafter\def\csname simpleicon@applemusicicon\endcsname {\simpleiconsmapone\symbol{215}}
- \expandafter\def\csname simpleicon@applenewsicon\endcsname {\simpleiconsmapone\symbol{216}}
- \expandafter\def\csname simpleicon@applepayicon\endcsname {\simpleiconsmapone\symbol{217}}
- \expandafter\def\csname simpleicon@applepodcastsicon\endcsname {\simpleiconsmapone\symbol{218}}
- \expandafter\def\csname simpleicon@appletvicon\endcsname {\simpleiconsmapone\symbol{219}}
- \expandafter\def\csname simpleicon@appsignalicon\endcsname {\simpleiconsmapone\symbol{220}}
- \expandafter\def\csname simpleicon@appsmithicon\endcsname {\simpleiconsmapone\symbol{221}}
- \expandafter\def\csname simpleicon@appstoreicon\endcsname {\simpleiconsmapone\symbol{222}}
- \expandafter\def\csname simpleicon@appveyoricon\endcsname {\simpleiconsmapone\symbol{223}}
- \expandafter\def\csname simpleicon@appwriteicon\endcsname {\simpleiconsmapone\symbol{224}}
- \expandafter\def\csname simpleicon@aquaicon\endcsname {\simpleiconsmapone\symbol{225}}
- \expandafter\def\csname simpleicon@aralicon\endcsname {\simpleiconsmapone\symbol{226}}
- \expandafter\def\csname simpleicon@arangodbicon\endcsname {\simpleiconsmapone\symbol{227}}
- \expandafter\def\csname simpleicon@arcicon\endcsname {\simpleiconsmapone\symbol{228}}
- \expandafter\def\csname simpleicon@arcgisicon\endcsname {\simpleiconsmapone\symbol{229}}
- \expandafter\def\csname simpleicon@archicadicon\endcsname {\simpleiconsmapone\symbol{230}}
- \expandafter\def\csname simpleicon@archiveofourownicon\endcsname {\simpleiconsmapone\symbol{231}}
- \expandafter\def\csname simpleicon@archlinuxicon\endcsname {\simpleiconsmapone\symbol{232}}
- \expandafter\def\csname simpleicon@ardouricon\endcsname {\simpleiconsmapone\symbol{233}}
- \expandafter\def\csname simpleicon@arduinoicon\endcsname {\simpleiconsmapone\symbol{234}}
- \expandafter\def\csname simpleicon@argoicon\endcsname {\simpleiconsmapone\symbol{235}}
- \expandafter\def\csname simpleicon@argosicon\endcsname {\simpleiconsmapone\symbol{236}}
- \expandafter\def\csname simpleicon@ariakiticon\endcsname {\simpleiconsmapone\symbol{237}}
- \expandafter\def\csname simpleicon@arkecosystemicon\endcsname {\simpleiconsmapone\symbol{238}}
- \expandafter\def\csname simpleicon@arloicon\endcsname {\simpleiconsmapone\symbol{239}}
- \expandafter\def\csname simpleicon@armicon\endcsname {\simpleiconsmapone\symbol{240}}
- \expandafter\def\csname simpleicon@armkeilicon\endcsname {\simpleiconsmapone\symbol{241}}
- \expandafter\def\csname simpleicon@arstechnicaicon\endcsname {\simpleiconsmapone\symbol{242}}
- \expandafter\def\csname simpleicon@artifacthubicon\endcsname {\simpleiconsmapone\symbol{243}}
- \expandafter\def\csname simpleicon@artixlinuxicon\endcsname {\simpleiconsmapone\symbol{244}}
- \expandafter\def\csname simpleicon@artstationicon\endcsname {\simpleiconsmapone\symbol{245}}
- \expandafter\def\csname simpleicon@arxivicon\endcsname {\simpleiconsmapone\symbol{246}}
- \expandafter\def\csname simpleicon@asahilinuxicon\endcsname {\simpleiconsmapone\symbol{247}}
- \expandafter\def\csname simpleicon@asanaicon\endcsname {\simpleiconsmapone\symbol{248}}
- \expandafter\def\csname simpleicon@asciidoctoricon\endcsname {\simpleiconsmapone\symbol{249}}
- \expandafter\def\csname simpleicon@asciinemaicon\endcsname {\simpleiconsmapone\symbol{250}}
- \expandafter\def\csname simpleicon@asdaicon\endcsname {\simpleiconsmapone\symbol{251}}
- \expandafter\def\csname simpleicon@asepriteicon\endcsname {\simpleiconsmapone\symbol{252}}
- \expandafter\def\csname simpleicon@askfmicon\endcsname {\simpleiconsmapone\symbol{253}}
- \expandafter\def\csname simpleicon@assemblyscripticon\endcsname {\simpleiconsmapone\symbol{254}}
- \expandafter\def\csname simpleicon@asteriskicon\endcsname {\simpleiconsmapone\symbol{255}}
- \expandafter\def\csname simpleicon@astonmartinicon\endcsname {\simpleiconsmaptwo\symbol{0}}
- \expandafter\def\csname simpleicon@astraicon\endcsname {\simpleiconsmaptwo\symbol{1}}
- \expandafter\def\csname simpleicon@astralicon\endcsname {\simpleiconsmaptwo\symbol{2}}
- \expandafter\def\csname simpleicon@astroicon\endcsname {\simpleiconsmaptwo\symbol{3}}
- \expandafter\def\csname simpleicon@asusicon\endcsname {\simpleiconsmaptwo\symbol{4}}
- \expandafter\def\csname simpleicon@atandticon\endcsname {\simpleiconsmaptwo\symbol{5}}
- \expandafter\def\csname simpleicon@atariicon\endcsname {\simpleiconsmaptwo\symbol{6}}
- \expandafter\def\csname simpleicon@atlassianicon\endcsname {\simpleiconsmaptwo\symbol{7}}
- \expandafter\def\csname simpleicon@auchanicon\endcsname {\simpleiconsmaptwo\symbol{8}}
- \expandafter\def\csname simpleicon@audacityicon\endcsname {\simpleiconsmaptwo\symbol{9}}
- \expandafter\def\csname simpleicon@audiicon\endcsname {\simpleiconsmaptwo\symbol{10}}
- \expandafter\def\csname simpleicon@audibleicon\endcsname {\simpleiconsmaptwo\symbol{11}}
- \expandafter\def\csname simpleicon@audiobookshelficon\endcsname {\simpleiconsmaptwo\symbol{12}}
- \expandafter\def\csname simpleicon@audioboomicon\endcsname {\simpleiconsmaptwo\symbol{13}}
- \expandafter\def\csname simpleicon@audiomackicon\endcsname {\simpleiconsmaptwo\symbol{14}}
- \expandafter\def\csname simpleicon@audiotechnicaicon\endcsname {\simpleiconsmaptwo\symbol{15}}
- \expandafter\def\csname simpleicon@aureliaicon\endcsname {\simpleiconsmaptwo\symbol{16}}
- \expandafter\def\csname simpleicon@auth0icon\endcsname {\simpleiconsmaptwo\symbol{17}}
- \expandafter\def\csname simpleicon@autheliaicon\endcsname {\simpleiconsmaptwo\symbol{18}}
- \expandafter\def\csname simpleicon@authentikicon\endcsname {\simpleiconsmaptwo\symbol{19}}
- \expandafter\def\csname simpleicon@authyicon\endcsname {\simpleiconsmaptwo\symbol{20}}
- \expandafter\def\csname simpleicon@autocadicon\endcsname {\simpleiconsmaptwo\symbol{21}}
- \expandafter\def\csname simpleicon@autocannonicon\endcsname {\simpleiconsmaptwo\symbol{22}}
- \expandafter\def\csname simpleicon@autodeskicon\endcsname {\simpleiconsmaptwo\symbol{23}}
- \expandafter\def\csname simpleicon@autodeskmayaicon\endcsname {\simpleiconsmaptwo\symbol{24}}
- \expandafter\def\csname simpleicon@autodeskreviticon\endcsname {\simpleiconsmaptwo\symbol{25}}
- \expandafter\def\csname simpleicon@autohotkeyicon\endcsname {\simpleiconsmaptwo\symbol{26}}
- \expandafter\def\csname simpleicon@autoiticon\endcsname {\simpleiconsmaptwo\symbol{27}}
- \expandafter\def\csname simpleicon@automatticicon\endcsname {\simpleiconsmaptwo\symbol{28}}
- \expandafter\def\csname simpleicon@autoprefixericon\endcsname {\simpleiconsmaptwo\symbol{29}}
- \expandafter\def\csname simpleicon@autozoneicon\endcsname {\simpleiconsmaptwo\symbol{30}}
- \expandafter\def\csname simpleicon@avajsicon\endcsname {\simpleiconsmaptwo\symbol{31}}
- \expandafter\def\csname simpleicon@avasticon\endcsname {\simpleiconsmaptwo\symbol{32}}
- \expandafter\def\csname simpleicon@aviancaicon\endcsname {\simpleiconsmaptwo\symbol{33}}
- \expandafter\def\csname simpleicon@aviraicon\endcsname {\simpleiconsmaptwo\symbol{34}}
- \expandafter\def\csname simpleicon@awesomelistsicon\endcsname {\simpleiconsmaptwo\symbol{35}}
- \expandafter\def\csname simpleicon@awesomewmicon\endcsname {\simpleiconsmaptwo\symbol{36}}
- \expandafter\def\csname simpleicon@awsamplifyicon\endcsname {\simpleiconsmaptwo\symbol{37}}
- \expandafter\def\csname simpleicon@awselasticloadbalancingicon\endcsname {\simpleiconsmaptwo\symbol{38}}
- \expandafter\def\csname simpleicon@awsfargateicon\endcsname {\simpleiconsmaptwo\symbol{39}}
- \expandafter\def\csname simpleicon@awslambdaicon\endcsname {\simpleiconsmaptwo\symbol{40}}
- \expandafter\def\csname simpleicon@awsorganizationsicon\endcsname {\simpleiconsmaptwo\symbol{41}}
- \expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmaptwo\symbol{42}}
- \expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmaptwo\symbol{43}}
- \expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmaptwo\symbol{44}}
- \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmaptwo\symbol{45}}
- \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmaptwo\symbol{46}}
- \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmaptwo\symbol{47}}
- \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmaptwo\symbol{48}}
- \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmaptwo\symbol{49}}
- \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmaptwo\symbol{50}}
- \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmaptwo\symbol{51}}
- \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmaptwo\symbol{52}}
- \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmaptwo\symbol{53}}
- \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmaptwo\symbol{54}}
- \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmaptwo\symbol{55}}
- \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmaptwo\symbol{56}}
- \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmaptwo\symbol{57}}
- \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmaptwo\symbol{58}}
- \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmaptwo\symbol{59}}
- \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmaptwo\symbol{60}}
- \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmaptwo\symbol{61}}
- \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmaptwo\symbol{62}}
- \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmaptwo\symbol{63}}
- \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmaptwo\symbol{64}}
- \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmaptwo\symbol{65}}
- \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{66}}
- \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{67}}
- \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{68}}
- \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{69}}
- \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{70}}
- \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{71}}
- \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{72}}
- \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{73}}
- \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{74}}
- \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{75}}
- \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{76}}
- \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{77}}
- \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{78}}
- \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{79}}
- \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{80}}
- \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{81}}
- \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{82}}
- \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{83}}
- \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{84}}
- \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{85}}
- \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{86}}
- \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{87}}
- \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{88}}
- \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{89}}
- \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{90}}
- \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{91}}
- \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{92}}
- \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{93}}
- \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{94}}
- \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{95}}
- \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{96}}
- \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{97}}
- \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{98}}
- \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{99}}
- \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{100}}
- \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{101}}
- \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{102}}
- \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{103}}
- \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{104}}
- \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{105}}
- \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{106}}
- \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{107}}
- \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{108}}
- \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{109}}
- \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{110}}
- \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{111}}
- \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{112}}
- \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{113}}
- \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{114}}
- \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{115}}
- \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{116}}
- \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{117}}
- \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{118}}
- \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{119}}
- \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{120}}
- \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{121}}
- \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{122}}
- \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{123}}
- \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{124}}
- \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{125}}
- \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{126}}
- \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{127}}
- \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{128}}
- \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{129}}
- \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{130}}
- \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{131}}
- \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{132}}
- \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{133}}
- \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{134}}
- \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{135}}
- \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{136}}
- \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{137}}
- \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{138}}
- \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{139}}
- \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{140}}
- \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{141}}
- \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{142}}
- \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{143}}
- \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{144}}
- \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{145}}
- \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{146}}
- \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{147}}
- \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{148}}
- \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{149}}
- \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{150}}
- \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{151}}
- \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{152}}
- \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{153}}
- \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{154}}
- \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{155}}
- \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{156}}
- \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{157}}
- \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{158}}
- \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{159}}
- \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{160}}
- \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{161}}
- \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{162}}
- \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{163}}
- \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{164}}
- \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{165}}
- \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{166}}
- \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{167}}
- \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{168}}
- \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{169}}
- \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{170}}
- \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{171}}
- \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{172}}
- \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{173}}
- \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{174}}
- \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{175}}
- \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{176}}
- \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{177}}
- \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{178}}
- \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{179}}
- \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{180}}
- \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{181}}
- \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{182}}
- \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{183}}
- \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{184}}
- \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{185}}
- \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{186}}
- \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{187}}
- \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{188}}
- \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{189}}
- \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{190}}
- \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{191}}
- \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{192}}
- \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{193}}
- \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{194}}
- \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{195}}
- \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{196}}
- \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{197}}
- \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{198}}
- \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{199}}
- \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{200}}
- \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{201}}
- \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{202}}
- \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{203}}
- \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{204}}
- \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{205}}
- \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{206}}
- \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{207}}
- \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{208}}
- \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{209}}
- \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{210}}
- \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{211}}
- \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{212}}
- \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{213}}
- \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{214}}
- \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{215}}
- \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{216}}
- \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{217}}
- \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{218}}
- \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{219}}
- \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{220}}
- \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{221}}
- \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{222}}
- \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{223}}
- \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{224}}
- \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{225}}
- \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{226}}
- \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{227}}
- \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{228}}
- \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{229}}
- \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{230}}
- \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{231}}
- \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{232}}
- \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{233}}
- \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{234}}
- \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{235}}
- \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{236}}
- \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{237}}
- \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{238}}
- \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{239}}
- \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{240}}
- \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{241}}
- \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{242}}
- \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{243}}
- \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{244}}
- \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{245}}
- \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{246}}
- \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{247}}
- \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{248}}
- \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{249}}
- \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmaptwo\symbol{250}}
- \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmaptwo\symbol{251}}
- \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmaptwo\symbol{252}}
- \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmaptwo\symbol{253}}
- \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmaptwo\symbol{254}}
- \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmaptwo\symbol{255}}
- \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{0}}
- \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{1}}
- \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{2}}
- \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{3}}
- \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{4}}
- \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{5}}
- \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{6}}
- \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{7}}
- \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{8}}
- \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{9}}
- \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{10}}
- \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{11}}
- \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{12}}
- \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{13}}
- \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{14}}
- \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{15}}
- \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{16}}
- \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{17}}
- \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{18}}
- \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{19}}
- \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{20}}
- \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{21}}
- \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{22}}
- \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{23}}
- \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{24}}
- \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{25}}
- \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{26}}
- \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{27}}
- \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{28}}
- \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{29}}
- \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{30}}
- \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{31}}
- \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{32}}
- \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{33}}
- \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{34}}
- \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{35}}
- \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{36}}
- \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{37}}
- \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{38}}
- \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{39}}
- \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{40}}
- \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{41}}
- \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{42}}
- \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{43}}
- \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{44}}
- \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{45}}
- \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{46}}
- \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{47}}
- \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{48}}
- \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{49}}
- \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{50}}
- \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{51}}
- \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{52}}
- \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{53}}
- \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{54}}
- \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{55}}
- \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{56}}
- \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{57}}
- \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{58}}
- \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{59}}
- \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{60}}
- \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{61}}
- \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{62}}
- \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{63}}
- \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{64}}
- \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{65}}
- \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{66}}
- \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{67}}
- \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{68}}
- \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{69}}
- \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{70}}
- \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{71}}
- \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{72}}
- \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{73}}
- \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{74}}
- \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{75}}
- \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{76}}
- \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{77}}
- \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{78}}
- \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{79}}
- \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{80}}
- \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{81}}
- \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{82}}
- \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{83}}
- \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{84}}
- \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{85}}
- \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{86}}
- \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{87}}
- \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{88}}
- \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{89}}
- \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{90}}
- \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{91}}
- \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{92}}
- \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{93}}
- \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{94}}
- \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{95}}
- \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{96}}
- \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{97}}
- \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{98}}
- \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{99}}
- \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{100}}
- \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{101}}
- \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{102}}
- \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{103}}
- \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{104}}
- \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{105}}
- \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{106}}
- \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{107}}
- \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{108}}
- \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{109}}
- \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{110}}
- \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{111}}
- \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{112}}
- \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{113}}
- \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{114}}
- \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{115}}
- \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{116}}
- \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{117}}
- \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{118}}
- \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{119}}
- \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{120}}
- \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{121}}
- \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{122}}
- \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{123}}
- \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{124}}
- \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{125}}
- \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{126}}
- \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{127}}
- \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{128}}
- \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{129}}
- \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{130}}
- \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{131}}
- \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{132}}
- \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{133}}
- \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{134}}
- \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{135}}
- \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{136}}
- \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{137}}
- \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{138}}
- \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{139}}
- \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{140}}
- \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{141}}
- \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{142}}
- \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{143}}
- \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{144}}
- \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{145}}
- \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{146}}
- \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{147}}
- \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{148}}
- \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{149}}
- \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{150}}
- \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{151}}
- \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{152}}
- \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{153}}
- \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{154}}
- \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{155}}
- \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{156}}
- \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{157}}
- \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{158}}
- \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{159}}
- \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{160}}
- \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{161}}
- \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{162}}
- \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{163}}
- \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{164}}
- \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{165}}
- \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{166}}
- \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{167}}
- \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{168}}
- \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{169}}
- \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{170}}
- \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{171}}
- \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{172}}
- \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{173}}
- \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{174}}
- \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{175}}
- \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{176}}
- \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{177}}
- \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{178}}
- \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{179}}
- \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{180}}
- \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{181}}
- \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{182}}
- \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{183}}
- \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{184}}
- \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{185}}
- \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{186}}
- \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{187}}
- \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{188}}
- \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{189}}
- \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{190}}
- \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{191}}
- \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{192}}
- \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{193}}
- \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{194}}
- \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{195}}
- \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{196}}
- \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{197}}
- \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{198}}
- \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{199}}
- \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{200}}
- \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{201}}
- \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{202}}
- \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{203}}
- \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{204}}
- \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{205}}
- \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{206}}
- \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{207}}
- \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{208}}
- \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{209}}
- \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{210}}
- \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{211}}
- \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{212}}
- \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{213}}
- \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{214}}
- \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{215}}
- \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{216}}
- \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{217}}
- \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{218}}
- \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{219}}
- \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{220}}
- \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{221}}
- \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{222}}
- \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{223}}
- \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{224}}
- \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{225}}
- \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{226}}
- \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{227}}
- \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{228}}
- \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{229}}
- \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{230}}
- \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{231}}
- \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{232}}
- \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{233}}
- \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{234}}
- \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{235}}
- \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{236}}
- \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{237}}
- \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{238}}
- \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{239}}
- \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{240}}
- \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{241}}
- \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{242}}
- \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{243}}
- \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{244}}
- \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapthree\symbol{245}}
- \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapthree\symbol{246}}
- \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapthree\symbol{247}}
- \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapthree\symbol{248}}
- \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapthree\symbol{249}}
- \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapthree\symbol{250}}
- \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapthree\symbol{251}}
- \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapthree\symbol{252}}
- \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapthree\symbol{253}}
- \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapthree\symbol{254}}
- \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapthree\symbol{255}}
- \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{0}}
- \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{1}}
- \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{2}}
- \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{3}}
- \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{4}}
- \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{5}}
- \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{6}}
- \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{7}}
- \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{8}}
- \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{9}}
- \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{10}}
- \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{11}}
- \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{12}}
- \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{13}}
- \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{14}}
- \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{15}}
- \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{16}}
- \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{17}}
- \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{18}}
- \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{19}}
- \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{20}}
- \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{21}}
- \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{22}}
- \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{23}}
- \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{24}}
- \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{25}}
- \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{26}}
- \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{27}}
- \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{28}}
- \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{29}}
- \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{30}}
- \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{31}}
- \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{32}}
- \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{33}}
- \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{34}}
- \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{35}}
- \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{36}}
- \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{37}}
- \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{38}}
- \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{39}}
- \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{40}}
- \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{41}}
- \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{42}}
- \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{43}}
- \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{44}}
- \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{45}}
- \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{46}}
- \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{47}}
- \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{48}}
- \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{49}}
- \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{50}}
- \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{51}}
- \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{52}}
- \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{53}}
- \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{54}}
- \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{55}}
- \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{56}}
- \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{57}}
- \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{58}}
- \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{59}}
- \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{60}}
- \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{61}}
- \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{62}}
- \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{63}}
- \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{64}}
- \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{65}}
- \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{66}}
- \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{67}}
- \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{68}}
- \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{69}}
- \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{70}}
- \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{71}}
- \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{72}}
- \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{73}}
- \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{74}}
- \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{75}}
- \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{76}}
- \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{77}}
- \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{78}}
- \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{79}}
- \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{80}}
- \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{81}}
- \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{82}}
- \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{83}}
- \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{84}}
- \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{85}}
- \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{86}}
- \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{87}}
- \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{88}}
- \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{89}}
- \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{90}}
- \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{91}}
- \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{92}}
- \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{93}}
- \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{94}}
- \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{95}}
- \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{96}}
- \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{97}}
- \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{98}}
- \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{99}}
- \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{100}}
- \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{101}}
- \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{102}}
- \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{103}}
- \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{104}}
- \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{105}}
- \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{106}}
- \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{107}}
- \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{108}}
- \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{109}}
- \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{110}}
- \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{111}}
- \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{112}}
- \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{113}}
- \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{114}}
- \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{115}}
- \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{116}}
- \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{117}}
- \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{118}}
- \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{119}}
- \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{120}}
- \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{121}}
- \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{122}}
- \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{123}}
- \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{124}}
- \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{125}}
- \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{126}}
- \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{127}}
- \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{128}}
- \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{129}}
- \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{130}}
- \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{131}}
- \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{132}}
- \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{133}}
- \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{134}}
- \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{135}}
- \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{136}}
- \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{137}}
- \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{138}}
- \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{139}}
- \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{140}}
- \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{141}}
- \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{142}}
- \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{143}}
- \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{144}}
- \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{145}}
- \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{146}}
- \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{147}}
- \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{148}}
- \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{149}}
- \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{150}}
- \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{151}}
- \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{152}}
- \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{153}}
- \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{154}}
- \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{155}}
- \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{156}}
- \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{157}}
- \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{158}}
- \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{159}}
- \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{160}}
- \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{161}}
- \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{162}}
- \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{163}}
- \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{164}}
- \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{165}}
- \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{166}}
- \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{167}}
- \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{168}}
- \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{169}}
- \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{170}}
- \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{171}}
- \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{172}}
- \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{173}}
- \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{174}}
- \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{175}}
- \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{176}}
- \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{177}}
- \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{178}}
- \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{179}}
- \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{180}}
- \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{181}}
- \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{182}}
- \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{183}}
- \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{184}}
- \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{185}}
- \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{186}}
- \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{187}}
- \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{188}}
- \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{189}}
- \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{190}}
- \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{191}}
- \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{192}}
- \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{193}}
- \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{194}}
- \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{195}}
- \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{196}}
- \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{197}}
- \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{198}}
- \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{199}}
- \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{200}}
- \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{201}}
- \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{202}}
- \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{203}}
- \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{204}}
- \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{205}}
- \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{206}}
- \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{207}}
- \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{208}}
- \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{209}}
- \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{210}}
- \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{211}}
- \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{212}}
- \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{213}}
- \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{214}}
- \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{215}}
- \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{216}}
- \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{217}}
- \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{218}}
- \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{219}}
- \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{220}}
- \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{221}}
- \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{222}}
- \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{223}}
- \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{224}}
- \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{225}}
- \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{226}}
- \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{227}}
- \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{228}}
- \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{229}}
- \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{230}}
- \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{231}}
- \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{232}}
- \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{233}}
- \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{234}}
- \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{235}}
- \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{236}}
- \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{237}}
- \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{238}}
- \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{239}}
- \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{240}}
- \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{241}}
- \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfour\symbol{242}}
- \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfour\symbol{243}}
- \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfour\symbol{244}}
- \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfour\symbol{245}}
- \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfour\symbol{246}}
- \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfour\symbol{247}}
- \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfour\symbol{248}}
- \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfour\symbol{249}}
- \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfour\symbol{250}}
- \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfour\symbol{251}}
- \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfour\symbol{252}}
- \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfour\symbol{253}}
- \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfour\symbol{254}}
- \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfour\symbol{255}}
- \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{0}}
- \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{1}}
- \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{2}}
- \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{3}}
- \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{4}}
- \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{5}}
- \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{6}}
- \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{7}}
- \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{8}}
- \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{9}}
- \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{10}}
- \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{11}}
- \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{12}}
- \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{13}}
- \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{14}}
- \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{15}}
- \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{16}}
- \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{17}}
- \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{18}}
- \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{19}}
- \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{20}}
- \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{21}}
- \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{22}}
- \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{23}}
- \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{24}}
- \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{25}}
- \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{26}}
- \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{27}}
- \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{28}}
- \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{29}}
- \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{30}}
- \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{31}}
- \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{32}}
- \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{33}}
- \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{34}}
- \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{35}}
- \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{36}}
- \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{37}}
- \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{38}}
- \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{39}}
- \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{40}}
- \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{41}}
- \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{42}}
- \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{43}}
- \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{44}}
- \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{45}}
- \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{46}}
- \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{47}}
- \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{48}}
- \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{49}}
- \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{50}}
- \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{51}}
- \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{52}}
- \expandafter\def\csname simpleicon@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@languagetoolicon\endcsname {\simpleiconsmapsix\symbol{230}}
- \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{231}}
- \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{232}}
- \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{233}}
- \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{234}}
- \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{235}}
- \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{236}}
- \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{237}}
- \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{238}}
- \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{239}}
- \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{240}}
- \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{241}}
- \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{242}}
- \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{243}}
- \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{244}}
- \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{245}}
- \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{246}}
- \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{247}}
- \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{248}}
- \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{249}}
- \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{250}}
- \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{251}}
- \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{252}}
- \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{253}}
- \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{254}}
- \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{255}}
- \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapseven\symbol{0}}
- \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{1}}
- \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{2}}
- \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{3}}
- \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{4}}
- \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{5}}
- \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{6}}
- \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{7}}
- \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{8}}
- \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{9}}
- \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{10}}
- \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{11}}
- \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{12}}
- \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{13}}
- \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{14}}
- \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{15}}
- \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{16}}
- \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{17}}
- \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{18}}
- \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{19}}
- \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{20}}
- \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{21}}
- \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{22}}
- \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{23}}
- \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{24}}
- \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{25}}
- \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{26}}
- \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{27}}
- \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{28}}
- \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{29}}
- \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{30}}
- \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{31}}
- \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{32}}
- \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{33}}
- \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{34}}
- \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{35}}
- \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{36}}
- \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{37}}
- \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{38}}
- \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{39}}
- \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{40}}
- \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{41}}
- \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{42}}
- \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{43}}
- \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{44}}
- \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{45}}
- \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{46}}
- \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{47}}
- \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{48}}
- \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{49}}
- \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{50}}
- \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{51}}
- \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{52}}
- \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{53}}
- \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{54}}
- \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{55}}
- \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{56}}
- \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{57}}
- \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{58}}
- \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{59}}
- \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{60}}
- \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{61}}
- \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{62}}
- \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{63}}
- \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{64}}
- \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{65}}
- \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{66}}
- \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{67}}
- \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{68}}
- \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{69}}
- \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{70}}
- \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{71}}
- \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{72}}
- \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{73}}
- \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{74}}
- \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{75}}
- \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{76}}
- \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{77}}
- \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{78}}
- \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{79}}
- \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{80}}
- \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{81}}
- \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{82}}
- \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{83}}
- \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{84}}
- \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{85}}
- \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{86}}
- \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{87}}
- \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{88}}
- \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{89}}
- \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{90}}
- \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{91}}
- \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{92}}
- \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{93}}
- \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{94}}
- \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{95}}
- \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{96}}
- \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{97}}
- \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{98}}
- \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{99}}
- \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{100}}
- \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{101}}
- \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{102}}
- \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{103}}
- \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{104}}
- \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{105}}
- \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{106}}
- \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{107}}
- \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{108}}
- \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{109}}
- \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{110}}
- \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{111}}
- \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{112}}
- \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{113}}
- \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{114}}
- \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{115}}
- \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{116}}
- \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{117}}
- \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{118}}
- \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{119}}
- \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{120}}
- \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{121}}
- \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{122}}
- \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{123}}
- \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{124}}
- \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{125}}
- \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{126}}
- \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{127}}
- \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{128}}
- \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{129}}
- \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{130}}
- \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{131}}
- \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{132}}
- \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{133}}
- \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{134}}
- \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{135}}
- \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{136}}
- \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{137}}
- \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{138}}
- \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{139}}
- \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{140}}
- \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{141}}
- \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{142}}
- \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{143}}
- \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{144}}
- \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{145}}
- \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{146}}
- \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{147}}
- \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{148}}
- \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{149}}
- \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{150}}
- \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{151}}
- \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{152}}
- \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{153}}
- \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{154}}
- \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{155}}
- \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{156}}
- \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{157}}
- \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{158}}
- \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{159}}
- \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{160}}
- \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{161}}
- \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{162}}
- \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{163}}
- \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{164}}
- \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{165}}
- \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{166}}
- \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{167}}
- \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{168}}
- \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{169}}
- \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{170}}
- \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{171}}
- \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{172}}
- \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{173}}
- \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{174}}
- \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{175}}
- \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{176}}
- \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{177}}
- \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{178}}
- \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{179}}
- \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{180}}
- \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{181}}
- \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{182}}
- \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{183}}
- \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{184}}
- \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{185}}
- \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{186}}
- \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmapseven\symbol{187}}
- \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{188}}
- \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{189}}
- \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{190}}
- \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{191}}
- \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{192}}
- \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{193}}
- \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{194}}
- \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{195}}
- \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{196}}
- \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{197}}
- \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{198}}
- \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{199}}
- \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{200}}
- \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{201}}
- \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{202}}
- \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{203}}
- \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{204}}
- \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{205}}
- \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{206}}
- \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{207}}
- \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{208}}
- \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{209}}
- \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{210}}
- \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{211}}
- \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{212}}
- \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{213}}
- \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{214}}
- \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{215}}
- \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{216}}
- \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{217}}
- \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{218}}
- \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{219}}
- \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{220}}
- \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{221}}
- \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{222}}
- \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{223}}
- \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{224}}
- \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{225}}
- \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{226}}
- \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{227}}
- \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{228}}
- \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{229}}
- \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{230}}
- \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{231}}
- \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{232}}
- \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{233}}
- \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{234}}
- \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{235}}
- \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{236}}
- \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{237}}
- \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{238}}
- \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{239}}
- \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{240}}
- \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{241}}
- \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{242}}
- \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{243}}
- \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{244}}
- \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{245}}
- \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{246}}
- \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{247}}
- \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{248}}
- \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{249}}
- \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{250}}
- \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{251}}
- \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{252}}
- \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{253}}
- \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{254}}
- \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{255}}
- \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapeight\symbol{0}}
- \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{1}}
- \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{2}}
- \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{3}}
- \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{4}}
- \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{5}}
- \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{6}}
- \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{7}}
- \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{8}}
- \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{9}}
- \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{10}}
- \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{11}}
- \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{12}}
- \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{13}}
- \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{14}}
- \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{15}}
- \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{16}}
- \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{17}}
- \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{18}}
- \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{19}}
- \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{20}}
- \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{21}}
- \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{22}}
- \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{23}}
- \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{24}}
- \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{25}}
- \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{26}}
- \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{27}}
- \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{28}}
- \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{29}}
- \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{30}}
- \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{31}}
- \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{32}}
- \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{33}}
- \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{34}}
- \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{35}}
- \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{36}}
- \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{37}}
- \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{38}}
- \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{39}}
- \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{40}}
- \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{41}}
- \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{42}}
- \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{43}}
- \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{44}}
- \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{45}}
- \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{46}}
- \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{47}}
- \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{48}}
- \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{49}}
- \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{50}}
- \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{51}}
- \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{52}}
- \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{53}}
- \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{54}}
- \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{55}}
- \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{56}}
- \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{57}}
- \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{58}}
- \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{59}}
- \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{60}}
- \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{61}}
- \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{62}}
- \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{63}}
- \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{64}}
- \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{65}}
- \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{66}}
- \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{67}}
- \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{68}}
- \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{69}}
- \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{70}}
- \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{71}}
- \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{72}}
- \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{73}}
- \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{74}}
- \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{75}}
- \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{76}}
- \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{77}}
- \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{78}}
- \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{79}}
- \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{80}}
- \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{81}}
- \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{82}}
- \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{83}}
- \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{84}}
- \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{85}}
- \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{86}}
- \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{87}}
- \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{88}}
- \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{89}}
- \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{90}}
- \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{91}}
- \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{92}}
- \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{93}}
- \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{94}}
- \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{95}}
- \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{96}}
- \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{97}}
- \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{98}}
- \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{99}}
- \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{100}}
- \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{101}}
- \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{102}}
- \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{103}}
- \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{104}}
- \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{105}}
- \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{106}}
- \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{107}}
- \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{108}}
- \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{109}}
- \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{110}}
- \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{111}}
- \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{112}}
- \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{113}}
- \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{114}}
- \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{115}}
- \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmapeight\symbol{116}}
- \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{117}}
- \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{118}}
- \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{119}}
- \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{120}}
- \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{121}}
- \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{122}}
- \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{123}}
- \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{124}}
- \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{125}}
- \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{126}}
- \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{127}}
- \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{128}}
- \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{129}}
- \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{130}}
- \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{131}}
- \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{132}}
- \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{133}}
- \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{134}}
- \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{135}}
- \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{136}}
- \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{137}}
- \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{138}}
- \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{139}}
- \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{140}}
- \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{141}}
- \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{142}}
- \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{143}}
- \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{144}}
- \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{145}}
- \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{146}}
- \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{147}}
- \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{148}}
- \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{149}}
- \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{150}}
- \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{151}}
- \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{152}}
- \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{153}}
- \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{154}}
- \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{155}}
- \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{156}}
- \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{157}}
- \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{158}}
- \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{159}}
- \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{160}}
- \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{161}}
- \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{162}}
- \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{163}}
- \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{164}}
- \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{165}}
- \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{166}}
- \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{167}}
- \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{168}}
- \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{169}}
- \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{170}}
- \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{171}}
- \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{172}}
- \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{173}}
- \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{174}}
- \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{175}}
- \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{176}}
- \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{177}}
- \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{178}}
- \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{179}}
- \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{180}}
- \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{181}}
- \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{182}}
- \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{183}}
- \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{184}}
- \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{185}}
- \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{186}}
- \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{187}}
- \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{188}}
- \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{189}}
- \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{190}}
- \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{191}}
- \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{192}}
- \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{193}}
- \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{194}}
- \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{195}}
- \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{196}}
- \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{197}}
- \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{198}}
- \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{199}}
- \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{200}}
- \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{201}}
- \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{202}}
- \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{203}}
- \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{204}}
- \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{205}}
- \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{206}}
- \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{207}}
- \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{208}}
- \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{209}}
- \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{210}}
- \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{211}}
- \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{212}}
- \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{213}}
- \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{214}}
- \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{215}}
- \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{216}}
- \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{217}}
- \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{218}}
- \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{219}}
- \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{220}}
- \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{221}}
- \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{222}}
- \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{223}}
- \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{224}}
- \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{225}}
- \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{226}}
- \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{227}}
- \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{228}}
- \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{229}}
- \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{230}}
- \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{231}}
- \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{232}}
- \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{233}}
- \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{234}}
- \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{235}}
- \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{236}}
- \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{237}}
- \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{238}}
- \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{239}}
- \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{240}}
- \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{241}}
- \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{242}}
- \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{243}}
- \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{244}}
- \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{245}}
- \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{246}}
- \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{247}}
- \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{248}}
- \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{249}}
- \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{250}}
- \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{251}}
- \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{252}}
- \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{253}}
- \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{254}}
- \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{255}}
- \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapnine\symbol{0}}
- \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapnine\symbol{1}}
- \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{2}}
- \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{3}}
- \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{4}}
- \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{5}}
- \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{6}}
- \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{7}}
- \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{8}}
- \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{9}}
- \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{10}}
- \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{11}}
- \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{12}}
- \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{13}}
- \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{14}}
- \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{15}}
- \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{16}}
- \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{17}}
- \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{18}}
- \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{19}}
- \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{20}}
- \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{21}}
- \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{22}}
- \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{23}}
- \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{24}}
- \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{25}}
- \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{26}}
- \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{27}}
- \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{28}}
- \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{29}}
- \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{30}}
- \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{31}}
- \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{32}}
- \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{33}}
- \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{34}}
- \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{35}}
- \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{36}}
- \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{37}}
- \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{38}}
- \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{39}}
- \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{40}}
- \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{41}}
- \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{42}}
- \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{43}}
- \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{44}}
- \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{45}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{46}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{47}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{48}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{49}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{50}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{51}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{52}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{53}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{54}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{55}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{56}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{57}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{58}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{59}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{60}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{61}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{62}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{63}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{64}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{65}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{66}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{67}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{68}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{69}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{70}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{71}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{72}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{73}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{74}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{75}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{76}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{77}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{78}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{79}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{80}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{81}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{82}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{83}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{84}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{85}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{86}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{87}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{88}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{89}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{90}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{91}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{92}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{93}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{94}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{95}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{96}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{97}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{98}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{99}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{100}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{101}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{102}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{103}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{104}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{105}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{106}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{107}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{108}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{109}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{110}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{111}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{112}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{113}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{114}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{115}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{116}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{117}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{118}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{119}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{120}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{121}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{122}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{123}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{124}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{125}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{126}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{127}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{128}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{129}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{130}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{131}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{132}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{133}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{134}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{135}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{136}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{137}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{138}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{139}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{140}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{141}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{142}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{143}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{144}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{145}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{146}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{147}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{148}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{149}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{150}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{151}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{152}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{153}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{154}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{155}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{156}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{157}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{158}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{159}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{160}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{161}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{162}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{163}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{164}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{165}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{166}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{167}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{168}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{169}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{170}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{171}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{172}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{173}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{174}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{175}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{176}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{177}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{178}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{179}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{180}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{181}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{182}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{183}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{184}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{185}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{186}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{187}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{188}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{189}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{190}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{191}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{192}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{193}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{194}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{195}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{196}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{197}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{198}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{199}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{200}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{201}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{202}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{203}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{204}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{205}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{206}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{207}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{208}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{209}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{210}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{211}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{212}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{213}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{214}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{215}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{216}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{217}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{218}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{219}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{220}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{221}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{222}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{223}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{224}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{225}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{226}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{227}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{228}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{229}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{230}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{231}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{232}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{233}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{234}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{235}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{236}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{237}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{238}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{239}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{240}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{241}}
- \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{242}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{243}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{244}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{245}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{246}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{247}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{248}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{249}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{250}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{251}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{252}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{253}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{254}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{255}}
- \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmaponezero\symbol{0}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmaponezero\symbol{1}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{2}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{3}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{4}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{5}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{6}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{7}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{8}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{9}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{10}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{11}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{12}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{13}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{14}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{15}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{16}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{17}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{18}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{19}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{20}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{21}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{22}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{23}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{24}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{25}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{26}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{27}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{28}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{29}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{30}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{31}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{32}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{33}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{34}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{35}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{36}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{37}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{38}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{39}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{40}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{41}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{42}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{43}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{44}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{45}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{46}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{47}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{48}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{49}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{50}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{51}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{52}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{53}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{54}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{55}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{56}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{57}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{58}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{59}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{60}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{61}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{62}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{63}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{64}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{65}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{66}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{67}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{68}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{69}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{70}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{71}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{72}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{73}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{74}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{75}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{76}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{77}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{78}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{79}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{80}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{81}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{82}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{83}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{84}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{85}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{86}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{87}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{88}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{89}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{90}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{91}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{92}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{93}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{94}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{95}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{96}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{97}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{98}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{99}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{100}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{101}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{102}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{103}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{104}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{105}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{106}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{107}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{108}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{109}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{110}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{111}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{112}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{113}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{114}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{115}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{116}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{117}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{118}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{119}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{120}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{121}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{122}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{123}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{124}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{125}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{126}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{127}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{128}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{129}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{130}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{131}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{132}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{133}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{134}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{135}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{136}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{137}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{138}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{139}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{140}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{141}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{142}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{143}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{144}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{145}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{146}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{147}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{148}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{149}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{150}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{151}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{152}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{153}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{154}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{155}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{156}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{157}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{158}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{159}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{160}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{161}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{162}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{163}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{164}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{165}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{166}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{167}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{168}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{169}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{170}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{171}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{172}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{173}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{174}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{175}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{176}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{177}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{178}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{179}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{180}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{181}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{182}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{183}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{184}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{185}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{186}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{187}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{188}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{189}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{190}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{191}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{192}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{193}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{194}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{195}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{196}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{197}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{198}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{199}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{200}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{201}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{202}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{203}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{204}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{205}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{206}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{207}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{208}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{209}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{210}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{211}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{212}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{213}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{214}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{215}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{216}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{217}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{218}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{219}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{220}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{221}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{222}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{223}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{224}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{225}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{226}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{227}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{228}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{229}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{230}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{231}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{232}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{233}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{234}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{235}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{236}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{237}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{238}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{239}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{240}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{241}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{242}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{243}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{244}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{245}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{246}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{247}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{248}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{249}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{250}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{251}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{252}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{253}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{254}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{255}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponeone\symbol{0}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponeone\symbol{1}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{2}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{3}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{4}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{5}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{6}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{7}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{8}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{9}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{10}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{11}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{12}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{13}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{14}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{15}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{16}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{17}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{18}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{19}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{20}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{21}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{22}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{23}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{24}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{25}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{26}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{27}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{28}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{29}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{30}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{31}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{32}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{33}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{34}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{35}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{36}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{37}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{38}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{39}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{40}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{41}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{42}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{43}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{44}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{45}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{46}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{47}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{48}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{49}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{50}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{51}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{52}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{53}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{54}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{55}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{56}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{57}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{58}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{59}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{60}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{61}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{62}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{63}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{64}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{65}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{66}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{67}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{68}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{69}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{70}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{71}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{72}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{73}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{74}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{75}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{76}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{77}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{78}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{79}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{80}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{81}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{82}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{83}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{84}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{85}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{86}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{87}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{88}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{89}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{90}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{91}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{92}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{93}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{94}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{95}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{96}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{97}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{98}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{99}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{100}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{101}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{102}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{103}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{104}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{105}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{106}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{107}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{108}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{109}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{110}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{111}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{112}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{113}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{114}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{115}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{116}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{117}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{118}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{119}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{120}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{121}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{122}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{123}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{124}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{125}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{126}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{127}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{128}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{129}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{130}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{131}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{132}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{133}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{134}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{135}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{136}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{137}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{138}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{139}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{140}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{141}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{142}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{143}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{144}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{145}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{146}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{147}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{148}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{149}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{150}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{151}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{152}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{153}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{154}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{155}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{156}}
- \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{157}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{158}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{159}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{160}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{161}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{162}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{163}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{164}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{165}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{166}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{167}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{168}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{169}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{170}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{171}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{172}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{173}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{174}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{175}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{176}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{177}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{178}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{179}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{180}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{181}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{182}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{183}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{184}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{185}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{186}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{187}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{188}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{189}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{190}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{191}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{192}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{193}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{194}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{195}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{196}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{197}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{198}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{199}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{200}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{201}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{202}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{203}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{204}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{205}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{206}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{207}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{208}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{209}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{210}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{211}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{212}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{213}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{214}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{215}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{216}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{217}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{218}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{219}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{220}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{221}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{222}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{223}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{224}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{225}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{226}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{227}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{228}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{229}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{230}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{231}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{232}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{233}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{234}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{235}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{236}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{237}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{238}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{239}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{240}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{241}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{242}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{243}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{244}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{245}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{246}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{247}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{248}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{249}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{250}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{251}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{252}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{253}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{254}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{255}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponetwo\symbol{0}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{5}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{9}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{12}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{15}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{22}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{23}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{25}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{31}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{40}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{41}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{42}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{43}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{44}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{45}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{46}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{47}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{48}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{49}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{50}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{51}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{52}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{54}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{61}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{65}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{68}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{72}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
- \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{87}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{88}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{89}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{90}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{91}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{92}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{94}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{96}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{97}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{98}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{99}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{101}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{103}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{106}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{122}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{125}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{129}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{137}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{139}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{141}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{143}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{144}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{146}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{148}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{150}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{153}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{161}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{162}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{170}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{174}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{178}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{179}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{180}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{181}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{183}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{186}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{187}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{188}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{189}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{203}}
- \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{210}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{212}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{213}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{220}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{222}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{223}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{255}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponethree\symbol{0}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponethree\symbol{1}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{2}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{3}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{4}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{5}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{6}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{7}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{8}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{9}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{10}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{11}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{12}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{13}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{14}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{15}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{16}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{17}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{18}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{19}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{20}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{21}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{22}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{23}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{24}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{25}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{26}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{27}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{28}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{29}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{30}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{31}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{32}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{33}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{34}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{35}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{36}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{37}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{38}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{39}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{40}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{41}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{42}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{43}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{44}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{45}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{46}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{47}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{48}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{49}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{50}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{51}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{52}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{53}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{54}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{55}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{56}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{57}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{58}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{59}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{60}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{61}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{62}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{63}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{64}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{65}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{66}}
- \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{67}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{68}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{69}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{70}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{71}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{72}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{73}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{74}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{75}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{76}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{77}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{78}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{79}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{80}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{81}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{82}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{83}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{84}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{85}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{86}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{87}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{88}} \ No newline at end of file
+ \expandafter\def\csname simpleicon@30secondsofcodeicon\endcsname {\simpleiconsmapone\symbol{6}}
+ \expandafter\def\csname simpleicon@365datascienceicon\endcsname {\simpleiconsmapone\symbol{7}}
+ \expandafter\def\csname simpleicon@3micon\endcsname {\simpleiconsmapone\symbol{8}}
+ \expandafter\def\csname simpleicon@42icon\endcsname {\simpleiconsmapone\symbol{9}}
+ \expandafter\def\csname simpleicon@4chanicon\endcsname {\simpleiconsmapone\symbol{10}}
+ \expandafter\def\csname simpleicon@4dicon\endcsname {\simpleiconsmapone\symbol{11}}
+ \expandafter\def\csname simpleicon@500pxicon\endcsname {\simpleiconsmapone\symbol{12}}
+ \expandafter\def\csname simpleicon@7zipicon\endcsname {\simpleiconsmapone\symbol{13}}
+ \expandafter\def\csname simpleicon@99designsicon\endcsname {\simpleiconsmapone\symbol{14}}
+ \expandafter\def\csname simpleicon@9gagicon\endcsname {\simpleiconsmapone\symbol{15}}
+ \expandafter\def\csname simpleicon@abbotticon\endcsname {\simpleiconsmapone\symbol{16}}
+ \expandafter\def\csname simpleicon@abbrobotstudioicon\endcsname {\simpleiconsmapone\symbol{17}}
+ \expandafter\def\csname simpleicon@abbvieicon\endcsname {\simpleiconsmapone\symbol{18}}
+ \expandafter\def\csname simpleicon@aboutdotmeicon\endcsname {\simpleiconsmapone\symbol{19}}
+ \expandafter\def\csname simpleicon@abstracticon\endcsname {\simpleiconsmapone\symbol{20}}
+ \expandafter\def\csname simpleicon@abusedotchicon\endcsname {\simpleiconsmapone\symbol{21}}
+ \expandafter\def\csname simpleicon@academiaicon\endcsname {\simpleiconsmapone\symbol{22}}
+ \expandafter\def\csname simpleicon@accentureicon\endcsname {\simpleiconsmapone\symbol{23}}
+ \expandafter\def\csname simpleicon@accusofticon\endcsname {\simpleiconsmapone\symbol{24}}
+ \expandafter\def\csname simpleicon@acericon\endcsname {\simpleiconsmapone\symbol{25}}
+ \expandafter\def\csname simpleicon@acmicon\endcsname {\simpleiconsmapone\symbol{26}}
+ \expandafter\def\csname simpleicon@actigraphicon\endcsname {\simpleiconsmapone\symbol{27}}
+ \expandafter\def\csname simpleicon@activisionicon\endcsname {\simpleiconsmapone\symbol{28}}
+ \expandafter\def\csname simpleicon@activitypubicon\endcsname {\simpleiconsmapone\symbol{29}}
+ \expandafter\def\csname simpleicon@actixicon\endcsname {\simpleiconsmapone\symbol{30}}
+ \expandafter\def\csname simpleicon@acuraicon\endcsname {\simpleiconsmapone\symbol{31}}
+ \expandafter\def\csname simpleicon@adafruiticon\endcsname {\simpleiconsmapone\symbol{32}}
+ \expandafter\def\csname simpleicon@adblockicon\endcsname {\simpleiconsmapone\symbol{33}}
+ \expandafter\def\csname simpleicon@adblockplusicon\endcsname {\simpleiconsmapone\symbol{34}}
+ \expandafter\def\csname simpleicon@adguardicon\endcsname {\simpleiconsmapone\symbol{35}}
+ \expandafter\def\csname simpleicon@adidasicon\endcsname {\simpleiconsmapone\symbol{36}}
+ \expandafter\def\csname simpleicon@adminericon\endcsname {\simpleiconsmapone\symbol{37}}
+ \expandafter\def\csname simpleicon@adobeicon\endcsname {\simpleiconsmapone\symbol{38}}
+ \expandafter\def\csname simpleicon@adobeacrobatreadericon\endcsname {\simpleiconsmapone\symbol{39}}
+ \expandafter\def\csname simpleicon@adobeaftereffectsicon\endcsname {\simpleiconsmapone\symbol{40}}
+ \expandafter\def\csname simpleicon@adobeauditionicon\endcsname {\simpleiconsmapone\symbol{41}}
+ \expandafter\def\csname simpleicon@adobecreativecloudicon\endcsname {\simpleiconsmapone\symbol{42}}
+ \expandafter\def\csname simpleicon@adobedreamweavericon\endcsname {\simpleiconsmapone\symbol{43}}
+ \expandafter\def\csname simpleicon@adobefontsicon\endcsname {\simpleiconsmapone\symbol{44}}
+ \expandafter\def\csname simpleicon@adobeillustratoricon\endcsname {\simpleiconsmapone\symbol{45}}
+ \expandafter\def\csname simpleicon@adobeindesignicon\endcsname {\simpleiconsmapone\symbol{46}}
+ \expandafter\def\csname simpleicon@adobelightroomicon\endcsname {\simpleiconsmapone\symbol{47}}
+ \expandafter\def\csname simpleicon@adobelightroomclassicicon\endcsname {\simpleiconsmapone\symbol{48}}
+ \expandafter\def\csname simpleicon@adobephotoshopicon\endcsname {\simpleiconsmapone\symbol{49}}
+ \expandafter\def\csname simpleicon@adobepremiereproicon\endcsname {\simpleiconsmapone\symbol{50}}
+ \expandafter\def\csname simpleicon@adobexdicon\endcsname {\simpleiconsmapone\symbol{51}}
+ \expandafter\def\csname simpleicon@adonisjsicon\endcsname {\simpleiconsmapone\symbol{52}}
+ \expandafter\def\csname simpleicon@adpicon\endcsname {\simpleiconsmapone\symbol{53}}
+ \expandafter\def\csname simpleicon@adrollicon\endcsname {\simpleiconsmapone\symbol{54}}
+ \expandafter\def\csname simpleicon@adventofcodeicon\endcsname {\simpleiconsmapone\symbol{55}}
+ \expandafter\def\csname simpleicon@adyenicon\endcsname {\simpleiconsmapone\symbol{56}}
+ \expandafter\def\csname simpleicon@aegisauthenticatoricon\endcsname {\simpleiconsmapone\symbol{57}}
+ \expandafter\def\csname simpleicon@aerlingusicon\endcsname {\simpleiconsmapone\symbol{58}}
+ \expandafter\def\csname simpleicon@aerofloticon\endcsname {\simpleiconsmapone\symbol{59}}
+ \expandafter\def\csname simpleicon@aeromexicoicon\endcsname {\simpleiconsmapone\symbol{60}}
+ \expandafter\def\csname simpleicon@aerospikeicon\endcsname {\simpleiconsmapone\symbol{61}}
+ \expandafter\def\csname simpleicon@aewicon\endcsname {\simpleiconsmapone\symbol{62}}
+ \expandafter\def\csname simpleicon@affineicon\endcsname {\simpleiconsmapone\symbol{63}}
+ \expandafter\def\csname simpleicon@affinityicon\endcsname {\simpleiconsmapone\symbol{64}}
+ \expandafter\def\csname simpleicon@affinitydesignericon\endcsname {\simpleiconsmapone\symbol{65}}
+ \expandafter\def\csname simpleicon@affinityphotoicon\endcsname {\simpleiconsmapone\symbol{66}}
+ \expandafter\def\csname simpleicon@affinitypublishericon\endcsname {\simpleiconsmapone\symbol{67}}
+ \expandafter\def\csname simpleicon@aframeicon\endcsname {\simpleiconsmapone\symbol{68}}
+ \expandafter\def\csname simpleicon@afterpayicon\endcsname {\simpleiconsmapone\symbol{69}}
+ \expandafter\def\csname simpleicon@agoraicon\endcsname {\simpleiconsmapone\symbol{70}}
+ \expandafter\def\csname simpleicon@aibicon\endcsname {\simpleiconsmapone\symbol{71}}
+ \expandafter\def\csname simpleicon@aidungeonicon\endcsname {\simpleiconsmapone\symbol{72}}
+ \expandafter\def\csname simpleicon@aiohttpicon\endcsname {\simpleiconsmapone\symbol{73}}
+ \expandafter\def\csname simpleicon@aiqfomeicon\endcsname {\simpleiconsmapone\symbol{74}}
+ \expandafter\def\csname simpleicon@airasiaicon\endcsname {\simpleiconsmapone\symbol{75}}
+ \expandafter\def\csname simpleicon@airbnbicon\endcsname {\simpleiconsmapone\symbol{76}}
+ \expandafter\def\csname simpleicon@airbrakeicon\endcsname {\simpleiconsmapone\symbol{77}}
+ \expandafter\def\csname simpleicon@airbusicon\endcsname {\simpleiconsmapone\symbol{78}}
+ \expandafter\def\csname simpleicon@airbyteicon\endcsname {\simpleiconsmapone\symbol{79}}
+ \expandafter\def\csname simpleicon@aircallicon\endcsname {\simpleiconsmapone\symbol{80}}
+ \expandafter\def\csname simpleicon@aircanadaicon\endcsname {\simpleiconsmapone\symbol{81}}
+ \expandafter\def\csname simpleicon@airchinaicon\endcsname {\simpleiconsmapone\symbol{82}}
+ \expandafter\def\csname simpleicon@airfranceicon\endcsname {\simpleiconsmapone\symbol{83}}
+ \expandafter\def\csname simpleicon@airindiaicon\endcsname {\simpleiconsmapone\symbol{84}}
+ \expandafter\def\csname simpleicon@airplayaudioicon\endcsname {\simpleiconsmapone\symbol{85}}
+ \expandafter\def\csname simpleicon@airplayvideoicon\endcsname {\simpleiconsmapone\symbol{86}}
+ \expandafter\def\csname simpleicon@airtableicon\endcsname {\simpleiconsmapone\symbol{87}}
+ \expandafter\def\csname simpleicon@airtelicon\endcsname {\simpleiconsmapone\symbol{88}}
+ \expandafter\def\csname simpleicon@airtransaticon\endcsname {\simpleiconsmapone\symbol{89}}
+ \expandafter\def\csname simpleicon@ajvicon\endcsname {\simpleiconsmapone\symbol{90}}
+ \expandafter\def\csname simpleicon@akamaiicon\endcsname {\simpleiconsmapone\symbol{91}}
+ \expandafter\def\csname simpleicon@akauntingicon\endcsname {\simpleiconsmapone\symbol{92}}
+ \expandafter\def\csname simpleicon@akiflowicon\endcsname {\simpleiconsmapone\symbol{93}}
+ \expandafter\def\csname simpleicon@alacrittyicon\endcsname {\simpleiconsmapone\symbol{94}}
+ \expandafter\def\csname simpleicon@alamyicon\endcsname {\simpleiconsmapone\symbol{95}}
+ \expandafter\def\csname simpleicon@albertheijnicon\endcsname {\simpleiconsmapone\symbol{96}}
+ \expandafter\def\csname simpleicon@albyicon\endcsname {\simpleiconsmapone\symbol{97}}
+ \expandafter\def\csname simpleicon@alchemyicon\endcsname {\simpleiconsmapone\symbol{98}}
+ \expandafter\def\csname simpleicon@aldinordicon\endcsname {\simpleiconsmapone\symbol{99}}
+ \expandafter\def\csname simpleicon@aldisudicon\endcsname {\simpleiconsmapone\symbol{100}}
+ \expandafter\def\csname simpleicon@alfaromeoicon\endcsname {\simpleiconsmapone\symbol{101}}
+ \expandafter\def\csname simpleicon@alfredicon\endcsname {\simpleiconsmapone\symbol{102}}
+ \expandafter\def\csname simpleicon@algoliaicon\endcsname {\simpleiconsmapone\symbol{103}}
+ \expandafter\def\csname simpleicon@algorandicon\endcsname {\simpleiconsmapone\symbol{104}}
+ \expandafter\def\csname simpleicon@alibabacloudicon\endcsname {\simpleiconsmapone\symbol{105}}
+ \expandafter\def\csname simpleicon@alibabadotcomicon\endcsname {\simpleiconsmapone\symbol{106}}
+ \expandafter\def\csname simpleicon@alienwareicon\endcsname {\simpleiconsmapone\symbol{107}}
+ \expandafter\def\csname simpleicon@aliexpressicon\endcsname {\simpleiconsmapone\symbol{108}}
+ \expandafter\def\csname simpleicon@alipayicon\endcsname {\simpleiconsmapone\symbol{109}}
+ \expandafter\def\csname simpleicon@allegroicon\endcsname {\simpleiconsmapone\symbol{110}}
+ \expandafter\def\csname simpleicon@alliedmoddersicon\endcsname {\simpleiconsmapone\symbol{111}}
+ \expandafter\def\csname simpleicon@allocineicon\endcsname {\simpleiconsmapone\symbol{112}}
+ \expandafter\def\csname simpleicon@alltrailsicon\endcsname {\simpleiconsmapone\symbol{113}}
+ \expandafter\def\csname simpleicon@almalinuxicon\endcsname {\simpleiconsmapone\symbol{114}}
+ \expandafter\def\csname simpleicon@alpinedotjsicon\endcsname {\simpleiconsmapone\symbol{115}}
+ \expandafter\def\csname simpleicon@alpinelinuxicon\endcsname {\simpleiconsmapone\symbol{116}}
+ \expandafter\def\csname simpleicon@alteryxicon\endcsname {\simpleiconsmapone\symbol{117}}
+ \expandafter\def\csname simpleicon@altiumdesignericon\endcsname {\simpleiconsmapone\symbol{118}}
+ \expandafter\def\csname simpleicon@alwaysdataicon\endcsname {\simpleiconsmapone\symbol{119}}
+ \expandafter\def\csname simpleicon@alxicon\endcsname {\simpleiconsmapone\symbol{120}}
+ \expandafter\def\csname simpleicon@amazonicon\endcsname {\simpleiconsmapone\symbol{121}}
+ \expandafter\def\csname simpleicon@amazonalexaicon\endcsname {\simpleiconsmapone\symbol{122}}
+ \expandafter\def\csname simpleicon@amazonapigatewayicon\endcsname {\simpleiconsmapone\symbol{123}}
+ \expandafter\def\csname simpleicon@amazoncloudwatchicon\endcsname {\simpleiconsmapone\symbol{124}}
+ \expandafter\def\csname simpleicon@amazoncognitoicon\endcsname {\simpleiconsmapone\symbol{125}}
+ \expandafter\def\csname simpleicon@amazondocumentdbicon\endcsname {\simpleiconsmapone\symbol{126}}
+ \expandafter\def\csname simpleicon@amazondynamodbicon\endcsname {\simpleiconsmapone\symbol{127}}
+ \expandafter\def\csname simpleicon@amazonec2icon\endcsname {\simpleiconsmapone\symbol{128}}
+ \expandafter\def\csname simpleicon@amazonecsicon\endcsname {\simpleiconsmapone\symbol{129}}
+ \expandafter\def\csname simpleicon@amazoneksicon\endcsname {\simpleiconsmapone\symbol{130}}
+ \expandafter\def\csname simpleicon@amazonelasticacheicon\endcsname {\simpleiconsmapone\symbol{131}}
+ \expandafter\def\csname simpleicon@amazonfiretvicon\endcsname {\simpleiconsmapone\symbol{132}}
+ \expandafter\def\csname simpleicon@amazongamesicon\endcsname {\simpleiconsmapone\symbol{133}}
+ \expandafter\def\csname simpleicon@amazoniamicon\endcsname {\simpleiconsmapone\symbol{134}}
+ \expandafter\def\csname simpleicon@amazonlumberyardicon\endcsname {\simpleiconsmapone\symbol{135}}
+ \expandafter\def\csname simpleicon@amazonlunaicon\endcsname {\simpleiconsmapone\symbol{136}}
+ \expandafter\def\csname simpleicon@amazonmusicicon\endcsname {\simpleiconsmapone\symbol{137}}
+ \expandafter\def\csname simpleicon@amazonpayicon\endcsname {\simpleiconsmapone\symbol{138}}
+ \expandafter\def\csname simpleicon@amazonprimeicon\endcsname {\simpleiconsmapone\symbol{139}}
+ \expandafter\def\csname simpleicon@amazonrdsicon\endcsname {\simpleiconsmapone\symbol{140}}
+ \expandafter\def\csname simpleicon@amazonredshifticon\endcsname {\simpleiconsmapone\symbol{141}}
+ \expandafter\def\csname simpleicon@amazonroute53icon\endcsname {\simpleiconsmapone\symbol{142}}
+ \expandafter\def\csname simpleicon@amazons3icon\endcsname {\simpleiconsmapone\symbol{143}}
+ \expandafter\def\csname simpleicon@amazonsimpleemailserviceicon\endcsname {\simpleiconsmapone\symbol{144}}
+ \expandafter\def\csname simpleicon@amazonsqsicon\endcsname {\simpleiconsmapone\symbol{145}}
+ \expandafter\def\csname simpleicon@amazonwebservicesicon\endcsname {\simpleiconsmapone\symbol{146}}
+ \expandafter\def\csname simpleicon@amdicon\endcsname {\simpleiconsmapone\symbol{147}}
+ \expandafter\def\csname simpleicon@amebaicon\endcsname {\simpleiconsmapone\symbol{148}}
+ \expandafter\def\csname simpleicon@americanairlinesicon\endcsname {\simpleiconsmapone\symbol{149}}
+ \expandafter\def\csname simpleicon@americanexpressicon\endcsname {\simpleiconsmapone\symbol{150}}
+ \expandafter\def\csname simpleicon@amgicon\endcsname {\simpleiconsmapone\symbol{151}}
+ \expandafter\def\csname simpleicon@ampicon\endcsname {\simpleiconsmapone\symbol{152}}
+ \expandafter\def\csname simpleicon@amulicon\endcsname {\simpleiconsmapone\symbol{153}}
+ \expandafter\def\csname simpleicon@anaicon\endcsname {\simpleiconsmapone\symbol{154}}
+ \expandafter\def\csname simpleicon@anacondaicon\endcsname {\simpleiconsmapone\symbol{155}}
+ \expandafter\def\csname simpleicon@analogueicon\endcsname {\simpleiconsmapone\symbol{156}}
+ \expandafter\def\csname simpleicon@andelaicon\endcsname {\simpleiconsmapone\symbol{157}}
+ \expandafter\def\csname simpleicon@androidicon\endcsname {\simpleiconsmapone\symbol{158}}
+ \expandafter\def\csname simpleicon@androidautoicon\endcsname {\simpleiconsmapone\symbol{159}}
+ \expandafter\def\csname simpleicon@androidstudioicon\endcsname {\simpleiconsmapone\symbol{160}}
+ \expandafter\def\csname simpleicon@angularicon\endcsname {\simpleiconsmapone\symbol{161}}
+ \expandafter\def\csname simpleicon@anilisticon\endcsname {\simpleiconsmapone\symbol{162}}
+ \expandafter\def\csname simpleicon@animalplaneticon\endcsname {\simpleiconsmapone\symbol{163}}
+ \expandafter\def\csname simpleicon@ankermakeicon\endcsname {\simpleiconsmapone\symbol{164}}
+ \expandafter\def\csname simpleicon@ankiicon\endcsname {\simpleiconsmapone\symbol{165}}
+ \expandafter\def\csname simpleicon@ansibleicon\endcsname {\simpleiconsmapone\symbol{166}}
+ \expandafter\def\csname simpleicon@answericon\endcsname {\simpleiconsmapone\symbol{167}}
+ \expandafter\def\csname simpleicon@ansysicon\endcsname {\simpleiconsmapone\symbol{168}}
+ \expandafter\def\csname simpleicon@antaicon\endcsname {\simpleiconsmapone\symbol{169}}
+ \expandafter\def\csname simpleicon@antdesignicon\endcsname {\simpleiconsmapone\symbol{170}}
+ \expandafter\def\csname simpleicon@antena3icon\endcsname {\simpleiconsmapone\symbol{171}}
+ \expandafter\def\csname simpleicon@anthropicicon\endcsname {\simpleiconsmapone\symbol{172}}
+ \expandafter\def\csname simpleicon@anycubicicon\endcsname {\simpleiconsmapone\symbol{173}}
+ \expandafter\def\csname simpleicon@anydeskicon\endcsname {\simpleiconsmapone\symbol{174}}
+ \expandafter\def\csname simpleicon@anytypeicon\endcsname {\simpleiconsmapone\symbol{175}}
+ \expandafter\def\csname simpleicon@aolicon\endcsname {\simpleiconsmapone\symbol{176}}
+ \expandafter\def\csname simpleicon@apacheicon\endcsname {\simpleiconsmapone\symbol{177}}
+ \expandafter\def\csname simpleicon@apacheairflowicon\endcsname {\simpleiconsmapone\symbol{178}}
+ \expandafter\def\csname simpleicon@apacheanticon\endcsname {\simpleiconsmapone\symbol{179}}
+ \expandafter\def\csname simpleicon@apachecassandraicon\endcsname {\simpleiconsmapone\symbol{180}}
+ \expandafter\def\csname simpleicon@apachecloudstackicon\endcsname {\simpleiconsmapone\symbol{181}}
+ \expandafter\def\csname simpleicon@apachecordovaicon\endcsname {\simpleiconsmapone\symbol{182}}
+ \expandafter\def\csname simpleicon@apachecouchdbicon\endcsname {\simpleiconsmapone\symbol{183}}
+ \expandafter\def\csname simpleicon@apachedolphinschedulericon\endcsname {\simpleiconsmapone\symbol{184}}
+ \expandafter\def\csname simpleicon@apachedruidicon\endcsname {\simpleiconsmapone\symbol{185}}
+ \expandafter\def\csname simpleicon@apacheechartsicon\endcsname {\simpleiconsmapone\symbol{186}}
+ \expandafter\def\csname simpleicon@apacheflinkicon\endcsname {\simpleiconsmapone\symbol{187}}
+ \expandafter\def\csname simpleicon@apachefreemarkericon\endcsname {\simpleiconsmapone\symbol{188}}
+ \expandafter\def\csname simpleicon@apachegroovyicon\endcsname {\simpleiconsmapone\symbol{189}}
+ \expandafter\def\csname simpleicon@apacheguacamoleicon\endcsname {\simpleiconsmapone\symbol{190}}
+ \expandafter\def\csname simpleicon@apachehadoopicon\endcsname {\simpleiconsmapone\symbol{191}}
+ \expandafter\def\csname simpleicon@apachehbaseicon\endcsname {\simpleiconsmapone\symbol{192}}
+ \expandafter\def\csname simpleicon@apachehiveicon\endcsname {\simpleiconsmapone\symbol{193}}
+ \expandafter\def\csname simpleicon@apachejmetericon\endcsname {\simpleiconsmapone\symbol{194}}
+ \expandafter\def\csname simpleicon@apachekafkaicon\endcsname {\simpleiconsmapone\symbol{195}}
+ \expandafter\def\csname simpleicon@apachekylinicon\endcsname {\simpleiconsmapone\symbol{196}}
+ \expandafter\def\csname simpleicon@apachemavenicon\endcsname {\simpleiconsmapone\symbol{197}}
+ \expandafter\def\csname simpleicon@apachenetbeansideicon\endcsname {\simpleiconsmapone\symbol{198}}
+ \expandafter\def\csname simpleicon@apachenifiicon\endcsname {\simpleiconsmapone\symbol{199}}
+ \expandafter\def\csname simpleicon@apacheopenofficeicon\endcsname {\simpleiconsmapone\symbol{200}}
+ \expandafter\def\csname simpleicon@apacheparqueticon\endcsname {\simpleiconsmapone\symbol{201}}
+ \expandafter\def\csname simpleicon@apachepulsaricon\endcsname {\simpleiconsmapone\symbol{202}}
+ \expandafter\def\csname simpleicon@apacherocketmqicon\endcsname {\simpleiconsmapone\symbol{203}}
+ \expandafter\def\csname simpleicon@apachesolricon\endcsname {\simpleiconsmapone\symbol{204}}
+ \expandafter\def\csname simpleicon@apachesparkicon\endcsname {\simpleiconsmapone\symbol{205}}
+ \expandafter\def\csname simpleicon@apachestormicon\endcsname {\simpleiconsmapone\symbol{206}}
+ \expandafter\def\csname simpleicon@apachesuperseticon\endcsname {\simpleiconsmapone\symbol{207}}
+ \expandafter\def\csname simpleicon@apachetomcaticon\endcsname {\simpleiconsmapone\symbol{208}}
+ \expandafter\def\csname simpleicon@aparaticon\endcsname {\simpleiconsmapone\symbol{209}}
+ \expandafter\def\csname simpleicon@apifoxicon\endcsname {\simpleiconsmapone\symbol{210}}
+ \expandafter\def\csname simpleicon@apmterminalsicon\endcsname {\simpleiconsmapone\symbol{211}}
+ \expandafter\def\csname simpleicon@apollographqlicon\endcsname {\simpleiconsmapone\symbol{212}}
+ \expandafter\def\csname simpleicon@apostropheicon\endcsname {\simpleiconsmapone\symbol{213}}
+ \expandafter\def\csname simpleicon@appianicon\endcsname {\simpleiconsmapone\symbol{214}}
+ \expandafter\def\csname simpleicon@appiumicon\endcsname {\simpleiconsmapone\symbol{215}}
+ \expandafter\def\csname simpleicon@appleicon\endcsname {\simpleiconsmapone\symbol{216}}
+ \expandafter\def\csname simpleicon@applearcadeicon\endcsname {\simpleiconsmapone\symbol{217}}
+ \expandafter\def\csname simpleicon@applemusicicon\endcsname {\simpleiconsmapone\symbol{218}}
+ \expandafter\def\csname simpleicon@applenewsicon\endcsname {\simpleiconsmapone\symbol{219}}
+ \expandafter\def\csname simpleicon@applepayicon\endcsname {\simpleiconsmapone\symbol{220}}
+ \expandafter\def\csname simpleicon@applepodcastsicon\endcsname {\simpleiconsmapone\symbol{221}}
+ \expandafter\def\csname simpleicon@appletvicon\endcsname {\simpleiconsmapone\symbol{222}}
+ \expandafter\def\csname simpleicon@appsignalicon\endcsname {\simpleiconsmapone\symbol{223}}
+ \expandafter\def\csname simpleicon@appsmithicon\endcsname {\simpleiconsmapone\symbol{224}}
+ \expandafter\def\csname simpleicon@appstoreicon\endcsname {\simpleiconsmapone\symbol{225}}
+ \expandafter\def\csname simpleicon@appveyoricon\endcsname {\simpleiconsmapone\symbol{226}}
+ \expandafter\def\csname simpleicon@appwriteicon\endcsname {\simpleiconsmapone\symbol{227}}
+ \expandafter\def\csname simpleicon@aquaicon\endcsname {\simpleiconsmapone\symbol{228}}
+ \expandafter\def\csname simpleicon@aralicon\endcsname {\simpleiconsmapone\symbol{229}}
+ \expandafter\def\csname simpleicon@arangodbicon\endcsname {\simpleiconsmapone\symbol{230}}
+ \expandafter\def\csname simpleicon@arcicon\endcsname {\simpleiconsmapone\symbol{231}}
+ \expandafter\def\csname simpleicon@arcgisicon\endcsname {\simpleiconsmapone\symbol{232}}
+ \expandafter\def\csname simpleicon@archicadicon\endcsname {\simpleiconsmapone\symbol{233}}
+ \expandafter\def\csname simpleicon@archiveofourownicon\endcsname {\simpleiconsmapone\symbol{234}}
+ \expandafter\def\csname simpleicon@archlinuxicon\endcsname {\simpleiconsmapone\symbol{235}}
+ \expandafter\def\csname simpleicon@ardouricon\endcsname {\simpleiconsmapone\symbol{236}}
+ \expandafter\def\csname simpleicon@arduinoicon\endcsname {\simpleiconsmapone\symbol{237}}
+ \expandafter\def\csname simpleicon@argoicon\endcsname {\simpleiconsmapone\symbol{238}}
+ \expandafter\def\csname simpleicon@argosicon\endcsname {\simpleiconsmapone\symbol{239}}
+ \expandafter\def\csname simpleicon@ariakiticon\endcsname {\simpleiconsmapone\symbol{240}}
+ \expandafter\def\csname simpleicon@arkecosystemicon\endcsname {\simpleiconsmapone\symbol{241}}
+ \expandafter\def\csname simpleicon@arloicon\endcsname {\simpleiconsmapone\symbol{242}}
+ \expandafter\def\csname simpleicon@armicon\endcsname {\simpleiconsmapone\symbol{243}}
+ \expandafter\def\csname simpleicon@armkeilicon\endcsname {\simpleiconsmapone\symbol{244}}
+ \expandafter\def\csname simpleicon@arstechnicaicon\endcsname {\simpleiconsmapone\symbol{245}}
+ \expandafter\def\csname simpleicon@artifacthubicon\endcsname {\simpleiconsmapone\symbol{246}}
+ \expandafter\def\csname simpleicon@artixlinuxicon\endcsname {\simpleiconsmapone\symbol{247}}
+ \expandafter\def\csname simpleicon@artstationicon\endcsname {\simpleiconsmapone\symbol{248}}
+ \expandafter\def\csname simpleicon@arxivicon\endcsname {\simpleiconsmapone\symbol{249}}
+ \expandafter\def\csname simpleicon@asahilinuxicon\endcsname {\simpleiconsmapone\symbol{250}}
+ \expandafter\def\csname simpleicon@asanaicon\endcsname {\simpleiconsmapone\symbol{251}}
+ \expandafter\def\csname simpleicon@asciidoctoricon\endcsname {\simpleiconsmapone\symbol{252}}
+ \expandafter\def\csname simpleicon@asciinemaicon\endcsname {\simpleiconsmapone\symbol{253}}
+ \expandafter\def\csname simpleicon@asdaicon\endcsname {\simpleiconsmapone\symbol{254}}
+ \expandafter\def\csname simpleicon@asepriteicon\endcsname {\simpleiconsmapone\symbol{255}}
+ \expandafter\def\csname simpleicon@askfmicon\endcsname {\simpleiconsmaptwo\symbol{0}}
+ \expandafter\def\csname simpleicon@assemblyscripticon\endcsname {\simpleiconsmaptwo\symbol{1}}
+ \expandafter\def\csname simpleicon@asteriskicon\endcsname {\simpleiconsmaptwo\symbol{2}}
+ \expandafter\def\csname simpleicon@astonmartinicon\endcsname {\simpleiconsmaptwo\symbol{3}}
+ \expandafter\def\csname simpleicon@astraicon\endcsname {\simpleiconsmaptwo\symbol{4}}
+ \expandafter\def\csname simpleicon@astralicon\endcsname {\simpleiconsmaptwo\symbol{5}}
+ \expandafter\def\csname simpleicon@astroicon\endcsname {\simpleiconsmaptwo\symbol{6}}
+ \expandafter\def\csname simpleicon@asusicon\endcsname {\simpleiconsmaptwo\symbol{7}}
+ \expandafter\def\csname simpleicon@atandticon\endcsname {\simpleiconsmaptwo\symbol{8}}
+ \expandafter\def\csname simpleicon@atariicon\endcsname {\simpleiconsmaptwo\symbol{9}}
+ \expandafter\def\csname simpleicon@atlassianicon\endcsname {\simpleiconsmaptwo\symbol{10}}
+ \expandafter\def\csname simpleicon@auchanicon\endcsname {\simpleiconsmaptwo\symbol{11}}
+ \expandafter\def\csname simpleicon@audacityicon\endcsname {\simpleiconsmaptwo\symbol{12}}
+ \expandafter\def\csname simpleicon@audiicon\endcsname {\simpleiconsmaptwo\symbol{13}}
+ \expandafter\def\csname simpleicon@audibleicon\endcsname {\simpleiconsmaptwo\symbol{14}}
+ \expandafter\def\csname simpleicon@audiobookshelficon\endcsname {\simpleiconsmaptwo\symbol{15}}
+ \expandafter\def\csname simpleicon@audioboomicon\endcsname {\simpleiconsmaptwo\symbol{16}}
+ \expandafter\def\csname simpleicon@audiomackicon\endcsname {\simpleiconsmaptwo\symbol{17}}
+ \expandafter\def\csname simpleicon@audiotechnicaicon\endcsname {\simpleiconsmaptwo\symbol{18}}
+ \expandafter\def\csname simpleicon@aureliaicon\endcsname {\simpleiconsmaptwo\symbol{19}}
+ \expandafter\def\csname simpleicon@auth0icon\endcsname {\simpleiconsmaptwo\symbol{20}}
+ \expandafter\def\csname simpleicon@autheliaicon\endcsname {\simpleiconsmaptwo\symbol{21}}
+ \expandafter\def\csname simpleicon@authentikicon\endcsname {\simpleiconsmaptwo\symbol{22}}
+ \expandafter\def\csname simpleicon@authyicon\endcsname {\simpleiconsmaptwo\symbol{23}}
+ \expandafter\def\csname simpleicon@autocadicon\endcsname {\simpleiconsmaptwo\symbol{24}}
+ \expandafter\def\csname simpleicon@autocannonicon\endcsname {\simpleiconsmaptwo\symbol{25}}
+ \expandafter\def\csname simpleicon@autodeskicon\endcsname {\simpleiconsmaptwo\symbol{26}}
+ \expandafter\def\csname simpleicon@autodeskmayaicon\endcsname {\simpleiconsmaptwo\symbol{27}}
+ \expandafter\def\csname simpleicon@autodeskreviticon\endcsname {\simpleiconsmaptwo\symbol{28}}
+ \expandafter\def\csname simpleicon@autohotkeyicon\endcsname {\simpleiconsmaptwo\symbol{29}}
+ \expandafter\def\csname simpleicon@autoiticon\endcsname {\simpleiconsmaptwo\symbol{30}}
+ \expandafter\def\csname simpleicon@automatticicon\endcsname {\simpleiconsmaptwo\symbol{31}}
+ \expandafter\def\csname simpleicon@autoprefixericon\endcsname {\simpleiconsmaptwo\symbol{32}}
+ \expandafter\def\csname simpleicon@autozoneicon\endcsname {\simpleiconsmaptwo\symbol{33}}
+ \expandafter\def\csname simpleicon@avajsicon\endcsname {\simpleiconsmaptwo\symbol{34}}
+ \expandafter\def\csname simpleicon@avasticon\endcsname {\simpleiconsmaptwo\symbol{35}}
+ \expandafter\def\csname simpleicon@aviancaicon\endcsname {\simpleiconsmaptwo\symbol{36}}
+ \expandafter\def\csname simpleicon@aviraicon\endcsname {\simpleiconsmaptwo\symbol{37}}
+ \expandafter\def\csname simpleicon@awesomelistsicon\endcsname {\simpleiconsmaptwo\symbol{38}}
+ \expandafter\def\csname simpleicon@awesomewmicon\endcsname {\simpleiconsmaptwo\symbol{39}}
+ \expandafter\def\csname simpleicon@awsamplifyicon\endcsname {\simpleiconsmaptwo\symbol{40}}
+ \expandafter\def\csname simpleicon@awselasticloadbalancingicon\endcsname {\simpleiconsmaptwo\symbol{41}}
+ \expandafter\def\csname simpleicon@awsfargateicon\endcsname {\simpleiconsmaptwo\symbol{42}}
+ \expandafter\def\csname simpleicon@awslambdaicon\endcsname {\simpleiconsmaptwo\symbol{43}}
+ \expandafter\def\csname simpleicon@awsorganizationsicon\endcsname {\simpleiconsmaptwo\symbol{44}}
+ \expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmaptwo\symbol{45}}
+ \expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmaptwo\symbol{46}}
+ \expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmaptwo\symbol{47}}
+ \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmaptwo\symbol{48}}
+ \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmaptwo\symbol{49}}
+ \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmaptwo\symbol{50}}
+ \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmaptwo\symbol{51}}
+ \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmaptwo\symbol{52}}
+ \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmaptwo\symbol{53}}
+ \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmaptwo\symbol{54}}
+ \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmaptwo\symbol{55}}
+ \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmaptwo\symbol{56}}
+ \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmaptwo\symbol{57}}
+ \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmaptwo\symbol{58}}
+ \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmaptwo\symbol{59}}
+ \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmaptwo\symbol{60}}
+ \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmaptwo\symbol{61}}
+ \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmaptwo\symbol{62}}
+ \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmaptwo\symbol{63}}
+ \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmaptwo\symbol{64}}
+ \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmaptwo\symbol{65}}
+ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmaptwo\symbol{66}}
+ \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmaptwo\symbol{67}}
+ \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmaptwo\symbol{68}}
+ \expandafter\def\csname simpleicon@baserowicon\endcsname {\simpleiconsmaptwo\symbol{69}}
+ \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{70}}
+ \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{71}}
+ \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{72}}
+ \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{73}}
+ \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{74}}
+ \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{75}}
+ \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{76}}
+ \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{77}}
+ \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{78}}
+ \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{79}}
+ \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{80}}
+ \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{81}}
+ \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{82}}
+ \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{83}}
+ \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{84}}
+ \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{85}}
+ \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{86}}
+ \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{87}}
+ \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{88}}
+ \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{89}}
+ \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{90}}
+ \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{91}}
+ \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{92}}
+ \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{93}}
+ \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{94}}
+ \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{95}}
+ \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{96}}
+ \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{97}}
+ \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{98}}
+ \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{99}}
+ \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{100}}
+ \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{101}}
+ \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{102}}
+ \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{103}}
+ \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{104}}
+ \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{105}}
+ \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{106}}
+ \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{107}}
+ \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{108}}
+ \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{109}}
+ \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{110}}
+ \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{111}}
+ \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{112}}
+ \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{113}}
+ \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{114}}
+ \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{115}}
+ \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{116}}
+ \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{117}}
+ \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{118}}
+ \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{119}}
+ \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{120}}
+ \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{121}}
+ \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{122}}
+ \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{123}}
+ \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{124}}
+ \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{125}}
+ \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{126}}
+ \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{127}}
+ \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{128}}
+ \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{129}}
+ \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{130}}
+ \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{131}}
+ \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{132}}
+ \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{133}}
+ \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{134}}
+ \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{135}}
+ \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{136}}
+ \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{137}}
+ \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{138}}
+ \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{139}}
+ \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{140}}
+ \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{141}}
+ \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{142}}
+ \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{143}}
+ \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{144}}
+ \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{145}}
+ \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{146}}
+ \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{147}}
+ \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{148}}
+ \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{149}}
+ \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{150}}
+ \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{151}}
+ \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{152}}
+ \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{153}}
+ \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{154}}
+ \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{155}}
+ \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{156}}
+ \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{157}}
+ \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{158}}
+ \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{159}}
+ \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{160}}
+ \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{161}}
+ \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{162}}
+ \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{163}}
+ \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{164}}
+ \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{165}}
+ \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{166}}
+ \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{167}}
+ \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{168}}
+ \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{169}}
+ \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{170}}
+ \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{171}}
+ \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{172}}
+ \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{173}}
+ \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{174}}
+ \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{175}}
+ \expandafter\def\csname simpleicon@builtbybiticon\endcsname {\simpleiconsmaptwo\symbol{176}}
+ \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{177}}
+ \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{178}}
+ \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{179}}
+ \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{180}}
+ \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{181}}
+ \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{182}}
+ \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{183}}
+ \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{184}}
+ \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{185}}
+ \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{186}}
+ \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{187}}
+ \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{188}}
+ \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{189}}
+ \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{190}}
+ \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{191}}
+ \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{192}}
+ \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{193}}
+ \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{194}}
+ \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{195}}
+ \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{196}}
+ \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{197}}
+ \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{198}}
+ \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{199}}
+ \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{200}}
+ \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{201}}
+ \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{202}}
+ \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{203}}
+ \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{204}}
+ \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{205}}
+ \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{206}}
+ \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{207}}
+ \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{208}}
+ \expandafter\def\csname simpleicon@caprovericon\endcsname {\simpleiconsmaptwo\symbol{209}}
+ \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{210}}
+ \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{211}}
+ \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{212}}
+ \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{213}}
+ \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{214}}
+ \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{215}}
+ \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{216}}
+ \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{217}}
+ \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{218}}
+ \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{219}}
+ \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{220}}
+ \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{221}}
+ \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{222}}
+ \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{223}}
+ \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{224}}
+ \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{225}}
+ \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{226}}
+ \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{227}}
+ \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{228}}
+ \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{229}}
+ \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{230}}
+ \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{231}}
+ \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{232}}
+ \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{233}}
+ \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{234}}
+ \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{235}}
+ \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{236}}
+ \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{237}}
+ \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{238}}
+ \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{239}}
+ \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{240}}
+ \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{241}}
+ \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{242}}
+ \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{243}}
+ \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{244}}
+ \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{245}}
+ \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{246}}
+ \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{247}}
+ \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{248}}
+ \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{249}}
+ \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{250}}
+ \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{251}}
+ \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{252}}
+ \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{253}}
+ \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{254}}
+ \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{255}}
+ \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmapthree\symbol{0}}
+ \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmapthree\symbol{1}}
+ \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmapthree\symbol{2}}
+ \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmapthree\symbol{3}}
+ \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmapthree\symbol{4}}
+ \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmapthree\symbol{5}}
+ \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{6}}
+ \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{7}}
+ \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{8}}
+ \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{9}}
+ \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{10}}
+ \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{11}}
+ \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{12}}
+ \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{13}}
+ \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{14}}
+ \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{15}}
+ \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{16}}
+ \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{17}}
+ \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{18}}
+ \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{19}}
+ \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{20}}
+ \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{21}}
+ \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{22}}
+ \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{23}}
+ \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{24}}
+ \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{25}}
+ \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{26}}
+ \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{27}}
+ \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{28}}
+ \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{29}}
+ \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{30}}
+ \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{31}}
+ \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{32}}
+ \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{33}}
+ \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{34}}
+ \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{35}}
+ \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{36}}
+ \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{37}}
+ \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{38}}
+ \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{39}}
+ \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{40}}
+ \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{41}}
+ \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{42}}
+ \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{43}}
+ \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{44}}
+ \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{45}}
+ \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{46}}
+ \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{47}}
+ \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{48}}
+ \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{49}}
+ \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{50}}
+ \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{51}}
+ \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{52}}
+ \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{53}}
+ \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{54}}
+ \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{55}}
+ \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{56}}
+ \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{57}}
+ \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{58}}
+ \expandafter\def\csname simpleicon@codecraftersicon\endcsname {\simpleiconsmapthree\symbol{59}}
+ \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{60}}
+ \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{61}}
+ \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{62}}
+ \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{63}}
+ \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{64}}
+ \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{65}}
+ \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{66}}
+ \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{67}}
+ \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{68}}
+ \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{69}}
+ \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{70}}
+ \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{71}}
+ \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{72}}
+ \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{73}}
+ \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{74}}
+ \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{75}}
+ \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{76}}
+ \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{77}}
+ \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{78}}
+ \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{79}}
+ \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{80}}
+ \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{81}}
+ \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{82}}
+ \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{83}}
+ \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{84}}
+ \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{85}}
+ \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{86}}
+ \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{87}}
+ \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{88}}
+ \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{89}}
+ \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{90}}
+ \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{91}}
+ \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{92}}
+ \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{93}}
+ \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{94}}
+ \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{95}}
+ \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{96}}
+ \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{97}}
+ \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{98}}
+ \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{99}}
+ \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{100}}
+ \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{101}}
+ \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{102}}
+ \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{103}}
+ \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{104}}
+ \expandafter\def\csname simpleicon@contaboicon\endcsname {\simpleiconsmapthree\symbol{105}}
+ \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{106}}
+ \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{107}}
+ \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{108}}
+ \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{109}}
+ \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{110}}
+ \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{111}}
+ \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{112}}
+ \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{113}}
+ \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{114}}
+ \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{115}}
+ \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{116}}
+ \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{117}}
+ \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{118}}
+ \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{119}}
+ \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{120}}
+ \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{121}}
+ \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{122}}
+ \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{123}}
+ \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{124}}
+ \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{125}}
+ \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{126}}
+ \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{127}}
+ \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{128}}
+ \expandafter\def\csname simpleicon@cozeicon\endcsname {\simpleiconsmapthree\symbol{129}}
+ \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{130}}
+ \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{131}}
+ \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{132}}
+ \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{133}}
+ \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{134}}
+ \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{135}}
+ \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{136}}
+ \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{137}}
+ \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{138}}
+ \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{139}}
+ \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{140}}
+ \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{141}}
+ \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{142}}
+ \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{143}}
+ \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{144}}
+ \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{145}}
+ \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{146}}
+ \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{147}}
+ \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{148}}
+ \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{149}}
+ \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{150}}
+ \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{151}}
+ \expandafter\def\csname simpleicon@csdnicon\endcsname {\simpleiconsmapthree\symbol{152}}
+ \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{153}}
+ \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{154}}
+ \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{155}}
+ \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{156}}
+ \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{157}}
+ \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{158}}
+ \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{159}}
+ \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{160}}
+ \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{161}}
+ \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{162}}
+ \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{163}}
+ \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{164}}
+ \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{165}}
+ \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{166}}
+ \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{167}}
+ \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{168}}
+ \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{169}}
+ \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{170}}
+ \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{171}}
+ \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{172}}
+ \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{173}}
+ \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{174}}
+ \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{175}}
+ \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{176}}
+ \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{177}}
+ \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{178}}
+ \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{179}}
+ \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{180}}
+ \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{181}}
+ \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{182}}
+ \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{183}}
+ \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{184}}
+ \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{185}}
+ \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{186}}
+ \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{187}}
+ \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{188}}
+ \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{189}}
+ \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{190}}
+ \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{191}}
+ \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{192}}
+ \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{193}}
+ \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{194}}
+ \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{195}}
+ \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{196}}
+ \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{197}}
+ \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{198}}
+ \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{199}}
+ \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{200}}
+ \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{201}}
+ \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{202}}
+ \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{203}}
+ \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{204}}
+ \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{205}}
+ \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{206}}
+ \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{207}}
+ \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{208}}
+ \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{209}}
+ \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{210}}
+ \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{211}}
+ \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{212}}
+ \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{213}}
+ \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{214}}
+ \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{215}}
+ \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{216}}
+ \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{217}}
+ \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{218}}
+ \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{219}}
+ \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{220}}
+ \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{221}}
+ \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{222}}
+ \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{223}}
+ \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{224}}
+ \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{225}}
+ \expandafter\def\csname simpleicon@deutschewelleicon\endcsname {\simpleiconsmapthree\symbol{226}}
+ \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{227}}
+ \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{228}}
+ \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{229}}
+ \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{230}}
+ \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{231}}
+ \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{232}}
+ \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{233}}
+ \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{234}}
+ \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{235}}
+ \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{236}}
+ \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{237}}
+ \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{238}}
+ \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{239}}
+ \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{240}}
+ \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{241}}
+ \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{242}}
+ \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{243}}
+ \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{244}}
+ \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{245}}
+ \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{246}}
+ \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{247}}
+ \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{248}}
+ \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{249}}
+ \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{250}}
+ \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{251}}
+ \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{252}}
+ \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{253}}
+ \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{254}}
+ \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{255}}
+ \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapfour\symbol{0}}
+ \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapfour\symbol{1}}
+ \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapfour\symbol{2}}
+ \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapfour\symbol{3}}
+ \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapfour\symbol{4}}
+ \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapfour\symbol{5}}
+ \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapfour\symbol{6}}
+ \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapfour\symbol{7}}
+ \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapfour\symbol{8}}
+ \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapfour\symbol{9}}
+ \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapfour\symbol{10}}
+ \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{11}}
+ \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{12}}
+ \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{13}}
+ \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{14}}
+ \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{15}}
+ \expandafter\def\csname simpleicon@downdetectoricon\endcsname {\simpleiconsmapfour\symbol{16}}
+ \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{17}}
+ \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{18}}
+ \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{19}}
+ \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{20}}
+ \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{21}}
+ \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{22}}
+ \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{23}}
+ \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{24}}
+ \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{25}}
+ \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{26}}
+ \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{27}}
+ \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{28}}
+ \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{29}}
+ \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{30}}
+ \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{31}}
+ \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{32}}
+ \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{33}}
+ \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{34}}
+ \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{35}}
+ \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{36}}
+ \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{37}}
+ \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{38}}
+ \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{39}}
+ \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{40}}
+ \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{41}}
+ \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{42}}
+ \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{43}}
+ \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{44}}
+ \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{45}}
+ \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{46}}
+ \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{47}}
+ \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{48}}
+ \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{49}}
+ \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{50}}
+ \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{51}}
+ \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{52}}
+ \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{53}}
+ \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{54}}
+ \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{55}}
+ \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{56}}
+ \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{57}}
+ \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{58}}
+ \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{59}}
+ \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{60}}
+ \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{61}}
+ \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{62}}
+ \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{63}}
+ \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{64}}
+ \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{65}}
+ \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{66}}
+ \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{67}}
+ \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{68}}
+ \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{69}}
+ \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{70}}
+ \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{71}}
+ \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{72}}
+ \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{73}}
+ \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{74}}
+ \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{75}}
+ \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{76}}
+ \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{77}}
+ \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{78}}
+ \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{79}}
+ \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{80}}
+ \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{81}}
+ \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{82}}
+ \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{83}}
+ \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{84}}
+ \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{85}}
+ \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{86}}
+ \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{87}}
+ \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{88}}
+ \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{89}}
+ \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{90}}
+ \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{91}}
+ \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{92}}
+ \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{93}}
+ \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{94}}
+ \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{95}}
+ \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{96}}
+ \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{97}}
+ \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{98}}
+ \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{99}}
+ \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{100}}
+ \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{101}}
+ \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{102}}
+ \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{103}}
+ \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{104}}
+ \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{105}}
+ \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{106}}
+ \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{107}}
+ \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{108}}
+ \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{109}}
+ \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{110}}
+ \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{111}}
+ \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{112}}
+ \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{113}}
+ \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{114}}
+ \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{115}}
+ \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{116}}
+ \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{117}}
+ \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{118}}
+ \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{119}}
+ \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{120}}
+ \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{121}}
+ \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{122}}
+ \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{123}}
+ \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{124}}
+ \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{125}}
+ \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{126}}
+ \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{127}}
+ \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{128}}
+ \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{129}}
+ \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{130}}
+ \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{131}}
+ \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{132}}
+ \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{133}}
+ \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{134}}
+ \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{135}}
+ \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{136}}
+ \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{137}}
+ \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{138}}
+ \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{139}}
+ \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{140}}
+ \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{141}}
+ \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{142}}
+ \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{143}}
+ \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{144}}
+ \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{145}}
+ \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{146}}
+ \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{147}}
+ \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{148}}
+ \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{149}}
+ \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{150}}
+ \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{151}}
+ \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{152}}
+ \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{153}}
+ \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{154}}
+ \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{155}}
+ \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{156}}
+ \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{157}}
+ \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{158}}
+ \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{159}}
+ \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{160}}
+ \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{161}}
+ \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{162}}
+ \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{163}}
+ \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{164}}
+ \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{165}}
+ \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{166}}
+ \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{167}}
+ \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{168}}
+ \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{169}}
+ \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{170}}
+ \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{171}}
+ \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{172}}
+ \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{173}}
+ \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{174}}
+ \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{175}}
+ \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{176}}
+ \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{177}}
+ \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{178}}
+ \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{179}}
+ \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{180}}
+ \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{181}}
+ \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{182}}
+ \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{183}}
+ \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{184}}
+ \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{185}}
+ \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{186}}
+ \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{187}}
+ \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{188}}
+ \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{189}}
+ \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{190}}
+ \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{191}}
+ \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{192}}
+ \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{193}}
+ \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{194}}
+ \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{195}}
+ \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{196}}
+ \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{197}}
+ \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{198}}
+ \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{199}}
+ \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{200}}
+ \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{201}}
+ \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{202}}
+ \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{203}}
+ \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{204}}
+ \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{205}}
+ \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{206}}
+ \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{207}}
+ \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{208}}
+ \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{209}}
+ \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{210}}
+ \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{211}}
+ \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{212}}
+ \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{213}}
+ \expandafter\def\csname simpleicon@flydotioicon\endcsname {\simpleiconsmapfour\symbol{214}}
+ \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{215}}
+ \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{216}}
+ \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{217}}
+ \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{218}}
+ \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{219}}
+ \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{220}}
+ \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{221}}
+ \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{222}}
+ \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{223}}
+ \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{224}}
+ \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{225}}
+ \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{226}}
+ \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{227}}
+ \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{228}}
+ \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{229}}
+ \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{230}}
+ \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{231}}
+ \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{232}}
+ \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{233}}
+ \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{234}}
+ \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{235}}
+ \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{236}}
+ \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{237}}
+ \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{238}}
+ \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{239}}
+ \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{240}}
+ \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{241}}
+ \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{242}}
+ \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{243}}
+ \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{244}}
+ \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{245}}
+ \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{246}}
+ \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{247}}
+ \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{248}}
+ \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{249}}
+ \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{250}}
+ \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{251}}
+ \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{252}}
+ \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{253}}
+ \expandafter\def\csname simpleicon@freshicon\endcsname {\simpleiconsmapfour\symbol{254}}
+ \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{255}}
+ \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfive\symbol{0}}
+ \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfive\symbol{1}}
+ \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfive\symbol{2}}
+ \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfive\symbol{3}}
+ \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfive\symbol{4}}
+ \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfive\symbol{5}}
+ \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfive\symbol{6}}
+ \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfive\symbol{7}}
+ \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfive\symbol{8}}
+ \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfive\symbol{9}}
+ \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfive\symbol{10}}
+ \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfive\symbol{11}}
+ \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfive\symbol{12}}
+ \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfive\symbol{13}}
+ \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{14}}
+ \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{15}}
+ \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{16}}
+ \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{17}}
+ \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{18}}
+ \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{19}}
+ \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{20}}
+ \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{21}}
+ \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{22}}
+ \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{23}}
+ \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{24}}
+ \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{25}}
+ \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{26}}
+ \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{27}}
+ \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{28}}
+ \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{29}}
+ \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{30}}
+ \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{31}}
+ \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{32}}
+ \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{33}}
+ \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{34}}
+ \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{35}}
+ \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{36}}
+ \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{37}}
+ \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{38}}
+ \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{39}}
+ \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{40}}
+ \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{41}}
+ \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{42}}
+ \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{43}}
+ \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{44}}
+ \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{45}}
+ \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{46}}
+ \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{47}}
+ \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{48}}
+ \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{49}}
+ \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{50}}
+ \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{51}}
+ \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{52}}
+ \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{53}}
+ \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{54}}
+ \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{55}}
+ \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{56}}
+ \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{57}}
+ \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{58}}
+ \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{59}}
+ \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{60}}
+ \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{61}}
+ \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{62}}
+ \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{63}}
+ \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{64}}
+ \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{65}}
+ \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{66}}
+ \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmapfive\symbol{67}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{68}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{69}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{70}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{71}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{72}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{73}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{74}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{75}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{76}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{77}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{78}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{79}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{80}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{81}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{82}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{83}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{84}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{85}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{86}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{87}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{88}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{89}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{90}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{91}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{92}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{93}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{94}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{95}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{96}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{97}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{98}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{99}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{100}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{101}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{102}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{103}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{104}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{105}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{106}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{107}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{108}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{109}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{110}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{111}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{112}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{113}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{114}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{115}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{116}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{117}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{118}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{119}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{120}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{121}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{122}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{123}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{124}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{125}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{126}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{127}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{128}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{129}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{130}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{131}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{132}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{133}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{134}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{135}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{136}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{137}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{138}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{139}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{140}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{141}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{142}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{143}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{144}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{145}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{146}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{147}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{148}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{149}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{150}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{151}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{152}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{153}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{154}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{155}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{156}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{157}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{158}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{159}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{160}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{161}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{162}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{163}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{164}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{165}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{166}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{167}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{168}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{169}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{170}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{171}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{172}}
+ \expandafter\def\csname simpleicon@guitarproicon\endcsname {\simpleiconsmapfive\symbol{173}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{174}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{175}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{176}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{177}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{178}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{179}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{180}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{181}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{182}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{183}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{184}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{185}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{186}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{187}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{188}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{189}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{190}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{191}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{192}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{193}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{194}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{195}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{196}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{197}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{198}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{199}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{200}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{201}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{202}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{203}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{204}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{205}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{206}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{207}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{208}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{209}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{210}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{211}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{212}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{213}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{214}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{215}}
+ \expandafter\def\csname simpleicon@helixicon\endcsname {\simpleiconsmapfive\symbol{216}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{217}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{218}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{219}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{220}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{221}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{222}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{223}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{224}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{225}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{226}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{227}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{228}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{229}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{230}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{231}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{232}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{233}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{234}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{235}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{236}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{237}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{238}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{239}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{240}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{241}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{242}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{243}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{244}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{245}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{246}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{247}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{248}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{249}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{250}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{251}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{252}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{253}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{254}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{255}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapsix\symbol{0}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapsix\symbol{1}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapsix\symbol{2}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapsix\symbol{3}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapsix\symbol{4}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapsix\symbol{5}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapsix\symbol{6}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapsix\symbol{7}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapsix\symbol{8}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapsix\symbol{9}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapsix\symbol{10}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapsix\symbol{11}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapsix\symbol{12}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapsix\symbol{13}}
+ \expandafter\def\csname simpleicon@humhubicon\endcsname {\simpleiconsmapsix\symbol{14}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapsix\symbol{15}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapsix\symbol{16}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapsix\symbol{17}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{18}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{19}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{20}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{21}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{22}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{23}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{24}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{25}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{26}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{27}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{28}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{29}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{30}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{31}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{32}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{33}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{34}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{35}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{36}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{37}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{38}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{39}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{40}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{41}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{42}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{43}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{44}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{45}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{46}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{47}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{48}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{49}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{50}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{51}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{52}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{53}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{54}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{55}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{56}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{57}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{58}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{59}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{60}}
+ \expandafter\def\csname simpleicon@inductiveautomationicon\endcsname {\simpleiconsmapsix\symbol{61}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{62}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{63}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{64}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{65}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{66}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{67}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{68}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{69}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{70}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{71}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{72}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{73}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{74}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{75}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{76}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{77}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{78}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{79}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{80}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{81}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{82}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{83}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{84}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{85}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{86}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{87}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{88}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{89}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{90}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{91}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{92}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{93}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{94}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{95}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{96}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{97}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{98}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{99}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{100}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{101}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{102}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{103}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{104}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{105}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{106}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{107}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{108}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{109}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{110}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{111}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{112}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{113}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{114}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{115}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{116}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{117}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{118}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{119}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{120}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{121}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{122}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{123}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{124}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{125}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{126}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{127}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{128}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{129}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{130}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{131}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{132}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{133}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{134}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{135}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{136}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{137}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{138}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{139}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{140}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{141}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{142}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{143}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{144}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{145}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{146}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{147}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{148}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{149}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{150}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{151}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{152}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{153}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{154}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{155}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{156}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{157}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{158}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{159}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{160}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{161}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{162}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{163}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{164}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{165}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{166}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{167}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{168}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{169}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{170}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{171}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{172}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{173}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{174}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{175}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{176}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{177}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{178}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{179}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{180}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{181}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{182}}
+ \expandafter\def\csname simpleicon@kdeplasmaicon\endcsname {\simpleiconsmapsix\symbol{183}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{184}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{185}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{186}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{187}}
+ \expandafter\def\csname simpleicon@keewebicon\endcsname {\simpleiconsmapsix\symbol{188}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{189}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{190}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{191}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{192}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{193}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{194}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{195}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{196}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{197}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{198}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{199}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{200}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{201}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{202}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{203}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{204}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{205}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{206}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{207}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{208}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{209}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{210}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{211}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{212}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{213}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{214}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{215}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{216}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{217}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{218}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{219}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{220}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{221}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{222}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{223}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{224}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{225}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{226}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{227}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{228}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{229}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{230}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{231}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{232}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{233}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{234}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{235}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{236}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{237}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{238}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{239}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{240}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{241}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{242}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{243}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{244}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{245}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{246}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{247}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{248}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{249}}
+ \expandafter\def\csname simpleicon@languagetoolicon\endcsname {\simpleiconsmapsix\symbol{250}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{251}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{252}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{253}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{254}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{255}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapseven\symbol{0}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapseven\symbol{1}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapseven\symbol{2}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapseven\symbol{3}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapseven\symbol{4}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapseven\symbol{5}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapseven\symbol{6}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapseven\symbol{7}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapseven\symbol{8}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapseven\symbol{9}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapseven\symbol{10}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapseven\symbol{11}}
+ \expandafter\def\csname simpleicon@lefthookicon\endcsname {\simpleiconsmapseven\symbol{12}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapseven\symbol{13}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapseven\symbol{14}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapseven\symbol{15}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapseven\symbol{16}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapseven\symbol{17}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapseven\symbol{18}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapseven\symbol{19}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapseven\symbol{20}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapseven\symbol{21}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{22}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{23}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{24}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{25}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{26}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{27}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{28}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{29}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{30}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{31}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{32}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{33}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{34}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{35}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{36}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{37}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{38}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{39}}
+ \expandafter\def\csname simpleicon@libretranslateicon\endcsname {\simpleiconsmapseven\symbol{40}}
+ \expandafter\def\csname simpleicon@libretubeicon\endcsname {\simpleiconsmapseven\symbol{41}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{42}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{43}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{44}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{45}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{46}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{47}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{48}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{49}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{50}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{51}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{52}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{53}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{54}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{55}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{56}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{57}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{58}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{59}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{60}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{61}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{62}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{63}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{64}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{65}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{66}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{67}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{68}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{69}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{70}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{71}}
+ \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{72}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{73}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{74}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{75}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{76}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{77}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{78}}
+ \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{79}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{80}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{81}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{82}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{83}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{84}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{85}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{86}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{87}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{88}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{89}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{90}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{91}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{92}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{93}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{94}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{95}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{96}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{97}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{98}}
+ \expandafter\def\csname simpleicon@lucideicon\endcsname {\simpleiconsmapseven\symbol{99}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{100}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{101}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{102}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{103}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{104}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{105}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{106}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{107}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{108}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{109}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{110}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{111}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{112}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{113}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{114}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{115}}
+ \expandafter\def\csname simpleicon@mailboxdotorgicon\endcsname {\simpleiconsmapseven\symbol{116}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{117}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{118}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{119}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{120}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{121}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{122}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{123}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{124}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{125}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{126}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{127}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{128}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{129}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{130}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{131}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{132}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{133}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{134}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{135}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{136}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{137}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{138}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{139}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{140}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{141}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{142}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{143}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{144}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{145}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{146}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{147}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{148}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{149}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{150}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{151}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{152}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{153}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{154}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{155}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{156}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{157}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{158}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{159}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{160}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{161}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{162}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{163}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{164}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{165}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{166}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{167}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{168}}
+ \expandafter\def\csname simpleicon@mediapipeicon\endcsname {\simpleiconsmapseven\symbol{169}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{170}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{171}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{172}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{173}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{174}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{175}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{176}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{177}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{178}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{179}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{180}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{181}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{182}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{183}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{184}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{185}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{186}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{187}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{188}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{189}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{190}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{191}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{192}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{193}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{194}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{195}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{196}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{197}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{198}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{199}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{200}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{201}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{202}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{203}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{204}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{205}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{206}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{207}}
+ \expandafter\def\csname simpleicon@mihoyoicon\endcsname {\simpleiconsmapseven\symbol{208}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{209}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{210}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{211}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{212}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{213}}
+ \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmapseven\symbol{214}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{215}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{216}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{217}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{218}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{219}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{220}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{221}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{222}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{223}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{224}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{225}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{226}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{227}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{228}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{229}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{230}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{231}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{232}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{233}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{234}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{235}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{236}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{237}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{238}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{239}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{240}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{241}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{242}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{243}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{244}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{245}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{246}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{247}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{248}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{249}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{250}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{251}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{252}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{253}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{254}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{255}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapeight\symbol{0}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapeight\symbol{1}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapeight\symbol{2}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapeight\symbol{3}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapeight\symbol{4}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapeight\symbol{5}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapeight\symbol{6}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapeight\symbol{7}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapeight\symbol{8}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapeight\symbol{9}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapeight\symbol{10}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapeight\symbol{11}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapeight\symbol{12}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapeight\symbol{13}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapeight\symbol{14}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapeight\symbol{15}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapeight\symbol{16}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapeight\symbol{17}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapeight\symbol{18}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapeight\symbol{19}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapeight\symbol{20}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapeight\symbol{21}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapeight\symbol{22}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapeight\symbol{23}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapeight\symbol{24}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapeight\symbol{25}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapeight\symbol{26}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapeight\symbol{27}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{28}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{29}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{30}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{31}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{32}}
+ \expandafter\def\csname simpleicon@nanostoresicon\endcsname {\simpleiconsmapeight\symbol{33}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{34}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{35}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{36}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{37}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{38}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{39}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{40}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{41}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{42}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{43}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{44}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{45}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{46}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{47}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{48}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{49}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{50}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{51}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{52}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{53}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{54}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{55}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{56}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{57}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{58}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{59}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{60}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{61}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{62}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{63}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{64}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{65}}
+ \expandafter\def\csname simpleicon@nexonicon\endcsname {\simpleiconsmapeight\symbol{66}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{67}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{68}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{69}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{70}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{71}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{72}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{73}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{74}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{75}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{76}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{77}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{78}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{79}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{80}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{81}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{82}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{83}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{84}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{85}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{86}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{87}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{88}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{89}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{90}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{91}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{92}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{93}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{94}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{95}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{96}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{97}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{98}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{99}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{100}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{101}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{102}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{103}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{104}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{105}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{106}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{107}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{108}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{109}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{110}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{111}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{112}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{113}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{114}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{115}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{116}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{117}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{118}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{119}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{120}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{121}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{122}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{123}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{124}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{125}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{126}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{127}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{128}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{129}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{130}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{131}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{132}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{133}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{134}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{135}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{136}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{137}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{138}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{139}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{140}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{141}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{142}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{143}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{144}}
+ \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmapeight\symbol{145}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{146}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{147}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{148}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{149}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{150}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{151}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{152}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{153}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{154}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{155}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{156}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{157}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{158}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{159}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{160}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{161}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{162}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{163}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{164}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{165}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{166}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{167}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{168}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{169}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{170}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{171}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{172}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{173}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{174}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{175}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{176}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{177}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{178}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{179}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{180}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{181}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{182}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{183}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{184}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{185}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{186}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{187}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{188}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{189}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{190}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{191}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{192}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{193}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{194}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{195}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{196}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{197}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{198}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{199}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{200}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{201}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{202}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{203}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{204}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{205}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{206}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{207}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{208}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{209}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{210}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{211}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{212}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{213}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{214}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{215}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{216}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{217}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{218}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{219}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{220}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{221}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{222}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{223}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{224}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{225}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{226}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{227}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{228}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{229}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{230}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{231}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{232}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{233}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{234}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{235}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{236}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{237}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{238}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{239}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{240}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{241}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{242}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{243}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{244}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{245}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{246}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{247}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{248}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{249}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{250}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{251}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{252}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{253}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{254}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{255}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapnine\symbol{0}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapnine\symbol{1}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapnine\symbol{2}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapnine\symbol{3}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapnine\symbol{4}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapnine\symbol{5}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapnine\symbol{6}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapnine\symbol{7}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapnine\symbol{8}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapnine\symbol{9}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapnine\symbol{10}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapnine\symbol{11}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapnine\symbol{12}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapnine\symbol{13}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapnine\symbol{14}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapnine\symbol{15}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapnine\symbol{16}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapnine\symbol{17}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapnine\symbol{18}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapnine\symbol{19}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapnine\symbol{20}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapnine\symbol{21}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapnine\symbol{22}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapnine\symbol{23}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapnine\symbol{24}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapnine\symbol{25}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapnine\symbol{26}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapnine\symbol{27}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapnine\symbol{28}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapnine\symbol{29}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapnine\symbol{30}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{31}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{32}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{33}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{34}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{35}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{36}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{37}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{38}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{39}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{40}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{41}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{42}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{43}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{44}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{45}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{46}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{47}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{48}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{49}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{50}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{51}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{52}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{53}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{54}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{55}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{56}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{57}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{58}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{59}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{60}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{61}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{62}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{63}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{64}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{65}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{66}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{67}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{68}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{69}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{70}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{71}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{72}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{73}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{74}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{75}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{76}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{77}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{78}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{79}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{80}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{81}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{82}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{83}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{84}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{85}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{86}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{87}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{88}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{89}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{90}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{91}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{92}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{93}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{94}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{95}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{96}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{97}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{98}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{99}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{100}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{101}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{102}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{103}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{104}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{105}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{106}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{107}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{108}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{109}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{110}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{111}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{112}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{113}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{114}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{115}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{116}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{117}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{118}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{119}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{120}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{121}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{122}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{123}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{124}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{125}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{126}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{127}}
+ \expandafter\def\csname simpleicon@primefacesicon\endcsname {\simpleiconsmapnine\symbol{128}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{129}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{130}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{131}}
+ \expandafter\def\csname simpleicon@primevueicon\endcsname {\simpleiconsmapnine\symbol{132}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{133}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{134}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{135}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{136}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{137}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{138}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{139}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{140}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{141}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{142}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{143}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{144}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{145}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{146}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{147}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{148}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{149}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{150}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{151}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{152}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{153}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{154}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{155}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{156}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{157}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{158}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{159}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{160}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{161}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{162}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{163}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{164}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{165}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{166}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{167}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{168}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{169}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{170}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{171}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{172}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{173}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{174}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{175}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{176}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{177}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{178}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{179}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{180}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{181}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{182}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{183}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{184}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{185}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{186}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{187}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{188}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{189}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{190}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{191}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{192}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{193}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{194}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{195}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{196}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{197}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{198}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{199}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{200}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{201}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{202}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{203}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{204}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{205}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{206}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{207}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{208}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{209}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{210}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{211}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{212}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{213}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{214}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{215}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{216}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{217}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{218}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{219}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{220}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{221}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{222}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{223}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{224}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{225}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{226}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{227}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{228}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{229}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{230}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{231}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{232}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{233}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{234}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{235}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{236}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{237}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{238}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{239}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{240}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{241}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{242}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{243}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{244}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{245}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{246}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{247}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{248}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{249}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{250}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{251}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{252}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{253}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{254}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{255}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmaponezero\symbol{0}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmaponezero\symbol{1}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmaponezero\symbol{2}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmaponezero\symbol{3}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmaponezero\symbol{4}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmaponezero\symbol{5}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmaponezero\symbol{6}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmaponezero\symbol{7}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmaponezero\symbol{8}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmaponezero\symbol{9}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmaponezero\symbol{10}}
+ \expandafter\def\csname simpleicon@redcandlegamesicon\endcsname {\simpleiconsmaponezero\symbol{11}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmaponezero\symbol{12}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmaponezero\symbol{13}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmaponezero\symbol{14}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmaponezero\symbol{15}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmaponezero\symbol{16}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmaponezero\symbol{17}}
+ \expandafter\def\csname simpleicon@redragonicon\endcsname {\simpleiconsmaponezero\symbol{18}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmaponezero\symbol{19}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmaponezero\symbol{20}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmaponezero\symbol{21}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmaponezero\symbol{22}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmaponezero\symbol{23}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmaponezero\symbol{24}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmaponezero\symbol{25}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmaponezero\symbol{26}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmaponezero\symbol{27}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmaponezero\symbol{28}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmaponezero\symbol{29}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmaponezero\symbol{30}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmaponezero\symbol{31}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmaponezero\symbol{32}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmaponezero\symbol{33}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmaponezero\symbol{34}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{35}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{36}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{37}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{38}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{39}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{40}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{41}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{42}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{43}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{44}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{45}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{46}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{47}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{48}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{49}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{50}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{51}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{52}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{53}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{54}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{55}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{56}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{57}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{58}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{59}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{60}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{61}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{62}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{63}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{64}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{65}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{66}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{67}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{68}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{69}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{70}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{71}}
+ \expandafter\def\csname simpleicon@roboflowicon\endcsname {\simpleiconsmaponezero\symbol{72}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{73}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{74}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{75}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{76}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{77}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{78}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{79}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{80}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{81}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{82}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{83}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{84}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{85}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{86}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{87}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{88}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{89}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{90}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{91}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{92}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{93}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{94}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{95}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{96}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{97}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{98}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{99}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{100}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{101}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{102}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{103}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{104}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{105}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{106}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{107}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{108}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{109}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{110}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{111}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{112}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{113}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{114}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{115}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{116}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{117}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{118}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{119}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{120}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{121}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{122}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{123}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{124}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{125}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{126}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{127}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{128}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{129}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{130}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{131}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{132}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{133}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{134}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{135}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{136}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{137}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{138}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{139}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{140}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{141}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{142}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{143}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{144}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{145}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{146}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{147}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{148}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{149}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{150}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{151}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{152}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{153}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{154}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{155}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{156}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{157}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{158}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{159}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{160}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{161}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{162}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{163}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{164}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{165}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{166}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{167}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{168}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{169}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{170}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{171}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{172}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{173}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{174}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{175}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{176}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{177}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{178}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{179}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{180}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{181}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{182}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{183}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{184}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{185}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{186}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{187}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{188}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{189}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{190}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{191}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{192}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{193}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{194}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{195}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{196}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{197}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{198}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{199}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{200}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{201}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{202}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{203}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{204}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{205}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{206}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{207}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{208}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{209}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{210}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{211}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{212}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{213}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{214}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{215}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{216}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{217}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{218}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{219}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{220}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{221}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{222}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{223}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{224}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{225}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{226}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{227}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{228}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{229}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{230}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{231}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{232}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{233}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{234}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{235}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{236}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{237}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{238}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{239}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{240}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{241}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{242}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{243}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{244}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{245}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{246}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{247}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{248}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{249}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{250}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{251}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{252}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{253}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{254}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{255}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponeone\symbol{0}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponeone\symbol{1}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponeone\symbol{2}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponeone\symbol{3}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponeone\symbol{4}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponeone\symbol{5}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponeone\symbol{6}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponeone\symbol{7}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponeone\symbol{8}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponeone\symbol{9}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponeone\symbol{10}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponeone\symbol{11}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponeone\symbol{12}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponeone\symbol{13}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponeone\symbol{14}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponeone\symbol{15}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponeone\symbol{16}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponeone\symbol{17}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponeone\symbol{18}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponeone\symbol{19}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponeone\symbol{20}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponeone\symbol{21}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponeone\symbol{22}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponeone\symbol{23}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponeone\symbol{24}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponeone\symbol{25}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponeone\symbol{26}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponeone\symbol{27}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponeone\symbol{28}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponeone\symbol{29}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponeone\symbol{30}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponeone\symbol{31}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponeone\symbol{32}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponeone\symbol{33}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponeone\symbol{34}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponeone\symbol{35}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{36}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{37}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{38}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{39}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{40}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{41}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{42}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{43}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{44}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{45}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{46}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{47}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{48}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{49}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{50}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{51}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{52}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{53}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{54}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{55}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{56}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{57}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{58}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{59}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{60}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{61}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{62}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{63}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{64}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{65}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{66}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{67}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{68}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{69}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{70}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{71}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{72}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{73}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{74}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{75}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{76}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{77}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{78}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{79}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{80}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{81}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{82}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{83}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{84}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{85}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{86}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{87}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{88}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{89}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{90}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{91}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{92}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{93}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{94}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{95}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{96}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{97}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{98}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{99}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{100}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{101}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{102}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{103}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{104}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{105}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{106}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{107}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{108}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{109}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{110}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{111}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{112}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{113}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{114}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{115}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{116}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{117}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{118}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{119}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{120}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{121}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{122}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{123}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{124}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{125}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{126}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{127}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{128}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{129}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{130}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{131}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{132}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{133}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{134}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{135}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{136}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{137}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{138}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{139}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{140}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{141}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{142}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{143}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{144}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{145}}
+ \expandafter\def\csname simpleicon@svgtraceicon\endcsname {\simpleiconsmaponeone\symbol{146}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{147}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{148}}
+ \expandafter\def\csname simpleicon@swayicon\endcsname {\simpleiconsmaponeone\symbol{149}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{150}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{151}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{152}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{153}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{154}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{155}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{156}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{157}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{158}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{159}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{160}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{161}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{162}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{163}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{164}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{165}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{166}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{167}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{168}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{169}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{170}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{171}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{172}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{173}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{174}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{175}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{176}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{177}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{178}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{179}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{180}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{181}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{182}}
+ \expandafter\def\csname simpleicon@taromicon\endcsname {\simpleiconsmaponeone\symbol{183}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{184}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{185}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{186}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{187}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{188}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{189}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{190}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{191}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{192}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{193}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{194}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{195}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{196}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{197}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{198}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{199}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{200}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{201}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{202}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{203}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{204}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{205}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{206}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{207}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{208}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{209}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{210}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{211}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{212}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{213}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{214}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{215}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{216}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{217}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{218}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{219}}
+ \expandafter\def\csname simpleicon@thanosicon\endcsname {\simpleiconsmaponeone\symbol{220}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{221}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{222}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{223}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{224}}
+ \expandafter\def\csname simpleicon@theguardianicon\endcsname {\simpleiconsmaponeone\symbol{225}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{226}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{227}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{228}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{229}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{230}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{231}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{232}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{233}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{234}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{235}}
+ \expandafter\def\csname simpleicon@theweatherchannelicon\endcsname {\simpleiconsmaponeone\symbol{236}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{237}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{238}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{239}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{240}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{241}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{242}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{243}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{244}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{245}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{246}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{247}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{248}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{249}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{250}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{251}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{252}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{253}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{254}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{255}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponetwo\symbol{5}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponetwo\symbol{9}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponetwo\symbol{10}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponetwo\symbol{12}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponetwo\symbol{13}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponetwo\symbol{14}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponetwo\symbol{22}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponetwo\symbol{23}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponetwo\symbol{25}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponetwo\symbol{26}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponetwo\symbol{29}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponetwo\symbol{30}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponetwo\symbol{31}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponetwo\symbol{34}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponetwo\symbol{40}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponetwo\symbol{41}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{42}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{43}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{44}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{45}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{46}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{47}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{48}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{49}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{51}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{52}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{54}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{55}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{59}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{61}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{65}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{66}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{68}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{70}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{71}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{87}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{88}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{89}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{90}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{91}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{92}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{94}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{96}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{97}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{98}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{99}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{101}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{103}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{104}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{108}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{112}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{122}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{123}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{127}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{136}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{137}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{139}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{141}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{143}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{144}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{146}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{148}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{150}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{151}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{153}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{160}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{161}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
+ \expandafter\def\csname simpleicon@vestelicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{166}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{168}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{170}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{174}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{178}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{179}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{180}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{181}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{186}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{187}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{188}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{189}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{191}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{194}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{203}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
+ \expandafter\def\csname simpleicon@vrchaticon\endcsname {\simpleiconsmaponetwo\symbol{205}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{210}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{211}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{212}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{220}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{222}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{223}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{225}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{230}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{231}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{255}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponethree\symbol{0}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponethree\symbol{1}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponethree\symbol{2}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponethree\symbol{3}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponethree\symbol{4}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponethree\symbol{5}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponethree\symbol{6}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponethree\symbol{7}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponethree\symbol{8}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponethree\symbol{9}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponethree\symbol{10}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponethree\symbol{11}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponethree\symbol{12}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponethree\symbol{13}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponethree\symbol{14}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponethree\symbol{15}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponethree\symbol{16}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponethree\symbol{17}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponethree\symbol{18}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponethree\symbol{19}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponethree\symbol{20}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponethree\symbol{21}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponethree\symbol{22}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponethree\symbol{23}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponethree\symbol{24}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponethree\symbol{25}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponethree\symbol{26}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponethree\symbol{27}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponethree\symbol{28}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponethree\symbol{29}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponethree\symbol{30}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponethree\symbol{31}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponethree\symbol{32}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponethree\symbol{33}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponethree\symbol{34}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponethree\symbol{35}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponethree\symbol{36}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponethree\symbol{37}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponethree\symbol{38}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponethree\symbol{39}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponethree\symbol{40}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponethree\symbol{41}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponethree\symbol{42}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponethree\symbol{43}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{44}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{45}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{46}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{47}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{48}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{49}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{50}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{51}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{52}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{53}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{54}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{55}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{56}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{57}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{58}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{59}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{60}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{61}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{62}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{63}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{64}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{65}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{66}}
+ \expandafter\def\csname simpleicon@xubuntuicon\endcsname {\simpleiconsmaponethree\symbol{67}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{68}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{69}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{70}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{71}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{72}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{73}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{74}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{75}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{76}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{77}}
+ \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmaponethree\symbol{78}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{79}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{80}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{81}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{82}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{83}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{84}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{85}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{86}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{87}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{88}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{89}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{90}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{91}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{92}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{93}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{94}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{95}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{96}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{97}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{98}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{99}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{100}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{101}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{102}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{103}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{104}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{105}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{106}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{107}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{108}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{109}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{110}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{111}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{112}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{113}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{114}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{115}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{116}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{117}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{118}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{119}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{120}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{121}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{122}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{123}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{124}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{125}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{126}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{127}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{128}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{129}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{130}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{131}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{132}} \ 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 aa2261296e9..251dd5d9105 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
@@ -5,3158 +5,3202 @@
\expandafter\def\csname simpleicon@1passwordicon\endcsname {\simpleiconsmap\symbol{"EA04}}
\expandafter\def\csname simpleicon@2fasicon\endcsname {\simpleiconsmap\symbol{"EA05}}
\expandafter\def\csname simpleicon@2kicon\endcsname {\simpleiconsmap\symbol{"EA06}}
- \expandafter\def\csname simpleicon@365datascienceicon\endcsname {\simpleiconsmap\symbol{"EA07}}
- \expandafter\def\csname simpleicon@3micon\endcsname {\simpleiconsmap\symbol{"EA08}}
- \expandafter\def\csname simpleicon@42icon\endcsname {\simpleiconsmap\symbol{"EA09}}
- \expandafter\def\csname simpleicon@4chanicon\endcsname {\simpleiconsmap\symbol{"EA0A}}
- \expandafter\def\csname simpleicon@4dicon\endcsname {\simpleiconsmap\symbol{"EA0B}}
- \expandafter\def\csname simpleicon@500pxicon\endcsname {\simpleiconsmap\symbol{"EA0C}}
- \expandafter\def\csname simpleicon@7zipicon\endcsname {\simpleiconsmap\symbol{"EA0D}}
- \expandafter\def\csname simpleicon@99designsicon\endcsname {\simpleiconsmap\symbol{"EA0E}}
- \expandafter\def\csname simpleicon@9gagicon\endcsname {\simpleiconsmap\symbol{"EA0F}}
- \expandafter\def\csname simpleicon@abbotticon\endcsname {\simpleiconsmap\symbol{"EA10}}
- \expandafter\def\csname simpleicon@abbrobotstudioicon\endcsname {\simpleiconsmap\symbol{"EA11}}
- \expandafter\def\csname simpleicon@abbvieicon\endcsname {\simpleiconsmap\symbol{"EA12}}
- \expandafter\def\csname simpleicon@aboutdotmeicon\endcsname {\simpleiconsmap\symbol{"EA13}}
- \expandafter\def\csname simpleicon@abstracticon\endcsname {\simpleiconsmap\symbol{"EA14}}
- \expandafter\def\csname simpleicon@abusedotchicon\endcsname {\simpleiconsmap\symbol{"EA15}}
- \expandafter\def\csname simpleicon@academiaicon\endcsname {\simpleiconsmap\symbol{"EA16}}
- \expandafter\def\csname simpleicon@accentureicon\endcsname {\simpleiconsmap\symbol{"EA17}}
- \expandafter\def\csname simpleicon@accusofticon\endcsname {\simpleiconsmap\symbol{"EA18}}
- \expandafter\def\csname simpleicon@acericon\endcsname {\simpleiconsmap\symbol{"EA19}}
- \expandafter\def\csname simpleicon@acmicon\endcsname {\simpleiconsmap\symbol{"EA1A}}
- \expandafter\def\csname simpleicon@actigraphicon\endcsname {\simpleiconsmap\symbol{"EA1B}}
- \expandafter\def\csname simpleicon@activisionicon\endcsname {\simpleiconsmap\symbol{"EA1C}}
- \expandafter\def\csname simpleicon@activitypubicon\endcsname {\simpleiconsmap\symbol{"EA1D}}
- \expandafter\def\csname simpleicon@actixicon\endcsname {\simpleiconsmap\symbol{"EA1E}}
- \expandafter\def\csname simpleicon@acuraicon\endcsname {\simpleiconsmap\symbol{"EA1F}}
- \expandafter\def\csname simpleicon@adafruiticon\endcsname {\simpleiconsmap\symbol{"EA20}}
- \expandafter\def\csname simpleicon@adblockicon\endcsname {\simpleiconsmap\symbol{"EA21}}
- \expandafter\def\csname simpleicon@adblockplusicon\endcsname {\simpleiconsmap\symbol{"EA22}}
- \expandafter\def\csname simpleicon@adguardicon\endcsname {\simpleiconsmap\symbol{"EA23}}
- \expandafter\def\csname simpleicon@adidasicon\endcsname {\simpleiconsmap\symbol{"EA24}}
- \expandafter\def\csname simpleicon@adminericon\endcsname {\simpleiconsmap\symbol{"EA25}}
- \expandafter\def\csname simpleicon@adobeicon\endcsname {\simpleiconsmap\symbol{"EA26}}
- \expandafter\def\csname simpleicon@adobeacrobatreadericon\endcsname {\simpleiconsmap\symbol{"EA27}}
- \expandafter\def\csname simpleicon@adobeaftereffectsicon\endcsname {\simpleiconsmap\symbol{"EA28}}
- \expandafter\def\csname simpleicon@adobeauditionicon\endcsname {\simpleiconsmap\symbol{"EA29}}
- \expandafter\def\csname simpleicon@adobecreativecloudicon\endcsname {\simpleiconsmap\symbol{"EA2A}}
- \expandafter\def\csname simpleicon@adobedreamweavericon\endcsname {\simpleiconsmap\symbol{"EA2B}}
- \expandafter\def\csname simpleicon@adobefontsicon\endcsname {\simpleiconsmap\symbol{"EA2C}}
- \expandafter\def\csname simpleicon@adobeillustratoricon\endcsname {\simpleiconsmap\symbol{"EA2D}}
- \expandafter\def\csname simpleicon@adobeindesignicon\endcsname {\simpleiconsmap\symbol{"EA2E}}
- \expandafter\def\csname simpleicon@adobelightroomicon\endcsname {\simpleiconsmap\symbol{"EA2F}}
- \expandafter\def\csname simpleicon@adobelightroomclassicicon\endcsname {\simpleiconsmap\symbol{"EA30}}
- \expandafter\def\csname simpleicon@adobephotoshopicon\endcsname {\simpleiconsmap\symbol{"EA31}}
- \expandafter\def\csname simpleicon@adobepremiereproicon\endcsname {\simpleiconsmap\symbol{"EA32}}
- \expandafter\def\csname simpleicon@adobexdicon\endcsname {\simpleiconsmap\symbol{"EA33}}
- \expandafter\def\csname simpleicon@adonisjsicon\endcsname {\simpleiconsmap\symbol{"EA34}}
- \expandafter\def\csname simpleicon@adpicon\endcsname {\simpleiconsmap\symbol{"EA35}}
- \expandafter\def\csname simpleicon@adrollicon\endcsname {\simpleiconsmap\symbol{"EA36}}
- \expandafter\def\csname simpleicon@adventofcodeicon\endcsname {\simpleiconsmap\symbol{"EA37}}
- \expandafter\def\csname simpleicon@adyenicon\endcsname {\simpleiconsmap\symbol{"EA38}}
- \expandafter\def\csname simpleicon@aegisauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EA39}}
- \expandafter\def\csname simpleicon@aerlingusicon\endcsname {\simpleiconsmap\symbol{"EA3A}}
- \expandafter\def\csname simpleicon@aerofloticon\endcsname {\simpleiconsmap\symbol{"EA3B}}
- \expandafter\def\csname simpleicon@aeromexicoicon\endcsname {\simpleiconsmap\symbol{"EA3C}}
- \expandafter\def\csname simpleicon@aerospikeicon\endcsname {\simpleiconsmap\symbol{"EA3D}}
- \expandafter\def\csname simpleicon@aewicon\endcsname {\simpleiconsmap\symbol{"EA3E}}
- \expandafter\def\csname simpleicon@affineicon\endcsname {\simpleiconsmap\symbol{"EA3F}}
- \expandafter\def\csname simpleicon@affinityicon\endcsname {\simpleiconsmap\symbol{"EA40}}
- \expandafter\def\csname simpleicon@affinitydesignericon\endcsname {\simpleiconsmap\symbol{"EA41}}
- \expandafter\def\csname simpleicon@affinityphotoicon\endcsname {\simpleiconsmap\symbol{"EA42}}
- \expandafter\def\csname simpleicon@affinitypublishericon\endcsname {\simpleiconsmap\symbol{"EA43}}
- \expandafter\def\csname simpleicon@aframeicon\endcsname {\simpleiconsmap\symbol{"EA44}}
- \expandafter\def\csname simpleicon@afterpayicon\endcsname {\simpleiconsmap\symbol{"EA45}}
- \expandafter\def\csname simpleicon@agoraicon\endcsname {\simpleiconsmap\symbol{"EA46}}
- \expandafter\def\csname simpleicon@aibicon\endcsname {\simpleiconsmap\symbol{"EA47}}
- \expandafter\def\csname simpleicon@aidungeonicon\endcsname {\simpleiconsmap\symbol{"EA48}}
- \expandafter\def\csname simpleicon@aiohttpicon\endcsname {\simpleiconsmap\symbol{"EA49}}
- \expandafter\def\csname simpleicon@aiqfomeicon\endcsname {\simpleiconsmap\symbol{"EA4A}}
- \expandafter\def\csname simpleicon@airasiaicon\endcsname {\simpleiconsmap\symbol{"EA4B}}
- \expandafter\def\csname simpleicon@airbnbicon\endcsname {\simpleiconsmap\symbol{"EA4C}}
- \expandafter\def\csname simpleicon@airbrakeicon\endcsname {\simpleiconsmap\symbol{"EA4D}}
- \expandafter\def\csname simpleicon@airbusicon\endcsname {\simpleiconsmap\symbol{"EA4E}}
- \expandafter\def\csname simpleicon@airbyteicon\endcsname {\simpleiconsmap\symbol{"EA4F}}
- \expandafter\def\csname simpleicon@aircallicon\endcsname {\simpleiconsmap\symbol{"EA50}}
- \expandafter\def\csname simpleicon@aircanadaicon\endcsname {\simpleiconsmap\symbol{"EA51}}
- \expandafter\def\csname simpleicon@airchinaicon\endcsname {\simpleiconsmap\symbol{"EA52}}
- \expandafter\def\csname simpleicon@airfranceicon\endcsname {\simpleiconsmap\symbol{"EA53}}
- \expandafter\def\csname simpleicon@airindiaicon\endcsname {\simpleiconsmap\symbol{"EA54}}
- \expandafter\def\csname simpleicon@airplayaudioicon\endcsname {\simpleiconsmap\symbol{"EA55}}
- \expandafter\def\csname simpleicon@airplayvideoicon\endcsname {\simpleiconsmap\symbol{"EA56}}
- \expandafter\def\csname simpleicon@airtableicon\endcsname {\simpleiconsmap\symbol{"EA57}}
- \expandafter\def\csname simpleicon@airtelicon\endcsname {\simpleiconsmap\symbol{"EA58}}
- \expandafter\def\csname simpleicon@airtransaticon\endcsname {\simpleiconsmap\symbol{"EA59}}
- \expandafter\def\csname simpleicon@ajvicon\endcsname {\simpleiconsmap\symbol{"EA5A}}
- \expandafter\def\csname simpleicon@akamaiicon\endcsname {\simpleiconsmap\symbol{"EA5B}}
- \expandafter\def\csname simpleicon@akauntingicon\endcsname {\simpleiconsmap\symbol{"EA5C}}
- \expandafter\def\csname simpleicon@akiflowicon\endcsname {\simpleiconsmap\symbol{"EA5D}}
- \expandafter\def\csname simpleicon@alacrittyicon\endcsname {\simpleiconsmap\symbol{"EA5E}}
- \expandafter\def\csname simpleicon@alamyicon\endcsname {\simpleiconsmap\symbol{"EA5F}}
- \expandafter\def\csname simpleicon@albertheijnicon\endcsname {\simpleiconsmap\symbol{"EA60}}
- \expandafter\def\csname simpleicon@albyicon\endcsname {\simpleiconsmap\symbol{"EA61}}
- \expandafter\def\csname simpleicon@alchemyicon\endcsname {\simpleiconsmap\symbol{"EA62}}
- \expandafter\def\csname simpleicon@aldinordicon\endcsname {\simpleiconsmap\symbol{"EA63}}
- \expandafter\def\csname simpleicon@aldisudicon\endcsname {\simpleiconsmap\symbol{"EA64}}
- \expandafter\def\csname simpleicon@alfaromeoicon\endcsname {\simpleiconsmap\symbol{"EA65}}
- \expandafter\def\csname simpleicon@alfredicon\endcsname {\simpleiconsmap\symbol{"EA66}}
- \expandafter\def\csname simpleicon@algoliaicon\endcsname {\simpleiconsmap\symbol{"EA67}}
- \expandafter\def\csname simpleicon@algorandicon\endcsname {\simpleiconsmap\symbol{"EA68}}
- \expandafter\def\csname simpleicon@alibabacloudicon\endcsname {\simpleiconsmap\symbol{"EA69}}
- \expandafter\def\csname simpleicon@alibabadotcomicon\endcsname {\simpleiconsmap\symbol{"EA6A}}
- \expandafter\def\csname simpleicon@alienwareicon\endcsname {\simpleiconsmap\symbol{"EA6B}}
- \expandafter\def\csname simpleicon@aliexpressicon\endcsname {\simpleiconsmap\symbol{"EA6C}}
- \expandafter\def\csname simpleicon@alipayicon\endcsname {\simpleiconsmap\symbol{"EA6D}}
- \expandafter\def\csname simpleicon@allegroicon\endcsname {\simpleiconsmap\symbol{"EA6E}}
- \expandafter\def\csname simpleicon@alliedmoddersicon\endcsname {\simpleiconsmap\symbol{"EA6F}}
- \expandafter\def\csname simpleicon@allocineicon\endcsname {\simpleiconsmap\symbol{"EA70}}
- \expandafter\def\csname simpleicon@alltrailsicon\endcsname {\simpleiconsmap\symbol{"EA71}}
- \expandafter\def\csname simpleicon@almalinuxicon\endcsname {\simpleiconsmap\symbol{"EA72}}
- \expandafter\def\csname simpleicon@alpinedotjsicon\endcsname {\simpleiconsmap\symbol{"EA73}}
- \expandafter\def\csname simpleicon@alpinelinuxicon\endcsname {\simpleiconsmap\symbol{"EA74}}
- \expandafter\def\csname simpleicon@alteryxicon\endcsname {\simpleiconsmap\symbol{"EA75}}
- \expandafter\def\csname simpleicon@altiumdesignericon\endcsname {\simpleiconsmap\symbol{"EA76}}
- \expandafter\def\csname simpleicon@alwaysdataicon\endcsname {\simpleiconsmap\symbol{"EA77}}
- \expandafter\def\csname simpleicon@alxicon\endcsname {\simpleiconsmap\symbol{"EA78}}
- \expandafter\def\csname simpleicon@amazonicon\endcsname {\simpleiconsmap\symbol{"EA79}}
- \expandafter\def\csname simpleicon@amazonalexaicon\endcsname {\simpleiconsmap\symbol{"EA7A}}
- \expandafter\def\csname simpleicon@amazonapigatewayicon\endcsname {\simpleiconsmap\symbol{"EA7B}}
- \expandafter\def\csname simpleicon@amazoncloudwatchicon\endcsname {\simpleiconsmap\symbol{"EA7C}}
- \expandafter\def\csname simpleicon@amazoncognitoicon\endcsname {\simpleiconsmap\symbol{"EA7D}}
- \expandafter\def\csname simpleicon@amazondocumentdbicon\endcsname {\simpleiconsmap\symbol{"EA7E}}
- \expandafter\def\csname simpleicon@amazondynamodbicon\endcsname {\simpleiconsmap\symbol{"EA7F}}
- \expandafter\def\csname simpleicon@amazonec2icon\endcsname {\simpleiconsmap\symbol{"EA80}}
- \expandafter\def\csname simpleicon@amazonecsicon\endcsname {\simpleiconsmap\symbol{"EA81}}
- \expandafter\def\csname simpleicon@amazoneksicon\endcsname {\simpleiconsmap\symbol{"EA82}}
- \expandafter\def\csname simpleicon@amazonelasticacheicon\endcsname {\simpleiconsmap\symbol{"EA83}}
- \expandafter\def\csname simpleicon@amazonfiretvicon\endcsname {\simpleiconsmap\symbol{"EA84}}
- \expandafter\def\csname simpleicon@amazongamesicon\endcsname {\simpleiconsmap\symbol{"EA85}}
- \expandafter\def\csname simpleicon@amazoniamicon\endcsname {\simpleiconsmap\symbol{"EA86}}
- \expandafter\def\csname simpleicon@amazonlumberyardicon\endcsname {\simpleiconsmap\symbol{"EA87}}
- \expandafter\def\csname simpleicon@amazonlunaicon\endcsname {\simpleiconsmap\symbol{"EA88}}
- \expandafter\def\csname simpleicon@amazonmusicicon\endcsname {\simpleiconsmap\symbol{"EA89}}
- \expandafter\def\csname simpleicon@amazonpayicon\endcsname {\simpleiconsmap\symbol{"EA8A}}
- \expandafter\def\csname simpleicon@amazonprimeicon\endcsname {\simpleiconsmap\symbol{"EA8B}}
- \expandafter\def\csname simpleicon@amazonrdsicon\endcsname {\simpleiconsmap\symbol{"EA8C}}
- \expandafter\def\csname simpleicon@amazonredshifticon\endcsname {\simpleiconsmap\symbol{"EA8D}}
- \expandafter\def\csname simpleicon@amazonroute53icon\endcsname {\simpleiconsmap\symbol{"EA8E}}
- \expandafter\def\csname simpleicon@amazons3icon\endcsname {\simpleiconsmap\symbol{"EA8F}}
- \expandafter\def\csname simpleicon@amazonsimpleemailserviceicon\endcsname {\simpleiconsmap\symbol{"EA90}}
- \expandafter\def\csname simpleicon@amazonsqsicon\endcsname {\simpleiconsmap\symbol{"EA91}}
- \expandafter\def\csname simpleicon@amazonwebservicesicon\endcsname {\simpleiconsmap\symbol{"EA92}}
- \expandafter\def\csname simpleicon@amdicon\endcsname {\simpleiconsmap\symbol{"EA93}}
- \expandafter\def\csname simpleicon@amebaicon\endcsname {\simpleiconsmap\symbol{"EA94}}
- \expandafter\def\csname simpleicon@americanairlinesicon\endcsname {\simpleiconsmap\symbol{"EA95}}
- \expandafter\def\csname simpleicon@americanexpressicon\endcsname {\simpleiconsmap\symbol{"EA96}}
- \expandafter\def\csname simpleicon@amgicon\endcsname {\simpleiconsmap\symbol{"EA97}}
- \expandafter\def\csname simpleicon@ampicon\endcsname {\simpleiconsmap\symbol{"EA98}}
- \expandafter\def\csname simpleicon@amulicon\endcsname {\simpleiconsmap\symbol{"EA99}}
- \expandafter\def\csname simpleicon@anaicon\endcsname {\simpleiconsmap\symbol{"EA9A}}
- \expandafter\def\csname simpleicon@anacondaicon\endcsname {\simpleiconsmap\symbol{"EA9B}}
- \expandafter\def\csname simpleicon@analogueicon\endcsname {\simpleiconsmap\symbol{"EA9C}}
- \expandafter\def\csname simpleicon@andelaicon\endcsname {\simpleiconsmap\symbol{"EA9D}}
- \expandafter\def\csname simpleicon@androidicon\endcsname {\simpleiconsmap\symbol{"EA9E}}
- \expandafter\def\csname simpleicon@androidautoicon\endcsname {\simpleiconsmap\symbol{"EA9F}}
- \expandafter\def\csname simpleicon@androidstudioicon\endcsname {\simpleiconsmap\symbol{"EAA0}}
- \expandafter\def\csname simpleicon@angularicon\endcsname {\simpleiconsmap\symbol{"EAA1}}
- \expandafter\def\csname simpleicon@anilisticon\endcsname {\simpleiconsmap\symbol{"EAA2}}
- \expandafter\def\csname simpleicon@animalplaneticon\endcsname {\simpleiconsmap\symbol{"EAA3}}
- \expandafter\def\csname simpleicon@ankermakeicon\endcsname {\simpleiconsmap\symbol{"EAA4}}
- \expandafter\def\csname simpleicon@ankiicon\endcsname {\simpleiconsmap\symbol{"EAA5}}
- \expandafter\def\csname simpleicon@ansibleicon\endcsname {\simpleiconsmap\symbol{"EAA6}}
- \expandafter\def\csname simpleicon@answericon\endcsname {\simpleiconsmap\symbol{"EAA7}}
- \expandafter\def\csname simpleicon@ansysicon\endcsname {\simpleiconsmap\symbol{"EAA8}}
- \expandafter\def\csname simpleicon@antaicon\endcsname {\simpleiconsmap\symbol{"EAA9}}
- \expandafter\def\csname simpleicon@antdesignicon\endcsname {\simpleiconsmap\symbol{"EAAA}}
- \expandafter\def\csname simpleicon@antena3icon\endcsname {\simpleiconsmap\symbol{"EAAB}}
- \expandafter\def\csname simpleicon@anthropicicon\endcsname {\simpleiconsmap\symbol{"EAAC}}
- \expandafter\def\csname simpleicon@anycubicicon\endcsname {\simpleiconsmap\symbol{"EAAD}}
- \expandafter\def\csname simpleicon@anydeskicon\endcsname {\simpleiconsmap\symbol{"EAAE}}
- \expandafter\def\csname simpleicon@anytypeicon\endcsname {\simpleiconsmap\symbol{"EAAF}}
- \expandafter\def\csname simpleicon@aolicon\endcsname {\simpleiconsmap\symbol{"EAB0}}
- \expandafter\def\csname simpleicon@apacheicon\endcsname {\simpleiconsmap\symbol{"EAB1}}
- \expandafter\def\csname simpleicon@apacheairflowicon\endcsname {\simpleiconsmap\symbol{"EAB2}}
- \expandafter\def\csname simpleicon@apacheanticon\endcsname {\simpleiconsmap\symbol{"EAB3}}
- \expandafter\def\csname simpleicon@apachecassandraicon\endcsname {\simpleiconsmap\symbol{"EAB4}}
- \expandafter\def\csname simpleicon@apachecloudstackicon\endcsname {\simpleiconsmap\symbol{"EAB5}}
- \expandafter\def\csname simpleicon@apachecordovaicon\endcsname {\simpleiconsmap\symbol{"EAB6}}
- \expandafter\def\csname simpleicon@apachecouchdbicon\endcsname {\simpleiconsmap\symbol{"EAB7}}
- \expandafter\def\csname simpleicon@apachedruidicon\endcsname {\simpleiconsmap\symbol{"EAB8}}
- \expandafter\def\csname simpleicon@apacheechartsicon\endcsname {\simpleiconsmap\symbol{"EAB9}}
- \expandafter\def\csname simpleicon@apacheflinkicon\endcsname {\simpleiconsmap\symbol{"EABA}}
- \expandafter\def\csname simpleicon@apachefreemarkericon\endcsname {\simpleiconsmap\symbol{"EABB}}
- \expandafter\def\csname simpleicon@apachegroovyicon\endcsname {\simpleiconsmap\symbol{"EABC}}
- \expandafter\def\csname simpleicon@apacheguacamoleicon\endcsname {\simpleiconsmap\symbol{"EABD}}
- \expandafter\def\csname simpleicon@apachehadoopicon\endcsname {\simpleiconsmap\symbol{"EABE}}
- \expandafter\def\csname simpleicon@apachehbaseicon\endcsname {\simpleiconsmap\symbol{"EABF}}
- \expandafter\def\csname simpleicon@apachehiveicon\endcsname {\simpleiconsmap\symbol{"EAC0}}
- \expandafter\def\csname simpleicon@apachejmetericon\endcsname {\simpleiconsmap\symbol{"EAC1}}
- \expandafter\def\csname simpleicon@apachekafkaicon\endcsname {\simpleiconsmap\symbol{"EAC2}}
- \expandafter\def\csname simpleicon@apachekylinicon\endcsname {\simpleiconsmap\symbol{"EAC3}}
- \expandafter\def\csname simpleicon@apachemavenicon\endcsname {\simpleiconsmap\symbol{"EAC4}}
- \expandafter\def\csname simpleicon@apachenetbeansideicon\endcsname {\simpleiconsmap\symbol{"EAC5}}
- \expandafter\def\csname simpleicon@apacheopenofficeicon\endcsname {\simpleiconsmap\symbol{"EAC6}}
- \expandafter\def\csname simpleicon@apacheparqueticon\endcsname {\simpleiconsmap\symbol{"EAC7}}
- \expandafter\def\csname simpleicon@apachepulsaricon\endcsname {\simpleiconsmap\symbol{"EAC8}}
- \expandafter\def\csname simpleicon@apacherocketmqicon\endcsname {\simpleiconsmap\symbol{"EAC9}}
- \expandafter\def\csname simpleicon@apachesolricon\endcsname {\simpleiconsmap\symbol{"EACA}}
- \expandafter\def\csname simpleicon@apachesparkicon\endcsname {\simpleiconsmap\symbol{"EACB}}
- \expandafter\def\csname simpleicon@apachestormicon\endcsname {\simpleiconsmap\symbol{"EACC}}
- \expandafter\def\csname simpleicon@apachesuperseticon\endcsname {\simpleiconsmap\symbol{"EACD}}
- \expandafter\def\csname simpleicon@apachetomcaticon\endcsname {\simpleiconsmap\symbol{"EACE}}
- \expandafter\def\csname simpleicon@aparaticon\endcsname {\simpleiconsmap\symbol{"EACF}}
- \expandafter\def\csname simpleicon@apifoxicon\endcsname {\simpleiconsmap\symbol{"EAD0}}
- \expandafter\def\csname simpleicon@apmterminalsicon\endcsname {\simpleiconsmap\symbol{"EAD1}}
- \expandafter\def\csname simpleicon@apollographqlicon\endcsname {\simpleiconsmap\symbol{"EAD2}}
- \expandafter\def\csname simpleicon@apostropheicon\endcsname {\simpleiconsmap\symbol{"EAD3}}
- \expandafter\def\csname simpleicon@appianicon\endcsname {\simpleiconsmap\symbol{"EAD4}}
- \expandafter\def\csname simpleicon@appiumicon\endcsname {\simpleiconsmap\symbol{"EAD5}}
- \expandafter\def\csname simpleicon@appleicon\endcsname {\simpleiconsmap\symbol{"EAD6}}
- \expandafter\def\csname simpleicon@applearcadeicon\endcsname {\simpleiconsmap\symbol{"EAD7}}
- \expandafter\def\csname simpleicon@applemusicicon\endcsname {\simpleiconsmap\symbol{"EAD8}}
- \expandafter\def\csname simpleicon@applenewsicon\endcsname {\simpleiconsmap\symbol{"EAD9}}
- \expandafter\def\csname simpleicon@applepayicon\endcsname {\simpleiconsmap\symbol{"EADA}}
- \expandafter\def\csname simpleicon@applepodcastsicon\endcsname {\simpleiconsmap\symbol{"EADB}}
- \expandafter\def\csname simpleicon@appletvicon\endcsname {\simpleiconsmap\symbol{"EADC}}
- \expandafter\def\csname simpleicon@appsignalicon\endcsname {\simpleiconsmap\symbol{"EADD}}
- \expandafter\def\csname simpleicon@appsmithicon\endcsname {\simpleiconsmap\symbol{"EADE}}
- \expandafter\def\csname simpleicon@appstoreicon\endcsname {\simpleiconsmap\symbol{"EADF}}
- \expandafter\def\csname simpleicon@appveyoricon\endcsname {\simpleiconsmap\symbol{"EAE0}}
- \expandafter\def\csname simpleicon@appwriteicon\endcsname {\simpleiconsmap\symbol{"EAE1}}
- \expandafter\def\csname simpleicon@aquaicon\endcsname {\simpleiconsmap\symbol{"EAE2}}
- \expandafter\def\csname simpleicon@aralicon\endcsname {\simpleiconsmap\symbol{"EAE3}}
- \expandafter\def\csname simpleicon@arangodbicon\endcsname {\simpleiconsmap\symbol{"EAE4}}
- \expandafter\def\csname simpleicon@arcicon\endcsname {\simpleiconsmap\symbol{"EAE5}}
- \expandafter\def\csname simpleicon@arcgisicon\endcsname {\simpleiconsmap\symbol{"EAE6}}
- \expandafter\def\csname simpleicon@archicadicon\endcsname {\simpleiconsmap\symbol{"EAE7}}
- \expandafter\def\csname simpleicon@archiveofourownicon\endcsname {\simpleiconsmap\symbol{"EAE8}}
- \expandafter\def\csname simpleicon@archlinuxicon\endcsname {\simpleiconsmap\symbol{"EAE9}}
- \expandafter\def\csname simpleicon@ardouricon\endcsname {\simpleiconsmap\symbol{"EAEA}}
- \expandafter\def\csname simpleicon@arduinoicon\endcsname {\simpleiconsmap\symbol{"EAEB}}
- \expandafter\def\csname simpleicon@argoicon\endcsname {\simpleiconsmap\symbol{"EAEC}}
- \expandafter\def\csname simpleicon@argosicon\endcsname {\simpleiconsmap\symbol{"EAED}}
- \expandafter\def\csname simpleicon@ariakiticon\endcsname {\simpleiconsmap\symbol{"EAEE}}
- \expandafter\def\csname simpleicon@arkecosystemicon\endcsname {\simpleiconsmap\symbol{"EAEF}}
- \expandafter\def\csname simpleicon@arloicon\endcsname {\simpleiconsmap\symbol{"EAF0}}
- \expandafter\def\csname simpleicon@armicon\endcsname {\simpleiconsmap\symbol{"EAF1}}
- \expandafter\def\csname simpleicon@armkeilicon\endcsname {\simpleiconsmap\symbol{"EAF2}}
- \expandafter\def\csname simpleicon@arstechnicaicon\endcsname {\simpleiconsmap\symbol{"EAF3}}
- \expandafter\def\csname simpleicon@artifacthubicon\endcsname {\simpleiconsmap\symbol{"EAF4}}
- \expandafter\def\csname simpleicon@artixlinuxicon\endcsname {\simpleiconsmap\symbol{"EAF5}}
- \expandafter\def\csname simpleicon@artstationicon\endcsname {\simpleiconsmap\symbol{"EAF6}}
- \expandafter\def\csname simpleicon@arxivicon\endcsname {\simpleiconsmap\symbol{"EAF7}}
- \expandafter\def\csname simpleicon@asahilinuxicon\endcsname {\simpleiconsmap\symbol{"EAF8}}
- \expandafter\def\csname simpleicon@asanaicon\endcsname {\simpleiconsmap\symbol{"EAF9}}
- \expandafter\def\csname simpleicon@asciidoctoricon\endcsname {\simpleiconsmap\symbol{"EAFA}}
- \expandafter\def\csname simpleicon@asciinemaicon\endcsname {\simpleiconsmap\symbol{"EAFB}}
- \expandafter\def\csname simpleicon@asdaicon\endcsname {\simpleiconsmap\symbol{"EAFC}}
- \expandafter\def\csname simpleicon@asepriteicon\endcsname {\simpleiconsmap\symbol{"EAFD}}
- \expandafter\def\csname simpleicon@askfmicon\endcsname {\simpleiconsmap\symbol{"EAFE}}
- \expandafter\def\csname simpleicon@assemblyscripticon\endcsname {\simpleiconsmap\symbol{"EAFF}}
- \expandafter\def\csname simpleicon@asteriskicon\endcsname {\simpleiconsmap\symbol{"EB00}}
- \expandafter\def\csname simpleicon@astonmartinicon\endcsname {\simpleiconsmap\symbol{"EB01}}
- \expandafter\def\csname simpleicon@astraicon\endcsname {\simpleiconsmap\symbol{"EB02}}
- \expandafter\def\csname simpleicon@astralicon\endcsname {\simpleiconsmap\symbol{"EB03}}
- \expandafter\def\csname simpleicon@astroicon\endcsname {\simpleiconsmap\symbol{"EB04}}
- \expandafter\def\csname simpleicon@asusicon\endcsname {\simpleiconsmap\symbol{"EB05}}
- \expandafter\def\csname simpleicon@atandticon\endcsname {\simpleiconsmap\symbol{"EB06}}
- \expandafter\def\csname simpleicon@atariicon\endcsname {\simpleiconsmap\symbol{"EB07}}
- \expandafter\def\csname simpleicon@atlassianicon\endcsname {\simpleiconsmap\symbol{"EB08}}
- \expandafter\def\csname simpleicon@auchanicon\endcsname {\simpleiconsmap\symbol{"EB09}}
- \expandafter\def\csname simpleicon@audacityicon\endcsname {\simpleiconsmap\symbol{"EB0A}}
- \expandafter\def\csname simpleicon@audiicon\endcsname {\simpleiconsmap\symbol{"EB0B}}
- \expandafter\def\csname simpleicon@audibleicon\endcsname {\simpleiconsmap\symbol{"EB0C}}
- \expandafter\def\csname simpleicon@audiobookshelficon\endcsname {\simpleiconsmap\symbol{"EB0D}}
- \expandafter\def\csname simpleicon@audioboomicon\endcsname {\simpleiconsmap\symbol{"EB0E}}
- \expandafter\def\csname simpleicon@audiomackicon\endcsname {\simpleiconsmap\symbol{"EB0F}}
- \expandafter\def\csname simpleicon@audiotechnicaicon\endcsname {\simpleiconsmap\symbol{"EB10}}
- \expandafter\def\csname simpleicon@aureliaicon\endcsname {\simpleiconsmap\symbol{"EB11}}
- \expandafter\def\csname simpleicon@auth0icon\endcsname {\simpleiconsmap\symbol{"EB12}}
- \expandafter\def\csname simpleicon@autheliaicon\endcsname {\simpleiconsmap\symbol{"EB13}}
- \expandafter\def\csname simpleicon@authentikicon\endcsname {\simpleiconsmap\symbol{"EB14}}
- \expandafter\def\csname simpleicon@authyicon\endcsname {\simpleiconsmap\symbol{"EB15}}
- \expandafter\def\csname simpleicon@autocadicon\endcsname {\simpleiconsmap\symbol{"EB16}}
- \expandafter\def\csname simpleicon@autocannonicon\endcsname {\simpleiconsmap\symbol{"EB17}}
- \expandafter\def\csname simpleicon@autodeskicon\endcsname {\simpleiconsmap\symbol{"EB18}}
- \expandafter\def\csname simpleicon@autodeskmayaicon\endcsname {\simpleiconsmap\symbol{"EB19}}
- \expandafter\def\csname simpleicon@autodeskreviticon\endcsname {\simpleiconsmap\symbol{"EB1A}}
- \expandafter\def\csname simpleicon@autohotkeyicon\endcsname {\simpleiconsmap\symbol{"EB1B}}
- \expandafter\def\csname simpleicon@autoiticon\endcsname {\simpleiconsmap\symbol{"EB1C}}
- \expandafter\def\csname simpleicon@automatticicon\endcsname {\simpleiconsmap\symbol{"EB1D}}
- \expandafter\def\csname simpleicon@autoprefixericon\endcsname {\simpleiconsmap\symbol{"EB1E}}
- \expandafter\def\csname simpleicon@autozoneicon\endcsname {\simpleiconsmap\symbol{"EB1F}}
- \expandafter\def\csname simpleicon@avajsicon\endcsname {\simpleiconsmap\symbol{"EB20}}
- \expandafter\def\csname simpleicon@avasticon\endcsname {\simpleiconsmap\symbol{"EB21}}
- \expandafter\def\csname simpleicon@aviancaicon\endcsname {\simpleiconsmap\symbol{"EB22}}
- \expandafter\def\csname simpleicon@aviraicon\endcsname {\simpleiconsmap\symbol{"EB23}}
- \expandafter\def\csname simpleicon@awesomelistsicon\endcsname {\simpleiconsmap\symbol{"EB24}}
- \expandafter\def\csname simpleicon@awesomewmicon\endcsname {\simpleiconsmap\symbol{"EB25}}
- \expandafter\def\csname simpleicon@awsamplifyicon\endcsname {\simpleiconsmap\symbol{"EB26}}
- \expandafter\def\csname simpleicon@awselasticloadbalancingicon\endcsname {\simpleiconsmap\symbol{"EB27}}
- \expandafter\def\csname simpleicon@awsfargateicon\endcsname {\simpleiconsmap\symbol{"EB28}}
- \expandafter\def\csname simpleicon@awslambdaicon\endcsname {\simpleiconsmap\symbol{"EB29}}
- \expandafter\def\csname simpleicon@awsorganizationsicon\endcsname {\simpleiconsmap\symbol{"EB2A}}
- \expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmap\symbol{"EB2B}}
- \expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmap\symbol{"EB2C}}
- \expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmap\symbol{"EB2D}}
- \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmap\symbol{"EB2E}}
- \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmap\symbol{"EB2F}}
- \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmap\symbol{"EB30}}
- \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmap\symbol{"EB31}}
- \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmap\symbol{"EB32}}
- \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmap\symbol{"EB33}}
- \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmap\symbol{"EB34}}
- \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmap\symbol{"EB35}}
- \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmap\symbol{"EB36}}
- \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmap\symbol{"EB37}}
- \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmap\symbol{"EB38}}
- \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmap\symbol{"EB39}}
- \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmap\symbol{"EB3A}}
- \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmap\symbol{"EB3B}}
- \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmap\symbol{"EB3C}}
- \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmap\symbol{"EB3D}}
- \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmap\symbol{"EB3E}}
- \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmap\symbol{"EB3F}}
- \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmap\symbol{"EB40}}
- \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmap\symbol{"EB41}}
- \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmap\symbol{"EB42}}
- \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB43}}
- \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB44}}
- \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB45}}
- \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB46}}
- \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB47}}
- \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB48}}
- \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB49}}
- \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4A}}
- \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB4B}}
- \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB4C}}
- \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB4D}}
- \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB4E}}
- \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB4F}}
- \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB50}}
- \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB51}}
- \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB52}}
- \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB53}}
- \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB54}}
- \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB55}}
- \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB56}}
- \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB57}}
- \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB58}}
- \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB59}}
- \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5A}}
- \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB5B}}
- \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB5C}}
- \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB5D}}
- \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB5E}}
- \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB5F}}
- \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB60}}
- \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB61}}
- \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB62}}
- \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB63}}
- \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB64}}
- \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB65}}
- \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB66}}
- \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB67}}
- \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB68}}
- \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB69}}
- \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6A}}
- \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB6B}}
- \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB6C}}
- \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB6D}}
- \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB6E}}
- \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB6F}}
- \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB70}}
- \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB71}}
- \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB72}}
- \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB73}}
- \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB74}}
- \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB75}}
- \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB76}}
- \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB77}}
- \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB78}}
- \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB79}}
- \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7A}}
- \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB7B}}
- \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB7C}}
- \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB7D}}
- \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB7E}}
- \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB7F}}
- \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB80}}
- \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB81}}
- \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB82}}
- \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB83}}
- \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB84}}
- \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB85}}
- \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB86}}
- \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB87}}
- \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB88}}
- \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB89}}
- \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8A}}
- \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB8B}}
- \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB8C}}
- \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB8D}}
- \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB8E}}
- \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB8F}}
- \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB90}}
- \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB91}}
- \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB92}}
- \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB93}}
- \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB94}}
- \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB95}}
- \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB96}}
- \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB97}}
- \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB98}}
- \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB99}}
- \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9A}}
- \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EB9B}}
- \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EB9C}}
- \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EB9D}}
- \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EB9E}}
- \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EB9F}}
- \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA0}}
- \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA1}}
- \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA2}}
- \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA3}}
- \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA4}}
- \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBA5}}
- \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBA6}}
- \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBA7}}
- \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBA8}}
- \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBA9}}
- \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAA}}
- \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBAB}}
- \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBAC}}
- \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBAD}}
- \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBAE}}
- \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBAF}}
- \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB0}}
- \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB1}}
- \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB2}}
- \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB3}}
- \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB4}}
- \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBB5}}
- \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBB6}}
- \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBB7}}
- \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBB8}}
- \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBB9}}
- \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBA}}
- \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBBB}}
- \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBBC}}
- \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBBD}}
- \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBBE}}
- \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBBF}}
- \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC0}}
- \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC1}}
- \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC2}}
- \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC3}}
- \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC4}}
- \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBC5}}
- \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBC6}}
- \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBC7}}
- \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBC8}}
- \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBC9}}
- \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCA}}
- \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBCB}}
- \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBCC}}
- \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBCD}}
- \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBCE}}
- \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBCF}}
- \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD0}}
- \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD1}}
- \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD2}}
- \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD3}}
- \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBD4}}
- \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBD5}}
- \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBD6}}
- \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBD7}}
- \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBD8}}
- \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBD9}}
- \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBDA}}
- \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBDB}}
- \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBDC}}
- \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBDD}}
- \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBDE}}
- \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBDF}}
- \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE0}}
- \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE1}}
- \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE2}}
- \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE3}}
- \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBE4}}
- \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBE5}}
- \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBE6}}
- \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBE7}}
- \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBE8}}
- \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBE9}}
- \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBEA}}
- \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBEB}}
- \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBEC}}
- \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBED}}
- \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBEE}}
- \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBEF}}
- \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF0}}
- \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF1}}
- \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF2}}
- \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF3}}
- \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBF4}}
- \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBF5}}
- \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF6}}
- \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF7}}
- \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBF8}}
- \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBF9}}
- \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EBFA}}
- \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmap\symbol{"EBFB}}
- \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EBFC}}
- \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EBFD}}
- \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EBFE}}
- \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EBFF}}
- \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC00}}
- \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC01}}
- \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC02}}
- \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC03}}
- \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC04}}
- \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC05}}
- \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC06}}
- \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC07}}
- \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC08}}
- \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC09}}
- \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC0A}}
- \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC0B}}
- \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC0C}}
- \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC0D}}
- \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC0E}}
- \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC0F}}
- \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC10}}
- \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC11}}
- \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC12}}
- \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC13}}
- \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC14}}
- \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC15}}
- \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC16}}
- \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC17}}
- \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC18}}
- \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC19}}
- \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC1A}}
- \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC1B}}
- \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC1C}}
- \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC1D}}
- \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC1E}}
- \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC1F}}
- \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC20}}
- \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC21}}
- \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC22}}
- \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC23}}
- \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC24}}
- \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC25}}
- \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC26}}
- \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC27}}
- \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC28}}
- \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC29}}
- \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC2A}}
- \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC2B}}
- \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC2C}}
- \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC2D}}
- \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC2E}}
- \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC2F}}
- \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC30}}
- \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC31}}
- \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC32}}
- \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC33}}
- \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC34}}
- \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC35}}
- \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC36}}
- \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC37}}
- \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC38}}
- \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC39}}
- \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC3A}}
- \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC3B}}
- \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC3C}}
- \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC3D}}
- \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC3E}}
- \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC3F}}
- \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC40}}
- \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC41}}
- \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC42}}
- \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC43}}
- \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC44}}
- \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC45}}
- \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC46}}
- \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC47}}
- \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC48}}
- \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC49}}
- \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC4A}}
- \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC4B}}
- \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC4C}}
- \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC4D}}
- \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC4E}}
- \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC4F}}
- \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC50}}
- \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC51}}
- \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC52}}
- \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC53}}
- \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC54}}
- \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC55}}
- \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC56}}
- \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC57}}
- \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC58}}
- \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC59}}
- \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC5A}}
- \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC5B}}
- \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC5C}}
- \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC5D}}
- \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC5E}}
- \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC5F}}
- \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC60}}
- \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC61}}
- \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC62}}
- \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC63}}
- \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC64}}
- \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC65}}
- \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC66}}
- \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC67}}
- \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC68}}
- \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC69}}
- \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC6A}}
- \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC6B}}
- \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC6C}}
- \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC6D}}
- \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC6E}}
- \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC6F}}
- \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC70}}
- \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC71}}
- \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC72}}
- \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC73}}
- \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC74}}
- \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC75}}
- \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC76}}
- \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC77}}
- \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC78}}
- \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC79}}
- \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC7A}}
- \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC7B}}
- \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC7C}}
- \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC7D}}
- \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC7E}}
- \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC7F}}
- \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC80}}
- \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC81}}
- \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC82}}
- \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC83}}
- \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC84}}
- \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC85}}
- \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC86}}
- \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC87}}
- \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC88}}
- \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC89}}
- \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC8A}}
- \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC8B}}
- \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC8C}}
- \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC8D}}
- \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC8E}}
- \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC8F}}
- \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC90}}
- \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC91}}
- \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC92}}
- \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC93}}
- \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC94}}
- \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC95}}
- \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"EC96}}
- \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"EC97}}
- \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"EC98}}
- \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"EC99}}
- \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"EC9A}}
- \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"EC9B}}
- \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"EC9C}}
- \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"EC9D}}
- \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"EC9E}}
- \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"EC9F}}
- \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECA0}}
- \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECA1}}
- \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECA2}}
- \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECA3}}
- \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECA4}}
- \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECA5}}
- \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECA6}}
- \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECA7}}
- \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECA8}}
- \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECA9}}
- \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECAA}}
- \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECAB}}
- \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECAC}}
- \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECAD}}
- \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECAE}}
- \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECAF}}
- \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECB0}}
- \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECB1}}
- \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECB2}}
- \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECB3}}
- \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECB4}}
- \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECB5}}
- \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECB6}}
- \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECB7}}
- \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECB8}}
- \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECB9}}
- \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECBA}}
- \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECBB}}
- \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECBC}}
- \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECBD}}
- \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECBE}}
- \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECBF}}
- \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECC0}}
- \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECC1}}
- \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECC2}}
- \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECC3}}
- \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECC4}}
- \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECC5}}
- \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECC6}}
- \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECC7}}
- \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECC8}}
- \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECC9}}
- \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECCA}}
- \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECCB}}
- \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECCC}}
- \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECCD}}
- \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECCE}}
- \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECCF}}
- \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECD0}}
- \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECD1}}
- \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECD2}}
- \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECD3}}
- \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECD4}}
- \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECD5}}
- \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECD6}}
- \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECD7}}
- \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECD8}}
- \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECD9}}
- \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECDA}}
- \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECDB}}
- \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECDC}}
- \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECDD}}
- \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECDE}}
- \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECDF}}
- \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECE0}}
- \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECE1}}
- \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECE2}}
- \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECE3}}
- \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECE4}}
- \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECE5}}
- \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECE6}}
- \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECE7}}
- \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECE8}}
- \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECE9}}
- \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECEA}}
- \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECEB}}
- \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECEC}}
- \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECED}}
- \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECEE}}
- \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECEF}}
- \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECF0}}
- \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECF1}}
- \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECF2}}
- \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECF3}}
- \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECF4}}
- \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ECF5}}
- \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ECF6}}
- \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ECF7}}
- \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ECF8}}
- \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ECF9}}
- \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ECFA}}
- \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ECFB}}
- \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ECFC}}
- \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ECFD}}
- \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ECFE}}
- \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ECFF}}
- \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED00}}
- \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED01}}
- \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED02}}
- \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED03}}
- \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED04}}
- \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED05}}
- \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED06}}
- \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED07}}
- \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED08}}
- \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED09}}
- \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED0A}}
- \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED0B}}
- \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED0C}}
- \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED0D}}
- \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED0E}}
- \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED0F}}
- \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED10}}
- \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED11}}
- \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED12}}
- \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED13}}
- \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED14}}
- \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED15}}
- \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED16}}
- \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED17}}
- \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED18}}
- \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED19}}
- \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED1A}}
- \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED1B}}
- \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED1C}}
- \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED1D}}
- \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED1E}}
- \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED1F}}
- \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED20}}
- \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED21}}
- \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED22}}
- \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED23}}
- \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED24}}
- \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED25}}
- \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED26}}
- \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED27}}
- \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED28}}
- \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED29}}
- \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED2A}}
- \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED2B}}
- \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED2C}}
- \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED2D}}
- \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED2E}}
- \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED2F}}
- \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED30}}
- \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED31}}
- \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED32}}
- \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED33}}
- \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED34}}
- \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED35}}
- \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED36}}
- \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED37}}
- \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED38}}
- \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED39}}
- \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED3A}}
- \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED3B}}
- \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED3C}}
- \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED3D}}
- \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED3E}}
- \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED3F}}
- \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED40}}
- \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED41}}
- \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED42}}
- \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED43}}
- \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED44}}
- \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED45}}
- \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED46}}
- \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED47}}
- \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED48}}
- \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED49}}
- \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED4A}}
- \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED4B}}
- \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED4C}}
- \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED4D}}
- \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED4E}}
- \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED4F}}
- \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED50}}
- \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED51}}
- \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED52}}
- \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED53}}
- \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED54}}
- \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED55}}
- \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED56}}
- \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED57}}
- \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED58}}
- \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED59}}
- \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED5A}}
- \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED5B}}
- \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED5C}}
- \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED5D}}
- \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED5E}}
- \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED5F}}
- \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED60}}
- \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED61}}
- \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED62}}
- \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED63}}
- \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED64}}
- \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED65}}
- \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED66}}
- \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED67}}
- \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED68}}
- \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED69}}
- \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED6A}}
- \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED6B}}
- \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED6C}}
- \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED6D}}
- \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED6E}}
- \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED6F}}
- \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED70}}
- \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED71}}
- \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED72}}
- \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED73}}
- \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED74}}
- \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED75}}
- \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED76}}
- \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED77}}
- \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED78}}
- \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED79}}
- \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED7A}}
- \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED7B}}
- \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED7C}}
- \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED7D}}
- \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED7E}}
- \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED7F}}
- \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED80}}
- \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED81}}
- \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED82}}
- \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED83}}
- \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED84}}
- \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED85}}
- \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED86}}
- \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED87}}
- \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED88}}
- \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED89}}
- \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED8A}}
- \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED8B}}
- \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED8C}}
- \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED8D}}
- \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED8E}}
- \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED8F}}
- \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED90}}
- \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED91}}
- \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED92}}
- \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED93}}
- \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"ED94}}
- \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"ED95}}
- \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"ED96}}
- \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"ED97}}
- \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"ED98}}
- \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"ED99}}
- \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"ED9A}}
- \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"ED9B}}
- \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"ED9C}}
- \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"ED9D}}
- \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"ED9E}}
- \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"ED9F}}
- \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDA0}}
- \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDA1}}
- \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDA2}}
- \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDA3}}
- \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDA4}}
- \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDA5}}
- \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDA6}}
- \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDA7}}
- \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDA8}}
- \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDA9}}
- \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDAA}}
- \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDAB}}
- \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDAC}}
- \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDAD}}
- \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDAE}}
- \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDAF}}
- \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDB0}}
- \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDB1}}
- \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDB2}}
- \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDB3}}
- \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDB4}}
- \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDB5}}
- \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDB6}}
- \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDB7}}
- \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDB8}}
- \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDB9}}
- \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDBA}}
- \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDBB}}
- \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDBC}}
- \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDBD}}
- \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDBE}}
- \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDBF}}
- \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDC0}}
- \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDC1}}
- \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDC2}}
- \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDC3}}
- \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDC4}}
- \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDC5}}
- \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDC6}}
- \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDC7}}
- \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDC8}}
- \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDC9}}
- \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDCA}}
- \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDCB}}
- \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDCC}}
- \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDCD}}
- \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDCE}}
- \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDCF}}
- \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDD0}}
- \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDD1}}
- \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDD2}}
- \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDD3}}
- \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDD4}}
- \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDD5}}
- \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDD6}}
- \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDD7}}
- \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDD8}}
- \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDD9}}
- \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDDA}}
- \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDDB}}
- \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDDC}}
- \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDDD}}
- \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDDE}}
- \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDDF}}
- \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDE0}}
- \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDE1}}
- \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDE2}}
- \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDE3}}
- \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDE4}}
- \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDE5}}
- \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDE6}}
- \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDE7}}
- \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDE8}}
- \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDE9}}
- \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDEA}}
- \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDEB}}
- \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDEC}}
- \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDED}}
- \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDEE}}
- \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDEF}}
- \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDF0}}
- \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDF1}}
- \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EDF2}}
- \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EDF3}}
- \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EDF4}}
- \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EDF5}}
- \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EDF6}}
- \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EDF7}}
- \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EDF8}}
- \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EDF9}}
- \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EDFA}}
- \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EDFB}}
- \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EDFC}}
- \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EDFD}}
- \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EDFE}}
- \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EDFF}}
- \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE00}}
- \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE01}}
- \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE02}}
- \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE03}}
- \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE04}}
- \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE05}}
- \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE06}}
- \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE07}}
- \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE08}}
- \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE09}}
- \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE0A}}
- \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE0B}}
- \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE0C}}
- \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE0D}}
- \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE0E}}
- \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE0F}}
- \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE10}}
- \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE11}}
- \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE12}}
- \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE13}}
- \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE14}}
- \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE15}}
- \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE16}}
- \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE17}}
- \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE18}}
- \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE19}}
- \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE1A}}
- \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE1B}}
- \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE1C}}
- \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE1D}}
- \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE1E}}
- \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE1F}}
- \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE20}}
- \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE21}}
- \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE22}}
- \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE23}}
- \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE24}}
- \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE25}}
- \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE26}}
- \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE27}}
- \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE28}}
- \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE29}}
- \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE2A}}
- \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE2B}}
- \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE2C}}
- \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE2D}}
- \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE2E}}
- \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE2F}}
- \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE30}}
- \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE31}}
- \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE32}}
- \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE33}}
- \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE34}}
- \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE35}}
- \expandafter\def\csname simpleicon@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@languagetoolicon\endcsname {\simpleiconsmap\symbol{"EFE7}}
- \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE8}}
- \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE9}}
- \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFEA}}
- \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFEB}}
- \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEC}}
- \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFED}}
- \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFEE}}
- \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFEF}}
- \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFF0}}
- \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFF1}}
- \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF2}}
- \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF3}}
- \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF4}}
- \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF5}}
- \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF6}}
- \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF7}}
- \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF8}}
- \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF9}}
- \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFFA}}
- \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFFB}}
- \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFC}}
- \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFD}}
- \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFE}}
- \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFF}}
- \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"F000}}
- \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F001}}
- \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F002}}
- \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F003}}
- \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F004}}
- \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F005}}
- \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F006}}
- \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F007}}
- \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F008}}
- \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F009}}
- \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F00A}}
- \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F00B}}
- \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00C}}
- \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00D}}
- \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00E}}
- \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00F}}
- \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F010}}
- \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F011}}
- \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F012}}
- \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F013}}
- \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F014}}
- \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F015}}
- \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F016}}
- \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F017}}
- \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F018}}
- \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F019}}
- \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F01A}}
- \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F01B}}
- \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01C}}
- \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01D}}
- \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01E}}
- \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01F}}
- \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F020}}
- \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F021}}
- \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F022}}
- \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F023}}
- \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F024}}
- \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F025}}
- \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F026}}
- \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F027}}
- \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F028}}
- \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F029}}
- \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F02A}}
- \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F02B}}
- \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02C}}
- \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02D}}
- \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02E}}
- \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02F}}
- \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F030}}
- \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F031}}
- \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F032}}
- \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F033}}
- \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F034}}
- \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F035}}
- \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F036}}
- \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F037}}
- \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F038}}
- \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F039}}
- \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F03A}}
- \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F03B}}
- \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F03C}}
- \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F03D}}
- \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03E}}
- \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03F}}
- \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F040}}
- \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F041}}
- \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F042}}
- \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F043}}
- \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F044}}
- \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F045}}
- \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F046}}
- \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F047}}
- \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F048}}
- \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F049}}
- \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F04A}}
- \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F04B}}
- \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F04C}}
- \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F04D}}
- \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04E}}
- \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04F}}
- \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F050}}
- \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F051}}
- \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F052}}
- \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F053}}
- \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F054}}
- \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F055}}
- \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F056}}
- \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F057}}
- \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F058}}
- \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F059}}
- \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F05A}}
- \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F05B}}
- \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F05C}}
- \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F05D}}
- \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05E}}
- \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05F}}
- \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F060}}
- \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F061}}
- \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F062}}
- \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F063}}
- \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F064}}
- \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F065}}
- \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F066}}
- \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F067}}
- \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F068}}
- \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F069}}
- \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F06A}}
- \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F06B}}
- \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F06C}}
- \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F06D}}
- \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06E}}
- \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06F}}
- \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F070}}
- \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F071}}
- \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F072}}
- \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F073}}
- \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F074}}
- \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F075}}
- \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F076}}
- \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F077}}
- \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F078}}
- \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F079}}
- \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F07A}}
- \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F07B}}
- \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F07C}}
- \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F07D}}
- \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07E}}
- \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07F}}
- \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F080}}
- \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F081}}
- \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F082}}
- \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F083}}
- \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F084}}
- \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F085}}
- \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F086}}
- \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F087}}
- \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F088}}
- \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F089}}
- \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F08A}}
- \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F08B}}
- \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F08C}}
- \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F08D}}
- \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08E}}
- \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08F}}
- \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F090}}
- \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F091}}
- \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F092}}
- \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F093}}
- \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F094}}
- \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F095}}
- \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F096}}
- \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F097}}
- \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F098}}
- \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F099}}
- \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F09A}}
- \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F09B}}
- \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F09C}}
- \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F09D}}
- \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09E}}
- \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09F}}
- \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F0A0}}
- \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0A1}}
- \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0A2}}
- \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0A3}}
- \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A4}}
- \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A5}}
- \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A6}}
- \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A7}}
- \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A8}}
- \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A9}}
- \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0AA}}
- \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0AB}}
- \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0AC}}
- \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0AD}}
- \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AE}}
- \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AF}}
- \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0B0}}
- \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0B1}}
- \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0B2}}
- \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0B3}}
- \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B4}}
- \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B5}}
- \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B6}}
- \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B7}}
- \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B8}}
- \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B9}}
- \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0BA}}
- \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0BB}}
- \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmap\symbol{"F0BC}}
- \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
- \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0BE}}
- \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BF}}
- \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0C0}}
- \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0C1}}
- \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
- \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
- \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
- \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
- \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
- \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
- \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C8}}
- \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
- \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0CA}}
- \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0CB}}
- \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0CC}}
- \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0CD}}
- \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0CE}}
- \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
- \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0D0}}
- \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0D1}}
- \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D2}}
- \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
- \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
- \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
- \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D6}}
- \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D7}}
- \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
- \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D9}}
- \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
- \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0DB}}
- \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0DC}}
- \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0DD}}
- \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0DE}}
- \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
- \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
- \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0E1}}
- \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
- \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
- \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
- \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E5}}
- \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
- \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
- \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E8}}
- \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E9}}
- \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0EA}}
- \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
- \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0EC}}
- \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0ED}}
- \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0EE}}
- \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0EF}}
- \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0F0}}
- \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0F1}}
- \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F2}}
- \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
- \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F4}}
- \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F5}}
- \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F6}}
- \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
- \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F8}}
- \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F9}}
- \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0FA}}
- \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0FB}}
- \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
- \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0FD}}
- \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0FE}}
- \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FF}}
- \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F100}}
- \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F101}}
- \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F102}}
- \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F103}}
- \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F104}}
- \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F105}}
- \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F106}}
- \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F107}}
- \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F108}}
- \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F109}}
- \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F10A}}
- \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F10B}}
- \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F10C}}
- \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F10D}}
- \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F10E}}
- \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10F}}
- \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F110}}
- \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F111}}
- \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F112}}
- \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F113}}
- \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F114}}
- \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F115}}
- \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F116}}
- \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F117}}
- \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F118}}
- \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F119}}
- \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F11A}}
- \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F11B}}
- \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F11C}}
- \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F11D}}
- \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F11E}}
- \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11F}}
- \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F120}}
- \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F121}}
- \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F122}}
- \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F123}}
- \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F124}}
- \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F125}}
- \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F126}}
- \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F127}}
- \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F128}}
- \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F129}}
- \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F12A}}
- \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F12B}}
- \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F12C}}
- \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F12D}}
- \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F12E}}
- \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12F}}
- \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F130}}
- \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F131}}
- \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F132}}
- \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F133}}
- \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F134}}
- \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F135}}
- \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F136}}
- \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F137}}
- \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F138}}
- \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F139}}
- \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F13A}}
- \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F13B}}
- \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F13C}}
- \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F13D}}
- \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F13E}}
- \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13F}}
- \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F140}}
- \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F141}}
- \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F142}}
- \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F143}}
- \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F144}}
- \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F145}}
- \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F146}}
- \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F147}}
- \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F148}}
- \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F149}}
- \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F14A}}
- \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F14B}}
- \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F14C}}
- \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F14D}}
- \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F14E}}
- \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14F}}
- \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F150}}
- \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F151}}
- \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F152}}
- \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F153}}
- \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F154}}
- \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F155}}
- \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F156}}
- \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F157}}
- \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F158}}
- \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F159}}
- \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F15A}}
- \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F15B}}
- \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F15C}}
- \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F15D}}
- \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F15E}}
- \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15F}}
- \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F160}}
- \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F161}}
- \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F162}}
- \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F163}}
- \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F164}}
- \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F165}}
- \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F166}}
- \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F167}}
- \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F168}}
- \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F169}}
- \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F16A}}
- \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F16B}}
- \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F16C}}
- \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F16D}}
- \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F16E}}
- \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16F}}
- \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F170}}
- \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F171}}
- \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F172}}
- \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F173}}
- \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F174}}
- \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmap\symbol{"F175}}
- \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F176}}
- \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F177}}
- \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F178}}
- \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F179}}
- \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F17A}}
- \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F17B}}
- \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F17C}}
- \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F17D}}
- \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F17E}}
- \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17F}}
- \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F180}}
- \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F181}}
- \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F182}}
- \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F183}}
- \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F184}}
- \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F185}}
- \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F186}}
- \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F187}}
- \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F188}}
- \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F189}}
- \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F18A}}
- \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F18B}}
- \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F18C}}
- \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F18D}}
- \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F18E}}
- \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F18F}}
- \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F190}}
- \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F191}}
- \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F192}}
- \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F193}}
- \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F194}}
- \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F195}}
- \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F196}}
- \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F197}}
- \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F198}}
- \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F199}}
- \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F19A}}
- \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F19B}}
- \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F19C}}
- \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F19D}}
- \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F19E}}
- \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F19F}}
- \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
- \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
- \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
- \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
- \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
- \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
- \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
- \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
- \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
- \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
- \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1AA}}
- \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1AB}}
- \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
- \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1AD}}
- \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1AE}}
- \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1AF}}
- \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1B0}}
- \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1B1}}
- \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1B2}}
- \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
- \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
- \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1B5}}
- \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B6}}
- \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1B7}}
- \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B8}}
- \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B9}}
- \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1BA}}
- \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1BB}}
- \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1BC}}
- \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1BD}}
- \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1BE}}
- \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1BF}}
- \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1C0}}
- \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1C1}}
- \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1C2}}
- \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C3}}
- \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C4}}
- \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1C5}}
- \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1C6}}
- \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C7}}
- \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C8}}
- \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
- \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1CA}}
- \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
- \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
- \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
- \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1CE}}
- \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
- \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1D0}}
- \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1D1}}
- \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
- \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
- \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
- \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1D5}}
- \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1D6}}
- \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D7}}
- \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D8}}
- \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
- \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
- \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1DB}}
- \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1DC}}
- \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1DD}}
- \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1DE}}
- \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1DF}}
- \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1E0}}
- \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
- \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1E2}}
- \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E3}}
- \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E4}}
- \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1E5}}
- \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1E6}}
- \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E7}}
- \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E8}}
- \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E9}}
- \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1EA}}
- \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
- \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1EC}}
- \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1ED}}
- \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1EE}}
- \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1EF}}
- \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1F0}}
- \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1F1}}
- \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1F2}}
- \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
- \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F4}}
- \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1F5}}
- \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1F6}}
- \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F7}}
- \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
- \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
- \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
- \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1FB}}
- \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1FC}}
- \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
- \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
- \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
- \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F200}}
- \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F201}}
- \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F202}}
- \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F203}}
- \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F204}}
- \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F205}}
- \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F206}}
- \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F207}}
- \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F208}}
- \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F209}}
- \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F20A}}
- \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F20B}}
- \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F20C}}
- \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F20D}}
- \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F20E}}
- \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F20F}}
- \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F210}}
- \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F211}}
- \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F212}}
- \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F213}}
- \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F214}}
- \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F215}}
- \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F216}}
- \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F217}}
- \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F218}}
- \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F219}}
- \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F21A}}
- \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F21B}}
- \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F21C}}
- \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F21D}}
- \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F21E}}
- \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F21F}}
- \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F220}}
- \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F221}}
- \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F222}}
- \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F223}}
- \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F224}}
- \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F225}}
- \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F226}}
- \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F227}}
- \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F228}}
- \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F229}}
- \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F22A}}
- \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F22B}}
- \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F22C}}
- \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F22D}}
- \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F22E}}
- \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F22F}}
- \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F230}}
- \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F231}}
- \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F232}}
- \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F233}}
- \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F234}}
- \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F235}}
- \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F236}}
- \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F237}}
- \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F238}}
- \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F239}}
- \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F23A}}
- \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F23B}}
- \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F23C}}
- \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F23D}}
- \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F23E}}
- \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F23F}}
- \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F240}}
- \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F241}}
- \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F242}}
- \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F243}}
- \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F244}}
- \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F245}}
- \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F246}}
- \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F247}}
- \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F248}}
- \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F249}}
- \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F24A}}
- \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F24B}}
- \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F24C}}
- \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F24D}}
- \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F24E}}
- \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F24F}}
- \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F250}}
- \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F251}}
- \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F252}}
- \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F253}}
- \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F254}}
- \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F255}}
- \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F256}}
- \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F257}}
- \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F258}}
- \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F259}}
- \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F25A}}
- \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F25B}}
- \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F25C}}
- \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F25D}}
- \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F25E}}
- \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F25F}}
- \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F260}}
- \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F261}}
- \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F262}}
- \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F263}}
- \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F264}}
- \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F265}}
- \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F266}}
- \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F267}}
- \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F268}}
- \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F269}}
- \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F26A}}
- \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F26B}}
- \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F26C}}
- \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F26D}}
- \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F26E}}
- \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F26F}}
- \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F270}}
- \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F271}}
- \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F272}}
- \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F273}}
- \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F274}}
- \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F275}}
- \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F276}}
- \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F277}}
- \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F278}}
- \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F279}}
- \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F27A}}
- \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F27B}}
- \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F27C}}
- \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F27D}}
- \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F27E}}
- \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F27F}}
- \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F280}}
- \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F281}}
- \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F282}}
- \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F283}}
- \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F284}}
- \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F285}}
- \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F286}}
- \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F287}}
- \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F288}}
- \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F289}}
- \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F28A}}
- \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F28B}}
- \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F28C}}
- \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F28D}}
- \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F28E}}
- \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F28F}}
- \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F290}}
- \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F291}}
- \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F292}}
- \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F293}}
- \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F294}}
- \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F295}}
- \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F296}}
- \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F297}}
- \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F298}}
- \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F299}}
- \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F29A}}
- \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F29B}}
- \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F29C}}
- \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F29D}}
- \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F29E}}
- \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F29F}}
- \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F2A0}}
- \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
- \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2A2}}
- \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A3}}
- \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
- \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2A5}}
- \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
- \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A7}}
- \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A8}}
- \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
- \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2AA}}
- \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2AB}}
- \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2AC}}
- \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2AD}}
- \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2AE}}
- \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2AF}}
- \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
- \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
- \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2B2}}
- \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B3}}
- \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
- \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
- \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
- \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B7}}
- \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B8}}
- \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B9}}
- \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2BA}}
- \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
- \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2BC}}
- \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2BD}}
- \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2BE}}
- \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2BF}}
- \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2C0}}
- \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2C1}}
- \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2C2}}
- \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C3}}
- \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C4}}
- \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2C5}}
- \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
- \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
- \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
- \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
- \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2CA}}
- \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
- \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
- \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2CD}}
- \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2CE}}
- \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2CF}}
- \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
- \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2D1}}
- \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2D2}}
- \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D3}}
- \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D4}}
- \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
- \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2D6}}
- \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D7}}
- \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
- \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D9}}
- \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
- \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
- \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
- \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
- \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
- \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2DF}}
- \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2E0}}
- \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
- \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
- \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
- \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
- \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
- \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2E6}}
- \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E7}}
- \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
- \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E9}}
- \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
- \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
- \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2EC}}
- \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
- \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2EE}}
- \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2EF}}
- \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
- \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
- \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
- \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
- \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
- \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2F5}}
- \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
- \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
- \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F8}}
- \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F9}}
- \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
- \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
- \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2FC}}
- \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2FD}}
- \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2FE}}
- \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2FF}}
- \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F300}}
- \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F301}}
- \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F302}}
- \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F303}}
- \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F304}}
- \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F305}}
- \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F306}}
- \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F307}}
- \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F308}}
- \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F309}}
- \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F30A}}
- \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F30B}}
- \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F30C}}
- \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F30D}}
- \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F30E}}
- \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F30F}}
- \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F310}}
- \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F311}}
- \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F312}}
- \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F313}}
- \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F314}}
- \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F315}}
- \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F316}}
- \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F317}}
- \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F318}}
- \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F319}}
- \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F31A}}
- \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F31B}}
- \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F31C}}
- \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F31D}}
- \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F31E}}
- \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F31F}}
- \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F320}}
- \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F321}}
- \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F322}}
- \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F323}}
- \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F324}}
- \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F325}}
- \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F326}}
- \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F327}}
- \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F328}}
- \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F329}}
- \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F32A}}
- \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F32B}}
- \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F32C}}
- \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F32D}}
- \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F32E}}
- \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F32F}}
- \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F330}}
- \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F331}}
- \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F332}}
- \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F333}}
- \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F334}}
- \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F335}}
- \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F336}}
- \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F337}}
- \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F338}}
- \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F339}}
- \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F33A}}
- \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F33B}}
- \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F33C}}
- \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F33D}}
- \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F33E}}
- \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F33F}}
- \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F340}}
- \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F341}}
- \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F342}}
- \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F343}}
- \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F344}}
- \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F345}}
- \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F346}}
- \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F347}}
- \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F348}}
- \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F349}}
- \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F34A}}
- \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F34B}}
- \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F34C}}
- \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F34D}}
- \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F34E}}
- \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F34F}}
- \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F350}}
- \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F351}}
- \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F352}}
- \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F353}}
- \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F354}}
- \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F355}}
- \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F356}}
- \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F357}}
- \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F358}}
- \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F359}}
- \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F35A}}
- \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F35B}}
- \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F35C}}
- \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F35D}}
- \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F35E}}
- \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F35F}}
- \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F360}}
- \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F361}}
- \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F362}}
- \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F363}}
- \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F364}}
- \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F365}}
- \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F366}}
- \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F367}}
- \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F368}}
- \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F369}}
- \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F36A}}
- \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F36B}}
- \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F36C}}
- \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F36D}}
- \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F36E}}
- \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F36F}}
- \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F370}}
- \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F371}}
- \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F372}}
- \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F373}}
- \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F374}}
- \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F375}}
- \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F376}}
- \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F377}}
- \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F378}}
- \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F379}}
- \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F37A}}
- \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F37B}}
- \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F37C}}
- \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F37D}}
- \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F37E}}
- \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F37F}}
- \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F380}}
- \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F381}}
- \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F382}}
- \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F383}}
- \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F384}}
- \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F385}}
- \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F386}}
- \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F387}}
- \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F388}}
- \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F389}}
- \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F38A}}
- \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F38B}}
- \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F38C}}
- \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F38D}}
- \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F38E}}
- \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F38F}}
- \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F390}}
- \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F391}}
- \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F392}}
- \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F393}}
- \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F394}}
- \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F395}}
- \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F396}}
- \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F397}}
- \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F398}}
- \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F399}}
- \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F39A}}
- \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F39B}}
- \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F39C}}
- \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F39D}}
- \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F39E}}
- \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F39F}}
- \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
- \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
- \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
- \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
- \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
- \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
- \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
- \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A7}}
- \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
- \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
- \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
- \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
- \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3AC}}
- \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
- \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3AE}}
- \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
- \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
- \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3B1}}
- \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
- \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
- \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3B4}}
- \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
- \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
- \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B7}}
- \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
- \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
- \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
- \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
- \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
- \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
- \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
- \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
- \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
- \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
- \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
- \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
- \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
- \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
- \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
- \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
- \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
- \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
- \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
- \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
- \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3CC}}
- \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3CD}}
- \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
- \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3CF}}
- \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3D0}}
- \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3D1}}
- \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3D2}}
- \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D3}}
- \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3D4}}
- \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3D5}}
- \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3D6}}
- \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
- \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D8}}
- \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D9}}
- \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3DA}}
- \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3DB}}
- \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3DC}}
- \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3DD}}
- \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
- \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
- \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
- \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
- \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3E2}}
- \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
- \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
- \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
- \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
- \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
- \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E8}}
- \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
- \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
- \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3EB}}
- \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
- \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3ED}}
- \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
- \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3EF}}
- \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
- \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
- \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
- \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
- \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
- \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3F5}}
- \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
- \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
- \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
- \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F9}}
- \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3FA}}
- \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3FB}}
- \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
- \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3FD}}
- \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3FE}}
- \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3FF}}
- \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F400}}
- \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F401}}
- \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F402}}
- \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F403}}
- \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F404}}
- \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F405}}
- \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F406}}
- \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F407}}
- \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F408}}
- \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F409}}
- \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F40A}}
- \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F40B}}
- \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F40C}}
- \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F40D}}
- \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F40E}}
- \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F40F}}
- \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F410}}
- \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F411}}
- \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F412}}
- \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F413}}
- \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F414}}
- \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F415}}
- \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F416}}
- \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F417}}
- \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F418}}
- \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F419}}
- \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F41A}}
- \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F41B}}
- \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F41C}}
- \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F41D}}
- \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F41E}}
- \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F41F}}
- \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F420}}
- \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F421}}
- \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F422}}
- \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F423}}
- \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F424}}
- \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F425}}
- \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F426}}
- \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F427}}
- \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F428}}
- \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F429}}
- \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F42A}}
- \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F42B}}
- \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F42C}}
- \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F42D}}
- \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F42E}}
- \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F42F}}
- \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F430}}
- \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F431}}
- \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F432}}
- \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F433}}
- \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F434}}
- \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F435}}
- \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F436}}
- \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F437}}
- \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F438}}
- \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F439}}
- \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F43A}}
- \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F43B}}
- \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F43C}}
- \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F43D}}
- \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F43E}}
- \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F43F}}
- \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F440}}
- \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F441}}
- \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F442}}
- \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F443}}
- \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F444}}
- \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F445}}
- \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F446}}
- \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F447}}
- \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F448}}
- \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F449}}
- \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F44A}}
- \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F44B}}
- \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F44C}}
- \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F44D}}
- \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F44E}}
- \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F44F}}
- \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F450}}
- \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F451}}
- \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F452}}
- \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F453}}
- \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F454}}
- \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F455}}
- \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F456}}
- \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F457}}
- \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F458}}
- \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F459}}
- \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F45A}}
- \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F45B}}
- \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F45C}}
- \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F45D}}
- \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F45E}}
- \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F45F}}
- \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F460}}
- \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F461}}
- \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F462}}
- \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F463}}
- \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F464}}
- \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F465}}
- \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F466}}
- \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F467}}
- \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F468}}
- \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F469}}
- \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F46A}}
- \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F46B}}
- \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F46C}}
- \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F46D}}
- \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F46E}}
- \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F46F}}
- \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F470}}
- \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F471}}
- \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F472}}
- \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F473}}
- \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F474}}
- \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F475}}
- \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F476}}
- \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F477}}
- \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F478}}
- \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F479}}
- \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F47A}}
- \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F47B}}
- \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F47C}}
- \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F47D}}
- \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F47E}}
- \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F47F}}
- \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F480}}
- \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F481}}
- \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F482}}
- \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F483}}
- \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F484}}
- \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F485}}
- \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F486}}
- \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F487}}
- \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F488}}
- \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F489}}
- \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F48A}}
- \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F48B}}
- \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F48C}}
- \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F48D}}
- \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F48E}}
- \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F48F}}
- \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F490}}
- \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F491}}
- \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F492}}
- \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F493}}
- \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F494}}
- \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F495}}
- \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F496}}
- \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F497}}
- \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F498}}
- \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F499}}
- \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F49A}}
- \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F49B}}
- \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F49C}}
- \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F49D}}
- \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F49E}}
- \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F49F}}
- \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
- \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
- \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
- \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A3}}
- \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
- \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
- \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
- \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
- \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
- \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
- \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
- \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
- \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
- \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
- \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
- \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
- \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
- \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
- \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
- \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
- \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4B4}}
- \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
- \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
- \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
- \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
- \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B9}}
- \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4BA}}
- \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
- \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
- \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
- \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BE}}
- \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4BF}}
- \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
- \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4C1}}
- \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4C2}}
- \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C3}}
- \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
- \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4C5}}
- \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
- \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
- \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C8}}
- \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
- \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4CA}}
- \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
- \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
- \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
- \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
- \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4CF}}
- \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
- \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4D1}}
- \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4D2}}
- \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
- \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
- \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
- \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
- \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
- \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
- \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D9}}
- \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
- \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4DB}}
- \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
- \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
- \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4DE}}
- \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4DF}}
- \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4E0}}
- \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
- \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4E2}}
- \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
- \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
- \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
- \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
- \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E7}}
- \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E8}}
- \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
- \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4EA}}
- \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4EB}}
- \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4EC}}
- \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
- \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
- \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4EF}}
- \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4F0}}
- \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
- \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4F2}}
- \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4F3}}
- \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4F4}}
- \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
- \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
- \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F7}}
- \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
- \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F9}}
- \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4FA}}
- \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4FB}}
- \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
- \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
- \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
- \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
- \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F500}}
- \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F501}}
- \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F502}}
- \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F503}}
- \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F504}}
- \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F505}}
- \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F506}}
- \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F507}}
- \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F508}}
- \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F509}}
- \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F50A}}
- \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F50B}}
- \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F50C}}
- \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F50D}}
- \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F50E}}
- \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F50F}}
- \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F510}}
- \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F511}}
- \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F512}}
- \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F513}}
- \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F514}}
- \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F515}}
- \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F516}}
- \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F517}}
- \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F518}}
- \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F519}}
- \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F51A}}
- \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F51B}}
- \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F51C}}
- \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F51D}}
- \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F51E}}
- \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F51F}}
- \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F520}}
- \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F521}}
- \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F522}}
- \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F523}}
- \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F524}}
- \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F525}}
- \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F526}}
- \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F527}}
- \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F528}}
- \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F529}}
- \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F52A}}
- \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F52B}}
- \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F52C}}
- \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F52D}}
- \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F52E}}
- \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F52F}}
- \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F530}}
- \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F531}}
- \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F532}}
- \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F533}}
- \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F534}}
- \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F535}}
- \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F536}}
- \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F537}}
- \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F538}}
- \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F539}}
- \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F53A}}
- \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F53B}}
- \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F53C}}
- \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F53D}}
- \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F53E}}
- \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F53F}}
- \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F540}}
- \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F541}}
- \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F542}}
- \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F543}}
- \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F544}}
- \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F545}}
- \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F546}}
- \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F547}}
- \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F548}}
- \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F549}}
- \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F54A}}
- \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F54B}}
- \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F54C}}
- \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F54D}}
- \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F54E}}
- \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F54F}}
- \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F550}}
- \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F551}}
- \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F552}}
- \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F553}}
- \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F554}}
- \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F555}}
- \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F556}}
- \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F557}}
- \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F558}}
- \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F559}}
- \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F55A}}
- \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F55B}}
- \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F55C}}
- \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F55D}}
- \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F55E}}
- \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F55F}}
- \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F560}}
- \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F561}}
- \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F562}}
- \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F563}}
- \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F564}}
- \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F565}}
- \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F566}}
- \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F567}}
- \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F568}}
- \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F569}}
- \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F56A}}
- \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F56B}}
- \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F56C}}
- \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F56D}}
- \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F56E}}
- \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F56F}}
- \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F570}}
- \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F571}}
- \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F572}}
- \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F573}}
- \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F574}}
- \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F575}}
- \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F576}}
- \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F577}}
- \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F578}}
- \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F579}}
- \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F57A}}
- \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F57B}}
- \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F57C}}
- \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F57D}}
- \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F57E}}
- \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F57F}}
- \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F580}}
- \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F581}}
- \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F582}}
- \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F583}}
- \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F584}}
- \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F585}}
- \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F586}}
- \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F587}}
- \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F588}}
- \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F589}}
- \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F58A}}
- \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F58B}}
- \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F58C}}
- \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F58D}}
- \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F58E}}
- \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F58F}}
- \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F590}}
- \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F591}}
- \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F592}}
- \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F593}}
- \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F594}}
- \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F595}}
- \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F596}}
- \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F597}}
- \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F598}}
- \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F599}}
- \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F59A}}
- \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F59B}}
- \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F59C}}
- \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F59D}}
- \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F59E}}
- \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F59F}}
- \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
- \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
- \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5A2}}
- \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5A3}}
- \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
- \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
- \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
- \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
- \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
- \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
- \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
- \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5AB}}
- \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
- \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
- \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
- \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5AF}}
- \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
- \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
- \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
- \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5B3}}
- \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5B4}}
- \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5B5}}
- \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5B6}}
- \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
- \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B8}}
- \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
- \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
- \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5BB}}
- \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5BC}}
- \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5BD}}
- \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5BE}}
- \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
- \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
- \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
- \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
- \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
- \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
- \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
- \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
- \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
- \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
- \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
- \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
- \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
- \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5CC}}
- \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
- \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
- \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
- \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
- \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
- \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
- \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5D3}}
- \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
- \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5D5}}
- \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5D6}}
- \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
- \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
- \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
- \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
- \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
- \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
- \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5DD}}
- \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
- \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5DF}}
- \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5E0}}
- \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
- \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
- \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
- \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
- \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
- \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
- \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
- \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
- \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
- \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
- \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
- \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
- \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
- \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
- \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
- \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
- \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
- \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
- \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
- \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
- \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
- \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
- \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
- \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
- \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
- \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
- \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
- \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
- \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
- \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
- \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
- \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F600}}
- \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F601}}
- \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F602}}
- \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F603}}
- \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F604}}
- \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F605}}
- \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F606}}
- \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F607}}
- \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F608}}
- \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F609}}
- \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F60A}}
- \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F60B}}
- \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F60C}}
- \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F60D}}
- \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F60E}}
- \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F60F}}
- \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F610}}
- \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F611}}
- \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F612}}
- \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F613}}
- \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F614}}
- \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F615}}
- \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F616}}
- \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F617}}
- \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F618}}
- \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F619}}
- \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F61A}}
- \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F61B}}
- \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F61C}}
- \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F61D}}
- \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F61E}}
- \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F61F}}
- \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F620}}
- \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F621}}
- \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F622}}
- \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F623}}
- \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F624}}
- \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F625}}
- \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F626}}
- \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F627}}
- \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F628}}
- \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F629}}
- \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F62A}}
- \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F62B}}
- \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F62C}}
- \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F62D}}
- \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F62E}}
- \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F62F}}
- \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F630}}
- \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F631}}
- \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F632}}
- \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F633}}
- \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F634}}
- \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F635}}
- \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F636}}
- \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F637}}
- \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F638}}
- \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F639}}
- \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F63A}}
- \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F63B}}
- \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F63C}}
- \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F63D}}
- \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F63E}}
- \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F63F}}
- \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F640}}
- \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F641}}
- \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F642}}
- \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F643}}
- \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F644}}
- \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F645}}
- \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F646}}
- \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F647}}
- \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F648}}
- \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F649}}
- \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F64A}}
- \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F64B}}
- \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F64C}}
- \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F64D}}
- \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F64E}}
- \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F64F}}
- \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F650}}
- \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F651}}
- \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F652}}
- \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F653}}
- \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F654}}
- \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F655}}
- \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F656}}
- \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F657}}
- \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F658}}
- \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F659}} \ No newline at end of file
+ \expandafter\def\csname simpleicon@30secondsofcodeicon\endcsname {\simpleiconsmap\symbol{"EA07}}
+ \expandafter\def\csname simpleicon@365datascienceicon\endcsname {\simpleiconsmap\symbol{"EA08}}
+ \expandafter\def\csname simpleicon@3micon\endcsname {\simpleiconsmap\symbol{"EA09}}
+ \expandafter\def\csname simpleicon@42icon\endcsname {\simpleiconsmap\symbol{"EA0A}}
+ \expandafter\def\csname simpleicon@4chanicon\endcsname {\simpleiconsmap\symbol{"EA0B}}
+ \expandafter\def\csname simpleicon@4dicon\endcsname {\simpleiconsmap\symbol{"EA0C}}
+ \expandafter\def\csname simpleicon@500pxicon\endcsname {\simpleiconsmap\symbol{"EA0D}}
+ \expandafter\def\csname simpleicon@7zipicon\endcsname {\simpleiconsmap\symbol{"EA0E}}
+ \expandafter\def\csname simpleicon@99designsicon\endcsname {\simpleiconsmap\symbol{"EA0F}}
+ \expandafter\def\csname simpleicon@9gagicon\endcsname {\simpleiconsmap\symbol{"EA10}}
+ \expandafter\def\csname simpleicon@abbotticon\endcsname {\simpleiconsmap\symbol{"EA11}}
+ \expandafter\def\csname simpleicon@abbrobotstudioicon\endcsname {\simpleiconsmap\symbol{"EA12}}
+ \expandafter\def\csname simpleicon@abbvieicon\endcsname {\simpleiconsmap\symbol{"EA13}}
+ \expandafter\def\csname simpleicon@aboutdotmeicon\endcsname {\simpleiconsmap\symbol{"EA14}}
+ \expandafter\def\csname simpleicon@abstracticon\endcsname {\simpleiconsmap\symbol{"EA15}}
+ \expandafter\def\csname simpleicon@abusedotchicon\endcsname {\simpleiconsmap\symbol{"EA16}}
+ \expandafter\def\csname simpleicon@academiaicon\endcsname {\simpleiconsmap\symbol{"EA17}}
+ \expandafter\def\csname simpleicon@accentureicon\endcsname {\simpleiconsmap\symbol{"EA18}}
+ \expandafter\def\csname simpleicon@accusofticon\endcsname {\simpleiconsmap\symbol{"EA19}}
+ \expandafter\def\csname simpleicon@acericon\endcsname {\simpleiconsmap\symbol{"EA1A}}
+ \expandafter\def\csname simpleicon@acmicon\endcsname {\simpleiconsmap\symbol{"EA1B}}
+ \expandafter\def\csname simpleicon@actigraphicon\endcsname {\simpleiconsmap\symbol{"EA1C}}
+ \expandafter\def\csname simpleicon@activisionicon\endcsname {\simpleiconsmap\symbol{"EA1D}}
+ \expandafter\def\csname simpleicon@activitypubicon\endcsname {\simpleiconsmap\symbol{"EA1E}}
+ \expandafter\def\csname simpleicon@actixicon\endcsname {\simpleiconsmap\symbol{"EA1F}}
+ \expandafter\def\csname simpleicon@acuraicon\endcsname {\simpleiconsmap\symbol{"EA20}}
+ \expandafter\def\csname simpleicon@adafruiticon\endcsname {\simpleiconsmap\symbol{"EA21}}
+ \expandafter\def\csname simpleicon@adblockicon\endcsname {\simpleiconsmap\symbol{"EA22}}
+ \expandafter\def\csname simpleicon@adblockplusicon\endcsname {\simpleiconsmap\symbol{"EA23}}
+ \expandafter\def\csname simpleicon@adguardicon\endcsname {\simpleiconsmap\symbol{"EA24}}
+ \expandafter\def\csname simpleicon@adidasicon\endcsname {\simpleiconsmap\symbol{"EA25}}
+ \expandafter\def\csname simpleicon@adminericon\endcsname {\simpleiconsmap\symbol{"EA26}}
+ \expandafter\def\csname simpleicon@adobeicon\endcsname {\simpleiconsmap\symbol{"EA27}}
+ \expandafter\def\csname simpleicon@adobeacrobatreadericon\endcsname {\simpleiconsmap\symbol{"EA28}}
+ \expandafter\def\csname simpleicon@adobeaftereffectsicon\endcsname {\simpleiconsmap\symbol{"EA29}}
+ \expandafter\def\csname simpleicon@adobeauditionicon\endcsname {\simpleiconsmap\symbol{"EA2A}}
+ \expandafter\def\csname simpleicon@adobecreativecloudicon\endcsname {\simpleiconsmap\symbol{"EA2B}}
+ \expandafter\def\csname simpleicon@adobedreamweavericon\endcsname {\simpleiconsmap\symbol{"EA2C}}
+ \expandafter\def\csname simpleicon@adobefontsicon\endcsname {\simpleiconsmap\symbol{"EA2D}}
+ \expandafter\def\csname simpleicon@adobeillustratoricon\endcsname {\simpleiconsmap\symbol{"EA2E}}
+ \expandafter\def\csname simpleicon@adobeindesignicon\endcsname {\simpleiconsmap\symbol{"EA2F}}
+ \expandafter\def\csname simpleicon@adobelightroomicon\endcsname {\simpleiconsmap\symbol{"EA30}}
+ \expandafter\def\csname simpleicon@adobelightroomclassicicon\endcsname {\simpleiconsmap\symbol{"EA31}}
+ \expandafter\def\csname simpleicon@adobephotoshopicon\endcsname {\simpleiconsmap\symbol{"EA32}}
+ \expandafter\def\csname simpleicon@adobepremiereproicon\endcsname {\simpleiconsmap\symbol{"EA33}}
+ \expandafter\def\csname simpleicon@adobexdicon\endcsname {\simpleiconsmap\symbol{"EA34}}
+ \expandafter\def\csname simpleicon@adonisjsicon\endcsname {\simpleiconsmap\symbol{"EA35}}
+ \expandafter\def\csname simpleicon@adpicon\endcsname {\simpleiconsmap\symbol{"EA36}}
+ \expandafter\def\csname simpleicon@adrollicon\endcsname {\simpleiconsmap\symbol{"EA37}}
+ \expandafter\def\csname simpleicon@adventofcodeicon\endcsname {\simpleiconsmap\symbol{"EA38}}
+ \expandafter\def\csname simpleicon@adyenicon\endcsname {\simpleiconsmap\symbol{"EA39}}
+ \expandafter\def\csname simpleicon@aegisauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EA3A}}
+ \expandafter\def\csname simpleicon@aerlingusicon\endcsname {\simpleiconsmap\symbol{"EA3B}}
+ \expandafter\def\csname simpleicon@aerofloticon\endcsname {\simpleiconsmap\symbol{"EA3C}}
+ \expandafter\def\csname simpleicon@aeromexicoicon\endcsname {\simpleiconsmap\symbol{"EA3D}}
+ \expandafter\def\csname simpleicon@aerospikeicon\endcsname {\simpleiconsmap\symbol{"EA3E}}
+ \expandafter\def\csname simpleicon@aewicon\endcsname {\simpleiconsmap\symbol{"EA3F}}
+ \expandafter\def\csname simpleicon@affineicon\endcsname {\simpleiconsmap\symbol{"EA40}}
+ \expandafter\def\csname simpleicon@affinityicon\endcsname {\simpleiconsmap\symbol{"EA41}}
+ \expandafter\def\csname simpleicon@affinitydesignericon\endcsname {\simpleiconsmap\symbol{"EA42}}
+ \expandafter\def\csname simpleicon@affinityphotoicon\endcsname {\simpleiconsmap\symbol{"EA43}}
+ \expandafter\def\csname simpleicon@affinitypublishericon\endcsname {\simpleiconsmap\symbol{"EA44}}
+ \expandafter\def\csname simpleicon@aframeicon\endcsname {\simpleiconsmap\symbol{"EA45}}
+ \expandafter\def\csname simpleicon@afterpayicon\endcsname {\simpleiconsmap\symbol{"EA46}}
+ \expandafter\def\csname simpleicon@agoraicon\endcsname {\simpleiconsmap\symbol{"EA47}}
+ \expandafter\def\csname simpleicon@aibicon\endcsname {\simpleiconsmap\symbol{"EA48}}
+ \expandafter\def\csname simpleicon@aidungeonicon\endcsname {\simpleiconsmap\symbol{"EA49}}
+ \expandafter\def\csname simpleicon@aiohttpicon\endcsname {\simpleiconsmap\symbol{"EA4A}}
+ \expandafter\def\csname simpleicon@aiqfomeicon\endcsname {\simpleiconsmap\symbol{"EA4B}}
+ \expandafter\def\csname simpleicon@airasiaicon\endcsname {\simpleiconsmap\symbol{"EA4C}}
+ \expandafter\def\csname simpleicon@airbnbicon\endcsname {\simpleiconsmap\symbol{"EA4D}}
+ \expandafter\def\csname simpleicon@airbrakeicon\endcsname {\simpleiconsmap\symbol{"EA4E}}
+ \expandafter\def\csname simpleicon@airbusicon\endcsname {\simpleiconsmap\symbol{"EA4F}}
+ \expandafter\def\csname simpleicon@airbyteicon\endcsname {\simpleiconsmap\symbol{"EA50}}
+ \expandafter\def\csname simpleicon@aircallicon\endcsname {\simpleiconsmap\symbol{"EA51}}
+ \expandafter\def\csname simpleicon@aircanadaicon\endcsname {\simpleiconsmap\symbol{"EA52}}
+ \expandafter\def\csname simpleicon@airchinaicon\endcsname {\simpleiconsmap\symbol{"EA53}}
+ \expandafter\def\csname simpleicon@airfranceicon\endcsname {\simpleiconsmap\symbol{"EA54}}
+ \expandafter\def\csname simpleicon@airindiaicon\endcsname {\simpleiconsmap\symbol{"EA55}}
+ \expandafter\def\csname simpleicon@airplayaudioicon\endcsname {\simpleiconsmap\symbol{"EA56}}
+ \expandafter\def\csname simpleicon@airplayvideoicon\endcsname {\simpleiconsmap\symbol{"EA57}}
+ \expandafter\def\csname simpleicon@airtableicon\endcsname {\simpleiconsmap\symbol{"EA58}}
+ \expandafter\def\csname simpleicon@airtelicon\endcsname {\simpleiconsmap\symbol{"EA59}}
+ \expandafter\def\csname simpleicon@airtransaticon\endcsname {\simpleiconsmap\symbol{"EA5A}}
+ \expandafter\def\csname simpleicon@ajvicon\endcsname {\simpleiconsmap\symbol{"EA5B}}
+ \expandafter\def\csname simpleicon@akamaiicon\endcsname {\simpleiconsmap\symbol{"EA5C}}
+ \expandafter\def\csname simpleicon@akauntingicon\endcsname {\simpleiconsmap\symbol{"EA5D}}
+ \expandafter\def\csname simpleicon@akiflowicon\endcsname {\simpleiconsmap\symbol{"EA5E}}
+ \expandafter\def\csname simpleicon@alacrittyicon\endcsname {\simpleiconsmap\symbol{"EA5F}}
+ \expandafter\def\csname simpleicon@alamyicon\endcsname {\simpleiconsmap\symbol{"EA60}}
+ \expandafter\def\csname simpleicon@albertheijnicon\endcsname {\simpleiconsmap\symbol{"EA61}}
+ \expandafter\def\csname simpleicon@albyicon\endcsname {\simpleiconsmap\symbol{"EA62}}
+ \expandafter\def\csname simpleicon@alchemyicon\endcsname {\simpleiconsmap\symbol{"EA63}}
+ \expandafter\def\csname simpleicon@aldinordicon\endcsname {\simpleiconsmap\symbol{"EA64}}
+ \expandafter\def\csname simpleicon@aldisudicon\endcsname {\simpleiconsmap\symbol{"EA65}}
+ \expandafter\def\csname simpleicon@alfaromeoicon\endcsname {\simpleiconsmap\symbol{"EA66}}
+ \expandafter\def\csname simpleicon@alfredicon\endcsname {\simpleiconsmap\symbol{"EA67}}
+ \expandafter\def\csname simpleicon@algoliaicon\endcsname {\simpleiconsmap\symbol{"EA68}}
+ \expandafter\def\csname simpleicon@algorandicon\endcsname {\simpleiconsmap\symbol{"EA69}}
+ \expandafter\def\csname simpleicon@alibabacloudicon\endcsname {\simpleiconsmap\symbol{"EA6A}}
+ \expandafter\def\csname simpleicon@alibabadotcomicon\endcsname {\simpleiconsmap\symbol{"EA6B}}
+ \expandafter\def\csname simpleicon@alienwareicon\endcsname {\simpleiconsmap\symbol{"EA6C}}
+ \expandafter\def\csname simpleicon@aliexpressicon\endcsname {\simpleiconsmap\symbol{"EA6D}}
+ \expandafter\def\csname simpleicon@alipayicon\endcsname {\simpleiconsmap\symbol{"EA6E}}
+ \expandafter\def\csname simpleicon@allegroicon\endcsname {\simpleiconsmap\symbol{"EA6F}}
+ \expandafter\def\csname simpleicon@alliedmoddersicon\endcsname {\simpleiconsmap\symbol{"EA70}}
+ \expandafter\def\csname simpleicon@allocineicon\endcsname {\simpleiconsmap\symbol{"EA71}}
+ \expandafter\def\csname simpleicon@alltrailsicon\endcsname {\simpleiconsmap\symbol{"EA72}}
+ \expandafter\def\csname simpleicon@almalinuxicon\endcsname {\simpleiconsmap\symbol{"EA73}}
+ \expandafter\def\csname simpleicon@alpinedotjsicon\endcsname {\simpleiconsmap\symbol{"EA74}}
+ \expandafter\def\csname simpleicon@alpinelinuxicon\endcsname {\simpleiconsmap\symbol{"EA75}}
+ \expandafter\def\csname simpleicon@alteryxicon\endcsname {\simpleiconsmap\symbol{"EA76}}
+ \expandafter\def\csname simpleicon@altiumdesignericon\endcsname {\simpleiconsmap\symbol{"EA77}}
+ \expandafter\def\csname simpleicon@alwaysdataicon\endcsname {\simpleiconsmap\symbol{"EA78}}
+ \expandafter\def\csname simpleicon@alxicon\endcsname {\simpleiconsmap\symbol{"EA79}}
+ \expandafter\def\csname simpleicon@amazonicon\endcsname {\simpleiconsmap\symbol{"EA7A}}
+ \expandafter\def\csname simpleicon@amazonalexaicon\endcsname {\simpleiconsmap\symbol{"EA7B}}
+ \expandafter\def\csname simpleicon@amazonapigatewayicon\endcsname {\simpleiconsmap\symbol{"EA7C}}
+ \expandafter\def\csname simpleicon@amazoncloudwatchicon\endcsname {\simpleiconsmap\symbol{"EA7D}}
+ \expandafter\def\csname simpleicon@amazoncognitoicon\endcsname {\simpleiconsmap\symbol{"EA7E}}
+ \expandafter\def\csname simpleicon@amazondocumentdbicon\endcsname {\simpleiconsmap\symbol{"EA7F}}
+ \expandafter\def\csname simpleicon@amazondynamodbicon\endcsname {\simpleiconsmap\symbol{"EA80}}
+ \expandafter\def\csname simpleicon@amazonec2icon\endcsname {\simpleiconsmap\symbol{"EA81}}
+ \expandafter\def\csname simpleicon@amazonecsicon\endcsname {\simpleiconsmap\symbol{"EA82}}
+ \expandafter\def\csname simpleicon@amazoneksicon\endcsname {\simpleiconsmap\symbol{"EA83}}
+ \expandafter\def\csname simpleicon@amazonelasticacheicon\endcsname {\simpleiconsmap\symbol{"EA84}}
+ \expandafter\def\csname simpleicon@amazonfiretvicon\endcsname {\simpleiconsmap\symbol{"EA85}}
+ \expandafter\def\csname simpleicon@amazongamesicon\endcsname {\simpleiconsmap\symbol{"EA86}}
+ \expandafter\def\csname simpleicon@amazoniamicon\endcsname {\simpleiconsmap\symbol{"EA87}}
+ \expandafter\def\csname simpleicon@amazonlumberyardicon\endcsname {\simpleiconsmap\symbol{"EA88}}
+ \expandafter\def\csname simpleicon@amazonlunaicon\endcsname {\simpleiconsmap\symbol{"EA89}}
+ \expandafter\def\csname simpleicon@amazonmusicicon\endcsname {\simpleiconsmap\symbol{"EA8A}}
+ \expandafter\def\csname simpleicon@amazonpayicon\endcsname {\simpleiconsmap\symbol{"EA8B}}
+ \expandafter\def\csname simpleicon@amazonprimeicon\endcsname {\simpleiconsmap\symbol{"EA8C}}
+ \expandafter\def\csname simpleicon@amazonrdsicon\endcsname {\simpleiconsmap\symbol{"EA8D}}
+ \expandafter\def\csname simpleicon@amazonredshifticon\endcsname {\simpleiconsmap\symbol{"EA8E}}
+ \expandafter\def\csname simpleicon@amazonroute53icon\endcsname {\simpleiconsmap\symbol{"EA8F}}
+ \expandafter\def\csname simpleicon@amazons3icon\endcsname {\simpleiconsmap\symbol{"EA90}}
+ \expandafter\def\csname simpleicon@amazonsimpleemailserviceicon\endcsname {\simpleiconsmap\symbol{"EA91}}
+ \expandafter\def\csname simpleicon@amazonsqsicon\endcsname {\simpleiconsmap\symbol{"EA92}}
+ \expandafter\def\csname simpleicon@amazonwebservicesicon\endcsname {\simpleiconsmap\symbol{"EA93}}
+ \expandafter\def\csname simpleicon@amdicon\endcsname {\simpleiconsmap\symbol{"EA94}}
+ \expandafter\def\csname simpleicon@amebaicon\endcsname {\simpleiconsmap\symbol{"EA95}}
+ \expandafter\def\csname simpleicon@americanairlinesicon\endcsname {\simpleiconsmap\symbol{"EA96}}
+ \expandafter\def\csname simpleicon@americanexpressicon\endcsname {\simpleiconsmap\symbol{"EA97}}
+ \expandafter\def\csname simpleicon@amgicon\endcsname {\simpleiconsmap\symbol{"EA98}}
+ \expandafter\def\csname simpleicon@ampicon\endcsname {\simpleiconsmap\symbol{"EA99}}
+ \expandafter\def\csname simpleicon@amulicon\endcsname {\simpleiconsmap\symbol{"EA9A}}
+ \expandafter\def\csname simpleicon@anaicon\endcsname {\simpleiconsmap\symbol{"EA9B}}
+ \expandafter\def\csname simpleicon@anacondaicon\endcsname {\simpleiconsmap\symbol{"EA9C}}
+ \expandafter\def\csname simpleicon@analogueicon\endcsname {\simpleiconsmap\symbol{"EA9D}}
+ \expandafter\def\csname simpleicon@andelaicon\endcsname {\simpleiconsmap\symbol{"EA9E}}
+ \expandafter\def\csname simpleicon@androidicon\endcsname {\simpleiconsmap\symbol{"EA9F}}
+ \expandafter\def\csname simpleicon@androidautoicon\endcsname {\simpleiconsmap\symbol{"EAA0}}
+ \expandafter\def\csname simpleicon@androidstudioicon\endcsname {\simpleiconsmap\symbol{"EAA1}}
+ \expandafter\def\csname simpleicon@angularicon\endcsname {\simpleiconsmap\symbol{"EAA2}}
+ \expandafter\def\csname simpleicon@anilisticon\endcsname {\simpleiconsmap\symbol{"EAA3}}
+ \expandafter\def\csname simpleicon@animalplaneticon\endcsname {\simpleiconsmap\symbol{"EAA4}}
+ \expandafter\def\csname simpleicon@ankermakeicon\endcsname {\simpleiconsmap\symbol{"EAA5}}
+ \expandafter\def\csname simpleicon@ankiicon\endcsname {\simpleiconsmap\symbol{"EAA6}}
+ \expandafter\def\csname simpleicon@ansibleicon\endcsname {\simpleiconsmap\symbol{"EAA7}}
+ \expandafter\def\csname simpleicon@answericon\endcsname {\simpleiconsmap\symbol{"EAA8}}
+ \expandafter\def\csname simpleicon@ansysicon\endcsname {\simpleiconsmap\symbol{"EAA9}}
+ \expandafter\def\csname simpleicon@antaicon\endcsname {\simpleiconsmap\symbol{"EAAA}}
+ \expandafter\def\csname simpleicon@antdesignicon\endcsname {\simpleiconsmap\symbol{"EAAB}}
+ \expandafter\def\csname simpleicon@antena3icon\endcsname {\simpleiconsmap\symbol{"EAAC}}
+ \expandafter\def\csname simpleicon@anthropicicon\endcsname {\simpleiconsmap\symbol{"EAAD}}
+ \expandafter\def\csname simpleicon@anycubicicon\endcsname {\simpleiconsmap\symbol{"EAAE}}
+ \expandafter\def\csname simpleicon@anydeskicon\endcsname {\simpleiconsmap\symbol{"EAAF}}
+ \expandafter\def\csname simpleicon@anytypeicon\endcsname {\simpleiconsmap\symbol{"EAB0}}
+ \expandafter\def\csname simpleicon@aolicon\endcsname {\simpleiconsmap\symbol{"EAB1}}
+ \expandafter\def\csname simpleicon@apacheicon\endcsname {\simpleiconsmap\symbol{"EAB2}}
+ \expandafter\def\csname simpleicon@apacheairflowicon\endcsname {\simpleiconsmap\symbol{"EAB3}}
+ \expandafter\def\csname simpleicon@apacheanticon\endcsname {\simpleiconsmap\symbol{"EAB4}}
+ \expandafter\def\csname simpleicon@apachecassandraicon\endcsname {\simpleiconsmap\symbol{"EAB5}}
+ \expandafter\def\csname simpleicon@apachecloudstackicon\endcsname {\simpleiconsmap\symbol{"EAB6}}
+ \expandafter\def\csname simpleicon@apachecordovaicon\endcsname {\simpleiconsmap\symbol{"EAB7}}
+ \expandafter\def\csname simpleicon@apachecouchdbicon\endcsname {\simpleiconsmap\symbol{"EAB8}}
+ \expandafter\def\csname simpleicon@apachedolphinschedulericon\endcsname {\simpleiconsmap\symbol{"EAB9}}
+ \expandafter\def\csname simpleicon@apachedruidicon\endcsname {\simpleiconsmap\symbol{"EABA}}
+ \expandafter\def\csname simpleicon@apacheechartsicon\endcsname {\simpleiconsmap\symbol{"EABB}}
+ \expandafter\def\csname simpleicon@apacheflinkicon\endcsname {\simpleiconsmap\symbol{"EABC}}
+ \expandafter\def\csname simpleicon@apachefreemarkericon\endcsname {\simpleiconsmap\symbol{"EABD}}
+ \expandafter\def\csname simpleicon@apachegroovyicon\endcsname {\simpleiconsmap\symbol{"EABE}}
+ \expandafter\def\csname simpleicon@apacheguacamoleicon\endcsname {\simpleiconsmap\symbol{"EABF}}
+ \expandafter\def\csname simpleicon@apachehadoopicon\endcsname {\simpleiconsmap\symbol{"EAC0}}
+ \expandafter\def\csname simpleicon@apachehbaseicon\endcsname {\simpleiconsmap\symbol{"EAC1}}
+ \expandafter\def\csname simpleicon@apachehiveicon\endcsname {\simpleiconsmap\symbol{"EAC2}}
+ \expandafter\def\csname simpleicon@apachejmetericon\endcsname {\simpleiconsmap\symbol{"EAC3}}
+ \expandafter\def\csname simpleicon@apachekafkaicon\endcsname {\simpleiconsmap\symbol{"EAC4}}
+ \expandafter\def\csname simpleicon@apachekylinicon\endcsname {\simpleiconsmap\symbol{"EAC5}}
+ \expandafter\def\csname simpleicon@apachemavenicon\endcsname {\simpleiconsmap\symbol{"EAC6}}
+ \expandafter\def\csname simpleicon@apachenetbeansideicon\endcsname {\simpleiconsmap\symbol{"EAC7}}
+ \expandafter\def\csname simpleicon@apachenifiicon\endcsname {\simpleiconsmap\symbol{"EAC8}}
+ \expandafter\def\csname simpleicon@apacheopenofficeicon\endcsname {\simpleiconsmap\symbol{"EAC9}}
+ \expandafter\def\csname simpleicon@apacheparqueticon\endcsname {\simpleiconsmap\symbol{"EACA}}
+ \expandafter\def\csname simpleicon@apachepulsaricon\endcsname {\simpleiconsmap\symbol{"EACB}}
+ \expandafter\def\csname simpleicon@apacherocketmqicon\endcsname {\simpleiconsmap\symbol{"EACC}}
+ \expandafter\def\csname simpleicon@apachesolricon\endcsname {\simpleiconsmap\symbol{"EACD}}
+ \expandafter\def\csname simpleicon@apachesparkicon\endcsname {\simpleiconsmap\symbol{"EACE}}
+ \expandafter\def\csname simpleicon@apachestormicon\endcsname {\simpleiconsmap\symbol{"EACF}}
+ \expandafter\def\csname simpleicon@apachesuperseticon\endcsname {\simpleiconsmap\symbol{"EAD0}}
+ \expandafter\def\csname simpleicon@apachetomcaticon\endcsname {\simpleiconsmap\symbol{"EAD1}}
+ \expandafter\def\csname simpleicon@aparaticon\endcsname {\simpleiconsmap\symbol{"EAD2}}
+ \expandafter\def\csname simpleicon@apifoxicon\endcsname {\simpleiconsmap\symbol{"EAD3}}
+ \expandafter\def\csname simpleicon@apmterminalsicon\endcsname {\simpleiconsmap\symbol{"EAD4}}
+ \expandafter\def\csname simpleicon@apollographqlicon\endcsname {\simpleiconsmap\symbol{"EAD5}}
+ \expandafter\def\csname simpleicon@apostropheicon\endcsname {\simpleiconsmap\symbol{"EAD6}}
+ \expandafter\def\csname simpleicon@appianicon\endcsname {\simpleiconsmap\symbol{"EAD7}}
+ \expandafter\def\csname simpleicon@appiumicon\endcsname {\simpleiconsmap\symbol{"EAD8}}
+ \expandafter\def\csname simpleicon@appleicon\endcsname {\simpleiconsmap\symbol{"EAD9}}
+ \expandafter\def\csname simpleicon@applearcadeicon\endcsname {\simpleiconsmap\symbol{"EADA}}
+ \expandafter\def\csname simpleicon@applemusicicon\endcsname {\simpleiconsmap\symbol{"EADB}}
+ \expandafter\def\csname simpleicon@applenewsicon\endcsname {\simpleiconsmap\symbol{"EADC}}
+ \expandafter\def\csname simpleicon@applepayicon\endcsname {\simpleiconsmap\symbol{"EADD}}
+ \expandafter\def\csname simpleicon@applepodcastsicon\endcsname {\simpleiconsmap\symbol{"EADE}}
+ \expandafter\def\csname simpleicon@appletvicon\endcsname {\simpleiconsmap\symbol{"EADF}}
+ \expandafter\def\csname simpleicon@appsignalicon\endcsname {\simpleiconsmap\symbol{"EAE0}}
+ \expandafter\def\csname simpleicon@appsmithicon\endcsname {\simpleiconsmap\symbol{"EAE1}}
+ \expandafter\def\csname simpleicon@appstoreicon\endcsname {\simpleiconsmap\symbol{"EAE2}}
+ \expandafter\def\csname simpleicon@appveyoricon\endcsname {\simpleiconsmap\symbol{"EAE3}}
+ \expandafter\def\csname simpleicon@appwriteicon\endcsname {\simpleiconsmap\symbol{"EAE4}}
+ \expandafter\def\csname simpleicon@aquaicon\endcsname {\simpleiconsmap\symbol{"EAE5}}
+ \expandafter\def\csname simpleicon@aralicon\endcsname {\simpleiconsmap\symbol{"EAE6}}
+ \expandafter\def\csname simpleicon@arangodbicon\endcsname {\simpleiconsmap\symbol{"EAE7}}
+ \expandafter\def\csname simpleicon@arcicon\endcsname {\simpleiconsmap\symbol{"EAE8}}
+ \expandafter\def\csname simpleicon@arcgisicon\endcsname {\simpleiconsmap\symbol{"EAE9}}
+ \expandafter\def\csname simpleicon@archicadicon\endcsname {\simpleiconsmap\symbol{"EAEA}}
+ \expandafter\def\csname simpleicon@archiveofourownicon\endcsname {\simpleiconsmap\symbol{"EAEB}}
+ \expandafter\def\csname simpleicon@archlinuxicon\endcsname {\simpleiconsmap\symbol{"EAEC}}
+ \expandafter\def\csname simpleicon@ardouricon\endcsname {\simpleiconsmap\symbol{"EAED}}
+ \expandafter\def\csname simpleicon@arduinoicon\endcsname {\simpleiconsmap\symbol{"EAEE}}
+ \expandafter\def\csname simpleicon@argoicon\endcsname {\simpleiconsmap\symbol{"EAEF}}
+ \expandafter\def\csname simpleicon@argosicon\endcsname {\simpleiconsmap\symbol{"EAF0}}
+ \expandafter\def\csname simpleicon@ariakiticon\endcsname {\simpleiconsmap\symbol{"EAF1}}
+ \expandafter\def\csname simpleicon@arkecosystemicon\endcsname {\simpleiconsmap\symbol{"EAF2}}
+ \expandafter\def\csname simpleicon@arloicon\endcsname {\simpleiconsmap\symbol{"EAF3}}
+ \expandafter\def\csname simpleicon@armicon\endcsname {\simpleiconsmap\symbol{"EAF4}}
+ \expandafter\def\csname simpleicon@armkeilicon\endcsname {\simpleiconsmap\symbol{"EAF5}}
+ \expandafter\def\csname simpleicon@arstechnicaicon\endcsname {\simpleiconsmap\symbol{"EAF6}}
+ \expandafter\def\csname simpleicon@artifacthubicon\endcsname {\simpleiconsmap\symbol{"EAF7}}
+ \expandafter\def\csname simpleicon@artixlinuxicon\endcsname {\simpleiconsmap\symbol{"EAF8}}
+ \expandafter\def\csname simpleicon@artstationicon\endcsname {\simpleiconsmap\symbol{"EAF9}}
+ \expandafter\def\csname simpleicon@arxivicon\endcsname {\simpleiconsmap\symbol{"EAFA}}
+ \expandafter\def\csname simpleicon@asahilinuxicon\endcsname {\simpleiconsmap\symbol{"EAFB}}
+ \expandafter\def\csname simpleicon@asanaicon\endcsname {\simpleiconsmap\symbol{"EAFC}}
+ \expandafter\def\csname simpleicon@asciidoctoricon\endcsname {\simpleiconsmap\symbol{"EAFD}}
+ \expandafter\def\csname simpleicon@asciinemaicon\endcsname {\simpleiconsmap\symbol{"EAFE}}
+ \expandafter\def\csname simpleicon@asdaicon\endcsname {\simpleiconsmap\symbol{"EAFF}}
+ \expandafter\def\csname simpleicon@asepriteicon\endcsname {\simpleiconsmap\symbol{"EB00}}
+ \expandafter\def\csname simpleicon@askfmicon\endcsname {\simpleiconsmap\symbol{"EB01}}
+ \expandafter\def\csname simpleicon@assemblyscripticon\endcsname {\simpleiconsmap\symbol{"EB02}}
+ \expandafter\def\csname simpleicon@asteriskicon\endcsname {\simpleiconsmap\symbol{"EB03}}
+ \expandafter\def\csname simpleicon@astonmartinicon\endcsname {\simpleiconsmap\symbol{"EB04}}
+ \expandafter\def\csname simpleicon@astraicon\endcsname {\simpleiconsmap\symbol{"EB05}}
+ \expandafter\def\csname simpleicon@astralicon\endcsname {\simpleiconsmap\symbol{"EB06}}
+ \expandafter\def\csname simpleicon@astroicon\endcsname {\simpleiconsmap\symbol{"EB07}}
+ \expandafter\def\csname simpleicon@asusicon\endcsname {\simpleiconsmap\symbol{"EB08}}
+ \expandafter\def\csname simpleicon@atandticon\endcsname {\simpleiconsmap\symbol{"EB09}}
+ \expandafter\def\csname simpleicon@atariicon\endcsname {\simpleiconsmap\symbol{"EB0A}}
+ \expandafter\def\csname simpleicon@atlassianicon\endcsname {\simpleiconsmap\symbol{"EB0B}}
+ \expandafter\def\csname simpleicon@auchanicon\endcsname {\simpleiconsmap\symbol{"EB0C}}
+ \expandafter\def\csname simpleicon@audacityicon\endcsname {\simpleiconsmap\symbol{"EB0D}}
+ \expandafter\def\csname simpleicon@audiicon\endcsname {\simpleiconsmap\symbol{"EB0E}}
+ \expandafter\def\csname simpleicon@audibleicon\endcsname {\simpleiconsmap\symbol{"EB0F}}
+ \expandafter\def\csname simpleicon@audiobookshelficon\endcsname {\simpleiconsmap\symbol{"EB10}}
+ \expandafter\def\csname simpleicon@audioboomicon\endcsname {\simpleiconsmap\symbol{"EB11}}
+ \expandafter\def\csname simpleicon@audiomackicon\endcsname {\simpleiconsmap\symbol{"EB12}}
+ \expandafter\def\csname simpleicon@audiotechnicaicon\endcsname {\simpleiconsmap\symbol{"EB13}}
+ \expandafter\def\csname simpleicon@aureliaicon\endcsname {\simpleiconsmap\symbol{"EB14}}
+ \expandafter\def\csname simpleicon@auth0icon\endcsname {\simpleiconsmap\symbol{"EB15}}
+ \expandafter\def\csname simpleicon@autheliaicon\endcsname {\simpleiconsmap\symbol{"EB16}}
+ \expandafter\def\csname simpleicon@authentikicon\endcsname {\simpleiconsmap\symbol{"EB17}}
+ \expandafter\def\csname simpleicon@authyicon\endcsname {\simpleiconsmap\symbol{"EB18}}
+ \expandafter\def\csname simpleicon@autocadicon\endcsname {\simpleiconsmap\symbol{"EB19}}
+ \expandafter\def\csname simpleicon@autocannonicon\endcsname {\simpleiconsmap\symbol{"EB1A}}
+ \expandafter\def\csname simpleicon@autodeskicon\endcsname {\simpleiconsmap\symbol{"EB1B}}
+ \expandafter\def\csname simpleicon@autodeskmayaicon\endcsname {\simpleiconsmap\symbol{"EB1C}}
+ \expandafter\def\csname simpleicon@autodeskreviticon\endcsname {\simpleiconsmap\symbol{"EB1D}}
+ \expandafter\def\csname simpleicon@autohotkeyicon\endcsname {\simpleiconsmap\symbol{"EB1E}}
+ \expandafter\def\csname simpleicon@autoiticon\endcsname {\simpleiconsmap\symbol{"EB1F}}
+ \expandafter\def\csname simpleicon@automatticicon\endcsname {\simpleiconsmap\symbol{"EB20}}
+ \expandafter\def\csname simpleicon@autoprefixericon\endcsname {\simpleiconsmap\symbol{"EB21}}
+ \expandafter\def\csname simpleicon@autozoneicon\endcsname {\simpleiconsmap\symbol{"EB22}}
+ \expandafter\def\csname simpleicon@avajsicon\endcsname {\simpleiconsmap\symbol{"EB23}}
+ \expandafter\def\csname simpleicon@avasticon\endcsname {\simpleiconsmap\symbol{"EB24}}
+ \expandafter\def\csname simpleicon@aviancaicon\endcsname {\simpleiconsmap\symbol{"EB25}}
+ \expandafter\def\csname simpleicon@aviraicon\endcsname {\simpleiconsmap\symbol{"EB26}}
+ \expandafter\def\csname simpleicon@awesomelistsicon\endcsname {\simpleiconsmap\symbol{"EB27}}
+ \expandafter\def\csname simpleicon@awesomewmicon\endcsname {\simpleiconsmap\symbol{"EB28}}
+ \expandafter\def\csname simpleicon@awsamplifyicon\endcsname {\simpleiconsmap\symbol{"EB29}}
+ \expandafter\def\csname simpleicon@awselasticloadbalancingicon\endcsname {\simpleiconsmap\symbol{"EB2A}}
+ \expandafter\def\csname simpleicon@awsfargateicon\endcsname {\simpleiconsmap\symbol{"EB2B}}
+ \expandafter\def\csname simpleicon@awslambdaicon\endcsname {\simpleiconsmap\symbol{"EB2C}}
+ \expandafter\def\csname simpleicon@awsorganizationsicon\endcsname {\simpleiconsmap\symbol{"EB2D}}
+ \expandafter\def\csname simpleicon@awssecretsmanagericon\endcsname {\simpleiconsmap\symbol{"EB2E}}
+ \expandafter\def\csname simpleicon@awwwardsicon\endcsname {\simpleiconsmap\symbol{"EB2F}}
+ \expandafter\def\csname simpleicon@axiosicon\endcsname {\simpleiconsmap\symbol{"EB30}}
+ \expandafter\def\csname simpleicon@babelicon\endcsname {\simpleiconsmap\symbol{"EB31}}
+ \expandafter\def\csname simpleicon@babelioicon\endcsname {\simpleiconsmap\symbol{"EB32}}
+ \expandafter\def\csname simpleicon@babylondotjsicon\endcsname {\simpleiconsmap\symbol{"EB33}}
+ \expandafter\def\csname simpleicon@backblazeicon\endcsname {\simpleiconsmap\symbol{"EB34}}
+ \expandafter\def\csname simpleicon@backbonedotjsicon\endcsname {\simpleiconsmap\symbol{"EB35}}
+ \expandafter\def\csname simpleicon@backendlessicon\endcsname {\simpleiconsmap\symbol{"EB36}}
+ \expandafter\def\csname simpleicon@backstageicon\endcsname {\simpleiconsmap\symbol{"EB37}}
+ \expandafter\def\csname simpleicon@badooicon\endcsname {\simpleiconsmap\symbol{"EB38}}
+ \expandafter\def\csname simpleicon@baiduicon\endcsname {\simpleiconsmap\symbol{"EB39}}
+ \expandafter\def\csname simpleicon@bakalariicon\endcsname {\simpleiconsmap\symbol{"EB3A}}
+ \expandafter\def\csname simpleicon@bambooicon\endcsname {\simpleiconsmap\symbol{"EB3B}}
+ \expandafter\def\csname simpleicon@bambulabicon\endcsname {\simpleiconsmap\symbol{"EB3C}}
+ \expandafter\def\csname simpleicon@bandcampicon\endcsname {\simpleiconsmap\symbol{"EB3D}}
+ \expandafter\def\csname simpleicon@bandlabicon\endcsname {\simpleiconsmap\symbol{"EB3E}}
+ \expandafter\def\csname simpleicon@bandrautomationicon\endcsname {\simpleiconsmap\symbol{"EB3F}}
+ \expandafter\def\csname simpleicon@bandsintownicon\endcsname {\simpleiconsmap\symbol{"EB40}}
+ \expandafter\def\csname simpleicon@bankofamericaicon\endcsname {\simpleiconsmap\symbol{"EB41}}
+ \expandafter\def\csname simpleicon@barclaysicon\endcsname {\simpleiconsmap\symbol{"EB42}}
+ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmap\symbol{"EB43}}
+ \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmap\symbol{"EB44}}
+ \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmap\symbol{"EB45}}
+ \expandafter\def\csname simpleicon@baserowicon\endcsname {\simpleiconsmap\symbol{"EB46}}
+ \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB47}}
+ \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB48}}
+ \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB49}}
+ \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB4A}}
+ \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB4B}}
+ \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB4C}}
+ \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB4D}}
+ \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4E}}
+ \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB4F}}
+ \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB50}}
+ \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB51}}
+ \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB52}}
+ \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB53}}
+ \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB54}}
+ \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB55}}
+ \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB56}}
+ \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB57}}
+ \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB58}}
+ \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB59}}
+ \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB5A}}
+ \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB5B}}
+ \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB5C}}
+ \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB5D}}
+ \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5E}}
+ \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB5F}}
+ \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB60}}
+ \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB61}}
+ \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB62}}
+ \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB63}}
+ \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB64}}
+ \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB65}}
+ \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB66}}
+ \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB67}}
+ \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB68}}
+ \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB69}}
+ \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB6A}}
+ \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB6B}}
+ \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB6C}}
+ \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB6D}}
+ \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6E}}
+ \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB6F}}
+ \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB70}}
+ \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB71}}
+ \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB72}}
+ \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB73}}
+ \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB74}}
+ \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB75}}
+ \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB76}}
+ \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB77}}
+ \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB78}}
+ \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB79}}
+ \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB7A}}
+ \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB7B}}
+ \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB7C}}
+ \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB7D}}
+ \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7E}}
+ \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB7F}}
+ \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB80}}
+ \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB81}}
+ \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB82}}
+ \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB83}}
+ \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB84}}
+ \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB85}}
+ \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB86}}
+ \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB87}}
+ \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB88}}
+ \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB89}}
+ \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB8A}}
+ \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB8B}}
+ \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB8C}}
+ \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB8D}}
+ \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8E}}
+ \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB8F}}
+ \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB90}}
+ \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB91}}
+ \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB92}}
+ \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB93}}
+ \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB94}}
+ \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB95}}
+ \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB96}}
+ \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB97}}
+ \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB98}}
+ \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB99}}
+ \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB9A}}
+ \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB9B}}
+ \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB9C}}
+ \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB9D}}
+ \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9E}}
+ \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EB9F}}
+ \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EBA0}}
+ \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EBA1}}
+ \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EBA2}}
+ \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EBA3}}
+ \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA4}}
+ \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA5}}
+ \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA6}}
+ \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA7}}
+ \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA8}}
+ \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBA9}}
+ \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBAA}}
+ \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBAB}}
+ \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBAC}}
+ \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBAD}}
+ \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAE}}
+ \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBAF}}
+ \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBB0}}
+ \expandafter\def\csname simpleicon@builtbybiticon\endcsname {\simpleiconsmap\symbol{"EBB1}}
+ \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBB2}}
+ \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBB3}}
+ \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBB4}}
+ \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB5}}
+ \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB6}}
+ \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB7}}
+ \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB8}}
+ \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB9}}
+ \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBBA}}
+ \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBBB}}
+ \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBBC}}
+ \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBBD}}
+ \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBBE}}
+ \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBF}}
+ \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBC0}}
+ \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBC1}}
+ \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBC2}}
+ \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBC3}}
+ \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBC4}}
+ \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC5}}
+ \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC6}}
+ \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC7}}
+ \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC8}}
+ \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC9}}
+ \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBCA}}
+ \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBCB}}
+ \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBCC}}
+ \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBCD}}
+ \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBCE}}
+ \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCF}}
+ \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBD0}}
+ \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBD1}}
+ \expandafter\def\csname simpleicon@caprovericon\endcsname {\simpleiconsmap\symbol{"EBD2}}
+ \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBD3}}
+ \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBD4}}
+ \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBD5}}
+ \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD6}}
+ \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD7}}
+ \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD8}}
+ \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD9}}
+ \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBDA}}
+ \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBDB}}
+ \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBDC}}
+ \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBDD}}
+ \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBDE}}
+ \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBDF}}
+ \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBE0}}
+ \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBE1}}
+ \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBE2}}
+ \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBE3}}
+ \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBE4}}
+ \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBE5}}
+ \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE6}}
+ \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE7}}
+ \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE8}}
+ \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE9}}
+ \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBEA}}
+ \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBEB}}
+ \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBEC}}
+ \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBED}}
+ \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBEE}}
+ \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBEF}}
+ \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBF0}}
+ \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBF1}}
+ \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBF2}}
+ \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBF3}}
+ \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBF4}}
+ \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBF5}}
+ \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF6}}
+ \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF7}}
+ \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF8}}
+ \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF9}}
+ \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBFA}}
+ \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBFB}}
+ \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBFC}}
+ \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBFD}}
+ \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBFE}}
+ \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBFF}}
+ \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EC00}}
+ \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmap\symbol{"EC01}}
+ \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EC02}}
+ \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EC03}}
+ \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EC04}}
+ \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EC05}}
+ \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC06}}
+ \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC07}}
+ \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC08}}
+ \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC09}}
+ \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC0A}}
+ \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC0B}}
+ \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC0C}}
+ \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC0D}}
+ \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC0E}}
+ \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC0F}}
+ \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC10}}
+ \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC11}}
+ \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC12}}
+ \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC13}}
+ \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC14}}
+ \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC15}}
+ \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC16}}
+ \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC17}}
+ \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC18}}
+ \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC19}}
+ \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC1A}}
+ \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC1B}}
+ \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC1C}}
+ \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC1D}}
+ \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC1E}}
+ \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC1F}}
+ \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC20}}
+ \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC21}}
+ \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC22}}
+ \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC23}}
+ \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC24}}
+ \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC25}}
+ \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC26}}
+ \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC27}}
+ \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC28}}
+ \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC29}}
+ \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC2A}}
+ \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC2B}}
+ \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC2C}}
+ \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC2D}}
+ \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC2E}}
+ \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC2F}}
+ \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC30}}
+ \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC31}}
+ \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC32}}
+ \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC33}}
+ \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC34}}
+ \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC35}}
+ \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC36}}
+ \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC37}}
+ \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC38}}
+ \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC39}}
+ \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC3A}}
+ \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC3B}}
+ \expandafter\def\csname simpleicon@codecraftersicon\endcsname {\simpleiconsmap\symbol{"EC3C}}
+ \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC3D}}
+ \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC3E}}
+ \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC3F}}
+ \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC40}}
+ \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC41}}
+ \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC42}}
+ \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC43}}
+ \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC44}}
+ \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC45}}
+ \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC46}}
+ \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC47}}
+ \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC48}}
+ \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC49}}
+ \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC4A}}
+ \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC4B}}
+ \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC4C}}
+ \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC4D}}
+ \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC4E}}
+ \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC4F}}
+ \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC50}}
+ \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC51}}
+ \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC52}}
+ \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC53}}
+ \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC54}}
+ \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC55}}
+ \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC56}}
+ \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC57}}
+ \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC58}}
+ \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC59}}
+ \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC5A}}
+ \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC5B}}
+ \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC5C}}
+ \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC5D}}
+ \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC5E}}
+ \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC5F}}
+ \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC60}}
+ \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC61}}
+ \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC62}}
+ \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC63}}
+ \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC64}}
+ \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC65}}
+ \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC66}}
+ \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC67}}
+ \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC68}}
+ \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC69}}
+ \expandafter\def\csname simpleicon@contaboicon\endcsname {\simpleiconsmap\symbol{"EC6A}}
+ \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC6B}}
+ \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC6C}}
+ \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC6D}}
+ \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC6E}}
+ \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC6F}}
+ \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC70}}
+ \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC71}}
+ \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC72}}
+ \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC73}}
+ \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC74}}
+ \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC75}}
+ \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC76}}
+ \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC77}}
+ \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC78}}
+ \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC79}}
+ \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC7A}}
+ \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC7B}}
+ \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC7C}}
+ \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC7D}}
+ \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC7E}}
+ \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC7F}}
+ \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC80}}
+ \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC81}}
+ \expandafter\def\csname simpleicon@cozeicon\endcsname {\simpleiconsmap\symbol{"EC82}}
+ \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC83}}
+ \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC84}}
+ \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC85}}
+ \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC86}}
+ \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC87}}
+ \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC88}}
+ \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC89}}
+ \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC8A}}
+ \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC8B}}
+ \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC8C}}
+ \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC8D}}
+ \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC8E}}
+ \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC8F}}
+ \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC90}}
+ \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC91}}
+ \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC92}}
+ \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC93}}
+ \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC94}}
+ \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC95}}
+ \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC96}}
+ \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC97}}
+ \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC98}}
+ \expandafter\def\csname simpleicon@csdnicon\endcsname {\simpleiconsmap\symbol{"EC99}}
+ \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC9A}}
+ \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC9B}}
+ \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC9C}}
+ \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC9D}}
+ \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC9E}}
+ \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC9F}}
+ \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"ECA0}}
+ \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"ECA1}}
+ \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"ECA2}}
+ \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"ECA3}}
+ \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"ECA4}}
+ \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"ECA5}}
+ \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"ECA6}}
+ \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"ECA7}}
+ \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"ECA8}}
+ \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"ECA9}}
+ \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECAA}}
+ \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECAB}}
+ \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECAC}}
+ \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECAD}}
+ \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECAE}}
+ \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECAF}}
+ \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECB0}}
+ \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECB1}}
+ \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECB2}}
+ \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECB3}}
+ \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECB4}}
+ \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECB5}}
+ \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECB6}}
+ \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECB7}}
+ \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECB8}}
+ \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECB9}}
+ \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECBA}}
+ \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECBB}}
+ \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECBC}}
+ \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECBD}}
+ \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECBE}}
+ \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECBF}}
+ \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECC0}}
+ \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECC1}}
+ \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECC2}}
+ \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECC3}}
+ \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECC4}}
+ \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECC5}}
+ \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECC6}}
+ \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECC7}}
+ \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECC8}}
+ \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECC9}}
+ \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECCA}}
+ \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECCB}}
+ \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECCC}}
+ \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECCD}}
+ \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECCE}}
+ \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECCF}}
+ \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECD0}}
+ \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECD1}}
+ \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECD2}}
+ \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECD3}}
+ \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECD4}}
+ \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECD5}}
+ \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECD6}}
+ \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECD7}}
+ \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECD8}}
+ \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECD9}}
+ \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECDA}}
+ \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECDB}}
+ \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECDC}}
+ \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECDD}}
+ \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECDE}}
+ \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECDF}}
+ \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECE0}}
+ \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECE1}}
+ \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECE2}}
+ \expandafter\def\csname simpleicon@deutschewelleicon\endcsname {\simpleiconsmap\symbol{"ECE3}}
+ \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECE4}}
+ \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECE5}}
+ \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECE6}}
+ \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECE7}}
+ \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECE8}}
+ \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECE9}}
+ \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECEA}}
+ \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECEB}}
+ \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECEC}}
+ \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECED}}
+ \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECEE}}
+ \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECEF}}
+ \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECF0}}
+ \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECF1}}
+ \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECF2}}
+ \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECF3}}
+ \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECF4}}
+ \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECF5}}
+ \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECF6}}
+ \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECF7}}
+ \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECF8}}
+ \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECF9}}
+ \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECFA}}
+ \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECFB}}
+ \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECFC}}
+ \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECFD}}
+ \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECFE}}
+ \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECFF}}
+ \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ED00}}
+ \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ED01}}
+ \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ED02}}
+ \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ED03}}
+ \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ED04}}
+ \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ED05}}
+ \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ED06}}
+ \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ED07}}
+ \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ED08}}
+ \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ED09}}
+ \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ED0A}}
+ \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED0B}}
+ \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED0C}}
+ \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED0D}}
+ \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED0E}}
+ \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED0F}}
+ \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED10}}
+ \expandafter\def\csname simpleicon@downdetectoricon\endcsname {\simpleiconsmap\symbol{"ED11}}
+ \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED12}}
+ \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED13}}
+ \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED14}}
+ \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED15}}
+ \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED16}}
+ \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED17}}
+ \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED18}}
+ \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED19}}
+ \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED1A}}
+ \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED1B}}
+ \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED1C}}
+ \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED1D}}
+ \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED1E}}
+ \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED1F}}
+ \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED20}}
+ \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED21}}
+ \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED22}}
+ \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED23}}
+ \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED24}}
+ \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED25}}
+ \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED26}}
+ \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED27}}
+ \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED28}}
+ \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED29}}
+ \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED2A}}
+ \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED2B}}
+ \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED2C}}
+ \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED2D}}
+ \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED2E}}
+ \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED2F}}
+ \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED30}}
+ \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED31}}
+ \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED32}}
+ \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED33}}
+ \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED34}}
+ \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED35}}
+ \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED36}}
+ \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED37}}
+ \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED38}}
+ \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED39}}
+ \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED3A}}
+ \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED3B}}
+ \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED3C}}
+ \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED3D}}
+ \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED3E}}
+ \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED3F}}
+ \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED40}}
+ \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED41}}
+ \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED42}}
+ \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED43}}
+ \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED44}}
+ \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED45}}
+ \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED46}}
+ \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED47}}
+ \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED48}}
+ \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED49}}
+ \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED4A}}
+ \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED4B}}
+ \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED4C}}
+ \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED4D}}
+ \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED4E}}
+ \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED4F}}
+ \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED50}}
+ \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED51}}
+ \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED52}}
+ \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED53}}
+ \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED54}}
+ \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED55}}
+ \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED56}}
+ \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED57}}
+ \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED58}}
+ \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED59}}
+ \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED5A}}
+ \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED5B}}
+ \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED5C}}
+ \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED5D}}
+ \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED5E}}
+ \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED5F}}
+ \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED60}}
+ \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED61}}
+ \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED62}}
+ \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED63}}
+ \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED64}}
+ \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED65}}
+ \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED66}}
+ \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED67}}
+ \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED68}}
+ \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED69}}
+ \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED6A}}
+ \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED6B}}
+ \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED6C}}
+ \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED6D}}
+ \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED6E}}
+ \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED6F}}
+ \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED70}}
+ \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED71}}
+ \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED72}}
+ \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED73}}
+ \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED74}}
+ \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED75}}
+ \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED76}}
+ \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED77}}
+ \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED78}}
+ \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED79}}
+ \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED7A}}
+ \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED7B}}
+ \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED7C}}
+ \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED7D}}
+ \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED7E}}
+ \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED7F}}
+ \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED80}}
+ \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED81}}
+ \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED82}}
+ \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED83}}
+ \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED84}}
+ \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED85}}
+ \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED86}}
+ \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED87}}
+ \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED88}}
+ \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED89}}
+ \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED8A}}
+ \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED8B}}
+ \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED8C}}
+ \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED8D}}
+ \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED8E}}
+ \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED8F}}
+ \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED90}}
+ \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED91}}
+ \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED92}}
+ \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED93}}
+ \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED94}}
+ \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED95}}
+ \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED96}}
+ \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED97}}
+ \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED98}}
+ \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED99}}
+ \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED9A}}
+ \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED9B}}
+ \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED9C}}
+ \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED9D}}
+ \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED9E}}
+ \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED9F}}
+ \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"EDA0}}
+ \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"EDA1}}
+ \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"EDA2}}
+ \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"EDA3}}
+ \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"EDA4}}
+ \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"EDA5}}
+ \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"EDA6}}
+ \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"EDA7}}
+ \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"EDA8}}
+ \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"EDA9}}
+ \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"EDAA}}
+ \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"EDAB}}
+ \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDAC}}
+ \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDAD}}
+ \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDAE}}
+ \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDAF}}
+ \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDB0}}
+ \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDB1}}
+ \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDB2}}
+ \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDB3}}
+ \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDB4}}
+ \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDB5}}
+ \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDB6}}
+ \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDB7}}
+ \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDB8}}
+ \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDB9}}
+ \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDBA}}
+ \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDBB}}
+ \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDBC}}
+ \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDBD}}
+ \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDBE}}
+ \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDBF}}
+ \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDC0}}
+ \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDC1}}
+ \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDC2}}
+ \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDC3}}
+ \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDC4}}
+ \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDC5}}
+ \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDC6}}
+ \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDC7}}
+ \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDC8}}
+ \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDC9}}
+ \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDCA}}
+ \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDCB}}
+ \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDCC}}
+ \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDCD}}
+ \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDCE}}
+ \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDCF}}
+ \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDD0}}
+ \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDD1}}
+ \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDD2}}
+ \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDD3}}
+ \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDD4}}
+ \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDD5}}
+ \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDD6}}
+ \expandafter\def\csname simpleicon@flydotioicon\endcsname {\simpleiconsmap\symbol{"EDD7}}
+ \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDD8}}
+ \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDD9}}
+ \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDDA}}
+ \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDDB}}
+ \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDDC}}
+ \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDDD}}
+ \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDDE}}
+ \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDDF}}
+ \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDE0}}
+ \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDE1}}
+ \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDE2}}
+ \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDE3}}
+ \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDE4}}
+ \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDE5}}
+ \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDE6}}
+ \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDE7}}
+ \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDE8}}
+ \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDE9}}
+ \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDEA}}
+ \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDEB}}
+ \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDEC}}
+ \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDED}}
+ \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDEE}}
+ \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDEF}}
+ \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDF0}}
+ \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDF1}}
+ \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDF2}}
+ \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDF3}}
+ \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDF4}}
+ \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDF5}}
+ \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDF6}}
+ \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDF7}}
+ \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDF8}}
+ \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDF9}}
+ \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDFA}}
+ \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDFB}}
+ \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDFC}}
+ \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDFD}}
+ \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDFE}}
+ \expandafter\def\csname simpleicon@freshicon\endcsname {\simpleiconsmap\symbol{"EDFF}}
+ \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EE00}}
+ \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EE01}}
+ \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EE02}}
+ \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EE03}}
+ \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EE04}}
+ \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EE05}}
+ \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EE06}}
+ \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EE07}}
+ \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EE08}}
+ \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EE09}}
+ \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EE0A}}
+ \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EE0B}}
+ \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EE0C}}
+ \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EE0D}}
+ \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE0E}}
+ \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE0F}}
+ \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE10}}
+ \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE11}}
+ \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE12}}
+ \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE13}}
+ \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE14}}
+ \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE15}}
+ \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE16}}
+ \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE17}}
+ \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE18}}
+ \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE19}}
+ \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE1A}}
+ \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE1B}}
+ \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE1C}}
+ \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE1D}}
+ \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE1E}}
+ \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE1F}}
+ \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE20}}
+ \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE21}}
+ \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE22}}
+ \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE23}}
+ \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE24}}
+ \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE25}}
+ \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE26}}
+ \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE27}}
+ \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE28}}
+ \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE29}}
+ \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE2A}}
+ \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE2B}}
+ \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE2C}}
+ \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE2D}}
+ \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE2E}}
+ \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE2F}}
+ \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE30}}
+ \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE31}}
+ \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE32}}
+ \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE33}}
+ \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE34}}
+ \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE35}}
+ \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE36}}
+ \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE37}}
+ \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE38}}
+ \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE39}}
+ \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE3A}}
+ \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE3B}}
+ \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE3C}}
+ \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE3D}}
+ \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE3E}}
+ \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE3F}}
+ \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE40}}
+ \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE41}}
+ \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE42}}
+ \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE43}}
+ \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmap\symbol{"EE44}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE45}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE46}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE47}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE48}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE49}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE4A}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE4B}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE4C}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE4D}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE4E}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE4F}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE50}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE51}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE52}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE53}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE54}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE55}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE56}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE57}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE58}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE59}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE5A}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE5B}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE5C}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE5D}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE5E}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE5F}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE60}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE61}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE62}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE63}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE64}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE65}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE66}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE67}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE68}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE69}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE6A}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE6B}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE6C}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE6D}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE6E}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE6F}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE70}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE71}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE72}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE73}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE74}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE75}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE76}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE77}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE78}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE79}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE7A}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE7B}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE7C}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE7D}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE7E}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE7F}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE80}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE81}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE82}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE83}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE84}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE85}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE86}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE87}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE88}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE89}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE8A}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE8B}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE8C}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE8D}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE8E}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE8F}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE90}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE91}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE92}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE93}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE94}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE95}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE96}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE97}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE98}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE99}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE9A}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE9B}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE9C}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE9D}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE9E}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE9F}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EEA0}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EEA1}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EEA2}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EEA3}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EEA4}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EEA5}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EEA6}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EEA7}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EEA8}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EEA9}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EEAA}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EEAB}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EEAC}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EEAD}}
+ \expandafter\def\csname simpleicon@guitarproicon\endcsname {\simpleiconsmap\symbol{"EEAE}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EEAF}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEB0}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEB1}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEB2}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEB3}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEB4}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEB5}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEB6}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEB7}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEB8}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEB9}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEBA}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEBB}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEBC}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEBD}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEBE}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEBF}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEC0}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEC1}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEC2}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEC3}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEC4}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEC5}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEC6}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEC7}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEC8}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEC9}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EECA}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EECB}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EECC}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EECD}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EECE}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EECF}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EED0}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EED1}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EED2}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EED3}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EED4}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EED5}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EED6}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EED7}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EED8}}
+ \expandafter\def\csname simpleicon@helixicon\endcsname {\simpleiconsmap\symbol{"EED9}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EEDA}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EEDB}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EEDC}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EEDD}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EEDE}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EEDF}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EEE0}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EEE1}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EEE2}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EEE3}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EEE4}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EEE5}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EEE6}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EEE7}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EEE8}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EEE9}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EEEA}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEEB}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEEC}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEED}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEEE}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEEF}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEF0}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEF1}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEF2}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEF3}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEF4}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEF5}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEF6}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEF7}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEF8}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEF9}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEFA}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEFB}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEFC}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEFD}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEFE}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEFF}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EF00}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EF01}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EF02}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EF03}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EF04}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EF05}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EF06}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EF07}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EF08}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EF09}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EF0A}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EF0B}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EF0C}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EF0D}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EF0E}}
+ \expandafter\def\csname simpleicon@humhubicon\endcsname {\simpleiconsmap\symbol{"EF0F}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EF10}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EF11}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF12}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF13}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF14}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF15}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF16}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF17}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF18}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF19}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF1A}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF1B}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF1C}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF1D}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF1E}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF1F}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF20}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF21}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF22}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF23}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF24}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF25}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF26}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF27}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF28}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF29}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF2A}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF2B}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF2C}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF2D}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF2E}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF2F}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF30}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF31}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF32}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF33}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF34}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF35}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF36}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF37}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF38}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF39}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF3A}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF3B}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF3C}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF3D}}
+ \expandafter\def\csname simpleicon@inductiveautomationicon\endcsname {\simpleiconsmap\symbol{"EF3E}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF3F}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF40}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF41}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF42}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF43}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF44}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF45}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF46}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF47}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF48}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF49}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF4A}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF4B}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF4C}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF4D}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF4E}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF4F}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF50}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF51}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF52}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF53}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF54}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF55}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF56}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF57}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF58}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF59}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF5A}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF5B}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF5C}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF5D}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF5E}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF5F}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF60}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF61}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF62}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF63}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF64}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF65}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF66}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF67}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF68}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF69}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF6A}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF6B}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF6C}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF6D}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF6E}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF6F}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF70}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF71}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF72}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF73}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF74}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF75}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF76}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF77}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF78}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF79}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF7A}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF7B}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF7C}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF7D}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF7E}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF7F}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF80}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF81}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF82}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF83}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF84}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF85}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF86}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF87}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF88}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF89}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF8A}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF8B}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF8C}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF8D}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF8E}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF8F}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF90}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF91}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF92}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF93}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF94}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF95}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF96}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF97}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF98}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF99}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF9A}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF9B}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF9C}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF9D}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF9E}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF9F}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EFA0}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EFA1}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EFA2}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EFA3}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EFA4}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EFA5}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EFA6}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EFA7}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EFA8}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EFA9}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EFAA}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EFAB}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EFAC}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EFAD}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EFAE}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EFAF}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EFB0}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EFB1}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EFB2}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFB3}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFB4}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFB5}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFB6}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFB7}}
+ \expandafter\def\csname simpleicon@kdeplasmaicon\endcsname {\simpleiconsmap\symbol{"EFB8}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFB9}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFBA}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFBB}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFBC}}
+ \expandafter\def\csname simpleicon@keewebicon\endcsname {\simpleiconsmap\symbol{"EFBD}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFBE}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFBF}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFC0}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFC1}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFC2}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFC3}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFC4}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFC5}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFC6}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFC7}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFC8}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFC9}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFCA}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFCB}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFCC}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFCD}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFCE}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFCF}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFD0}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFD1}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFD2}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFD3}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFD4}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFD5}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFD6}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFD7}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFD8}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFD9}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFDA}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFDB}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFDC}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFDD}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFDE}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFDF}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFE0}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFE1}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFE2}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFE3}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFE4}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFE5}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFE6}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFE7}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFE8}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFE9}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFEA}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFEB}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFEC}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFED}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFEE}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFEF}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFF0}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFF1}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFF2}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFF3}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFF4}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFF5}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFF6}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFF7}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFF8}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFF9}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFFA}}
+ \expandafter\def\csname simpleicon@languagetoolicon\endcsname {\simpleiconsmap\symbol{"EFFB}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFFC}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFFD}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFFE}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFFF}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"F000}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"F001}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"F002}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"F003}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"F004}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"F005}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"F006}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"F007}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"F008}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"F009}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"F00A}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"F00B}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"F00C}}
+ \expandafter\def\csname simpleicon@lefthookicon\endcsname {\simpleiconsmap\symbol{"F00D}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"F00E}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"F00F}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"F010}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"F011}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"F012}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"F013}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"F014}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"F015}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F016}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F017}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F018}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F019}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F01A}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F01B}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F01C}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F01D}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F01E}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F01F}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F020}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F021}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F022}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F023}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F024}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F025}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F026}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F027}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F028}}
+ \expandafter\def\csname simpleicon@libretranslateicon\endcsname {\simpleiconsmap\symbol{"F029}}
+ \expandafter\def\csname simpleicon@libretubeicon\endcsname {\simpleiconsmap\symbol{"F02A}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F02B}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F02C}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F02D}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F02E}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F02F}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F030}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F031}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F032}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F033}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F034}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F035}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F036}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F037}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F038}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F039}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F03A}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F03B}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F03C}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F03D}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F03E}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F03F}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F040}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F041}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F042}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F043}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F044}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F045}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F046}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F047}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F048}}
+ \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F049}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F04A}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F04B}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F04C}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F04D}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F04E}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F04F}}
+ \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F050}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F051}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F052}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F053}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F054}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F055}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F056}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F057}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F058}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F059}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F05A}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F05B}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F05C}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F05D}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F05E}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F05F}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F060}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F061}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F062}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F063}}
+ \expandafter\def\csname simpleicon@lucideicon\endcsname {\simpleiconsmap\symbol{"F064}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F065}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F066}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F067}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F068}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F069}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F06A}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F06B}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F06C}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F06D}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F06E}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F06F}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F070}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F071}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F072}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F073}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F074}}
+ \expandafter\def\csname simpleicon@mailboxdotorgicon\endcsname {\simpleiconsmap\symbol{"F075}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F076}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F077}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F078}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F079}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F07A}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F07B}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F07C}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F07D}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F07E}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F07F}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F080}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F081}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F082}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F083}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F084}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F085}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F086}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F087}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F088}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F089}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F08A}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F08B}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F08C}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F08D}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F08E}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F08F}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F090}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F091}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F092}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F093}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F094}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F095}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F096}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F097}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F098}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F099}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F09A}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F09B}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F09C}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F09D}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F09E}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F09F}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F0A0}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F0A1}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F0A2}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F0A3}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F0A4}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F0A5}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F0A6}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F0A7}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F0A8}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F0A9}}
+ \expandafter\def\csname simpleicon@mediapipeicon\endcsname {\simpleiconsmap\symbol{"F0AA}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F0AB}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F0AC}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F0AD}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F0AE}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F0AF}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F0B0}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F0B1}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F0B2}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F0B3}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F0B4}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F0B5}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F0B6}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F0B7}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F0B8}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F0B9}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F0BA}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0BB}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0BC}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0BE}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0BF}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0C0}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0C1}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0C8}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0CA}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0CB}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0CC}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0CD}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0CE}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0D0}}
+ \expandafter\def\csname simpleicon@mihoyoicon\endcsname {\simpleiconsmap\symbol{"F0D1}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0D2}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0D6}}
+ \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmap\symbol{"F0D7}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0D9}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0DB}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0DC}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0DD}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0DE}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0E1}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0E5}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0E8}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0E9}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0EA}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0EC}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0ED}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0EE}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0EF}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0F0}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0F1}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0F2}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0F4}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0F5}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0F6}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0F8}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0F9}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0FA}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0FB}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0FD}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0FE}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0FF}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F100}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F101}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F102}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F103}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F104}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F105}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F106}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F107}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F108}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F109}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F10A}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F10B}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F10C}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F10D}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F10E}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F10F}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F110}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F111}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F112}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F113}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F114}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F115}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F116}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F117}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F118}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F119}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F11A}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F11B}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F11C}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F11D}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F11E}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F11F}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F120}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F121}}
+ \expandafter\def\csname simpleicon@nanostoresicon\endcsname {\simpleiconsmap\symbol{"F122}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F123}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F124}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F125}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F126}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F127}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F128}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F129}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F12A}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F12B}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F12C}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F12D}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F12E}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F12F}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F130}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F131}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F132}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F133}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F134}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F135}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F136}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F137}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F138}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F139}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F13A}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F13B}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F13C}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F13D}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F13E}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F13F}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F140}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F141}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F142}}
+ \expandafter\def\csname simpleicon@nexonicon\endcsname {\simpleiconsmap\symbol{"F143}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F144}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F145}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F146}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F147}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F148}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F149}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F14A}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F14B}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F14C}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F14D}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F14E}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F14F}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F150}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F151}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F152}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F153}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F154}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F155}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F156}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F157}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F158}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F159}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F15A}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F15B}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F15C}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F15D}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F15E}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F15F}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F160}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F161}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F162}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F163}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F164}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F165}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F166}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F167}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F168}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F169}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F16A}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F16B}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F16C}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F16D}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F16E}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F16F}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F170}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F171}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F172}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F173}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F174}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F175}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F176}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F177}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F178}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F179}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F17A}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F17B}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F17C}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F17D}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F17E}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F17F}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F180}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F181}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F182}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F183}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F184}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F185}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F186}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F187}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F188}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F189}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F18A}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F18B}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F18C}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F18D}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F18E}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F18F}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F190}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F191}}
+ \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmap\symbol{"F192}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F193}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F194}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F195}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F196}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F197}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F198}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F199}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F19A}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F19B}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F19C}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F19D}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F19E}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F19F}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F1AA}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F1AB}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F1AD}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F1AE}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F1AF}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F1B0}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F1B1}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F1B2}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F1B5}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F1B6}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F1B7}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F1B8}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F1B9}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F1BA}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F1BB}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F1BC}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F1BD}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F1BE}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1BF}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1C0}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1C1}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1C2}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1C3}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1C4}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1C5}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1C6}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1C7}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1C8}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1CA}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1CE}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1D0}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1D1}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1D5}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1D6}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1D7}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1D8}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1DB}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1DC}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1DD}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1DE}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1DF}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1E0}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1E2}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1E3}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1E4}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1E5}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1E6}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1E7}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1E8}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1E9}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1EA}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1EC}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1ED}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1EE}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1EF}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1F0}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1F1}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1F2}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1F4}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1F5}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1F6}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1F7}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1FB}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1FC}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F200}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F201}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F202}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F203}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F204}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F205}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F206}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F207}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F208}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F209}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F20A}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F20B}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F20C}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F20D}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F20E}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F20F}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F210}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F211}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F212}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F213}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F214}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F215}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F216}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F217}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F218}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F219}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F21A}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F21B}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F21C}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F21D}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F21E}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F21F}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F220}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F221}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F222}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F223}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F224}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F225}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F226}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F227}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F228}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F229}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F22A}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F22B}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F22C}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F22D}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F22E}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F22F}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F230}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F231}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F232}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F233}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F234}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F235}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F236}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F237}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F238}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F239}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F23A}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F23B}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F23C}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F23D}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F23E}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F23F}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F240}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F241}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F242}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F243}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F244}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F245}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F246}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F247}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F248}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F249}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F24A}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F24B}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F24C}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F24D}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F24E}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F24F}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F250}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F251}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F252}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F253}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F254}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F255}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F256}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F257}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F258}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F259}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F25A}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F25B}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F25C}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F25D}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F25E}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F25F}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F260}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F261}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F262}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F263}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F264}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F265}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F266}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F267}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F268}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F269}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F26A}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F26B}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F26C}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F26D}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F26E}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F26F}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F270}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F271}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F272}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F273}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F274}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F275}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F276}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F277}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F278}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F279}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F27A}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F27B}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F27C}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F27D}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F27E}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F27F}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F280}}
+ \expandafter\def\csname simpleicon@primefacesicon\endcsname {\simpleiconsmap\symbol{"F281}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F282}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F283}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F284}}
+ \expandafter\def\csname simpleicon@primevueicon\endcsname {\simpleiconsmap\symbol{"F285}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F286}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F287}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F288}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F289}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F28A}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F28B}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F28C}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F28D}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F28E}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F28F}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F290}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F291}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F292}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F293}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F294}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F295}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F296}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F297}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F298}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F299}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F29A}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F29B}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F29C}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F29D}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F29E}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F29F}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F2A2}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F2A3}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F2A7}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F2A8}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F2A9}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F2AA}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F2AB}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F2AC}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F2AD}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F2AE}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F2AF}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F2B0}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F2B2}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F2B3}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F2B6}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F2B7}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F2B8}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F2B9}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F2BA}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F2BC}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F2BD}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F2BE}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F2BF}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2C1}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2C2}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2C3}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2C4}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2C5}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2C8}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2C9}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2CA}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2CB}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2CD}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2CE}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2CF}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2D1}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2D2}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2D3}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2D4}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2D6}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2D7}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2D9}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2DB}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2DE}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2DF}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2E0}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2E3}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2E4}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2E6}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2E7}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2E9}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2EC}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2ED}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2EF}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2F3}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2F5}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2F8}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2F9}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2FA}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2FC}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2FD}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2FE}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2FF}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F300}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F301}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F302}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F303}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F304}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F305}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F306}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F307}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F308}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F309}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F30A}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F30B}}
+ \expandafter\def\csname simpleicon@redcandlegamesicon\endcsname {\simpleiconsmap\symbol{"F30C}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F30D}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F30E}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F30F}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F310}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F311}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F312}}
+ \expandafter\def\csname simpleicon@redragonicon\endcsname {\simpleiconsmap\symbol{"F313}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F314}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F315}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F316}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F317}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F318}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F319}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F31A}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F31B}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F31C}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F31D}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F31E}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F31F}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F320}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F321}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F322}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F323}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F324}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F325}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F326}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F327}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F328}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F329}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F32A}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F32B}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F32C}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F32D}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F32E}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F32F}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F330}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F331}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F332}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F333}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F334}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F335}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F336}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F337}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F338}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F339}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F33A}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F33B}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F33C}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F33D}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F33E}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F33F}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F340}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F341}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F342}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F343}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F344}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F345}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F346}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F347}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F348}}
+ \expandafter\def\csname simpleicon@roboflowicon\endcsname {\simpleiconsmap\symbol{"F349}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F34A}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F34B}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F34C}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F34D}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F34E}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F34F}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F350}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F351}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F352}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F353}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F354}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F355}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F356}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F357}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F358}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F359}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F35A}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F35B}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F35C}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F35D}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F35E}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F35F}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F360}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F361}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F362}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F363}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F364}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F365}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F366}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F367}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F368}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F369}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F36A}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F36B}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F36C}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F36D}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F36E}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F36F}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F370}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F371}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F372}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F373}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F374}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F375}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F376}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F377}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F378}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F379}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F37A}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F37B}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F37C}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F37D}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F37E}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F37F}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F380}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F381}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F382}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F383}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F384}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F385}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F386}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F387}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F388}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F389}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F38A}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F38B}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F38C}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F38D}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F38E}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F38F}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F390}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F391}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F392}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F393}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F394}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F395}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F396}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F397}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F398}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F399}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F39A}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F39B}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F39C}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F39D}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F39E}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F39F}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F3A7}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F3AC}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F3AF}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F3B1}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F3B2}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F3B5}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F3B7}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F3BC}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3CC}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3CD}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3D0}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3D1}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3D2}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3D3}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3D4}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3D5}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3D6}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3D8}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3D9}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3DA}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3DB}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3E0}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3E8}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3E9}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3EB}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3ED}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3F1}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3F5}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3F6}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3F9}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3FA}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3FB}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3FC}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3FD}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3FE}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3FF}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F400}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F401}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F402}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F403}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F404}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F405}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F406}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F407}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F408}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F409}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F40A}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F40B}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F40C}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F40D}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F40E}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F40F}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F410}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F411}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F412}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F413}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F414}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F415}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F416}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F417}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F418}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F419}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F41A}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F41B}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F41C}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F41D}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F41E}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F41F}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F420}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F421}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F422}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F423}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F424}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F425}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F426}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F427}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F428}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F429}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F42A}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F42B}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F42C}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F42D}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F42E}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F42F}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F430}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F431}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F432}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F433}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F434}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F435}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F436}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F437}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F438}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F439}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F43A}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F43B}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F43C}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F43D}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F43E}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F43F}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F440}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F441}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F442}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F443}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F444}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F445}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F446}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F447}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F448}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F449}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F44A}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F44B}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F44C}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F44D}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F44E}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F44F}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F450}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F451}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F452}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F453}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F454}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F455}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F456}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F457}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F458}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F459}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F45A}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F45B}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F45C}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F45D}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F45E}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F45F}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F460}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F461}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F462}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F463}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F464}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F465}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F466}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F467}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F468}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F469}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F46A}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F46B}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F46C}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F46D}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F46E}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F46F}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F470}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F471}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F472}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F473}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F474}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F475}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F476}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F477}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F478}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F479}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F47A}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F47B}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F47C}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F47D}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F47E}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F47F}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F480}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F481}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F482}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F483}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F484}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F485}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F486}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F487}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F488}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F489}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F48A}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F48B}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F48C}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F48D}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F48E}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F48F}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F490}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F491}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F492}}
+ \expandafter\def\csname simpleicon@svgtraceicon\endcsname {\simpleiconsmap\symbol{"F493}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F494}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F495}}
+ \expandafter\def\csname simpleicon@swayicon\endcsname {\simpleiconsmap\symbol{"F496}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F497}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F498}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F499}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F49A}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F49B}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F49C}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F49D}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F49E}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F49F}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F4A1}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F4A3}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F4B2}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F4B7}}
+ \expandafter\def\csname simpleicon@taromicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F4B9}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F4BA}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F4BE}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F4BF}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F4C0}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F4C2}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F4C3}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4C8}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4CA}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4CF}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4D0}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4D9}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4DB}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4DC}}
+ \expandafter\def\csname simpleicon@thanosicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4DF}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4E0}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
+ \expandafter\def\csname simpleicon@theguardianicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4E5}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4E7}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4E8}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4E9}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4EA}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4EB}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4EC}}
+ \expandafter\def\csname simpleicon@theweatherchannelicon\endcsname {\simpleiconsmap\symbol{"F4ED}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4EF}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4F0}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4F1}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4F3}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4F4}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4F5}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4F7}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4F9}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4FA}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4FF}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F500}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F501}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F502}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F503}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F504}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F505}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F506}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F507}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F508}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F509}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F50A}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F50B}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F50C}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F50D}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F50E}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F50F}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F510}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F511}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F512}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F513}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F514}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F515}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F516}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F517}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F518}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F519}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F51A}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F51B}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F51C}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F51D}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F51E}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F51F}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F520}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F521}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F522}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F523}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F524}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F525}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F526}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F527}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F528}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F529}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F52A}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F52B}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F52C}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F52D}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F52E}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F52F}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F530}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F531}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F532}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F533}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F534}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F535}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F536}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F537}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F538}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F539}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F53A}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F53B}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F53C}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F53D}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F53E}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F53F}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F540}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F541}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F542}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F543}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F544}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F545}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F546}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F547}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F548}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F549}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F54A}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F54B}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F54C}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F54D}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F54E}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F54F}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F550}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F551}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F552}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F553}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F554}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F555}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F556}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F557}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F558}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F559}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F55A}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F55B}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F55C}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F55D}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F55E}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F55F}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F560}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F561}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F562}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F563}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F564}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F565}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F566}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F567}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F568}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F569}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F56A}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F56B}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F56C}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F56D}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F56E}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F56F}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F570}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F571}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F572}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F573}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F574}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F575}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F576}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F577}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F578}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F579}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F57A}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F57B}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F57C}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F57D}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F57E}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F57F}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F580}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F581}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F582}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F583}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F584}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F585}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F586}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F587}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F588}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F589}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F58A}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F58B}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F58C}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F58D}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F58E}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F58F}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F590}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F591}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F592}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F593}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F594}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F595}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F596}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F597}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F598}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F599}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F59A}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F59B}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F59C}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F59D}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F59E}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F59F}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F5A1}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F5A2}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
+ \expandafter\def\csname simpleicon@vestelicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F5A7}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F5A9}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F5AB}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F5AF}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F5B3}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F5B4}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F5B5}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F5B6}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F5BB}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F5BC}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F5BD}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F5BE}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F5C0}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F5C3}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5CC}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
+ \expandafter\def\csname simpleicon@vrchaticon\endcsname {\simpleiconsmap\symbol{"F5CE}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5D3}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5D4}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5D5}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5DD}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5DF}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5E0}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5E2}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5E7}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5E8}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F600}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F601}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F602}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F603}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F604}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F605}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F606}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F607}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F608}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F609}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F60A}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F60B}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F60C}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F60D}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F60E}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F60F}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F610}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F611}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F612}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F613}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F614}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F615}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F616}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F617}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F618}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F619}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F61A}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F61B}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F61C}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F61D}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F61E}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F61F}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F620}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F621}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F622}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F623}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F624}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F625}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F626}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F627}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F628}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F629}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F62A}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F62B}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F62C}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F62D}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F62E}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F62F}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F630}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F631}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F632}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F633}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F634}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F635}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F636}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F637}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F638}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F639}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F63A}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F63B}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F63C}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F63D}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F63E}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F63F}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F640}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F641}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F642}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F643}}
+ \expandafter\def\csname simpleicon@xubuntuicon\endcsname {\simpleiconsmap\symbol{"F644}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F645}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F646}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F647}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F648}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F649}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F64A}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F64B}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F64C}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F64D}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F64E}}
+ \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmap\symbol{"F64F}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F650}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F651}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F652}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F653}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F654}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F655}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F656}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F657}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F658}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F659}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F65A}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F65B}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F65C}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F65D}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F65E}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F65F}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F660}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F661}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F662}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F663}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F664}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F665}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F666}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F667}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F668}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F669}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F66A}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F66B}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F66C}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F66D}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F66E}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F66F}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F670}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F671}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F672}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F673}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F674}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F675}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F676}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F677}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F678}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F679}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F67A}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F67B}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F67C}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F67D}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F67E}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F67F}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F680}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F681}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F682}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F683}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F684}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F685}} \ 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 3b3ef9876f3..8312881b7e5 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/08/16 Font definitions for U/simpleiconseight.]
+ \ProvidesFile{usimpleiconseight.fd}[2024/09/27 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 b9d32c42d8a..522af34b693 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/08/16 Font definitions for U/simpleiconsfive.]
+ \ProvidesFile{usimpleiconsfive.fd}[2024/09/27 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 92aa9b7ead4..28b9388eaec 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/08/16 Font definitions for U/simpleiconsfour.]
+ \ProvidesFile{usimpleiconsfour.fd}[2024/09/27 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 fd6b8f720b9..94a046e108a 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/08/16 Font definitions for U/simpleiconsnine.]
+ \ProvidesFile{usimpleiconsnine.fd}[2024/09/27 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 e384cebdbc2..5386f2462fe 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/08/16 Font definitions for U/simpleiconsone.]
+ \ProvidesFile{usimpleiconsone.fd}[2024/09/27 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 13da29245e0..8d6530ba8c9 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/08/16 Font definitions for U/simpleiconsoneone.]
+ \ProvidesFile{usimpleiconsoneone.fd}[2024/09/27 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 d2432feba8e..bd15bbf6f20 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/08/16 Font definitions for U/simpleiconsonethree.]
+ \ProvidesFile{usimpleiconsonethree.fd}[2024/09/27 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 16e56effc86..c47b0d02c1a 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/08/16 Font definitions for U/simpleiconsonetwo.]
+ \ProvidesFile{usimpleiconsonetwo.fd}[2024/09/27 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 7e60f2a6188..e9f4ecb5cba 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/08/16 Font definitions for U/simpleiconsonezero.]
+ \ProvidesFile{usimpleiconsonezero.fd}[2024/09/27 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 0cbc2b586c3..663e5d16fca 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/08/16 Font definitions for U/simpleiconsseven.]
+ \ProvidesFile{usimpleiconsseven.fd}[2024/09/27 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 ec3ce7b1f6e..210c956be3c 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/08/16 Font definitions for U/simpleiconssix.]
+ \ProvidesFile{usimpleiconssix.fd}[2024/09/27 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 02c8b6b0dd0..859391bdb5f 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/08/16 Font definitions for U/simpleiconsthree.]
+ \ProvidesFile{usimpleiconsthree.fd}[2024/09/27 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 12c3d407c88..759034821a7 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/08/16 Font definitions for U/simpleiconstwo.]
+ \ProvidesFile{usimpleiconstwo.fd}[2024/09/27 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 1c97adf20a1..9e943639402 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-08-20} {3.3.21}
+\ProvidesExplPackage {siunitx} {2024-09-30} {3.3.22}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -7550,7 +7550,10 @@
\str_if_eq:eeT
{ \exp_not:o { \familydefault } }
{ \exp_not:n { \sfdefault } }
- { \keys_set:nn { siunitx } { unit-font-command = \mathsf } }
+ {
+ \tl_if_eq:VnT \l_siunitx_unit_font_tl { \mathrm }
+ { \keys_set:nn { siunitx } { unit-font-command = \mathsf } }
+ }
}
{ }
}
diff --git a/Master/texmf-dist/tex/latex/spelatex/spelatex.sty b/Master/texmf-dist/tex/latex/spelatex/spelatex.sty
index bf2a290b1bb..1c2e1185b39 100644
--- a/Master/texmf-dist/tex/latex/spelatex/spelatex.sty
+++ b/Master/texmf-dist/tex/latex/spelatex/spelatex.sty
@@ -23,17 +23,19 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{spelatex}
- [2024/06/21 v0.91 SpeLaTeX - Speech-enabled LaTeX (DMW and LVP)]
-\def\fileversion{0.91}
-\def\filedate{2024/06/21}
+ [2024/09/09 v0.92 SpeLaTeX - Speech-enabled LaTeX (DMW and LVP)]
+\def\fileversion{0.92}
+\def\filedate{2024/09/09}
-%%
+%%
+%% \begin{spelchunk}
\RequirePackage{expl3}
\RequirePackage{hyperref}
\RequirePackage{xcolor}
\RequirePackage{ifthen}
+\RequirePackage{verbatim}
\RequirePackage{fancyvrb}
\RequirePackage{newfile}
\RequirePackage{rotating}
@@ -53,18 +55,17 @@
urlcolor=black}
\RequirePackage{kvoptions}
\RequirePackage{xkeyval}
-\RequirePackage{marginnote}
\SetupKeyvalOptions{
family=spel,
prefix=spel@
}
\DeclareStringOption[ogg]{format}
+\DeclareStringOption[local]{server}
+\DeclareStringOption[full]{markervisibility}
\DeclareBoolOption[false]{disabled}
\DeclareBoolOption[false]{extramath}
-\DeclareBoolOption[false]{propermath}
\ProcessKeyvalOptions*
\DeclareRobustCommand{\spelatex}{S\kern-0.3ex\raisebox{-0.1ex}{\rotatebox{-15}{p}}\kern-0.25ex\raisebox{0.1ex}{\rotatebox{10}{e}}\kern-0.1ex\LaTeX}
-\DeclareRobustCommand{\spelbox}{S\kern-0.3ex\raisebox{-0.1ex}{\rotatebox{-15}{p}}\kern-0.25ex\raisebox{0.1ex}{\rotatebox{10}{e}}\kern-0.1exLbo\raisebox{-0.2ex}{x}}
\DeclareRobustCommand{\spelpl}{\texttt{spel-wizard.pl}}
\newoutputstream{chunk}
\newoutputstream{spelidx}
@@ -77,6 +78,10 @@
\addtostream{spelidx}{format|\spel@format}
\addtostream{spelidx}{audiodir|\audiodir}
\addtostream{spelidx}{chunkdir|\chunkdir}
+\addtostream{spelidx}{server|\spel@server}
+\ExplSyntaxOn
+\newcommand\linksdir{\str_if_eq:VnTF{\spel@server}{local}{./\audiodir}{\spel@server/\audiodir}}
+\ExplSyntaxOff
\ifspel@disabled\newcommand{\spel@idxwrite}[2]{}\else
\newcommand{\spel@idxwrite}[2]{%
\typeout{spel: Generating #1 - #2}%
@@ -118,12 +123,27 @@
\setcounter{spel@chunk}{0}
\AddBabelHook{informspel}{write}{\spel@idxwrite{language}{\languagename}}
\EnableBabelHook{informspel}
+\ExplSyntaxOn
+\definecolor{faintgray}{rgb}{0.9,0.9,0.9}
+\str_if_eq:VnTF{\spel@markervisibility}{none}{
+ \colorlet{spel@color@right}{white}
+ \colorlet{spel@color@left}{white}
+}{}
+\str_if_eq:VnTF{\spel@markervisibility}{onlygroups}{
+ \colorlet{spel@color@right}{black!25}
+ \colorlet{spel@color@left}{white}
+}{}
+\str_if_eq:VnTF{\spel@markervisibility}{full}{
+ \colorlet{spel@color@right}{black!25}
+ \colorlet{spel@color@left}{black!25}
+}{}
+\ExplSyntaxOff
\ifspel@disabled\newcommand{\spel@registerelement}[1]{}\else
\newcommand{\spel@registerelement}[1]{%
\expandafter\let\csname spel@@#1\expandafter\endcsname\csname #1\endcsname
\expandafter\gdef\csname #1\endcsname##1{%
\spel@chunkwrite{#1}{##1}
- \csname spel@@#1\endcsname{\href{run:\audiodir/#1.\spel@format}{##1}}
+ \csname spel@@#1\endcsname{\href{\linksdir/#1.\spel@format}{##1}}
}
\expandafter\AtBeginDocument{
\spel@idxwrite{#1}{#1}
@@ -159,7 +179,7 @@
\let\spel@@part\@part
\def\@part[#1]#2{%
\setcounter{spel@chunk}{0}% need this because counter resetting fails
- \spel@@part[#1]{\href{run:\audiodir/\spel@@optpart.\spel@format}{#2}}%
+ \spel@@part[#1]{\href{\linksdir/\spel@@optpart.\spel@format}{#2}}%
\spel@idxwrite{part \thepart}{\spel@@optpart}%
\spel@chunkwrite{\spel@@optpart}{#2}%
}
@@ -170,7 +190,7 @@
\stepcounter{spel@spart}%
\setcounter{spel@chunk}{0}% need this because counter resetting fails
\spel@@spart{%
- \href{run:\audiodir/\spel@@optpart star-\thespel@spart.\spel@format}{#1}}%
+ \href{\linksdir/\spel@@optpart star-\thespel@spart.\spel@format}{#1}}%
\spel@idxwrite{part}{\spel@@optpart star-\thespel@spart}%
\spel@chunkwrite{\spel@@optpart star-\thespel@spart}{#1}%
}
@@ -181,7 +201,7 @@
\def\@chapter[#1]#2{%
\setcounter{spel@chunk}{0}% need this because counter resetting fails
\spel@@chapter[#1]{%
- \href{run:\audiodir/\spel@@optpart\thechapter.\spel@format}{#2}}%
+ \href{\linksdir/\spel@@optpart\thechapter.\spel@format}{#2}}%
\spel@idxwrite{chapter \thechapter}{\spel@@optpart\thechapter}%
\spel@chunkwrite{\spel@@optpart\thechapter}{#2}%
}
@@ -194,7 +214,7 @@
\stepcounter{spel@schapter}%
\setcounter{spel@chunk}{0}% need this because counter resetting fails
\spel@@schapter{%
- \href{run:\audiodir/\spel@@optpart star-\thespel@schapter.\spel@format}{#1}}%
+ \href{\linksdir/\spel@@optpart star-\thespel@schapter.\spel@format}{#1}}%
\spel@idxwrite{chapter}{\spel@@optpart star-\thespel@schapter}%
\spel@chunkwrite{\spel@@optpart star-\thespel@schapter}{#1}%
}
@@ -209,8 +229,8 @@
\fi%
\setcounter{spel@chunk}{0}% need this because counter resetting fails
\spel@@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{%
- \href{run:\audiodir/\spel@@optpart\thesubparagraph.\spel@format}{#8}\hfill%
- \href{run:\audiodir/\spel@@optpart\thesubparagraph.m3u}{\textcolor{black!25}{$\triangleright$}}}%
+ \href{\linksdir/\spel@@optpart\thesubparagraph.\spel@format}{#8}\hfill%
+ \href{\linksdir/\spel@@optpart\thesubparagraph.m3u}{\textcolor{spel@color@right}{$\triangleright$}}}%
\def\spel@@label{\ifnum #2>\c@secnumdepth\else#1 \csname the#1\endcsname\fi}
\spel@idxwrite{\spel@@label}{\spel@@optpart\thesubparagraph}%
\spel@chunkwrite{\spel@@optpart\thesubparagraph}{#8}%
@@ -222,7 +242,7 @@
\stepcounter{spel@ssect}%
%\setcounter{spel@chunk}{0}% need this because counter resetting fails
\spel@@ssect{#1}{#2}{#3}{#4}{%
- \href{run:\audiodir/\spel@@optpart\thesubparagraph-star-\thespel@ssect.\spel@format}%
+ \href{\linksdir/\spel@@optpart\thesubparagraph-star-\thespel@ssect.\spel@format}%
{#5}}%
\spel@idxwrite{section}{\spel@@optpart\thesubparagraph-star-\thespel@ssect}%
\spel@chunkwrite{\spel@@optpart\thesubparagraph-star-\thespel@ssect}{#5}%
@@ -234,7 +254,7 @@
\stepcounter{spel@footnote}%
\settowidth\spel@mptboxwidth{\usebox\spel@mptbox}%
\spel@@fntext{%
- \hspace*{-\spel@mptboxwidth}\href{run:\audiodir/footnote-\thespel@footnote.\spel@format}{\usebox\spel@mptbox}#1}%
+ \hspace*{-\spel@mptboxwidth}\href{\linksdir/footnote-\thespel@footnote.\spel@format}{\usebox\spel@mptbox}#1}%
\spel@idxwrite{footnote}{footnote-\thespel@footnote}%
\spel@chunkwrite{footnote-\thespel@footnote}{#1}%
}
@@ -251,25 +271,25 @@
\settowidth\spel@mptboxwidth{\usebox\spel@mptbox}%
\spel@idxwrite{item}{\spel@@optpart\thesubparagraph-\thespel@chunk}%
\spel@chunkwrite{\spel@@optpart\thesubparagraph-\thespel@chunk}{#1}%
- \item \hspace*{-\spel@mptboxwidth}\href{run:\audiodir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}#1}
+ \item \hspace*{-\spel@mptboxwidth}\href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}#1}
\def\spelitem@inttwo#1#2{%
\stepcounter{spel@chunk}%
\settowidth\spel@mptboxwidth{\usebox\spel@mptbox}%
\spel@idxwrite{item}{\spel@@optpart\thesubparagraph-\thespel@chunk}%
\spel@chunkwrite{\spel@@optpart\thesubparagraph-\thespel@chunk}{#1 . #2}%
-\item[#1] \hspace*{-\spel@mptboxwidth}\href{run:\audiodir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}#2}
+\item[#1] \hspace*{-\spel@mptboxwidth}\href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}#2}
\ifspel@disabled\else
\let\spel@@caption\caption
\renewcommand\caption[2][]{%
\stepcounter{spel@chunk}%
\spel@idxwrite{caption}{\spel@@optpart\thesubparagraph-\thespel@chunk}%
\spel@chunkwrite{\spel@@optpart\thesubparagraph-\thespel@chunk}{#2}%
- \spel@@caption[#1]{\protect\href{run:\audiodir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{#2}}
+ \spel@@caption[#1]{\protect\href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{#2}}
}
\fi
\newlength\spel@mptboxwidth
\newsavebox\spel@mptbox
-\savebox\spel@mptbox{\textcolor{black!25}{$\qquad$}}
+\savebox\spel@mptbox{\textcolor{spel@color@left}{\quad\strut\tiny\raisebox{0.4ex}{$\triangleright$}\,}}
\newif\ifspel@chunkarealink
\define@key{spelchunk}{arealink}[]{\spel@chunkarealinktrue}
\ifspel@disabled\def\spelchunk{}\else
@@ -284,10 +304,10 @@
\end{VerbatimOut}%
\catcode`\^^M=5\relax%
\ifspel@chunkarealink%
- \href{run:\audiodir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}}%
+ \href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}}%
\else%
\settowidth\spel@mptboxwidth{\usebox\spel@mptbox}%
- \hspace*{-\spel@mptboxwidth}\href{run:\audiodir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}%
+ \hspace*{-\spel@mptboxwidth}\href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}%
\fi%
\spel@chunkarealinkfalse%
}%
@@ -296,6 +316,44 @@
\def\spelchunk@int{%
\VerbatimEnvironment
\begin{VerbatimOut}{\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk.tex}}
+\ExplSyntaxOn
+\NewDocumentCommand{\spelchunkatom}{O{}m}{
+ \stepcounter{spel@chunk}%
+ \spel@idxwrite{chunk}{\spel@@optpart\thesubparagraph-\thespel@chunk}%
+ \setkeys{spelchunk}{#1}
+ \scantokens{
+ \makeatletter
+ \begin{spelverbatimwrite}{\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk.tex}
+ #2
+ \end{spelverbatimwrite}
+ \makeatother
+ }
+ \ifspel@chunkarealink%
+ \href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}}%
+ \else%
+ \settowidth\spel@mptboxwidth{\usebox\spel@mptbox}%
+ \hspace*{-\spel@mptboxwidth}\href{\linksdir/\spel@@optpart\thesubparagraph-\thespel@chunk.\spel@format}{\usebox\spel@mptbox}\input{./\chunkdir/\spel@@optpart\thesubparagraph-\thespel@chunk}%
+ \fi%
+ \spel@chunkarealinkfalse%
+}
+
+\def\spelverbatimwrite#1{%
+ \@bsphack
+ \openoutputfile{#1}{chunk}%
+ \def\verbatim@processline{\addtostream{chunk}{\the\verbatim@line}}%
+ \let\do\@makeother\dospecials
+ \catcode`\^^M\active \catcode`\^^I=12
+ \verbatim@start}%
+\def\endspelverbatimwrite{%
+ \closeoutputstream{chunk}%
+ \@esphack%
+}
+\ifspel@disabled
+ \newcommand\<<<[2][]{#2}
+\else
+ \def\<<<{\spelchunkatom}
+\fi
+\ExplSyntaxOff
\def\spelchunkad{%
\catcode`\^^M=\active
\@ifnextchar[{\catcode`\^^M=5\spelchunk@opt}{\catcode`\^^M=5\spelchunk@int}}
@@ -332,6 +390,8 @@
\spelmacpp{textit}[1]{keep}
\spelmacpp{texttt}[1]{keep}
\spelmacpp{textbf}[1]{keep}
+\spelmacpp{mathbb}[1]{keep}
+\spelmacpp{mathcal}[1]{keep}
\spelmacpp{quad}{}
\spelmacpp{qquad}{}
\spelmacpp{displaystyle}{}
@@ -354,7 +414,6 @@
}
\ExplSyntaxOff
\spelmacad{spelatex}{spee-lay-tech}
-\spelmacad{spelbox}{spel-box}
\spelmacad{spelpl}{spel wizzard dot pl}
\spelmacad{LaTeX}{lay-tech}
\spelmacad{TeX}{tech}
diff --git a/Master/texmf-dist/tex/latex/stickstoo/ly1minstickstootext.fd b/Master/texmf-dist/tex/latex/stickstoo/ly1minstickstootext.fd
new file mode 100644
index 00000000000..72dd4632717
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/stickstoo/ly1minstickstootext.fd
@@ -0,0 +1,84 @@
+%% Generated by msharpe on 2022/01/23
+%%
+\ProvidesFile{ly1minstickstootext.fd}
+ [2022/01/23 (msharpe) Font definitions for LY1/minstickstootext.]
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+\DeclareFontFamily{LY1}{minstickstootext}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{scit}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{it}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{n}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{sl}{
+ <-> ssub * minstickstootext/m/it
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{m}{scsl}{
+ <-> ssub * minstickstootext/m/scit
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{scit}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{it}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{n}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{sl}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{b}{scsl}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{scit}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{scsl}{
+ <-> ssub * minstickstootext/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{it}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{n}{
+ <-> ssub * minstickstootext/b/n
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{sc}{
+ <-> ssub * minstickstootext/b/sc
+}{}
+
+\DeclareFontShape{LY1}{minstickstootext}{bx}{sl}{
+ <-> ssub * minstickstootext/b/sl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/stickstoo/ot1minstickstootext.fd b/Master/texmf-dist/tex/latex/stickstoo/ot1minstickstootext.fd
new file mode 100644
index 00000000000..e3a19f3615c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/stickstoo/ot1minstickstootext.fd
@@ -0,0 +1,84 @@
+%% Generated by msharpe on 2022/01/23
+%%
+\ProvidesFile{ot1minstickstootext.fd}
+ [2022/01/23 (msharpe) Font definitions for OT1/minstickstootext.]
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+\DeclareFontFamily{OT1}{minstickstootext}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{scit}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{it}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{n}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{sl}{
+ <-> ssub * minstickstootext/m/it
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{m}{scsl}{
+ <-> ssub * minstickstootext/m/scit
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{n}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{it}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-ot1G
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{scit}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{sl}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{b}{scsl}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{sl}{
+ <-> ssub * minstickstootext/b/sl
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{sc}{
+ <-> ssub * minstickstootext/b/sc
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{scit}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{n}{
+ <-> ssub * minstickstootext/b/n
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{it}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{OT1}{minstickstootext}{bx}{scsl}{
+ <-> ssub * minstickstootext/b/scsl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty b/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
index f9d1351ede9..6a5af23b517 100644
--- a/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
+++ b/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
@@ -1,7 +1,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.035}
-\def\filedate{2021/10/17}
+\def\fileversion{1.036}
+\def\filedate{2024/09/22}
\ProvidesPackage{stickstootext}
[\filedate\space v\fileversion]
\message{`SticksTooText' v\fileversion, \filedate\space Text macros taking advantage of the STIXTwoText fonts (msharpe)}
@@ -44,10 +44,10 @@
}{}
\IfFileExists{xkeyval.sty}{
- \newcommand*{\SticksToo@scale}{1}
+ \newcommand*{\SticksTooText@scale}{1}
\RequirePackage{xkeyval}
- \DeclareOptionX{scale}{\renewcommand*{\SticksToo@scale}{##1}}
- \DeclareOptionX{scaled}{\renewcommand*{\SticksToo@scale}{##1}}
+ \DeclareOptionX{scale}{\renewcommand*{\SticksTooText@scale}{##1}}
+ \DeclareOptionX{scaled}{\renewcommand*{\SticksTooText@scale}{##1}}
}{
\let\DeclareOptionX\DeclareOption
\let\ExecuteOptionsX\ExecuteOptions
diff --git a/Master/texmf-dist/tex/latex/stickstoo/t1minstickstootext.fd b/Master/texmf-dist/tex/latex/stickstoo/t1minstickstootext.fd
new file mode 100644
index 00000000000..e737beb61cb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/stickstoo/t1minstickstootext.fd
@@ -0,0 +1,90 @@
+%% Generated by msharpe on 2022/01/23
+%%
+\ProvidesFile{t1minstickstootext.fd}
+ [2022/01/23 (msharpe) Font definitions for T1/minstickstootext.]
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+%\expandafter\ifx\csname SticksTooText@scale\endcsname\relax
+% \let\ntxmath@scaled\@empty
+%\else
+% \edef\ntxmath@scaled{s*[\csname SticksTooText@scale\endcsname]}%
+%\fi
+
+\DeclareFontFamily{T1}{minstickstootext}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{scit}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{n}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{it}{
+ <-> \ntxmath@scaled SticksTooText-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{sl}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{b}{scsl}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{sc}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{it}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{n}{
+ <-> \ntxmath@scaled SticksTooText-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{scit}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{sl}{
+ <-> \ntxmath@scaled SticksTooText-Italic-tlf-th-t1
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{m}{scsl}{
+ <-> ssub * minstickstootext/m/scit
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{it}{
+ <-> ssub * minstickstootext/b/it
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{scsl}{
+ <-> ssub * minstickstootext/b/scsl
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{sc}{
+ <-> ssub * minstickstootext/b/sc
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{scit}{
+ <-> ssub * minstickstootext/b/scit
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{sl}{
+ <-> ssub * minstickstootext/b/sl
+}{}
+
+\DeclareFontShape{T1}{minstickstootext}{bx}{n}{
+ <-> ssub * minstickstootext/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty b/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty
new file mode 100644
index 00000000000..ac30c79d740
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty
@@ -0,0 +1,1401 @@
+%%% ----------------------------------------------------------------------------
+%%% suanpan: draw suanpan(abacus) with LaTeX3
+%%% Author : Nan Geng <nangeng@nwafu.edu.cn>
+%%% Repository: https://gitee.com/nwafu_nan/suan-span
+%%% License : The LaTeX Project Public License 1.3c
+%%% ----------------------------------------------------------------------------
+
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\RequirePackage{expl3}
+% \ProvidesExplPackage{suanpan}{2024-08-20}{v1.0.0} % 初稿
+% \ProvidesExplPackage{suanpan}{2024-08-28}{v1.1.0} % 优化(统一尺寸计算,添加空白占位)
+% \ProvidesExplPackage{suanpan-l3}{2024-08-30}{v1.1.1} % 更名为suanpan-l3
+% \ProvidesExplPackage{suanpan-l3}{2024-08-31}{v1.1.2} % 添加empty不绘制空档选项
+% \ProvidesExplPackage{suanpan-l3}{2024-09-01}{v1.1.3} % 添加bid批处理及绘制颜色选项
+% % 将算珠与档杆绘制改为TikZ
+% \ProvidesExplPackage{suanpan-l3}{2024-09-04}{v1.2.0} % 添加\lab横梁文字标记命令
+% \ProvidesExplPackage{suanpan-l3}{2024-09-05}{v1.2.1} % 将草稿模式所有算珠改为圆冒
+% % 直线并取消所有高光特效
+\ProvidesExplPackage{suanpan-l3}{2024-09-07}{v1.2.2} % 为珠高、珠宽、档杆宽度和
+ % 边框宽度添加设置选项
+ {draw suanpan(abacus) with LaTeX3}
+
+\RequirePackage{l3keys2e}
+\RequirePackage{xparse}
+\RequirePackage{l3draw}
+
+\RequirePackage {tikz}
+
+\cs_new:Npn \__suanpan_error:n { \msg_error:nn { suanpan(abacus) } }
+
+% 盒子容器总高度计算函数
+\cs_new_nopar:Npn \__suanpan_coffin_ht_plus_dp:N #1
+ {
+ \coffin_ht:N #1 + \coffin_dp:N #1
+ }
+
+% =============颜色处理函数=============
+% 填充色辅助函数
+\cs_new_nopar:Nn \__suanpan_aux_color_boxfill:
+ { }
+
+% 颜色命名函数
+% #1 颜色名称
+% #2 颜色表达式
+\cs_set_nopar:Npn \__suanpan_color_select:nn #1#2
+ {
+ \colorlet { #1 } { #2 }
+ }
+\cs_generate_variant:Nn \__suanpan_color_select:nn {nx}
+
+% 颜色命名函数
+% #1 颜色名称
+% #2 颜色空间
+% #3 颜色分量值
+\cs_set_nopar:Npn \__suanpan_color_select:nnn #1#2#3
+ {
+ \definecolor { #1 } { #2 } { #3 }
+ }
+\cs_generate_variant:Nn \__suanpan_color_select:nnn {nnx}
+
+% 定义变量
+% 算盘基础尺寸
+\dim_new:N \l__suanpan_bid_h_dim
+\dim_new:N \l__suanpan_bid_d_dim
+\dim_new:N \l__suanpan_rod_d_dim
+\dim_new:N \l__suanpan_frame_b_dim
+\dim_new:N \l__suanpan_bid_sep_dim
+\dim_new:N \l__suanpan_rod_sep_dim
+
+% 算盘基础尺寸初值(参考 QBT1747-1993 算盘标准)
+\dim_set:Nn \l__suanpan_bid_h_dim { 12mm }
+\dim_set:Nn \l__suanpan_bid_d_dim { 23mm }
+\dim_set:Nn \l__suanpan_rod_d_dim { 7mm }
+\dim_set:Nn \l__suanpan_frame_b_dim { 13mm }
+\dim_set:Nn \l__suanpan_bid_sep_dim { 1.8pt }
+\dim_set:Nn \l__suanpan_rod_sep_dim { 3.0pt }
+
+% 半长度
+\dim_new:N \l__suanpan_bid_h_half_dim
+\dim_new:N \l__suanpan_bid_d_half_dim
+\dim_new:N \l__suanpan_rod_d_half_dim
+\dim_new:N \l__suanpan_frame_b_half_dim
+
+% 上珠偏移
+\dim_new:N \l__suanpan_bid_upper_offset_dim
+% 下珠偏移
+\dim_new:N \l__suanpan_bid_lower_offset_dim
+% 上档杆长度
+\dim_new:N \l__suanpan_rod_upper_h_dim
+% 下档杆长度
+\dim_new:N \l__suanpan_rod_lower_h_dim
+% 上档杆偏移
+\dim_new:N \l__suanpan_rod_upper_offset_dim
+% 下档杆偏移
+\dim_new:N \l__suanpan_rod_lower_offset_dim
+% 上档杆位置
+\dim_new:N \l__suanpan_rod_upper_dim
+% 下档杆位置
+\dim_new:N \l__suanpan_rod_lower_dim
+% 上边框内线偏移
+\dim_new:N \l__suanpan_frame_upper_inner_offset_dim
+% 下边框内线偏移
+\dim_new:N \l__suanpan_frame_lower_inner_offset_dim
+% 上边框外线偏移
+\dim_new:N \l__suanpan_frame_upper_outer_offset_dim
+% 下边框外线偏移
+\dim_new:N \l__suanpan_frame_lower_outer_offset_dim
+% 算珠上边缘
+\dim_new:N \l__suanpan_bid_upper_dim
+% 算珠下边缘
+\dim_new:N \l__suanpan_bid_lower_dim
+% 算珠绘制高度
+\dim_new:N \l__suanpan_bid_draw_h_dim
+% 算珠绘制半高度
+\dim_new:N \l__suanpan_bid_draw_h_half_dim
+% 算珠圆角半径
+\dim_new:N \l__suanpan_bid_arc_dim
+% 横梁计位点半径
+\dim_new:N \l__suanpan_frame_unit_r_dim
+% 边框外线半宽度
+\dim_new:N \l__suanpan_frame_outer_half_dim
+% 档杆总成宽度
+\dim_new:N \l__suanpan_support_d_dim
+% 档杆总成半宽度
+\dim_new:N \l__suanpan_support_d_half_dim
+% 档杆总成组装垂直偏移
+\dim_new:N \l__suanpan_support_y_offset_dim
+
+% 上边框内线位置
+\dim_new:N \l__suanpan_frame_inner_upper_dim
+% 下边框内线位置
+\dim_new:N \l__suanpan_frame_inner_lower_dim
+
+% 边框内线高度
+\dim_new:N \l__suanpan_frame_inner_h_dim
+% 边框外线高度
+\dim_new:N \l__suanpan_frame_outer_h_dim
+
+\dim_new:N \l__suanpan_frame_inner_linewidth_dim
+\dim_new:N \l__suanpan_frame_outer_linewidth_dim
+\dim_new:N \l__suanpan_rod_linewidth_dim
+\dim_new:N \l__suanpan_bid_linewidth_dim
+
+% 状态变量
+\bool_new:N \l__suanpan_support_frame_bool
+\bool_set_true:N \l__suanpan_support_frame_bool
+\bool_new:N \l__suanpan_support_unit_bool
+\bool_set_false:N \l__suanpan_support_unit_bool
+\bool_new:N \l__suanpan_draft_bool
+\bool_new:N \l__suanpan_empty_rod_bool
+
+% 容器(盒子)
+\coffin_new:N \l__suanpan_inner_bid_coffin
+\coffin_new:N \l__suanpan_outer_bid_coffin
+\coffin_new:N \l__suanpan_float_bid_coffin
+\coffin_new:N \l__suanpan_support_coffin
+\coffin_new:N \l_tmpc_coffin
+\coffin_new:N \l_tmpd_coffin
+
+% 凭据表(Token)
+\tl_new:N \l__suanpan_bid_draw_color_tl
+\tl_new:N \l__suanpan_bid_fill_color_tl
+\tl_new:N \l__suanpan_scale_tl
+\tl_new:N \l__suanpan_mark_font_tl
+
+% 档位最大值
+\int_new:N \l__suanpan_rod_max_int
+\int_zero:N \l__suanpan_rod_max_int
+
+% 档位算珠位置列表
+\clist_new:N \l__suanpan_bids_pos_clist
+
+% 档位数字与算珠位置对照属性表常量(内珠和外珠)
+% {x, y}==>x: 算珠位置(1-11, 1-7---下珠,8-10---上珠,11---悬珠)
+% y: 算珠类型(0---外珠,1---内珠)
+\prop_const_from_keyval:Nn \l__suanpan_rods_val_prop
+ {
+ 0 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {9, 0}, {10, 0}},
+ 1 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {9, 0}, {10, 0}},
+ 2 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {9, 0}, {10, 0}},
+ 3 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {9, 0}, {10, 0}},
+ 4 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {9, 0}, {10, 0}},
+ 5 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {8, 1}, {10, 0}},
+ 6 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {10, 0}},
+ 7 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {10, 0}},
+ 8 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}},
+ 9 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}},
+ 10 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}},
+ 11 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {9 , 1}},
+ 12 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}},
+ 13 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}},
+ 14 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}},
+ 15 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}},
+ 16 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {11, 1}},
+ 17 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {11, 1}},
+ 18 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}},
+ 19 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}},
+ 20 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}}
+ }
+
+% 尺寸计算函数
+\cs_new:Nn \__suanpan_dim_calc:
+ {
+ % 基础尺寸半长度
+ \dim_set:Nn \l__suanpan_bid_h_half_dim { \l__suanpan_bid_h_dim / 2 }
+ \dim_set:Nn \l__suanpan_bid_d_half_dim { \l__suanpan_bid_d_dim / 2 }
+ \dim_set:Nn \l__suanpan_rod_d_half_dim { \l__suanpan_rod_d_dim / 2 }
+ \dim_set:Nn \l__suanpan_frame_b_half_dim { \l__suanpan_frame_b_dim / 2 }
+ % 上珠偏移(8号算珠)
+ \dim_set:Nn \l__suanpan_bid_upper_offset_dim
+ { \l__suanpan_frame_b_half_dim + \l__suanpan_bid_h_half_dim }
+ % 下珠偏移(1号算珠)
+ \dim_set:Nn \l__suanpan_bid_lower_offset_dim
+ { -\l__suanpan_frame_b_half_dim - \l__suanpan_bid_h_dim * 7 +
+ \l__suanpan_bid_h_half_dim }
+ % 上档杆长度
+ \dim_set:Nn \l__suanpan_rod_upper_h_dim { \l__suanpan_bid_h_dim * 3 }
+ % 下档杆长度
+ \dim_set:Nn \l__suanpan_rod_lower_h_dim { \l__suanpan_bid_h_dim * 7 }
+ % 上档杆偏移
+ \dim_set:Nn \l__suanpan_rod_upper_offset_dim { \l__suanpan_frame_b_half_dim }
+ % 下档杆偏移
+ \dim_set:Nn \l__suanpan_rod_lower_offset_dim
+ { -\l__suanpan_frame_b_half_dim - \l__suanpan_rod_lower_h_dim }
+ % 上档杆位置
+ \dim_set:Nn \l__suanpan_rod_upper_dim
+ { \l__suanpan_rod_upper_offset_dim + \l__suanpan_rod_upper_h_dim }
+ % 下档杆位置
+ \dim_set:Nn \l__suanpan_rod_lower_dim { -\l__suanpan_frame_b_half_dim }
+
+ % 上边框内线偏移
+ \dim_set:Nn \l__suanpan_frame_upper_inner_offset_dim
+ { \l__suanpan_frame_b_half_dim + \l__suanpan_rod_upper_h_dim }
+ % 下边框内线偏移
+ \dim_set:Nn \l__suanpan_frame_lower_inner_offset_dim
+ { -\l__suanpan_frame_b_half_dim - \l__suanpan_rod_lower_h_dim }
+ % 上边框外线偏移
+ \dim_set:Nn \l__suanpan_frame_upper_outer_offset_dim
+ { \l__suanpan_frame_b_dim + \l__suanpan_frame_b_half_dim +
+ \l__suanpan_rod_upper_h_dim }
+ % 下边框外线偏移
+ \dim_set:Nn \l__suanpan_frame_lower_outer_offset_dim
+ { -\l__suanpan_frame_b_dim - \l__suanpan_frame_b_half_dim -
+ \l__suanpan_rod_lower_h_dim }
+
+ % 算珠上边缘
+ \dim_set:Nn \l__suanpan_bid_upper_dim
+ { \l__suanpan_bid_h_half_dim - \l__suanpan_bid_sep_dim / 2 }
+ % 算珠上边缘
+ \dim_set:Nn \l__suanpan_bid_lower_dim
+ { -\l__suanpan_bid_h_half_dim + \l__suanpan_bid_sep_dim / 2 }
+ % 算珠绘制高度
+ \dim_set:Nn \l__suanpan_bid_draw_h_dim
+ { \l__suanpan_bid_upper_dim - \l__suanpan_bid_lower_dim }
+ % 算珠绘制半高度
+ \dim_set:Nn \l__suanpan_bid_draw_h_half_dim
+ { \l__suanpan_bid_draw_h_dim / 2 }
+ % 算珠圆角半径
+ \dim_set:Nn \l__suanpan_bid_arc_dim
+ { \l__suanpan_bid_draw_h_half_dim - 1pt}
+
+ % 横梁计位点半径
+ \dim_set:Nn \l__suanpan_frame_unit_r_dim { \l__suanpan_frame_b_dim / 4 }
+
+ % 边框外线半宽度
+ \dim_set:Nn \l__suanpan_frame_outer_half_dim
+ { \l__suanpan_frame_outer_linewidth_dim / 2 }
+
+ % 档杆总成宽度
+ \dim_set:Nn \l__suanpan_support_d_dim
+ { \l__suanpan_bid_d_dim + \l__suanpan_rod_sep_dim }
+ % 档杆总成半宽度
+ \dim_set:Nn \l__suanpan_support_d_half_dim
+ { \l__suanpan_bid_d_half_dim + \l__suanpan_rod_sep_dim / 2 }
+
+ % 档杆总成组装垂直偏移
+ \dim_set:Nn \l__suanpan_support_y_offset_dim
+ { ( \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_lower_outer_offset_dim +
+ \l__suanpan_frame_outer_linewidth_dim ) / 2 -
+ \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_outer_half_dim
+ }
+
+ % 上边框内线位置
+ \dim_set:Nn \l__suanpan_frame_inner_upper_dim
+ { \l__suanpan_frame_upper_inner_offset_dim +
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ % 下边框内线位置
+ \dim_set:Nn \l__suanpan_frame_inner_lower_dim
+ { \l__suanpan_frame_lower_inner_offset_dim -
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+
+ % 边框内线高度
+ \dim_set:Nn \l__suanpan_frame_inner_h_dim
+ { \l__suanpan_rod_upper_h_dim +
+ \l__suanpan_rod_lower_h_dim +
+ \l__suanpan_frame_b_dim }
+ % 边框外线高度
+ \dim_set:Nn \l__suanpan_frame_outer_h_dim
+ { \l__suanpan_rod_upper_h_dim +
+ \l__suanpan_rod_lower_h_dim +
+ \l__suanpan_frame_b_dim * 3 }
+ }
+
+% 选项处理
+% ============宏包选项=================
+\keys_define:nn { suanpan }
+ {
+ % 草稿模式
+ draft .choice:,
+ draft / true .code:n = {%
+ \bool_set_true:N \l__suanpan_draft_bool
+ \bool_set_false:N \l__suanpan_empty_rod_bool
+ },
+ draft / false .code:n = {%
+ \bool_set_false:N \l__suanpan_draft_bool
+ \bool_set_true:N \l__suanpan_empty_rod_bool
+ },
+ draft .default:n = true,
+ draft .initial:n = false,
+
+ % 是否绘制档的数值为0的空档算珠
+ empty .choice:,
+ empty / true .code:n = { \bool_set_true:N \l__suanpan_empty_rod_bool },
+ empty / false .code:n = { \bool_set_false:N \l__suanpan_empty_rod_bool },
+ empty .default:n = true,
+ empty .initial:n = true,
+
+ unknown .code:n = { \msg_error:nn { suanpan } { unknown-option } }
+ }
+
+% key_value选项设计
+\keys_define:nn { suanpan }
+ {
+ % 绘图线宽
+ linewd .code:n = { % 算盘边框内线线宽
+ \dim_set:Nn \l__suanpan_frame_inner_linewidth_dim {#1}
+ % 算盘边框外线线宽
+ \dim_set:Nn \l__suanpan_frame_outer_linewidth_dim
+ {
+ \fp_to_dim:n
+ {
+ \fp_eval:n {%
+ \l__suanpan_frame_inner_linewidth_dim * 7.0 }
+ }
+ }
+ % 档杆线宽
+ \dim_set:Nn \l__suanpan_rod_linewidth_dim
+ {
+ \fp_to_dim:n
+ {
+ \fp_eval:n {%
+ \l__suanpan_frame_inner_linewidth_dim * 0.2 }
+ }
+ }
+ % 算珠线宽
+ \dim_set:Nn \l__suanpan_bid_linewidth_dim
+ {
+ \fp_to_dim:n
+ {
+ \fp_eval:n {%
+ \l__suanpan_frame_inner_linewidth_dim * 0.2 }
+ }
+ }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ linewd .initial:n = 2.0pt,
+
+ % 算珠高度
+ bidh .code:n = {%
+ \dim_set:Nn \l__suanpan_bid_h_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ bidh .initial:n = 12mm,
+
+ % 算珠直径
+ bidd .code:n = {%
+ \dim_set:Nn \l__suanpan_bid_d_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ bidd .initial:n = 23mm,
+
+ % 档杆直径(应小于算珠直径bidd)
+ rodd .code:n = {%
+ \dim_set:Nn \l__suanpan_rod_d_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ rodd .initial:n = 7mm,
+
+ % 边框宽度
+ framew .code:n = {%
+ \dim_set:Nn \l__suanpan_frame_b_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ framew .initial:n = 13mm,
+
+ % 档间间距
+ rodsep .code:n = {%
+ \dim_set:Nn \l__suanpan_rod_sep_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ rodsep .initial:n = 3.0pt,
+
+ % 算珠间距
+ bidsep .code:n = {%
+ \dim_set:Nn \l__suanpan_bid_sep_dim { #1 }
+ % 计算其它尺寸
+ \__suanpan_dim_calc:
+ },
+ bidsep .initial:n = 0.0pt,
+
+ % 缩放参数
+ scale .tl_set:N = \l__suanpan_scale_tl,
+ scale .initial:n = 1.0,
+
+ % 边框绘图颜色
+ framedraw .code:n = { \__suanpan_color_select:nn { framecolor } {#1} },
+ framedraw .initial:n = black,
+ framedraw* .code:n = { \__suanpan_color_select:nnn { framecolor } #1 },
+
+ % 档杆绘图颜色
+ roddraw .code:n = { \__suanpan_color_select:nn { roddrawcolor } {#1} },
+ roddraw .initial:n = black,
+ roddraw* .code:n = { \__suanpan_color_select:nnn { roddrawcolor } #1 },
+ % 档杆填充颜色
+ rodfill .code:n = { \__suanpan_color_select:nn { rodfillcolor } {#1} },
+ rodfill .initial:n = black!20,
+ rodfill* .code:n = { \__suanpan_color_select:nnn { rodfillcolor } #1 },
+
+ % 外珠绘图颜色
+ outerdraw .code:n = { \__suanpan_color_select:nn { outerdrawcolor } {#1} },
+ outerdraw .initial:n = black,
+ outerdraw* .code:n = { \__suanpan_color_select:nnn { outerdrawcolor } #1 },
+ % 外珠填充颜色
+ outerfill .code:n = { \__suanpan_color_select:nn { outerfillcolor } {#1} },
+ outerfill .initial:n = black!40,
+ outerfill* .code:n = { \__suanpan_color_select:nnn { outerfillcolor } #1 },
+
+ % 内珠绘图颜色
+ innerdraw .code:n = { \__suanpan_color_select:nn { innerdrawcolor } {#1} },
+ innerdraw .initial:n = black,
+ innerdraw* .code:n = { \__suanpan_color_select:nnn { innerdrawcolor } #1 },
+ % 内珠填充颜色
+ innerfill .code:n = { \__suanpan_color_select:nn { innerfillcolor } {#1} },
+ innerfill .initial:n = black,
+ innerfill* .code:n = { \__suanpan_color_select:nnn { innerfillcolor } #1 },
+ innerfill .initial:n = black,
+
+ % 横梁标记字符格式
+ font .code:n = {%
+ \tl_gset:Nn \l__suanpan_mark_font_tl {#1}
+ },
+ font .initial:n = \bfseries\Large,
+
+ unknown .code:n = { \msg_error:nn { suanpan } { unknown-option } }
+ }
+
+% 出错输出信息
+\msg_new:nnn { suanpan } { unknown-option }
+ { package~ option~ "\l_keys_key_tl"~ is~ unknown. }
+
+% 选项默认值
+\keys_set:nn { suanpan }
+ {
+ linewd = 2.0pt,
+ rodsep = 3.0pt,
+ bidsep = 1.8pt,
+ scale = 1.0,
+ empty = true,
+ }
+
+% 将文档类选项传给suanpan
+\ProcessKeysOptions { suanpan }
+
+% 构建内珠(靠近横梁,参与计数)容器(盒子)
+\cs_new:Nn \__suanpan_inner_bid_construct:
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \l__suanpan_bid_d_half_dim - \l__suanpan_bid_draw_h_half_dim }
+
+ \tikzset{bid/.style = {% 内珠高光填充样式
+ inner~color = innerfillcolor!30,
+ outer~color = innerfillcolor,
+ draw = innerdrawcolor,
+ line~width = \l__suanpan_bid_linewidth_dim,
+ rounded~corners = \l__suanpan_bid_arc_dim,
+ },
+ draftline/.style = {% 内珠草稿模式绘制样式
+ draw = innerfillcolor,
+ line~cap = round,% 圆角线冒
+ line~width = \l__suanpan_bid_draw_h_dim,
+ }
+ }
+
+ \group_begin:
+ \hcoffin_gset:Nn \l__suanpan_inner_bid_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \draw[draftline]
+ ( -\l_tmpa_dim, 0) -- ( \l_tmpa_dim, 0);
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shadedraw[bid]
+ ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim)
+ rectangle
+ ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim);
+ \end{tikzpicture}
+ }
+ }
+ \group_end:
+ }
+
+% 构建外珠(远离横梁,不参与计数)容器(盒子)
+\cs_new:Nn \__suanpan_outer_bid_construct:
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \l__suanpan_bid_d_half_dim - \l__suanpan_bid_draw_h_half_dim }
+
+ \tikzset{bid/.style ={
+ inner~color = outerfillcolor!30,
+ outer~color = outerfillcolor,
+ draw = outerdrawcolor,
+ line~width = \l__suanpan_bid_linewidth_dim,
+ rounded~corners = \l__suanpan_bid_arc_dim,
+ },
+ draftline/.style = {
+ draw = outerfillcolor,
+ line~cap = round,
+ line~width = \l__suanpan_bid_draw_h_dim,
+ }
+ }
+
+ \group_begin:
+ \hcoffin_gset:Nn \l__suanpan_outer_bid_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \draw[draftline]
+ ( -\l_tmpa_dim, 0) -- ( \l_tmpa_dim, 0 );
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shadedraw[bid]%
+ ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim)
+ rectangle
+ ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim);
+ \end{tikzpicture}
+ }
+ }
+ \group_end:
+ }
+
+% 构建浮珠容器(盒子)
+% 浮珠指可以在算盘中任意布置的算珠
+% #1 绘制颜色
+% #2 填充颜色
+\cs_new:Npn \__suanpan_float_bid_construct:nn #1#2
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \l__suanpan_bid_d_half_dim - \l__suanpan_bid_draw_h_half_dim }
+
+ \tikzset{bid/.style ={
+ line~width = \l__suanpan_bid_linewidth_dim,
+ rounded~corners = \l__suanpan_bid_arc_dim,
+ },
+ draftline/.style = {
+ line~cap = round,
+ line~width = \l__suanpan_bid_draw_h_dim,
+ }
+ }
+
+ \group_begin:
+ \hcoffin_gset:Nn \l__suanpan_float_bid_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \draw[draw=#2, draftline]
+ ( -\l_tmpa_dim, 0) -- ( \l_tmpa_dim, 0 );
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shadedraw[draw = #1,
+ inner~color=#2!30,
+ outer~color=#2,
+ bid]%
+ ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim)
+ rectangle
+ ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim);
+ \end{tikzpicture}
+ }
+ }
+ \group_end:
+ }
+
+% 构建档杆容器(盒子)
+\cs_new:Nn \__suanpan_support_construct:
+ {
+ % TikZ绘图样式
+ \tikzset{%
+ rod/.style = {% 档杆
+ inner~color = rodfillcolor!30,
+ outer~color = rodfillcolor,
+ draw = roddrawcolor,
+ line~width = \l__suanpan_rod_linewidth_dim,
+ },
+ beam/.style = {% 横梁
+ bottom~color = framecolor!60,
+ top~color = framecolor!60,
+ middle~color = framecolor!5,
+ },
+ frame/.style = {% 上下梁
+ bottom~color = framecolor!95,
+ top~color = framecolor!95,
+ middle~color = framecolor!15,
+ },
+ rodline/.style = {% 档杆边线
+ draw = roddrawcolor,
+ line~width = \l__suanpan_rod_linewidth_dim,
+ },
+ frameinner/.style = {% 内边框线
+ draw = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ frameouter/.style = {% 外边框线
+ draw = framecolor,
+ line~width = \l__suanpan_frame_outer_linewidth_dim,
+ },
+ }
+
+ \group_begin:
+ \hcoffin_gset:Nn \l__suanpan_support_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ % 绘制下杆
+ \draw[rodline]
+ ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_offset_dim )
+ rectangle
+ ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_dim );
+ % 绘制上杆
+ \draw[rodline]
+ ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_offset_dim )
+ rectangle
+ ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_dim );
+
+ % 绘制横梁
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim )
+ --
+ ( \l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim );
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim )
+ --
+ ( \l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim );
+
+ % 绘制上梁下边线
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_inner_offset_dim )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_inner_offset_dim );
+ % 绘制上梁上边线
+ \draw[frameouter]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_outer_linewidth_dim / 2)
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_outer_linewidth_dim / 2);
+
+ % 绘制下梁上边线
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_inner_offset_dim )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_inner_offset_dim );
+ % 绘制下梁下边线
+ \draw[frameouter]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_outer_offset_dim +
+ \l__suanpan_frame_outer_linewidth_dim / 2 )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_outer_offset_dim +
+ \l__suanpan_frame_outer_linewidth_dim / 2 );
+
+ % 绘制计位点(黑色圆点)
+ \bool_if:NT \l__suanpan_support_unit_bool
+ {
+ \fill[%
+ fill=black,
+ ] (0pt, 0pt) circle
+ [radius = \l__suanpan_frame_unit_r_dim];
+ }
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ % 绘制下杆
+ \shadedraw[rod]
+ ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_offset_dim )
+ rectangle
+ ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_dim );
+ % 绘制上杆
+ \shadedraw[rod]
+ ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_offset_dim )
+ rectangle
+ ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_dim );
+
+ % 绘制横梁
+ \shade[beam]
+ ( -\l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim )
+ rectangle
+ ( \l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim );
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim )
+ --
+ ( \l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim );
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim )
+ --
+ ( \l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim );
+
+ % 绘制上梁下边线
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_inner_offset_dim )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_inner_offset_dim );
+ % 绘制上梁上边线
+ \draw[frameouter]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_outer_linewidth_dim / 2)
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_upper_outer_offset_dim -
+ \l__suanpan_frame_outer_linewidth_dim / 2);
+
+ % 绘制下梁上边线
+ \draw[frameinner]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_inner_offset_dim )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_inner_offset_dim );
+ % 绘制下梁下边线
+ \draw[frameouter]
+ ( -\l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_outer_offset_dim +
+ \l__suanpan_frame_outer_linewidth_dim / 2 )
+ --
+ ( \l__suanpan_support_d_half_dim,
+ \l__suanpan_frame_lower_outer_offset_dim +
+ \l__suanpan_frame_outer_linewidth_dim / 2 );
+
+ % 绘制计位点(黑色圆点)
+ \bool_if:NT \l__suanpan_support_unit_bool
+ {
+ \shade[%
+ inner~color=black!40,
+ outer~color=black!80,
+ ] (0pt, 0pt) circle
+ [radius = \l__suanpan_frame_unit_r_dim];
+ }
+ \end{tikzpicture}
+ }
+ }
+ \group_end:
+ }
+
+% 绘制算珠
+% #1: 算珠位置编号
+% o o o o o o o | o o o
+% 1 2 3 4 5 6 7 8 9 10
+% | o
+% 11
+% 其中,11是悬珠位置
+% #2: 算珠类型
+% 0——外珠,1——内珠,2——浮珠
+\cs_new:Npn \__suanpan_bid_layout:nn #1#2
+ {
+ % 算珠垂直偏移
+ \int_compare:nNnTF { #1 } > { 7 }
+ {
+ \int_compare:nNnTF { #1 } < { 11 }
+ {
+ % 上珠
+ \dim_set:Nn \l_tmpb_dim{ \l__suanpan_bid_upper_offset_dim +
+ \l__suanpan_bid_h_dim * (#1 - 8) }
+ }{
+ % 悬珠
+ \dim_set:Nn \l_tmpb_dim{ \l__suanpan_frame_b_half_dim +
+ \l__suanpan_bid_h_dim * 2 }
+ }
+ }{
+ % 下珠
+ \dim_set:Nn \l_tmpb_dim{ \l__suanpan_bid_lower_offset_dim +
+ \l__suanpan_bid_h_dim * (#1 - 1) }
+ }
+
+ % 绘图算珠
+ \draw_scope_begin:
+ \draw_transform_yshift:n { \l_tmpb_dim }
+ \int_case:nnF { #2 }
+ {
+ { 0 } { \draw_coffin_use:Nnn \l__suanpan_outer_bid_coffin { hc } { vc } }
+ { 1 } { \draw_coffin_use:Nnn \l__suanpan_inner_bid_coffin { hc } { vc } }
+ { 2 } { \draw_coffin_use:Nnn \l__suanpan_float_bid_coffin { hc } { vc } }
+ }{ \msg_error:nnn { suanpan } { bid-type-error } {#2} }
+ \draw_scope_end:
+ }
+
+\msg_new:nnn { suanpan } { bid-type-error }
+ { #1~ bid~ type~ is~ unknown. }
+
+% 函数变体
+\cs_generate_variant:Nn \__suanpan_bid_layout:nn {xx}
+
+% 组装一个档位
+% #1: 档位编号(基于1,从左向右计数)
+% #2: 档位数字
+\cs_new:Npn \__suanpan_assemble_rod:nn #1#2
+ {
+ \tl_set:Nn \l_tmpb_tl { #2 }
+ % 绘制
+ \draw_scope_begin:
+ % 水平方向偏移
+ \draw_transform_xshift:n { \l__suanpan_support_d_dim * (#1 - 1) }
+
+ % 档杆
+ \draw_coffin_use:Nnnn \l__suanpan_support_coffin
+ { hc } { vc } { 0pt, -\l__suanpan_support_y_offset_dim }
+
+ % 算珠
+ \int_compare:nNnTF { #2 } = { 0 }
+ {
+ % 判断0值空档算珠是否需要绘制
+ \bool_if:NT \l__suanpan_empty_rod_bool
+ {
+ % 取得档位数字对应算珠位置及内珠/外珠编号
+ \prop_get:NnN \l__suanpan_rods_val_prop { #2 } \l_tmpa_tl
+ \clist_clear:N \l__suanpan_bids_pos_clist
+ \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl
+
+ \clist_map_inline:Nn \l__suanpan_bids_pos_clist
+ {
+ \clist_set:Nn \l_tmpa_clist { ##1 }
+ \__suanpan_bid_layout:xx { \clist_item:Nn \l_tmpa_clist { 1 } }
+ { \clist_item:Nn \l_tmpa_clist { 2 } }
+ }
+ }
+ }{
+ % 不是0值空档算珠,需要绘制
+ % 取得档位数字对应算珠位置及内珠/外珠编号
+ \prop_get:NnN \l__suanpan_rods_val_prop { #2 } \l_tmpa_tl
+ \clist_clear:N \l__suanpan_bids_pos_clist
+ \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl
+
+ \clist_map_inline:Nn \l__suanpan_bids_pos_clist
+ {
+ \clist_set:Nn \l_tmpa_clist { ##1 }
+ \__suanpan_bid_layout:xx { \clist_item:Nn \l_tmpa_clist { 1 } }
+ { \clist_item:Nn \l_tmpa_clist { 2 } }
+ }
+ }
+ \draw_scope_end:
+ }
+
+% 指定一个档位上浮珠的颜色
+% #1: 档位编号(从左向右)
+% #2: 算珠位置([1, 11])
+\cs_new:Npn \__suanpan_float_bid:nn #1#2
+ {
+ \draw_scope_begin:
+ % 水平偏移
+ \draw_transform_xshift:n { \l__suanpan_support_d_dim * ( #1 - 1 ) }
+
+ % 覆盖绘制
+ \__suanpan_bid_layout:xx { #2 }{ 2 }
+ \draw_scope_end:
+ }
+
+% 为一个档位添加计数标记
+% #1: 档位编号(基于1,从左向右)
+% #2: 标记内容
+\cs_new:Npn \__suanpan_rod_mark:nn #1#2
+ {
+ \hcoffin_set:Nn \l_tmpa_coffin
+ {
+ \begin{tikzpicture}
+ \node at ( 0, 0 ) [font=\l__suanpan_mark_font_tl] { #2 };
+ \end{tikzpicture}
+ }
+
+ \draw_scope_begin:
+ % 水平偏移
+ \draw_transform_xshift:n { \l__suanpan_support_d_dim * ( #1 - 1 ) }
+ \draw_coffin_use:Nnn \l_tmpa_coffin { hc } { vc }
+ \draw_scope_end:
+ }
+
+% 绘制边框
+% #1 第一档编号(左)
+% #2 最后一档编号(右)
+\cs_new:Npn \__suanpan_frame_layout:nn #1#2
+ {
+ % TikZ绘制样式
+ \tikzset{%
+ hframe/.style = {% 上下梁
+ bottom~color = framecolor!95,
+ top~color = framecolor!95,
+ middle~color = framecolor!15,
+ draw = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ vframe/.style = {% 左右梁
+ left~color = framecolor!95,
+ right~color = framecolor!95,
+ middle~color = framecolor!15,
+ draw = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ mframe/.style = {% 横梁
+ top~color = framecolor!60,
+ bottom~color = framecolor!60,
+ middle~color = framecolor!5,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ frameline/.style = {% 梁连线
+ draw = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ framefill/.style = {% 外框填充
+ draw = framecolor,
+ fill = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ },
+ arcline/.style = {% 转角线
+ draw = framecolor,
+ line~width = \l__suanpan_frame_inner_linewidth_dim,
+ rounded~corners = \l__suanpan_frame_inner_linewidth_dim / 2,
+ },
+ }
+
+ % 总宽度
+ \dim_set:Nn \l_tmpa_dim {
+ \fp_to_dim:n {
+ \fp_eval:n { \l__suanpan_support_d_dim * ( #2 - #1 + 1.0) }
+ }
+ }
+ % 减半档宽度
+ \dim_set:Nn \l_tmpb_dim {
+ \fp_to_dim:n {
+ \fp_eval:n { \l__suanpan_support_d_dim * ( #2 - #1 ) +
+ \l__suanpan_support_d_half_dim}
+ }
+ }
+
+ \group_begin:
+ % 上下边框基础容器(盒子)
+ \hcoffin_set:Nn \l_tmpa_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \draw[framefill]
+ ( 0pt, 0pt ) --
+ ++( \l_tmpa_dim, 0) --
+ ++( \l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) --
+ ++( -\l__suanpan_frame_b_dim, 0 ) --
+ ++( -\l_tmpa_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_dim, 0 ) --
+ cycle;
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shadedraw[hframe]
+ ( 0pt, 0pt ) --
+ ++( \l_tmpa_dim, 0) --
+ ++( \l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) --
+ ++( -\l__suanpan_frame_b_dim, 0 ) --
+ ++( -\l_tmpa_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_dim, 0 ) --
+ cycle;
+ \end{tikzpicture}
+ }
+ }
+
+ % 左右边框基础容器(盒子)
+ \hcoffin_set:Nn \l_tmpb_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \draw[framefill]
+ ( 0, 0 ) --
+ ++( 0, \l__suanpan_frame_inner_h_dim) --
+ ++( -\l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) --
+ ++( 0, -\l__suanpan_frame_outer_h_dim ) --
+ cycle;
+ \draw[arcline]
+ ( 0, 0 )
+ ++( 0, \l__suanpan_frame_inner_h_dim )
+ ++( 0, \l__suanpan_frame_b_dim )
+ ++( 0, \l__suanpan_frame_inner_linewidth_dim * 0.9 )
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) --
+ ++( 0, -\l__suanpan_frame_b_half_dim );
+ \draw[arcline]
+ ( 0, 0 )
+ ++( 0, -\l__suanpan_frame_b_dim )
+ ++( 0, -\l__suanpan_frame_inner_linewidth_dim * 0.9 )
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) --
+ ++( 0, \l__suanpan_frame_b_half_dim );
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shadedraw[vframe]
+ ( 0, 0 ) --
+ ++( 0, \l__suanpan_frame_inner_h_dim) --
+ ++( -\l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) --
+ ++( 0, -\l__suanpan_frame_outer_h_dim ) --
+ cycle;
+ \draw[arcline]
+ ( 0, 0 )
+ ++( 0, \l__suanpan_frame_inner_h_dim )
+ ++( 0, \l__suanpan_frame_b_dim )
+ ++( 0, \l__suanpan_frame_inner_linewidth_dim * 0.9 )
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) --
+ ++( 0, -\l__suanpan_frame_b_half_dim );
+ \draw[arcline]
+ ( 0, 0 )
+ ++( 0, -\l__suanpan_frame_b_dim )
+ ++( 0, -\l__suanpan_frame_inner_linewidth_dim * 0.9 )
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_b_half_dim, 0 ) --
+ ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) --
+ ++( 0, \l__suanpan_frame_b_half_dim );
+ \end{tikzpicture}
+ }
+ }
+
+ % 横梁接头基础容器(盒子)
+ \hcoffin_set:Nn \l_tmpc_coffin
+ {
+ % 判断是否为草稿模式
+ \bool_if:NTF \l__suanpan_draft_bool
+ {
+ \begin{tikzpicture}
+ \fill[fill=white,
+ line~width=\l__suanpan_frame_inner_linewidth_dim]
+ ( 0pt, 0pt ) --++( 0, \l__suanpan_frame_b_dim) --
+ ++(-\l__suanpan_frame_inner_linewidth_dim, 0) --
+ ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ cycle;
+ \draw[frameline]%
+ ( 0, \l__suanpan_frame_b_dim) --
+ ++(-\l__suanpan_frame_inner_linewidth_dim, 0) --
+ ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_inner_linewidth_dim, 0);
+ \end{tikzpicture}
+ }{
+ \begin{tikzpicture}
+ \shade[mframe]
+ ( 0pt, 0pt ) --++( 0, \l__suanpan_frame_b_dim) --
+ ++(-\l__suanpan_frame_inner_linewidth_dim, 0) --
+ ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ cycle;
+ \draw[frameline]%
+ ( 0, \l__suanpan_frame_b_dim) --
+ ++(-\l__suanpan_frame_inner_linewidth_dim, 0) --
+ ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) --
+ ++( \l__suanpan_frame_inner_linewidth_dim, 0);
+ \end{tikzpicture}
+ }
+ }
+
+ % 布置上边框
+ \draw_scope_begin:
+ \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim -
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ \draw_transform_yshift:n { \l__suanpan_frame_inner_upper_dim -
+ \l__suanpan_frame_inner_linewidth_dim }
+ \draw_coffin_use:Nnnn \l_tmpa_coffin { l } { b }
+ { -\l__suanpan_frame_b_dim, 0pt }
+ \draw_scope_end:
+
+ % 布置下边框
+ \draw_scope_begin:
+ \coffin_rotate:Nn \l_tmpa_coffin { 180 }
+ \draw_transform_xshift:n { \l_tmpa_dim - \l__suanpan_support_d_half_dim +
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+
+ \draw_transform_yshift:n { \l__suanpan_frame_inner_lower_dim +
+ \l__suanpan_frame_inner_linewidth_dim }
+ \draw_coffin_use:Nnnn \l_tmpa_coffin { l } { b }
+ { \l__suanpan_frame_b_dim, 0pt }
+ \draw_scope_end:
+
+ % 布置左边框
+ \draw_scope_begin:
+ \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim -
+ \l__suanpan_frame_b_dim -
+ \l__suanpan_frame_inner_linewidth_dim * 1.5 }
+ \draw_transform_yshift:n { \l__suanpan_frame_inner_lower_dim -
+ \l__suanpan_frame_inner_linewidth_dim }
+
+ \draw_coffin_use:Nnnn \l_tmpb_coffin { l } { b }
+ { 0pt, -\l__suanpan_frame_b_dim }
+ \draw_scope_end:
+
+ % 布置右边框
+ \draw_scope_begin:
+ \coffin_rotate:Nn \l_tmpb_coffin { 180 }
+ \draw_transform_xshift:n { \l_tmpb_dim +
+ \l__suanpan_frame_b_dim +
+ \l__suanpan_frame_inner_linewidth_dim * 1.5}% -
+ \draw_transform_yshift:n { \l__suanpan_frame_inner_upper_dim +
+ \l__suanpan_frame_inner_linewidth_dim }
+ \draw_coffin_use:Nnnn \l_tmpb_coffin { l } { b }
+ { 0pt, \l__suanpan_frame_b_dim }
+ \draw_scope_end:
+
+ % 布置左横梁接头
+ \draw_scope_begin:
+ \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim -
+ \l__suanpan_frame_b_dim / 3 -
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ \draw_transform_yshift:n { -\l__suanpan_frame_b_dim / 2 -
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ \draw_coffin_use:Nnnn \l_tmpc_coffin { l } { b } { 0pt, 0pt }
+ \draw_scope_end:
+
+ % 布置右横梁接头
+ \draw_scope_begin:
+ \coffin_rotate:Nn \l_tmpc_coffin { 180 }
+ \draw_transform_xshift:n { \l_tmpb_dim +
+ \l__suanpan_frame_b_dim / 3 +
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ \draw_transform_yshift:n { \l__suanpan_frame_b_dim / 2 +
+ \l__suanpan_frame_inner_linewidth_dim / 2 }
+ \draw_coffin_use:Nnnn \l_tmpc_coffin { l } { b } { 0pt, 0pt }
+ \draw_scope_end:
+ \group_end:
+ }
+
+% 算盘排版用户接口
+% 算盘排版环境
+% #1 suanpan环境选项
+% #2 suanpan环境内容(!b参数)
+\NewDocumentEnvironment{ suanpan }{ o !b }
+ {
+ \group_begin:
+ % 设置选项
+ \IfNoValueF{ #1 }
+ {
+ \keys_set:nn { suanpan }{ #1 }
+ }
+
+ % 构造基础容器(盒子)
+ \__suanpan_inner_bid_construct:
+ \__suanpan_outer_bid_construct:
+ \__suanpan_support_construct:
+
+ % 删除#2(!b)参数取得的环境内容中的空白
+ \str_set:Nn \l_tmpa_str { #2 }
+ \str_remove_all:Nn \l_tmpa_str {~}
+ % 将str还原为tl
+ \tl_set_rescan:Nno \l_tmpa_tl {}{ \l_tmpa_str }
+
+ % 在容器(盒子)中用#2(!b)参数取得的按环境内容实现绘制
+ \hcoffin_set:Nn \l_tmpa_coffin
+ {
+ \draw_begin:
+ \l_tmpa_tl
+ \draw_end:
+ }
+
+ \hcoffin_set:Nn \l_tmpb_coffin
+ {
+ % 将原图缩小50%
+ \coffin_scale:Nnn \l_tmpa_coffin { 0.50 } { 0.50 }
+ \coffin_typeset:Nnnnn \l_tmpa_coffin{ l }{ b }{ 0pt }{ 0pt }
+ }
+ }{
+ % 按用户指定比例缩放
+ \coffin_scale:Nnn \l_tmpb_coffin
+ { \l__suanpan_scale_tl } { \l__suanpan_scale_tl }
+
+ % 设置基字符盒子(排版深度)
+ \hbox_set:Nn \l_tmpa_box { x }
+ % 盒子深度
+ \dim_set:Nn \l_tmpa_dim { \box_dp:N \l_tmpa_box}
+
+ % 输出算盘容器(盒子)
+ \coffin_typeset:Nnnnn \l_tmpb_coffin{ l }{ b }{ 0pt }{ -\l_tmpa_dim }
+ \int_zero:N \l__suanpan_rod_max_int
+ \group_end:
+ }
+
+% 排版算盘一个档位,包括档杆和算珠
+% #1 星号命令,绘制计位点(黑色圆点)
+% #2 档位编号(基于1,从左向右计数)
+% #3 本档数字(0-20,10-15需用到顶珠和底珠,16-20需要用到悬珠)
+\NewDocumentCommand{ \rod }{ s m m }
+ {
+ % 记录原状态变量
+ \bool_set_eq:NN \l_tmpa_bool \l__suanpan_support_unit_bool
+ % 星号命令,用于在横梁绘制计位点
+ \IfBooleanTF{#1}
+ {
+ \bool_set_true:N \l__suanpan_support_unit_bool
+ }{
+ \bool_set_false:N \l__suanpan_support_unit_bool
+ }
+
+ % 如状态发生改变,则重新绘制档杆单元
+ \bool_if:NTF \l_tmpa_bool
+ {
+ \bool_if:NF \l__suanpan_support_unit_bool
+ {
+ \__suanpan_support_construct:
+ }
+ }{
+ \bool_if:NT \l__suanpan_support_unit_bool
+ {
+ \__suanpan_support_construct:
+ }
+ }
+
+ % 组装一个档位
+ \__suanpan_assemble_rod:nn { #2 }{ #3 }
+
+ % 统计档位总数
+ \int_set:Nn \l__suanpan_rod_max_int
+ { \int_max:nn { \l__suanpan_rod_max_int }{ #2 } }
+ }
+
+% 排版算盘多个档位,包括档杆和算珠
+% #1 本档数字(0-20,10-15需用到顶珠和底珠,16-20需要用到悬珠)
+% 各数字之间需要用逗号分隔。
+\NewDocumentCommand{ \rods }{ m }
+ {
+ % 构造档位数字列表
+ \clist_set:Nn \l_tmpa_clist { #1 }
+ % 初始化档位计数器
+ \int_set:Nn \l_tmpa_int { 0 }
+
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ % 档位计数器自增1
+ \int_incr:N \l_tmpa_int
+
+ % 组装当前档位
+ \__suanpan_assemble_rod:nn {\l_tmpa_int }{ ##1 }
+ }
+
+ % 记录档位总数
+ \int_set:Nn \l__suanpan_rod_max_int
+ { \int_max:nn { \l__suanpan_rod_max_int }{ \l_tmpa_int } }
+ }
+
+% 指定某档上某个算珠的颜色
+% #1 档位(基于1,从左向右计数)
+% #2 算珠位置列表(1--11,11为悬珠位置)
+% #3 算珠填充颜色
+% #4 算珠绘制颜色(默认为内珠绘制颜色)
+\NewDocumentCommand{ \bid }{ m m m O{innerdrawcolor} }
+ {
+ % 构造浮珠
+ \__suanpan_float_bid_construct:nn { #4 }{ #3 }
+
+ % 构造算珠位置列表
+ \clist_set:Nn \l_tmpa_clist { #2 }
+
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ % 绘制浮珠
+ \__suanpan_float_bid:nn { #1 }{ ##1 }
+ }
+ }
+
+% 指定某档上所有内珠或外珠的颜色
+% #1 星号命令,选择内珠或外珠
+% #2 档位(基于1,从左向右计数)
+% #3 该档数字
+% #4 算珠填充颜色(绘图颜色采用原内/外珠绘制颜色)
+\NewDocumentCommand{ \bids }{ s m m m }
+ {
+ % 取得档位数字对应算珠位置及内珠/外珠编号
+ \prop_get:NnN \l__suanpan_rods_val_prop { #3 } \l_tmpa_tl
+ \clist_clear:N \l__suanpan_bids_pos_clist
+ \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl
+
+ % 星号命令,用于选择外珠着色
+ \IfBooleanTF{#1}
+ {
+ % 构造浮珠
+ \__suanpan_float_bid_construct:nn { outerdrawcolor }{ #4 }
+
+ \clist_map_inline:Nn \l__suanpan_bids_pos_clist
+ {
+ \clist_set:Nn \l_tmpa_clist { ##1 }
+ % 选择外珠
+ \int_compare:nNnT { \clist_item:Nn \l_tmpa_clist { 2 } } = { 0 }
+ {
+ \__suanpan_float_bid:nn { #2 }{ \clist_item:Nn \l_tmpa_clist { 1 } }
+ }
+ }
+ }{
+ % 构造浮珠
+ \__suanpan_float_bid_construct:nn { innerdrawcolor }{ #4 }
+
+ \clist_map_inline:Nn \l__suanpan_bids_pos_clist
+ {
+ \clist_set:Nn \l_tmpa_clist { ##1 }
+ % 选择内珠
+ \int_compare:nNnT { \clist_item:Nn \l_tmpa_clist { 2 } } = { 1 }
+ {
+ \__suanpan_float_bid:nn { #2 }{ \clist_item:Nn \l_tmpa_clist { 1 } }
+ }
+ }
+ }
+ }
+
+% 左右边框
+\NewDocumentCommand{ \mkframe }{ }
+ {
+ \__suanpan_frame_layout:nn { 1 }{ \l__suanpan_rod_max_int }
+ }
+
+% 为各档添加计位标记
+% #1 起始档位(基于1,从左向右计数)
+% #2 标记列表
+\NewDocumentCommand{ \rodmark }{ O{1} m }
+ {
+ % 标记列表
+ \clist_set:Nn \l_tmpa_clist { #2 }
+
+ % 计数器
+ \int_set:Nn \l_tmpa_int { #1 }
+
+ % 遍历列表
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ % 输出标记
+ \__suanpan_rod_mark:nn { \l_tmpa_int }{ ##1 }
+
+ % 调整计数器
+ \int_incr:N \l_tmpa_int
+
+ % 超出最大档位
+ \int_compare:nNnT { \l_tmpa_int } > { \l__suanpan_rod_max_int }
+ {
+ \clist_map_break:
+ }
+ }
+ }
+
+% 选项设置用户接口
+\NewDocumentCommand{ \suanpanset } { m }
+ {
+ \IfNoValueF { #1}
+ {
+ \keys_set:nn { suanpan } { #1 }
+ }
+ }
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/tableof/tableof.sty b/Master/texmf-dist/tex/latex/tableof/tableof.sty
index 0af308c5eca..b2cc137c4ba 100644
--- a/Master/texmf-dist/tex/latex/tableof/tableof.sty
+++ b/Master/texmf-dist/tex/latex/tableof/tableof.sty
@@ -22,14 +22,14 @@
%% in the same archive or directory.)
%%
\ProvidesPackage{tableof}
- [2021/07/05 v1.4c Tables of tagged contents (JFB)]
+ [2024/09/17 v1.4d Tables of tagged contents (JFB)]
%%
%% Package: tableof
-%% Version: 1.4c (2021/07/05)
+%% Version: 1.4d (2024/09/17)
%% License: LPPL 1.3c
-%% Copyright (C) 2012, 2013, 2015, 2018, 2021 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2012, 2013, 2015, 2018, 2021, 2024 Jean-Francois Burnol <jfbu at free dot fr>
%%
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{atveryend}
\DeclareOption*{\PackageWarning{tableof}{Option `\CurrentOption' is unknown.}}
\ProcessOptions\relax
@@ -42,7 +42,8 @@
{\expandafter\the\expandafter\tof@toctoks\tof@buffer}%
\expandafter\tof@readtoc
\fi }
-\AtBeginDocument{\IfFileExists{\jobname.toc}
+\AtBeginDocument{%
+ \IfFileExists{\jobname.toc}
{{\endlinechar\m@ne
\makeatletter
\newread\tof@tf
@@ -50,20 +51,20 @@
\tof@toctoks{\tof@begingroup}%
\tof@readtoc
\global\tof@toctoks=\expandafter{\the\tof@toctoks\tof@endgroup}%
- \closein\tof@tf}}{}}
-\AtBeginDocument{
+ \closein\tof@tf}}
+ {}%
+}
+\AtBeginDocument{%
\addtocontents{toc}{\string\@ifundefined{tof@begin}%
{\global\let\string\tof@begin\relax
\global\let\string\tof@finish\string\@empty
\global\let\string\tof@starttags\string\@gobble
\global\let\string\tof@stoptags\string\@gobble
\global\let\string\tof@tagthis\string\@gobble
- \global\let\string\tof@untagthis\string\@gobble}\relax}
- \addtocontents{toc}{\string\tof@begin}
- \@ifpackageloaded{hyperref}
- {\def\tof@gobblethree@orfour#1#2#3#4{}%
- \ifx\hyper@last\@undefined\tof@toctoks{}\fi}
- {\def\tof@gobblethree@orfour#1#2#3{}}}
+ \global\let\string\tof@untagthis\string\@gobble}\relax}%
+ \addtocontents{toc}{\string\tof@begin}%
+}
+\let\tof@gobblethree@orfour\@gobblefour
\AfterLastShipout
{\immediate\write\@auxout{\string\@writefile{toc}{\string\tof@finish}}}
\let\tof@global \@empty
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
index 7a9a9d6d55d..a6f4347d43a 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-base} {2024-09-16} {0.99f}
{part of tagpdf - provide base, no-op versions of the user commands }
\cs_new_protected:Npn \__tag_whatsits: {}
\AddToHook{begindocument}
@@ -39,36 +39,14 @@
\cs_set_protected:Npn \__tag_whatsits: {\tex_special:D {} }
}
}
-\cs_if_free:NT \pdf_object_new_indexed:nn
- {
- \cs_generate_variant:Nn \pdf_object_new:n {e}
- \cs_generate_variant:Nn \pdf_object_write:nnn {enn}
- \cs_new_protected:Npn \pdf_object_new_indexed:nn #1 #2
- {
- \pdf_object_new:e {#1/\int_eval:n{#2}}
- }
- \cs_new_protected:Npn \pdf_object_write_indexed:nnnn #1 #2 #3 #4
- {
- \pdf_object_write:enn {#1/\int_eval:n{#2}}{#3}{#4}
- }
- \cs_generate_variant:Nn \pdf_object_write_indexed:nnnn {nnne}
- \cs_new:Npn\pdf_object_ref_indexed:nn #1 #2
- {
- \pdf_object_ref:e {#1/\int_eval:n{#2}}
- }
- \cs_new:Npn \__kernel_pdf_object_id_indexed:nn #1 #2
- {
- \int_use:c
- { c__pdf_object_ #1/\int_eval:n{#2} _int }
- }
- }
-
\cs_new_protected:Npn \tag_stop:{}
\cs_new_protected:Npn \tag_start:{}
\cs_new_protected:Npn \tagstop{}
\cs_new_protected:Npn \tagstart{}
\cs_new_protected:Npn \tag_stop:n #1 {}
\cs_new_protected:Npn \tag_start:n #1 {}
+\cs_set_eq:NN \tag_suspend:n \tag_stop:n
+\cs_set_eq:NN \tag_resume:n \tag_start:n
%% File: tagpdf-mc-generic.dtx
\cs_new_protected:Npn \tag_mc_begin:n #1 { \__tag_whatsits: \int_gincr:N \c@g__tag_MCID_abs_int }
\cs_new_protected:Nn \tag_mc_end:{ \__tag_whatsits: }
@@ -106,6 +84,7 @@
\cs_new_protected:Npn \tag_struct_end:n{}
\cs_new_protected:Npn \tag_struct_use:n #1 {}
\cs_new_protected:Npn \tag_struct_use_num:n #1 {}
+\cs_new_protected:Npn \tag_struct_gput:nnn #1 #2 #3{}
%% File: tagpdf-checks.dtx
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 901c138ac94..10b9399ba38 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-debug-generic} {2024-09-16} {0.99f}
{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 5872b3cee0a..104228a144e 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-debug-lua} {2024-09-16} {0.99f}
{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 4aec29b682d..198c0be0c0a 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty
@@ -26,38 +26,14 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-debug} {2024-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-debug} {2024-09-16} {0.99f}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
\prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {}
\prop_gput:Nnn \g_msg_module_name_prop { tag / debug }{tagpdf~DEBUG}
-\cs_if_free:NT \pdf_object_new_indexed:nn
- {
- \cs_generate_variant:Nn \pdf_object_new:n {e}
- \cs_generate_variant:Nn \pdf_object_write:nnn {enn}
- \cs_new_protected:Npn \pdf_object_new_indexed:nn #1 #2
- {
- \pdf_object_new:e {#1/\int_eval:n{#2}}
- }
- \cs_new_protected:Npn \pdf_object_write_indexed:nnnn #1 #2 #3 #4
- {
- \pdf_object_write:enn {#1/\int_eval:n{#2}}{#3}{#4}
- }
- \cs_generate_variant:Nn \pdf_object_write_indexed:nnnn {nnne}
- \cs_new:Npn\pdf_object_ref_indexed:nn #1 #2
- {
- \pdf_object_ref:e {#1/\int_eval:n{#2}}
- }
- \cs_new:Npn \__kernel_pdf_object_id_indexed:nn #1 #2
- {
- \int_use:c
- { c__pdf_object_ #1/\int_eval:n{#2} _int }
- }
- }
-
\cs_set_protected:Npn \tag_stop:
{
- \msg_note:nne {tag / debug }{tag-stop}{ \int_use:N \l__tag_tag_stop_int }
+ \msg_note:nne {tag / debug }{tag-suspend}{ \int_use:N \l__tag_tag_stop_int }
\int_incr:N \l__tag_tag_stop_int
\bool_set_false:N \l__tag_active_struct_bool
\bool_set_false:N \l__tag_active_mc_bool
@@ -74,20 +50,22 @@
\bool_set_true:N \l__tag_active_socket_bool
\__tag_start_para_ints:
}
- \msg_note:nne {tag / debug }{tag-start}{ \int_use:N \l__tag_tag_stop_int }
+ \msg_note:nne {tag / debug }{tag-resume}{ \int_use:N \l__tag_tag_stop_int }
}
\cs_set_eq:NN\tagstop\tag_stop:
\cs_set_eq:NN\tagstart\tag_start:
-\cs_set_protected:Npn \tag_stop:n #1
+\cs_set_protected:Npn \tag_suspend:n #1
{
- \msg_note:nnee {tag / debug }{tag-stop}{ \int_use:N \l__tag_tag_stop_int }{#1}
+ \msg_note:nnee {tag / debug }{tag-suspend}
+ { \int_use:N \l__tag_tag_stop_int }{\exp_not:n{#1}}
\int_incr:N \l__tag_tag_stop_int
\bool_set_false:N \l__tag_active_struct_bool
\bool_set_false:N \l__tag_active_mc_bool
\bool_set_false:N \l__tag_active_socket_bool
\__tag_stop_para_ints:
}
-\cs_set_protected:Npn \tag_start:n #1
+\cs_set_eq:NN \tag_stop:n \tag_suspend:n
+\cs_set_protected:Npn \tag_resume:n #1
{
\int_if_zero:nF { \l__tag_tag_stop_int } { \int_decr:N \l__tag_tag_stop_int }
\int_if_zero:nT { \l__tag_tag_stop_int }
@@ -97,8 +75,10 @@
\bool_set_true:N \l__tag_active_socket_bool
\__tag_start_para_ints:
}
- \msg_note:nnee {tag / debug }{tag-start}{ \int_use:N \l__tag_tag_stop_int }{#1}
+ \msg_note:nnee {tag / debug }{tag-resume}
+ { \int_use:N \l__tag_tag_stop_int }{\exp_not:n{#1}}
}
+\cs_set_eq:NN \tag_start:n \tag_resume:n
\bool_if:NTF \g__tag_mode_lua_bool
{
\RequirePackage {tagpdf-debug-lua}
@@ -217,20 +197,20 @@
}
}
}
-\msg_new:nnn { tag / debug } {tag-stop}
+\msg_new:nnn { tag / debug } {tag-suspend}
{
\int_if_zero:nTF
{#1}
- {Tagging~stopped}
- {Tagging~(not)~stopped~(already~inactive)}\\
+ {Tagging~suspended}
+ {Tagging~(not)~suspended~(already~inactive)}\\
level:~#1~==>~\int_eval:n{#1+1}\tl_if_empty:nF{#2}{,~label:~#2}~[\msg_line_context:]
}
-\msg_new:nnn { tag / debug } {tag-start}
+\msg_new:nnn { tag / debug } {tag-resume}
{
\int_if_zero:nTF
{#1}
- {Tagging~restarted}
- {Tagging~(not)~restarted}\\
+ {Tagging~resumed}
+ {Tagging~(not)~resumed}\\
level:~\int_eval:n{#1+1}~==>~#1\tl_if_empty:nF{#2}{,~label:~#2}~[\msg_line_context:]
}
%% File: tagpdf-user.dtx
@@ -285,7 +265,7 @@
\seq_new:c { g__tag_struct_debug_kids_1_seq }
\prop_gset_eq:cc { g__tag_struct_debug_1_prop }{ g__tag_struct_1_prop }
\prop_gremove:cn { g__tag_struct_debug_1_prop }{Namespaces}
-\cs_set_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 %#1 structure num, #2 MCID absnum%
+\cs_set_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2
{
\__tag_seq_gput_right:ce
{ g__tag_struct_kids_#1_seq }
@@ -303,7 +283,8 @@
\prop_item:Nn \g__tag_struct_cont_mc_prop {#2}
}
}
-\cs_set_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 %#1 num of parent struct, #2 kid struct
+\cs_set_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2
+%%#1 num of parent struct, #2 kid struct
{
\__tag_seq_gput_right:ce
{ g__tag_struct_kids_#1_seq }
@@ -316,8 +297,22 @@
Struct~#2
}
}
-
+\cs_set_protected:Npn\__tag_struct_kid_struct_gput_left:nn #1 #2
+%%#1 num of parent struct, #2 kid struct
+ {
+ \__tag_seq_gput_left:ce
+ { g__tag_struct_kids_#1_seq }
+ {
+ \pdf_object_ref_indexed:nn { __tag/struct }{ #2 }
+ }
+ \seq_gput_left:cn
+ { g__tag_struct_debug_kids_#1_seq }
+ {
+ Struct~#2
+ }
+ }
\cs_set_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3
+%%#1 num of parent struct,#2 obj reference,#3 page object reference
{
\pdf_object_unnamed_write:nn
{ dict }
@@ -371,13 +366,6 @@
\g__tag_struct_tag_tl
\g__tag_struct_tag_NS_tl
\__tag_check_structure_has_tag:n { \int_use:N \c@g__tag_struct_abs_int }
- \tl_if_empty:NF
- \l__tag_struct_key_label_tl
- {
- \__tag_property_record:eV
- {tagpdfstruct-\l__tag_struct_key_label_tl}
- \c__tag_property_struct_clist
- }
\int_compare:nNnT { \l__tag_struct_stack_parent_tmpa_tl } = { -1 }
{
\seq_get:NNF
@@ -479,7 +467,7 @@
%record this structure as kid:
%\tl_show:N \g__tag_struct_stack_current_tl
%\tl_show:N \l__tag_struct_stack_parent_tmpa_tl
- \__tag_struct_kid_struct_gput_right:ee
+ \use:c { __tag_struct_kid_struct_gput_ \l__tag_struct_addkid_tl :ee }
{ \l__tag_struct_stack_parent_tmpa_tl }
{ \g__tag_struct_stack_current_tl }
%\prop_show:c { g__tag_struct_\g__tag_struct_stack_current_tl _prop }
@@ -554,29 +542,29 @@
\__tag_check_if_active_struct:T
{
\prop_if_exist:cTF
- { g__tag_struct_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop } %
+ { g__tag_struct_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop } %
{
\__tag_check_struct_used:n {#1}
%add the label structure as kid to the current structure (can be the root)
\__tag_struct_kid_struct_gput_right:ee
{ \g__tag_struct_stack_current_tl }
- { \__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1} }
+ { \property_ref:enn{tagpdfstruct-#1}{tagstruct}{1} }
%add the current structure to the labeled one as parents
\__tag_prop_gput:cne
- { g__tag_struct_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
+ { g__tag_struct_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
{ P }
{
\pdf_object_ref_indexed:nn { __tag/struct } { \g__tag_struct_stack_current_tl }
}
\prop_gput:cne
- { g__tag_struct_debug_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
+ { g__tag_struct_debug_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
{ P }
{
parent~structure:~\g__tag_struct_stack_current_tl\c_space_tl=~
\g__tag_struct_tag_tl
}
\__tag_struct_get_parentrole:eNN
- {\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}}
+ {\property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}}
\l__tag_tmpa_tl
\l__tag_tmpb_tl
\__tag_check_parent_child:VVVVN
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def
index 1425f7f3ae1..9782383e677 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-08-02} {0.99d}
+\ProvidesExplFile {tagpdf-luatex.def} {2024-09-16} {0.99f}
{tagpdf~driver~for~luatex}
{
\fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont
@@ -46,7 +46,7 @@
\cs_set_protected:Npn \__tag_prop_gput:Nnn #1 #2 #3
{
\prop_gput:Nnn #1 { #2 } { #3 }
- \lua_now:e { ltx.__tag.tables.\cs_to_str:N#1 ["#2"] = "#3" }
+ \lua_now:e { ltx.__tag.tables.\cs_to_str:N#1 ["#2"] = "\lua_escape:n{#3}" }
}
\cs_set_protected:Npn \__tag_seq_gput_right:Nn #1 #2
@@ -54,7 +54,11 @@
\seq_gput_right:Nn #1 { #2 }
\lua_now:e { table.insert(ltx.__tag.tables.\cs_to_str:N#1, "#2") }
}
-
+\cs_set_protected:Npn \__tag_seq_gput_left:Nn #1 #2
+ {
+ \seq_gput_left:Nn #1 { #2 }
+ \lua_now:e { table.insert(ltx.__tag.tables.\cs_to_str:N#1, "#2") }
+ }
\cs_set:Npn \__tag_seq_item:cn #1 #2
{
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 20f619c57b2..e15b161e45a 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-09-16} {0.99f}
{part of tagpdf - code related to marking chunks - generic mode}
\tl_new:N \l__tag_mc_ref_abspage_tl
@@ -276,14 +276,14 @@
\__tag_prop_new:N \g__tag_MCID_byabspage_prop
\int_new:N \g__tag_MCID_tmp_bypage_int
\cs_generate_variant:Nn \__tag_mc_bdc:nn {ne}
- \__tag_property_gset:nnnn {tagmcid } { now }
+ \property_gset:nnnn {tagmcid } { now }
{0} { \int_use:N \g__tag_MCID_tmp_bypage_int }
\cs_new_protected:Npn \__tag_mc_bdc_mcid:nn #1 #2
{
\int_gincr:N \c@g__tag_MCID_abs_int
\tl_set:Ne \l__tag_mc_ref_abspage_tl
{
- \__tag_property_ref:enn %3 args
+ \property_ref:enn %3 args
{
mcid-\int_use:N \c@g__tag_MCID_abs_int
}
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 e87996ede51..cdaa00d7421 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-09-16} {0.99f}
{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 c869398d1c6..1e3f6a621f0 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-09-16} {0.99f}
%% {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 de5cfacde9a..23ed98ec64e 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-09-16} {0.99f}
%% {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 eba7d348687..89c8e7192d8 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-09-16} {0.99f}
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 3dd6cd6af68..013cd0a2e91 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-09-16} {0.99f}
%% {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 f646b798d92..f00b99a5632 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-09-16} {0.99f}
%% {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 6acd9851901..29dc81f79f4 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-09-16} {0.99f}
,,,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 74e8ba8e519..38f5c33947c 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-08-02} {0.99d}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-09-16} {0.99f}
,,,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 eebcf5ec97d..5aec9d346da 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.99d", --TAGVERSION
- date = "2024-08-02", --TAGDATE
+ version = "0.99f", --TAGVERSION
+ date = "2024-09-16", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
index 063109a7a22..2f85934f312 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
@@ -28,8 +28,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf} {2024-08-02} {0.99d}
- { A package to experiment with pdf tagging }
+\ProvidesExplPackage {tagpdf} {2024-09-16} {0.99f}
+ { LaTeX kernel code for PDF tagging }
\bool_if:nF
{
@@ -65,30 +65,23 @@
\ExecuteOptions{luamode}
\ProcessOptions
\RequirePackage{tagpdf-base}
-\cs_if_free:NT \pdf_object_new_indexed:nn
- {
- \cs_generate_variant:Nn \pdf_object_new:n {e}
- \cs_generate_variant:Nn \pdf_object_write:nnn {enn}
- \cs_new_protected:Npn \pdf_object_new_indexed:nn #1 #2
- {
- \pdf_object_new:e {#1/\int_eval:n{#2}}
- }
- \cs_new_protected:Npn \pdf_object_write_indexed:nnnn #1 #2 #3 #4
- {
- \pdf_object_write:enn {#1/\int_eval:n{#2}}{#3}{#4}
- }
- \cs_generate_variant:Nn \pdf_object_write_indexed:nnnn {nnne}
- \cs_new:Npn\pdf_object_ref_indexed:nn #1 #2
- {
- \pdf_object_ref:e {#1/\int_eval:n{#2}}
- }
- \cs_new:Npn \__kernel_pdf_object_id_indexed:nn #1 #2
- {
- \int_use:c
- { c__pdf_object_ #1/\int_eval:n{#2} _int }
- }
- }
-
+\AddToHook{package/latex-lab-testphase-new-or-2/after}
+ {
+ \cs_set_protected:Npn \__fnote_gput_ref:nn #1 #2 %#1 the structure number receiving the ref #2
+ {
+ \tag_struct_gput:nnn {#1}{ref_num}{#2}
+ }
+ }
+\AddToHook{package/latex-lab-testphase-toc/after}
+ {
+ \cs_set_protected:Npn \g__tag_struct_ref_by_dest:
+ {
+ \prop_map_inline:Nn\g__tag_struct_ref_by_dest_prop
+ {
+ \tag_struct_gput:nnn {##1}{ref_dest}{##2}
+ }
+ }
+ }
\cs_new_protected:Npn \__tag_lastpagelabel:
{
\legacy_if:nT { @filesw }
@@ -110,6 +103,7 @@
{\__tag_lastpagelabel:}
\tl_new:N \l__tag_tmpa_tl
\tl_new:N \l__tag_tmpb_tl
+\tl_new:N \l__tag_Ref_tmpa_tl
\tl_new:N \l__tag_get_tmpc_tl
\tl_new:N \l__tag_get_parent_tmpa_tl
\tl_new:N \l__tag_get_parent_tmpb_tl
@@ -148,10 +142,6 @@
\cs_generate_variant:Nn \seq_set_split:Nnn{Nne} %** unneeded
\cs_generate_variant:Nn \str_set_convert:Nnnn {Nonn, Noon, Nnon }
\cs_generate_variant:Nn \clist_map_inline:nn {on}
- \cs_new_eq:NN \__tag_property_new:nnnn \property_new:nnnn
- \cs_new_eq:NN \__tag_property_gset:nnnn \property_gset:nnnn
- \cs_new_eq:NN \__tag_property_ref:nnn \property_ref:nnn
- \cs_new_eq:NN \__tag_property_ref:nn \property_ref:nn
\cs_new_protected:Npn \__tag_property_record:nn #1#2
{
\@bsphack
@@ -159,29 +149,29 @@
\@esphack
}
-\cs_generate_variant:Nn \__tag_property_ref:nnn {enn}
-\cs_generate_variant:Nn \__tag_property_ref:nn {en}
+\cs_generate_variant:Nn \property_ref:nnn {enn}
+\cs_generate_variant:Nn \property_ref:nn {en}
\cs_generate_variant:Nn \__tag_property_record:nn {en,eV}
\cs_new:Npn \__tag_property_ref_lastpage:nn #1 #2
{
- \__tag_property_ref:nnn {@tag@LastPage}{#1}{#2}
+ \property_ref:nnn {@tag@LastPage}{#1}{#2}
}
-\__tag_property_new:nnnn
+\property_new:nnnn
{ tagstruct } { now }
- {0} { \int_use:N \c@g__tag_struct_abs_int }
-\__tag_property_new:nnnn { tagstructobj } { now } {}
+ {1} { \int_use:N \c@g__tag_struct_abs_int }
+\property_new:nnnn { tagstructobj } { now } {}
{
\pdf_object_ref_indexed:nn { __tag/struct } { \c@g__tag_struct_abs_int }
}
-\__tag_property_new:nnnn
+\property_new:nnnn
{ tagabspage } { shipout }
{0} { \int_use:N \g_shipout_readonly_int }
-\__tag_property_new:nnnn { tagmcabs } { now }
+\property_new:nnnn { tagmcabs } { now }
{0} { \int_use:N \c@g__tag_MCID_abs_int }
\flag_new:n { __tag/mcid }
-\__tag_property_new:nnnn {tagmcid } { shipout }
+\property_new:nnnn {tagmcid } { shipout }
{0} { \flag_height:n { __tag/mcid } }
@@ -190,12 +180,14 @@
\cs_set_eq:NN \__tag_seq_new:N \seq_new:N
\cs_set_eq:NN \__tag_prop_gput:Nnn \prop_gput:Nnn
\cs_set_eq:NN \__tag_seq_gput_right:Nn \seq_gput_right:Nn
+\cs_set_eq:NN \__tag_seq_gput_left:Nn \seq_gput_left:Nn
\cs_set_eq:NN \__tag_seq_item:cn \seq_item:cn
\cs_set_eq:NN \__tag_prop_item:cn \prop_item:cn
\cs_set_eq:NN \__tag_seq_show:N \seq_show:N
\cs_set_eq:NN \__tag_prop_show:N \prop_show:N
\cs_generate_variant:Nn \__tag_prop_gput:Nnn { Nen , Nee, Nne , cnn, cen, cne, cno, cnx}
\cs_generate_variant:Nn \__tag_seq_gput_right:Nn { Ne , No, cn, ce }
+\cs_generate_variant:Nn \__tag_seq_gput_left:Nn { ce }
\cs_generate_variant:Nn \__tag_prop_new:N { c }
\cs_generate_variant:Nn \__tag_seq_new:N { c }
\cs_generate_variant:Nn \__tag_seq_show:N { c }
@@ -222,7 +214,7 @@
}
\cs_set_eq:NN\tagstop\tag_stop:
\cs_set_eq:NN\tagstart\tag_start:
-\cs_set_protected:Npn \tag_stop:n #1
+\cs_set_protected:Npn \tag_suspend:n #1
{
\int_incr:N \l__tag_tag_stop_int
\bool_set_false:N \l__tag_active_struct_bool
@@ -230,7 +222,8 @@
\bool_set_false:N \l__tag_active_socket_bool
\__tag_stop_para_ints:
}
-\cs_set_protected:Npn \tag_start:n #1
+\cs_set_eq:NN \tag_stop:n \tag_suspend:n
+\cs_set_protected:Npn \tag_resume:n #1
{
\int_if_zero:nF { \l__tag_tag_stop_int } { \int_decr:N \l__tag_tag_stop_int }
\int_if_zero:nT { \l__tag_tag_stop_int }
@@ -241,6 +234,7 @@
\__tag_start_para_ints:
}
}
+\cs_set_eq:NN \tag_start:n \tag_resume:n
\keys_define:nn { __tag / setup }
{
activate/mc .bool_gset:N = \g__tag_active_mc_bool,
@@ -329,6 +323,11 @@
{ structure~with~label~#1~is~unknown~rerun}
\msg_new:nnn { tag } {struct-show-closing}
{ closing~structure~#1~tagged~\use:e{\prop_item:cn{g__tag_struct_#1_prop}{S}} }
+\msg_new:nnn { tag } {struct-Ref-unknown}
+ {
+ #1~has~no~related~structure.\\
+ /Ref~not~updated.
+ }
\msg_new:nnn { tag } {tree-struct-still-open}
{
There~are~still~open~structures~on~the~stack!\\
@@ -435,7 +434,7 @@
\cs_new_protected:Npn \__tag_check_struct_used:n #1 %#1 label
{
\prop_get:cnNT
- {g__tag_struct_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop}
+ {g__tag_struct_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop}
{P}
\l__tag_tmpa_tl
{
@@ -568,7 +567,7 @@
{
\int_compare:nT
{
- \__tag_property_ref:enn
+ \property_ref:enn
{mcid-####1}
{tagabspage}
{-1}
@@ -579,7 +578,7 @@
\seq_gput_right:Ne \l_tmpa_seq
{
Page##1-####1-
- \__tag_property_ref:enn
+ \property_ref:enn
{mcid-####1}
{tagmcid}
{-1}
@@ -649,7 +648,7 @@
{
\__tag_check_if_active_struct:T
{
- \tl_set:Ne \l__tag_tmpa_tl { \__tag_property_ref:nnn{tagpdf-#1}{tagmcabs}{} }
+ \tl_set:Ne \l__tag_tmpa_tl { \property_ref:nnn{tagpdf-#1}{tagmcabs}{} }
\tl_if_empty:NTF\l__tag_tmpa_tl
{
\msg_warning:nnn {tag} {mc-label-unknown} {#1}
@@ -671,12 +670,12 @@
\tag_mc_end_push:
\tag_mc_begin:n {artifact=#1}
\group_begin:
- \tag_stop:n{artifact-group}
+ \tag_suspend:n{artifact-group}
}
\cs_set_protected:Npn \tag_mc_artifact_group_end:
{
- \tag_start:n{artifact-group}
+ \tag_resume:n{artifact-group}
\group_end:
\tag_mc_end:
\tag_mc_begin_pop:n{}
@@ -759,30 +758,6 @@
},
}
%% File: tagpdf.dtx
-\cs_if_free:NT \pdf_object_new_indexed:nn
- {
- \cs_generate_variant:Nn \pdf_object_new:n {e}
- \cs_generate_variant:Nn \pdf_object_write:nnn {enn}
- \cs_new_protected:Npn \pdf_object_new_indexed:nn #1 #2
- {
- \pdf_object_new:e {#1/\int_eval:n{#2}}
- }
- \cs_new_protected:Npn \pdf_object_write_indexed:nnnn #1 #2 #3 #4
- {
- \pdf_object_write:enn {#1/\int_eval:n{#2}}{#3}{#4}
- }
- \cs_generate_variant:Nn \pdf_object_write_indexed:nnnn {nnne}
- \cs_new:Npn\pdf_object_ref_indexed:nn #1 #2
- {
- \pdf_object_ref:e {#1/\int_eval:n{#2}}
- }
- \cs_new:Npn \__kernel_pdf_object_id_indexed:nn #1 #2
- {
- \int_use:c
- { c__pdf_object_ #1/\int_eval:n{#2} _int }
- }
- }
-
\bool_if:NTF \g__tag_mode_lua_bool
{
\RequirePackage {tagpdf-mc-code-lua}
@@ -964,11 +939,11 @@
{
%mcid####1
\int_compare:nT
- {\__tag_property_ref:enn{mcid-####1}{tagabspage}{-1}=##1} %mcid is on current page
+ {\property_ref:enn{mcid-####1}{tagabspage}{-1}=##1} %mcid is on current page
{% yes
\prop_put:Nee
\l__tag_tmpa_prop
- {\__tag_property_ref:enn{mcid-####1}{tagmcid}{-1}}
+ {\property_ref:enn{mcid-####1}{tagmcid}{-1}}
{\prop_item:Nn \g__tag_mc_parenttree_prop {####1}}
}
}
@@ -1999,8 +1974,12 @@
\tl_new:N \g__tag_struct_tag_NS_tl
\tl_new:N \l__tag_struct_roletag_tl
\tl_new:N \l__tag_struct_roletag_NS_tl
-\tl_new:N \l__tag_struct_key_label_tl
+\prop_new_linked:N \g__tag_struct_label_num_prop
+
\bool_new:N \l__tag_struct_elem_stash_bool
+\tl_new:N \l__tag_struct_addkid_tl
+\tl_set:Nn \l__tag_struct_addkid_tl {right}
+
\prop_new_linked:N \g__tag_struct_ref_by_dest_prop
\cs_new:Npn \__tag_struct_output_prop_aux:nn #1 #2 %#1 num, #2 key
{
@@ -2121,11 +2100,11 @@
/Type \c_space_tl /MCR \c_space_tl
/Pg
\c_space_tl
- \pdf_pageobject_ref:n { \__tag_property_ref:enn{mcid-#1}{tagabspage}{1} }
- /MCID \c_space_tl \__tag_property_ref:enn{mcid-#1}{tagmcid}{1}
+ \pdf_pageobject_ref:n { \property_ref:enn{mcid-#1}{tagabspage}{1} }
+ /MCID \c_space_tl \property_ref:enn{mcid-#1}{tagmcid}{1}
>>
}
-\cs_new_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 %#1 structure num, #2 MCID absnum%
+\cs_new_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2
{
\__tag_seq_gput_right:ce
{ g__tag_struct_kids_#1_seq }
@@ -2139,7 +2118,8 @@
}
}
\cs_generate_variant:Nn \__tag_struct_kid_mc_gput_right:nn {ne}
-\cs_new_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 %#1 num of parent struct, #2 kid struct
+\cs_new_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2
+%%#1 num of parent struct, #2 kid struct
{
\__tag_seq_gput_right:ce
{ g__tag_struct_kids_#1_seq }
@@ -2147,11 +2127,21 @@
\pdf_object_ref_indexed:nn { __tag/struct }{ #2 }
}
}
-
\cs_generate_variant:Nn \__tag_struct_kid_struct_gput_right:nn {ee}
-\cs_new_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3 %#1 num of parent struct,
- %#2 obj reference
- %#3 page object reference
+\cs_new_protected:Npn\__tag_struct_kid_struct_gput_left:nn #1 #2
+%%#1 num of parent struct, #2 kid struct
+ {
+ \__tag_seq_gput_left:ce
+ { g__tag_struct_kids_#1_seq }
+ {
+ \pdf_object_ref_indexed:nn { __tag/struct }{ #2 }
+ }
+ }
+\cs_generate_variant:Nn \__tag_struct_kid_struct_gput_left:nn {ee}
+\cs_new_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3
+
+
+%%#1 num of parent struct,#2 obj reference,#3 page object reference
{
\pdf_object_unnamed_write:nn
{ dict }
@@ -2260,25 +2250,38 @@
\tl_clear:N #2
\prop_map_inline:cn { g__tag_struct_#1_prop }
{
- \tl_put_right:Ne #2
+ \cs_if_exist_use:cTF {__tag_struct_format_##1:nnN}
{
- \cs_if_exist_use:cTF {__tag_struct_format_##1:nn}
- {{##1}{##2}}
- {\c_space_tl/##1~##2}
+ {##1}{##2}#2
+ }
+ {
+ \tl_put_right:Ne #2 { \c_space_tl/##1~##2 }
}
}
}
-\cs_new:Nn\__tag_struct_format_rolemap:nn{}
-\cs_new:Nn\__tag_struct_format_parentrole:nn{}
+\cs_new:Nn\__tag_struct_format_rolemap:nnN{}
+\cs_new:Nn\__tag_struct_format_parentrole:nnN{}
-\cs_new:Nn\__tag_struct_format_Ref:nn{\c_space_tl/#1~[#2]}
+\cs_new_protected:Nn\__tag_struct_format_Ref:nnN
+ {
+ \tl_put_right:Nn #3 { ~/#1~[ } %]
+ \clist_map_inline:nn{ #2 }
+ {
+ ##1 #3
+ }
+ \tl_put_right:Nn #3
+ { %[
+ \c_space_tl]
+ }
+ }
\cs_new_protected:Npn \__tag_struct_write_obj:n #1 % #1 is the struct num
{
\prop_if_exist:cTF { g__tag_struct_#1_prop }
{
\prop_get:cnNF { g__tag_struct_#1_prop } {P}\l__tag_tmpb_tl
{
- \prop_gput:cne { g__tag_struct_#1_prop } {P}{\pdf_object_ref_indexed:nn { __tag/struct }{1}}
+ \prop_gput:cne { g__tag_struct_#1_prop } {P}
+ {\pdf_object_ref_indexed:nn { __tag/struct }{1}}
\prop_gput:cne { g__tag_struct_#1_prop } {S}{/Artifact}
\seq_if_empty:cF {g__tag_struct_kids_#1_seq}
{
@@ -2304,8 +2307,9 @@
\msg_error:nnn { tag } { struct-no-objnum } { #1}
}
}
-\cs_new_protected:Npn \__tag_struct_insert_annot:nn #1 #2 %#1 object reference to the annotation/xform
- %#2 structparent number
+\cs_new_protected:Npn \__tag_struct_insert_annot:nn #1 #2
+ %#1 object reference to the annotation/xform
+ %#2 structparent number
{
\bool_if:NT \g__tag_active_struct_bool
{
@@ -2327,7 +2331,8 @@
#1 %
}
{
- \pdf_pageobject_ref:n { \__tag_property_ref:nnn {@tag@objr@page@#2 }{ tagabspage }{1} }
+ \pdf_pageobject_ref:n
+ { \property_ref:nnn {@tag@objr@page@#2 }{ tagabspage }{1} }
}
% add the parent obj number to the parent tree:
\exp_args:Nne
@@ -2336,7 +2341,8 @@
#2
}
{
- \pdf_object_ref_indexed:nn { __tag/struct }{ \l__tag_struct_stack_parent_tmpa_tl }
+ \pdf_object_ref_indexed:nn
+ { __tag/struct }{ \l__tag_struct_stack_parent_tmpa_tl }
}
% increase the int:
\int_gincr:N \c@g__tag_parenttree_obj_int
@@ -2357,7 +2363,8 @@
\socket_new:nn { tag/struct/tag }{1}
\socket_new_plug:nnn { tag/struct/tag }{ latex-tags }
{
- \seq_set_split:Nne \l__tag_tmpa_seq { / } {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}}
+ \seq_set_split:Nne \l__tag_tmpa_seq { / }
+ {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}}
\tl_gset:Ne \g__tag_struct_tag_tl { \seq_item:Nn\l__tag_tmpa_seq {1} }
\tl_gset:Ne \g__tag_struct_tag_NS_tl{ \seq_item:Nn\l__tag_tmpa_seq {2} }
\__tag_check_structure_tag:N \g__tag_struct_tag_tl
@@ -2365,10 +2372,12 @@
\socket_new_plug:nnn { tag/struct/tag }{ pdf-tags }
{
- \seq_set_split:Nne \l__tag_tmpa_seq { / } {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}}
+ \seq_set_split:Nne \l__tag_tmpa_seq { / }
+ {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}}
\tl_gset:Ne \g__tag_struct_tag_tl { \seq_item:Nn\l__tag_tmpa_seq {1} }
\tl_gset:Ne \g__tag_struct_tag_NS_tl{ \seq_item:Nn\l__tag_tmpa_seq {2} }
- \__tag_role_get:VVNN \g__tag_struct_tag_tl\g__tag_struct_tag_NS_tl\l__tag_tmpa_tl\l__tag_tmpb_tl
+ \__tag_role_get:VVNN
+ \g__tag_struct_tag_tl \g__tag_struct_tag_NS_tl \l__tag_tmpa_tl \l__tag_tmpb_tl
\tl_gset:Ne \g__tag_struct_tag_tl {\l__tag_tmpa_tl}
\tl_gset:Ne \g__tag_struct_tag_NS_tl{\l__tag_tmpb_tl}
\__tag_check_structure_tag:N \g__tag_struct_tag_tl
@@ -2377,7 +2386,14 @@
\keys_define:nn { __tag / struct }
{
- label .tl_set:N = \l__tag_struct_key_label_tl,
+ label .code:n =
+ {
+ \prop_gput:Nee\g__tag_struct_label_num_prop
+ {#1}{\int_use:N \c@g__tag_struct_abs_int}
+ \__tag_property_record:eV
+ {tagpdfstruct-#1}
+ \c__tag_property_struct_clist
+ },
stash .bool_set:N = \l__tag_struct_elem_stash_bool,
parent .code:n =
{
@@ -2396,6 +2412,7 @@
}
},
parent .default:n = {-1},
+firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} },
tag .code:n = % S property
{
\socket_use:nn { tag/struct/tag }{#1}
@@ -2462,16 +2479,58 @@
{ Lang }
{ (#1) }
},
+ }
+\cs_new_protected:Npn \__tag_struct_Ref_obj:nN #1 #2 %#1 a object reference
+ {
+ \tl_put_right:Ne#2
+ {
+ \c_space_tl#1
+ }
+ }
+
+\cs_new_protected:Npn \__tag_struct_Ref_label:nN #1 #2 %#1 a label
+ {
+ \prop_get:NnNTF \g__tag_struct_label_num_prop {#1} \l__tag_tmpb_tl
+ {
+ \tl_put_right:Ne#2
+ {
+ \c_space_tl\tag_struct_object_ref:e{ \l__tag_tmpb_tl }
+ }
+ }
+ {
+ \msg_warning:nnn {tag}{struct-Ref-unknown}{Label~'#1'}
+ }
+ }
+\cs_new_protected:Npn \__tag_struct_Ref_dest:nN #1 #2 %#1 a dest name
+ {
+ \prop_get:NnNTF \g__tag_struct_dest_num_prop {#1} \l__tag_tmpb_tl
+ {
+ \tl_put_right:Ne#2
+ {
+ \c_space_tl\tag_struct_object_ref:e{ \l__tag_tmpb_tl }
+ }
+ }
+ {
+ \msg_warning:nnn {tag}{struct-Ref-unknown}{Destination~'#1'}
+ }
+ }
+\cs_new_protected:Npn \__tag_struct_Ref_num:nN #1 #2 %#1 a structure number
+ {
+ \tl_put_right:Ne#2
+ {
+ \c_space_tl\tag_struct_object_ref:e{ #1 }
+ }
+ }
+
+\keys_define:nn { __tag / struct }
+ {
ref .code:n = % ref property
{
- \tl_clear:N\l__tag_tmpa_tl
\clist_map_inline:on {#1}
{
- \tl_put_right:Ne \l__tag_tmpa_tl
- {~\__tag_property_ref:en{tagpdfstruct-##1}{tagstructobj} }
+ \tag_struct_gput:nne
+ {\int_use:N \c@g__tag_struct_abs_int}{ref_label}{ ##1 }
}
- \__tag_struct_gput_data_ref:ee
- { \int_use:N \c@g__tag_struct_abs_int } {\l__tag_tmpa_tl}
},
E .code:n = % E property
{
@@ -2515,7 +2574,7 @@
}
\cs_generate_variant:Nn \__tag_struct_add_inline_AF:nn {on}
-\cs_new_protected:Npn \__tag_struct_add_AF:nn #1 #2 % #1 struct num #2 object reference
+\cs_new_protected:Npn \__tag_struct_add_AF:nn #1 #2
{
\tl_if_exist:cTF
{
@@ -2541,7 +2600,8 @@
{
\pdf_object_if_exist:eTF {#1}
{
- \__tag_struct_add_AF:ee { \int_use:N \c@g__tag_struct_abs_int }{\pdf_object_ref:e {#1}}
+ \__tag_struct_add_AF:ee
+ { \int_use:N \c@g__tag_struct_abs_int }{\pdf_object_ref:e {#1}}
\__tag_struct_prop_gput:nne
{ \int_use:N \c@g__tag_struct_abs_int }
{ AF }
@@ -2654,13 +2714,6 @@
\g__tag_struct_tag_tl
\g__tag_struct_tag_NS_tl
\__tag_check_structure_has_tag:n { \int_use:N \c@g__tag_struct_abs_int }
- \tl_if_empty:NF
- \l__tag_struct_key_label_tl
- {
- \__tag_property_record:eV
- {tagpdfstruct-\l__tag_struct_key_label_tl}
- \c__tag_property_struct_clist
- }
\int_compare:nNnT { \l__tag_struct_stack_parent_tmpa_tl } = { -1 }
{
\seq_get:NNF
@@ -2762,7 +2815,7 @@
%record this structure as kid:
%\tl_show:N \g__tag_struct_stack_current_tl
%\tl_show:N \l__tag_struct_stack_parent_tmpa_tl
- \__tag_struct_kid_struct_gput_right:ee
+ \use:c { __tag_struct_kid_struct_gput_ \l__tag_struct_addkid_tl :ee }
{ \l__tag_struct_stack_parent_tmpa_tl }
{ \g__tag_struct_stack_current_tl }
%\prop_show:c { g__tag_struct_\g__tag_struct_stack_current_tl _prop }
@@ -2814,22 +2867,22 @@
\__tag_check_if_active_struct:T
{
\prop_if_exist:cTF
- { g__tag_struct_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop } %
+ { g__tag_struct_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{unknown}_prop } %
{
\__tag_check_struct_used:n {#1}
%add the label structure as kid to the current structure (can be the root)
\__tag_struct_kid_struct_gput_right:ee
{ \g__tag_struct_stack_current_tl }
- { \__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1} }
+ { \property_ref:enn{tagpdfstruct-#1}{tagstruct}{1} }
%add the current structure to the labeled one as parents
\__tag_prop_gput:cne
- { g__tag_struct_\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
+ { g__tag_struct_\property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}_prop }
{ P }
{
\pdf_object_ref_indexed:nn { __tag/struct } { \g__tag_struct_stack_current_tl }
}
\__tag_struct_get_parentrole:eNN
- {\__tag_property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}}
+ {\property_ref:enn{tagpdfstruct-#1}{tagstruct}{1}}
\l__tag_tmpa_tl
\l__tag_tmpb_tl
\__tag_check_parent_child:VVVVN
@@ -2914,7 +2967,7 @@
\pdf_object_ref_indexed:nn {__tag/struct}{ #1 }
}
\cs_generate_variant:Nn \tag_struct_object_ref:n {e}
-\cs_new_protected:Npn \tag_struct_gput:nnn #1 #2 #3
+\cs_set_protected:Npn \tag_struct_gput:nnn #1 #2 #3
{
\cs_if_exist_use:cF {__tag_struct_gput_data_#2:nn}
{ %warning??
@@ -2923,19 +2976,44 @@
{#1}{#3}
}
\cs_generate_variant:Nn \tag_struct_gput:nnn {ene,nne}
-\cs_new_protected:Npn \__tag_struct_gput_data_ref:nn #1 #2
- % #1 receiving struct num, #2 list of object ref
+\cs_new_protected:Npn \__tag_struct_gput_data_ref_aux:nnn #1 #2 #3
+ % #1 receiving struct num, #2 key word #3 value
{
- \prop_get:cnN
- { g__tag_struct_#1_prop }
- {Ref}
- \l__tag_get_tmpc_tl
- \__tag_struct_prop_gput:nne
- { #1 }
- { Ref }
- { \quark_if_no_value:NF\l__tag_get_tmpc_tl { \l__tag_get_tmpc_tl\c_space_tl }#2 }
+ \prop_get:cnNTF
+ { g__tag_struct_#1_prop }
+ {Ref}
+ \l__tag_get_tmpc_tl
+ {
+ \tl_put_right:No \l__tag_get_tmpc_tl
+ {\cs:w __tag_struct_Ref_#2:nN \cs_end: {#3},}
+ }
+ {
+ \tl_set:No \l__tag_get_tmpc_tl
+ {\cs:w __tag_struct_Ref_#2:nN \cs_end: {#3},}
+ }
+ \__tag_struct_prop_gput:nno
+ { #1 }
+ { Ref }
+ { \l__tag_get_tmpc_tl }
}
-\cs_generate_variant:Nn \__tag_struct_gput_data_ref:nn {ee}
+\cs_new_protected:Npn \__tag_struct_gput_data_ref:nn #1 #2
+ {
+ \__tag_struct_gput_data_ref_aux:nnn {#1}{obj}{#2}
+ }
+\cs_new_protected:Npn \__tag_struct_gput_data_ref_label:nn #1 #2
+ {
+ \__tag_struct_gput_data_ref_aux:nnn {#1}{label}{#2}
+ }
+\cs_new_protected:Npn \__tag_struct_gput_data_ref_dest:nn #1 #2
+ {
+ \__tag_struct_gput_data_ref_aux:nnn {#1}{dest}{#2}
+ }
+\cs_new_protected:Npn \__tag_struct_gput_data_ref_num:nn #1 #2
+ {
+ \__tag_struct_gput_data_ref_aux:nnn {#1}{num}{#2}
+ }
+
+\cs_generate_variant:Nn \__tag_struct_gput_data_ref:nn {ee,no}
\cs_new_protected:Npn \tag_struct_insert_annot:nn #1 #2 %#1 should be an object reference
%#2 struct parent num
{
@@ -3057,6 +3135,7 @@
},
}
%% File: tagpdf-space.dtx
+\bool_new:N\l__tag_showspaces_bool
\keys_define:nn { __tag / setup }
{
activate/spaces .choice:,
@@ -3463,9 +3542,9 @@
{\tagmcbegin{tag=Lbl}}
{#1}
}
- \tag_stop:n{hangfrom}
+ \tag_suspend:n{hangfrom}
\hangindent \wd\@tempboxa\noindent
- \tag_start:n{hangfrom}
+ \tag_resume:n{hangfrom}
\tagmcbegin{}\box\@tempboxa\tagmcend\tagstructend\tagmcbegin{}
}
}
@@ -3716,11 +3795,11 @@
\bool_gset_false:N \g__tag_in_mc_bool
}
\tag_mc_begin:n {artifact}
- \tag_stop:n{headfoot}
+ \tag_suspend:n{headfoot}
}
\cs_new_protected:Npn \__tag_exclude_headfoot_end:
{
- \tag_start:n{headfoot}
+ \tag_resume:n{headfoot}
\tag_mc_end:
\bool_if:NTF \g__tag_mode_lua_bool
{
@@ -3744,12 +3823,12 @@
}
\tag_struct_begin:n{tag=Artifact,attribute-class=__tag/attr/#1}
\tag_mc_begin:n {artifact=#1}
- \tag_stop:n{headfoot}
+ \tag_suspend:n{headfoot}
}
\cs_new_protected:Npn \__tag_exclude_struct_headfoot_end:
{
- \tag_start:n{headfoot}
+ \tag_resume:n{headfoot}
\tag_mc_end:
\tag_struct_end:
\bool_if:NTF \g__tag_mode_lua_bool
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty
index 6ae5840b113..81ce196e8e7 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-08-02} {0.99d}
+\ProvidesExplPackage {tagpdfdocu-patches} {2024-09-16} {0.99f}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox,xpatch}
diff --git a/Master/texmf-dist/tex/latex/tikz3d-fr/tikz3d-fr.sty b/Master/texmf-dist/tex/latex/tikz3d-fr/tikz3d-fr.sty
index 5056c951a87..b6d4e20829f 100644
--- a/Master/texmf-dist/tex/latex/tikz3d-fr/tikz3d-fr.sty
+++ b/Master/texmf-dist/tex/latex/tikz3d-fr/tikz3d-fr.sty
@@ -3,15 +3,18 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikz3d-fr}[2023/07/22 0.1.2 Aide pour l'utilisation de TikZ 3D]
+\ProvidesPackage{tikz3d-fr}[2024/09/16 0.1.3 Aide pour l'utilisation de TikZ 3D]
+%0.1.3 Dés à jouer en 3D
%0.1.2 Option pour l'épaisseur des traits + [line join=round] pour les cubes
%0.1.1 Segments avec [line cap=round]
%0.1.0 Version initiale
%------Packages utiles
\RequirePackage{tikz}
+\RequirePackage{tikz-3dplot}
\RequirePackage{xstring}
\RequirePackage{simplekv}
+\RequirePackage{randomlist}
\RequirePackage{xinttools}
\RequirePackage{xintexpr}
\RequirePackage{listofitems}
@@ -328,4 +331,258 @@
{\end{EnvTikzEspace}}
}
+%====DÉS EN 3D
+\newlength{\detridimoffseth}
+\setlength{\detridimoffseth}{0mm}
+
+\defKV[DeTriDim]{%
+ Echelle=\def\detridimscale{#1},%
+ Couleur=\def\detridimcouleur{#1},%
+ EspaceH=\setlength{\detridimoffseth}{#1},%
+ Couleurs=\def\detridimcouleurs{#1},%
+ CouleurPoints=\def\detridimcouleurpts{#1},%
+ Phi=\def\detridimphi{#1},%
+ Theta=\def\detridimtheta{#1},%
+ Vue=\def\deftridimvue{#1},%
+ Origine=\def\deftridimorigin{#1}
+}
+\setKVdefault[DeTriDim]{%
+ Echelle=1,%
+ Couleur=lightgray!25,%
+ CouleurPoints=black,%
+ Hasard=false,%
+ EspaceH={0mm},%
+ Couleurs=lightgray!25,%
+ Phi=110,%
+ Theta=70,%
+ Vue=D,%
+ Origine={(0,0)},%
+ Yams=false
+}
+
+\NewDocumentCommand\FaceDeTriDim{ m }{%
+ %1 = face avec points communs si besoin pour simplifier le code
+ \xintifboolexpr{#1 == 2 'or' #1 == 4 'or' #1 == 5 'or' #1 == 6}%
+ {%
+ \fill[\detridimcouleurpts] (0.5,0.5) circle[radius=1/6] ; % HG
+ \fill[\detridimcouleurpts] (-0.5,-0.5) circle[radius=1/6] ; % BD
+ }%
+ {}%
+ \xintifboolexpr{#1 == 3 'or' #1 == 4 'or' #1 == 5 'or' #1 == 6}%
+ {%
+ \fill[\detridimcouleurpts] (-0.5,0.5) circle[radius=1/6] ; % HD
+ \fill[\detridimcouleurpts] (0.5,-0.5) circle[radius=1/6] ; % BG
+ }%
+ {}%
+ \xintifboolexpr{#1 == 1 'or' #1 == 3 'or' #1 == 5}%
+ {%
+ \fill[\detridimcouleurpts] (0,0) circle[radius=1/6] ; % CENTRE
+ }%
+ {}%
+ \xintifboolexpr{#1 == 6}%
+ {%
+ \fill[\detridimcouleurpts] (0.5,0) circle[radius=1/6] ; % MG
+ \fill[\detridimcouleurpts] (-0.5,0) circle[radius=1/6] ; % MD
+ }%
+ {}%
+}
+
+%liste pour les faces
+\NewList{detridimfaceU}\SetList{detridimfaceU}{2,3,4,5}
+\NewList{detridimfaceD}\SetList{detridimfaceD}{1,3,4,6}
+\NewList{detridimfaceT}\SetList{detridimfaceT}{1,2,6,5}
+\NewList{detridimfaceQ}\SetList{detridimfaceQ}{1,5,6,2}
+\NewList{detridimfaceC}\SetList{detridimfaceC}{1,3,6,4}
+\NewList{detridimfaceS}\SetList{detridimfaceS}{2,4,5,3}
+
+%commande autonome
+\NewDocumentCommand\DeTriDim{ s O{} D<>{} m }{%
+ %* = mode non autonome
+ %1 = clés
+ %2 = options tikzpicture
+ %3 = faces devant/dessus
+ \restoreKV[DeTriDim]%
+ \setKV[DeTriDim]{#2}%
+ %si aléatoire
+ \ifboolKV[DeTriDim]{Hasard}%
+ {%
+ \xdef\detridimfacedevant{\xinteval{randrange(1,7)}}%
+ \xintifboolexpr{\detridimfacedevant == 1}%
+ {%
+ \GetRandomItem{detridimfaceU}{detridimfacedessus}%
+ }%
+ {}%
+ \xintifboolexpr{\detridimfacedevant == 2}%
+ {%
+ \GetRandomItem{detridimfaceD}{detridimfacedessus}%
+ }%
+ {}%
+ \xintifboolexpr{\detridimfacedevant == 3}%
+ {%
+ \GetRandomItem{detridimfaceT}{detridimfacedessus}%
+ }%
+ {}%
+ \xintifboolexpr{\detridimfacedevant == 4}%
+ {%
+ \GetRandomItem{detridimfaceQ}{detridimfacedessus}%
+ }%
+ {}%
+ \xintifboolexpr{\detridimfacedevant == 5}%
+ {%
+ \GetRandomItem{detridimfaceC}{detridimfacedessus}%
+ }%
+ {}%
+ \xintifboolexpr{\detridimfacedevant == 6}%
+ {%
+ \GetRandomItem{detridimfaceS}{detridimfacedessus}%
+ }%
+ {}%
+ \xdef\detridimfaces{\detridimfacedevant/\detridimfacedessus}%
+ }%
+ {%
+ \xdef\detridimfaces{#4}%
+ \StrCut{#4}{/}{\detridimfacedevant}{\detridimfacedessus}%
+ }%
+ \IfStrEq{\deftridimvue}{D}%
+ {%
+ \IfStrEqCase{\detridimfaces}{%
+ {1/2}{\def\detridimfacedroite{3}}%
+ {1/3}{\def\detridimfacedroite{5}}%
+ {1/5}{\def\detridimfacedroite{4}}%
+ {1/4}{\def\detridimfacedroite{2}}%
+ %
+ {2/1}{\def\detridimfacedroite{4}}%
+ {2/4}{\def\detridimfacedroite{6}}%
+ {2/6}{\def\detridimfacedroite{3}}%
+ {2/3}{\def\detridimfacedroite{1}}%
+ %
+ {3/1}{\def\detridimfacedroite{2}}%
+ {3/2}{\def\detridimfacedroite{6}}%
+ {3/6}{\def\detridimfacedroite{5}}%
+ {3/5}{\def\detridimfacedroite{1}}%
+ %
+ {4/1}{\def\detridimfacedroite{5}}%
+ {4/5}{\def\detridimfacedroite{6}}%
+ {4/6}{\def\detridimfacedroite{2}}%
+ {4/2}{\def\detridimfacedroite{1}}%
+ %
+ {5/1}{\def\detridimfacedroite{3}}%
+ {5/3}{\def\detridimfacedroite{6}}%
+ {5/6}{\def\detridimfacedroite{4}}%
+ {5/4}{\def\detridimfacedroite{1}}%
+ %
+ {6/2}{\def\detridimfacedroite{4}}%
+ {6/4}{\def\detridimfacedroite{5}}%
+ {6/5}{\def\detridimfacedroite{3}}%
+ {6/3}{\def\detridimfacedroite{2}}%
+ }%
+ }%
+ {%
+ \IfStrEqCase{\detridimfaces}{%
+ {1/2}{\def\detridimfacedroite{4}}%
+ {1/3}{\def\detridimfacedroite{2}}%
+ {1/5}{\def\detridimfacedroite{3}}%
+ {1/4}{\def\detridimfacedroite{5}}%
+ %
+ {2/1}{\def\detridimfacedroite{3}}%
+ {2/4}{\def\detridimfacedroite{1}}%
+ {2/6}{\def\detridimfacedroite{4}}%
+ {2/3}{\def\detridimfacedroite{6}}%
+ %
+ {3/1}{\def\detridimfacedroite{5}}%
+ {3/2}{\def\detridimfacedroite{1}}%
+ {3/6}{\def\detridimfacedroite{2}}%
+ {3/5}{\def\detridimfacedroite{6}}%
+ %
+ {4/1}{\def\detridimfacedroite{2}}%
+ {4/5}{\def\detridimfacedroite{1}}%
+ {4/6}{\def\detridimfacedroite{5}}%
+ {4/2}{\def\detridimfacedroite{6}}%
+ %
+ {5/1}{\def\detridimfacedroite{3}}%
+ {5/3}{\def\detridimfacedroite{6}}%
+ {5/6}{\def\detridimfacedroite{4}}%
+ {5/4}{\def\detridimfacedroite{1}}%
+ %
+ {6/2}{\def\detridimfacedroite{3}}%
+ {6/4}{\def\detridimfacedroite{2}}%
+ {6/5}{\def\detridimfacedroite{4}}%
+ {6/3}{\def\detridimfacedroite{5}}%
+ }%
+ }%
+ \IfStrEq{\deftridimvue}{D}{\def\tmpdetridimxscale{1}}{\def\tmpdetridimxscale{-1}}%
+ \IfBooleanF{#1}{\begin{tikzpicture}[#3]}%
+ \tdplotsetmaincoords{\detridimtheta}{\detridimphi}
+ \begin{scope}[shift={(\deftridimorigin)},scale=\fpeval{0.5*\detridimscale},xscale=\tmpdetridimxscale,thick,tdplot_main_coords,rounded corners=\fpeval{\detridimscale*0.5*0.33}cm,fill=\detridimcouleur]
+ \begin{scope}[canvas is xy plane at z=-1]
+ \filldraw (-1,-1) rectangle (1,1);
+ \end{scope}
+ \begin{scope}[canvas is xz plane at y=-1]
+ \filldraw (-1,-1) rectangle (1,1);
+ \end{scope}
+ \begin{scope}[canvas is yz plane at x=-1]
+ \filldraw (-1,-1) rectangle (1,1);
+ \end{scope}
+ \begin{scope}[canvas is xy plane at z=1]%face du dessus
+ \filldraw (-1,-1) rectangle (1,1);
+ \FaceDeTriDim{\detridimfacedessus}
+ \end{scope}
+ \begin{scope}[canvas is xz plane at y=1]%face de droite
+ \filldraw (-1,-1) rectangle (1,1);
+ \FaceDeTriDim{\detridimfacedroite}
+ \end{scope}
+ \begin{scope}[canvas is yz plane at x=1]%face de devant
+ \filldraw (-1,-1) rectangle (1,1);
+ \FaceDeTriDim{\detridimfacedevant}
+ \end{scope}
+ \end{scope}
+ \IfBooleanF{#1}{\end{tikzpicture}}%
+}
+
+\NewDocumentCommand\TirageAleaDesTriDim{ O{} D<>{} m }{%
+ \restoreKV[DeTriDim]%
+ \setKV[DeTriDim]{#1}%
+ \readlist*\detridimlstcolors{\detridimcouleurs}%
+ \ifboolKV[DeTriDim]{Yams}%
+ {%
+ \begin{tikzpicture}[#2]
+ \ifnum\detridimlstcolorslen=1\relax
+ \foreach \i in {1,...,#3}{%
+ \IfStrEq{\deftridimvue}{D}%
+ {%
+ \DeTriDim*[#1,Hasard,Couleur=\detridimcouleurs,Origine={(\i*\detridimscale,-\i*\detridimscale*0.1)}]{}%
+ }%
+ {%
+ \DeTriDim*[#1,Hasard,Couleur=\detridimcouleurs,Origine={(-\i*\detridimscale,-\i*\detridimscale*0.1)}]{}%
+ }%
+ }%
+ \else%
+ \foreach \i in {1,...,#3}{%
+ \itemtomacro\detridimlstcolors[\i]{\tmpdetridimcolor}%
+ \IfStrEq{\deftridimvue}{D}%
+ {%
+ \DeTriDim*[#1,Hasard,Couleur=\tmpdetridimcolor,Origine={(\i*\detridimscale,-\i*\detridimscale*0.1)}]{}%
+ }%
+ {%
+ \DeTriDim*[#1,Hasard,Couleur=\tmpdetridimcolor,Origine={(-\i*\detridimscale,-\i*\detridimscale*0.1)}]{}%
+ }%
+ }%
+ \fi%
+ \end{tikzpicture}
+ }%
+ {%
+ \ifnum\detridimlstcolorslen=1\relax
+ \foreach \i in {1,...,#3}{%
+ \DeTriDim[#1,Hasard,Couleur=\detridimcouleurs]<#2>{}\ifnum\i<#3\relax\hspace*{\detridimoffseth}\fi%
+ }%
+ \else%
+ \foreach \i in {1,...,#3}{%
+ \itemtomacro\detridimlstcolors[\i]{\tmpdetridimcolor}%
+ \DeTriDim[#1,Hasard,Couleur=\tmpdetridimcolor]<#2>{}\ifnum\i<#3\relax\hspace*{\detridimoffseth}\fi%
+ }%
+ \fi%
+ }%
+}
+
+
\endinput \ No newline at end of file
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 ce321f6d4be..274adac46cc 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,11 @@
% 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/07/13 0.1.6.Des outils en TikZ pour travailler comme avec un grapheur]
+\ProvidesPackage{tkz-grapheur}[2024/09/08 0.1.8 Des outils en TikZ pour travailler comme avec un grapheur]
%====HISTORIQUE
+% v 0.1.8 Ajout des courbes d'ECC/FCC + Toile récurrence + Points discontinuité + Histobinom
+% v 0.1.7 Méthodes intégrales avec des splines
% 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
@@ -50,7 +52,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,group-minimum-digits=4}
+ \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
@@ -112,6 +114,7 @@
\tikzset{pflpointnuage/.style={radius=1.75pt}}
\tikzset{pflcadre/.style={line width=0.8pt,gray}}
\tikzset{pflcourbe/.style={line width=1.05pt}}
+\tikzset{pflcourbediscont/.style={line width=1.1pt}}
\tikzset{pfltrait/.style={line width=0.8pt}}
\tikzset{pflflecheg/.style={<-,>=latex}}
\tikzset{pflfleched/.style={->,>=latex}}
@@ -1068,10 +1071,11 @@
Methode=RectanglesGauche,%
Remplir=true,%
CouleurRemplissage={\graphtikzintgrcol!25},%
- Opacite=0.25
+ Opacite=0.25,%
+ Spline=false
}
-\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct+a+b
+\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct/spline+a+b
\useKVdefault[graphiquetikzintegr]%
\setKV[graphiquetikzintegr]{#1}%
\ifboolKV[graphiquetikzintegr]{Remplir}%
@@ -1083,31 +1087,73 @@
}%
\tikzset{figureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}%
\def\TmpH{(#4-#3)/\graphtikzintgrnb}
- %rectangles gauches
- \IfEq{\graphtikzintgrtype}{RectanglesGauche}%
+ \ifboolKV[graphiquetikzintegr]{Spline}%
{%
- \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}{RectanglesGauche}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{%
+ \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+\i*\TmpH},{\pflymin})--({#3+\i*\TmpH},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ;
+ \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ;
+ }%
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesDroite}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{%
+ \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+(\i+1)*\TmpH},{\pflymin})--({#3+(\i+1)*\TmpH},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ;
+ \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ;
+ }%
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{RectanglesMilieu}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{%
+ \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+(\i+0.5)*\TmpH},{\pflymin})--({#3+(\i+0.5)*\TmpH},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ;
+ \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ;
+ }%
+ }%
+ {}%
+ \IfEq{\graphtikzintgrtype}{Trapezes}%
+ {%
+ \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{%
+ \path[draw=none,pflcourbe,name path=tmpintmethodg] ({#3+(\i)*\TmpH},{\pflymin})--({#3+(\i)*\TmpH},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmpintmethodg,name=KLMg}] ;
+ \path[draw=none,pflcourbe,name path=tmpintmethodd] ({#3+(\i+1)*\TmpH},{\pflymin})--({#3+(\i+1)*\TmpH},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmpintmethodd,name=KLMd}] ;
+ \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- (KLMg-1) -- (KLMd-1) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ;
+ }%
+ }%
+ {}%
}%
- {}%
- \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 ;
+ \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 ;
+ }%
+ {}%
}%
- {}%
}
@@ -4218,4 +4264,325 @@
}%
}
+%====ECC
+\defKV[tkzgECC]{%
+ Couleur=\def\tkzecc@coul@graph{#1},%
+ CouleursParams=\def\tkzecc@coul@params{#1}
+}
+
+\setKVdefault[tkzgECC]{%
+ Couleur=black,%
+ AffParams=true,%
+ CouleursParams={black},%
+ TraitsComplets=true
+}
+
+\tikzset{pfltraitsparamecc/.style={line width=0.9pt,densely dashed}}
+\tikzset{pflcourbeecc/.style={line width=1.05pt}}
+
+\NewDocumentCommand\TracerCourbeECC{ O{} m m }{%
+ \restoreKV[tkzgECC]%
+ \setKV[tkzgECC]{#1}%
+ \IfSubStr{\tkzecc@coul@params}{/}%
+ {%
+ \StrCut{\tkzecc@coul@params}{/}{\tkzecc@coul@quart}{\tkzecc@coul@med}%
+ }%
+ {%
+ \def\tkzecc@coul@quart{\tkzecc@coul@params}\def\tkzecc@coul@med{\tkzecc@coul@params}%
+ }%
+ \readlist*\DataClass{#2}%
+ \readlist*\DataEff{#3}%
+ \xdef\DonneesECC{0}%
+ \xintFor* ##1 in {\xintSeq{1}{\DataEfflen}}\do{%
+ \xdef\DonneesTmp{0}
+ \xintFor* ##2 in {\xintSeq{1}{##1}}\do{%
+ \xdef\DonneesTmp{\xintfloateval{\DonneesTmp+\DataEff[##2]}}%
+ }%
+ \xdef\DonneesECC{\DonneesECC,\DonneesTmp}%
+ }%
+ \readlist*\DataECC\DonneesECC%
+ \itemtomacro\DataClass[1]\DonneesXmin%
+ \itemtomacro\DataClass[-1]\DonneesXmax%
+ \itemtomacro\DataECC[-1]\DonneesEffMax%
+ \xdef\DonneesListeECC{(\DataClass[1],\DataECC[1])}%
+ \xintFor* ##1 in {\xintSeq{2}{\DataECClen}}\do{%
+ \xdef\DonneesListeECC{\DonneesListeECC--(\DataClass[##1],\DataECC[##1])}%
+ }%
+ %paramètres par interpolation
+ \xintFor* ##1 in {\xintSeq{1}{\DataEfflen}}\do{%
+ \xdef\isuiv{\xinteval{##1+1}}%
+ \xintifboolexpr{\DataECC[##1] < (0.25*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.25*\DonneesEffMax)}%
+ {%
+ \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK
+ \xdef\ValPremQuartile{\xintfloateval{(0.25*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}%
+ }
+ {}%
+ \xintifboolexpr{\DataECC[##1] < (0.50*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.50*\DonneesEffMax)}%
+ {%
+ \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK
+ \xdef\ValMed{\xintfloateval{(0.50*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}%
+ }
+ {}%
+ \xintifboolexpr{\DataECC[##1] < (0.75*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.75*\DonneesEffMax)}%
+ {%
+ \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK
+ \xdef\ValTroisQuartile{\xintfloateval{(0.75*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}%
+ }
+ {}%
+ }%
+ %partie graphique
+ \draw[pflcourbeecc,\tkzecc@coul@graph] \DonneesListeECC ;
+ \xintFor* ##1 in {\xintSeq{1}{\DataECClen}}\do{%
+ \filldraw[\tkzecc@coul@graph] (\DataClass[##1],\DataECC[##1]) circle[pflpointnuage] ;
+ }%
+ \ifboolKV[tkzgECC]{AffParams}%
+ {%
+ %médiane
+ \ifboolKV[tkzgECC]{TraitsComplets}%
+ {%
+ \draw[pfltraitsparamecc,\tkzecc@coul@med] (\pflxmin,{0.50*\DonneesEffMax})--(\pflxmax,{0.50*\DonneesEffMax});
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.25*\DonneesEffMax})--++({\pflxmax-\pflxmin},0);
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.75*\DonneesEffMax})--++({\pflxmax-\pflxmin},0);
+ }%
+ {%
+ \draw[pfltraitsparamecc,\tkzecc@coul@med] (\pflxmin,{0.50*\DonneesEffMax})--(\ValMed,{0.50*\DonneesEffMax});
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.25*\DonneesEffMax})--++({\ValPremQuartile-\pflxmin},0);
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.75*\DonneesEffMax})--++({\ValTroisQuartile-\pflxmin},0);
+ }%
+ \draw[pfltraitsparamecc,\tkzecc@coul@med] (\ValMed,{0.5*\DonneesEffMax})--(\ValMed,0) ; \draw[\tkzecc@coul@med,thick,fill=white] (\ValMed,{0.5*\DonneesEffMax}) circle[pflpointnuage] ;
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\ValPremQuartile,{0.25*\DonneesEffMax})--(\ValPremQuartile,\pflymin) ; \draw[\tkzecc@coul@quart,thick,fill=white] (\ValPremQuartile,{0.25*\DonneesEffMax}) circle[pflpointnuage] ;
+ \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\ValTroisQuartile,{0.75*\DonneesEffMax})--(\ValTroisQuartile,\pflymin) ; \draw[\tkzecc@coul@quart,thick,fill=white] (\ValTroisQuartile,{0.75*\DonneesEffMax}) circle[pflpointnuage] ;
+ }%
+ {}%
+}
+
+%====PTS DISCONTINUITÉ
+\defKV[tkzptdiscont]{%
+ Couleur=\def\pfldiscontcouleur{#1},%
+ Pos=\def\pfldiscontpos{#1},%
+ Echelle=\def\pfldiscontechelle{#1},%
+ Type=\def\pfldisconttype{#1}
+}
+
+\setKVdefault[tkzptdiscont]{%
+ Couleur=black,%
+ Pos=D,%
+ Echelle=1,%
+ Type=par
+}
+
+\NewDocumentCommand\AfficherPtsDiscont{ O{} m }{%
+ \restoreKV[tkzptdiscont]
+ \setKV[tkzptdiscont]{#1}%
+ \setsepchar[.]{§./}%
+ \readlist*\SPLlisteDiscont{#2}%
+ \def\SPLlisteDiscontNb{\SPLlisteDiscontlen}%
+ \foreach \i in {1,...,\SPLlisteDiscontNb}{%
+ \begin{scope}[shift={(\SPLlisteDiscont[\i,1],\SPLlisteDiscont[\i,2])},rotate={atan \SPLlisteDiscont[\i,3]},scale=\pfldiscontechelle]
+ \IfStrEq{\pfldisconttype}{rond}%
+ {%
+ \draw[pflcourbediscont,fill=white,draw=\pfldiscontcouleur] (0,0) circle[radius=3pt] ;
+ }{}%
+ \IfStrEq{\pfldiscontpos}{D}%
+ {%
+ \IfStrEq{\pfldisconttype}{par}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=170] (4pt,5pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=-170] (4pt,-5pt) ;
+ }{}%
+ \IfStrEq{\pfldisconttype}{demirond}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=180] (3pt,3pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=180] (3pt,-3pt) ;
+ }{}%
+ \IfStrEq{\pfldisconttype}{cro}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (4pt,5pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (4pt,-5pt) ;
+ }{}%
+ }%
+ {%
+ \IfStrEq{\pfldisconttype}{par}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=-10] (-4pt,5pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=10] (-4pt,-5pt) ;
+ }{}%
+ \IfStrEq{\pfldisconttype}{demirond}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=0] (-3pt,3pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=0] (-3pt,-3pt) ;
+ }{}%
+ \IfStrEq{\pfldisconttype}{cro}%
+ {%
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (-4pt,5pt) ;
+ \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (-4pt,-5pt) ;
+ }{}%
+ }%
+ \end{scope}
+ }%
+}
+
+%====TOILE RÉCURRENCE (OK avec courbe + spline !!)
+\tikzset{pfltraitrec/.style={line width=0.8pt}}
+\tikzset{pfltraitrecpointill/.style={pfltraitrec,densely dashed}}
+
+\defKV[tkzwebrecurr]{%
+ Couleur=\def\pflrecurcolor{#1},%
+ Nom=\def\pflrecurnom{#1},%
+ No=\def\pflrecurno{#1},%
+ Nb=\def\pflrecurnb{#1},%
+ Uno=\def\pflrecuruno{#1},
+ TailleLabel=\def\pflrecurlabelsize{#1},%
+ PosLabel=\def\pflrecurlabelpos{#1}
+}
+
+\setKVdefault[tkzwebrecurr]{%
+ Couleur=black,%
+ Spline=false,%
+ No=0,%
+ Nom=u,%
+ Nb=5,%
+ AffTermes=false,%
+ AffPointilles=true,%
+ TailleLabel=\small,%
+ PosLabel=below
+}
+
+\NewDocumentCommand\TracerToileRecurrence{ O{} m }{
+ %<clés> + fonction/courbe
+ \useKVdefault[tkzwebrecurr]%
+ \setKV[tkzwebrecurr]{#1}% on paramètres les nouvelles clés et on les simplifie
+ \ifboolKV[tkzwebrecurr]{Spline}%
+ {%
+ \foreach \i [remember=\i as \x (initially \pflrecuruno)] in {1,...,\pflrecurnb}{%
+ %\xdef\y{\xintfloateval{#2(\x)}}%
+ \path[draw=none,pflcourbe,name path=tmprecur] ({\x},{\pflymin})--({\x},{\pflymax}) ;
+ \path[name intersections={of=#2 and tmprecur,name=ZZZZ}] ;
+ %\coordinate (\pflrecurnoms) at (ZZZZ-1) ;
+ \GetYcoord{(ZZZZ-1)}[\y]
+ %test de la position courbe / bissectrice ?
+ \ifnum \i=1
+ \newdimen \X
+ \newdimen \Y
+ \X = \x pt
+ \Y = \y pt
+ \ifdim \Y < \X
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\y)--(\y,\y) ;
+ \else
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ;
+ \fi
+ \else
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ;
+ \fi
+ \ifboolKV[tkzwebrecurr]{AffPointilles}%
+ {%
+ \def\indice{\fpeval{\i+\pflrecurno-1}}%
+ \ifboolKV[tkzwebrecurr]{AffTermes}%
+ {%
+ \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) node[\pflrecurlabelpos,font=\pflrecurlabelsize]{$\pflrecurnom_{\indice}$};%
+ }%
+ {%
+ \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) ;%
+ }%
+ }%
+ {}
+ \def\i{\y}%
+ }%
+ }%
+ {%
+ \foreach \i [remember=\i as \x (initially \pflrecuruno)] in {1,...,\pflrecurnb}{%
+ \xdef\y{\xintfloateval{#2(\x)}}%
+ %test de la position courbe / bissectrice ?
+ \ifnum \i=1
+ \newdimen \X
+ \newdimen \Y
+ \X = \x pt
+ \Y = \y pt
+ \ifdim \Y < \X
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\y)--(\y,\y) ;
+ \else
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ;
+ \fi
+ \else
+ \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ;
+ \fi
+ \ifboolKV[tkzwebrecurr]{AffPointilles}%
+ {%
+ \def\indice{\fpeval{\i+\pflrecurno-1}}%
+ \ifboolKV[tkzwebrecurr]{AffTermes}%
+ {%
+ \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) node[\pflrecurlabelpos,font=\pflrecurlabelsize]{$\pflrecurnom_{\indice}$};%
+ }%
+ {%
+ \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) ;%
+ }%
+ }%
+ {}
+ \def\i{\xintfloateval{\y}}%
+ }%
+ }%
+}
+
+%====HISTOBINOM
+\defKV[tkzHistoBinom]{%
+ Plage=\def\tkzGraphBinomPlage{#1},%
+ CouleurPlage=\def\tkzGraphBimomColPlage{#1},%
+ ClipX=\def\tkzGraphBinomXminmax{#1},%
+ CouleurNormale=\def\tkzGraphBinomColNorm{#1}
+}
+\setKVdefault[tkzHistoBinom]{%
+ Plage={},%
+ CouleurPlage=black,%
+ ClipX={},%
+ AffNormale=false,%
+ CouleurNormale=black
+}
+
+\NewDocumentCommand\TracerHistoBinomiale{ O{} D<>{phi} m m }{%
+ \restoreKV[tkzHistoBinom]%
+ \setKV[tkzHistoBinom]{#1}
+ \def\tkzGraphBinomN{#3}%
+ \def\tkzGraphBinomP{#4}%
+ \IfStrEq{\tkzGraphBinomXminmax}{}%
+ {%
+ \xdef\tkzGraphBinomXmin{0}%
+ \xdef\tkzGraphBinomXmax{\tkzGraphBinomN}%
+ }%
+ {%
+ \StrCut{\tkzGraphBinomXminmax}{-}{\tkzGraphBinomXmin}{\tkzGraphBinomXmax}%
+ \IfStrEq{\tkzGraphBinomXmin}{*}{\xdef\tkzGraphBinomXmin{0}}{}%
+ \IfStrEq{\tkzGraphBinomXmax}{*}{\xdef\tkzGraphBinomXmax{\tkzGraphBinomN}}{}%
+ }%
+ \IfStrEq{\tkzGraphBinomPlage}{}%
+ {}%
+ {%
+ \StrCut{\tkzGraphBinomPlage}{-}{\tkzGraphBinomColorMin}{\tkzGraphBinomColorMax}%
+ \IfStrEq{\tkzGraphBinomColorMin}{*}{\xdef\tkzGraphBinomColorMin{\tkzGraphBinomXmin}}{}%
+ \IfStrEq{\tkzGraphBinomColorMax}{*}{\xdef\tkzGraphBinomColorMax{\tkzGraphBinomXmax}}{}%
+ }%
+ %coloriage éventuel
+ \IfStrEq{\tkzGraphBinomPlage}{}%
+ {}%
+ {%
+ \xintFor* ##1 in {\xintSeq{\tkzGraphBinomColorMin}{\tkzGraphBinomColorMax}}\do{%
+ \xdef\tkztmpYYY{\xintfloateval{binomial(\tkzGraphBinomN,##1)*(\tkzGraphBinomP)^(##1)*(1-(\tkzGraphBinomP))^((\tkzGraphBinomN)-(##1))}}%
+ \draw[draw=none,fill=\tkzGraphBimomColPlage,fill opacity=0.5] ({##1-0.5},{\pflymin}) rectangle++ (1,{\tkztmpYYY-\pflymin}) ;
+ }%
+ }%
+ %tracé
+ \xintFor* ##1 in {\xintSeq{\tkzGraphBinomXmin}{\tkzGraphBinomXmax}}\do{%
+ \xdef\tkztmpYYY{\xintfloateval{binomial(\tkzGraphBinomN,##1)*(\tkzGraphBinomP)^(##1)*(1-(\tkzGraphBinomP))^((\tkzGraphBinomN)-(##1))}}%
+ \draw[pfltrait] ({##1-0.5},{\pflymin}) rectangle++ (1,{\tkztmpYYY-\pflymin}) ;
+ }%
+ \ifboolKV[tkzHistoBinom]{AffNormale}%
+ {%
+ \xdef\tkzMinNormHistoBinom{\xintfloateval{{\tkzGraphBinomXmin-0.5}}}%
+ \xdef\tkzMaxNormHistoBinom{\xintfloateval{{\tkzGraphBinomXmax+0.5}}}%
+ \xdef\tkzEsperNorm{\xintfloateval{(#3)*(#4)}}%
+ \xdef\tkzVarNorm{\xintfloateval{sqrt((#3)*(#4)*(1-(#4)))}}%
+ \DefinirLoiNormale[Trace,Couleur=\tkzGraphBinomColNorm,pflcourbe,Debut=\tkzMinNormHistoBinom,Fin=\tkzMaxNormHistoBinom]<#2>{\tkzEsperNorm}{\tkzVarNorm}
+ }%
+ {}%
+}
+
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-english.cfg.sty b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-english.cfg.sty
index 339f10240c6..e72b66100ae 100644
--- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-english.cfg.sty
+++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-english.cfg.sty
@@ -4,13 +4,13 @@
\NewDocumentCommand{\tutodoc@trans@latex@show@start}{}{Start ~ of ~ the ~ real ~ output}
\NewDocumentCommand{\tutodoc@trans@latex@show@end}{}{End ~ of ~ the ~ real ~ output}
\NewDocumentCommand{\tutodoc@trans@exa@title}{}{Example}
-\NewDocumentCommand{\tutodoc@trans@rmk@title}{}{Remark}
+\NewDocumentCommand{\tutodoc@trans@rem@title}{}{Remark}
\NewDocumentCommand{\tutodoc@trans@note@title}{}{Note}
\NewDocumentCommand{\tutodoc@trans@tip@title}{}{Tip}
-\NewDocumentCommand{\tutodoc@trans@important@title}{}{Important}
-\NewDocumentCommand{\tutodoc@trans@caution@title}{}{Caution}
+\NewDocumentCommand{\tutodoc@trans@imp@title}{}{Important}
+\NewDocumentCommand{\tutodoc@trans@caut@title}{}{Caution}
\NewDocumentCommand{\tutodoc@trans@warn@title}{}{Warning}
-\NewDocumentCommand{\tutodoc@trans@chges@pb}{}{Problem}
+\NewDocumentCommand{\tutodoc@trans@chges@prob}{}{Problem}
\NewDocumentCommand{\tutodoc@trans@chges@break}{}{Break}
\NewDocumentCommand{\tutodoc@trans@chges@fix}{}{Fix}
\NewDocumentCommand{\tutodoc@trans@chges@new}{}{New}
diff --git a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty
index c639e1e9e03..49ad24c363e 100644
--- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty
+++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty
@@ -4,13 +4,13 @@
\NewDocumentCommand{\tutodoc@trans@latex@show@start}{}{Début ~ du ~ rendu ~ réel}
\NewDocumentCommand{\tutodoc@trans@latex@show@end}{}{Fin ~ du ~ rendu ~ réel}
\NewDocumentCommand{\tutodoc@trans@exa@title}{}{Exemple}
-\NewDocumentCommand{\tutodoc@trans@rmk@title}{}{Remarque}
+\NewDocumentCommand{\tutodoc@trans@rem@title}{}{Remarque}
\NewDocumentCommand{\tutodoc@trans@note@title}{}{Note}
\NewDocumentCommand{\tutodoc@trans@tip@title}{}{Astuce}
-\NewDocumentCommand{\tutodoc@trans@important@title}{}{Important}
-\NewDocumentCommand{\tutodoc@trans@caution@title}{}{Caution}
-\NewDocumentCommand{\tutodoc@trans@warn@title}{}{Danger}
-\NewDocumentCommand{\tutodoc@trans@chges@pb}{}{Problème}
+\NewDocumentCommand{\tutodoc@trans@imp@title}{}{Important}
+\NewDocumentCommand{\tutodoc@trans@caut@title}{}{Mise ~ en ~ garde}
+\NewDocumentCommand{\tutodoc@trans@warn@title}{}{Avertissement}
+\NewDocumentCommand{\tutodoc@trans@chges@prob}{}{Problème}
\NewDocumentCommand{\tutodoc@trans@chges@break}{}{Bifurcation}
\NewDocumentCommand{\tutodoc@trans@chges@fix}{}{Réparation}
\NewDocumentCommand{\tutodoc@trans@chges@new}{}{Nouveau}
diff --git a/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty b/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty
index 5e0ea7a0fb4..13040c1ff5c 100644
--- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty
+++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty
@@ -1,17 +1,22 @@
-% ------------------------------------------------------- %
-% - This is file `tutodoc.sty' generated automatically. - %
-% - - %
-% - Copyright (C) 2023-2024 by Christophe BAL - %
-% - - %
-% - This file may be distributed and/or modified under - %
-% - the conditions of the GNU 3 License. - %
-% ------------------------------------------------------- %
+% ********************************************************* %
+% ** This is file `tutodoc.sty' generated automatically. ** %
+% ** ** %
+% ** Copyright (C) 2023-2024 by Christophe BAL ** %
+% ** ** %
+% ** This file may be distributed and/or modified under ** %
+% ** the conditions of the GNU 3 License. ** %
+% ********************************************************* %
\ProvidesExplPackage
- {tutodoc}
- {2024-01-06} % Creation: 2023-11-29
- {1.1.0}
- {This package proposes tools for writing "human friendly" documentations of LaTeX packages.}
+ {tutodoc}
+ {2024-09-28} % Creation: 2023-11-29
+ {1.4.0}
+ {This package proposes tools for writing "human friendly" documentations of LaTeX packages.}
+
+
+% =================== %
+% == PACKAGES USED == %
+% =================== %
\RequirePackage[
top = 2.5cm,
@@ -21,45 +26,90 @@
marginparwidth = 2cm,
marginparsep = 2mm,
heightrounded
-]{geometry}[2020-01-02]
+]{geometry}%
+ [2020-01-02]
+
+\RequirePackage[raggedright]%
+ {titlesec}%
+ [2021/07/05]
-\RequirePackage[raggedright]{titlesec}[2021/07/05]
\RequirePackage{tocbasic}
-\RequirePackage{xcolor}[2022/06/12]
-\RequirePackage{hyperref}[2023-02-07]
+\RequirePackage{xcolor}%
+ [2022/06/12]
+
+\RequirePackage{hyperref}%
+ [2023-02-07]
% We delegate the management of quoting to the `csquotes' package,
% which takes care of the linguistic parameters.
-\RequirePackage{csquotes}[2022-09-14]
+\RequirePackage{csquotes}%
+ [2022-09-14]
+
+
+\RequirePackage{fontawesome5}%
+ [2022-05-02]
+
+\RequirePackage{keytheorems}%
+ [2024/09/19]
+
+\RequirePackage[svgnames]%
+ {xcolor}%
+ [2023/11/15]
+
+\RequirePackage{tcolorbox}%
+ [2024/07/10]
+
+\tcbuselibrary{breakable,
+ skins}
+
+\RequirePackage{clrstrip}%
+ [2021-08-28]
-\RequirePackage{amsthm}[2017/09]
+%\RequirePackage[highlightmode = immediate]% Too slow!
+% {minted}%
+% [2024/09/22]
-\RequirePackage{clrstrip}[2021-08-28]
+\RequirePackage{minted2}% Temporary patch.
+\RequirePackage{tcolorbox}%
+ [2024/07/10]
-\RequirePackage{tcolorbox}[2023/06/19]
\tcbuselibrary{minted, breakable, skins}
-\RequirePackage{marginnote}[2023-09-07]
+\RequirePackage{fontawesome5}%
+ [2022-05-02]
+\RequirePackage{marginnote}%
+ [2023-09-07]
+
+% ======================= %
+% == AVAILABLE OPTIONS == %
+% ======================= %
+
+% ----------------- %
% -- LOCALE LANG -- %
+% ----------------- %
\ExplSyntaxOn
+% ::::::::::::::::::: %
% :: SOME MESSAGES :: %
+% ::::::::::::::::::: %
\msg_set:nnnn { tdoc } { package-option-lang-unknown }
{ Unknown ~ language. }
{ See ~ the ~ documentation ~ for ~ the ~ supported ~ languages. }
+% ::::::::::::::::::::::: %
% :: SETTING SOME KEYS :: %
+% ::::::::::::::::::::::: %
\str_new:N \l_tdoc_opt_lang_str
@@ -86,7 +136,13 @@
\ExplSyntaxOff
+% =============== %
+% == MAIN CODE == %
+% =============== %
+
+% --------------------- %
% -- LOCALE SETTINGS -- %
+% --------------------- %
\NewDocumentCommand{\tutodoc@colon}{}{:}
@@ -104,12 +160,16 @@
\ExplSyntaxOff
+% ---------------------- %
% -- GENERAL SETTINGS -- %
+% ---------------------- %
\setlength{\parindent}{0cm}
+% ----------- %
% -- LINKS -- %
+% ----------- %
\hypersetup{
colorlinks,
@@ -120,7 +180,9 @@
}
+% --------------- %
% -- TOC & Co. -- %
+% --------------- %
\ifcsundef{chapter}%
{}%
@@ -162,7 +224,49 @@
\DeclareTOCStyleEntry[indentfollows = chapter]{tocline}{section}
+% --------------------------- %
+% -- COLOR TRANSFORMATIONS -- %
+% --------------------------- %
+
+%%%
+% prototype::
+% #1 : the amount of color relative to black.
+% #2 : one color following the ''xcolor'' format.
+%
+% :return: a "darker" version of the color ''#1''.
+%%%
+\NewExpandableDocumentCommand{\tdocdarkcolor}{O{50}m}{#2!#1!black}
+
+
+%%%
+% prototype::
+% #1 : the transparency rate.
+% #2 : one color following the ''xcolor'' format.
+%
+% :return: a "transparent" version of the color `#1`.
+%%%
+\NewExpandableDocumentCommand{\tdoclightcolor}{O{5}m}{#2!#1}
+
+
+% ----------- %
+% -- ICONS -- %
+% ----------- %
+
+%%%
+% prototype::
+% #1 : one material that expects to be an icon command from the
+% ''fontawsome5'' \pack.
+%
+% :return: the icon followed by a small insecable space.
+%%%
+\NewDocumentCommand{\tdocicon}{m}{%
+ #1\kern.45em%
+}
+
+
+% ------------- %
% -- QUOTING -- %
+% ------------- %
%%%
% prototype::
@@ -175,7 +279,9 @@
}
+% ------------------------------ %
% -- EXPLAINING ENGLISH NAMES -- %
+% ------------------------------ %
%%%
% prototype::
@@ -204,119 +310,134 @@
}
-% -- FOCUS ON SOME CONTENT -- %
+% ----------------------------------- %
+% -- SOBER HIGHLIGHTING OF CONTENT -- %
+% ----------------------------------- %
-% :: EXAMPLE - HIDDEN VERSIONS :: %
+% :::::::::::::::::::::: %
+% :: EXAMPLE - REMARK :: %
+% :::::::::::::::::::::: %
-%%%
-% See the \doc of the macro ''\newtheorem'' from the package ''amsthm''
-% to have \infos about the environment ''@@tdocexa@nb''.
-%%%
-\newtheorem{@@tdocexa@nb}{\tutodoc@trans@exa@title}%
- [subsubsection]
+\ExplSyntaxOn
%%%
-% We redefine the counter associated to the environment ''@@tdocexa@nb''
-% to obtain only one single arabic number.
+% We use a ''seq'' variable to factorize the code just after.
%%%
-\renewcommand{\the@@tdocexa@nb}{\arabic{@@tdocexa@nb}}
+\seq_new:N \__g_tutodoc_focus_sober_seq
+\seq_set_from_clist:Nn \__g_tutodoc_focus_sober_seq {
+ exa,
+ rem
+}
%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''@@tdocexa@no@nb''.
-%%%
-\newtheorem*{@@tdocexa@no@nb}{\tutodoc@trans@exa@title}
-
-
-% :: EXAMPLE - PUBLIC VERSION :: %
-
-\ExplSyntaxOn
-
-\msg_set:nnnn { tdoc } { env-tdocexa-unknown-option }
- { Unknown ~ rafters ~ option. }
- { See ~ the ~ documentation ~ for ~ the ~ supported ~ options. }
-
-\NewDocumentEnvironment{tdocexa}{D<>{nb} O{}}{
- \str_case:nnF { #1 } {
- { nb } {
- \begin{@@tdocexa@nb}[#2]
- }
- { nonb } {
- \begin{@@tdocexa@no@nb}[#2]
- }
- }{
- \msg_error:nn { tdoc } { env-tdocexa-unknown-option }
+% prototype::
+% :action: looping over ''\__g_tutodoc_focus_sober_seq'' to build new
+% numbered theorems sharing the same section level counter.
+% To achieve that, we use the ''\newkeytheorem'' macro from
+% the ''keytheorems'' \pack.
+%%%
+\seq_map_inline:Nn \__g_tutodoc_focus_sober_seq {
+ \str_if_eq:nnTF { #1 } { exa } {
+ \newkeytheorem{tdoc#1}[
+ name = \use:c { tutodoc@trans@#1@title },
+ within = section,
+ ]
+ } {
+ \newkeytheorem{tdoc#1}[
+ name = \use:c { tutodoc@trans@#1@title },
+ numberlike = tdocexa,
+ ]
}
-}{
- \str_case:nnF { #1 } {
- { nb } {
- \end{@@tdocexa@nb}
- }
- { nonb } {
- \end{@@tdocexa@no@nb}
- }
- }{}
+
+ \cs_set:cpn { the tdoc #1 } { \thesection\arabic{tdoc#1} }
}
\ExplSyntaxOff
-% :: REMARK :: %
-
-%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdocrem''.
-%%%
-\newtheorem*{tdocrem}{\tutodoc@trans@rmk@title}
-
+% -------------------------------------- %
+% -- COLORFUL HIGHLIGHTING OF CONTENT -- %
+% -------------------------------------- %
-% :: IMPORTANT :: %
+% ::::::::::::::::: %
+% :: ABSTRACTION :: %
+% ::::::::::::::::: %
%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdocimportant''.
+% note::
+% The settings used come from the following sources.
+% * https://tex.stackexchange.com/a/727022/6880
+% * https://tex.stackexchange.com/a/682332/6880
%%%
-\newtheorem*{tdocimportant}{\tutodoc@trans@important@title}
-
-
-% :: NOTE :: %
+\tcbset{
+ tutodoc-focus-color-style/.style = {
+ breakable,
+ enhanced,
+ left = 3pt,
+ right = 3pt,
+ fontupper = \color{\tdocdarkcolor{#1}},
+ colback = \tdoclightcolor{#1},
+ colframe = #1!75!black!45,
+ shadow = {.75mm}{-.75mm}{0mm}{black!30},
+% We want to use the same color for the footnotes in the frame.
+ before upper = {\let\default@color\current@color},
+ }
+}
-%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdocnote''.
-%%%
-\newtheorem*{tdocnote}{\tutodoc@trans@note@title}
+% ::::::::::::::::::::::::::::::::::::: %
+% :: LET'S GO BACK TO THE REAL WORLD :: %
+% ::::::::::::::::::::::::::::::::::::: %
-% :: TIP :: %
+\ExplSyntaxOn
%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdoctip''.
+% We use two ''prop'' variables to factorize the code just after.
%%%
-\newtheorem*{tdoctip}{\tutodoc@trans@tip@title}
+\prop_set_from_keyval:Nn \__g_tutodoc_focus_color_prop {
+ note = cyan,
+ tip = ForestGreen,
+ imp = orange,
+ caut = violet,
+ warn = red,
+}
+\prop_set_from_keyval:Nn \__g_tutodoc_focus_icon_prop {
+ note = \faInfoCircle,
+ tip = \faLightbulb,
+ imp = \faHighlighter,
+ caut = \faBiohazard,
+ warn = \faSkullCrossbones,
+}
-% :: CUATION :: %
%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdoccaution''.
-%%%
-\newtheorem*{tdoccaution}{\tutodoc@trans@caution@title}
-
-
-% :: WARNING :: %
+% prototype::
+% :action: ''key/value'' iteration over ''\__g_tutodoc_focus_color_prop''
+% to build new colorful unumbered theorems. To achieve that,
+% we use a ''tcolorbox'' style givent to the ''\newkeytheorem''
+% macro from the ''keytheorems'' \pack, and icons from the
+% ''fontawesome5'' \pack.
+%%%
+\prop_map_inline:Nn \__g_tutodoc_focus_color_prop {
+ \newkeytheorem{tdoc#1}[
+ numbered = false,
+% tcolorbox-no-titlebar can be used.
+ tcolorbox = {tutodoc-focus-color-style=#2},
+ name = {
+ \tdocicon{ \prop_item:Nn \__g_tutodoc_focus_icon_prop { #1 } }
+ \use:c { tutodoc@trans@#1@title }
+ },
+ ]
+}
-%%%
-% See the \doc of the macro ''\newtheorem*'' from the package ''amsthm''
-% to have \infos about the environment ''tdocwarn''.
-%%%
-\newtheorem*{tdocwarn}{\tutodoc@trans@warn@title}
+\ExplSyntaxOff
+% ---------------------------------------------- %
% -- NAMES OF PACKAGES, MACROS & ENVIRONMENTS -- %
+% ---------------------------------------------- %
%%%
% prototype::
@@ -356,31 +477,53 @@
% #1 : hard typed options with the good delimiters
% #2 : the name of an environment
%
-% :action: ''\tdocenv{myenv}'' prints verb::''\begin{myenv} ... \end{myenv}''
-% or something like verb::''\begin{myenv}<opt1> ... \end{myenv}'',
-% the spaces being secable.
+% :extra: this macro has a star version.
+%
+% Here are the four kind of outputs.
+%
+% 1) ''\tdocenv{myenv}'' prints
+% verb::''\begin{myenv} ... \end{myenv}''.
+%
+% 2) ''\tdocenv[{<opt1>[mando2]}]{myenv}'' prints
+% verb::''\begin{myenv}<opt1>[mando2] ... \end{myenv}''.
+%
+% 3) ''\tdocenv*{myenv}'' prints
+% verb::''myenv''.
+%
+% 4) ''\tdocenv*[{<opt1>[mando2]}]{myenv}'' prints
+% verb::''myenv''.
%%%
%
% Cleaner code from https://tex.stackexchange.com/a/703379/6880 .
-\NewDocumentCommand{\tdocenv}{O{}m}{%
- \texttt{\string\begin\string{#2\string}#1 %
- \!\!...\@\!\!\! %
- \string\end\string{#2\string}}%
+\NewDocumentCommand{\tdocenv}{s O{} m}{%
+ \IfBooleanTF{#1}{%
+ \texttt{#3}%
+ }{%
+ \texttt{\string\begin\string{#3\string}#2 %
+ \!\!...\@\!\!\! %
+ \string\end\string{#3\string}}%
+ }%
}
+% ------------------------- %
% -- EXPLAINING PREFIXES -- %
+% ------------------------- %
\ExplSyntaxOn
+% :::::::::::::: %
% :: MESSAGES :: %
+% :::::::::::::: %
\msg_set:nnnn { bdoc } { prefixwhy-bad-format }
{ Bad ~ format, ~ something ~ like ~ ''pre.fix'' ~ expected. }
{ You ~ must ~ use ~ one ~ single ~ point. }
+% :::::::::::::::::::: %
% :: PREFIX FROM... :: %
+% :::::::::::::::::::: %
%%%
% prototype::
@@ -410,7 +553,9 @@
\ExplSyntaxOff
+% ::::::::::::::::::::: %
% :: JUST ONE PREFIX :: %
+% ::::::::::::::::::::: %
%%%
% prototype::
@@ -427,9 +572,13 @@
}
+% ------------------------ %
% -- GENERAL FORMATTING -- %
+% ------------------------ %
+% :::::::::::::::::::::::: %
% :: TEXT INSIDE A RULE :: %
+% :::::::::::::::::::::::: %
\ExplSyntaxOn
@@ -472,31 +621,9 @@
\ExplSyntaxOff
-% :: COLOR TRANSFORMATIONS :: %
-
-%%%
-% prototype::
-% #1 : one color following the ''xcolor'' format.
-%
-% :return: a "darker" version of the color ''#1''.
-%%%
-\NewExpandableDocumentCommand{\tdocdarkcolor}{m}{%
- #1!50!black%
-}
-
-
-%%%
-% prototype::
-% #1 : one color following the ''xcolor'' format.
-%
-% :return: a "transparent" version of the color `#1`.
-%%%
-\NewExpandableDocumentCommand{\tdoclightcolor}{m}{%
- #1!5%
-}
-
-
+% ::::::::::::::::::::::::::: %
% :: INTERNAL ENVIRONMENTS :: %
+% ::::::::::::::::::::::::::: %
%%%
% prototype::
@@ -545,7 +672,9 @@
\ExplSyntaxOn
+% ::::::::::::::::::::::: %
% :: SETTING SOME KEYS :: %
+% ::::::::::::::::::::::: %
\tl_new:N \l_tdoc_showcase_before_tl
\tl_new:N \l_tdoc_showcase_after_tl
@@ -574,7 +703,9 @@
}
+% :::::::::::::::::::::::::::::: %
% :: SHOWCASE FROM TYPED CODE :: %
+% :::::::::::::::::::::::::::::: %
% prototype::
% #1 : the key-value options.
@@ -614,7 +745,9 @@
}
+% :::::::::::::::::::::::: %
% :: SHOWCASE FROM FILE :: %
+% :::::::::::::::::::::::: %
%%%
% prototype::
@@ -636,9 +769,13 @@
\ExplSyntaxOff
+% -------------------- %
% -- LATEX EXAMPLES -- %
+% -------------------- %
+% ::::::::::::::::::::::::::::: %
% :: INLINE SHORT LATEX CODE :: %
+% ::::::::::::::::::::::::::::: %
%%%
% See the \doc of the macro ''\newmintinline'' from the package ''minted''
@@ -647,11 +784,18 @@
\newmintinline[tdocinlatex]{latex}{bgcolor = yellow!4}
+% ::::::::::::::::::::::::::::::::::::::::::::::: %
% :: SHORTCUTS FOR TCOLORBOX LISTING FORMATING :: %
+% ::::::::::::::::::::::::::::::::::::::::::::::: %
\ExplSyntaxOn
%%%
+% prototype::
+% #1 : a style of formatting for a \latex listing and its output.
+%
+% :see: macro.tdoclatex , macro.tdoclatexinput
+%
% In the following easy-to-understand macro, we use one fictive ''tcolorbox''
% style such as to indicate an unknown ''tdoc'' style to the user.
% For example, this can give one message similar to the following one.
@@ -673,7 +817,9 @@
\ExplSyntaxOff
+% ::::::::::::::::::::::::::::::::: %
% :: THE TCOLORBOX LISTING STYLE :: %
+% ::::::::::::::::::::::::::::::::: %
%%%
% note::
@@ -685,6 +831,7 @@
tdoclatex_tcbstyle/.style = {
minted language = latex,
breakable,
+ enhanced,
% Code and output
colback = yellow!5,
% Frame
@@ -696,7 +843,6 @@
% We can use ''sharp corners'' to obtain an "old school" style.
%
% Separating line
- enhanced,
segmentation style = {
gray,
dash pattern = {on 5pt off 2.5pt},
@@ -707,7 +853,9 @@
}
+% ::::::::::::::::::::::::::::::::::: %
% :: TCOLORBOX LISTING ENVIRONMENT :: %
+% ::::::::::::::::::::::::::::::::::: %
%%%
% prototype::
@@ -725,11 +873,13 @@
}
+% :::::::::::::::::::::::::::::::::::::: %
% :: TCOLORBOX IMPORTED LISTING MACRO :: %
+% :::::::::::::::::::::::::::::::::::::: %
%%%
% prototype::
-% #1 : :see: \newtcblisting{tdoclatex}.
+% #1 : :see: ''\newtcblisting{tdoclatex}'' just before.
% #2 : the path of the file to input and format.
%
% note::
@@ -742,11 +892,15 @@
}
+% -------------------------- %
% -- LATEX REAL USE CASES -- %
+% -------------------------- %
\ExplSyntaxOn
+% ::::::::::::::::::::::: %
% :: SETTING SOME KEYS :: %
+% ::::::::::::::::::::::: %
\tl_new:N \l_tdoc_listing_explain_tl
@@ -762,7 +916,9 @@
}
+% ::::::::::::::::::::: %
% :: LATEXSHOW MACRO :: %
+% ::::::::::::::::::::: %
%%%
% prototype::
@@ -794,22 +950,26 @@
\ExplSyntaxOn
+% :::::::::::::: %
% :: MESSAGES :: %
+% :::::::::::::: %
\msg_set:nnnn { tdoc } { date-bad-format }
{ Bad ~ format ~ for ~ a ~ date. }
{ Use ~ YYYY-MM-DD. }
+% ::::::::::::::::: %
% :: MARGIN NOTE :: %
+% ::::::::::::::::: %
\reversemarginpar{}
%%%
% prototype::
% #1 : the color of the margin note
-% #2 : the first material (a date or nothing)
-% #3 : the second material (a version number or nothing)
+% #2 : the first material (a version number or nothing)
+% #3 : the second material (a date or nothing)
% #4 : the last negative vertical spacing for the 2nd rule
%
% :action: this macro factorizes the printing of the changes
@@ -829,15 +989,19 @@
\IfBlankTF{#2}{}{
\par
- \__tdoc_translate_date:n { #2 }
+ #2\vphantom{Mp}
\par
}
- \vspace{1pt}
+ \IfBlankTF{#3}{}{
+ \IfBlankTF{#2}{}{
+ \vspace{1pt}
+ }
- \par
- #3
- \par
+ \par
+ \__tdoc_translate_date:n { #3 }\vphantom{Mp}
+ \par
+ }
\vspace{#4}
\rule{1.65cm}{.95pt}
@@ -871,12 +1035,16 @@
%%%
\cs_new:Npn \__tdoc_translate_date_process:w #1 - #2 - #3 \q_stop {
\tutodoc@trans@date{#1}
- {#2}
- {#3}
+ {#2}
+ {#3}
}
+\ExplSyntaxOff
+
+% :::::::::::::::::::::: %
% :: VERSION AND DATE :: %
+% :::::::::::::::::::::: %
%%%
% prototype::
@@ -895,13 +1063,15 @@
%%%
\NewDocumentCommand{\tdocversion}{O{blue} m O{}}{
\tutodoc@new@change@margin{#1} % Color
- {#3} % Date
- {#2} % Version
- {-4.25pt} % Last negative vertical spacing
+ {#2} % Version
+ {#3} % Date
+ {-4.25pt} % Last negative vertical spacing
}
+% :::::::::: %
% :: DATE :: %
+% :::::::::: %
%%%
% prototype::
@@ -913,36 +1083,46 @@
%%%
\NewDocumentCommand{\tdocdate}{O{blue} m}{
\tutodoc@new@change@margin{#1} % Color
- {#2} % Date
- {} % Version
- {-5.35pt} % Last negative spacing
+ {#2} % Date
+ {} % Version
+ {-5.35pt} % Last negative spacing
}
-% -- CHANGES - WHAT?
+% --------------------- %
+% -- CHANGES - WHAT? -- %
+% --------------------- %
+
+\ExplSyntaxOn
+% :::::::::::::: %
% :: MESSAGES :: %
+% :::::::::::::: %
\msg_set:nnnn { tdoc } { changes-topic-missing-title }
{ Missing ~ title. }
{ One ~ single ~ title ~ must ~ be ~ indicated. }
+% ::::::::::::::::::::: %
% :: CHANGES - TOPIC :: %
+% ::::::::::::::::::::: %
%%%
% prototype::
% #1 : a title that will be followed by a colon.
+% #2 : one material that expects to be an icon command from the
+% ''fontawsome5'' \pack.
%
% :action: this environment prints some ¨infos about specific changes
% achieved in a new version (no special formatting is applied).
%%%
-\NewDocumentEnvironment{tdoctopic}{ m }{
+\NewDocumentEnvironment{tdoctopic}{ m O{} }{
\IfBlankT{#1}{
\msg_fatal:nn { tdoc } { changes-topic-missing-title }
- }
-
- \textbf{
+ }%
+ \textbf{%
+ \IfBlankF{#2}{\tdocicon{#2}}%
\textsc{#1.}
}
@@ -952,89 +1132,56 @@
}
+% :::::::::::::::::::::::::: %
% :: CHANGES - NEW THINGS :: %
+% :::::::::::::::::::::::::: %
%%%
-% prototype::
-% :see: env.tdoctopic
-%
-% :action: similar to the \env ''tdoctopic'' with the title "New"
-% translated into the good language.
-%%%
-\NewDocumentEnvironment{tdocnew}{}{
- \begin{tdoctopic}{\tutodoc@trans@chges@new}
-}{
- \end{tdoctopic}
-}
-
-
-% :: CHANGES - UPDATE :: %
-
-%%%
-% prototype::
-% :see: env.tdoctopic
-%
-% :action: similar to the \env ''tdoctopic'' with the title "Update"
-% translated into the good language.
-%%%
-\NewDocumentEnvironment{tdocupdate}{}{
- \begin{tdoctopic}{\tutodoc@trans@chges@update}
-}{
- \end{tdoctopic}
-}
-
-
-% :: CHANGES - BREAK :: %
-
-%%%
-% prototype::
-% :see: env.tdoctopic
-%
-% :action: similar to the \env ''tdoctopic'' with the title "Break"
-% translated into the good language.
+% We use a ''prop'' variable to factorize the code just after.
%%%
-\NewDocumentEnvironment{tdocbreak}{}{
- \begin{tdoctopic}{\tutodoc@trans@chges@break}
-}{
- \end{tdoctopic}
+\prop_new:N \__g_tutodoc_topic_change_prop
+\prop_set_from_keyval:Nn \__g_tutodoc_topic_change_prop {
+ break = \faCodeBranch,
+ fix = \faWrench,
+ new = \faGem,
+ prob = \faFire*,
+ update = \faMagic,
}
-% :: CHANGES - PROBLEM :: %
-
%%%
% prototype::
% :see: env.tdoctopic
%
-% :action: similar to the \env ''tdoctopic'' with the title "Problem"
-% translated into the good language.
+% :action: ''key/value'' iteration over ''\__g_tutodoc_topic_change_prop''
+% to build topic-like \envs using the \env ''tdoctopic''
+% (the title used is translated into the good language).
%%%
-\NewDocumentEnvironment{tdocprob}{}{
- \begin{tdoctopic}{\tutodoc@trans@chges@pb}
-}{
- \end{tdoctopic}
+\prop_map_inline:Nn \__g_tutodoc_topic_change_prop {
+ \NewDocumentEnvironment{ tdoc#1 } {} {
+ \begin{tdoctopic}{ \use:c { tutodoc@trans@chges@#1 } } [ #2 ]
+ }{
+ \end{tdoctopic}
+ }
}
-% :: CHANGES - FIX :: %
-
%%%
% prototype::
-% :see: env.tdoctopic
+% #1 : a short text expected t indicate the very first version of a project.
%
-% :action: similar to the \env ''tdoctopic'' with the title "Fix"
-% translated into the good language.
+% :action: the short text printed will be preceded by a pretty anchor icon.
%%%
-\NewDocumentEnvironment{tdocfix}{}{
- \begin{tdoctopic}{\tutodoc@trans@chges@fix}
-}{
- \end{tdoctopic}
+\NewDocumentCommand{ \tdocstartproj }{ m } {
+ \tdocicon{\faAnchor}#1
}
\ExplSyntaxOff
+% ----------------- %
% -- DECORATIONS -- %
+% ----------------- %
% Source for \addvspace{\medskipamount} instead of \medskip.
% * https://tex.stackexchange.com/a/705938/6880
@@ -1052,12 +1199,3 @@
\medskip
\smallskip
}
-
-
-%%%
-% prototype::
-% :action: this macro adds a tiny vertical spacing.
-%%%
-\NewDocumentCommand{\tdocxspace}{}{
- \vspace{0.25em}
-}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
index 61fe5db1b48..c901bd70b5b 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{beamerthemeuantwerpen}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
index 34e0dceb034..dacdc2eba5f 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenbamathesis}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
\input{uantwerpencommonoptions.clo}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty
index c18c069f77a..cbc4e66ac75 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty
@@ -25,7 +25,7 @@
%% The Current Maintainer of this work is Walter Daems.
%%
\ProvidesPackage{uantwerpencolorlogoscheme}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\if@cmyk
%% UAntwerpen
\definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
index 0f39d9fce21..75b7428ba8d 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpencoursetext}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@modern
\@modernfalse
\DeclareOption{modern}{\@moderntrue}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data
index 78baa70ad6a..b3d2a343bdf 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data
@@ -46,8 +46,8 @@ juryname = Jury
jurymembersname = Members
jurychairname = Chair
bmthesisname = Thesis to obtain the degree of
-pthesisnamei = Thesis submitted in fulfilment of the requirements for the degree of
-pthesisnameii = at the University of Antwerp
+pthesisnamei = Thesis submitted for the degree of
+pthesisnameii = at the University of Antwerp to be defended by
weightname = Weight
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
index 3b6ba3c95e5..7e4b1999d4c 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenexam}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@examiner
\DeclareOption{examiner}{\@examinertrue}
\input{uantwerpencommonoptions.clo}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
index 36ea4e52a16..eebd93d7930 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenletter}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
\newif\if@nofoldline
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
index 99966e060cd..ddb8dd2d254 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenphdthesis}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
\newif\if@cameraready
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls
index 09009072947..feeb5ac9623 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenreport}
- [2024/06/04 v4.7 .dtx skeleton file]
+ [2024/08/27 v4.8 .dtx skeleton file]
\newif\if@copyright
\DeclareOption{copyright}{\@copyrighttrue}
\newif\if@filled
diff --git a/Master/texmf-dist/tex/latex/ucph-revy/ucph-revy.cls b/Master/texmf-dist/tex/latex/ucph-revy/ucph-revy.cls
index 1ecd22dc05c..694b59651e9 100644
--- a/Master/texmf-dist/tex/latex/ucph-revy/ucph-revy.cls
+++ b/Master/texmf-dist/tex/latex/ucph-revy/ucph-revy.cls
@@ -22,7 +22,7 @@
%% LaTeX version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{ucph-revy}
- [2024/02/07 v1.0.1 Fix occational divide by 0]
+ [2024/09/24 v1.0.2 A class for making musical manuscripts]
\RequirePackage{xstring}
\newif\if@thumbindex\@thumbindexfalse
\DeclareOption{thumbindex}{\@thumbindextrue}
@@ -46,7 +46,7 @@
\else
\expandafter\@gobble
\fi{
- \RequirePackage[T1]{fontenc}
+ \RequirePackage[OT1]{fontenc}
\begingroup
\count256=0
\endlinechar=-1
@@ -545,6 +545,7 @@
\def\does##1{\scene \hspace{-1em}\role{##1}}
\def\act##1{\textit{(##1)}}
}{}
+\newcommand{\SaTyR}{S\hspace*{-.2ex}\raisebox{-.15em}{A}\hspace*{-.5ex}TyR}
\let\revyinfo=\relax
\newtoks\@titletoks
\newtoks\@authortoks
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 f7ff0916f44..495172ee0dd 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/07/23 v.2.7 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2024/09/28 v.2.9 Univie Linguistic Exposes (JSp)]
%% ============================================================
@@ -687,7 +687,22 @@
% End of @uve@apa condition
\fi
-% End of @uve@biblatex condition
+\else% @uvt@biblatex condition FALSE
+
+% Some support for legacy bibtex
+\AtBeginDocument{%
+ \@ifundefined{bibhang}{}{%
+ \setlength{\bibhang}{\parindent}%
+ }%
+ \@ifundefined{bibfont}{}{%
+ \renewcommand{\bibfont}{\small}%
+ }%
+ \@ifundefined{bibsep}{}{%
+ \setlength\bibsep{0pt}%
+ }%
+}
+
+% End of @uvt@biblatex condition
\fi
%% =============================================================
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 73c5a325da4..d81cd6a27a1 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/07/23 v.2.7 Univie Ling handout class (JSp)]
+\ProvidesClass{univie-ling-handout}[2024/09/28 v.2.9 Univie Ling handout class (JSp)]
%% ============================================================
%% CLASS OPTIONS
@@ -867,7 +867,22 @@
\DeclarePrintbibliographyDefaults{title=\uvh@bibheading}
-% End of @uvh@biblatex condition
+\else% @uvt@biblatex condition FALSE
+
+% Some support for legacy bibtex
+\AtBeginDocument{%
+ \@ifundefined{bibhang}{}{%
+ \setlength{\bibhang}{\parindent}%
+ }%
+ \@ifundefined{bibfont}{}{%
+ \renewcommand{\bibfont}{\small}%
+ }%
+ \@ifundefined{bibsep}{}{%
+ \setlength\bibsep{0pt}%
+ }%
+}
+
+% End of @uvt@biblatex condition
\fi
% Smaller
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 eda1430345b..51690011986 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/07/23 v.2.7 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2024/09/28 v.2.9 Univie Linguistic Papers (JSp)]
%% ============================================================
@@ -845,7 +845,22 @@ This includes all drawings, sketches, graphics and internet sources.}
% End of @uvp@apa condition
\fi
-% End of @uvp@biblatex condition
+\else% @uvt@biblatex condition FALSE
+
+% Some support for legacy bibtex
+\AtBeginDocument{%
+ \@ifundefined{bibhang}{}{%
+ \setlength{\bibhang}{\parindent}%
+ }%
+ \@ifundefined{bibfont}{}{%
+ \renewcommand{\bibfont}{\small}%
+ }%
+ \@ifundefined{bibsep}{}{%
+ \setlength\bibsep{0pt}%
+ }%
+}
+
+% End of @uvt@biblatex condition
\fi
%% =============================================================
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 87f5092d4ce..780e98bc832 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/07/23 v.2.7 Univie Ling poster class (JSp)]
+\ProvidesClass{univie-ling-poster}[2024/09/28 v.2.9 Univie Ling poster class (JSp)]
%% ============================================================
%% CLASS OPTIONS
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 91d34276a0f..82dae78b030 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/07/23 v.2.7 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2024/09/28 v.2.9 Univie Linguistic Theses (JSp)]
%% ============================================================
@@ -55,6 +55,7 @@
\newif\if@uvt@psfonts\@uvt@psfontstrue
\newif\if@uvt@refsp\@uvt@refsptrue
\newif\if@uvt@usefontenc\@uvt@usefontenctrue
+\newif\if@uvt@titlepage\@uvt@titlepagetrue
\def\uvt@fontenc{T1}
% Define keys and values
@@ -155,6 +156,10 @@
{ \@uvt@draftmarktrue
\@uvt@draftmarkfptrue
},
+ % titlepage=<true|false>
+ % Output titlepage
+ titlepage.legacy_if_set:n = @uvt@titlepage,
+ titlepage.usage:n = preamble,
% no val equals to true
draftmark .default:n = {true},
% fonts=<ps|otf|none>
@@ -241,33 +246,36 @@ This includes all drawings, sketches, graphics and internet sources.}
%% FONTS AND EMPHASIZING:
%% ============================================================
+\def\uvt@titlesans{\sffamily}
+
\if@uvt@psfonts
\RequirePackage[T1]{fontenc}
\if@uvt@usefontenc
\RequirePackage[\uvt@fontenc]{fontenc}
\fi
-
- % Palatino
+ % Serif: Palatino
\RequirePackage[osf]{mathpazo}
-
- % Arial or Helvetica
- \IfFileExists{uarial.sty}{%
- \RequirePackage{uarial}
- }{%
- \RequirePackage{helvet}
- }
-
- % Source Code Pro (Courier)
+ % Sans: Source Sans Pro Light
+ \RequirePackage[semibold]{sourcesanspro}
+ % Mono: Source Code Pro
\RequirePackage[scale=.93]{sourcecodepro}
+ % Lighter Sans for title page
+ \def\uvt@titlesans{\def\mdseries@sf{l}\sffamily}
\fi
\if@uvt@otffonts
\RequirePackage{fontspec}
- \setmainfont{Palatino}
- \setsansfont{Arial}
- \setmonofont{SourceCodePro}
+ \setmainfont{TeX Gyre Pagella}
+ % Sans: Source Sans Pro Light
+ \RequirePackage[semibold]{sourcesanspro}
+ % Mono: Source Code Pro
+ \RequirePackage[scale=.93]{sourcecodepro}
+ % Lighter Sans for title page
+ \def\uvt@titlesans{\sourcesansprolight}
\fi
+
+
% Hyperlinks
\RequirePackage{url}
\newcommand{\urlprefix}{}
@@ -299,14 +307,14 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\slash{/\penalty\exhyphenpenalty\hskip\z@skip}
% Font settings
-\newkomafont{thesistype}{\fontsize{24}{26pt}\bfseries\sffamily}
-\setkomafont{title}{\fontsize{18}{20pt}\sffamily}
-\setkomafont{author}{\fontsize{18}{20pt}\large\sffamily}
-\setkomafont{date}{\normalfont\fontsize{11}{13pt}\mdseries\sffamily}
-\newkomafont{degree}{\fontsize{12}{14pt}\sffamily}
-\newkomafont{baende}{\normalfont\fontsize{12}{14pt}\mdseries\sffamily}
-\newkomafont{tpcaption}{\fontsize{11}{13pt}\sffamily}
-\newkomafont{codes}{\fontsize{10}{12pt}\sffamily}
+\newkomafont{thesistype}{\fontsize{24}{26pt}\bfseries\uvt@titlesans}
+\setkomafont{title}{\fontsize{18}{20pt}\uvt@titlesans}
+\setkomafont{author}{\fontsize{18}{20pt}\large\uvt@titlesans}
+\setkomafont{date}{\normalfont\fontsize{11}{13pt}\mdseries\uvt@titlesans}
+\newkomafont{degree}{\fontsize{12}{14pt}\uvt@titlesans}
+\newkomafont{baende}{\normalfont\fontsize{12}{14pt}\mdseries\uvt@titlesans}
+\newkomafont{tpcaption}{\fontsize{11}{13pt}\uvt@titlesans}
+\newkomafont{codes}{\fontsize{10}{12pt}\uvt@titlesans}
%% ============================================================
@@ -384,35 +392,35 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\thesistype@bachelor{Bachelorarbeit}
\def\thesistype@bachelor@en{Bachelor's Thesis}
\def\dirtype@bachelor{Studienrichtung}
-\def\dirtype@bachelor@en{degree programme}
+\def\dirtype@bachelor@en{Degree programme}
\def\degree@bachelor{Bachelor of Arts (BA)}
\def\degree@bachelor@f{\degree@bachelor}
% master
\def\thesistype@master{Masterarbeit}
\def\thesistype@master@en{Master's Thesis}
\def\dirtype@master{Studienrichtung}
-\def\dirtype@master@en{degree programme}
+\def\dirtype@master@en{Degree programme}
\def\degree@master{Master of Arts (MA)}
\def\degree@master@f{\degree@master}
% magister
\def\thesistype@magister{Magisterarbeit}
\def\thesistype@magister@en{Magister Thesis}
\def\dirtype@magister{Studienrichtung}
-\def\dirtype@magister@en{degree programme}
+\def\dirtype@magister@en{Degree programme}
\def\degree@magister{Magister der Philosophie (Mag.\,Phil.)}
\def\degree@magister@f{Magistra der Philosophie (Mag.\,Phil.)}
% diplom
\def\thesistype@diplom{Diplomarbeit}
\def\thesistype@diplom@en{Diploma Thesis}
\def\dirtype@diplom{Studienrichtung}
-\def\dirtype@diplom@en{degree programme}
+\def\dirtype@diplom@en{Degree programme}
\def\degree@diplom{Magister der Philosophie (Mag.\,Phil.)}
\def\degree@diplom@f{Magistra der Philosophie (Mag.\,Phil.)}
% diss
\def\thesistype@diss{Dissertation}
\def\thesistype@diss@en{Doctoral Thesis}
\def\dirtype@diss{Dissertationsgebiet}
-\def\dirtype@diss@en{field of study}
+\def\dirtype@diss@en{Field of study}
\def\degree@diss{Doktor der Philosophie (Dr.\,phil.)}
\def\degree@diss@f{Doktorin der Philosophie (Dr.\,phil.)}
@@ -474,7 +482,10 @@ This includes all drawings, sketches, graphics and internet sources.}
% We need graphicx for the logo
\RequirePackage{graphicx}
+\def\uvt@titlesep{\,|\,}
+
\renewcommand*\maketitle[1][1]{%
+ \if@uvt@titlepage
\newgeometry{top=2cm,bottom=2.5cm,left=2.5cm,right=2cm}
\expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
\else
@@ -527,27 +538,27 @@ This includes all drawings, sketches, graphics and internet sources.}
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\begin{flushright}
- \includegraphics[width=6cm]{univielogo-sw}
+ \includegraphics[width=6cm]{univielogo}
\end{flushright}
\vspace{2\baselineskip}
\begin{center}
- {\usekomafont{thesistype}\MakeUppercase{\@thesistype\,/\,\hskip\z@skip\mbox{\@thesistype@en}}\par}
+ {\usekomafont{thesistype}\MakeUppercase{\@thesistype\uvt@titlesep\hskip\z@skip\mbox{\@thesistype@en}}\par}
\end{center}
\vspace{2\baselineskip}
\begin{center}
- {\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
+ {\usekomafont{tpcaption}Titel\uvt@titlesep Title\par}
{\ifx\@title\@empty\else
- \usekomafont{title}{\enquote{\@title%
- \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
+ \usekomafont{title}{\@title%
+ \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi\par}%
\fi
}%
{\ifx\@volume\@empty\else%
- \vskip 1em\usekomafont{baende}{Band \@volume\ von \@volumes\ B\"anden\,/\,volume \@volume\ of \@volumes\ volumes}%
+ \vskip 1em\usekomafont{baende}{Band \@volume\ von \@volumes\ B\"anden\uvt@titlesep volume \@volume\ of \@volumes\ volumes}%
\fi%
}%
\vskip 2em
{%
- {\usekomafont{tpcaption}verfasst von\,/\,submitted by\par}
+ {\usekomafont{tpcaption}verfasst von\,\uvt@titlesep\uvt@titlesep submitted by\par}
\usekomafont{author}{%
\lineskip 0.75em%
\begin{tabular}[t]{c}
@@ -556,21 +567,21 @@ This includes all drawings, sketches, graphics and internet sources.}
}%
}%
\vskip 2em
- {\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par}
+ {\usekomafont{tpcaption}angestrebter akademischer Grad\uvt@titlesep in partial fulfilment of the requirements for the degree of\par}
\usekomafont{degree}{\@degree}
\end{center}\par
\vfill
- {\usekomafont{date}{Wien, \the\year\,/\,Vienna, \the\year\par}}%
+ {\usekomafont{date}{Wien, \the\year\uvt@titlesep Vienna, \the\year\par}}%
\vskip 2em
\usekomafont{codes}{%
\begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
- Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
+ Studienkennzahl lt. Studienblatt\uvt@titlesep Degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
\noalign{\vskip6pt}
- \@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
+ \@dirtype\ lt. Studienblatt\uvt@titlesep\@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
\noalign{\vskip6pt}
- Betreut von\,/\,Supervisor: & & \@supervisor\tabularnewline%
+ Betreut von\uvt@titlesep Supervisor: & & \@supervisor\tabularnewline%
\noalign{\vskip6pt}
- \ifx\@cosupervisor\@empty\else Mitbetreut von\,/\,Co-Supervisor: & & \@cosupervisor\fi
+ \ifx\@cosupervisor\@empty\else Mitbetreut von\uvt@titlesep Co-Supervisor: & & \@cosupervisor\fi
\end{tabular}\par
}
\par
@@ -591,7 +602,10 @@ This includes all drawings, sketches, graphics and internet sources.}
\cleardoubleemptypage
\fi
\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
- \end{titlepage}
+ \end{titlepage}
+ \else% \if@uvt@titlepage
+ \setcounter{page}{2}%
+ \fi
\setcounter{footnote}{0}%
\expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
\let\thanks\relax
@@ -822,6 +836,21 @@ This includes all drawings, sketches, graphics and internet sources.}
% End of @uvt@apa condition
\fi
+\else% @uvt@biblatex condition FALSE
+
+% Some support for legacy bibtex
+\AtBeginDocument{%
+ \@ifundefined{bibhang}{}{%
+ \setlength{\bibhang}{\parindent}%
+ }%
+ \@ifundefined{bibfont}{}{%
+ \renewcommand{\bibfont}{\small}%
+ }%
+ \@ifundefined{bibsep}{}{%
+ \setlength\bibsep{0pt}%
+ }%
+}
+
% End of @uvt@biblatex condition
\fi
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 00deb089cca..7c32f39b478 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/07/23 v.2.7 Univie WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2024/09/28 v.2.9 Univie WLG journal layout (JSp)]
%% ============================================================
@@ -431,10 +431,15 @@
\if@wlg@specialprint\else
\RequirePackage{etoc}
\etocstandardlines
+ \etocsetstyle{part}
+ {}
+ {\vspace{12pt}\normalsize\bfseries\rmfamily}
+ {\etocnumber. \etocname{}\par\vspace{10pt}}
+ {}
\etocsetstyle{chapter}
{}
{\normalsize\mdseries\rmfamily}
- {\etocname{}\dotfill\etocpage\par\vspace{12pt}}
+ {\etocname{}\dotfill\etocpage\par\vspace{10pt}}
{}
\setcounter{tocdepth}{0}
\fi
@@ -461,8 +466,7 @@
\newcommand*\frontmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi
\@wlg@mainmatterfalse\@wlg@frontmattertrue\pagenumbering{roman}%
- \edef\computelastpage{%
- \romannumeral\numexpr\getpagerefnumber{LastFrontPage}-1\relax}%
+ \def\computelastpage{\pageref{TotPages}}%
\edef\startpageref{%
\romannumeral\thestartpage\relax}%
}
@@ -595,6 +599,9 @@
\fi
\if@wlg@titlepage
\@maketitlepage[#1]%
+ \if@wlg@mainmatter
+ \pagenumbering{arabic}
+ \fi
\fi
\if@wlg@startpageset\else
\setcounter{page}{\thestartpage}
@@ -633,6 +640,7 @@
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\setcounter{footnote}{0}%
+ \setcounter{page}{\thestartpage}%
\global\let\@cauthor\@empty
\global\let\@thanks\@empty
\gdef\@ccauthor{\translate{corrauthor}}
@@ -672,7 +680,7 @@
\newcommand{\@maketitlepage}[1][1]{%
\if@wlg@titlepageneeded
\begin{titlepage}
- \pagenumbering{alph}
+ \pagenumbering{roman}
\thispagestyle{empty}%
\setcounter{page}{%
#1%
@@ -876,7 +884,9 @@
\end{flushright}%
\par
\vskip 2em
- \pagenumbering{arabic}
+ \if@wlg@mainmatter
+ \pagenumbering{arabic}
+ \fi
}%
% Rewrite \include for local LastPage counter
@@ -986,6 +996,9 @@
% (serifs)
\setkomafont{sectioning}{\normalfont\normalcolor\bfseries}
+% empty part pages
+\AddToHook{cmd/scr@startpart/before}{\cleardoublepage\thispagestyle{empty}}
+
% Abstract
\renewenvironment{abstract}{%
\addsec*{\hspace*{2.4em}Abstract}
@@ -1085,8 +1098,13 @@
\AtBeginDocument{%
\@ifundefined{bibhang}{}{%
\setlength{\bibhang}{\parindent}%
+ }%
+ \@ifundefined{bibfont}{}{%
\renewcommand{\bibfont}{\small}%
}%
+ \@ifundefined{bibsep}{}{%
+ \setlength\bibsep{0pt}%
+ }%
}
%% =============================================================
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 985dc19f98b..78f5ac46459 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/07/23 v.2.7 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2024/09/28 v.2.9 biblatex bibliography style]
% Load base style (authoryear-comp)
\RequireBibliographyStyle{authoryear-comp}
@@ -75,9 +75,14 @@
% Option "issueeditor": Output journal issue editor (false by default)
\newtoggle{issueeditor}
-\DeclareBibliographyOption{issueeditor}[false]{%
+\DeclareBibliographyOption{issueeditor}[true]{%
\settoggle{issueeditor}{#1}}
+% Option "annotations": Output annotations (false by default)
+\newtoggle{annotations}
+\DeclareBibliographyOption{annotations}[true]{%
+ \settoggle{annotations}{#1}}
+
%
% NAME formatting (general)
%
@@ -518,6 +523,23 @@
\usebibmacro{date}%
\newunit}
+% Vertical separation for annotations
+\newlength\annotsep
+\setlength\annotsep{3pt}
+\newcommand*{\annotationdelim}{\adddot\par\setunit{}\nobreak}
+\AtEndOfPackage{%
+ \iftoggle{annotations}
+ {\setlength\bibparsep{\annotsep}}
+ {}%
+}
+
+\renewbibmacro*{annotation}{%
+ \iffieldundef{annotation}
+ {\printfile[annotation]{
+ \bibannotationprefix\thefield{entrykey}.tex}}%
+ {\printfield{annotation}}%
+}
+
\renewbibmacro*{labeltitle}{%
\iffieldundef{label}
{\iffieldundef{shorttitle}
@@ -620,6 +642,9 @@
% no pp. prefix
\DeclareFieldFormat{pages}{#1}
+% Add delimiter
+\DeclareFieldFormat{annotation}{\annotationdelim #1}
+
\DeclareFieldFormat{doi}{%
\ifhyperref
{\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
@@ -664,6 +689,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{book}{%
@@ -714,6 +742,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{collection}{book}
@@ -771,6 +802,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
@@ -829,6 +863,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{thesis}{%
@@ -864,6 +901,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{unpublished}{%
@@ -895,6 +935,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{periodical}{%
@@ -924,6 +967,9 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \iftoggle{annotations}
+ {\usebibmacro{annotation}}
+ {}%
\usebibmacro{finentry}}
\endinput
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 76000569402..9cf6707ff63 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/07/23 v.2.7 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2024/09/28 v.2.9 biblatex citation style]
\RequireCitationStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvt.fd b/Master/texmf-dist/tex/latex/venturis/t1yvt.fd
deleted file mode 100644
index ad6759b0195..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvt.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%Filename: t1yvt.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvt.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvt.]
-
-\DeclareFontFamily{T1}{yvt}{}
-
-\DeclareFontShape{T1}{yvt}{m}{n}{
- <-> yvtr8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{m}{sc}{
- <-> yvtrc8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{m}{si}{
- <-> yvtrci8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{m}{it}{
- <-> yvtri8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{b}{n}{
- <-> yvtb8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{b}{sc}{
- <-> yvtbc8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{b}{si}{
- <-> yvtbci8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{b}{it}{
- <-> yvtbi8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{eb}{n}{
- <-> yvth8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{eb}{it}{
- <-> yvthi8t
-}{}
-
-\DeclareFontShape{T1}{yvt}{mc}{n}{
- <-> yvtr8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{mc}{sc}{
- <-> yvtrc8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{mc}{si}{
- <-> yvtrci8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{mc}{it}{
- <-> yvtri8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{bc}{n}{
- <-> yvtb8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{bc}{sc}{
- <-> yvtbc8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{bc}{si}{
- <-> yvtbci8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{bc}{it}{
- <-> yvtbi8tc
-}{}
-
-\DeclareFontShape{T1}{yvt}{m}{sl}{<->ssub * yvt/m/it}{}
-\DeclareFontShape{T1}{yvt}{bx}{n}{<->ssub * yvt/b/n}{}
-\DeclareFontShape{T1}{yvt}{bx}{sc}{<->ssub * yvt/b/sc}{}
-\DeclareFontShape{T1}{yvt}{bx}{si}{<->ssub * yvt/b/si}{}
-\DeclareFontShape{T1}{yvt}{bx}{it}{<->ssub * yvt/b/it}{}
-\DeclareFontShape{T1}{yvt}{b}{sl}{<->ssub * yvt/b/it}{}
-\DeclareFontShape{T1}{yvt}{bx}{sl}{<->ssub * yvt/b/sl}{}
-\DeclareFontShape{T1}{yvt}{eb}{sc}{<->ssub * yvt/eb/n}{}
-\DeclareFontShape{T1}{yvt}{eb}{si}{<->ssub * yvt/eb/sc}{}
-\DeclareFontShape{T1}{yvt}{eb}{sl}{<->ssub * yvt/eb/it}{}
-\DeclareFontShape{T1}{yvt}{mc}{sl}{<->ssub * yvt/mc/it}{}
-\DeclareFontShape{T1}{yvt}{bc}{sl}{<->ssub * yvt/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtajw.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtajw.fd
deleted file mode 100644
index 7d5802f79ae..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtajw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: t1yvtajw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtajw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtajw.]
-
-\DeclareFontFamily{T1}{yvtajw}{}
-
-\DeclareFontShape{T1}{yvtajw}{m}{n}{
- <-> yvtrajw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{m}{it}{
- <-> yvtrijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{m}{sc}{
- <-> yvtrcjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{m}{si}{
- <-> yvtrcijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{b}{n}{
- <-> yvtbjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{b}{it}{
- <-> yvtbijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{b}{sc}{
- <-> yvtbcjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{b}{si}{
- <-> yvtbcijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{mc}{n}{
- <-> yvtrjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{mc}{it}{
- <-> yvtrijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{mc}{sc}{
- <-> yvtrcjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{mc}{si}{
- <-> yvtrcijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{bc}{n}{
- <-> yvtbjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{bc}{it}{
- <-> yvtbijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{bc}{sc}{
- <-> yvtbcjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{bc}{si}{
- <-> yvtbcijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtajw}{m}{sl}{<->ssub * yvtajw/m/it}{}
-\DeclareFontShape{T1}{yvtajw}{bx}{n}{<->ssub * yvtajw/b/n}{}
-\DeclareFontShape{T1}{yvtajw}{bx}{it}{<->ssub * yvtajw/b/it}{}
-\DeclareFontShape{T1}{yvtajw}{b}{sl}{<->ssub * yvtajw/b/it}{}
-\DeclareFontShape{T1}{yvtajw}{bx}{sl}{<->ssub * yvtajw/b/sl}{}
-\DeclareFontShape{T1}{yvtajw}{bx}{sc}{<->ssub * yvtajw/b/sc}{}
-\DeclareFontShape{T1}{yvtajw}{bx}{si}{<->ssub * yvtajw/b/si}{}
-\DeclareFontShape{T1}{yvtajw}{mc}{sl}{<->ssub * yvtajw/mc/it}{}
-\DeclareFontShape{T1}{yvtajw}{bc}{sl}{<->ssub * yvtajw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtaw.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtaw.fd
deleted file mode 100644
index 07a3955cf42..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtaw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: t1yvtaw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtaw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtaw.]
-
-\DeclareFontFamily{T1}{yvtaw}{}
-
-\DeclareFontShape{T1}{yvtaw}{m}{n}{
- <-> yvtraw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{m}{sc}{
- <-> yvtrcw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{m}{si}{
- <-> yvtrciw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{m}{it}{
- <-> yvtriw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{b}{n}{
- <-> yvtbw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{b}{sc}{
- <-> yvtbcw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{b}{si}{
- <-> yvtbciw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{b}{it}{
- <-> yvtbiw8t
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{mc}{n}{
- <-> yvtrw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{mc}{sc}{
- <-> yvtrcw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{mc}{si}{
- <-> yvtrciw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{mc}{it}{
- <-> yvtriw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{bc}{n}{
- <-> yvtbw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{bc}{sc}{
- <-> yvtbcw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{bc}{si}{
- <-> yvtbciw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{bc}{it}{
- <-> yvtbiw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtaw}{m}{sl}{<->ssub * yvtaw/m/it}{}
-\DeclareFontShape{T1}{yvtaw}{bx}{n}{<->ssub * yvtaw/b/n}{}
-\DeclareFontShape{T1}{yvtaw}{bx}{sc}{<->ssub * yvtaw/b/sc}{}
-\DeclareFontShape{T1}{yvtaw}{bx}{si}{<->ssub * yvtaw/b/si}{}
-\DeclareFontShape{T1}{yvtaw}{bx}{it}{<->ssub * yvtaw/b/it}{}
-\DeclareFontShape{T1}{yvtaw}{b}{sl}{<->ssub * yvtaw/b/it}{}
-\DeclareFontShape{T1}{yvtaw}{bx}{sl}{<->ssub * yvtaw/b/sl}{}
-\DeclareFontShape{T1}{yvtaw}{mc}{sl}{<->ssub * yvtaw/mc/it}{}
-\DeclareFontShape{T1}{yvtaw}{bc}{sl}{<->ssub * yvtaw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtd.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtd.fd
deleted file mode 100644
index 82a76a51960..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtd.fd
+++ /dev/null
@@ -1,82 +0,0 @@
-%Filename: t1yvtd.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtd.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtd.]
-
-\DeclareFontFamily{T1}{yvtd}{}
-
-\DeclareFontShape{T1}{yvtd}{bc}{sc}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{mc}{sc}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{m}{sc}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{b}{sc}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{eb}{sc}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{m}{ol}{
- <-> yvtrdl8t
-}{}
-
-\DeclareFontShape{T1}{yvtd}{mc}{ol}{
- <-> yvtrdl7t
-}{}
-
-\DeclareFontShape{T1}{yvtd}{bc}{ol}{
- <-> yvtrdl8t
-}{}
-
-\DeclareFontShape{T1}{yvtd}{b}{ol}{
- <-> yvtrdl8t
-}{}
-
-\DeclareFontShape{T1}{yvtd}{eb}{ol}{
- <-> yvtrdl8t
-}{}
-
-\DeclareFontShape{T1}{yvtd}{mc}{n}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{m}{n}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{bc}{n}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{b}{n}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{eb}{n}{
- <-> yvtbd8tc
-}{}
-
-\DeclareFontShape{T1}{yvtd}{bc}{si}{<->ssub * yvtd/bc/sc}{}
-\DeclareFontShape{T1}{yvtd}{mc}{si}{<->ssub * yvtd/mc/sc}{}
-\DeclareFontShape{T1}{yvtd}{m}{si}{<->ssub * yvtd/m/sc}{}
-\DeclareFontShape{T1}{yvtd}{bx}{sc}{<->ssub * yvtd/b/sc}{}
-\DeclareFontShape{T1}{yvtd}{b}{si}{<->ssub * yvtd/b/sc}{}
-\DeclareFontShape{T1}{yvtd}{bx}{si}{<->ssub * yvtd/b/si}{}
-\DeclareFontShape{T1}{yvtd}{eb}{si}{<->ssub * yvtd/eb/sc}{}
-\DeclareFontShape{T1}{yvtd}{bx}{ol}{<->ssub * yvtd/b/ol}{}
-\DeclareFontShape{T1}{yvtd}{bx}{n}{<->ssub * yvtd/b/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtj.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtj.fd
deleted file mode 100644
index 2237b44f629..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtj.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: t1yvtj.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtj.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtj.]
-
-\DeclareFontFamily{T1}{yvtj}{}
-
-\DeclareFontShape{T1}{yvtj}{m}{n}{
- <-> yvtrj8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{m}{sc}{
- <-> yvtrcj8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{m}{si}{
- <-> yvtrcij8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{m}{it}{
- <-> yvtrij8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{b}{n}{
- <-> yvtbj8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{b}{sc}{
- <-> yvtbcj8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{b}{si}{
- <-> yvtbcij8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{b}{it}{
- <-> yvtbij8t
-}{}
-
-\DeclareFontShape{T1}{yvtj}{mc}{n}{
- <-> yvtrj8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{mc}{sc}{
- <-> yvtrcj8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{mc}{si}{
- <-> yvtrcij8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{mc}{it}{
- <-> yvtrij8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{bc}{n}{
- <-> yvtbj8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{bc}{sc}{
- <-> yvtbcj8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{bc}{si}{
- <-> yvtbcij8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{bc}{it}{
- <-> yvtbij8tc
-}{}
-
-\DeclareFontShape{T1}{yvtj}{m}{sl}{<->ssub * yvtj/m/it}{}
-\DeclareFontShape{T1}{yvtj}{bx}{n}{<->ssub * yvtj/b/n}{}
-\DeclareFontShape{T1}{yvtj}{bx}{sc}{<->ssub * yvtj/b/sc}{}
-\DeclareFontShape{T1}{yvtj}{bx}{si}{<->ssub * yvtj/b/si}{}
-\DeclareFontShape{T1}{yvtj}{bx}{it}{<->ssub * yvtj/b/it}{}
-\DeclareFontShape{T1}{yvtj}{b}{sl}{<->ssub * yvtj/b/it}{}
-\DeclareFontShape{T1}{yvtj}{bx}{sl}{<->ssub * yvtj/b/sl}{}
-\DeclareFontShape{T1}{yvtj}{mc}{sl}{<->ssub * yvtj/mc/it}{}
-\DeclareFontShape{T1}{yvtj}{bc}{sl}{<->ssub * yvtj/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtjw.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtjw.fd
deleted file mode 100644
index 5ca3288e389..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtjw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: t1yvtjw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtjw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtjw.]
-
-\DeclareFontFamily{T1}{yvtjw}{}
-
-\DeclareFontShape{T1}{yvtjw}{m}{n}{
- <-> yvtrjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{m}{sc}{
- <-> yvtrcjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{m}{si}{
- <-> yvtrcijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{m}{it}{
- <-> yvtrijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{b}{n}{
- <-> yvtbjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{b}{it}{
- <-> yvtbijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{b}{sc}{
- <-> yvtbcjw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{b}{si}{
- <-> yvtbcijw8t
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{mc}{n}{
- <-> yvtrjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{mc}{sc}{
- <-> yvtrcjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{mc}{si}{
- <-> yvtrcijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{mc}{it}{
- <-> yvtrijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{bc}{n}{
- <-> yvtbjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{bc}{it}{
- <-> yvtbijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{bc}{sc}{
- <-> yvtbcjw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{bc}{si}{
- <-> yvtbcijw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtjw}{m}{sl}{<->ssub * yvtjw/m/it}{}
-\DeclareFontShape{T1}{yvtjw}{bx}{n}{<->ssub * yvtjw/b/n}{}
-\DeclareFontShape{T1}{yvtjw}{bx}{it}{<->ssub * yvtjw/b/it}{}
-\DeclareFontShape{T1}{yvtjw}{b}{sl}{<->ssub * yvtjw/b/it}{}
-\DeclareFontShape{T1}{yvtjw}{bx}{sl}{<->ssub * yvtjw/b/sl}{}
-\DeclareFontShape{T1}{yvtjw}{bx}{sc}{<->ssub * yvtjw/b/sc}{}
-\DeclareFontShape{T1}{yvtjw}{bx}{si}{<->ssub * yvtjw/b/si}{}
-\DeclareFontShape{T1}{yvtjw}{mc}{sl}{<->ssub * yvtjw/mc/it}{}
-\DeclareFontShape{T1}{yvtjw}{bc}{sl}{<->ssub * yvtjw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/t1yvtw.fd b/Master/texmf-dist/tex/latex/venturis/t1yvtw.fd
deleted file mode 100644
index 0b424c71c90..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/t1yvtw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: t1yvtw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvtw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvtw.]
-
-\DeclareFontFamily{T1}{yvtw}{}
-
-\DeclareFontShape{T1}{yvtw}{m}{n}{
- <-> yvtrw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{m}{it}{
- <-> yvtriw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{m}{sc}{
- <-> yvtrcw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{m}{si}{
- <-> yvtrciw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{b}{n}{
- <-> yvtbw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{b}{it}{
- <-> yvtbiw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{b}{sc}{
- <-> yvtbcw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{b}{si}{
- <-> yvtbciw8t
-}{}
-
-\DeclareFontShape{T1}{yvtw}{mc}{n}{
- <-> yvtrw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{mc}{it}{
- <-> yvtriw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{mc}{sc}{
- <-> yvtrcw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{mc}{si}{
- <-> yvtrciw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{bc}{n}{
- <-> yvtbw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{bc}{it}{
- <-> yvtbiw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{bc}{sc}{
- <-> yvtbcw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{bc}{si}{
- <-> yvtbciw8tc
-}{}
-
-\DeclareFontShape{T1}{yvtw}{m}{sl}{<->ssub * yvtw/m/it}{}
-\DeclareFontShape{T1}{yvtw}{bx}{n}{<->ssub * yvtw/b/n}{}
-\DeclareFontShape{T1}{yvtw}{bx}{it}{<->ssub * yvtw/b/it}{}
-\DeclareFontShape{T1}{yvtw}{b}{sl}{<->ssub * yvtw/b/it}{}
-\DeclareFontShape{T1}{yvtw}{bx}{sl}{<->ssub * yvtw/b/sl}{}
-\DeclareFontShape{T1}{yvtw}{bx}{sc}{<->ssub * yvtw/b/sc}{}
-\DeclareFontShape{T1}{yvtw}{bx}{si}{<->ssub * yvtw/b/si}{}
-\DeclareFontShape{T1}{yvtw}{mc}{sl}{<->ssub * yvtw/mc/it}{}
-\DeclareFontShape{T1}{yvtw}{bc}{sl}{<->ssub * yvtw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvt.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvt.fd
deleted file mode 100644
index a2e80329049..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvt.fd
+++ /dev/null
@@ -1,97 +0,0 @@
-%Filename: ts1yvt.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvt.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvt.]
-
-\DeclareFontFamily{TS1}{yvt}{}
-
-\DeclareFontShape{TS1}{yvt}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{eb}{n}{
- <-> yvth8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{eb}{it}{
- <-> yvthi8c
-}{}
-
-\DeclareFontShape{TS1}{yvt}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvt}{m}{sl}{<->ssub * yvt/m/it}{}
-\DeclareFontShape{TS1}{yvt}{bx}{n}{<->ssub * yvt/b/n}{}
-\DeclareFontShape{TS1}{yvt}{bx}{sc}{<->ssub * yvt/b/sc}{}
-\DeclareFontShape{TS1}{yvt}{bx}{it}{<->ssub * yvt/b/it}{}
-\DeclareFontShape{TS1}{yvt}{b}{sl}{<->ssub * yvt/b/it}{}
-\DeclareFontShape{TS1}{yvt}{bx}{sl}{<->ssub * yvt/b/sl}{}
-\DeclareFontShape{TS1}{yvt}{bx}{si}{<->ssub * yvt/b/si}{}
-\DeclareFontShape{TS1}{yvt}{eb}{sc}{<->ssub * yvt/eb/n}{}
-\DeclareFontShape{TS1}{yvt}{eb}{si}{<->ssub * yvt/eb/sc}{}
-\DeclareFontShape{TS1}{yvt}{eb}{sl}{<->ssub * yvt/eb/it}{}
-\DeclareFontShape{TS1}{yvt}{mc}{sl}{<->ssub * yvt/mc/it}{}
-\DeclareFontShape{TS1}{yvt}{bc}{sl}{<->ssub * yvt/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtajw.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtajw.fd
deleted file mode 100644
index 40f418fb0eb..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtajw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: ts1yvtajw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtajw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtajw.]
-
-\DeclareFontFamily{TS1}{yvtajw}{}
-
-\DeclareFontShape{TS1}{yvtajw}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtajw}{m}{sl}{<->ssub * yvtajw/m/it}{}
-\DeclareFontShape{TS1}{yvtajw}{bx}{n}{<->ssub * yvtajw/b/n}{}
-\DeclareFontShape{TS1}{yvtajw}{bx}{sc}{<->ssub * yvtajw/b/sc}{}
-\DeclareFontShape{TS1}{yvtajw}{bx}{it}{<->ssub * yvtajw/b/it}{}
-\DeclareFontShape{TS1}{yvtajw}{b}{sl}{<->ssub * yvtajw/b/it}{}
-\DeclareFontShape{TS1}{yvtajw}{bx}{sl}{<->ssub * yvtajw/b/sl}{}
-\DeclareFontShape{TS1}{yvtajw}{bx}{si}{<->ssub * yvtajw/b/si}{}
-\DeclareFontShape{TS1}{yvtajw}{mc}{sl}{<->ssub * yvtajw/mc/it}{}
-\DeclareFontShape{TS1}{yvtajw}{bc}{sl}{<->ssub * yvtajw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtaw.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtaw.fd
deleted file mode 100644
index 9872bbac000..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtaw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: ts1yvtaw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtaw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtaw.]
-
-\DeclareFontFamily{TS1}{yvtaw}{}
-
-\DeclareFontShape{TS1}{yvtaw}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtaw}{m}{sl}{<->ssub * yvtaw/m/it}{}
-\DeclareFontShape{TS1}{yvtaw}{bx}{n}{<->ssub * yvtaw/b/n}{}
-\DeclareFontShape{TS1}{yvtaw}{bx}{sc}{<->ssub * yvtaw/b/sc}{}
-\DeclareFontShape{TS1}{yvtaw}{bx}{it}{<->ssub * yvtaw/b/it}{}
-\DeclareFontShape{TS1}{yvtaw}{b}{sl}{<->ssub * yvtaw/b/it}{}
-\DeclareFontShape{TS1}{yvtaw}{bx}{sl}{<->ssub * yvtaw/b/sl}{}
-\DeclareFontShape{TS1}{yvtaw}{bx}{si}{<->ssub * yvtaw/b/si}{}
-\DeclareFontShape{TS1}{yvtaw}{mc}{sl}{<->ssub * yvtaw/mc/it}{}
-\DeclareFontShape{TS1}{yvtaw}{bc}{sl}{<->ssub * yvtaw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtd.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtd.fd
deleted file mode 100644
index 3dc1881b8bc..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtd.fd
+++ /dev/null
@@ -1,78 +0,0 @@
-%Filename: ts1yvtd.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtd.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtd.]
-
-\DeclareFontFamily{TS1}{yvtd}{}
-
-\DeclareFontShape{TS1}{yvtd}{bc}{sc}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{m}{sc}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{mc}{sc}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{b}{sc}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{eb}{sc}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{m}{ol}{
- <-> yvtrdl8c
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{mc}{ol}{
- <-> yvtrdl8c
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{bc}{ol}{
- <-> yvtrdl8c
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{b}{ol}{
- <-> yvtrdl8c
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{mc}{n}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{m}{n}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{bc}{n}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{b}{n}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{eb}{n}{
- <-> yvtbd8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtd}{bc}{si}{<->ssub * yvtd/bc/sc}{}
-\DeclareFontShape{TS1}{yvtd}{m}{si}{<->ssub * yvtd/m/sc}{}
-\DeclareFontShape{TS1}{yvtd}{mc}{si}{<->ssub * yvtd/mc/sc}{}
-\DeclareFontShape{TS1}{yvtd}{bx}{sc}{<->ssub * yvtd/b/sc}{}
-\DeclareFontShape{TS1}{yvtd}{b}{si}{<->ssub * yvtd/b/sc}{}
-\DeclareFontShape{TS1}{yvtd}{bx}{si}{<->ssub * yvtd/b/si}{}
-\DeclareFontShape{TS1}{yvtd}{eb}{si}{<->ssub * yvtd/eb/sc}{}
-\DeclareFontShape{TS1}{yvtd}{bx}{ol}{<->ssub * yvtd/b/ol}{}
-\DeclareFontShape{TS1}{yvtd}{bx}{n}{<->ssub * yvtd/b/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtj.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtj.fd
deleted file mode 100644
index 5df3103f0ae..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtj.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: ts1yvtj.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtj.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtj.]
-
-\DeclareFontFamily{TS1}{yvtj}{}
-
-\DeclareFontShape{TS1}{yvtj}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtj}{m}{sl}{<->ssub * yvtj/m/it}{}
-\DeclareFontShape{TS1}{yvtj}{bx}{n}{<->ssub * yvtj/b/n}{}
-\DeclareFontShape{TS1}{yvtj}{bx}{sc}{<->ssub * yvtj/b/sc}{}
-\DeclareFontShape{TS1}{yvtj}{bx}{it}{<->ssub * yvtj/b/it}{}
-\DeclareFontShape{TS1}{yvtj}{b}{sl}{<->ssub * yvtj/b/it}{}
-\DeclareFontShape{TS1}{yvtj}{bx}{sl}{<->ssub * yvtj/b/sl}{}
-\DeclareFontShape{TS1}{yvtj}{bx}{si}{<->ssub * yvtj/b/si}{}
-\DeclareFontShape{TS1}{yvtj}{mc}{sl}{<->ssub * yvtj/mc/it}{}
-\DeclareFontShape{TS1}{yvtj}{bc}{sl}{<->ssub * yvtj/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtjw.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtjw.fd
deleted file mode 100644
index f1a348c2945..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtjw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: ts1yvtjw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtjw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtjw.]
-
-\DeclareFontFamily{TS1}{yvtjw}{}
-
-\DeclareFontShape{TS1}{yvtjw}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtjw}{m}{sl}{<->ssub * yvtjw/m/it}{}
-\DeclareFontShape{TS1}{yvtjw}{bx}{n}{<->ssub * yvtjw/b/n}{}
-\DeclareFontShape{TS1}{yvtjw}{bx}{sc}{<->ssub * yvtjw/b/sc}{}
-\DeclareFontShape{TS1}{yvtjw}{bx}{it}{<->ssub * yvtjw/b/it}{}
-\DeclareFontShape{TS1}{yvtjw}{b}{sl}{<->ssub * yvtjw/b/it}{}
-\DeclareFontShape{TS1}{yvtjw}{bx}{sl}{<->ssub * yvtjw/b/sl}{}
-\DeclareFontShape{TS1}{yvtjw}{bx}{si}{<->ssub * yvtjw/b/si}{}
-\DeclareFontShape{TS1}{yvtjw}{mc}{sl}{<->ssub * yvtjw/mc/it}{}
-\DeclareFontShape{TS1}{yvtjw}{bc}{sl}{<->ssub * yvtjw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis/ts1yvtw.fd b/Master/texmf-dist/tex/latex/venturis/ts1yvtw.fd
deleted file mode 100644
index 14afed4faa2..00000000000
--- a/Master/texmf-dist/tex/latex/venturis/ts1yvtw.fd
+++ /dev/null
@@ -1,86 +0,0 @@
-%Filename: ts1yvtw.fd
-%Created by: tex yvt-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvtw.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvtw.]
-
-\DeclareFontFamily{TS1}{yvtw}{}
-
-\DeclareFontShape{TS1}{yvtw}{m}{n}{
- <-> yvtr8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{m}{sc}{
- <-> yvtrc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{m}{it}{
- <-> yvtri8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{m}{si}{
- <-> yvtrci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{b}{n}{
- <-> yvtb8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{b}{sc}{
- <-> yvtbc8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{b}{it}{
- <-> yvtbi8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{b}{si}{
- <-> yvtbci8c
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{mc}{n}{
- <-> yvtr8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{mc}{sc}{
- <-> yvtrc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{mc}{it}{
- <-> yvtri8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{mc}{si}{
- <-> yvtrci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{bc}{n}{
- <-> yvtb8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{bc}{sc}{
- <-> yvtbc8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{bc}{it}{
- <-> yvtbi8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{bc}{si}{
- <-> yvtbci8cc
-}{}
-
-\DeclareFontShape{TS1}{yvtw}{m}{sl}{<->ssub * yvtw/m/it}{}
-\DeclareFontShape{TS1}{yvtw}{bx}{n}{<->ssub * yvtw/b/n}{}
-\DeclareFontShape{TS1}{yvtw}{bx}{sc}{<->ssub * yvtw/b/sc}{}
-\DeclareFontShape{TS1}{yvtw}{bx}{it}{<->ssub * yvtw/b/it}{}
-\DeclareFontShape{TS1}{yvtw}{b}{sl}{<->ssub * yvtw/b/it}{}
-\DeclareFontShape{TS1}{yvtw}{bx}{sl}{<->ssub * yvtw/b/sl}{}
-\DeclareFontShape{TS1}{yvtw}{bx}{si}{<->ssub * yvtw/b/si}{}
-\DeclareFontShape{TS1}{yvtw}{mc}{sl}{<->ssub * yvtw/mc/it}{}
-\DeclareFontShape{TS1}{yvtw}{bc}{sl}{<->ssub * yvtw/bc/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis2/t1yv2.fd b/Master/texmf-dist/tex/latex/venturis2/t1yv2.fd
deleted file mode 100644
index b58640fa12f..00000000000
--- a/Master/texmf-dist/tex/latex/venturis2/t1yv2.fd
+++ /dev/null
@@ -1,84 +0,0 @@
-%Filename: t1yv2.fd
-%Created by: tex yv2-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yv2.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yv2.]
-
-\DeclareFontFamily{T1}{yv2}{}
-
-\DeclareFontShape{T1}{yv2}{m}{n}{
- <-> yv2r8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{m}{it}{
- <-> yv2ri8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{b}{n}{
- <-> yv2b8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{b}{it}{
- <-> yv2bi8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{mc}{n}{
- <-> yv2r8tc
-}{}
-
-\DeclareFontShape{T1}{yv2}{mc}{it}{
- <-> yv2ri8tc
-}{}
-
-\DeclareFontShape{T1}{yv2}{bc}{n}{
- <-> yv2b8tc
-}{}
-
-\DeclareFontShape{T1}{yv2}{bc}{it}{
- <-> yv2bi8tc
-}{}
-
-\DeclareFontShape{T1}{yv2}{mb}{n}{
- <-> yv2m8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{mb}{it}{
- <-> yv2mi8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{eb}{n}{
- <-> yv2x8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{eb}{it}{
- <-> yv2xi8t
-}{}
-
-\DeclareFontShape{T1}{yv2}{m}{sc}{<->ssub * yv2/m/n}{}
-\DeclareFontShape{T1}{yv2}{m}{si}{<->ssub * yv2/m/sc}{}
-\DeclareFontShape{T1}{yv2}{m}{sl}{<->ssub * yv2/m/it}{}
-\DeclareFontShape{T1}{yv2}{bx}{n}{<->ssub * yv2/b/n}{}
-\DeclareFontShape{T1}{yv2}{b}{sc}{<->ssub * yv2/b/n}{}
-\DeclareFontShape{T1}{yv2}{bx}{sc}{<->ssub * yv2/b/sc}{}
-\DeclareFontShape{T1}{yv2}{b}{si}{<->ssub * yv2/b/sc}{}
-\DeclareFontShape{T1}{yv2}{bx}{si}{<->ssub * yv2/b/si}{}
-\DeclareFontShape{T1}{yv2}{bx}{it}{<->ssub * yv2/b/it}{}
-\DeclareFontShape{T1}{yv2}{b}{sl}{<->ssub * yv2/b/it}{}
-\DeclareFontShape{T1}{yv2}{bx}{sl}{<->ssub * yv2/b/sl}{}
-\DeclareFontShape{T1}{yv2}{mc}{sc}{<->ssub * yv2/mc/n}{}
-\DeclareFontShape{T1}{yv2}{mc}{si}{<->ssub * yv2/mc/sc}{}
-\DeclareFontShape{T1}{yv2}{mc}{sl}{<->ssub * yv2/mc/it}{}
-\DeclareFontShape{T1}{yv2}{bc}{sc}{<->ssub * yv2/bc/n}{}
-\DeclareFontShape{T1}{yv2}{bc}{si}{<->ssub * yv2/bc/sc}{}
-\DeclareFontShape{T1}{yv2}{bc}{sl}{<->ssub * yv2/bc/it}{}
-\DeclareFontShape{T1}{yv2}{mb}{sc}{<->ssub * yv2/mb/n}{}
-\DeclareFontShape{T1}{yv2}{mb}{si}{<->ssub * yv2/mb/sc}{}
-\DeclareFontShape{T1}{yv2}{mb}{sl}{<->ssub * yv2/mb/it}{}
-\DeclareFontShape{T1}{yv2}{eb}{sc}{<->ssub * yv2/eb/n}{}
-\DeclareFontShape{T1}{yv2}{eb}{si}{<->ssub * yv2/eb/sc}{}
-\DeclareFontShape{T1}{yv2}{eb}{sl}{<->ssub * yv2/eb/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturis2/ts1yv2.fd b/Master/texmf-dist/tex/latex/venturis2/ts1yv2.fd
deleted file mode 100644
index 0b502b51c4b..00000000000
--- a/Master/texmf-dist/tex/latex/venturis2/ts1yv2.fd
+++ /dev/null
@@ -1,84 +0,0 @@
-%Filename: ts1yv2.fd
-%Created by: tex yv2-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yv2.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yv2.]
-
-\DeclareFontFamily{TS1}{yv2}{}
-
-\DeclareFontShape{TS1}{yv2}{m}{n}{
- <-> yv2r8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{m}{it}{
- <-> yv2ri8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{b}{n}{
- <-> yv2b8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{b}{it}{
- <-> yv2bi8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{mc}{n}{
- <-> yv2r8cc
-}{}
-
-\DeclareFontShape{TS1}{yv2}{mc}{it}{
- <-> yv2ri8cc
-}{}
-
-\DeclareFontShape{TS1}{yv2}{bc}{n}{
- <-> yv2b8cc
-}{}
-
-\DeclareFontShape{TS1}{yv2}{bc}{it}{
- <-> yv2bi8cc
-}{}
-
-\DeclareFontShape{TS1}{yv2}{mb}{n}{
- <-> yv2m8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{mb}{it}{
- <-> yv2mi8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{eb}{n}{
- <-> yv2x8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{eb}{it}{
- <-> yv2xi8c
-}{}
-
-\DeclareFontShape{TS1}{yv2}{m}{sc}{<->ssub * yv2/m/n}{}
-\DeclareFontShape{TS1}{yv2}{m}{si}{<->ssub * yv2/m/sc}{}
-\DeclareFontShape{TS1}{yv2}{m}{sl}{<->ssub * yv2/m/it}{}
-\DeclareFontShape{TS1}{yv2}{bx}{n}{<->ssub * yv2/b/n}{}
-\DeclareFontShape{TS1}{yv2}{b}{sc}{<->ssub * yv2/b/n}{}
-\DeclareFontShape{TS1}{yv2}{bx}{sc}{<->ssub * yv2/b/sc}{}
-\DeclareFontShape{TS1}{yv2}{b}{si}{<->ssub * yv2/b/sc}{}
-\DeclareFontShape{TS1}{yv2}{bx}{si}{<->ssub * yv2/b/si}{}
-\DeclareFontShape{TS1}{yv2}{bx}{it}{<->ssub * yv2/b/it}{}
-\DeclareFontShape{TS1}{yv2}{b}{sl}{<->ssub * yv2/b/it}{}
-\DeclareFontShape{TS1}{yv2}{bx}{sl}{<->ssub * yv2/b/sl}{}
-\DeclareFontShape{TS1}{yv2}{mc}{sc}{<->ssub * yv2/mc/n}{}
-\DeclareFontShape{TS1}{yv2}{mc}{si}{<->ssub * yv2/mc/sc}{}
-\DeclareFontShape{TS1}{yv2}{mc}{sl}{<->ssub * yv2/mc/it}{}
-\DeclareFontShape{TS1}{yv2}{bc}{sc}{<->ssub * yv2/bc/n}{}
-\DeclareFontShape{TS1}{yv2}{bc}{si}{<->ssub * yv2/bc/sc}{}
-\DeclareFontShape{TS1}{yv2}{bc}{sl}{<->ssub * yv2/bc/it}{}
-\DeclareFontShape{TS1}{yv2}{mb}{sc}{<->ssub * yv2/mb/n}{}
-\DeclareFontShape{TS1}{yv2}{mb}{si}{<->ssub * yv2/mb/sc}{}
-\DeclareFontShape{TS1}{yv2}{mb}{sl}{<->ssub * yv2/mb/it}{}
-\DeclareFontShape{TS1}{yv2}{eb}{sc}{<->ssub * yv2/eb/n}{}
-\DeclareFontShape{TS1}{yv2}{eb}{si}{<->ssub * yv2/eb/sc}{}
-\DeclareFontShape{TS1}{yv2}{eb}{sl}{<->ssub * yv2/eb/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yv1.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yv1.fd
new file mode 100644
index 00000000000..a0d2a262cb5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yv1.fd
@@ -0,0 +1,163 @@
+%Filename: t1yv1.fd
+%Created by: tex yv1-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yv1.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yv1.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvi@scale\endcsname\relax
+ \let\yvi@@scale\@empty
+\else
+ \edef\yvi@@scale{s*[\csname yvi@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yv1}{}
+
+\DeclareFontShape{T1}{yv1}{m}{n}{
+ <-> \yvi@@scale yv1r8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{m}{it}{
+ <-> \yvi@@scale yv1ri8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{b}{n}{
+ <-> \yvi@@scale yv1b8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{b}{it}{
+ <-> \yvi@@scale yv1bi8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{eb}{n}{
+ <-> \yvi@@scale yv1h8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{eb}{sl}{
+ <-> \yvi@@scale yv1ho8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{eb}{it}{
+ <-> \yvi@@scale yv1ho8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{c}{n}{
+ <-> \yvi@@scale yv1r8tc
+}{}
+
+\DeclareFontShape{T1}{yv1}{c}{it}{
+ <-> \yvi@@scale yv1ri8tc
+}{}
+
+\DeclareFontShape{T1}{yv1}{bc}{n}{
+ <-> \yvi@@scale yv1b8tc
+}{}
+
+\DeclareFontShape{T1}{yv1}{bc}{it}{
+ <-> \yvi@@scale yv1bi8tc
+}{}
+
+\DeclareFontShape{T1}{yv1}{x}{n}{
+ <-> \yvi@@scale yv1r8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{x}{it}{
+ <-> \yvi@@scale yv1ri8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{bx}{n}{
+ <-> \yvi@@scale yv1b8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{bx}{sc}{
+ <-> \yvi@@scale yv1b8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{bx}{it}{
+ <-> \yvi@@scale yv1bi8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{bx}{sl}{
+ <-> \yvi@@scale yv1bi8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{bx}{scit}{
+ <-> \yvi@@scale yv1b8tx
+}{}
+
+\DeclareFontShape{T1}{yv1}{l}{n}{
+ <-> \yvi@@scale yv1l8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{l}{it}{
+ <-> \yvi@@scale yv1li8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{db}{n}{
+ <-> \yvi@@scale yv1d8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{db}{it}{
+ <-> \yvi@@scale yv1di8t
+}{}
+
+\DeclareFontShape{T1}{yv1}{m}{sc}{<->ssub * yv1/m/n}{}
+\DeclareFontShape{T1}{yv1}{m}{scit}{<->ssub * yv1/m/sc}{}
+\DeclareFontShape{T1}{yv1}{m}{scsl}{<->ssub * yv1/m/scit}{}
+\DeclareFontShape{T1}{yv1}{m}{si}{<->ssub * yv1/m/scsl}{}
+\DeclareFontShape{T1}{yv1}{m}{sl}{<->ssub * yv1/m/it}{}
+\DeclareFontShape{T1}{yv1}{b}{sc}{<->ssub * yv1/b/n}{}
+\DeclareFontShape{T1}{yv1}{b}{scit}{<->ssub * yv1/b/sc}{}
+\DeclareFontShape{T1}{yv1}{b}{scsl}{<->ssub * yv1/b/scit}{}
+\DeclareFontShape{T1}{yv1}{bx}{scsl}{<->ssub * yv1/b/scsl}{}
+\DeclareFontShape{T1}{yv1}{b}{si}{<->ssub * yv1/b/scsl}{}
+\DeclareFontShape{T1}{yv1}{bx}{si}{<->ssub * yv1/b/si}{}
+\DeclareFontShape{T1}{yv1}{b}{sl}{<->ssub * yv1/b/it}{}
+\DeclareFontShape{T1}{yv1}{eb}{sc}{<->ssub * yv1/eb/n}{}
+\DeclareFontShape{T1}{yv1}{eb}{scit}{<->ssub * yv1/eb/sc}{}
+\DeclareFontShape{T1}{yv1}{eb}{scsl}{<->ssub * yv1/eb/scit}{}
+\DeclareFontShape{T1}{yv1}{eb}{si}{<->ssub * yv1/eb/scsl}{}
+\DeclareFontShape{T1}{yv1}{uc}{n}{<->ssub * yv1/c/n}{}
+\DeclareFontShape{T1}{yv1}{c}{sc}{<->ssub * yv1/c/n}{}
+\DeclareFontShape{T1}{yv1}{uc}{sc}{<->ssub * yv1/c/sc}{}
+\DeclareFontShape{T1}{yv1}{c}{scit}{<->ssub * yv1/c/sc}{}
+\DeclareFontShape{T1}{yv1}{uc}{scit}{<->ssub * yv1/c/scit}{}
+\DeclareFontShape{T1}{yv1}{c}{scsl}{<->ssub * yv1/c/scit}{}
+\DeclareFontShape{T1}{yv1}{uc}{scsl}{<->ssub * yv1/c/scsl}{}
+\DeclareFontShape{T1}{yv1}{c}{si}{<->ssub * yv1/c/scsl}{}
+\DeclareFontShape{T1}{yv1}{uc}{si}{<->ssub * yv1/c/si}{}
+\DeclareFontShape{T1}{yv1}{uc}{it}{<->ssub * yv1/c/it}{}
+\DeclareFontShape{T1}{yv1}{c}{sl}{<->ssub * yv1/c/it}{}
+\DeclareFontShape{T1}{yv1}{uc}{sl}{<->ssub * yv1/c/sl}{}
+\DeclareFontShape{T1}{yv1}{bc}{sc}{<->ssub * yv1/bc/n}{}
+\DeclareFontShape{T1}{yv1}{bc}{scit}{<->ssub * yv1/bc/sc}{}
+\DeclareFontShape{T1}{yv1}{bc}{scsl}{<->ssub * yv1/bc/scit}{}
+\DeclareFontShape{T1}{yv1}{bc}{si}{<->ssub * yv1/bc/scsl}{}
+\DeclareFontShape{T1}{yv1}{bc}{sl}{<->ssub * yv1/bc/it}{}
+\DeclareFontShape{T1}{yv1}{x}{sc}{<->ssub * yv1/x/n}{}
+\DeclareFontShape{T1}{yv1}{x}{scit}{<->ssub * yv1/x/sc}{}
+\DeclareFontShape{T1}{yv1}{x}{scsl}{<->ssub * yv1/x/scit}{}
+\DeclareFontShape{T1}{yv1}{x}{si}{<->ssub * yv1/x/scsl}{}
+\DeclareFontShape{T1}{yv1}{x}{sl}{<->ssub * yv1/x/it}{}
+\DeclareFontShape{T1}{yv1}{l}{sc}{<->ssub * yv1/l/n}{}
+\DeclareFontShape{T1}{yv1}{l}{scit}{<->ssub * yv1/l/sc}{}
+\DeclareFontShape{T1}{yv1}{l}{scsl}{<->ssub * yv1/l/scit}{}
+\DeclareFontShape{T1}{yv1}{l}{si}{<->ssub * yv1/l/scsl}{}
+\DeclareFontShape{T1}{yv1}{l}{sl}{<->ssub * yv1/l/it}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{n}{<->ssub * yv1/db/n}{}
+\DeclareFontShape{T1}{yv1}{db}{sc}{<->ssub * yv1/db/n}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{sc}{<->ssub * yv1/db/sc}{}
+\DeclareFontShape{T1}{yv1}{db}{scit}{<->ssub * yv1/db/sc}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{scit}{<->ssub * yv1/db/scit}{}
+\DeclareFontShape{T1}{yv1}{db}{scsl}{<->ssub * yv1/db/scit}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{scsl}{<->ssub * yv1/db/scsl}{}
+\DeclareFontShape{T1}{yv1}{db}{si}{<->ssub * yv1/db/scsl}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{si}{<->ssub * yv1/db/si}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{it}{<->ssub * yv1/db/it}{}
+\DeclareFontShape{T1}{yv1}{db}{sl}{<->ssub * yv1/db/it}{}
+\DeclareFontShape{T1}{yv1}{dbuc}{sl}{<->ssub * yv1/db/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yv1d.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yv1d.fd
new file mode 100644
index 00000000000..be02e62d1f1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yv1d.fd
@@ -0,0 +1,135 @@
+%Filename: t1yv1d.fd
+%Created by: tex yv1-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yv1d.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yv1d.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvi@scale\endcsname\relax
+ \let\yvi@@scale\@empty
+\else
+ \edef\yvi@@scale{s*[\csname yvi@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yv1d}{}
+
+\DeclareFontShape{T1}{yv1d}{b}{sc}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{eb}{sc}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{bc}{sc}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{db}{sc}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{b}{n}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{eb}{n}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{bc}{n}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{db}{n}{
+ <-> \yvi@@scale yv1bd8t
+}{}
+
+\DeclareFontShape{T1}{yv1d}{dbuc}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{x}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{m}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{c}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{uc}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{l}{sc}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{dbuc}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{x}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{m}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{c}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{uc}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{l}{n}{
+ <-> \yvi@@scale yv1dd8tu
+}{}
+
+\DeclareFontShape{T1}{yv1d}{bx}{sc}{<->ssub * yv1d/b/sc}{}
+\DeclareFontShape{T1}{yv1d}{b}{scit}{<->ssub * yv1d/b/sc}{}
+\DeclareFontShape{T1}{yv1d}{bx}{scit}{<->ssub * yv1d/b/scit}{}
+\DeclareFontShape{T1}{yv1d}{b}{scsl}{<->ssub * yv1d/b/scit}{}
+\DeclareFontShape{T1}{yv1d}{bx}{scsl}{<->ssub * yv1d/b/scsl}{}
+\DeclareFontShape{T1}{yv1d}{b}{si}{<->ssub * yv1d/b/scsl}{}
+\DeclareFontShape{T1}{yv1d}{bx}{si}{<->ssub * yv1d/b/si}{}
+\DeclareFontShape{T1}{yv1d}{eb}{scit}{<->ssub * yv1d/eb/sc}{}
+\DeclareFontShape{T1}{yv1d}{eb}{scsl}{<->ssub * yv1d/eb/scit}{}
+\DeclareFontShape{T1}{yv1d}{eb}{si}{<->ssub * yv1d/eb/scsl}{}
+\DeclareFontShape{T1}{yv1d}{bc}{scit}{<->ssub * yv1d/bc/sc}{}
+\DeclareFontShape{T1}{yv1d}{bc}{scsl}{<->ssub * yv1d/bc/scit}{}
+\DeclareFontShape{T1}{yv1d}{bc}{si}{<->ssub * yv1d/bc/scsl}{}
+\DeclareFontShape{T1}{yv1d}{db}{scit}{<->ssub * yv1d/db/sc}{}
+\DeclareFontShape{T1}{yv1d}{dbuc}{scit}{<->ssub * yv1d/db/scit}{}
+\DeclareFontShape{T1}{yv1d}{db}{scsl}{<->ssub * yv1d/db/scit}{}
+\DeclareFontShape{T1}{yv1d}{dbuc}{scsl}{<->ssub * yv1d/db/scsl}{}
+\DeclareFontShape{T1}{yv1d}{db}{si}{<->ssub * yv1d/db/scsl}{}
+\DeclareFontShape{T1}{yv1d}{dbuc}{si}{<->ssub * yv1d/db/si}{}
+\DeclareFontShape{T1}{yv1d}{bx}{n}{<->ssub * yv1d/b/n}{}
+\DeclareFontShape{T1}{yv1d}{x}{scit}{<->ssub * yv1d/x/sc}{}
+\DeclareFontShape{T1}{yv1d}{x}{scsl}{<->ssub * yv1d/x/scit}{}
+\DeclareFontShape{T1}{yv1d}{x}{si}{<->ssub * yv1d/x/scsl}{}
+\DeclareFontShape{T1}{yv1d}{m}{scit}{<->ssub * yv1d/m/sc}{}
+\DeclareFontShape{T1}{yv1d}{m}{scsl}{<->ssub * yv1d/m/scit}{}
+\DeclareFontShape{T1}{yv1d}{m}{si}{<->ssub * yv1d/m/scsl}{}
+\DeclareFontShape{T1}{yv1d}{c}{scit}{<->ssub * yv1d/c/sc}{}
+\DeclareFontShape{T1}{yv1d}{uc}{scit}{<->ssub * yv1d/c/scit}{}
+\DeclareFontShape{T1}{yv1d}{c}{scsl}{<->ssub * yv1d/c/scit}{}
+\DeclareFontShape{T1}{yv1d}{uc}{scsl}{<->ssub * yv1d/c/scsl}{}
+\DeclareFontShape{T1}{yv1d}{c}{si}{<->ssub * yv1d/c/scsl}{}
+\DeclareFontShape{T1}{yv1d}{uc}{si}{<->ssub * yv1d/c/si}{}
+\DeclareFontShape{T1}{yv1d}{l}{scit}{<->ssub * yv1d/l/sc}{}
+\DeclareFontShape{T1}{yv1d}{l}{scsl}{<->ssub * yv1d/l/scit}{}
+\DeclareFontShape{T1}{yv1d}{l}{si}{<->ssub * yv1d/l/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yv2.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yv2.fd
new file mode 100644
index 00000000000..54356fbd1f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yv2.fd
@@ -0,0 +1,105 @@
+%Filename: t1yv2.fd
+%Created by: tex yv2-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yv2.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yv2.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvii@scale\endcsname\relax
+ \let\yvii@@scale\@empty
+\else
+ \edef\yvii@@scale{s*[\csname yvii@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yv2}{}
+
+\DeclareFontShape{T1}{yv2}{m}{n}{
+ <-> \yvii@@scale yv2r8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{m}{it}{
+ <-> \yvii@@scale yv2ri8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{b}{n}{
+ <-> \yvii@@scale yv2b8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{b}{it}{
+ <-> \yvii@@scale yv2bi8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{c}{n}{
+ <-> \yvii@@scale yv2r8tc
+}{}
+
+\DeclareFontShape{T1}{yv2}{c}{it}{
+ <-> \yvii@@scale yv2ri8tc
+}{}
+
+\DeclareFontShape{T1}{yv2}{bc}{n}{
+ <-> \yvii@@scale yv2b8tc
+}{}
+
+\DeclareFontShape{T1}{yv2}{bc}{it}{
+ <-> \yvii@@scale yv2bi8tc
+}{}
+
+\DeclareFontShape{T1}{yv2}{sb}{n}{
+ <-> \yvii@@scale yv2m8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{sb}{it}{
+ <-> \yvii@@scale yv2mi8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{eb}{n}{
+ <-> \yvii@@scale yv2x8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{eb}{it}{
+ <-> \yvii@@scale yv2xi8t
+}{}
+
+\DeclareFontShape{T1}{yv2}{m}{sc}{<->ssub * yv2/m/n}{}
+\DeclareFontShape{T1}{yv2}{m}{scit}{<->ssub * yv2/m/sc}{}
+\DeclareFontShape{T1}{yv2}{m}{scsl}{<->ssub * yv2/m/scit}{}
+\DeclareFontShape{T1}{yv2}{m}{si}{<->ssub * yv2/m/scsl}{}
+\DeclareFontShape{T1}{yv2}{m}{sl}{<->ssub * yv2/m/it}{}
+\DeclareFontShape{T1}{yv2}{bx}{n}{<->ssub * yv2/b/n}{}
+\DeclareFontShape{T1}{yv2}{b}{sc}{<->ssub * yv2/b/n}{}
+\DeclareFontShape{T1}{yv2}{bx}{sc}{<->ssub * yv2/b/sc}{}
+\DeclareFontShape{T1}{yv2}{b}{scit}{<->ssub * yv2/b/sc}{}
+\DeclareFontShape{T1}{yv2}{bx}{scit}{<->ssub * yv2/b/scit}{}
+\DeclareFontShape{T1}{yv2}{b}{scsl}{<->ssub * yv2/b/scit}{}
+\DeclareFontShape{T1}{yv2}{bx}{scsl}{<->ssub * yv2/b/scsl}{}
+\DeclareFontShape{T1}{yv2}{b}{si}{<->ssub * yv2/b/scsl}{}
+\DeclareFontShape{T1}{yv2}{bx}{si}{<->ssub * yv2/b/si}{}
+\DeclareFontShape{T1}{yv2}{bx}{it}{<->ssub * yv2/b/it}{}
+\DeclareFontShape{T1}{yv2}{b}{sl}{<->ssub * yv2/b/it}{}
+\DeclareFontShape{T1}{yv2}{bx}{sl}{<->ssub * yv2/b/sl}{}
+\DeclareFontShape{T1}{yv2}{c}{sc}{<->ssub * yv2/c/n}{}
+\DeclareFontShape{T1}{yv2}{c}{scit}{<->ssub * yv2/c/sc}{}
+\DeclareFontShape{T1}{yv2}{c}{scsl}{<->ssub * yv2/c/scit}{}
+\DeclareFontShape{T1}{yv2}{c}{si}{<->ssub * yv2/c/scsl}{}
+\DeclareFontShape{T1}{yv2}{c}{sl}{<->ssub * yv2/c/it}{}
+\DeclareFontShape{T1}{yv2}{bc}{sc}{<->ssub * yv2/bc/n}{}
+\DeclareFontShape{T1}{yv2}{bc}{scit}{<->ssub * yv2/bc/sc}{}
+\DeclareFontShape{T1}{yv2}{bc}{scsl}{<->ssub * yv2/bc/scit}{}
+\DeclareFontShape{T1}{yv2}{bc}{si}{<->ssub * yv2/bc/scsl}{}
+\DeclareFontShape{T1}{yv2}{bc}{sl}{<->ssub * yv2/bc/it}{}
+\DeclareFontShape{T1}{yv2}{sb}{sc}{<->ssub * yv2/sb/n}{}
+\DeclareFontShape{T1}{yv2}{sb}{scit}{<->ssub * yv2/sb/sc}{}
+\DeclareFontShape{T1}{yv2}{sb}{scsl}{<->ssub * yv2/sb/scit}{}
+\DeclareFontShape{T1}{yv2}{sb}{si}{<->ssub * yv2/sb/scsl}{}
+\DeclareFontShape{T1}{yv2}{sb}{sl}{<->ssub * yv2/sb/it}{}
+\DeclareFontShape{T1}{yv2}{eb}{sc}{<->ssub * yv2/eb/n}{}
+\DeclareFontShape{T1}{yv2}{eb}{scit}{<->ssub * yv2/eb/sc}{}
+\DeclareFontShape{T1}{yv2}{eb}{scsl}{<->ssub * yv2/eb/scit}{}
+\DeclareFontShape{T1}{yv2}{eb}{si}{<->ssub * yv2/eb/scsl}{}
+\DeclareFontShape{T1}{yv2}{eb}{sl}{<->ssub * yv2/eb/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yv3.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yv3.fd
new file mode 100644
index 00000000000..e438f9d4b11
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yv3.fd
@@ -0,0 +1,98 @@
+%Filename: t1yv3.fd
+%Created by: tex yv3-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yv3.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yv3.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yviii@scale\endcsname\relax
+ \let\yviii@@scale\@empty
+\else
+ \edef\yviii@@scale{s*[\csname yviii@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yv3}{}
+
+\DeclareFontShape{T1}{yv3}{m}{n}{
+ <-> \yviii@@scale yv3r8t
+}{}
+
+\DeclareFontShape{T1}{yv3}{m}{it}{
+ <-> \yviii@@scale yv3ri8t
+}{}
+
+\DeclareFontShape{T1}{yv3}{b}{n}{
+ <-> \yviii@@scale yv3b8t
+}{}
+
+\DeclareFontShape{T1}{yv3}{b}{it}{
+ <-> \yviii@@scale yv3bi8t
+}{}
+
+\DeclareFontShape{T1}{yv3}{c}{n}{
+ <-> \yviii@@scale yv3r8tc
+}{}
+
+\DeclareFontShape{T1}{yv3}{c}{it}{
+ <-> \yviii@@scale yv3ri8tc
+}{}
+
+\DeclareFontShape{T1}{yv3}{x}{n}{
+ <-> \yviii@@scale yv3r8tx
+}{}
+
+\DeclareFontShape{T1}{yv3}{x}{it}{
+ <-> \yviii@@scale yv3ri8tx
+}{}
+
+\DeclareFontShape{T1}{yv3}{bc}{n}{
+ <-> \yviii@@scale yv3b8tc
+}{}
+
+\DeclareFontShape{T1}{yv3}{bc}{it}{
+ <-> \yviii@@scale yv3bi8tc
+}{}
+
+\DeclareFontShape{T1}{yv3}{bx}{n}{
+ <-> \yviii@@scale yv3b8tx
+}{}
+
+\DeclareFontShape{T1}{yv3}{bx}{it}{
+ <-> \yviii@@scale yv3bi8tx
+}{}
+
+\DeclareFontShape{T1}{yv3}{m}{sc}{<->ssub * yv3/m/n}{}
+\DeclareFontShape{T1}{yv3}{m}{scit}{<->ssub * yv3/m/sc}{}
+\DeclareFontShape{T1}{yv3}{m}{scsl}{<->ssub * yv3/m/scit}{}
+\DeclareFontShape{T1}{yv3}{m}{si}{<->ssub * yv3/m/scsl}{}
+\DeclareFontShape{T1}{yv3}{m}{sl}{<->ssub * yv3/m/it}{}
+\DeclareFontShape{T1}{yv3}{b}{sc}{<->ssub * yv3/b/n}{}
+\DeclareFontShape{T1}{yv3}{bx}{sc}{<->ssub * yv3/b/sc}{}
+\DeclareFontShape{T1}{yv3}{b}{scit}{<->ssub * yv3/b/sc}{}
+\DeclareFontShape{T1}{yv3}{bx}{scit}{<->ssub * yv3/b/scit}{}
+\DeclareFontShape{T1}{yv3}{b}{scsl}{<->ssub * yv3/b/scit}{}
+\DeclareFontShape{T1}{yv3}{bx}{scsl}{<->ssub * yv3/b/scsl}{}
+\DeclareFontShape{T1}{yv3}{b}{si}{<->ssub * yv3/b/scsl}{}
+\DeclareFontShape{T1}{yv3}{bx}{si}{<->ssub * yv3/b/si}{}
+\DeclareFontShape{T1}{yv3}{b}{sl}{<->ssub * yv3/b/it}{}
+\DeclareFontShape{T1}{yv3}{bx}{sl}{<->ssub * yv3/b/sl}{}
+\DeclareFontShape{T1}{yv3}{c}{sc}{<->ssub * yv3/c/n}{}
+\DeclareFontShape{T1}{yv3}{c}{scit}{<->ssub * yv3/c/sc}{}
+\DeclareFontShape{T1}{yv3}{c}{scsl}{<->ssub * yv3/c/scit}{}
+\DeclareFontShape{T1}{yv3}{c}{si}{<->ssub * yv3/c/scsl}{}
+\DeclareFontShape{T1}{yv3}{c}{sl}{<->ssub * yv3/c/it}{}
+\DeclareFontShape{T1}{yv3}{x}{sc}{<->ssub * yv3/x/n}{}
+\DeclareFontShape{T1}{yv3}{x}{scit}{<->ssub * yv3/x/sc}{}
+\DeclareFontShape{T1}{yv3}{x}{scsl}{<->ssub * yv3/x/scit}{}
+\DeclareFontShape{T1}{yv3}{x}{si}{<->ssub * yv3/x/scsl}{}
+\DeclareFontShape{T1}{yv3}{x}{sl}{<->ssub * yv3/x/it}{}
+\DeclareFontShape{T1}{yv3}{bc}{sc}{<->ssub * yv3/bc/n}{}
+\DeclareFontShape{T1}{yv3}{bc}{scit}{<->ssub * yv3/bc/sc}{}
+\DeclareFontShape{T1}{yv3}{bc}{scsl}{<->ssub * yv3/bc/scit}{}
+\DeclareFontShape{T1}{yv3}{bc}{si}{<->ssub * yv3/bc/scsl}{}
+\DeclareFontShape{T1}{yv3}{bc}{sl}{<->ssub * yv3/bc/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisold/t1yvo.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvo.fd
index e07ba8ce669..6d7509da27f 100644
--- a/Master/texmf-dist/tex/latex/venturisold/t1yvo.fd
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvo.fd
@@ -5,33 +5,46 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yvo.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvo.]
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvo.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yvo}{}
\DeclareFontShape{T1}{yvo}{m}{n}{
- <-> yvor8t
+ <-> \yvo@@scale yvor8t
}{}
\DeclareFontShape{T1}{yvo}{m}{it}{
- <-> yvori8t
+ <-> \yvo@@scale yvori8t
}{}
\DeclareFontShape{T1}{yvo}{b}{n}{
- <-> yvob8t
+ <-> \yvo@@scale yvob8t
}{}
\DeclareFontShape{T1}{yvo}{b}{it}{
- <-> yvobi8t
+ <-> \yvo@@scale yvobi8t
}{}
\DeclareFontShape{T1}{yvo}{m}{sc}{<->sub * yvo/m/n}{}
-\DeclareFontShape{T1}{yvo}{m}{si}{<->ssub * yvo/m/sc}{}
+\DeclareFontShape{T1}{yvo}{m}{scit}{<->ssub * yvo/m/sc}{}
+\DeclareFontShape{T1}{yvo}{m}{scsl}{<->ssub * yvo/m/scit}{}
+\DeclareFontShape{T1}{yvo}{m}{si}{<->ssub * yvo/m/scsl}{}
\DeclareFontShape{T1}{yvo}{m}{sl}{<->ssub * yvo/m/it}{}
\DeclareFontShape{T1}{yvo}{bx}{n}{<->ssub * yvo/b/n}{}
\DeclareFontShape{T1}{yvo}{b}{sc}{<->sub * yvo/b/n}{}
\DeclareFontShape{T1}{yvo}{bx}{sc}{<->ssub * yvo/b/sc}{}
-\DeclareFontShape{T1}{yvo}{b}{si}{<->ssub * yvo/b/sc}{}
+\DeclareFontShape{T1}{yvo}{b}{scit}{<->ssub * yvo/b/sc}{}
+\DeclareFontShape{T1}{yvo}{bx}{scit}{<->ssub * yvo/b/scit}{}
+\DeclareFontShape{T1}{yvo}{b}{scsl}{<->ssub * yvo/b/scit}{}
+\DeclareFontShape{T1}{yvo}{bx}{scsl}{<->ssub * yvo/b/scsl}{}
+\DeclareFontShape{T1}{yvo}{b}{si}{<->ssub * yvo/b/scsl}{}
\DeclareFontShape{T1}{yvo}{bx}{si}{<->ssub * yvo/b/si}{}
\DeclareFontShape{T1}{yvo}{bx}{it}{<->ssub * yvo/b/it}{}
\DeclareFontShape{T1}{yvo}{b}{sl}{<->ssub * yvo/b/it}{}
diff --git a/Master/texmf-dist/tex/latex/venturisold/t1yvoa.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvoa.fd
index 2e6460e971c..8b91232829f 100644
--- a/Master/texmf-dist/tex/latex/venturisold/t1yvoa.fd
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvoa.fd
@@ -5,33 +5,46 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1yvoa.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvoa.]
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvoa.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
\DeclareFontFamily{T1}{yvoa}{}
\DeclareFontShape{T1}{yvoa}{m}{n}{
- <-> yvoar8t
+ <-> \yvo@@scale yvoar8t
}{}
\DeclareFontShape{T1}{yvoa}{m}{it}{
- <-> yvoari8t
+ <-> \yvo@@scale yvoari8t
}{}
\DeclareFontShape{T1}{yvoa}{b}{n}{
- <-> yvoab8t
+ <-> \yvo@@scale yvoab8t
}{}
\DeclareFontShape{T1}{yvoa}{b}{it}{
- <-> yvoabi8t
+ <-> \yvo@@scale yvoabi8t
}{}
\DeclareFontShape{T1}{yvoa}{m}{sc}{<->sub * yvoa/m/n}{}
-\DeclareFontShape{T1}{yvoa}{m}{si}{<->ssub * yvoa/m/sc}{}
+\DeclareFontShape{T1}{yvoa}{m}{scit}{<->ssub * yvoa/m/sc}{}
+\DeclareFontShape{T1}{yvoa}{m}{scsl}{<->ssub * yvoa/m/scit}{}
+\DeclareFontShape{T1}{yvoa}{m}{si}{<->ssub * yvoa/m/scsl}{}
\DeclareFontShape{T1}{yvoa}{m}{sl}{<->ssub * yvoa/m/it}{}
\DeclareFontShape{T1}{yvoa}{bx}{n}{<->ssub * yvoa/b/n}{}
\DeclareFontShape{T1}{yvoa}{b}{sc}{<->sub * yvoa/b/n}{}
\DeclareFontShape{T1}{yvoa}{bx}{sc}{<->ssub * yvoa/b/sc}{}
-\DeclareFontShape{T1}{yvoa}{b}{si}{<->ssub * yvoa/b/sc}{}
+\DeclareFontShape{T1}{yvoa}{b}{scit}{<->ssub * yvoa/b/sc}{}
+\DeclareFontShape{T1}{yvoa}{bx}{scit}{<->ssub * yvoa/b/scit}{}
+\DeclareFontShape{T1}{yvoa}{b}{scsl}{<->ssub * yvoa/b/scit}{}
+\DeclareFontShape{T1}{yvoa}{bx}{scsl}{<->ssub * yvoa/b/scsl}{}
+\DeclareFontShape{T1}{yvoa}{b}{si}{<->ssub * yvoa/b/scsl}{}
\DeclareFontShape{T1}{yvoa}{bx}{si}{<->ssub * yvoa/b/si}{}
\DeclareFontShape{T1}{yvoa}{bx}{it}{<->ssub * yvoa/b/it}{}
\DeclareFontShape{T1}{yvoa}{b}{sl}{<->ssub * yvoa/b/it}{}
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvoad.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvoad.fd
new file mode 100644
index 00000000000..0c6dc273c37
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvoad.fd
@@ -0,0 +1,46 @@
+%Filename: t1yvoad.fd
+%Created by: tex yvo-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvoad.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvoad.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvoad}{}
+
+\DeclareFontShape{T1}{yvoad}{db}{sc}{
+ <-> \yvo@@scale yvodd8t
+}{}
+
+\DeclareFontShape{T1}{yvoad}{db}{n}{
+ <-> \yvo@@scale yvodd8t
+}{}
+
+\DeclareFontShape{T1}{yvoad}{b}{sc}{<->ssub * yvoad/db/sc}{}
+\DeclareFontShape{T1}{yvoad}{bx}{sc}{<->ssub * yvoad/b/sc}{}
+\DeclareFontShape{T1}{yvoad}{m}{sc}{<->ssub * yvoad/bx/sc}{}
+\DeclareFontShape{T1}{yvoad}{db}{scit}{<->ssub * yvoad/db/sc}{}
+\DeclareFontShape{T1}{yvoad}{b}{scit}{<->ssub * yvoad/db/scit}{}
+\DeclareFontShape{T1}{yvoad}{bx}{scit}{<->ssub * yvoad/b/scit}{}
+\DeclareFontShape{T1}{yvoad}{m}{scit}{<->ssub * yvoad/bx/scit}{}
+\DeclareFontShape{T1}{yvoad}{db}{scsl}{<->ssub * yvoad/db/scit}{}
+\DeclareFontShape{T1}{yvoad}{b}{scsl}{<->ssub * yvoad/db/scsl}{}
+\DeclareFontShape{T1}{yvoad}{bx}{scsl}{<->ssub * yvoad/b/scsl}{}
+\DeclareFontShape{T1}{yvoad}{m}{scsl}{<->ssub * yvoad/bx/scsl}{}
+\DeclareFontShape{T1}{yvoad}{db}{si}{<->ssub * yvoad/db/scsl}{}
+\DeclareFontShape{T1}{yvoad}{b}{si}{<->ssub * yvoad/db/si}{}
+\DeclareFontShape{T1}{yvoad}{bx}{si}{<->ssub * yvoad/b/si}{}
+\DeclareFontShape{T1}{yvoad}{m}{si}{<->ssub * yvoad/bx/si}{}
+\DeclareFontShape{T1}{yvoad}{b}{n}{<->ssub * yvoad/db/n}{}
+\DeclareFontShape{T1}{yvoad}{bx}{n}{<->ssub * yvoad/b/n}{}
+\DeclareFontShape{T1}{yvoad}{m}{n}{<->ssub * yvoad/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvod.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvod.fd
new file mode 100644
index 00000000000..3f472f51176
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvod.fd
@@ -0,0 +1,46 @@
+%Filename: t1yvod.fd
+%Created by: tex yvo-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvod.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvod.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvod}{}
+
+\DeclareFontShape{T1}{yvod}{db}{sc}{
+ <-> \yvo@@scale yvodd8t
+}{}
+
+\DeclareFontShape{T1}{yvod}{db}{n}{
+ <-> \yvo@@scale yvodd8t
+}{}
+
+\DeclareFontShape{T1}{yvod}{b}{sc}{<->ssub * yvod/db/sc}{}
+\DeclareFontShape{T1}{yvod}{bx}{sc}{<->ssub * yvod/b/sc}{}
+\DeclareFontShape{T1}{yvod}{m}{sc}{<->ssub * yvod/bx/sc}{}
+\DeclareFontShape{T1}{yvod}{db}{scit}{<->ssub * yvod/db/sc}{}
+\DeclareFontShape{T1}{yvod}{b}{scit}{<->ssub * yvod/db/scit}{}
+\DeclareFontShape{T1}{yvod}{bx}{scit}{<->ssub * yvod/b/scit}{}
+\DeclareFontShape{T1}{yvod}{m}{scit}{<->ssub * yvod/bx/scit}{}
+\DeclareFontShape{T1}{yvod}{db}{scsl}{<->ssub * yvod/db/scit}{}
+\DeclareFontShape{T1}{yvod}{b}{scsl}{<->ssub * yvod/db/scsl}{}
+\DeclareFontShape{T1}{yvod}{bx}{scsl}{<->ssub * yvod/b/scsl}{}
+\DeclareFontShape{T1}{yvod}{m}{scsl}{<->ssub * yvod/bx/scsl}{}
+\DeclareFontShape{T1}{yvod}{db}{si}{<->ssub * yvod/db/scsl}{}
+\DeclareFontShape{T1}{yvod}{b}{si}{<->ssub * yvod/db/si}{}
+\DeclareFontShape{T1}{yvod}{bx}{si}{<->ssub * yvod/b/si}{}
+\DeclareFontShape{T1}{yvod}{m}{si}{<->ssub * yvod/bx/si}{}
+\DeclareFontShape{T1}{yvod}{b}{n}{<->ssub * yvod/db/n}{}
+\DeclareFontShape{T1}{yvod}{bx}{n}{<->ssub * yvod/b/n}{}
+\DeclareFontShape{T1}{yvod}{m}{n}{<->ssub * yvod/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvt.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvt.fd
new file mode 100644
index 00000000000..038a54dbcf2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvt.fd
@@ -0,0 +1,116 @@
+%Filename: t1yvt.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvt.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvt.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvt}{}
+
+\DeclareFontShape{T1}{yvt}{m}{n}{
+ <-> \yvt@@scale yvtr8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{m}{sc}{
+ <-> \yvt@@scale yvtrc8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{m}{scit}{
+ <-> \yvt@@scale yvtrci8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{m}{it}{
+ <-> \yvt@@scale yvtri8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{b}{n}{
+ <-> \yvt@@scale yvtb8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{b}{sc}{
+ <-> \yvt@@scale yvtbc8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{b}{scit}{
+ <-> \yvt@@scale yvtbci8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{b}{it}{
+ <-> \yvt@@scale yvtbi8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{eb}{n}{
+ <-> \yvt@@scale yvth8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{eb}{it}{
+ <-> \yvt@@scale yvthi8t
+}{}
+
+\DeclareFontShape{T1}{yvt}{c}{n}{
+ <-> \yvt@@scale yvtr8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{c}{sc}{
+ <-> \yvt@@scale yvtrc8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{c}{scit}{
+ <-> \yvt@@scale yvtrci8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{c}{it}{
+ <-> \yvt@@scale yvtri8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{bc}{n}{
+ <-> \yvt@@scale yvtb8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{bc}{it}{
+ <-> \yvt@@scale yvtbi8tc
+}{}
+
+\DeclareFontShape{T1}{yvt}{m}{scsl}{<->ssub * yvt/m/scit}{}
+\DeclareFontShape{T1}{yvt}{m}{si}{<->ssub * yvt/m/scsl}{}
+\DeclareFontShape{T1}{yvt}{m}{sl}{<->ssub * yvt/m/it}{}
+\DeclareFontShape{T1}{yvt}{bx}{n}{<->ssub * yvt/b/n}{}
+\DeclareFontShape{T1}{yvt}{bx}{sc}{<->ssub * yvt/b/sc}{}
+\DeclareFontShape{T1}{yvt}{bx}{scit}{<->ssub * yvt/b/scit}{}
+\DeclareFontShape{T1}{yvt}{b}{scsl}{<->ssub * yvt/b/scit}{}
+\DeclareFontShape{T1}{yvt}{bx}{scsl}{<->ssub * yvt/b/scsl}{}
+\DeclareFontShape{T1}{yvt}{b}{si}{<->ssub * yvt/b/scsl}{}
+\DeclareFontShape{T1}{yvt}{bx}{si}{<->ssub * yvt/b/si}{}
+\DeclareFontShape{T1}{yvt}{bx}{it}{<->ssub * yvt/b/it}{}
+\DeclareFontShape{T1}{yvt}{b}{sl}{<->ssub * yvt/b/it}{}
+\DeclareFontShape{T1}{yvt}{bx}{sl}{<->ssub * yvt/b/sl}{}
+\DeclareFontShape{T1}{yvt}{eb}{sc}{<->ssub * yvt/eb/n}{}
+\DeclareFontShape{T1}{yvt}{eb}{scit}{<->ssub * yvt/eb/sc}{}
+\DeclareFontShape{T1}{yvt}{eb}{scsl}{<->ssub * yvt/eb/scit}{}
+\DeclareFontShape{T1}{yvt}{eb}{si}{<->ssub * yvt/eb/scsl}{}
+\DeclareFontShape{T1}{yvt}{eb}{sl}{<->ssub * yvt/eb/it}{}
+\DeclareFontShape{T1}{yvt}{c}{scsl}{<->ssub * yvt/c/scit}{}
+\DeclareFontShape{T1}{yvt}{c}{si}{<->ssub * yvt/c/scsl}{}
+\DeclareFontShape{T1}{yvt}{c}{sl}{<->ssub * yvt/c/it}{}
+\DeclareFontShape{T1}{yvt}{bc}{scsl}{<->ssub * yvt/bc/scit}{}
+\DeclareFontShape{T1}{yvt}{bc}{si}{<->ssub * yvt/bc/scsl}{}
+\DeclareFontShape{T1}{yvt}{bc}{sl}{<->ssub * yvt/bc/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtajw.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtajw.fd
new file mode 100644
index 00000000000..eb45bd4359a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtajw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yvtajw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtajw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtajw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtajw}{}
+
+\DeclareFontShape{T1}{yvtajw}{m}{n}{
+ <-> \yvt@@scale yvtrajw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{m}{it}{
+ <-> \yvt@@scale yvtrijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{m}{sc}{
+ <-> \yvt@@scale yvtrcjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{m}{scit}{
+ <-> \yvt@@scale yvtrcijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{b}{n}{
+ <-> \yvt@@scale yvtbjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{b}{it}{
+ <-> \yvt@@scale yvtbijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{b}{sc}{
+ <-> \yvt@@scale yvtbcjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{b}{scit}{
+ <-> \yvt@@scale yvtbcijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{c}{n}{
+ <-> \yvt@@scale yvtrjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{c}{it}{
+ <-> \yvt@@scale yvtrijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{c}{sc}{
+ <-> \yvt@@scale yvtrcjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{c}{scit}{
+ <-> \yvt@@scale yvtrcijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{bc}{n}{
+ <-> \yvt@@scale yvtbjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{bc}{it}{
+ <-> \yvt@@scale yvtbijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{bc}{sc}{
+ <-> \yvt@@scale yvtbcjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{bc}{scit}{
+ <-> \yvt@@scale yvtbcijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtajw}{m}{sl}{<->ssub * yvtajw/m/it}{}
+\DeclareFontShape{T1}{yvtajw}{m}{scsl}{<->ssub * yvtajw/m/scit}{}
+\DeclareFontShape{T1}{yvtajw}{m}{si}{<->ssub * yvtajw/m/scsl}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{n}{<->ssub * yvtajw/b/n}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{it}{<->ssub * yvtajw/b/it}{}
+\DeclareFontShape{T1}{yvtajw}{b}{sl}{<->ssub * yvtajw/b/it}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{sl}{<->ssub * yvtajw/b/sl}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{sc}{<->ssub * yvtajw/b/sc}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{scit}{<->ssub * yvtajw/b/scit}{}
+\DeclareFontShape{T1}{yvtajw}{b}{scsl}{<->ssub * yvtajw/b/scit}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{scsl}{<->ssub * yvtajw/b/scsl}{}
+\DeclareFontShape{T1}{yvtajw}{b}{si}{<->ssub * yvtajw/b/scsl}{}
+\DeclareFontShape{T1}{yvtajw}{bx}{si}{<->ssub * yvtajw/b/si}{}
+\DeclareFontShape{T1}{yvtajw}{c}{sl}{<->ssub * yvtajw/c/it}{}
+\DeclareFontShape{T1}{yvtajw}{c}{scsl}{<->ssub * yvtajw/c/scit}{}
+\DeclareFontShape{T1}{yvtajw}{c}{si}{<->ssub * yvtajw/c/scsl}{}
+\DeclareFontShape{T1}{yvtajw}{bc}{sl}{<->ssub * yvtajw/bc/it}{}
+\DeclareFontShape{T1}{yvtajw}{bc}{scsl}{<->ssub * yvtajw/bc/scit}{}
+\DeclareFontShape{T1}{yvtajw}{bc}{si}{<->ssub * yvtajw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtaw.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtaw.fd
new file mode 100644
index 00000000000..f3094f3a442
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtaw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yvtaw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtaw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtaw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtaw}{}
+
+\DeclareFontShape{T1}{yvtaw}{m}{n}{
+ <-> \yvt@@scale yvtraw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{m}{sc}{
+ <-> \yvt@@scale yvtrcw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{m}{scit}{
+ <-> \yvt@@scale yvtrciw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{m}{it}{
+ <-> \yvt@@scale yvtriw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{b}{n}{
+ <-> \yvt@@scale yvtbw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{b}{sc}{
+ <-> \yvt@@scale yvtbcw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{b}{scit}{
+ <-> \yvt@@scale yvtbciw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{b}{it}{
+ <-> \yvt@@scale yvtbiw8t
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{c}{n}{
+ <-> \yvt@@scale yvtrw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{c}{sc}{
+ <-> \yvt@@scale yvtrcw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{c}{scit}{
+ <-> \yvt@@scale yvtrciw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{c}{it}{
+ <-> \yvt@@scale yvtriw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{bc}{n}{
+ <-> \yvt@@scale yvtbw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{bc}{sc}{
+ <-> \yvt@@scale yvtbcw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{bc}{scit}{
+ <-> \yvt@@scale yvtbciw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{bc}{it}{
+ <-> \yvt@@scale yvtbiw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtaw}{m}{scsl}{<->ssub * yvtaw/m/scit}{}
+\DeclareFontShape{T1}{yvtaw}{m}{si}{<->ssub * yvtaw/m/scsl}{}
+\DeclareFontShape{T1}{yvtaw}{m}{sl}{<->ssub * yvtaw/m/it}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{n}{<->ssub * yvtaw/b/n}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{sc}{<->ssub * yvtaw/b/sc}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{scit}{<->ssub * yvtaw/b/scit}{}
+\DeclareFontShape{T1}{yvtaw}{b}{scsl}{<->ssub * yvtaw/b/scit}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{scsl}{<->ssub * yvtaw/b/scsl}{}
+\DeclareFontShape{T1}{yvtaw}{b}{si}{<->ssub * yvtaw/b/scsl}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{si}{<->ssub * yvtaw/b/si}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{it}{<->ssub * yvtaw/b/it}{}
+\DeclareFontShape{T1}{yvtaw}{b}{sl}{<->ssub * yvtaw/b/it}{}
+\DeclareFontShape{T1}{yvtaw}{bx}{sl}{<->ssub * yvtaw/b/sl}{}
+\DeclareFontShape{T1}{yvtaw}{c}{scsl}{<->ssub * yvtaw/c/scit}{}
+\DeclareFontShape{T1}{yvtaw}{c}{si}{<->ssub * yvtaw/c/scsl}{}
+\DeclareFontShape{T1}{yvtaw}{c}{sl}{<->ssub * yvtaw/c/it}{}
+\DeclareFontShape{T1}{yvtaw}{bc}{scsl}{<->ssub * yvtaw/bc/scit}{}
+\DeclareFontShape{T1}{yvtaw}{bc}{si}{<->ssub * yvtaw/bc/scsl}{}
+\DeclareFontShape{T1}{yvtaw}{bc}{sl}{<->ssub * yvtaw/bc/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtd.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtd.fd
new file mode 100644
index 00000000000..6700063f3f0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtd.fd
@@ -0,0 +1,101 @@
+%Filename: t1yvtd.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtd.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtd.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtd}{}
+
+\DeclareFontShape{T1}{yvtd}{bc}{sc}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{c}{sc}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{m}{sc}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{b}{sc}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{eb}{sc}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{m}{ol}{
+ <-> \yvt@@scale yvtrdl8t
+}{}
+
+\DeclareFontShape{T1}{yvtd}{c}{ol}{
+ <-> \yvt@@scale yvtrdl8t
+}{}
+
+\DeclareFontShape{T1}{yvtd}{bc}{ol}{
+ <-> \yvt@@scale yvtrdl8t
+}{}
+
+\DeclareFontShape{T1}{yvtd}{b}{ol}{
+ <-> \yvt@@scale yvtrdl8t
+}{}
+
+\DeclareFontShape{T1}{yvtd}{eb}{ol}{
+ <-> \yvt@@scale yvtrdl8t
+}{}
+
+\DeclareFontShape{T1}{yvtd}{c}{n}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{m}{n}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{bc}{n}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{b}{n}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{eb}{n}{
+ <-> \yvt@@scale yvtbd8tc
+}{}
+
+\DeclareFontShape{T1}{yvtd}{bc}{scit}{<->ssub * yvtd/bc/sc}{}
+\DeclareFontShape{T1}{yvtd}{bc}{scsl}{<->ssub * yvtd/bc/scit}{}
+\DeclareFontShape{T1}{yvtd}{bc}{si}{<->ssub * yvtd/bc/scsl}{}
+\DeclareFontShape{T1}{yvtd}{c}{scit}{<->ssub * yvtd/c/sc}{}
+\DeclareFontShape{T1}{yvtd}{c}{scsl}{<->ssub * yvtd/c/scit}{}
+\DeclareFontShape{T1}{yvtd}{c}{si}{<->ssub * yvtd/c/scsl}{}
+\DeclareFontShape{T1}{yvtd}{m}{scit}{<->ssub * yvtd/m/sc}{}
+\DeclareFontShape{T1}{yvtd}{m}{scsl}{<->ssub * yvtd/m/scit}{}
+\DeclareFontShape{T1}{yvtd}{m}{si}{<->ssub * yvtd/m/scsl}{}
+\DeclareFontShape{T1}{yvtd}{bx}{sc}{<->ssub * yvtd/b/sc}{}
+\DeclareFontShape{T1}{yvtd}{b}{scit}{<->ssub * yvtd/b/sc}{}
+\DeclareFontShape{T1}{yvtd}{bx}{scit}{<->ssub * yvtd/b/scit}{}
+\DeclareFontShape{T1}{yvtd}{b}{scsl}{<->ssub * yvtd/b/scit}{}
+\DeclareFontShape{T1}{yvtd}{bx}{scsl}{<->ssub * yvtd/b/scsl}{}
+\DeclareFontShape{T1}{yvtd}{b}{si}{<->ssub * yvtd/b/scsl}{}
+\DeclareFontShape{T1}{yvtd}{bx}{si}{<->ssub * yvtd/b/si}{}
+\DeclareFontShape{T1}{yvtd}{eb}{scit}{<->ssub * yvtd/eb/sc}{}
+\DeclareFontShape{T1}{yvtd}{eb}{scsl}{<->ssub * yvtd/eb/scit}{}
+\DeclareFontShape{T1}{yvtd}{eb}{si}{<->ssub * yvtd/eb/scsl}{}
+\DeclareFontShape{T1}{yvtd}{bx}{ol}{<->ssub * yvtd/b/ol}{}
+\DeclareFontShape{T1}{yvtd}{bx}{n}{<->ssub * yvtd/b/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtj.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtj.fd
new file mode 100644
index 00000000000..03521590fbb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtj.fd
@@ -0,0 +1,103 @@
+%Filename: t1yvtj.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtj.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtj.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtj}{}
+
+\DeclareFontShape{T1}{yvtj}{m}{n}{
+ <-> \yvt@@scale yvtrj8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{m}{sc}{
+ <-> \yvt@@scale yvtrcj8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{m}{scit}{
+ <-> \yvt@@scale yvtrcij8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{m}{it}{
+ <-> \yvt@@scale yvtrij8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{b}{n}{
+ <-> \yvt@@scale yvtbj8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{b}{sc}{
+ <-> \yvt@@scale yvtbcj8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{b}{scit}{
+ <-> \yvt@@scale yvtbcij8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{b}{it}{
+ <-> \yvt@@scale yvtbij8t
+}{}
+
+\DeclareFontShape{T1}{yvtj}{c}{n}{
+ <-> \yvt@@scale yvtrj8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{c}{sc}{
+ <-> \yvt@@scale yvtrcj8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{c}{scit}{
+ <-> \yvt@@scale yvtrcij8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{c}{it}{
+ <-> \yvt@@scale yvtrij8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{bc}{n}{
+ <-> \yvt@@scale yvtbj8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{bc}{sc}{
+ <-> \yvt@@scale yvtbcj8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{bc}{scit}{
+ <-> \yvt@@scale yvtbcij8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{bc}{it}{
+ <-> \yvt@@scale yvtbij8tc
+}{}
+
+\DeclareFontShape{T1}{yvtj}{m}{scsl}{<->ssub * yvtj/m/scit}{}
+\DeclareFontShape{T1}{yvtj}{m}{si}{<->ssub * yvtj/m/scsl}{}
+\DeclareFontShape{T1}{yvtj}{m}{sl}{<->ssub * yvtj/m/it}{}
+\DeclareFontShape{T1}{yvtj}{bx}{n}{<->ssub * yvtj/b/n}{}
+\DeclareFontShape{T1}{yvtj}{bx}{sc}{<->ssub * yvtj/b/sc}{}
+\DeclareFontShape{T1}{yvtj}{bx}{scit}{<->ssub * yvtj/b/scit}{}
+\DeclareFontShape{T1}{yvtj}{b}{scsl}{<->ssub * yvtj/b/scit}{}
+\DeclareFontShape{T1}{yvtj}{bx}{scsl}{<->ssub * yvtj/b/scsl}{}
+\DeclareFontShape{T1}{yvtj}{b}{si}{<->ssub * yvtj/b/scsl}{}
+\DeclareFontShape{T1}{yvtj}{bx}{si}{<->ssub * yvtj/b/si}{}
+\DeclareFontShape{T1}{yvtj}{bx}{it}{<->ssub * yvtj/b/it}{}
+\DeclareFontShape{T1}{yvtj}{b}{sl}{<->ssub * yvtj/b/it}{}
+\DeclareFontShape{T1}{yvtj}{bx}{sl}{<->ssub * yvtj/b/sl}{}
+\DeclareFontShape{T1}{yvtj}{c}{scsl}{<->ssub * yvtj/c/scit}{}
+\DeclareFontShape{T1}{yvtj}{c}{si}{<->ssub * yvtj/c/scsl}{}
+\DeclareFontShape{T1}{yvtj}{c}{sl}{<->ssub * yvtj/c/it}{}
+\DeclareFontShape{T1}{yvtj}{bc}{scsl}{<->ssub * yvtj/bc/scit}{}
+\DeclareFontShape{T1}{yvtj}{bc}{si}{<->ssub * yvtj/bc/scsl}{}
+\DeclareFontShape{T1}{yvtj}{bc}{sl}{<->ssub * yvtj/bc/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtjw.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtjw.fd
new file mode 100644
index 00000000000..7f953d25dc3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtjw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yvtjw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtjw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtjw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtjw}{}
+
+\DeclareFontShape{T1}{yvtjw}{m}{n}{
+ <-> \yvt@@scale yvtrjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{m}{sc}{
+ <-> \yvt@@scale yvtrcjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{m}{scit}{
+ <-> \yvt@@scale yvtrcijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{m}{it}{
+ <-> \yvt@@scale yvtrijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{b}{n}{
+ <-> \yvt@@scale yvtbjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{b}{it}{
+ <-> \yvt@@scale yvtbijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{b}{sc}{
+ <-> \yvt@@scale yvtbcjw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{b}{scit}{
+ <-> \yvt@@scale yvtbcijw8t
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{c}{n}{
+ <-> \yvt@@scale yvtrjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{c}{sc}{
+ <-> \yvt@@scale yvtrcjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{c}{scit}{
+ <-> \yvt@@scale yvtrcijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{c}{it}{
+ <-> \yvt@@scale yvtrijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{bc}{n}{
+ <-> \yvt@@scale yvtbjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{bc}{it}{
+ <-> \yvt@@scale yvtbijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{bc}{sc}{
+ <-> \yvt@@scale yvtbcjw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{bc}{scit}{
+ <-> \yvt@@scale yvtbcijw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtjw}{m}{scsl}{<->ssub * yvtjw/m/scit}{}
+\DeclareFontShape{T1}{yvtjw}{m}{si}{<->ssub * yvtjw/m/scsl}{}
+\DeclareFontShape{T1}{yvtjw}{m}{sl}{<->ssub * yvtjw/m/it}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{n}{<->ssub * yvtjw/b/n}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{it}{<->ssub * yvtjw/b/it}{}
+\DeclareFontShape{T1}{yvtjw}{b}{sl}{<->ssub * yvtjw/b/it}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{sl}{<->ssub * yvtjw/b/sl}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{sc}{<->ssub * yvtjw/b/sc}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{scit}{<->ssub * yvtjw/b/scit}{}
+\DeclareFontShape{T1}{yvtjw}{b}{scsl}{<->ssub * yvtjw/b/scit}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{scsl}{<->ssub * yvtjw/b/scsl}{}
+\DeclareFontShape{T1}{yvtjw}{b}{si}{<->ssub * yvtjw/b/scsl}{}
+\DeclareFontShape{T1}{yvtjw}{bx}{si}{<->ssub * yvtjw/b/si}{}
+\DeclareFontShape{T1}{yvtjw}{c}{scsl}{<->ssub * yvtjw/c/scit}{}
+\DeclareFontShape{T1}{yvtjw}{c}{si}{<->ssub * yvtjw/c/scsl}{}
+\DeclareFontShape{T1}{yvtjw}{c}{sl}{<->ssub * yvtjw/c/it}{}
+\DeclareFontShape{T1}{yvtjw}{bc}{sl}{<->ssub * yvtjw/bc/it}{}
+\DeclareFontShape{T1}{yvtjw}{bc}{scsl}{<->ssub * yvtjw/bc/scit}{}
+\DeclareFontShape{T1}{yvtjw}{bc}{si}{<->ssub * yvtjw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/t1yvtw.fd b/Master/texmf-dist/tex/latex/venturisadf/t1yvtw.fd
new file mode 100644
index 00000000000..22ce518563e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/t1yvtw.fd
@@ -0,0 +1,103 @@
+%Filename: t1yvtw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1yvtw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for T1/yvtw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{yvtw}{}
+
+\DeclareFontShape{T1}{yvtw}{m}{n}{
+ <-> \yvt@@scale yvtrw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{m}{it}{
+ <-> \yvt@@scale yvtriw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{m}{sc}{
+ <-> \yvt@@scale yvtrcw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{m}{scit}{
+ <-> \yvt@@scale yvtrciw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{b}{n}{
+ <-> \yvt@@scale yvtbw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{b}{it}{
+ <-> \yvt@@scale yvtbiw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{b}{sc}{
+ <-> \yvt@@scale yvtbcw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{b}{scit}{
+ <-> \yvt@@scale yvtbciw8t
+}{}
+
+\DeclareFontShape{T1}{yvtw}{c}{n}{
+ <-> \yvt@@scale yvtrw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{c}{it}{
+ <-> \yvt@@scale yvtriw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{c}{sc}{
+ <-> \yvt@@scale yvtrcw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{c}{scit}{
+ <-> \yvt@@scale yvtrciw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{bc}{n}{
+ <-> \yvt@@scale yvtbw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{bc}{it}{
+ <-> \yvt@@scale yvtbiw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{bc}{sc}{
+ <-> \yvt@@scale yvtbcw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{bc}{scit}{
+ <-> \yvt@@scale yvtbciw8tc
+}{}
+
+\DeclareFontShape{T1}{yvtw}{m}{sl}{<->ssub * yvtw/m/it}{}
+\DeclareFontShape{T1}{yvtw}{m}{scsl}{<->ssub * yvtw/m/scit}{}
+\DeclareFontShape{T1}{yvtw}{m}{si}{<->ssub * yvtw/m/scsl}{}
+\DeclareFontShape{T1}{yvtw}{bx}{n}{<->ssub * yvtw/b/n}{}
+\DeclareFontShape{T1}{yvtw}{bx}{it}{<->ssub * yvtw/b/it}{}
+\DeclareFontShape{T1}{yvtw}{b}{sl}{<->ssub * yvtw/b/it}{}
+\DeclareFontShape{T1}{yvtw}{bx}{sl}{<->ssub * yvtw/b/sl}{}
+\DeclareFontShape{T1}{yvtw}{bx}{sc}{<->ssub * yvtw/b/sc}{}
+\DeclareFontShape{T1}{yvtw}{bx}{scit}{<->ssub * yvtw/b/scit}{}
+\DeclareFontShape{T1}{yvtw}{b}{scsl}{<->ssub * yvtw/b/scit}{}
+\DeclareFontShape{T1}{yvtw}{bx}{scsl}{<->ssub * yvtw/b/scsl}{}
+\DeclareFontShape{T1}{yvtw}{b}{si}{<->ssub * yvtw/b/scsl}{}
+\DeclareFontShape{T1}{yvtw}{bx}{si}{<->ssub * yvtw/b/si}{}
+\DeclareFontShape{T1}{yvtw}{c}{sl}{<->ssub * yvtw/c/it}{}
+\DeclareFontShape{T1}{yvtw}{c}{scsl}{<->ssub * yvtw/c/scit}{}
+\DeclareFontShape{T1}{yvtw}{c}{si}{<->ssub * yvtw/c/scsl}{}
+\DeclareFontShape{T1}{yvtw}{bc}{sl}{<->ssub * yvtw/bc/it}{}
+\DeclareFontShape{T1}{yvtw}{bc}{scsl}{<->ssub * yvtw/bc/scit}{}
+\DeclareFontShape{T1}{yvtw}{bc}{si}{<->ssub * yvtw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yv1.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yv1.fd
new file mode 100644
index 00000000000..3e03b4e3a95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yv1.fd
@@ -0,0 +1,163 @@
+%Filename: ts1yv1.fd
+%Created by: tex yv1-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yv1.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yv1.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvi@scale\endcsname\relax
+ \let\yvi@@scale\@empty
+\else
+ \edef\yvi@@scale{s*[\csname yvi@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yv1}{}
+
+\DeclareFontShape{TS1}{yv1}{m}{n}{
+ <-> \yvi@@scale yv1r8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{m}{it}{
+ <-> \yvi@@scale yv1ri8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{b}{n}{
+ <-> \yvi@@scale yv1b8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{b}{it}{
+ <-> \yvi@@scale yv1bi8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{eb}{n}{
+ <-> \yvi@@scale yv1h8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{eb}{sl}{
+ <-> \yvi@@scale yv1ho8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{eb}{it}{
+ <-> \yvi@@scale yv1ho8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{c}{n}{
+ <-> \yvi@@scale yv1r8cc
+}{}
+
+\DeclareFontShape{TS1}{yv1}{c}{it}{
+ <-> \yvi@@scale yv1ri8cc
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bc}{n}{
+ <-> \yvi@@scale yv1b8cc
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bc}{it}{
+ <-> \yvi@@scale yv1bi8cc
+}{}
+
+\DeclareFontShape{TS1}{yv1}{x}{n}{
+ <-> \yvi@@scale yv1r8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{x}{it}{
+ <-> \yvi@@scale yv1ri8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bx}{n}{
+ <-> \yvi@@scale yv1b8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bx}{it}{
+ <-> \yvi@@scale yv1bi8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bx}{sl}{
+ <-> \yvi@@scale yv1bi8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bx}{sc}{
+ <-> \yvi@@scale yv1b8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{bx}{scit}{
+ <-> \yvi@@scale yv1b8cx
+}{}
+
+\DeclareFontShape{TS1}{yv1}{l}{n}{
+ <-> \yvi@@scale yv1l8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{l}{it}{
+ <-> \yvi@@scale yv1li8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{db}{n}{
+ <-> \yvi@@scale yv1d8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{db}{it}{
+ <-> \yvi@@scale yv1di8c
+}{}
+
+\DeclareFontShape{TS1}{yv1}{m}{sc}{<->ssub * yv1/m/n}{}
+\DeclareFontShape{TS1}{yv1}{m}{scit}{<->ssub * yv1/m/sc}{}
+\DeclareFontShape{TS1}{yv1}{m}{scsl}{<->ssub * yv1/m/scit}{}
+\DeclareFontShape{TS1}{yv1}{m}{si}{<->ssub * yv1/m/scsl}{}
+\DeclareFontShape{TS1}{yv1}{m}{sl}{<->ssub * yv1/m/it}{}
+\DeclareFontShape{TS1}{yv1}{b}{sc}{<->ssub * yv1/b/n}{}
+\DeclareFontShape{TS1}{yv1}{b}{scit}{<->ssub * yv1/b/sc}{}
+\DeclareFontShape{TS1}{yv1}{b}{scsl}{<->ssub * yv1/b/scit}{}
+\DeclareFontShape{TS1}{yv1}{bx}{scsl}{<->ssub * yv1/b/scsl}{}
+\DeclareFontShape{TS1}{yv1}{b}{si}{<->ssub * yv1/b/scsl}{}
+\DeclareFontShape{TS1}{yv1}{bx}{si}{<->ssub * yv1/b/si}{}
+\DeclareFontShape{TS1}{yv1}{b}{sl}{<->ssub * yv1/b/it}{}
+\DeclareFontShape{TS1}{yv1}{eb}{sc}{<->ssub * yv1/eb/n}{}
+\DeclareFontShape{TS1}{yv1}{eb}{scit}{<->ssub * yv1/eb/sc}{}
+\DeclareFontShape{TS1}{yv1}{eb}{scsl}{<->ssub * yv1/eb/scit}{}
+\DeclareFontShape{TS1}{yv1}{eb}{si}{<->ssub * yv1/eb/scsl}{}
+\DeclareFontShape{TS1}{yv1}{uc}{n}{<->ssub * yv1/c/n}{}
+\DeclareFontShape{TS1}{yv1}{c}{sc}{<->ssub * yv1/c/n}{}
+\DeclareFontShape{TS1}{yv1}{uc}{sc}{<->ssub * yv1/c/sc}{}
+\DeclareFontShape{TS1}{yv1}{c}{scit}{<->ssub * yv1/c/sc}{}
+\DeclareFontShape{TS1}{yv1}{uc}{scit}{<->ssub * yv1/c/scit}{}
+\DeclareFontShape{TS1}{yv1}{c}{scsl}{<->ssub * yv1/c/scit}{}
+\DeclareFontShape{TS1}{yv1}{uc}{scsl}{<->ssub * yv1/c/scsl}{}
+\DeclareFontShape{TS1}{yv1}{c}{si}{<->ssub * yv1/c/scsl}{}
+\DeclareFontShape{TS1}{yv1}{uc}{si}{<->ssub * yv1/c/si}{}
+\DeclareFontShape{TS1}{yv1}{uc}{it}{<->ssub * yv1/c/it}{}
+\DeclareFontShape{TS1}{yv1}{c}{sl}{<->ssub * yv1/c/it}{}
+\DeclareFontShape{TS1}{yv1}{uc}{sl}{<->ssub * yv1/c/sl}{}
+\DeclareFontShape{TS1}{yv1}{bc}{sc}{<->ssub * yv1/bc/n}{}
+\DeclareFontShape{TS1}{yv1}{bc}{scit}{<->ssub * yv1/bc/sc}{}
+\DeclareFontShape{TS1}{yv1}{bc}{scsl}{<->ssub * yv1/bc/scit}{}
+\DeclareFontShape{TS1}{yv1}{bc}{si}{<->ssub * yv1/bc/scsl}{}
+\DeclareFontShape{TS1}{yv1}{bc}{sl}{<->ssub * yv1/bc/it}{}
+\DeclareFontShape{TS1}{yv1}{x}{sc}{<->ssub * yv1/x/n}{}
+\DeclareFontShape{TS1}{yv1}{x}{scit}{<->ssub * yv1/x/sc}{}
+\DeclareFontShape{TS1}{yv1}{x}{scsl}{<->ssub * yv1/x/scit}{}
+\DeclareFontShape{TS1}{yv1}{x}{si}{<->ssub * yv1/x/scsl}{}
+\DeclareFontShape{TS1}{yv1}{x}{sl}{<->ssub * yv1/x/it}{}
+\DeclareFontShape{TS1}{yv1}{l}{sc}{<->ssub * yv1/l/n}{}
+\DeclareFontShape{TS1}{yv1}{l}{scit}{<->ssub * yv1/l/sc}{}
+\DeclareFontShape{TS1}{yv1}{l}{scsl}{<->ssub * yv1/l/scit}{}
+\DeclareFontShape{TS1}{yv1}{l}{si}{<->ssub * yv1/l/scsl}{}
+\DeclareFontShape{TS1}{yv1}{l}{sl}{<->ssub * yv1/l/it}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{n}{<->ssub * yv1/db/n}{}
+\DeclareFontShape{TS1}{yv1}{db}{sc}{<->ssub * yv1/db/n}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{sc}{<->ssub * yv1/db/sc}{}
+\DeclareFontShape{TS1}{yv1}{db}{scit}{<->ssub * yv1/db/sc}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{scit}{<->ssub * yv1/db/scit}{}
+\DeclareFontShape{TS1}{yv1}{db}{scsl}{<->ssub * yv1/db/scit}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{scsl}{<->ssub * yv1/db/scsl}{}
+\DeclareFontShape{TS1}{yv1}{db}{si}{<->ssub * yv1/db/scsl}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{si}{<->ssub * yv1/db/si}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{it}{<->ssub * yv1/db/it}{}
+\DeclareFontShape{TS1}{yv1}{db}{sl}{<->ssub * yv1/db/it}{}
+\DeclareFontShape{TS1}{yv1}{dbuc}{sl}{<->ssub * yv1/db/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yv1d.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yv1d.fd
new file mode 100644
index 00000000000..46b88ae4ba0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yv1d.fd
@@ -0,0 +1,135 @@
+%Filename: ts1yv1d.fd
+%Created by: tex yv1-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yv1d.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yv1d.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvi@scale\endcsname\relax
+ \let\yvi@@scale\@empty
+\else
+ \edef\yvi@@scale{s*[\csname yvi@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yv1d}{}
+
+\DeclareFontShape{TS1}{yv1d}{b}{sc}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{eb}{sc}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{bc}{sc}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{db}{sc}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{b}{n}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{eb}{n}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{bc}{n}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{db}{n}{
+ <-> \yvi@@scale yv1bd8c
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{dbuc}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{x}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{m}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{c}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{uc}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{l}{sc}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{dbuc}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{x}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{m}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{c}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{uc}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{l}{n}{
+ <-> \yvi@@scale yv1dd8cu
+}{}
+
+\DeclareFontShape{TS1}{yv1d}{bx}{sc}{<->ssub * yv1d/b/sc}{}
+\DeclareFontShape{TS1}{yv1d}{b}{scit}{<->ssub * yv1d/b/sc}{}
+\DeclareFontShape{TS1}{yv1d}{bx}{scit}{<->ssub * yv1d/b/scit}{}
+\DeclareFontShape{TS1}{yv1d}{b}{scsl}{<->ssub * yv1d/b/scit}{}
+\DeclareFontShape{TS1}{yv1d}{bx}{scsl}{<->ssub * yv1d/b/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{b}{si}{<->ssub * yv1d/b/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{bx}{si}{<->ssub * yv1d/b/si}{}
+\DeclareFontShape{TS1}{yv1d}{eb}{scit}{<->ssub * yv1d/eb/sc}{}
+\DeclareFontShape{TS1}{yv1d}{eb}{scsl}{<->ssub * yv1d/eb/scit}{}
+\DeclareFontShape{TS1}{yv1d}{eb}{si}{<->ssub * yv1d/eb/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{bc}{scit}{<->ssub * yv1d/bc/sc}{}
+\DeclareFontShape{TS1}{yv1d}{bc}{scsl}{<->ssub * yv1d/bc/scit}{}
+\DeclareFontShape{TS1}{yv1d}{bc}{si}{<->ssub * yv1d/bc/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{db}{scit}{<->ssub * yv1d/db/sc}{}
+\DeclareFontShape{TS1}{yv1d}{dbuc}{scit}{<->ssub * yv1d/db/scit}{}
+\DeclareFontShape{TS1}{yv1d}{db}{scsl}{<->ssub * yv1d/db/scit}{}
+\DeclareFontShape{TS1}{yv1d}{dbuc}{scsl}{<->ssub * yv1d/db/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{db}{si}{<->ssub * yv1d/db/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{dbuc}{si}{<->ssub * yv1d/db/si}{}
+\DeclareFontShape{TS1}{yv1d}{bx}{n}{<->ssub * yv1d/b/n}{}
+\DeclareFontShape{TS1}{yv1d}{x}{scit}{<->ssub * yv1d/x/sc}{}
+\DeclareFontShape{TS1}{yv1d}{x}{scsl}{<->ssub * yv1d/x/scit}{}
+\DeclareFontShape{TS1}{yv1d}{x}{si}{<->ssub * yv1d/x/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{m}{scit}{<->ssub * yv1d/m/sc}{}
+\DeclareFontShape{TS1}{yv1d}{m}{scsl}{<->ssub * yv1d/m/scit}{}
+\DeclareFontShape{TS1}{yv1d}{m}{si}{<->ssub * yv1d/m/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{c}{scit}{<->ssub * yv1d/c/sc}{}
+\DeclareFontShape{TS1}{yv1d}{uc}{scit}{<->ssub * yv1d/c/scit}{}
+\DeclareFontShape{TS1}{yv1d}{c}{scsl}{<->ssub * yv1d/c/scit}{}
+\DeclareFontShape{TS1}{yv1d}{uc}{scsl}{<->ssub * yv1d/c/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{c}{si}{<->ssub * yv1d/c/scsl}{}
+\DeclareFontShape{TS1}{yv1d}{uc}{si}{<->ssub * yv1d/c/si}{}
+\DeclareFontShape{TS1}{yv1d}{l}{scit}{<->ssub * yv1d/l/sc}{}
+\DeclareFontShape{TS1}{yv1d}{l}{scsl}{<->ssub * yv1d/l/scit}{}
+\DeclareFontShape{TS1}{yv1d}{l}{si}{<->ssub * yv1d/l/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yv2.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yv2.fd
new file mode 100644
index 00000000000..c7b4fb25819
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yv2.fd
@@ -0,0 +1,105 @@
+%Filename: ts1yv2.fd
+%Created by: tex yv2-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yv2.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yv2.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvii@scale\endcsname\relax
+ \let\yvii@@scale\@empty
+\else
+ \edef\yvii@@scale{s*[\csname yvii@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yv2}{}
+
+\DeclareFontShape{TS1}{yv2}{m}{n}{
+ <-> \yvii@@scale yv2r8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{m}{it}{
+ <-> \yvii@@scale yv2ri8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{b}{n}{
+ <-> \yvii@@scale yv2b8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{b}{it}{
+ <-> \yvii@@scale yv2bi8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{c}{n}{
+ <-> \yvii@@scale yv2r8cc
+}{}
+
+\DeclareFontShape{TS1}{yv2}{c}{it}{
+ <-> \yvii@@scale yv2ri8cc
+}{}
+
+\DeclareFontShape{TS1}{yv2}{bc}{n}{
+ <-> \yvii@@scale yv2b8cc
+}{}
+
+\DeclareFontShape{TS1}{yv2}{bc}{it}{
+ <-> \yvii@@scale yv2bi8cc
+}{}
+
+\DeclareFontShape{TS1}{yv2}{sb}{n}{
+ <-> \yvii@@scale yv2m8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{sb}{it}{
+ <-> \yvii@@scale yv2mi8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{eb}{n}{
+ <-> \yvii@@scale yv2x8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{eb}{it}{
+ <-> \yvii@@scale yv2xi8c
+}{}
+
+\DeclareFontShape{TS1}{yv2}{m}{sc}{<->ssub * yv2/m/n}{}
+\DeclareFontShape{TS1}{yv2}{m}{scit}{<->ssub * yv2/m/sc}{}
+\DeclareFontShape{TS1}{yv2}{m}{scsl}{<->ssub * yv2/m/scit}{}
+\DeclareFontShape{TS1}{yv2}{m}{si}{<->ssub * yv2/m/scsl}{}
+\DeclareFontShape{TS1}{yv2}{m}{sl}{<->ssub * yv2/m/it}{}
+\DeclareFontShape{TS1}{yv2}{bx}{n}{<->ssub * yv2/b/n}{}
+\DeclareFontShape{TS1}{yv2}{b}{sc}{<->ssub * yv2/b/n}{}
+\DeclareFontShape{TS1}{yv2}{bx}{sc}{<->ssub * yv2/b/sc}{}
+\DeclareFontShape{TS1}{yv2}{b}{scit}{<->ssub * yv2/b/sc}{}
+\DeclareFontShape{TS1}{yv2}{bx}{scit}{<->ssub * yv2/b/scit}{}
+\DeclareFontShape{TS1}{yv2}{b}{scsl}{<->ssub * yv2/b/scit}{}
+\DeclareFontShape{TS1}{yv2}{bx}{scsl}{<->ssub * yv2/b/scsl}{}
+\DeclareFontShape{TS1}{yv2}{b}{si}{<->ssub * yv2/b/scsl}{}
+\DeclareFontShape{TS1}{yv2}{bx}{si}{<->ssub * yv2/b/si}{}
+\DeclareFontShape{TS1}{yv2}{bx}{it}{<->ssub * yv2/b/it}{}
+\DeclareFontShape{TS1}{yv2}{b}{sl}{<->ssub * yv2/b/it}{}
+\DeclareFontShape{TS1}{yv2}{bx}{sl}{<->ssub * yv2/b/sl}{}
+\DeclareFontShape{TS1}{yv2}{c}{sc}{<->ssub * yv2/c/n}{}
+\DeclareFontShape{TS1}{yv2}{c}{scit}{<->ssub * yv2/c/sc}{}
+\DeclareFontShape{TS1}{yv2}{c}{scsl}{<->ssub * yv2/c/scit}{}
+\DeclareFontShape{TS1}{yv2}{c}{si}{<->ssub * yv2/c/scsl}{}
+\DeclareFontShape{TS1}{yv2}{c}{sl}{<->ssub * yv2/c/it}{}
+\DeclareFontShape{TS1}{yv2}{bc}{sc}{<->ssub * yv2/bc/n}{}
+\DeclareFontShape{TS1}{yv2}{bc}{scit}{<->ssub * yv2/bc/sc}{}
+\DeclareFontShape{TS1}{yv2}{bc}{scsl}{<->ssub * yv2/bc/scit}{}
+\DeclareFontShape{TS1}{yv2}{bc}{si}{<->ssub * yv2/bc/scsl}{}
+\DeclareFontShape{TS1}{yv2}{bc}{sl}{<->ssub * yv2/bc/it}{}
+\DeclareFontShape{TS1}{yv2}{sb}{sc}{<->ssub * yv2/sb/n}{}
+\DeclareFontShape{TS1}{yv2}{sb}{scit}{<->ssub * yv2/sb/sc}{}
+\DeclareFontShape{TS1}{yv2}{sb}{scsl}{<->ssub * yv2/sb/scit}{}
+\DeclareFontShape{TS1}{yv2}{sb}{si}{<->ssub * yv2/sb/scsl}{}
+\DeclareFontShape{TS1}{yv2}{sb}{sl}{<->ssub * yv2/sb/it}{}
+\DeclareFontShape{TS1}{yv2}{eb}{sc}{<->ssub * yv2/eb/n}{}
+\DeclareFontShape{TS1}{yv2}{eb}{scit}{<->ssub * yv2/eb/sc}{}
+\DeclareFontShape{TS1}{yv2}{eb}{scsl}{<->ssub * yv2/eb/scit}{}
+\DeclareFontShape{TS1}{yv2}{eb}{si}{<->ssub * yv2/eb/scsl}{}
+\DeclareFontShape{TS1}{yv2}{eb}{sl}{<->ssub * yv2/eb/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yv3.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yv3.fd
new file mode 100644
index 00000000000..182eb5ba316
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yv3.fd
@@ -0,0 +1,98 @@
+%Filename: ts1yv3.fd
+%Created by: tex yv3-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yv3.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yv3.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yviii@scale\endcsname\relax
+ \let\yviii@@scale\@empty
+\else
+ \edef\yviii@@scale{s*[\csname yviii@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yv3}{}
+
+\DeclareFontShape{TS1}{yv3}{m}{n}{
+ <-> \yviii@@scale yv3r8c
+}{}
+
+\DeclareFontShape{TS1}{yv3}{m}{it}{
+ <-> \yviii@@scale yv3ri8c
+}{}
+
+\DeclareFontShape{TS1}{yv3}{b}{n}{
+ <-> \yviii@@scale yv3b8c
+}{}
+
+\DeclareFontShape{TS1}{yv3}{b}{it}{
+ <-> \yviii@@scale yv3bi8c
+}{}
+
+\DeclareFontShape{TS1}{yv3}{c}{n}{
+ <-> \yviii@@scale yv3r8cc
+}{}
+
+\DeclareFontShape{TS1}{yv3}{c}{it}{
+ <-> \yviii@@scale yv3ri8cc
+}{}
+
+\DeclareFontShape{TS1}{yv3}{bc}{n}{
+ <-> \yviii@@scale yv3b8cc
+}{}
+
+\DeclareFontShape{TS1}{yv3}{bc}{it}{
+ <-> \yviii@@scale yv3bi8cc
+}{}
+
+\DeclareFontShape{TS1}{yv3}{x}{n}{
+ <-> \yviii@@scale yv3r8cx
+}{}
+
+\DeclareFontShape{TS1}{yv3}{x}{it}{
+ <-> \yviii@@scale yv3ri8cx
+}{}
+
+\DeclareFontShape{TS1}{yv3}{bx}{n}{
+ <-> \yviii@@scale yv3b8cx
+}{}
+
+\DeclareFontShape{TS1}{yv3}{bx}{it}{
+ <-> \yviii@@scale yv3bi8cx
+}{}
+
+\DeclareFontShape{TS1}{yv3}{m}{sc}{<->ssub * yv3/m/n}{}
+\DeclareFontShape{TS1}{yv3}{m}{scit}{<->ssub * yv3/m/sc}{}
+\DeclareFontShape{TS1}{yv3}{m}{scsl}{<->ssub * yv3/m/scit}{}
+\DeclareFontShape{TS1}{yv3}{m}{si}{<->ssub * yv3/m/scsl}{}
+\DeclareFontShape{TS1}{yv3}{m}{sl}{<->ssub * yv3/m/it}{}
+\DeclareFontShape{TS1}{yv3}{b}{sc}{<->ssub * yv3/b/n}{}
+\DeclareFontShape{TS1}{yv3}{bx}{sc}{<->ssub * yv3/b/sc}{}
+\DeclareFontShape{TS1}{yv3}{b}{scit}{<->ssub * yv3/b/sc}{}
+\DeclareFontShape{TS1}{yv3}{bx}{scit}{<->ssub * yv3/b/scit}{}
+\DeclareFontShape{TS1}{yv3}{b}{scsl}{<->ssub * yv3/b/scit}{}
+\DeclareFontShape{TS1}{yv3}{bx}{scsl}{<->ssub * yv3/b/scsl}{}
+\DeclareFontShape{TS1}{yv3}{b}{si}{<->ssub * yv3/b/scsl}{}
+\DeclareFontShape{TS1}{yv3}{bx}{si}{<->ssub * yv3/b/si}{}
+\DeclareFontShape{TS1}{yv3}{b}{sl}{<->ssub * yv3/b/it}{}
+\DeclareFontShape{TS1}{yv3}{bx}{sl}{<->ssub * yv3/b/sl}{}
+\DeclareFontShape{TS1}{yv3}{c}{sc}{<->ssub * yv3/c/n}{}
+\DeclareFontShape{TS1}{yv3}{c}{scit}{<->ssub * yv3/c/sc}{}
+\DeclareFontShape{TS1}{yv3}{c}{scsl}{<->ssub * yv3/c/scit}{}
+\DeclareFontShape{TS1}{yv3}{c}{si}{<->ssub * yv3/c/scsl}{}
+\DeclareFontShape{TS1}{yv3}{c}{sl}{<->ssub * yv3/c/it}{}
+\DeclareFontShape{TS1}{yv3}{bc}{sc}{<->ssub * yv3/bc/n}{}
+\DeclareFontShape{TS1}{yv3}{bc}{scit}{<->ssub * yv3/bc/sc}{}
+\DeclareFontShape{TS1}{yv3}{bc}{scsl}{<->ssub * yv3/bc/scit}{}
+\DeclareFontShape{TS1}{yv3}{bc}{si}{<->ssub * yv3/bc/scsl}{}
+\DeclareFontShape{TS1}{yv3}{bc}{sl}{<->ssub * yv3/bc/it}{}
+\DeclareFontShape{TS1}{yv3}{x}{sc}{<->ssub * yv3/x/n}{}
+\DeclareFontShape{TS1}{yv3}{x}{scit}{<->ssub * yv3/x/sc}{}
+\DeclareFontShape{TS1}{yv3}{x}{scsl}{<->ssub * yv3/x/scit}{}
+\DeclareFontShape{TS1}{yv3}{x}{si}{<->ssub * yv3/x/scsl}{}
+\DeclareFontShape{TS1}{yv3}{x}{sl}{<->ssub * yv3/x/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisold/ts1yvo.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvo.fd
index 2d53b412c76..b7a740502da 100644
--- a/Master/texmf-dist/tex/latex/venturisold/ts1yvo.fd
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvo.fd
@@ -5,33 +5,46 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yvo.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvo.]
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvo.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yvo}{}
\DeclareFontShape{TS1}{yvo}{m}{n}{
- <-> yvor8c
+ <-> \yvo@@scale yvor8c
}{}
\DeclareFontShape{TS1}{yvo}{m}{it}{
- <-> yvori8c
+ <-> \yvo@@scale yvori8c
}{}
\DeclareFontShape{TS1}{yvo}{b}{n}{
- <-> yvob8c
+ <-> \yvo@@scale yvob8c
}{}
\DeclareFontShape{TS1}{yvo}{b}{it}{
- <-> yvobi8c
+ <-> \yvo@@scale yvobi8c
}{}
\DeclareFontShape{TS1}{yvo}{m}{sc}{<->sub * yvo/m/n}{}
-\DeclareFontShape{TS1}{yvo}{m}{si}{<->ssub * yvo/m/sc}{}
+\DeclareFontShape{TS1}{yvo}{m}{scit}{<->ssub * yvo/m/sc}{}
+\DeclareFontShape{TS1}{yvo}{m}{scsl}{<->ssub * yvo/m/scit}{}
+\DeclareFontShape{TS1}{yvo}{m}{si}{<->ssub * yvo/m/scsl}{}
\DeclareFontShape{TS1}{yvo}{m}{sl}{<->ssub * yvo/m/it}{}
\DeclareFontShape{TS1}{yvo}{bx}{n}{<->ssub * yvo/b/n}{}
\DeclareFontShape{TS1}{yvo}{b}{sc}{<->sub * yvo/b/n}{}
\DeclareFontShape{TS1}{yvo}{bx}{sc}{<->ssub * yvo/b/sc}{}
-\DeclareFontShape{TS1}{yvo}{b}{si}{<->ssub * yvo/b/sc}{}
+\DeclareFontShape{TS1}{yvo}{b}{scit}{<->ssub * yvo/b/sc}{}
+\DeclareFontShape{TS1}{yvo}{bx}{scit}{<->ssub * yvo/b/scit}{}
+\DeclareFontShape{TS1}{yvo}{b}{scsl}{<->ssub * yvo/b/scit}{}
+\DeclareFontShape{TS1}{yvo}{bx}{scsl}{<->ssub * yvo/b/scsl}{}
+\DeclareFontShape{TS1}{yvo}{b}{si}{<->ssub * yvo/b/scsl}{}
\DeclareFontShape{TS1}{yvo}{bx}{si}{<->ssub * yvo/b/si}{}
\DeclareFontShape{TS1}{yvo}{bx}{it}{<->ssub * yvo/b/it}{}
\DeclareFontShape{TS1}{yvo}{b}{sl}{<->ssub * yvo/b/it}{}
diff --git a/Master/texmf-dist/tex/latex/venturisold/ts1yvoa.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvoa.fd
index 003f75a60f2..487e53e7fc1 100644
--- a/Master/texmf-dist/tex/latex/venturisold/ts1yvoa.fd
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvoa.fd
@@ -5,33 +5,46 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1yvoa.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvoa.]
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvoa.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
\DeclareFontFamily{TS1}{yvoa}{}
\DeclareFontShape{TS1}{yvoa}{m}{n}{
- <-> yvor8c
+ <-> \yvo@@scale yvor8c
}{}
\DeclareFontShape{TS1}{yvoa}{m}{it}{
- <-> yvori8c
+ <-> \yvo@@scale yvori8c
}{}
\DeclareFontShape{TS1}{yvoa}{b}{n}{
- <-> yvob8c
+ <-> \yvo@@scale yvob8c
}{}
\DeclareFontShape{TS1}{yvoa}{b}{it}{
- <-> yvobi8c
+ <-> \yvo@@scale yvobi8c
}{}
\DeclareFontShape{TS1}{yvoa}{m}{sc}{<->sub * yvoa/m/n}{}
-\DeclareFontShape{TS1}{yvoa}{m}{si}{<->ssub * yvoa/m/sc}{}
+\DeclareFontShape{TS1}{yvoa}{m}{scit}{<->ssub * yvoa/m/sc}{}
+\DeclareFontShape{TS1}{yvoa}{m}{scsl}{<->ssub * yvoa/m/scit}{}
+\DeclareFontShape{TS1}{yvoa}{m}{si}{<->ssub * yvoa/m/scsl}{}
\DeclareFontShape{TS1}{yvoa}{m}{sl}{<->ssub * yvoa/m/it}{}
\DeclareFontShape{TS1}{yvoa}{bx}{n}{<->ssub * yvoa/b/n}{}
\DeclareFontShape{TS1}{yvoa}{b}{sc}{<->sub * yvoa/b/n}{}
\DeclareFontShape{TS1}{yvoa}{bx}{sc}{<->ssub * yvoa/b/sc}{}
-\DeclareFontShape{TS1}{yvoa}{b}{si}{<->ssub * yvoa/b/sc}{}
+\DeclareFontShape{TS1}{yvoa}{b}{scit}{<->ssub * yvoa/b/sc}{}
+\DeclareFontShape{TS1}{yvoa}{bx}{scit}{<->ssub * yvoa/b/scit}{}
+\DeclareFontShape{TS1}{yvoa}{b}{scsl}{<->ssub * yvoa/b/scit}{}
+\DeclareFontShape{TS1}{yvoa}{bx}{scsl}{<->ssub * yvoa/b/scsl}{}
+\DeclareFontShape{TS1}{yvoa}{b}{si}{<->ssub * yvoa/b/scsl}{}
\DeclareFontShape{TS1}{yvoa}{bx}{si}{<->ssub * yvoa/b/si}{}
\DeclareFontShape{TS1}{yvoa}{bx}{it}{<->ssub * yvoa/b/it}{}
\DeclareFontShape{TS1}{yvoa}{b}{sl}{<->ssub * yvoa/b/it}{}
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvoad.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvoad.fd
new file mode 100644
index 00000000000..f1de4addb8e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvoad.fd
@@ -0,0 +1,46 @@
+%Filename: ts1yvoad.fd
+%Created by: tex yvo-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvoad.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvoad.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvoad}{}
+
+\DeclareFontShape{TS1}{yvoad}{db}{sc}{
+ <-> \yvo@@scale yvodd8c
+}{}
+
+\DeclareFontShape{TS1}{yvoad}{db}{n}{
+ <-> \yvo@@scale yvodd8c
+}{}
+
+\DeclareFontShape{TS1}{yvoad}{b}{sc}{<->ssub * yvoad/db/sc}{}
+\DeclareFontShape{TS1}{yvoad}{bx}{sc}{<->ssub * yvoad/b/sc}{}
+\DeclareFontShape{TS1}{yvoad}{m}{sc}{<->ssub * yvoad/bx/sc}{}
+\DeclareFontShape{TS1}{yvoad}{db}{scit}{<->ssub * yvoad/db/sc}{}
+\DeclareFontShape{TS1}{yvoad}{b}{scit}{<->ssub * yvoad/db/scit}{}
+\DeclareFontShape{TS1}{yvoad}{bx}{scit}{<->ssub * yvoad/b/scit}{}
+\DeclareFontShape{TS1}{yvoad}{m}{scit}{<->ssub * yvoad/bx/scit}{}
+\DeclareFontShape{TS1}{yvoad}{db}{scsl}{<->ssub * yvoad/db/scit}{}
+\DeclareFontShape{TS1}{yvoad}{b}{scsl}{<->ssub * yvoad/db/scsl}{}
+\DeclareFontShape{TS1}{yvoad}{bx}{scsl}{<->ssub * yvoad/b/scsl}{}
+\DeclareFontShape{TS1}{yvoad}{m}{scsl}{<->ssub * yvoad/bx/scsl}{}
+\DeclareFontShape{TS1}{yvoad}{db}{si}{<->ssub * yvoad/db/scsl}{}
+\DeclareFontShape{TS1}{yvoad}{b}{si}{<->ssub * yvoad/db/si}{}
+\DeclareFontShape{TS1}{yvoad}{bx}{si}{<->ssub * yvoad/b/si}{}
+\DeclareFontShape{TS1}{yvoad}{m}{si}{<->ssub * yvoad/bx/si}{}
+\DeclareFontShape{TS1}{yvoad}{b}{n}{<->ssub * yvoad/db/n}{}
+\DeclareFontShape{TS1}{yvoad}{bx}{n}{<->ssub * yvoad/b/n}{}
+\DeclareFontShape{TS1}{yvoad}{m}{n}{<->ssub * yvoad/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvod.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvod.fd
new file mode 100644
index 00000000000..a42c9aaca99
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvod.fd
@@ -0,0 +1,46 @@
+%Filename: ts1yvod.fd
+%Created by: tex yvo-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvod.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvod.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvo@scale\endcsname\relax
+ \let\yvo@@scale\@empty
+\else
+ \edef\yvo@@scale{s*[\csname yvo@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvod}{}
+
+\DeclareFontShape{TS1}{yvod}{db}{sc}{
+ <-> \yvo@@scale yvodd8c
+}{}
+
+\DeclareFontShape{TS1}{yvod}{db}{n}{
+ <-> \yvo@@scale yvodd8c
+}{}
+
+\DeclareFontShape{TS1}{yvod}{b}{sc}{<->ssub * yvod/db/sc}{}
+\DeclareFontShape{TS1}{yvod}{bx}{sc}{<->ssub * yvod/b/sc}{}
+\DeclareFontShape{TS1}{yvod}{m}{sc}{<->ssub * yvod/bx/sc}{}
+\DeclareFontShape{TS1}{yvod}{db}{scit}{<->ssub * yvod/db/sc}{}
+\DeclareFontShape{TS1}{yvod}{b}{scit}{<->ssub * yvod/db/scit}{}
+\DeclareFontShape{TS1}{yvod}{bx}{scit}{<->ssub * yvod/b/scit}{}
+\DeclareFontShape{TS1}{yvod}{m}{scit}{<->ssub * yvod/bx/scit}{}
+\DeclareFontShape{TS1}{yvod}{db}{scsl}{<->ssub * yvod/db/scit}{}
+\DeclareFontShape{TS1}{yvod}{b}{scsl}{<->ssub * yvod/db/scsl}{}
+\DeclareFontShape{TS1}{yvod}{bx}{scsl}{<->ssub * yvod/b/scsl}{}
+\DeclareFontShape{TS1}{yvod}{m}{scsl}{<->ssub * yvod/bx/scsl}{}
+\DeclareFontShape{TS1}{yvod}{db}{si}{<->ssub * yvod/db/scsl}{}
+\DeclareFontShape{TS1}{yvod}{b}{si}{<->ssub * yvod/db/si}{}
+\DeclareFontShape{TS1}{yvod}{bx}{si}{<->ssub * yvod/b/si}{}
+\DeclareFontShape{TS1}{yvod}{m}{si}{<->ssub * yvod/bx/si}{}
+\DeclareFontShape{TS1}{yvod}{b}{n}{<->ssub * yvod/db/n}{}
+\DeclareFontShape{TS1}{yvod}{bx}{n}{<->ssub * yvod/b/n}{}
+\DeclareFontShape{TS1}{yvod}{m}{n}{<->ssub * yvod/bx/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvt.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvt.fd
new file mode 100644
index 00000000000..db55b930dd2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvt.fd
@@ -0,0 +1,116 @@
+%Filename: ts1yvt.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvt.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvt.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvt}{}
+
+\DeclareFontShape{TS1}{yvt}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{eb}{n}{
+ <-> \yvt@@scale yvth8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{eb}{it}{
+ <-> \yvt@@scale yvthi8c
+}{}
+
+\DeclareFontShape{TS1}{yvt}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvt}{m}{sl}{<->ssub * yvt/m/it}{}
+\DeclareFontShape{TS1}{yvt}{m}{scsl}{<->ssub * yvt/m/scit}{}
+\DeclareFontShape{TS1}{yvt}{m}{si}{<->ssub * yvt/m/scsl}{}
+\DeclareFontShape{TS1}{yvt}{bx}{n}{<->ssub * yvt/b/n}{}
+\DeclareFontShape{TS1}{yvt}{bx}{sc}{<->ssub * yvt/b/sc}{}
+\DeclareFontShape{TS1}{yvt}{bx}{it}{<->ssub * yvt/b/it}{}
+\DeclareFontShape{TS1}{yvt}{b}{sl}{<->ssub * yvt/b/it}{}
+\DeclareFontShape{TS1}{yvt}{bx}{sl}{<->ssub * yvt/b/sl}{}
+\DeclareFontShape{TS1}{yvt}{bx}{scit}{<->ssub * yvt/b/scit}{}
+\DeclareFontShape{TS1}{yvt}{b}{scsl}{<->ssub * yvt/b/scit}{}
+\DeclareFontShape{TS1}{yvt}{bx}{scsl}{<->ssub * yvt/b/scsl}{}
+\DeclareFontShape{TS1}{yvt}{b}{si}{<->ssub * yvt/b/scsl}{}
+\DeclareFontShape{TS1}{yvt}{bx}{si}{<->ssub * yvt/b/si}{}
+\DeclareFontShape{TS1}{yvt}{eb}{sc}{<->ssub * yvt/eb/n}{}
+\DeclareFontShape{TS1}{yvt}{eb}{scit}{<->ssub * yvt/eb/sc}{}
+\DeclareFontShape{TS1}{yvt}{eb}{scsl}{<->ssub * yvt/eb/scit}{}
+\DeclareFontShape{TS1}{yvt}{eb}{si}{<->ssub * yvt/eb/scsl}{}
+\DeclareFontShape{TS1}{yvt}{eb}{sl}{<->ssub * yvt/eb/it}{}
+\DeclareFontShape{TS1}{yvt}{c}{sl}{<->ssub * yvt/c/it}{}
+\DeclareFontShape{TS1}{yvt}{c}{scsl}{<->ssub * yvt/c/scit}{}
+\DeclareFontShape{TS1}{yvt}{c}{si}{<->ssub * yvt/c/scsl}{}
+\DeclareFontShape{TS1}{yvt}{bc}{sl}{<->ssub * yvt/bc/it}{}
+\DeclareFontShape{TS1}{yvt}{bc}{scsl}{<->ssub * yvt/bc/scit}{}
+\DeclareFontShape{TS1}{yvt}{bc}{si}{<->ssub * yvt/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtajw.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtajw.fd
new file mode 100644
index 00000000000..45a558ab84d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtajw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yvtajw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtajw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtajw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtajw}{}
+
+\DeclareFontShape{TS1}{yvtajw}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtajw}{m}{sl}{<->ssub * yvtajw/m/it}{}
+\DeclareFontShape{TS1}{yvtajw}{m}{scsl}{<->ssub * yvtajw/m/scit}{}
+\DeclareFontShape{TS1}{yvtajw}{m}{si}{<->ssub * yvtajw/m/scsl}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{n}{<->ssub * yvtajw/b/n}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{sc}{<->ssub * yvtajw/b/sc}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{it}{<->ssub * yvtajw/b/it}{}
+\DeclareFontShape{TS1}{yvtajw}{b}{sl}{<->ssub * yvtajw/b/it}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{sl}{<->ssub * yvtajw/b/sl}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{scit}{<->ssub * yvtajw/b/scit}{}
+\DeclareFontShape{TS1}{yvtajw}{b}{scsl}{<->ssub * yvtajw/b/scit}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{scsl}{<->ssub * yvtajw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtajw}{b}{si}{<->ssub * yvtajw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtajw}{bx}{si}{<->ssub * yvtajw/b/si}{}
+\DeclareFontShape{TS1}{yvtajw}{c}{sl}{<->ssub * yvtajw/c/it}{}
+\DeclareFontShape{TS1}{yvtajw}{c}{scsl}{<->ssub * yvtajw/c/scit}{}
+\DeclareFontShape{TS1}{yvtajw}{c}{si}{<->ssub * yvtajw/c/scsl}{}
+\DeclareFontShape{TS1}{yvtajw}{bc}{sl}{<->ssub * yvtajw/bc/it}{}
+\DeclareFontShape{TS1}{yvtajw}{bc}{scsl}{<->ssub * yvtajw/bc/scit}{}
+\DeclareFontShape{TS1}{yvtajw}{bc}{si}{<->ssub * yvtajw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtaw.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtaw.fd
new file mode 100644
index 00000000000..8736f1e3d50
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtaw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yvtaw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtaw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtaw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtaw}{}
+
+\DeclareFontShape{TS1}{yvtaw}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtaw}{m}{sl}{<->ssub * yvtaw/m/it}{}
+\DeclareFontShape{TS1}{yvtaw}{m}{scsl}{<->ssub * yvtaw/m/scit}{}
+\DeclareFontShape{TS1}{yvtaw}{m}{si}{<->ssub * yvtaw/m/scsl}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{n}{<->ssub * yvtaw/b/n}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{sc}{<->ssub * yvtaw/b/sc}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{it}{<->ssub * yvtaw/b/it}{}
+\DeclareFontShape{TS1}{yvtaw}{b}{sl}{<->ssub * yvtaw/b/it}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{sl}{<->ssub * yvtaw/b/sl}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{scit}{<->ssub * yvtaw/b/scit}{}
+\DeclareFontShape{TS1}{yvtaw}{b}{scsl}{<->ssub * yvtaw/b/scit}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{scsl}{<->ssub * yvtaw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtaw}{b}{si}{<->ssub * yvtaw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtaw}{bx}{si}{<->ssub * yvtaw/b/si}{}
+\DeclareFontShape{TS1}{yvtaw}{c}{sl}{<->ssub * yvtaw/c/it}{}
+\DeclareFontShape{TS1}{yvtaw}{c}{scsl}{<->ssub * yvtaw/c/scit}{}
+\DeclareFontShape{TS1}{yvtaw}{c}{si}{<->ssub * yvtaw/c/scsl}{}
+\DeclareFontShape{TS1}{yvtaw}{bc}{sl}{<->ssub * yvtaw/bc/it}{}
+\DeclareFontShape{TS1}{yvtaw}{bc}{scsl}{<->ssub * yvtaw/bc/scit}{}
+\DeclareFontShape{TS1}{yvtaw}{bc}{si}{<->ssub * yvtaw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtd.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtd.fd
new file mode 100644
index 00000000000..9880c3f23ea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtd.fd
@@ -0,0 +1,97 @@
+%Filename: ts1yvtd.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtd.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtd.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtd}{}
+
+\DeclareFontShape{TS1}{yvtd}{bc}{sc}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{m}{sc}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{c}{sc}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{b}{sc}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{eb}{sc}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{m}{ol}{
+ <-> \yvt@@scale yvtrdl8c
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{c}{ol}{
+ <-> \yvt@@scale yvtrdl8c
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{bc}{ol}{
+ <-> \yvt@@scale yvtrdl8c
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{b}{ol}{
+ <-> \yvt@@scale yvtrdl8c
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{c}{n}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{m}{n}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{bc}{n}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{b}{n}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{eb}{n}{
+ <-> \yvt@@scale yvtbd8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtd}{bc}{scit}{<->ssub * yvtd/bc/sc}{}
+\DeclareFontShape{TS1}{yvtd}{bc}{scsl}{<->ssub * yvtd/bc/scit}{}
+\DeclareFontShape{TS1}{yvtd}{bc}{si}{<->ssub * yvtd/bc/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{m}{scit}{<->ssub * yvtd/m/sc}{}
+\DeclareFontShape{TS1}{yvtd}{m}{scsl}{<->ssub * yvtd/m/scit}{}
+\DeclareFontShape{TS1}{yvtd}{m}{si}{<->ssub * yvtd/m/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{c}{scit}{<->ssub * yvtd/c/sc}{}
+\DeclareFontShape{TS1}{yvtd}{c}{scsl}{<->ssub * yvtd/c/scit}{}
+\DeclareFontShape{TS1}{yvtd}{c}{si}{<->ssub * yvtd/c/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{sc}{<->ssub * yvtd/b/sc}{}
+\DeclareFontShape{TS1}{yvtd}{b}{scit}{<->ssub * yvtd/b/sc}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{scit}{<->ssub * yvtd/b/scit}{}
+\DeclareFontShape{TS1}{yvtd}{b}{scsl}{<->ssub * yvtd/b/scit}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{scsl}{<->ssub * yvtd/b/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{b}{si}{<->ssub * yvtd/b/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{si}{<->ssub * yvtd/b/si}{}
+\DeclareFontShape{TS1}{yvtd}{eb}{scit}{<->ssub * yvtd/eb/sc}{}
+\DeclareFontShape{TS1}{yvtd}{eb}{scsl}{<->ssub * yvtd/eb/scit}{}
+\DeclareFontShape{TS1}{yvtd}{eb}{si}{<->ssub * yvtd/eb/scsl}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{ol}{<->ssub * yvtd/b/ol}{}
+\DeclareFontShape{TS1}{yvtd}{bx}{n}{<->ssub * yvtd/b/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtj.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtj.fd
new file mode 100644
index 00000000000..606b774992b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtj.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yvtj.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtj.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtj.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtj}{}
+
+\DeclareFontShape{TS1}{yvtj}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtj}{m}{sl}{<->ssub * yvtj/m/it}{}
+\DeclareFontShape{TS1}{yvtj}{m}{scsl}{<->ssub * yvtj/m/scit}{}
+\DeclareFontShape{TS1}{yvtj}{m}{si}{<->ssub * yvtj/m/scsl}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{n}{<->ssub * yvtj/b/n}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{sc}{<->ssub * yvtj/b/sc}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{it}{<->ssub * yvtj/b/it}{}
+\DeclareFontShape{TS1}{yvtj}{b}{sl}{<->ssub * yvtj/b/it}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{sl}{<->ssub * yvtj/b/sl}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{scit}{<->ssub * yvtj/b/scit}{}
+\DeclareFontShape{TS1}{yvtj}{b}{scsl}{<->ssub * yvtj/b/scit}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{scsl}{<->ssub * yvtj/b/scsl}{}
+\DeclareFontShape{TS1}{yvtj}{b}{si}{<->ssub * yvtj/b/scsl}{}
+\DeclareFontShape{TS1}{yvtj}{bx}{si}{<->ssub * yvtj/b/si}{}
+\DeclareFontShape{TS1}{yvtj}{c}{sl}{<->ssub * yvtj/c/it}{}
+\DeclareFontShape{TS1}{yvtj}{c}{scsl}{<->ssub * yvtj/c/scit}{}
+\DeclareFontShape{TS1}{yvtj}{c}{si}{<->ssub * yvtj/c/scsl}{}
+\DeclareFontShape{TS1}{yvtj}{bc}{sl}{<->ssub * yvtj/bc/it}{}
+\DeclareFontShape{TS1}{yvtj}{bc}{scsl}{<->ssub * yvtj/bc/scit}{}
+\DeclareFontShape{TS1}{yvtj}{bc}{si}{<->ssub * yvtj/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtjw.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtjw.fd
new file mode 100644
index 00000000000..52b4279e32f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtjw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yvtjw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtjw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtjw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtjw}{}
+
+\DeclareFontShape{TS1}{yvtjw}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtjw}{m}{sl}{<->ssub * yvtjw/m/it}{}
+\DeclareFontShape{TS1}{yvtjw}{m}{scsl}{<->ssub * yvtjw/m/scit}{}
+\DeclareFontShape{TS1}{yvtjw}{m}{si}{<->ssub * yvtjw/m/scsl}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{n}{<->ssub * yvtjw/b/n}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{sc}{<->ssub * yvtjw/b/sc}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{it}{<->ssub * yvtjw/b/it}{}
+\DeclareFontShape{TS1}{yvtjw}{b}{sl}{<->ssub * yvtjw/b/it}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{sl}{<->ssub * yvtjw/b/sl}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{scit}{<->ssub * yvtjw/b/scit}{}
+\DeclareFontShape{TS1}{yvtjw}{b}{scsl}{<->ssub * yvtjw/b/scit}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{scsl}{<->ssub * yvtjw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtjw}{b}{si}{<->ssub * yvtjw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtjw}{bx}{si}{<->ssub * yvtjw/b/si}{}
+\DeclareFontShape{TS1}{yvtjw}{c}{sl}{<->ssub * yvtjw/c/it}{}
+\DeclareFontShape{TS1}{yvtjw}{c}{scsl}{<->ssub * yvtjw/c/scit}{}
+\DeclareFontShape{TS1}{yvtjw}{c}{si}{<->ssub * yvtjw/c/scsl}{}
+\DeclareFontShape{TS1}{yvtjw}{bc}{sl}{<->ssub * yvtjw/bc/it}{}
+\DeclareFontShape{TS1}{yvtjw}{bc}{scsl}{<->ssub * yvtjw/bc/scit}{}
+\DeclareFontShape{TS1}{yvtjw}{bc}{si}{<->ssub * yvtjw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/ts1yvtw.fd b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtw.fd
new file mode 100644
index 00000000000..c24428ff5af
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/venturisadf/ts1yvtw.fd
@@ -0,0 +1,103 @@
+%Filename: ts1yvtw.fd
+%Created by: tex yvt-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1yvtw.fd}
+ [2024/08/17 Fontinst v1.933 font definitions for TS1/yvtw.]
+
+% addaswyd o t1phv.fd (dyddiad y ffeil fd: 2020-03-25)
+\expandafter\ifx\csname yvt@scale\endcsname\relax
+ \let\yvt@@scale\@empty
+\else
+ \edef\yvt@@scale{s*[\csname yvt@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{yvtw}{}
+
+\DeclareFontShape{TS1}{yvtw}{m}{n}{
+ <-> \yvt@@scale yvtr8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{m}{sc}{
+ <-> \yvt@@scale yvtrc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{m}{it}{
+ <-> \yvt@@scale yvtri8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{m}{scit}{
+ <-> \yvt@@scale yvtrci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{b}{n}{
+ <-> \yvt@@scale yvtb8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{b}{sc}{
+ <-> \yvt@@scale yvtbc8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{b}{it}{
+ <-> \yvt@@scale yvtbi8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{b}{scit}{
+ <-> \yvt@@scale yvtbci8c
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{c}{n}{
+ <-> \yvt@@scale yvtr8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{c}{sc}{
+ <-> \yvt@@scale yvtrc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{c}{it}{
+ <-> \yvt@@scale yvtri8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{c}{scit}{
+ <-> \yvt@@scale yvtrci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{bc}{n}{
+ <-> \yvt@@scale yvtb8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{bc}{sc}{
+ <-> \yvt@@scale yvtbc8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{bc}{it}{
+ <-> \yvt@@scale yvtbi8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{bc}{scit}{
+ <-> \yvt@@scale yvtbci8cc
+}{}
+
+\DeclareFontShape{TS1}{yvtw}{m}{sl}{<->ssub * yvtw/m/it}{}
+\DeclareFontShape{TS1}{yvtw}{m}{scsl}{<->ssub * yvtw/m/scit}{}
+\DeclareFontShape{TS1}{yvtw}{m}{si}{<->ssub * yvtw/m/scsl}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{n}{<->ssub * yvtw/b/n}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{sc}{<->ssub * yvtw/b/sc}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{it}{<->ssub * yvtw/b/it}{}
+\DeclareFontShape{TS1}{yvtw}{b}{sl}{<->ssub * yvtw/b/it}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{sl}{<->ssub * yvtw/b/sl}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{scit}{<->ssub * yvtw/b/scit}{}
+\DeclareFontShape{TS1}{yvtw}{b}{scsl}{<->ssub * yvtw/b/scit}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{scsl}{<->ssub * yvtw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtw}{b}{si}{<->ssub * yvtw/b/scsl}{}
+\DeclareFontShape{TS1}{yvtw}{bx}{si}{<->ssub * yvtw/b/si}{}
+\DeclareFontShape{TS1}{yvtw}{c}{sl}{<->ssub * yvtw/c/it}{}
+\DeclareFontShape{TS1}{yvtw}{c}{scsl}{<->ssub * yvtw/c/scit}{}
+\DeclareFontShape{TS1}{yvtw}{c}{si}{<->ssub * yvtw/c/scsl}{}
+\DeclareFontShape{TS1}{yvtw}{bc}{sl}{<->ssub * yvtw/bc/it}{}
+\DeclareFontShape{TS1}{yvtw}{bc}{scsl}{<->ssub * yvtw/bc/scit}{}
+\DeclareFontShape{TS1}{yvtw}{bc}{si}{<->ssub * yvtw/bc/scsl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturis.sty b/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
index d746f39c7cb..c6d46951e47 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
@@ -1,73 +1,105 @@
-%% Copyright 2010 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `venturis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% venturis.dtx (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%%
+%% 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 Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% venturisadf. You may however distribute the package venturisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturis}[2010/07/03 v1.005 VenturisADF PS]
-\RequirePackage{xkeyval}
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: venturis.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v2.0 \revinfo for VenturisADF PS 1.005]
+\DefineFileInfoSVN[venturis]
\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
-%:boolkeys for roman osf/lf
-\define@boolkey{venturis.sty}[venturis@]{osf}[true]{%
- \ifventuris@osf
- \def\venturis@lfosf{j}%
- \else
- \def\venturis@lfosf{}%
- \fi}
-\define@boolkey{venturis.sty}[venturis@]{lf}[true]{%
- \ifventuris@lf
- \def\venturis@lfosf{}%
- \else
- \def\venturis@lfosf{j}%
- \fi}
-
-%:defaults to ensure everything is defined to something
-\ExecuteOptionsX{osf=true}
-
-%:options override defaults
-\ProcessOptionsX
-
-%:make Venturis default for roman text, implementing the relevant option
-\renewcommand{\rmdefault}{yvt\venturis@lfosf}
-%:make Venturis Sans default for sans-serif text
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yvt}{1}%
+ \DeclareEncodingSubset{TS1}{yvtj}{1}%
+ \DeclareEncodingSubset{TS1}{yvtw}{1}%
+ \DeclareEncodingSubset{TS1}{yvtaw}{1}%
+ \DeclareEncodingSubset{TS1}{yvtjw}{1}%
+ \DeclareEncodingSubset{TS1}{yvtajw}{1}%
+ \DeclareEncodingSubset{TS1}{yvtd}{1}%
+ \DeclareEncodingSubset{TS1}{yv1}{1}%
+ \DeclareEncodingSubset{TS1}{yv1d}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { venturis }
+{
+ lf .bool_set_inverse:N = \l__venturis_osf_bool,
+ lf .default:n = true,
+ osf .bool_set:N = \l__venturis_osf_bool,
+ osf .default:n = true,
+ osf .initial:n = true,
+ scale ~ rm .tl_set:N = \yvt@scale,
+ scale ~ rm .initial:V = \@empty,
+ scale ~ sf .tl_set:N = \yvi@scale,
+ scale ~ sf .initial:V = \@empty,
+ scale .code:n = {
+ \gdef\yvt@scale{#1}
+ \gdef\yvi@scale{#1}
+ },
+}
+\ProcessKeyOptions[venturis]
+\bool_if:NTF \l__venturis_osf_bool
+{
+ \cs_set:Npn \rmdefault { yvtj }
+}{
+ \cs_set:Npn \rmdefault { yvt }
+}
+\ExplSyntaxOff
\renewcommand{\sfdefault}{yv1}
-
-%:introduce special titling commands
\DeclareRobustCommand{\vtstyle}[1][]{%
- \edef\vt@shape{#1}%
- \def\tempo{ol}%
- \def\temps{yv1}%
- \def\tempr{yvt}%
- \not@math@alphabet\vtstyle\relax
-%:because the titling fonts have limited availability, don't use the \tistyle set-up, but choose the family explicitly in case we're currently using sans or typewriter - note, though, that some are also called as small-caps commands in certain sans-serif variants (though the seriffed variant seems not to match anything...)
- \ifx\vt@shape\tempo
- \fontfamily{yvtd}\fontshape{ol}\selectfont
- \else
- \edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
- \ifx\tempf\temps
- \fontfamily{yv1d}\selectfont
- \else
- \ifx\tempf\tempr
- \fontfamily{yvtd}\selectfont
- \else
- \PackageWarning{venturis.sty}{\tempf is unknown. This command requires that yv1 or yvt be active in order to determine whether serif or sans-serif titling is required. I am going to guess that you want serif titling. If this is wrong, be sure to activate yv1 first or copy and adapt the styling command from venturis.sty.}%
- \fontfamily{yvtd}\selectfont
- \fi
- \fi
- \fi
- }
+\edef\vt@shape{#1}%
+\def\tempo{ol}%
+\def\temps{yv1}%
+\def\tempr{yvt}%
+\not@math@alphabet\vtstyle\relax
+\ifx\vt@shape\tempo
+\fontfamily{yvtd}\fontshape{ol}\selectfont
+\else
+\edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
+\ifx\tempf\temps
+\fontfamily{yv1d}\selectfont
+\else
+\ifx\tempf\tempr
+\fontfamily{yvtd}\selectfont
+\else
+\PackageWarning{venturis.sty}{%
+ \tempf is unknown.
+ This command requires that yv1 or yvt be active in order to determine whether serif or sans-serif titling is required.
+ I am going to guess that you want serif titling. If this is wrong, be sure to activate yv1 first or copy and adapt the styling command from venturis.sty.%
+ }%
+\fontfamily{yvtd}\selectfont
+\fi
+\fi
+\fi
+}
\DeclareTextFontCommand{\textvt}{\vtstyle}
\DeclareTextFontCommand{\textvtl}{\vtstyle[ol]}
+%% end venturis.sty
\endinput
+%%
+%% End of file `venturis.sty'.
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty b/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
index e28fcbaef45..0bf9ebdec49 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
@@ -1,50 +1,89 @@
-%% Copyright 2010 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `venturis2.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% venturis2.dtx (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%%
+%% 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 Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% venturisadf. You may however distribute the package venturisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturis2}[2010/07/03 v1.005 VenturisADFNo2 PS]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: venturis2.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v2.0 \revinfo for VenturisADFNo2 PS 1.005]
+\DefineFileInfoSVN[venturisii]
\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yv2}{1}%
+ \DeclareEncodingSubset{TS1}{yv3}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { venturis ii }
+{
+ scale ~ rm .tl_set:N = \yvii@scale,
+ scale ~ rm .initial:V = \@empty,
+ scale ~ sf .tl_set:N = \yviii@scale,
+ scale ~ sf .initial:V = \@empty,
+ scale .code:n = {
+ \gdef\yvii@scale{#1}
+ \gdef\yviii@scale{#1}
+ },
+}
+\ProcessKeyOptions[venturis ii]
+\ExplSyntaxOff
\renewcommand{\rmdefault}{yv2}
\renewcommand{\sfdefault}{yv3}
-%:introduce special titling commands
\DeclareRobustCommand{\vtstyle}[1][]{%
- \edef\vt@shape{#1}%
- \def\tempo{ol}%
- \def\temps{yv3}%
- \def\tempr{yv2}%
- \not@math@alphabet\vtstyle\relax
-%:because the titling fonts have limited availability, don't use the \tistyle set-up which won't work with venturis2 in any case, but choose the family explicitly in case we're currently using sans or typewriter
+\edef\vt@shape{#1}%
+\def\tempo{ol}%
+\def\temps{yv3}%
+\def\tempr{yv2}%
+\not@math@alphabet\vtstyle\relax
\ifx\vt@shape\tempo
- \fontfamily{yvtd}\fontshape{ol}\selectfont
- \else
- \edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
- \ifx\tempf\temps
- \fontfamily{yv1d}\selectfont
- \else
- \ifx\tempf\tempr
- \fontfamily{yvtd}\selectfont
- \else
- \PackageWarning{venturis.sty}{\tempf is unknown. This command requires that yv2 or yv3 be active in order to determine whether serif or sans-serif titling is required. I am going to guess that you want serif titling. If this is wrong, be sure to activate yv3 first or copy and adapt the styling command from venturis.sty.}%
- \fontfamily{yvtd}\selectfont
- \fi
- \fi
- \fi
- }
+\fontfamily{yvtd}\fontshape{ol}\selectfont
+\else
+\edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
+\ifx\tempf\temps
+\fontfamily{yv1d}\selectfont
+\else
+\ifx\tempf\tempr
+\fontfamily{yvtd}\selectfont
+\else
+\PackageWarning{venturis.sty}{%
+ \tempf is unknown.
+ This command requires that yv2 or yv3 be active in order to determine whether serif or sans-serif titling is required.
+ I am going to guess that you want serif titling.
+ If this is wrong, be sure to activate yv3 first or copy and adapt the styling command from venturis.sty.%
+ }%
+\fontfamily{yvtd}\selectfont
+\fi
+\fi
+\fi
+}
\DeclareTextFontCommand{\textvt}{\vtstyle}
\DeclareTextFontCommand{\textvtl}{\vtstyle[ol]}
-
+%% end venturis2.sty
\endinput
+%%
+%% End of file `venturis2.sty'.
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty b/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
index 0fa213688d7..cabac96cba2 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
@@ -1,30 +1,60 @@
-%% Copyright 2010 Clea F. Rees
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clea F. Rees.
-%
-% This work consists of all files listed in manifest.txt.
+%%
+%% This is file `venturisold.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% venturisold.dtx (with options: `sty')
+%% Copyright (C) 2008-2024 Clea F. Rees.
+%%
+%% 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 Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% venturisadf. You may however distribute the package venturisadf without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturisold}[2010/07/03 v1.005 VenturisOldADF PS]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: venturisold.dtx 10366 2024-09-18 14:25:21Z cfrees $}[v2.0 \revinfo (for VenturisOldADF PS 1.005)]
+\DefineFileInfoSVN[venturisold]
\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{nfssext-cfr}
-%:Make Venturis Old default for roman text
+\RequirePackage{nfssext-cfr}[2024/01/01]
+\IfFormatAtLeastTF {2020-02-02}{%
+ \DeclareEncodingSubset{TS1}{yvo}{1}%
+ \DeclareEncodingSubset{TS1}{yvoa}{1}%
+ \DeclareEncodingSubset{TS1}{yvod}{1}%
+ \DeclareEncodingSubset{TS1}{yvoad}{1}%
+}{%
+ \RequirePackage{textcomp}}
+\UndeclareTextCommand{\textperthousand}{T1}
+\ExplSyntaxOn
+\keys_define:nn { venturisold }
+{
+ scale .tl_set:N = \yvo@scale,
+ scale .initial:V = \@empty,
+}
+\ProcessKeyOptions[venturisold]
+\ExplSyntaxOff
\renewcommand{\rmdefault}{yvo}
-%:introduce special titling commands
-\DeclareRobustCommand{\vtstyle}[1][]{% allow an optional argument for consistency with venturis.sty
- \not@math@alphabet\vtstyle\relax
- \fontfamily{yvod}\selectfont}
+\DeclareRobustCommand{\vtstyle}[1][]{%
+\not@math@alphabet\vtstyle\relax
+\fontfamily{yvod}\selectfont}
\DeclareTextFontCommand{\textvt}{\vtstyle}
\DeclareTextFontCommand{\textvtl}{\vtstyle}
+%% end venturis.sty
\endinput
-%% end venturisold.sty
+%%
+%% End of file `venturisold.sty'.
diff --git a/Master/texmf-dist/tex/latex/venturisold/t1yvoad.fd b/Master/texmf-dist/tex/latex/venturisold/t1yvoad.fd
deleted file mode 100644
index 7206dc69122..00000000000
--- a/Master/texmf-dist/tex/latex/venturisold/t1yvoad.fd
+++ /dev/null
@@ -1,31 +0,0 @@
-%Filename: t1yvoad.fd
-%Created by: tex yvo-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvoad.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvoad.]
-
-\DeclareFontFamily{T1}{yvoad}{}
-
-\DeclareFontShape{T1}{yvoad}{db}{sc}{
- <-> yvodd8t
-}{}
-
-\DeclareFontShape{T1}{yvoad}{db}{n}{
- <-> yvodd8t
-}{}
-
-\DeclareFontShape{T1}{yvoad}{b}{sc}{<->ssub * yvoad/db/sc}{}
-\DeclareFontShape{T1}{yvoad}{bx}{sc}{<->ssub * yvoad/b/sc}{}
-\DeclareFontShape{T1}{yvoad}{m}{sc}{<->ssub * yvoad/bx/sc}{}
-\DeclareFontShape{T1}{yvoad}{db}{si}{<->ssub * yvoad/db/sc}{}
-\DeclareFontShape{T1}{yvoad}{b}{si}{<->ssub * yvoad/db/si}{}
-\DeclareFontShape{T1}{yvoad}{bx}{si}{<->ssub * yvoad/b/si}{}
-\DeclareFontShape{T1}{yvoad}{m}{si}{<->ssub * yvoad/bx/si}{}
-\DeclareFontShape{T1}{yvoad}{b}{n}{<->ssub * yvoad/db/n}{}
-\DeclareFontShape{T1}{yvoad}{bx}{n}{<->ssub * yvoad/b/n}{}
-\DeclareFontShape{T1}{yvoad}{m}{n}{<->ssub * yvoad/bx/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisold/t1yvod.fd b/Master/texmf-dist/tex/latex/venturisold/t1yvod.fd
deleted file mode 100644
index 1220e211a1b..00000000000
--- a/Master/texmf-dist/tex/latex/venturisold/t1yvod.fd
+++ /dev/null
@@ -1,31 +0,0 @@
-%Filename: t1yvod.fd
-%Created by: tex yvo-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yvod.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yvod.]
-
-\DeclareFontFamily{T1}{yvod}{}
-
-\DeclareFontShape{T1}{yvod}{db}{sc}{
- <-> yvodd8t
-}{}
-
-\DeclareFontShape{T1}{yvod}{db}{n}{
- <-> yvodd8t
-}{}
-
-\DeclareFontShape{T1}{yvod}{b}{sc}{<->ssub * yvod/db/sc}{}
-\DeclareFontShape{T1}{yvod}{bx}{sc}{<->ssub * yvod/b/sc}{}
-\DeclareFontShape{T1}{yvod}{m}{sc}{<->ssub * yvod/bx/sc}{}
-\DeclareFontShape{T1}{yvod}{db}{si}{<->ssub * yvod/db/sc}{}
-\DeclareFontShape{T1}{yvod}{b}{si}{<->ssub * yvod/db/si}{}
-\DeclareFontShape{T1}{yvod}{bx}{si}{<->ssub * yvod/b/si}{}
-\DeclareFontShape{T1}{yvod}{m}{si}{<->ssub * yvod/bx/si}{}
-\DeclareFontShape{T1}{yvod}{b}{n}{<->ssub * yvod/db/n}{}
-\DeclareFontShape{T1}{yvod}{bx}{n}{<->ssub * yvod/b/n}{}
-\DeclareFontShape{T1}{yvod}{m}{n}{<->ssub * yvod/bx/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisold/ts1yvoad.fd b/Master/texmf-dist/tex/latex/venturisold/ts1yvoad.fd
deleted file mode 100644
index 8b9b3060588..00000000000
--- a/Master/texmf-dist/tex/latex/venturisold/ts1yvoad.fd
+++ /dev/null
@@ -1,31 +0,0 @@
-%Filename: ts1yvoad.fd
-%Created by: tex yvo-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvoad.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvoad.]
-
-\DeclareFontFamily{TS1}{yvoad}{}
-
-\DeclareFontShape{TS1}{yvoad}{db}{sc}{
- <-> yvodd8c
-}{}
-
-\DeclareFontShape{TS1}{yvoad}{db}{n}{
- <-> yvodd8c
-}{}
-
-\DeclareFontShape{TS1}{yvoad}{b}{sc}{<->ssub * yvoad/db/sc}{}
-\DeclareFontShape{TS1}{yvoad}{bx}{sc}{<->ssub * yvoad/b/sc}{}
-\DeclareFontShape{TS1}{yvoad}{m}{sc}{<->ssub * yvoad/bx/sc}{}
-\DeclareFontShape{TS1}{yvoad}{db}{si}{<->ssub * yvoad/db/sc}{}
-\DeclareFontShape{TS1}{yvoad}{b}{si}{<->ssub * yvoad/db/si}{}
-\DeclareFontShape{TS1}{yvoad}{bx}{si}{<->ssub * yvoad/b/si}{}
-\DeclareFontShape{TS1}{yvoad}{m}{si}{<->ssub * yvoad/bx/si}{}
-\DeclareFontShape{TS1}{yvoad}{b}{n}{<->ssub * yvoad/db/n}{}
-\DeclareFontShape{TS1}{yvoad}{bx}{n}{<->ssub * yvoad/b/n}{}
-\DeclareFontShape{TS1}{yvoad}{m}{n}{<->ssub * yvoad/bx/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisold/ts1yvod.fd b/Master/texmf-dist/tex/latex/venturisold/ts1yvod.fd
deleted file mode 100644
index 3fb6f9dd57b..00000000000
--- a/Master/texmf-dist/tex/latex/venturisold/ts1yvod.fd
+++ /dev/null
@@ -1,31 +0,0 @@
-%Filename: ts1yvod.fd
-%Created by: tex yvo-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yvod.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yvod.]
-
-\DeclareFontFamily{TS1}{yvod}{}
-
-\DeclareFontShape{TS1}{yvod}{db}{sc}{
- <-> yvodd8c
-}{}
-
-\DeclareFontShape{TS1}{yvod}{db}{n}{
- <-> yvodd8c
-}{}
-
-\DeclareFontShape{TS1}{yvod}{b}{sc}{<->ssub * yvod/db/sc}{}
-\DeclareFontShape{TS1}{yvod}{bx}{sc}{<->ssub * yvod/b/sc}{}
-\DeclareFontShape{TS1}{yvod}{m}{sc}{<->ssub * yvod/bx/sc}{}
-\DeclareFontShape{TS1}{yvod}{db}{si}{<->ssub * yvod/db/sc}{}
-\DeclareFontShape{TS1}{yvod}{b}{si}{<->ssub * yvod/db/si}{}
-\DeclareFontShape{TS1}{yvod}{bx}{si}{<->ssub * yvod/b/si}{}
-\DeclareFontShape{TS1}{yvod}{m}{si}{<->ssub * yvod/bx/si}{}
-\DeclareFontShape{TS1}{yvod}{b}{n}{<->ssub * yvod/db/n}{}
-\DeclareFontShape{TS1}{yvod}{bx}{n}{<->ssub * yvod/b/n}{}
-\DeclareFontShape{TS1}{yvod}{m}{n}{<->ssub * yvod/bx/n}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans/t1yv1.fd b/Master/texmf-dist/tex/latex/venturissans/t1yv1.fd
deleted file mode 100644
index b6d4ca743a4..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans/t1yv1.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%Filename: t1yv1.fd
-%Created by: tex yv1-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yv1.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yv1.]
-
-\DeclareFontFamily{T1}{yv1}{}
-
-\DeclareFontShape{T1}{yv1}{m}{n}{
- <-> yv1r8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{m}{it}{
- <-> yv1ri8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{b}{n}{
- <-> yv1b8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{b}{it}{
- <-> yv1bi8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{eb}{n}{
- <-> yv1h8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{eb}{sl}{
- <-> yv1ho8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{eb}{it}{
- <-> yv1ho8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{mc}{n}{
- <-> yv1r8tc
-}{}
-
-\DeclareFontShape{T1}{yv1}{mc}{it}{
- <-> yv1ri8tc
-}{}
-
-\DeclareFontShape{T1}{yv1}{bc}{n}{
- <-> yv1b8tc
-}{}
-
-\DeclareFontShape{T1}{yv1}{bc}{it}{
- <-> yv1bi8tc
-}{}
-
-\DeclareFontShape{T1}{yv1}{mx}{n}{
- <-> yv1r8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{mx}{it}{
- <-> yv1ri8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{bx}{n}{
- <-> yv1b8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{bx}{sc}{
- <-> yv1b8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{bx}{it}{
- <-> yv1bi8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{bx}{sl}{
- <-> yv1bi8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{bx}{si}{
- <-> yv1b8tx
-}{}
-
-\DeclareFontShape{T1}{yv1}{l}{n}{
- <-> yv1l8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{l}{it}{
- <-> yv1li8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{db}{n}{
- <-> yv1d8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{db}{it}{
- <-> yv1di8t
-}{}
-
-\DeclareFontShape{T1}{yv1}{m}{sc}{<->ssub * yv1/m/n}{}
-\DeclareFontShape{T1}{yv1}{m}{si}{<->ssub * yv1/m/sc}{}
-\DeclareFontShape{T1}{yv1}{m}{sl}{<->ssub * yv1/m/it}{}
-\DeclareFontShape{T1}{yv1}{b}{sc}{<->ssub * yv1/b/n}{}
-\DeclareFontShape{T1}{yv1}{b}{si}{<->ssub * yv1/b/sc}{}
-\DeclareFontShape{T1}{yv1}{b}{sl}{<->ssub * yv1/b/it}{}
-\DeclareFontShape{T1}{yv1}{eb}{sc}{<->ssub * yv1/eb/n}{}
-\DeclareFontShape{T1}{yv1}{eb}{si}{<->ssub * yv1/eb/sc}{}
-\DeclareFontShape{T1}{yv1}{muc}{n}{<->ssub * yv1/mc/n}{}
-\DeclareFontShape{T1}{yv1}{mc}{sc}{<->ssub * yv1/mc/n}{}
-\DeclareFontShape{T1}{yv1}{muc}{sc}{<->ssub * yv1/mc/sc}{}
-\DeclareFontShape{T1}{yv1}{mc}{si}{<->ssub * yv1/mc/sc}{}
-\DeclareFontShape{T1}{yv1}{muc}{si}{<->ssub * yv1/mc/si}{}
-\DeclareFontShape{T1}{yv1}{muc}{it}{<->ssub * yv1/mc/it}{}
-\DeclareFontShape{T1}{yv1}{mc}{sl}{<->ssub * yv1/mc/it}{}
-\DeclareFontShape{T1}{yv1}{muc}{sl}{<->ssub * yv1/mc/sl}{}
-\DeclareFontShape{T1}{yv1}{bc}{sc}{<->ssub * yv1/bc/n}{}
-\DeclareFontShape{T1}{yv1}{bc}{si}{<->ssub * yv1/bc/sc}{}
-\DeclareFontShape{T1}{yv1}{bc}{sl}{<->ssub * yv1/bc/it}{}
-\DeclareFontShape{T1}{yv1}{mx}{sc}{<->ssub * yv1/mx/n}{}
-\DeclareFontShape{T1}{yv1}{mx}{si}{<->ssub * yv1/mx/sc}{}
-\DeclareFontShape{T1}{yv1}{mx}{sl}{<->ssub * yv1/mx/it}{}
-\DeclareFontShape{T1}{yv1}{l}{sc}{<->ssub * yv1/l/n}{}
-\DeclareFontShape{T1}{yv1}{l}{si}{<->ssub * yv1/l/sc}{}
-\DeclareFontShape{T1}{yv1}{l}{sl}{<->ssub * yv1/l/it}{}
-\DeclareFontShape{T1}{yv1}{dbuc}{n}{<->ssub * yv1/db/n}{}
-\DeclareFontShape{T1}{yv1}{db}{sc}{<->ssub * yv1/db/n}{}
-\DeclareFontShape{T1}{yv1}{dbuc}{sc}{<->ssub * yv1/db/sc}{}
-\DeclareFontShape{T1}{yv1}{db}{si}{<->ssub * yv1/db/sc}{}
-\DeclareFontShape{T1}{yv1}{dbuc}{si}{<->ssub * yv1/db/si}{}
-\DeclareFontShape{T1}{yv1}{dbuc}{it}{<->ssub * yv1/db/it}{}
-\DeclareFontShape{T1}{yv1}{db}{sl}{<->ssub * yv1/db/it}{}
-\DeclareFontShape{T1}{yv1}{dbuc}{sl}{<->ssub * yv1/db/sl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans/t1yv1d.fd b/Master/texmf-dist/tex/latex/venturissans/t1yv1d.fd
deleted file mode 100644
index fc0b0dc3d39..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans/t1yv1d.fd
+++ /dev/null
@@ -1,106 +0,0 @@
-%Filename: t1yv1d.fd
-%Created by: tex yv1-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yv1d.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yv1d.]
-
-\DeclareFontFamily{T1}{yv1d}{}
-
-\DeclareFontShape{T1}{yv1d}{b}{sc}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{eb}{sc}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{bc}{sc}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{db}{sc}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{b}{n}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{eb}{n}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{bc}{n}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{db}{n}{
- <-> yv1bd8t
-}{}
-
-\DeclareFontShape{T1}{yv1d}{dbuc}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{mx}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{m}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{mc}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{muc}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{l}{sc}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{dbuc}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{mx}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{m}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{mc}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{muc}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{l}{n}{
- <-> yv1dd8tu
-}{}
-
-\DeclareFontShape{T1}{yv1d}{bx}{sc}{<->ssub * yv1d/b/sc}{}
-\DeclareFontShape{T1}{yv1d}{b}{si}{<->ssub * yv1d/b/sc}{}
-\DeclareFontShape{T1}{yv1d}{bx}{si}{<->ssub * yv1d/b/si}{}
-\DeclareFontShape{T1}{yv1d}{eb}{si}{<->ssub * yv1d/eb/sc}{}
-\DeclareFontShape{T1}{yv1d}{bc}{si}{<->ssub * yv1d/bc/sc}{}
-\DeclareFontShape{T1}{yv1d}{db}{si}{<->ssub * yv1d/db/sc}{}
-\DeclareFontShape{T1}{yv1d}{dbuc}{si}{<->ssub * yv1d/db/si}{}
-\DeclareFontShape{T1}{yv1d}{bx}{n}{<->ssub * yv1d/b/n}{}
-\DeclareFontShape{T1}{yv1d}{mx}{si}{<->ssub * yv1d/mx/sc}{}
-\DeclareFontShape{T1}{yv1d}{m}{si}{<->ssub * yv1d/m/sc}{}
-\DeclareFontShape{T1}{yv1d}{mc}{si}{<->ssub * yv1d/mc/sc}{}
-\DeclareFontShape{T1}{yv1d}{muc}{si}{<->ssub * yv1d/mc/si}{}
-\DeclareFontShape{T1}{yv1d}{l}{si}{<->ssub * yv1d/l/sc}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans/ts1yv1.fd b/Master/texmf-dist/tex/latex/venturissans/ts1yv1.fd
deleted file mode 100644
index 95705d063a5..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans/ts1yv1.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%Filename: ts1yv1.fd
-%Created by: tex yv1-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yv1.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yv1.]
-
-\DeclareFontFamily{TS1}{yv1}{}
-
-\DeclareFontShape{TS1}{yv1}{m}{n}{
- <-> yv1r8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{m}{it}{
- <-> yv1ri8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{b}{n}{
- <-> yv1b8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{b}{it}{
- <-> yv1bi8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{eb}{n}{
- <-> yv1h8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{eb}{sl}{
- <-> yv1ho8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{eb}{it}{
- <-> yv1ho8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{mc}{n}{
- <-> yv1r8cc
-}{}
-
-\DeclareFontShape{TS1}{yv1}{mc}{it}{
- <-> yv1ri8cc
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bc}{n}{
- <-> yv1b8cc
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bc}{it}{
- <-> yv1bi8cc
-}{}
-
-\DeclareFontShape{TS1}{yv1}{mx}{n}{
- <-> yv1r8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{mx}{it}{
- <-> yv1ri8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bx}{n}{
- <-> yv1b8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bx}{it}{
- <-> yv1bi8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bx}{sl}{
- <-> yv1bi8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bx}{sc}{
- <-> yv1b8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{bx}{si}{
- <-> yv1b8cx
-}{}
-
-\DeclareFontShape{TS1}{yv1}{l}{n}{
- <-> yv1l8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{l}{it}{
- <-> yv1li8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{db}{n}{
- <-> yv1d8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{db}{it}{
- <-> yv1di8c
-}{}
-
-\DeclareFontShape{TS1}{yv1}{m}{sc}{<->ssub * yv1/m/n}{}
-\DeclareFontShape{TS1}{yv1}{m}{si}{<->ssub * yv1/m/sc}{}
-\DeclareFontShape{TS1}{yv1}{m}{sl}{<->ssub * yv1/m/it}{}
-\DeclareFontShape{TS1}{yv1}{b}{sc}{<->ssub * yv1/b/n}{}
-\DeclareFontShape{TS1}{yv1}{b}{si}{<->ssub * yv1/b/sc}{}
-\DeclareFontShape{TS1}{yv1}{b}{sl}{<->ssub * yv1/b/it}{}
-\DeclareFontShape{TS1}{yv1}{eb}{sc}{<->ssub * yv1/eb/n}{}
-\DeclareFontShape{TS1}{yv1}{eb}{si}{<->ssub * yv1/eb/sc}{}
-\DeclareFontShape{TS1}{yv1}{muc}{n}{<->ssub * yv1/mc/n}{}
-\DeclareFontShape{TS1}{yv1}{mc}{sc}{<->ssub * yv1/mc/n}{}
-\DeclareFontShape{TS1}{yv1}{muc}{sc}{<->ssub * yv1/mc/sc}{}
-\DeclareFontShape{TS1}{yv1}{mc}{si}{<->ssub * yv1/mc/sc}{}
-\DeclareFontShape{TS1}{yv1}{muc}{si}{<->ssub * yv1/mc/si}{}
-\DeclareFontShape{TS1}{yv1}{muc}{it}{<->ssub * yv1/mc/it}{}
-\DeclareFontShape{TS1}{yv1}{mc}{sl}{<->ssub * yv1/mc/it}{}
-\DeclareFontShape{TS1}{yv1}{muc}{sl}{<->ssub * yv1/mc/sl}{}
-\DeclareFontShape{TS1}{yv1}{bc}{sc}{<->ssub * yv1/bc/n}{}
-\DeclareFontShape{TS1}{yv1}{bc}{si}{<->ssub * yv1/bc/sc}{}
-\DeclareFontShape{TS1}{yv1}{bc}{sl}{<->ssub * yv1/bc/it}{}
-\DeclareFontShape{TS1}{yv1}{mx}{sc}{<->ssub * yv1/mx/n}{}
-\DeclareFontShape{TS1}{yv1}{mx}{si}{<->ssub * yv1/mx/sc}{}
-\DeclareFontShape{TS1}{yv1}{mx}{sl}{<->ssub * yv1/mx/it}{}
-\DeclareFontShape{TS1}{yv1}{l}{sc}{<->ssub * yv1/l/n}{}
-\DeclareFontShape{TS1}{yv1}{l}{si}{<->ssub * yv1/l/sc}{}
-\DeclareFontShape{TS1}{yv1}{l}{sl}{<->ssub * yv1/l/it}{}
-\DeclareFontShape{TS1}{yv1}{dbuc}{n}{<->ssub * yv1/db/n}{}
-\DeclareFontShape{TS1}{yv1}{db}{sc}{<->ssub * yv1/db/n}{}
-\DeclareFontShape{TS1}{yv1}{dbuc}{sc}{<->ssub * yv1/db/sc}{}
-\DeclareFontShape{TS1}{yv1}{db}{si}{<->ssub * yv1/db/sc}{}
-\DeclareFontShape{TS1}{yv1}{dbuc}{si}{<->ssub * yv1/db/si}{}
-\DeclareFontShape{TS1}{yv1}{dbuc}{it}{<->ssub * yv1/db/it}{}
-\DeclareFontShape{TS1}{yv1}{db}{sl}{<->ssub * yv1/db/it}{}
-\DeclareFontShape{TS1}{yv1}{dbuc}{sl}{<->ssub * yv1/db/sl}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans/ts1yv1d.fd b/Master/texmf-dist/tex/latex/venturissans/ts1yv1d.fd
deleted file mode 100644
index 3c21720b1b1..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans/ts1yv1d.fd
+++ /dev/null
@@ -1,106 +0,0 @@
-%Filename: ts1yv1d.fd
-%Created by: tex yv1-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yv1d.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yv1d.]
-
-\DeclareFontFamily{TS1}{yv1d}{}
-
-\DeclareFontShape{TS1}{yv1d}{b}{sc}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{eb}{sc}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{bc}{sc}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{db}{sc}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{b}{n}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{eb}{n}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{bc}{n}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{db}{n}{
- <-> yv1bd8c
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{dbuc}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{mx}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{m}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{mc}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{muc}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{l}{sc}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{dbuc}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{mx}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{m}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{mc}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{muc}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{l}{n}{
- <-> yv1dd8cu
-}{}
-
-\DeclareFontShape{TS1}{yv1d}{bx}{sc}{<->ssub * yv1d/b/sc}{}
-\DeclareFontShape{TS1}{yv1d}{b}{si}{<->ssub * yv1d/b/sc}{}
-\DeclareFontShape{TS1}{yv1d}{bx}{si}{<->ssub * yv1d/b/si}{}
-\DeclareFontShape{TS1}{yv1d}{eb}{si}{<->ssub * yv1d/eb/sc}{}
-\DeclareFontShape{TS1}{yv1d}{bc}{si}{<->ssub * yv1d/bc/sc}{}
-\DeclareFontShape{TS1}{yv1d}{db}{si}{<->ssub * yv1d/db/sc}{}
-\DeclareFontShape{TS1}{yv1d}{dbuc}{si}{<->ssub * yv1d/db/si}{}
-\DeclareFontShape{TS1}{yv1d}{bx}{n}{<->ssub * yv1d/b/n}{}
-\DeclareFontShape{TS1}{yv1d}{mx}{si}{<->ssub * yv1d/mx/sc}{}
-\DeclareFontShape{TS1}{yv1d}{m}{si}{<->ssub * yv1d/m/sc}{}
-\DeclareFontShape{TS1}{yv1d}{mc}{si}{<->ssub * yv1d/mc/sc}{}
-\DeclareFontShape{TS1}{yv1d}{muc}{si}{<->ssub * yv1d/mc/si}{}
-\DeclareFontShape{TS1}{yv1d}{l}{si}{<->ssub * yv1d/l/sc}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans2/t1yv3.fd b/Master/texmf-dist/tex/latex/venturissans2/t1yv3.fd
deleted file mode 100644
index 4080a89337c..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans2/t1yv3.fd
+++ /dev/null
@@ -1,79 +0,0 @@
-%Filename: t1yv3.fd
-%Created by: tex yv3-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1yv3.fd}
- [2010/07/03 Fontinst v1.933 font definitions for T1/yv3.]
-
-\DeclareFontFamily{T1}{yv3}{}
-
-\DeclareFontShape{T1}{yv3}{m}{n}{
- <-> yv3r8t
-}{}
-
-\DeclareFontShape{T1}{yv3}{m}{it}{
- <-> yv3ri8t
-}{}
-
-\DeclareFontShape{T1}{yv3}{b}{n}{
- <-> yv3b8t
-}{}
-
-\DeclareFontShape{T1}{yv3}{b}{it}{
- <-> yv3bi8t
-}{}
-
-\DeclareFontShape{T1}{yv3}{mc}{n}{
- <-> yv3r8tc
-}{}
-
-\DeclareFontShape{T1}{yv3}{mc}{it}{
- <-> yv3ri8tc
-}{}
-
-\DeclareFontShape{T1}{yv3}{bc}{n}{
- <-> yv3b8tc
-}{}
-
-\DeclareFontShape{T1}{yv3}{bc}{it}{
- <-> yv3bi8tc
-}{}
-
-\DeclareFontShape{T1}{yv3}{mx}{n}{
- <-> yv3r8tx
-}{}
-
-\DeclareFontShape{T1}{yv3}{mx}{it}{
- <-> yv3ri8tx
-}{}
-
-\DeclareFontShape{T1}{yv3}{bx}{n}{
- <-> yv3b8tx
-}{}
-
-\DeclareFontShape{T1}{yv3}{bx}{it}{
- <-> yv3bi8tx
-}{}
-
-\DeclareFontShape{T1}{yv3}{m}{sc}{<->ssub * yv3/m/n}{}
-\DeclareFontShape{T1}{yv3}{m}{si}{<->ssub * yv3/m/sc}{}
-\DeclareFontShape{T1}{yv3}{m}{sl}{<->ssub * yv3/m/it}{}
-\DeclareFontShape{T1}{yv3}{b}{sc}{<->ssub * yv3/b/n}{}
-\DeclareFontShape{T1}{yv3}{bx}{sc}{<->ssub * yv3/b/sc}{}
-\DeclareFontShape{T1}{yv3}{b}{si}{<->ssub * yv3/b/sc}{}
-\DeclareFontShape{T1}{yv3}{bx}{si}{<->ssub * yv3/b/si}{}
-\DeclareFontShape{T1}{yv3}{b}{sl}{<->ssub * yv3/b/it}{}
-\DeclareFontShape{T1}{yv3}{bx}{sl}{<->ssub * yv3/b/sl}{}
-\DeclareFontShape{T1}{yv3}{mc}{sc}{<->ssub * yv3/mc/n}{}
-\DeclareFontShape{T1}{yv3}{mc}{si}{<->ssub * yv3/mc/sc}{}
-\DeclareFontShape{T1}{yv3}{mc}{sl}{<->ssub * yv3/mc/it}{}
-\DeclareFontShape{T1}{yv3}{bc}{sc}{<->ssub * yv3/bc/n}{}
-\DeclareFontShape{T1}{yv3}{bc}{si}{<->ssub * yv3/bc/sc}{}
-\DeclareFontShape{T1}{yv3}{bc}{sl}{<->ssub * yv3/bc/it}{}
-\DeclareFontShape{T1}{yv3}{mx}{sc}{<->ssub * yv3/mx/n}{}
-\DeclareFontShape{T1}{yv3}{mx}{si}{<->ssub * yv3/mx/sc}{}
-\DeclareFontShape{T1}{yv3}{mx}{sl}{<->ssub * yv3/mx/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/venturissans2/ts1yv3.fd b/Master/texmf-dist/tex/latex/venturissans2/ts1yv3.fd
deleted file mode 100644
index 65f27ef37de..00000000000
--- a/Master/texmf-dist/tex/latex/venturissans2/ts1yv3.fd
+++ /dev/null
@@ -1,79 +0,0 @@
-%Filename: ts1yv3.fd
-%Created by: tex yv3-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1yv3.fd}
- [2010/07/03 Fontinst v1.933 font definitions for TS1/yv3.]
-
-\DeclareFontFamily{TS1}{yv3}{}
-
-\DeclareFontShape{TS1}{yv3}{m}{n}{
- <-> yv3r8c
-}{}
-
-\DeclareFontShape{TS1}{yv3}{m}{it}{
- <-> yv3ri8c
-}{}
-
-\DeclareFontShape{TS1}{yv3}{b}{n}{
- <-> yv3b8c
-}{}
-
-\DeclareFontShape{TS1}{yv3}{b}{it}{
- <-> yv3bi8c
-}{}
-
-\DeclareFontShape{TS1}{yv3}{mc}{n}{
- <-> yv3r8cc
-}{}
-
-\DeclareFontShape{TS1}{yv3}{mc}{it}{
- <-> yv3ri8cc
-}{}
-
-\DeclareFontShape{TS1}{yv3}{bc}{n}{
- <-> yv3b8cc
-}{}
-
-\DeclareFontShape{TS1}{yv3}{bc}{it}{
- <-> yv3bi8cc
-}{}
-
-\DeclareFontShape{TS1}{yv3}{mx}{n}{
- <-> yv3r8cx
-}{}
-
-\DeclareFontShape{TS1}{yv3}{mx}{it}{
- <-> yv3ri8cx
-}{}
-
-\DeclareFontShape{TS1}{yv3}{bx}{n}{
- <-> yv3b8cx
-}{}
-
-\DeclareFontShape{TS1}{yv3}{bx}{it}{
- <-> yv3bi8cx
-}{}
-
-\DeclareFontShape{TS1}{yv3}{m}{sc}{<->ssub * yv3/m/n}{}
-\DeclareFontShape{TS1}{yv3}{m}{si}{<->ssub * yv3/m/sc}{}
-\DeclareFontShape{TS1}{yv3}{m}{sl}{<->ssub * yv3/m/it}{}
-\DeclareFontShape{TS1}{yv3}{b}{sc}{<->ssub * yv3/b/n}{}
-\DeclareFontShape{TS1}{yv3}{bx}{sc}{<->ssub * yv3/b/sc}{}
-\DeclareFontShape{TS1}{yv3}{b}{si}{<->ssub * yv3/b/sc}{}
-\DeclareFontShape{TS1}{yv3}{bx}{si}{<->ssub * yv3/b/si}{}
-\DeclareFontShape{TS1}{yv3}{b}{sl}{<->ssub * yv3/b/it}{}
-\DeclareFontShape{TS1}{yv3}{bx}{sl}{<->ssub * yv3/b/sl}{}
-\DeclareFontShape{TS1}{yv3}{mc}{sc}{<->ssub * yv3/mc/n}{}
-\DeclareFontShape{TS1}{yv3}{mc}{si}{<->ssub * yv3/mc/sc}{}
-\DeclareFontShape{TS1}{yv3}{mc}{sl}{<->ssub * yv3/mc/it}{}
-\DeclareFontShape{TS1}{yv3}{bc}{sc}{<->ssub * yv3/bc/n}{}
-\DeclareFontShape{TS1}{yv3}{bc}{si}{<->ssub * yv3/bc/sc}{}
-\DeclareFontShape{TS1}{yv3}{bc}{sl}{<->ssub * yv3/bc/it}{}
-\DeclareFontShape{TS1}{yv3}{mx}{sc}{<->ssub * yv3/mx/n}{}
-\DeclareFontShape{TS1}{yv3}{mx}{si}{<->ssub * yv3/mx/sc}{}
-\DeclareFontShape{TS1}{yv3}{mx}{sl}{<->ssub * yv3/mx/it}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty b/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty
index 535bc7da318..72417ae4000 100644
--- a/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty
+++ b/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty
@@ -18,18 +18,16 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{verifycommand}
- [2024/01/11 v1.00 Verify definitions have not changed.]
-
-
+ [2024/09/03 v1.10 Verify definitions have not changed.]
\RequirePackage{etoolbox}
\RequirePackage{iftex}
-\newbool{VERCMD@enable}
-\booltrue{VERCMD@enable}
+\newbool{VERCMDenable}
+\booltrue{VERCMDenable}
\DeclareOption{disable}{%
- \boolfalse{VERCMD@enable}%
+ \boolfalse{VERCMDenable}%
\typeout{----}%
\typeout{Package verifycommand: Turned off by option 'disable'.}%
\typeout{----}%
@@ -68,20 +66,46 @@
}
\newcommand*{\VERCMD@whatchanged}{}
+\newbool{VERCMD@this@ltxcmd}
+\boolfalse{VERCMD@this@ltxcmd}
+
+\newbool{VERCMD@failed@ltxcmd}
+\boolfalse{VERCMD@failed@ltxcmd}
+
\newcommand*{\VERCMD@addchanged}[2]{%
\ifdefempty{\VERCMD@whatchanged}%
{}%
{\apptocmd{\VERCMD@whatchanged}{^^J}{}{}}%
- \apptocmd{\VERCMD@whatchanged}{Definition changed: #2^^J}{}{}%
- \apptocmd{\VERCMD@whatchanged}{Definition changed: \space\space\space#1}{}{}%
+ \apptocmd{\VERCMD@whatchanged}{%
+ (verifycommand)\space\space#2^^J%
+ \space\space\space\space\space\space\space\space\space\space%
+ \space\space\space\space\space\space\space\space\space(#1)%
+ }{}{}%
+ \ifbool{VERCMD@this@ltxcmd}{%
+ \apptocmd{\VERCMD@whatchanged}{ *}{}{}%
+ \booltrue{VERCMD@failed@ltxcmd}%
+ }{}%
+ \boolfalse{VERCMD@this@ltxcmd}%
}
-\AfterEndDocument{
+\AtEndDocument{
\ifdefempty{\VERCMD@whatchanged}{}{%
\typeout{--------------------------------}%
- \typeout{WARNING: Something may fail.}%
- \typeout{\VERCMD@whatchanged}%
- \typeout{--------------------------------}%
+ \typeout{Package verifycommand Warning: Definitions have changed.}%
+ \typeout{Patches for the following macros may need to be updated.}%
+ \typeout{See the previous warnings for line numbers.}%
+ \typeout{}%
+ \typeout{Syntax:\space\space Patching pkg -> Defining pkg: Macro (checksum)}%
+ \typeout{-----}%
+ \typeout{\VERCMD@whatchanged}
+ \typeout{-----}%
+ \typeout{Look for updates to these packages.}
+ \ifbool{VERCMD@failed@ltxcmd}{
+ \typeout{Any of the above marked with a * may be due to changes in LaTeX internals,}
+ \typeout{the most recently known of which was 2023/12/01.}
+ \typeout{If so, look for updates for the LaTeX sytem as well.}
+ }{}
+ \typeout{--------------------------------}
}
}
@@ -93,32 +117,57 @@
}%
}
-\newcommand*{\VERCMD@Warning}[3]{%
+\newcommand*{\VERCMDWarning}[3]{%
\ifblank{#1}%
{%
\VERCMD@ProgWarning{%
- Something may fail. A definition has changed:\MessageBreak
+ A definition has changed:\MessageBreak
\ifblank{#2}{}{#2: }\string#3\MessageBreak
- \VERCMD@temp\MessageBreak
- }
- \expandafter\VERCMD@addchanged\expandafter{\VERCMD@temp}{\string#3}%
+ (\VERCMD@temp)\MessageBreak
+ }%
+ \expandafter\VERCMD@addchanged%
+ \expandafter{\VERCMD@temp}{\string#3}%
}%
{%
\PackageWarning{#1}{%
- Something may fail. A definition has changed:\MessageBreak%
+ A definition has changed:\MessageBreak%
\ifblank{#2}{}{#2: }%
\string#3\MessageBreak%
- \VERCMD@temp\MessageBreak%
+ (\VERCMD@temp)\MessageBreak%
}%
- \expandafter\VERCMD@addchanged\expandafter{\VERCMD@temp}{\ifblank{#2}{}{#2: }\string#3}%
+ \expandafter\VERCMD@addchanged%
+ \expandafter{\VERCMD@temp}{#1 -> \ifblank{#2}{}{#2: }\string#3}%
}%
}
\ExplSyntaxOn
-\NewDocumentCommand{\VerifyCommand}{O{} O{} m m}{%
- \ifbool{VERCMD@enable}{%
+\newbool{VERCMD@passed}
+\newbool{VERCMD@failed}
+\newcommand*{\TestVerifyCommands}
+{
+ \boolfalse{VERCMD@passed}
+ \boolfalse{VERCMD@failed}
+}
+\newcommand*{\IfVerifyCommandPassed}
+ {%
+ \ifbool{VERCMD@passed}%
+ {\let\VERCMD@tempa\@firstoftwo}%
+ {\let\VERCMD@tempa\@secondoftwo}%
+ \VERCMD@tempa%
+ }
+\newcommand*{\IfVerifyCommandFailed}
+ {%
+ \ifbool{VERCMD@failed}%
+ {\let\VERCMD@tempa\@firstoftwo}%
+ {\let\VERCMD@tempa\@secondoftwo}%
+ \VERCMD@tempa%
+ }
+\NewDocumentCommand{\IfVerifyCommand}{O{} O{} m m}{%
+ \ifbool{VERCMDenable}{%
\edef\VERCMD@temp{Unknown~definition}%
+ \boolfalse{VERCMD@this@ltxcmd}
\ifcsdef{\cs_to_str:N #3~code}%
{%
+ \booltrue{VERCMD@this@ltxcmd}%
\expandafter\VERCMD@mdfive%
\csname \cs_to_str:N #3~code\endcsname%
}%
@@ -138,7 +187,10 @@
\ifcsdef{\VERCMD@backslash\cs_to_str:N #3}%
{%
\expandafter\VERCMD@mdfive%
- \csname \VERCMD@backslash\cs_to_str:N #3\endcsname%
+ \csname %
+ \VERCMD@backslash%
+ \cs_to_str:N #3%
+ \endcsname%
}%
{%
\ifdef{#3}%
@@ -149,18 +201,38 @@
}%
}%
\ifdefstring{\VERCMD@temp}{#4}%
- {}%
{%
- \VERCMD@Warning{#1}{#2}{#3}%
+ \booltrue{VERCMD@passed}%
+ \let\VERCMD@tempa\@firstoftwo%
+ }%
+ {%
+ \booltrue{VERCMD@failed}%
+ \let\VERCMD@tempa\@secondoftwo%
}%
}% if package enabled
- {}% if package not enabled
+ {\let\VERCMD@tempa\@firstoftwo}% if package not enabled
+ \VERCMD@tempa%
}
-\NewDocumentCommand{\VerifyEnvironment}{O{} O{} m m m}{%
- \ifbool{VERCMD@enable}{%
+\NewDocumentCommand{\VerifyCommand}{O{} O{} m m}{%
+ \ifblank{#1}{% #1 blank
+ \IfVerifyCommand{#3}{#4}{}{\VERCMDWarning{}{}{#3}}%
+ }% #1 blank
+ {% #1 given
+ \ifblank{#2}{% #2 blank
+ \IfVerifyCommand[#1]{#3}{#4}{}{\VERCMDWarning{#1}{}{#3}}%
+ }% #2 blank
+ {% #2 given
+ \IfVerifyCommand[#1][#2]{#3}{#4}{}{\VERCMDWarning{#1}{#2}{#3}}%
+ }% #2 given
+ }% #1 given
+}
+\NewDocumentCommand{\IfVerifyEnvironmentBegin}{O{} O{} m m}{%
+ \ifbool{VERCMDenable}{%
\edef\VERCMD@temp{Unknown~definition}%
+ \boolfalse{VERCMD@this@ltxcmd}
\ifcsdef{environment~#3~code}%
{%
+ \booltrue{VERCMD@this@ltxcmd}%
\expandafter\VERCMD@mdfive%
\csname environment~#3~code\endcsname%
}%
@@ -177,13 +249,25 @@
}%
}%
\ifdefstring{\VERCMD@temp}{#4}%
- {}%
{%
- \VERCMD@Warning{#1}{#2}{#3}%
+ \booltrue{VERCMD@passed}%
+ \let\VERCMD@tempa\@firstoftwo%
+ }%
+ {%
+ \booltrue{VERCMD@failed}%
+ \let\VERCMD@tempa\@secondoftwo%
}%
+ }% if package enabled
+ {\let\VERCMD@tempa\@firstoftwo}% if package not enabled
+ \VERCMD@tempa%
+}
+\NewDocumentCommand{\IfVerifyEnvironmentEnd}{O{} O{} m m}{%
+ \ifbool{VERCMDenable}{%
\edef\VERCMD@temp{Unknown~definition}%
+ \boolfalse{VERCMD@this@ltxcmd}
\ifcsdef{environment~#3~end~aux~}%
{%
+ \booltrue{VERCMD@this@ltxcmd}%
\expandafter\VERCMD@mdfive
\csname environment~#3~end~aux~\endcsname%
}%
@@ -195,15 +279,57 @@
}%
{}%
}%
- \ifdefstring{\VERCMD@temp}{#5}%
- {}%
+ \ifdefstring{\VERCMD@temp}{#4}%
+ {%
+ \booltrue{VERCMD@passed}%
+ \let\VERCMD@tempa\@firstoftwo%
+ }%
{%
- \VERCMD@Warning{#1}{#2}{(end)#3}%
+ \booltrue{VERCMD@failed}%
+ \let\VERCMD@tempa\@secondoftwo%
}%
}% if package enabled
- {}% if package not enabled
+ {\let\VERCMD@tempa\@firstoftwo}% if package not enabled
+ \VERCMD@tempa%
+}
+\NewDocumentCommand{\VerifyEnvironment}{O{} O{} m m m}{%
+ \ifblank{#1}{% #1 blank
+ \IfVerifyEnvironmentBegin{#3}{#4}%
+ {}%
+ {\VERCMDWarning{}{}{#3}}%
+ }% #1 blank
+ {% #1 given
+ \ifblank{#2}{% #2 blank
+ \IfVerifyEnvironmentBegin[#1]{#3}{#4}%
+ {}%
+ {\VERCMDWarning{#1}{}{#3}}%
+ }% #2 blank
+ {% #2 given
+ \IfVerifyEnvironmentBegin[#1][#2]{#3}{#4}%
+ {}%
+ {\VERCMDWarning{#1}{#2}{#3}}%
+ }% #2 given
+ }% #1 given
+ \ifblank{#1}{% #1 blank
+ \IfVerifyEnvironmentEnd{#3}{#5}%
+ {}%
+ {\VERCMDWarning{}{}{(end)#3}}%
+ }% #1 blank
+ {% #1 given
+ \ifblank{#2}{% #2 blank
+ \IfVerifyEnvironmentEnd[#1]{#3}{#5}%
+ {}%
+ {\VERCMDWarning{#1}{}{(end)#3}}%
+ }% #2 blank
+ {% #2 given
+ \IfVerifyEnvironmentEnd[#1][#2]{#3}{#5}%
+ {}%
+ {\VERCMDWarning{#1}{#2}{(end)#3}}%
+ }% #2 given
+ }% #1 given
}
\ExplSyntaxOff
+
\endinput
%%
%% End of file `verifycommand.sty'.
diff --git a/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty b/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty
index e2673d3c581..3d462b8a33e 100644
--- a/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty
+++ b/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty
@@ -2,7 +2,8 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{WriteOnGrid}[2024/04/12 v0.1.6 package to write on grid lines]
+\ProvidesPackage{WriteOnGrid}[2024/09/01 v0.1.7 package to write on grid lines]
+% 0.1.7 Option pour régler la marge pour les PleinePageCinqCinq
% 0.1.6 Commande pour calculer le nombre de lignes à insérer en fin de page / options Auto
% 0.1.5 Choix de la réglure pour le seyes (en pretest) + amélioration de la gestion des paragraphes
% 0.1.4 Suppression des options de xcolor (définition manuelle des couleurs)
@@ -564,16 +565,21 @@
}
%------page entière 5x5
+%les marges doivent valoir MargeH=0.2+k*0.5 et MargeV=0.3+k'*0.5
\defKV[CxCFull]{%
Couleur=\xdef\CCFullCoul{#1},%
CouleurMarge=\xdef\CCFullCoulM{#1},%
- FormatPapier=\xdef\CCFullFormatPap{#1}
+ FormatPapier=\xdef\CCFullFormatPap{#1},%
+ MargeG=\xdef\CCFullMargeG{#1},%
+ MargeH=\xdef\CCFullMargeH{#1}
}
\setKVdefault[CxCFull]{%
Couleur=lightgray!50,%
CouleurMarge=gray,%
NumLignes=false,%
- FormatPapier=A4
+ FormatPapier=A4,%
+ MargeG=auto,%
+ MargeH=auto
}
\NewDocumentEnvironment{PleinePageCinqCinq}{ O{} }%semble OK ^^
@@ -581,13 +587,49 @@
\useKVdefault[CxCFull]%
\setKV[CxCFull]{#1}%
\IfEq{\CCFullFormatPap}{A4}%
- {\xdef\CCFullHautPap{29.7}\xdef\CCFullLargPap{21}\xdef\CCFullMargeG{1.7}\xdef\CCFullMargeH{1.3}}%
+ {%
+ \xdef\CCFullHautPap{29.7}\xdef\CCFullLargPap{21}%
+ \IfEq{\CCFullMargeG}{auto}%
+ {%
+ \xdef\CCFullMargeG{1.7}%
+ }%
+ {}%
+ \IfEq{\CCFullMargeH}{auto}%
+ {%
+ \xdef\CCFullMargeH{1.3}%
+ }%
+ {}%
+ }%
{}%
\IfEq{\CCFullFormatPap}{A5}%
- {\xdef\CCFullHautPap{21}\xdef\CCFullLargPap{14.8}\xdef\CCFullMargeG{1.2}\xdef\CCFullMargeH{0.8}}%
+ {%
+ \xdef\CCFullHautPap{21}\xdef\CCFullLargPap{14.8}%
+ \IfEq{\CCFullMargeG}{auto}%
+ {%
+ \xdef\CCFullMargeG{1.2}%
+ }%
+ {}%
+ \IfEq{\CCFullMargeH}{auto}%
+ {%
+ \xdef\CCFullMargeH{0.8}%
+ }%
+ {}%
+ }%
{}%
\IfSubStr{\CCFullFormatPap}{x}%
- {\StrCut{\CCFullFormatPap}{x}{\CCFullLargPap}{\CCFullHautPap}\xdef\CCFullMargeG{1.7}\xdef\CCFullMargeH{1.3}}%
+ {%
+ \StrCut{\CCFullFormatPap}{x}{\CCFullLargPap}{\CCFullHautPap}%
+ \IfEq{\CCFullMargeG}{auto}%
+ {%
+ \xdef\CCFullMargeG{1.7}%
+ }%
+ {}%
+ \IfEq{\CCFullMargeH}{auto}%
+ {%
+ \xdef\CCFullMargeH{1.3}%
+ }%
+ {}%
+ }%
{}%
%calcul du nombre de lignes /colonnes ?
\xdef\CCFullNbLign{\fpeval{round(\CCFullHautPap/(0.5),0)}}%
diff --git a/Master/texmf-dist/tex/latex/xcolor/svgnam.def b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
index 8d0a156f59a..00b7bace1db 100644
--- a/Master/texmf-dist/tex/latex/xcolor/svgnam.def
+++ b/Master/texmf-dist/tex/latex/xcolor/svgnam.def
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesFile{svgnam.def}
- [2023/11/15 v3.01 Predefined colors according to SVG 1.1 (UK)]
+ [2024/09/29 v3.02 Predefined colors according to SVG 1.1 (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/latex/xcolor/x11nam.def b/Master/texmf-dist/tex/latex/xcolor/x11nam.def
index 8b845036513..7808279d86a 100644
--- a/Master/texmf-dist/tex/latex/xcolor/x11nam.def
+++ b/Master/texmf-dist/tex/latex/xcolor/x11nam.def
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesFile{x11nam.def}
- [2023/11/15 v3.01 Predefined colors according to Unix/X11 (UK)]
+ [2024/09/29 v3.02 Predefined colors according to Unix/X11 (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
index 120e3c0b6a4..37e806d2c05 100644
--- a/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
+++ b/Master/texmf-dist/tex/latex/xcolor/xcolor.sty
@@ -22,11 +22,11 @@
%% in the same archive or directory.)
%%
\ProvidesPackage{xcolor}
- [2023/11/15 v3.01 LaTeX color extensions (UK)]
+ [2024/09/29 v3.02 LaTeX color extensions (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
%% Please send error reports and suggestions for
@@ -244,7 +244,7 @@
{
,usenames .code =
{\PackageWarning{xcolor}{Package option `usenames' is obsolete and ignored}}
- ,usename .usage = preamble
+ ,usenames .usage = preamble
,hyperref .code =
{\PackageWarning{xcolor}{Package option `hyperref' is obsolete and ignored}}
,hyperref .usage = preamble
@@ -262,7 +262,7 @@
\ExplSyntaxOff
\InputIfFileExists{color.cfg}{}{}
\let\ExecuteOptions\XC@ExecuteOptions
-\ProcessKeyOptions
+\ProcessKeyOptions\relax
\edef\Gin@driver{\Gin@driver}
\if!\Gin@driver!
\PackageError{xcolor}
@@ -574,15 +574,19 @@
\fi
\fi \@secondoftwo}}
\def\XC@getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
- {\XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}%
+ {\def\XC@dflt@@mod{#1}%
+ \XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}%
\XC@getm@d3{#4}\XC@getm@d4{#5}\XC@getm@d5{#6}\XC@getm@d6{#7}%
- \XC@getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+ \XC@getm@d7{#8}\def\XC@@pos{0}\let\@@mod\XC@dflt@@mod\@gobble\@nnil}%
\def\XC@getm@d#1#2%
{\edef\XC@@pos{#2}\XC@sdef\@@mod{\XC@tgt@mod\XC@@pos}%
\ifx\XC@@pos\@@mod\def\XC@@pos{#1}\expandafter\remove@to@nnil\fi}%
\def\XC@g@tm@d#1#2:#3:#4\XC@@
{\@ifxempty{#3}{\let\@@Mod\XC@mod@ignore\XC@getm@d0{#2}}%
- {\def\@@Mod{#2}\XC@getm@d0{#3}}}%
+ {\def\@@Mod{#2}%
+ \def\XC@tgt@mod##1{#2}%
+ \def\XC@dflt@@mod{#3}%
+ \XC@getm@d0{#3}}}%
\def\XC@getclr#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
{\ifcase\XC@@pos\space #1\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi}
\newif\ifXC@@getmod \XC@@getmodtrue
@@ -1108,11 +1112,6 @@
\def\@@arg{\textbf{color}& }\let\@@clr\@empty\@testc@lor}%
{\endtabular\ignorespacesafterend}
\def\color@setgroup{\begingroup\set@color}
-\let\color@begingroup\begingroup
-\def\color@endgroup{\endgraf\endgroup}
-\def\color@hbox{\hbox\bgroup\color@begingroup}
-\def\color@vbox{\vbox\bgroup\color@begingroup}
-\def\color@endbox{\color@endgroup\egroup}
\def\convertcolorspec#1#2#3#4%
{\begingroup
\XC@sdef\sm{#1}\XC@sdef\tm{#3}\edef\@@tmp{#2}%
diff --git a/Master/texmf-dist/tex/latex/xindex/xindex.sty b/Master/texmf-dist/tex/latex/xindex/xindex.sty
index 43cd71a3247..143e36b4317 100644
--- a/Master/texmf-dist/tex/latex/xindex/xindex.sty
+++ b/Master/texmf-dist/tex/latex/xindex/xindex.sty
@@ -13,7 +13,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{xindex}[2024/05/16 v. 0.60 write into an idx file (hv)]
+\ProvidesPackage{xindex}[2024/05/16 v. 0.61 write into an idx file (hv)]
%
\RequirePackage{xkeyval}
diff --git a/Master/texmf-dist/tex/latex/xreview/xreview.sty b/Master/texmf-dist/tex/latex/xreview/xreview.sty
new file mode 100644
index 00000000000..a6d2501eed1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/xreview/xreview.sty
@@ -0,0 +1,135 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{xreview}[2024/08/29 Reviewing LaTeX documents made easy]
+
+\RequirePackage{xcolor}
+\RequirePackage[normalem]{ulem}
+\RequirePackage{etoolbox}
+\RequirePackage{environ}
+\RequirePackage{letltxmacro}
+\RequirePackage{todonotes}
+\RequirePackage{soul}
+\RequirePackage{pifont}
+\RequirePackage{xparse}
+\RequirePackage{amsmath}
+
+%%%% Equation numbering
+\newcounter{removedeqcounter}
+\setcounter{removedeqcounter}{0}
+
+%%%% Comment numbering
+\newcounter{commentcounter}
+\setcounter{commentcounter}{0}
+
+%%%% Define colours and prefixes
+\newcommand{\addedcolor}{blue}
+\newcommand{\removedcolor}{red}
+\newcommand{\removedeqprefix}{R}
+\newcommand{\commentcolor}{yellow}
+\newcommand{\resolvedcommentcolor}{green}
+\newcommand{\commentprefix}{C}
+
+%%%% Necessary for comments to work in twocolumn-type documents
+\setlength{\marginparwidth}{2cm}
+
+%%%% Reviewing commands
+\newtoggle{annotated}
+\toggletrue{annotated} % Show changes by default
+
+\newcommand{\showchanges}{\toggletrue{annotated}}
+\newcommand{\showclean}{\togglefalse{annotated}}
+
+\newtoggle{commented}
+\toggletrue{commented} % Show comments by default
+
+\newcommand{\showcomments}{\toggletrue{commented}}
+\newcommand{\hidecomments}{\togglefalse{commented}}
+
+%%%% Text coloring and hiding
+\newcommand{\colortext}[2]{{\leavevmode\color{#1}{#2}}}
+\newcommand{\safesout}[1]{\ifmmode\text{\sout{\ensuremath{#1}}}\else\sout{#1}\fi}
+\newcommand{\hidefromclean}[1]{\iftoggle{annotated}{#1}{}}
+
+\newcommand{\added}[1]{\iftoggle{annotated}{\colortext{\addedcolor}{#1}}{{#1}}}
+
+\newcommand{\removed}[1]{\hidefromclean{%
+\begingroup%
+\let\oldcite\cite%
+\renewcommand{\cite}[1]{\mbox{\oldcite{##1}}}%
+\colortext{\removedcolor}{\safesout{#1}}%
+\endgroup}}
+
+\newcommand{\changed}[2]{\removed{#1}\iftoggle{annotated}{ }{}\added{#2}}
+
+%%%% Equation coloring and hiding
+\NewEnviron{remequation}{\hidefromclean{%
+\addtocounter{equation}{-1}%
+\refstepcounter{removedeqcounter}%
+\renewcommand{\theequation}{\textcolor{\removedcolor}{\removedeqprefix\arabic{removedeqcounter}}}%
+\let\oldnonumber\nonumber%
+\renewcommand{\nonumber}{\addtocounter{equation}{1}\addtocounter{removedeqcounter}{-1}\oldnonumber}%
+\renewcommand{\notag}{\nonumber}%
+\begin{equation}%
+\color{\removedcolor}%
+\safesout{\BODY}%
+\end{equation}}}
+
+\NewEnviron{remequation*}{\hidefromclean{%
+\begin{equation*}%
+\color{\removedcolor}%
+\safesout{\BODY}%
+\end{equation*}}}
+
+\NewEnviron{addequation}{%
+\begin{equation}%
+\added{\BODY}%
+\end{equation}}
+
+\NewEnviron{addequation*}{%
+\begin{equation*}%
+\added{\BODY}%
+\end{equation*}}
+
+\newcommand{\removedeqline}[1]{\hidefromclean{%
+\let\oldnonumber\nonumber%
+\renewcommand{\nonumber}{\global\tag@false\addtocounter{removedeqcounter}{-1}}%
+\renewcommand{\notag}{\nonumber}%
+\makeatletter%
+\newcommand{\remlabel}{%
+\refstepcounter{removedeqcounter}%
+\global\tag@true%
+\oldnonumber%
+\gdef\df@tag{\maketag@@@{\textcolor{\removedcolor}{(\removedeqprefix\arabic{removedeqcounter})}}\def\@currentlabel{\textcolor{\removedcolor}{\removedeqprefix\arabic{removedeqcounter}}}}}
+\makeatother
+\remlabel%
+\color{\removedcolor}%
+\makeatletter\let\default@color\current@color\makeatother%
+\safesout{#1}%
+}}
+
+\newcommand{\addedeqline}[1]{%
+\iftoggle{annotated}{\color{\addedcolor}{#1}}%
+{{#1}}%
+}
+
+\newcommand{\remaligntab}{\hidefromclean{&}}
+\newcommand{\remnewline}{\hidefromclean{\\}}
+
+%%%% Commenting
+\DeclareRobustCommand{\resolvedhl}[1]{{\sethlcolor{green}\hl{#1}}}
+
+\newcommand{\comment}[3][]{%
+\stepcounter{commentcounter}%
+\ifboolexpr{togl{annotated} and togl{commented}}{%
+\hl{#2}\todo[prepend, color=\commentcolor ,caption=\textbf{\commentprefix\arabic{commentcounter}}, linecolor=black, #1]{#3}}%
+{#2}}
+
+\newcommand{\resolvedcomment}[3][]{%
+\stepcounter{commentcounter}%
+\ifboolexpr{togl{annotated} and togl{commented}}{%
+\resolvedhl{#2}\todo[prepend, color=\resolvedcommentcolor ,caption=\textbf{\ding{52} \commentprefix\arabic{commentcounter}}, linecolor=black, #1]{#3}}%
+{#2}}
+
+\NewDocumentCommand{\authoredcomments}{O{} O{} m}{%
+ \expandafter\newcommand\csname #3comment\endcsname{\comment[author=#3, #1]}%
+ \expandafter\newcommand\csname resolved#3comment\endcsname{\resolvedcomment[author=#3, #2]}%
+} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
index 5a91bc017a9..a1af5c5d4b3 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
@@ -52,7 +52,7 @@
'zref-clever' requires a LaTeX kernel \zrefclever@required@kernel\space or newer.%
}%
}%
-\ProvidesExplPackage {zref-clever} {2024-05-20} {0.4.5}
+\ProvidesExplPackage {zref-clever} {2024-09-30} {0.4.7}
{Clever LaTeX cross-references based on zref}
\RequirePackage { zref-base }
\RequirePackage { zref-user }
@@ -102,6 +102,15 @@
\zref@addprop \ZREF@mainlist { zc@cntval }
\zref@newprop* { zc@pgval } [0] { \int_use:c { c@page } }
\zref@addprop \ZREF@mainlist { zc@pgval }
+\cs_new:Npn \__zrefclever_get_enclosing_counters:n #1
+ {
+ \cs_if_exist:cT { c@ \__zrefclever_counter_reset_by:n {#1} }
+ {
+ { \__zrefclever_counter_reset_by:n {#1} }
+ \__zrefclever_get_enclosing_counters:e
+ { \__zrefclever_counter_reset_by:n {#1} }
+ }
+ }
\cs_new:Npn \__zrefclever_get_enclosing_counters_value:n #1
{
\cs_if_exist:cT { c@ \__zrefclever_counter_reset_by:n {#1} }
@@ -111,6 +120,7 @@
{ \__zrefclever_counter_reset_by:n {#1} }
}
}
+\cs_generate_variant:Nn \__zrefclever_get_enclosing_counters:n { e }
\cs_generate_variant:Nn \__zrefclever_get_enclosing_counters_value:n { e }
\cs_new:Npn \__zrefclever_counter_reset_by:n #1
{
@@ -144,6 +154,8 @@
\l__zrefclever_current_counter_tl
}
\zref@addprop \ZREF@mainlist { zc@enclval }
+\zref@newprop { zc@enclcnt }
+ { \__zrefclever_get_enclosing_counters:e \l__zrefclever_current_counter_tl }
\int_new:N \g__zrefclever_page_format_int
\tl_new:N \g__zrefclever_prev_page_format_tl
\AddToHook { shipout / before }
@@ -2418,25 +2430,16 @@
\keys_define:nn { zref-clever/label }
{
counterresetters .code:n =
- {
- \clist_map_inline:nn {#1}
- {
- \seq_if_in:NnF \l__zrefclever_counter_resetters_seq {##1}
- {
- \seq_put_right:Nn
- \l__zrefclever_counter_resetters_seq {##1}
- }
- }
- } ,
+ { \seq_set_from_clist:Nn \l__zrefclever_counter_resetters_seq {#1} } ,
counterresetters .initial:n =
{
- part ,
- chapter ,
- section ,
- subsection ,
- subsubsection ,
- paragraph ,
subparagraph ,
+ paragraph ,
+ subsubsection ,
+ subsection ,
+ section ,
+ chapter ,
+ part ,
},
counterresetters .value_required:n = true ,
}
@@ -4967,237 +4970,254 @@
}
\cs_new_protected:Npn \__zrefclever_type_name_setup:
{
- \zref@ifrefundefined { \l__zrefclever_type_first_label_tl }
+ \bool_if:nTF
+ { \l__zrefclever_typeset_ref_bool && ! \l__zrefclever_typeset_name_bool }
{
+ % `typeset=ref' / `noname' option
+ % Probably redundant, since in this case the type name is not being
+ % typeset. But, for completeness sake:
\tl_clear:N \l__zrefclever_type_name_tl
+ \bool_set_false:N \l__zrefclever_name_in_link_bool
\bool_set_true:N \l__zrefclever_type_name_missing_bool
}
{
- \tl_if_eq:NnTF
- \l__zrefclever_type_first_label_type_tl { zc@missingtype }
+ \zref@ifrefundefined { \l__zrefclever_type_first_label_tl }
{
\tl_clear:N \l__zrefclever_type_name_tl
\bool_set_true:N \l__zrefclever_type_name_missing_bool
}
{
- % Determine whether we should use capitalization, abbreviation,
- % and plural.
- \bool_lazy_or:nnTF
- { \l__zrefclever_cap_bool }
+ \tl_if_eq:NnTF
+ \l__zrefclever_type_first_label_type_tl { zc@missingtype }
{
- \l__zrefclever_capfirst_bool &&
- \int_compare_p:nNn { \l__zrefclever_type_count_int } = { 0 }
+ \tl_clear:N \l__zrefclever_type_name_tl
+ \bool_set_true:N \l__zrefclever_type_name_missing_bool
}
- { \tl_set:Nn \l__zrefclever_name_format_tl {Name} }
- { \tl_set:Nn \l__zrefclever_name_format_tl {name} }
- % If the queue is empty, we have a singular, otherwise, plural.
- \tl_if_empty:NTF \l__zrefclever_typeset_queue_curr_tl
- { \tl_put_right:Nn \l__zrefclever_name_format_tl { -sg } }
- { \tl_put_right:Nn \l__zrefclever_name_format_tl { -pl } }
- \bool_lazy_and:nnTF
- { \l__zrefclever_abbrev_bool }
{
- ! \int_compare_p:nNn
- { \l__zrefclever_type_count_int } = { 0 } ||
- ! \l__zrefclever_noabbrev_first_bool
- }
- {
- \tl_set:NV \l__zrefclever_name_format_fallback_tl
- \l__zrefclever_name_format_tl
- \tl_put_right:Nn \l__zrefclever_name_format_tl { -ab }
- }
- { \tl_clear:N \l__zrefclever_name_format_fallback_tl }
-
- % Handle number and gender nudges.
- \bool_if:NT \l__zrefclever_nudge_enabled_bool
- {
- \bool_if:NTF \l__zrefclever_nudge_singular_bool
+ % Determine whether we should use capitalization,
+ % abbreviation, and plural.
+ \bool_lazy_or:nnTF
+ { \l__zrefclever_cap_bool }
{
- \tl_if_empty:NF \l__zrefclever_typeset_queue_curr_tl
- {
- \msg_warning:nne { zref-clever }
- { nudge-plural-when-sg }
- { \l__zrefclever_type_first_label_type_tl }
- }
+ \l__zrefclever_capfirst_bool &&
+ \int_compare_p:nNn { \l__zrefclever_type_count_int } = { 0 }
}
+ { \tl_set:Nn \l__zrefclever_name_format_tl {Name} }
+ { \tl_set:Nn \l__zrefclever_name_format_tl {name} }
+ % If the queue is empty, we have a singular, otherwise,
+ % plural.
+ \tl_if_empty:NTF \l__zrefclever_typeset_queue_curr_tl
+ { \tl_put_right:Nn \l__zrefclever_name_format_tl { -sg } }
+ { \tl_put_right:Nn \l__zrefclever_name_format_tl { -pl } }
+ \bool_lazy_and:nnTF
+ { \l__zrefclever_abbrev_bool }
{
- \bool_lazy_all:nT
- {
- { \l__zrefclever_nudge_comptosing_bool }
- { \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl }
- {
- \int_compare_p:nNn
- { \l__zrefclever_label_count_int } > { 0 }
- }
- }
- {
- \msg_warning:nne { zref-clever }
- { nudge-comptosing }
- { \l__zrefclever_type_first_label_type_tl }
- }
+ ! \int_compare_p:nNn
+ { \l__zrefclever_type_count_int } = { 0 } ||
+ ! \l__zrefclever_noabbrev_first_bool
}
- \bool_lazy_and:nnT
- { \l__zrefclever_nudge_gender_bool }
- { ! \tl_if_empty_p:N \l__zrefclever_ref_gender_tl }
{
- \__zrefclever_get_rf_opt_seq:neeN { gender }
- { \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_ref_language_tl }
- \l__zrefclever_type_name_gender_seq
- \seq_if_in:NVF
- \l__zrefclever_type_name_gender_seq
- \l__zrefclever_ref_gender_tl
+ \tl_set:NV \l__zrefclever_name_format_fallback_tl
+ \l__zrefclever_name_format_tl
+ \tl_put_right:Nn \l__zrefclever_name_format_tl { -ab }
+ }
+ { \tl_clear:N \l__zrefclever_name_format_fallback_tl }
+
+ % Handle number and gender nudges.
+ % Note that these nudges get disabled for `typeset=ref' /
+ % `noname' option, but in this case they are not really
+ % meaningful anyway.
+ \bool_if:NT \l__zrefclever_nudge_enabled_bool
+ {
+ \bool_if:NTF \l__zrefclever_nudge_singular_bool
{
- \seq_if_empty:NTF \l__zrefclever_type_name_gender_seq
+ \tl_if_empty:NF \l__zrefclever_typeset_queue_curr_tl
{
- \msg_warning:nneee { zref-clever }
- { nudge-gender-not-declared-for-type }
- { \l__zrefclever_ref_gender_tl }
+ \msg_warning:nne { zref-clever }
+ { nudge-plural-when-sg }
{ \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_ref_language_tl }
+ }
+ }
+ {
+ \bool_lazy_all:nT
+ {
+ { \l__zrefclever_nudge_comptosing_bool }
+ { \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl }
+ {
+ \int_compare_p:nNn
+ { \l__zrefclever_label_count_int } > { 0 }
+ }
}
{
- \msg_warning:nneeee { zref-clever }
- { nudge-gender-mismatch }
+ \msg_warning:nne { zref-clever }
+ { nudge-comptosing }
{ \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_ref_gender_tl }
+ }
+ }
+ \bool_lazy_and:nnT
+ { \l__zrefclever_nudge_gender_bool }
+ { ! \tl_if_empty_p:N \l__zrefclever_ref_gender_tl }
+ {
+ \__zrefclever_get_rf_opt_seq:neeN { gender }
+ { \l__zrefclever_type_first_label_type_tl }
+ { \l__zrefclever_ref_language_tl }
+ \l__zrefclever_type_name_gender_seq
+ \seq_if_in:NVF
+ \l__zrefclever_type_name_gender_seq
+ \l__zrefclever_ref_gender_tl
+ {
+ \seq_if_empty:NTF \l__zrefclever_type_name_gender_seq
{
- \seq_use:Nn
- \l__zrefclever_type_name_gender_seq { ,~ }
+ \msg_warning:nneee { zref-clever }
+ { nudge-gender-not-declared-for-type }
+ { \l__zrefclever_ref_gender_tl }
+ { \l__zrefclever_type_first_label_type_tl }
+ { \l__zrefclever_ref_language_tl }
+ }
+ {
+ \msg_warning:nneeee { zref-clever }
+ { nudge-gender-mismatch }
+ { \l__zrefclever_type_first_label_type_tl }
+ { \l__zrefclever_ref_gender_tl }
+ {
+ \seq_use:Nn
+ \l__zrefclever_type_name_gender_seq { ,~ }
+ }
+ { \l__zrefclever_ref_language_tl }
}
- { \l__zrefclever_ref_language_tl }
}
}
}
- }
- \tl_if_empty:NTF \l__zrefclever_name_format_fallback_tl
- {
- \__zrefclever_opt_tl_get:cNF
+ \tl_if_empty:NTF \l__zrefclever_name_format_fallback_tl
{
- \__zrefclever_opt_varname_type:een
- { \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_name_format_tl }
- { tl }
- }
- \l__zrefclever_type_name_tl
- {
- \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl
- {
- \tl_put_left:Nn \l__zrefclever_name_format_tl { - }
- \tl_put_left:NV \l__zrefclever_name_format_tl
- \l__zrefclever_ref_decl_case_tl
- }
\__zrefclever_opt_tl_get:cNF
{
- \__zrefclever_opt_varname_lang_type:eeen
- { \l__zrefclever_ref_language_tl }
+ \__zrefclever_opt_varname_type:een
{ \l__zrefclever_type_first_label_type_tl }
{ \l__zrefclever_name_format_tl }
{ tl }
}
\l__zrefclever_type_name_tl
{
- \tl_clear:N \l__zrefclever_type_name_tl
- \bool_set_true:N \l__zrefclever_type_name_missing_bool
- \msg_warning:nnee { zref-clever } { missing-name }
- { \l__zrefclever_name_format_tl }
- { \l__zrefclever_type_first_label_type_tl }
+ \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl
+ {
+ \tl_put_left:Nn \l__zrefclever_name_format_tl { - }
+ \tl_put_left:NV \l__zrefclever_name_format_tl
+ \l__zrefclever_ref_decl_case_tl
+ }
+ \__zrefclever_opt_tl_get:cNF
+ {
+ \__zrefclever_opt_varname_lang_type:eeen
+ { \l__zrefclever_ref_language_tl }
+ { \l__zrefclever_type_first_label_type_tl }
+ { \l__zrefclever_name_format_tl }
+ { tl }
+ }
+ \l__zrefclever_type_name_tl
+ {
+ \tl_clear:N \l__zrefclever_type_name_tl
+ \bool_set_true:N \l__zrefclever_type_name_missing_bool
+ \msg_warning:nnee { zref-clever } { missing-name }
+ { \l__zrefclever_name_format_tl }
+ { \l__zrefclever_type_first_label_type_tl }
+ }
}
}
- }
- {
- \__zrefclever_opt_tl_get:cNF
- {
- \__zrefclever_opt_varname_type:een
- { \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_name_format_tl }
- { tl }
- }
- \l__zrefclever_type_name_tl
{
\__zrefclever_opt_tl_get:cNF
{
\__zrefclever_opt_varname_type:een
{ \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_name_format_fallback_tl }
+ { \l__zrefclever_name_format_tl }
{ tl }
}
\l__zrefclever_type_name_tl
{
- \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl
- {
- \tl_put_left:Nn
- \l__zrefclever_name_format_tl { - }
- \tl_put_left:NV \l__zrefclever_name_format_tl
- \l__zrefclever_ref_decl_case_tl
- \tl_put_left:Nn
- \l__zrefclever_name_format_fallback_tl { - }
- \tl_put_left:NV
- \l__zrefclever_name_format_fallback_tl
- \l__zrefclever_ref_decl_case_tl
- }
\__zrefclever_opt_tl_get:cNF
{
- \__zrefclever_opt_varname_lang_type:eeen
- { \l__zrefclever_ref_language_tl }
+ \__zrefclever_opt_varname_type:een
{ \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_name_format_tl }
+ { \l__zrefclever_name_format_fallback_tl }
{ tl }
}
\l__zrefclever_type_name_tl
{
+ \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl
+ {
+ \tl_put_left:Nn
+ \l__zrefclever_name_format_tl { - }
+ \tl_put_left:NV \l__zrefclever_name_format_tl
+ \l__zrefclever_ref_decl_case_tl
+ \tl_put_left:Nn
+ \l__zrefclever_name_format_fallback_tl { - }
+ \tl_put_left:NV
+ \l__zrefclever_name_format_fallback_tl
+ \l__zrefclever_ref_decl_case_tl
+ }
\__zrefclever_opt_tl_get:cNF
{
\__zrefclever_opt_varname_lang_type:eeen
{ \l__zrefclever_ref_language_tl }
{ \l__zrefclever_type_first_label_type_tl }
- { \l__zrefclever_name_format_fallback_tl }
+ { \l__zrefclever_name_format_tl }
{ tl }
}
\l__zrefclever_type_name_tl
{
- \tl_clear:N \l__zrefclever_type_name_tl
- \bool_set_true:N
- \l__zrefclever_type_name_missing_bool
- \msg_warning:nnee { zref-clever }
- { missing-name }
- { \l__zrefclever_name_format_tl }
- { \l__zrefclever_type_first_label_type_tl }
+ \__zrefclever_opt_tl_get:cNF
+ {
+ \__zrefclever_opt_varname_lang_type:eeen
+ { \l__zrefclever_ref_language_tl }
+ { \l__zrefclever_type_first_label_type_tl }
+ { \l__zrefclever_name_format_fallback_tl }
+ { tl }
+ }
+ \l__zrefclever_type_name_tl
+ {
+ \tl_clear:N \l__zrefclever_type_name_tl
+ \bool_set_true:N
+ \l__zrefclever_type_name_missing_bool
+ \msg_warning:nnee { zref-clever }
+ { missing-name }
+ { \l__zrefclever_name_format_tl }
+ { \l__zrefclever_type_first_label_type_tl }
+ }
}
}
}
}
}
}
- }
- % Signal whether the type name is to be included in the hyperlink or not.
- \bool_lazy_any:nTF
- {
- { ! \l__zrefclever_hyperlink_bool }
- { \l__zrefclever_link_star_bool }
- { \tl_if_empty_p:N \l__zrefclever_type_name_tl }
- { \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { false } }
- }
- { \bool_set_false:N \l__zrefclever_name_in_link_bool }
- {
+ % Signal whether the type name is to be included in the hyperlink or
+ % not.
\bool_lazy_any:nTF
{
- { \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { true } }
- {
- \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { tsingle } &&
- \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl
- }
- {
- \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { single } &&
- \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl &&
- \l__zrefclever_typeset_last_bool &&
- \int_compare_p:nNn { \l__zrefclever_type_count_int } = { 0 }
- }
+ { ! \l__zrefclever_hyperlink_bool }
+ { \l__zrefclever_link_star_bool }
+ { \tl_if_empty_p:N \l__zrefclever_type_name_tl }
+ { \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { false } }
}
- { \bool_set_true:N \l__zrefclever_name_in_link_bool }
{ \bool_set_false:N \l__zrefclever_name_in_link_bool }
+ {
+ \bool_lazy_any:nTF
+ {
+ { \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { true } }
+ {
+ \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { tsingle } &&
+ \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl
+ }
+ {
+ \str_if_eq_p:Vn \l__zrefclever_nameinlink_str { single } &&
+ \tl_if_empty_p:N \l__zrefclever_typeset_queue_curr_tl &&
+ \l__zrefclever_typeset_last_bool &&
+ \int_compare_p:nNn { \l__zrefclever_type_count_int } = { 0 }
+ }
+ }
+ { \bool_set_true:N \l__zrefclever_name_in_link_bool }
+ { \bool_set_false:N \l__zrefclever_name_in_link_bool }
+ }
}
}
\cs_new_protected:Npn \__zrefclever_hyperlink:nnn #1#2#3
@@ -5389,8 +5409,34 @@
\cs_generate_variant:Nn \__zrefclever_get_rf_opt_bool:nnnnN { nneeN }
\__zrefclever_compat_module:nn { appendix }
{
+ \newcounter { zc@appendix }
+ \cs_if_exist:cTF { chapter }
+ {
+ \__zrefclever_zcsetup:e
+ {
+ counterresetby =
+ {
+ zc@appendix = \__zrefclever_counter_reset_by:n { chapter } ,
+ chapter = zc@appendix ,
+ } ,
+ }
+ }
+ {
+ \cs_if_exist:cT { section }
+ {
+ \__zrefclever_zcsetup:e
+ {
+ counterresetby =
+ {
+ zc@appendix = \__zrefclever_counter_reset_by:n { section } ,
+ section = zc@appendix ,
+ } ,
+ }
+ }
+ }
\AddToHook { cmd / appendix / before }
{
+ \setcounter { zc@appendix } { 1 }
\__zrefclever_zcsetup:n
{
countertype =
@@ -5409,26 +5455,9 @@
{
\__zrefclever_if_package_loaded:nT { appendix }
{
- \newcounter { zc@appendix }
- \newcounter { zc@save@appendix }
- \setcounter { zc@appendix } { 0 }
- \setcounter { zc@save@appendix } { 0 }
- \cs_if_exist:cTF { chapter }
- {
- \__zrefclever_zcsetup:n
- { counterresetby = { chapter = zc@appendix } }
- }
- {
- \cs_if_exist:cT { section }
- {
- \__zrefclever_zcsetup:n
- { counterresetby = { section = zc@appendix } }
- }
- }
\AddToHook { env / appendices / begin }
{
- \stepcounter { zc@save@appendix }
- \setcounter { zc@appendix } { \value { zc@save@appendix } }
+ \setcounter { zc@appendix } { 1 }
\__zrefclever_zcsetup:n
{
countertype =
@@ -5444,13 +5473,31 @@
}
\AddToHook { env / appendices / end }
{ \setcounter { zc@appendix } { 0 } }
- \AddToHook { cmd / appendix / before }
+ \newcounter { zc@subappendix }
+ \cs_if_exist:cTF { chapter }
{
- \stepcounter { zc@save@appendix }
- \setcounter { zc@appendix } { \value { zc@save@appendix } }
+ \__zrefclever_zcsetup:e
+ {
+ counterresetby =
+ {
+ zc@subappendix = \__zrefclever_counter_reset_by:n { section } ,
+ section = zc@subappendix ,
+ } ,
+ }
+ }
+ {
+ \__zrefclever_zcsetup:e
+ {
+ counterresetby =
+ {
+ zc@subappendix = \__zrefclever_counter_reset_by:n { subsection } ,
+ subsection = zc@subappendix ,
+ } ,
+ }
}
\AddToHook { env / subappendices / begin }
{
+ \setcounter { zc@subappendix } { 1 }
\__zrefclever_zcsetup:n
{
countertype =
@@ -5463,6 +5510,8 @@
} ,
}
}
+ \AddToHook { env / subappendices / end }
+ { \setcounter { zc@subappendix } { 0 } }
\msg_info:nnn { zref-clever } { compat-package } { appendix }
}
}
diff --git a/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty b/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty
new file mode 100644
index 00000000000..e86dbdee1bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/zugferd/zugferd-invoice.sty
@@ -0,0 +1,193 @@
+%
+% Copyright (C) 2024 Marei Peischl <marei@peitex.de>
+% ---------------------------------------------------------
+%
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008-05-04 or later.
+%
+\ProvidesExplPackage{zugferd-invoice}{2024-09-11}{0.8}{Invoice wrapper example package for the factur-x to create ZUGFerD invoices}
+
+\keys_define:nn {zugferd/invoice}{
+ default-vat .tl_set:N = \defaultVAT,
+ default-vat .initial:n = 19,
+ format .code:n = \PassOptionsToPackage{format=#1}{zugferd},
+ format .initial:n = xrechnung3.0,
+}
+
+\ProcessKeyOptions[zugferd/invoice]
+
+\msg_new:nnnn {ptxcd/zugferd} {not-for-production} {
+ This~package~is~intented~to~be~an~example~for~a~possible~implementation~to~use~the~zugferd~package~for~invoicing.\\
+ As~this~integrates~a~lot~with~the~visual~structure~of~your~invoice~this~should~not~be~used~directly~but~may~be~an~example~for~your~own~package.
+}{See~zugferd~documentation~for~instructions~concerning~the~interfaces~used~in~this~file.}
+\msg_warning:nn {ptxcd/zugferd} {not-for-production}
+
+\RequirePackage{scrletter}
+\RequirePackage{ragged2e}
+\RequirePackage{zugferd}
+\RequirePackage{babel}
+
+% e.g. use comma as output decimal marker if german
+\addto\extrasgerman{\sisetup{locale=DE}}
+\addto\extrasngerman{\sisetup{locale=DE}}% for backwards compatibility
+
+\RequirePackage{xltabular}
+\RequirePackage{booktabs}
+
+\newcounter{invoiceitem}
+\seq_new:N \g__ptxcd_VAT_rates_seq
+
+\NewDocumentCommand{\InitVAT}{omO{S}}{
+ \seq_gput_right:Nn \g__ptxcd_VAT_rates_seq {#2}
+ \fp_new:c {g__ptxcd_invoice_sum_vat#2_fp}
+ \fp_new:c {g__ptxcd_invoice_base_vat#2_fp}
+ \cs_new:cn {__ptxcd_invoice_type_code#2:} {#3}
+}
+
+%%initialisierung auf 5,7,16 oder 19 % Mwst
+\InitVAT{16}
+\InitVAT{19}
+\InitVAT{5}
+\InitVAT{7}
+
+\newcommand*{\SetDefaultVAT}[1]{\def\defaultVAT{#1}}
+
+
+\seq_new:N \l__ptxcd_invoice_items_seq
+
+%\newcommand*{\AddInvoiceItem}[4][\defaultVAT]{%
+\NewDocumentCommand{\AddInvoiceItem}{D<>{}O{\defaultVAT}mmm}{
+ \seq_put_right:Nn \l__ptxcd_invoice_items_seq {
+ {#2}{#3}{#4}{#5}{#1}
+ }
+}
+
+\newcolumntype{P}{r<{\PrintTableCurrency}}
+
+\fp_new:N \g__ptxcd_invoice_sum_fp
+\fp_new:N \g__ptxcd_invoice_total_fp
+\fp_new:N \g__ptxcd_tax_total_fp
+\fp_new:N \g__ptxcd_invoice_item_fp
+\fp_new:N \g__ptxcd_invoice_item_vat_fp
+\fp_new:N \g__ptxcd_invoice_sum_vat_fp
+
+\newcommand*{\PrintInvoiceTabular}{
+\bool_gset_true:N \g_ptxcd_first_run_bool
+ \begin{ZUGFeRD}
+ \sisetup{round-precision=2,round-mode=places,round-pad=false,table-number-alignment=right,minimum-decimal-digits=2,mode=text}
+ \begin{xltabular}{\linewidth}{@{}rS[round-precision=1,table-format=2.1]>{\RaggedRight}XPP@{}}
+ \toprule[\lightrulewidth]
+ \noalign{\global\let\PrintTableCurrency\relax}%
+ \small\emph{Pos.}&\small\emph{Std.}&\small\emph{Beschreibung}&\small\emph{Einzelpreis}&\small\emph{Gesamtpreis}\\\midrule[\heavyrulewidth]
+ \noalign{\global\let\PrintTableCurrency\TableCurrency}%
+ \endhead
+ \bottomrule[\lightrulewidth]\multicolumn{5}{@{}p{\textwidth}@{}}{\strut\hspace*{\fill}\footnotesize Fortsetzung auf der nächsten Seite}\endfoot
+ \bottomrule\endlastfoot
+% Only write xml for the first run of the tabular.
+ \fp_compare:nNnF {\g__ptxcd_invoice_sum_fp} = {\c_zero_dim} {
+ \fp_gzero:N \g__ptxcd_invoice_sum_fp
+ \zugferd_disable_XML_interfaces:
+ }
+ \seq_map_inline:Nn \g__ptxcd_VAT_rates_seq {
+ \fp_gzero:c {g__ptxcd_invoice_sum_vat##1_fp}
+ \fp_gzero:c {g__ptxcd_invoice_base_vat##1_fp}
+ }
+ \fp_gzero:N \g__ptxcd_invoice_sum_fp
+ \seq_map_inline:Nn \l__ptxcd_invoice_items_seq {
+ \PrintInvoiceItem##1
+ }
+ \tabularnewline
+ \noalign{\skip_vertical:n {-\ht\strutbox-\dp\strutbox}}%offset for extra empty row of mapping
+ \midrule[\heavyrulewidth]
+ \PrintInvoiceTotal
+ \end{xltabular}
+ \end{ZUGFeRD}
+}
+
+\newcommand*{\PrintInvoiceTotal}{
+ \zugferd_startInvoiceSums:
+ \fp_gset:Nn \g__ptxcd_invoice_total_fp { \g__ptxcd_invoice_sum_fp}
+ \fp_gzero:N \g__ptxcd_tax_total_fp
+ \PrintInvoiceSum{netto}{\fp_use:N \g__ptxcd_invoice_sum_fp}
+ \seq_map_inline:Nn \g__ptxcd_VAT_rates_seq {
+ \fp_compare:nNnF {\fp_use:c {g__ptxcd_invoice_sum_vat##1_fp}} = {0} {
+ \zugferd_write_TaxEntry:nnnn {\use:c {__ptxcd_invoice_type_code##1:}} {##1} {\fp_use:c {g__ptxcd_invoice_base_vat##1_fp}} {\fp_use:c {g__ptxcd_invoice_sum_vat##1_fp}}
+ \fp_gadd:Nn \g__ptxcd_tax_total_fp {\fp_use:c {g__ptxcd_invoice_sum_vat##1_fp}}
+ \PrintVatSum[{\fp_use:c {g__ptxcd_invoice_base_vat##1_fp}}]{##1 }{\fp_use:c {g__ptxcd_invoice_sum_vat##1_fp}}
+ }
+ }
+ \PrintInvoiceSum{brutto}{\fp_eval:n {\g__ptxcd_tax_total_fp + \g__ptxcd_invoice_total_fp }}
+ % TODO add support for allowance, chargeTotal, and prepaid
+ \zugferd_write_Summation:nnnnnnnn
+ {\fp_use:N \g__ptxcd_invoice_sum_fp}% LineTotalAmount
+ {0} %ChargeTotalAmount
+ {0} %AllowanceTotalAmount
+ {\fp_use:N \g__ptxcd_invoice_sum_fp} %TaxBasisTotalAmount
+ {\fp_use:N \g__ptxcd_tax_total_fp} %TaxTotalAmount
+ {\fp_eval:n {\g__ptxcd_tax_total_fp + \g__ptxcd_invoice_total_fp }} %GrandTotalAmount
+ {0} % TotalPrepaidAmount
+ {\fp_eval:n {\g__ptxcd_tax_total_fp + \g__ptxcd_invoice_total_fp }} %DuePayableAmount = GrandTotalAmount - TotalPrepaidAmount
+ \zugferd_stopInvoiceSums:
+}
+
+%Ausgabe der einzelnen Rechnungspositionen
+\newcommand*{\PrintInvoiceItem}[5]{%
+ \stepcounter{invoiceitem}%
+ \theinvoiceitem%Positionsnummer
+ \fp_gset:Nn \g__ptxcd_invoice_item_vat_fp {#2 * (#1/100) * #4}
+ \fp_gset:Nn \g__ptxcd_invoice_item_fp {#2 * #4}
+% \fp_gadd:Nn \g__ptxcd_invoice_sum_vat_fp
+ \fp_gadd:cn {g__ptxcd_invoice_base_vat#1_fp} {\g__ptxcd_invoice_item_fp}
+ \fp_gadd:cn {g__ptxcd_invoice_sum_vat#1_fp} {\g__ptxcd_invoice_item_vat_fp}
+ \fp_gadd:Nn \g__ptxcd_invoice_sum_fp {\g__ptxcd_invoice_item_fp}
+
+ % position nummer name einzel-preis anzahl gesamtpreis
+ \keys_set:ne {zugferd}{tax/rate=#1, tax/category=\use:c {__ptxcd_invoice_type_code#1:},#5}
+ \zugferd_write_Item:nnnnnn {\theinvoiceitem} {} {#3} {#4} {#2} {\fp_use:N \g__ptxcd_invoice_item_fp}
+
+ &#2% Anzahl
+ &#3\space(\printVAT{#1}~MwSt.)% Beschreibung mit Angabe der MwSt, in Klammern
+ &\num{#4}%\num[round-mode=places,output-decimal-marker={,},round-pad = false]{#4}\tl_show:n {#4}%Einzelpreis
+ &\exp_args:Nx \num{\fp_use:N \g__ptxcd_invoice_item_fp}
+ \tabularnewline
+}
+
+
+
+\newcommand*{\PrintInvoiceSum}[2]{
+ \PrintSum{\csname invoicesum#1name\endcsname}{#2}
+}
+
+\newcommand*{\PrintVatSum}[3][]{
+ \PrintSum{\invoicesumvatname[#1]{#2}}{#3}
+}
+
+\newcommand*{\invoicesumvatname}[2][]{MwSt.~\printVAT{#2}\tl_if_empty:nF {#1} {\space(\num[round-precision=2]{#1}\TableCurrency)}}
+\renewcommand*{\theinvoiceitem}{\int_compare:nNnT {\value{invoiceitem}}<{10}{0}\arabic{invoiceitem}}
+
+\newcommand*{\PrintSum}[2]{
+ &&\multicolumn{1}{r}{#1\invoicesumseparator}&\multicolumn{1}{l}{}&\exp_args:Nx \num {#2}\tabularnewline
+}
+
+\ExplSyntaxOff
+
+\newcommand*{\invoicesumnettoname}{Summe (Netto)}
+\newcommand*{\invoicesumbruttoname}{Summe (Brutto)}
+\newcommand*{\invoicesumseparator}{:\space}
+
+\newcommand*{\TableCurrency}{\,€}
+\newcommand*{\printVAT}[1]{\num[round-mode=none]{#1}\,\%}
+
+\newcommand*{\PrintPositionenVAT}[5]{%
+ \stepcounter{invoiceitem}%
+ \theinvoiceitem&#1&#2\space(\printVAT{#3})&#4&#5\tabularnewline
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/zugferd/zugferd.sty b/Master/texmf-dist/tex/latex/zugferd/zugferd.sty
new file mode 100644
index 00000000000..15b57b9f321
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/zugferd/zugferd.sty
@@ -0,0 +1,1132 @@
+%%
+%% This is file `zugferd.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zugferd.dtx (with options: `package')
+%%
+%% Copyright (C) 2023--2024 by Marei Peischl (peiTeX) <marei@peitex.de>
+%%
+\NeedsTeXFormat{LaTeX2e}[2023-11-01]
+\ProvidesExplPackage{zugferd}{2024-09-11}{0.8}{Create ZUGFerd invoices using LaTeX}
+\tl_new:N \l__zugferd_tmp_tl
+\str_new:N \g__zugferd_format_str
+\str_new:N \g__zugferd_businessProcessId_str
+\bool_new:N \g__zugferd_writeTradeContact_bool
+\bool_new:N \g__zugferd_writePaymentMeans_bool
+\str_new:N \g__zugferd_conformance_level_str
+\char_set_catcode_other:N \#%
+\keys_define:nn {zugferd} {
+xrechnung .code:n = {
+\bool_gset_true:N \g__zugferd_writeTradeContact_bool
+\bool_gset_true:N \g__zugferd_writePaymentMeans_bool
+\str_gset:Nn \g__zugferd_conformance_level_str {XRECHNUNG}
+},
+format .choice:,
+format / xrechnung3.0 .code:n = {
+\str_gset:Nx \g__zugferd_format_str {
+urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0
+}
+\str_gset:Nx \g__zugferd_businessProcessId_str {
+urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+}
+\keys_set:nn {zugferd}{xrechnung}
+},
+format / xrechnung2.3 .code:n = {
+\str_gset:Nx \g__zugferd_format_str {
+urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.3
+}
+\keys_set:nn {zugferd}{xrechnung}
+},
+format / basic .code:n = {
+\str_gset:Nx \g__zugferd_format_str {
+urn:cen.eu:en16931:2017#compliant#urn:factur-x.eu:1p0:basic
+}
+\bool_gset_false:N \g__zugferd_writeTradeContact_bool
+\bool_gset_false:N \g__zugferd_writePaymentMeans_bool
+\str_gset:Nn \g__zugferd_conformance_level_str {BASIC}
+},
+format / xrechnung .meta:n = { format = xrechnung3.0 },
+format .initial:n = xrechnung,
+format .usage:n = load,
+write-xml .bool_gset:N = \g__zugferd_write_xml_bool,
+write-xml .initial:n = true,
+write-xml .usage:n = load,
+zugferd .bool_gset:N = \g__zugferd_active_bool,
+zugferd .initial:n = true,
+zugferd .default:n = true,
+zugferd .usage:n = load,
+ZUGFerD .meta:n = {zugferd = #1},
+xml-file .tl_gset:N = \g__zugferd_xml_file_tl,
+xml-file .initial:n = \jobname _zugferd.xml,
+xml-file .usage:n = load,
+auto-exemption .bool_gset:N = \g__zugferd_auto_exemption_bool,
+auto-exemption .initial:n = true,
+auto-exemption .default:n = true,
+auto-exemption .usage:n =load,
+}
+\char_set_catcode_parameter:N \#%
+
+\ProcessKeyOptions[zugferd]
+\iow_new:N \__zugferd_xml_writer_iow
+\bool_if:NT \g__zugferd_active_bool {
+\cs_if_exist:NF \pdfmeta_xmp_xmlns_new:nn {
+\msg_new:nnnn {zugferd} {PDFmanagement-not-active} {
+The~\LaTeX~PDF~management~is~not~active.\\
+Activate~it~using~\string\DocumentMetadata.
+} {
+See~ZUGFeRD~or~PDFmanagement~documentation~for~more~information.
+}
+\msg_error:nn{zugferd} {PDFmanagement-not-active}
+}
+%% based on experiments for l3pdfmeta by Ulrike Fischer
+\pdfmeta_xmp_xmlns_new:nn {fx}{
+urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0\c_hash_str
+}
+
+\cs_generate_variant:Nn \__pdfmeta_xmp_schema_new:nnn {nne}
+
+\__pdfmeta_xmp_schema_new:nne
+ {Factur-X~PDFA~Extension~Schema}
+ {fx}
+ {urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0\c_hash_str}
+
+\__pdfmeta_xmp_property_new:nnnnn
+ {fx}
+ {DocumentFileName}
+ {Text}
+ {external}
+ {name~of~the~embedded~XML~invoice~file}
+
+\__pdfmeta_xmp_property_new:nnnnn
+ {fx}
+ {DocumentType}
+ {Text}
+ {external}
+ {INVOICE}
+
+\__pdfmeta_xmp_property_new:nnnnn
+ {fx}
+ {Version}
+ {Text}
+ {external}
+ {The~actual~version~of~the~factur-x~schema}
+
+\__pdfmeta_xmp_property_new:nnnnn
+ {fx}
+ {ConformanceLevel}
+ {Text}
+ {external}
+ {The~conformance~level~of~the~factur-x~data}
+
+\exp_args:Ne \pdfmeta_xmp_add:n {
+<fx:DocumentType>INVOICE</fx:DocumentType>\iow_newline:
+<fx:DocumentFileName>factur-x.xml</fx:DocumentFileName>\iow_newline:
+<fx:Version>1.0</fx:Version>\iow_newline:
+<fx:ConformanceLevel>\g__zugferd_conformance_level_str</fx:ConformanceLevel>%
+\iow_newline:
+}
+}
+\NewDocumentCommand{\SetZUGFeRDData}{sm}{
+\IfBooleanTF{#1}
+{\keys_set:ne}
+{\keys_set:nn}
+{zugferd} {#2}
+}
+\let\SetZugferdData\SetZUGFeRDData
+\NewDocumentCommand{\InsertZUGFeRDData}{om}{
+\str_case:nnF {#1} {
+{AddressData} {
+\clist_map_inline:nn {name, lineone, linetwo} {
+\prop_if_in:cnT {g__zugferd_#2_AddressData_prop } {##1} {
+\prop_item:cn {g__zugferd_#2_AddressData_prop } {##1}\\
+}
+}
+\prop_item:cn {g__zugferd_#2_AddressData_prop } {postcode}
+\space
+\prop_item:cn {g__zugferd_#2_AddressData_prop } {city}
+}
+{set-today} {
+\__zugferd_set_today:v {g__zugferd_#2_tl}
+}
+} {
+\str_set:Ne \l_tmpa_str {#2}
+\str_replace_all:Nnn \l_tmpa_str {-} {_}
+\str_replace_all:Nnn \l_tmpa_str {/} {_}
+\bool_set_true:N \g_tmpa_bool
+\clist_map_inline:nn {tl, str} {
+\clist_map_inline:nn {g, l} {
+\use:c {##1 _if_exist:cT} {####1__zugferd_ \l_tmpa_str _##1}
+{
+\use:c {####1__zugferd_ \l_tmpa_str _##1}
+\bool_gset_false:N \g_tmpa_bool
+}
+\bool_if:NF \g_tmpa_bool {\clist_map_break:}
+}
+\bool_if:NF \g_tmpa_bool {\clist_map_break:}
+}
+}
+}
+\providecommand{\InsertZugferdData}{\InsertZUGFeRDData}
+\providecommand{\insertZugferdData}{\InsertZUGFeRDData}
+\cs_new:Nn \__zugferd_set_today:n {
+\__zugferd_set_today_aux:w #1 \q_stop
+}
+\cs_generate_variant:Nn \__zugferd_set_today:n {v}
+\cs_new:Npn \__zugferd_set_today_aux:w #1 #2 #3 #4 #5 #6 #7 #8 \q_stop{
+\int_set:Nn \year {#1#2#3#4}
+\int_set:Nn \month {#5#6}
+\int_set:Nn \day {#7#8}
+}
+\NewDocumentEnvironment{ZUGFeRD}{o}{
+\IfNoValueF{#1}{
+\SetZUGFeRDData{#1}
+}
+\zugferd_enable_XML_interfaces:
+\startWritingZUGFeRDxml
+\zugferd_write_Header:
+\ignorespaces
+}{
+\zugferd_enable_XML_interfaces:
+\zugferd_write_Footer:
+\stopWritingZUGFeRDxml
+\zugferd_disable_XML_interfaces:
+}
+\newcommand*{\startWritingZUGFeRDxml}{
+\begingroup
+\bool_if:NTF \g__zugferd_write_xml_bool {
+\char_set_active_eq:nN {13} \__zugferd_xml_newline_indent:
+\iow_open:Nn \__zugferd_xml_writer_iow {\g__zugferd_xml_file_tl}
+}{
+\msg_info:nn {zugferd} {no-xml-write}
+}
+}
+\msg_new:nnn {zugferd} {no-xml-write} {
+The~option~write-xml=false~was~set.\\
+Writing~of~XML~file~is~deactivated.
+}
+%% The metadata elements are taken by Ulrike Fischer's faktur-x experiments
+%% https://github.com/latex3/pdfresources/tree/main/experiments/factur-x-bills
+\newcommand*{\stopWritingZUGFeRDxml}{%
+\bool_if:NT \g__zugferd_write_xml_bool
+{\iow_close:N \__zugferd_xml_writer_iow}%
+\endgroup
+\bool_if:NT \g__zugferd_active_bool {
+\group_begin:
+\pdfdict_put:nnn {l_pdffile/Filespec} {AFRelationship}{/Alternative}
+\pdfdict_put:nnn {l_pdffile/Filespec} {Desc}{(Factur-X/ZUGFeRD-Rechnung)}
+\pdffile_embed_file:nnn {\g__zugferd_xml_file_tl}{factur-x.xml}
+{zugferd/rechnung}
+\group_end:
+\pdfmanagement_add:nnx
+{Catalog/Names}
+{EmbeddedFiles}
+{\pdf_object_ref:n{zugferd/rechnung}}
+\pdfmanagement_add:nnx{Catalog}{AF}{\pdf_object_ref:n{zugferd/rechnung}}
+}
+}
+%% Code using the data for visible representation
+\cs_new:Nn \zugferd_enable_XML_interfaces: {
+\bool_if:NT \g__zugferd_write_xml_bool {
+\cs_gset:Nn \zugferd_write_Header: {
+\__zugferd_insert_Header:
+\__zugferd_insert_FrontMatter:
+}
+\cs_gset:Nn \zugferd_write_Footer: {
+\__zugferd_insert_Footer:
+}
+\cs_gset_eq:NN \zugferd_write_Item:nnnnnn
+\__zugferd_insert_TradeLineItem:nnnnnn
+\cs_gset:Nn \zugferd_startInvoiceSums: {
+\__zugferd_ApplicableHeaderTradeAgreement:
+\__zugferd_ApplicableHeaderTradeSettlement_start:
+\__zugferd_SpecifiedTradeSettlementPaymentMeans:
+}
+\cs_gset:Nn \zugferd_stopInvoiceSums: {
+\__zugferd_ApplicableHeaderTradeSettlement_stop:
+}
+\cs_gset_eq:NN \zugferd_write_TaxEntry:nnnn \__zugferd_ApplicableTradeTax:nnnn
+\cs_gset:Nn \zugferd_write_Summation:nnnnnnnn {
+\__zugferd_SpecifiedTradePaymentTerms:
+\__zugferd_SpecifiedTradeSettlementHeaderMonetarySummation:nnnnnnnn
+{##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8}
+}
+}
+}
+\cs_new:Nn \zugferd_disable_XML_interfaces: {
+\cs_gset_eq:NN \zugferd_write_Header: \prg_do_nothing:
+\cs_gset_eq:NN \zugferd_write_Footer: \prg_do_nothing:
+\cs_gset_eq:NN \zugferd_write_Item:nnnnnn \use_none:nnnnnn
+\cs_gset_eq:NN \zugferd_startInvoiceSums: \prg_do_nothing:
+\cs_gset_eq:NN \zugferd_stopInvoiceSums: \prg_do_nothing:
+\cs_gset_eq:NN \zugferd_write_TaxEntry:nnnn \use_none:nnnn
+\cs_gset_eq:NN \zugferd_write_Summation:nnnnnnnn \use_none:nnnnnnnn
+}
+\bool_if:NTF \g__zugferd_write_xml_bool {
+\zugferd_enable_XML_interfaces:
+}{
+\zugferd_disable_XML_interfaces:
+}
+\bool_if:NTF \g__zugferd_write_xml_bool {
+\cs_new:Nn \__zugferd_write_xml:n {
+\iow_now:Ne \__zugferd_xml_writer_iow {\__zugferd_xml_auto_indent: #1}
+}
+\cs_new_eq:NN \__zugferd_define_xml_writer:Nn \cs_new:Nn
+\cs_new_eq:NN \__zugferd_define_xml_content:Nn \cs_new:Nn
+} {
+\cs_set_eq:NN \__zugferd_write_xml:n \use_none:n
+\cs_set:Nn \__zugferd_define_xml_writer:Nn {\cs_new:Nn #1 {}}
+\cs_set:Nn \__zugferd_define_xml_content:Nn {\cs_new:Nn #1 {}}
+}
+
+\cs_generate_variant:Nn \__zugferd_write_xml:n {e}
+\RequirePackage{siunitx}
+\cs_new:Nn \__zugferd_number_format:nNn {
+\sisetup{
+parse-numbers=true,
+round-mode=places,
+round-precision=#1,
+round-pad = false,
+group-digits=false,
+minimum-decimal-digits=#1,
+output-decimal-marker=.
+}
+\siunitx_number_format:nN {#3} #2
+}
+\cs_generate_variant:Nn \__zugferd_number_format:nNn {nNe}
+\cs_new:Nn \__zugferd_write_rounded:nnnn {
+\__zugferd_number_format:nNe {#1} \l__zugferd_tmp_tl {#4}
+\__zugferd_write_xml:e {<ram:#2#3>\l__zugferd_tmp_tl</ram:#2>}
+}
+\cs_new:Nn \__zugferd_write_rounded:nnn {
+\__zugferd_write_rounded:nnnn {#1} {#2} {} {#3}
+}
+\int_new:N \g__zugferd_indent_int
+\cs_new:Nn \__zugferd_indent: {
+\space\space
+}
+\cs_new:Nn \__zugferd_indent:n {
+\prg_replicate:nn {#1} {\__zugferd_indent:}
+}
+\cs_new:Nn \__zugferd_xml_auto_indent: {
+\__zugferd_indent:n {\g__zugferd_indent_int}
+}
+\cs_new:Nn \__zugferd_xml_newline_indent: {
+\iow_newline: \__zugferd_xml_auto_indent:
+}
+\cctab_new:N \g__zugferd_xml_cctab
+\begingroup%
+\endlinechar=13%
+\char_set_catcode:nn {13}{13}%
+\cctab_gsave_current:N \g__zugferd_xml_cctab%
+\endgroup
+%% modified list taken from hyperref.sty v7.01i
+%% Copyright
+%% 1995-2001 Sebastian Rahtz, with portions written by David Carlisle and Heiko Oberdiek
+%% 2001-2015 Heiko Oberdiek
+%% 2016-2019 Oberdiek Package Support Group
+%% 2019-2024 LaTeX Project
+%% modifications have been made to support the mechanism if hyperref is not loaded
+\cs_new:Nn \zugferd_disable_macros: {
+\let\{\textbraceleft
+\let\}\textbraceright
+\let\\\textbackslash
+\let\#\textnumbersign
+\let\$\textdollar
+\let\%\textpercent
+\let\&\textampersand
+\let\_\textunderscore
+\let\P\textparagraph
+\let\ldots\textellipsis
+\let\dots\textellipsis
+\def\\{\space}%
+\def\newline{\space}%
+\def\TeX{TeX}%
+\def\LaTeX{La\TeX}%
+\def\LaTeXe{\LaTeX2e}%
+\def\eTeX{e-\TeX}%
+\def\SliTeX{Sli\TeX}%
+\def\MF{Metafont}%
+\def\MP{Metapost}%
+\let\fontencoding\@gobble
+\let\fontfamily\@gobble
+\let\fontseries\@gobble
+\let\fontshape\@gobble
+\let\fontsize\@gobbletwo
+\let\selectfont\@empty
+\let\usefont\@gobblefour
+\let\emph\@firstofone
+\let\textnormal\@firstofone
+\let\textrm\@firstofone
+\let\textsf\@firstofone
+\let\texttt\@firstofone
+\let\textbf\@firstofone
+\let\textmd\@firstofone
+\let\textit\@firstofone
+\let\textsc\@firstofone
+\let\textsl\@firstofone
+\let\textup\@firstofone
+\let\normalfont\@empty
+\let\rmfamily\@empty
+\let\sffamily\@empty
+\let\ttfamily\@empty
+\let\bfseries\@empty
+\let\mdseries\@empty
+\let\itshape\@empty
+\let\scshape\@empty
+\let\slshape\@empty
+\let\upshape\@empty
+\let\em\@empty
+\let\rm\@empty
+\let\Huge\@empty
+\let\LARGE\@empty
+\let\Large\@empty
+\let\footnotesize\@empty
+\let\huge\@empty
+\let\large\@empty
+\let\normalsize\@empty
+\let\scriptsize\@empty
+\let\small\@empty
+\let\tiny\@empty
+\let\mathversion\@gobble
+\let\phantom\@gobble
+\let\vphantom\@gobble
+\let\hphantom\@gobble
+\let\ding\HyPsd@ding
+\let\Cube\HyPsd@DieFace
+\def\begin##1{\csname##1\endcsname}%
+\def\end##1{\csname end##1\endcsname}%
+\def\textcolor##1##{\@secondoftwo}%
+\def\TextOrMath{\ifmmode\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}%
+\let\foreignlanguage\@secondoftwo
+\let\textlatin\@firstofone
+\let\cyr\relax
+\let\glqq\textglqq
+\let\grqq\textgrqq
+\let\glq\textglq
+\let\grq\textgrq
+\let\flqq\textflqq
+\let\frqq\textfrqq
+\let\flq\textflq
+\let\frq\textfrq
+\let\if@mid@expandable\@firstoftwo
+\let\hspace\@gobble
+\let\label\@gobble
+\let\index\@gobble
+\let\glossary\@gobble
+\let\@mkboth\@gobbletwo
+\let\leavevmode\@empty
+\let\mbox\@empty
+\def\halign{\@gobble}%
+\let\Hy@SectionAnchorHref\@gobble
+\let\ref\@gobble
+\let\href\@gobble
+\let\pageref\@gobble
+\let\nameref\@gobble
+\let\autoref\@gobble
+\let\ignorespaces\relax
+\let\ensuremath\@firstofone
+\hook_use:n {zugferd/disable-macros}
+}
+\hook_new:n {zugferd/disable-macros}
+\seq_new:N \g__zugferd_notes_seq
+\tl_new:N \g__zugferd_id_tl
+\tl_new:N \g__zugferd_date_tl
+\tl_new:N \g__zugferd_delivery_date_tl
+\tl_new:N \g__zugferd_subject_tl
+\tl_new:N \g__zugferd_fromaddress_tl
+\tl_new:N \g__zugferd_DocumentTypeCode_tl
+\tl_new:N \l__zugferd_currency_tl
+\keys_define:nn { zugferd } {
+document-type .choice:,
+document-type / commercial-invoice .code:n =
+\tl_gset:Nn \g__zugferd_DocumentTypeCode_tl {380},
+document-type .initial:n = commercial-invoice,
+id .choice:,
+id / komavar .code:n = \tl_gset:Nf \g__zugferd_id_tl {\scr@invoice@var},
+id / unknown .code:n = \tl_gset:Nn \g__zugferd_id_tl {#1},
+currency .choices:nn = {EUR, USD, CHF} {
+\tl_set_eq:NN \l__zugferd_currency_tl \l_keys_choice_tl
+},
+currency / € .meta:n = {currency = EUR},
+currency / unknown .code:n = {
+\exp_args:Nnnx \keys_if_choice_exist:nnnTF {zugferd} {unit} {
+\str_uppercase:f {#1}
+}
+{\keys_set:nx { zugferd } {unit= {\str_uppercase:f {#1}}}}
+{
+\msg_warning:nnn { zugferd } {unknown-value} {currency} {#1}
+\tl_set:Ne \l__zugferd_currency_tl {\str_uppercase:f {#1}}
+}
+},
+currency .initial:n = EUR,
+date .choice:,
+date / auto .code:n = \tl_gset:Ne \g__zugferd_date_tl {
+\the\year
+\int_compare:nNnT {\month} < {10} {0} \the\month
+\int_compare:nNnT {\day} < {10} {0}\the\day
+},
+date / unknown .code:n = \tl_gset:Nn \g__zugferd_date_tl {#1},
+date .initial:n = auto,
+delivery-date .choice:,
+delivery-date / auto .code:n = \tl_gset:Ne \g__zugferd_delivery_date_tl {
+\the\year
+\int_compare:nNnT {\month} < {10} {0} \the\month
+\int_compare:nNnT {\day} < {10} {0}\the\day
+},
+delivery-date / unknown .code:n = {
+\tl_gset:Nn \g__zugferd_delivery_date_tl {#1}
+},
+delivery-date .initial:n = auto,
+due-date .tl_gset:N = \__zugferd_due_date_tl,
+due-date .initial:n =,
+payment-terms .str_gset:N = \__zugferd_payment_terms_str,
+payment-terms .initial:n =,
+subject .choice:,
+subject / komavar .code:n = {
+\tl_gset:Nf \g__zugferd_subject_tl {\scr@subject@var}
+},
+subject / unknown .code:n = \tl_gset:Nn \g__zugferd_subject_tl {#1},
+fromaddress .choice:,
+fromaddress / komavar .code:n = \tl_gset:Nf \g__zugferd_fromaddress_tl
+{\scr@fromaddress@var},
+fromaddress / unknown .code:n = \tl_gset:Nn \g__zugferd_fromaddress_tl {#1},
+add-note .code:n = \seq_gput_right:Nn \g__zugferd_notes_seq {#1},
+}
+\msg_new:nnnn {zugferd} {unknown-value} {
+You~selected~a~#1~which~was~not~predefined.\\
+I~will~directly~use~your~selection~'#1=#2'.
+Please~ensure~the~selection~is~valid!
+} {
+For~more~information~see~the~zugferd~documentation.
+}
+\cs_new:Nn \__zugferd_note_if_not_empty:N {%
+\tl_if_empty:NF #1 {%
+\__zugferd_write_note:n {#1}%
+}%
+}%
+\clist_map_inline:nn {seller,buyer,shipto} {
+\prop_new:c {g__zugferd_#1_AddressData_prop}
+\keys_define:nn {zugferd / #1} {
+address .code:n = {
+\seq_set_split:Nnn \l_tmpa_seq {\\} {##1}
+\keys_set:nx {zugferd / #1} {
+lineone=\seq_item:Nn \l_tmpa_seq {1},
+linetwo=\seq_item:Nn \l_tmpa_seq {2}
+}
+},
+contact .code:n = {
+\seq_set_split:Nnn \l_tmpa_seq {\\} {##1}
+\int_compare:nNnTF {\seq_count:N \l_tmpa_seq} > {3} {
+\keys_set:ne {zugferd/#1} {
+contact-name = \seq_item:Nn \l_tmpa_seq {1},
+contact-department = \seq_item:Nn \l_tmpa_seq {2},
+contact-phone = \seq_item:Nn \l_tmpa_seq {3},
+contact-email= \seq_item:Nn \l_tmpa_seq {4}
+}
+}{
+\keys_set:ne {zugferd/#1} {
+contact-name = \seq_item:Nn \l_tmpa_seq {1},
+contact-phone = \seq_item:Nn \l_tmpa_seq {2},
+contact-email= \seq_item:Nn \l_tmpa_seq {3}
+}
+}
+},
+unknown .code:n = \tl_if_blank:nF {##1} {
+\prop_gput:cVe {g__zugferd_#1_AddressData_prop}
+\l_keys_key_tl {\tl_trim_spaces:n {##1}}
+}
+}
+}
+\cs_new:Nn \__zugferd_PostalTradeAddress_short:N {
+\exp_args:Ne \tl_if_blank:nF {\prop_item:Nn #1 {name}}
+{<ram:Name>\prop_item:Nn #1 {name}</ram:Name>\iow_newline:\__zugferd_xml_auto_indent:}
+\__zugferd_PostalTradeAddress:eeeee
+{\prop_item:Nn #1 {postcode}}
+{\prop_item:Nn #1 {lineone}}
+{\prop_item:Nn #1 {linetwo}}
+{\prop_item:Nn #1 {city}}
+{\prop_item:Nn #1 {country}}
+}
+\cs_new:Nn \__zugferd_PostalTradeAddress:N {%
+\__zugferd_PostalTradeAddress:eeeeeee
+{\prop_item:Nn #1 {postcode}}
+{\prop_item:Nn #1 {lineone}}
+{\prop_item:Nn #1 {linetwo}}
+{\prop_item:Nn #1 {city}}
+{\prop_item:Nn #1 {country}}
+{\prop_item:Nn #1 {email}}
+{\prop_item:Nn #1 {vatid}}
+}%
+\cs_new:Nn \__zugferd_DefinedTradeContact:N {%
+\__zugferd_DefinedTradeContact:eeee
+{\prop_item:Nn #1 {contact-name}}
+{\prop_item:Nn #1 {contact-department}}
+{\prop_item:Nn #1 {contact-phone}}
+{\prop_item:Nn #1 {contact-email}}
+}%
+\cctab_begin:N \g__zugferd_xml_cctab%
+\__zugferd_define_xml_content:Nn \__zugferd_PostalTradeAddress:nnnnn {%
+<ram:PostalTradeAddress>
+\__zugferd_indent: <ram:PostcodeCode>#1</ram:PostcodeCode>
+\tl_if_blank:nF {#2} {%
+\__zugferd_indent: <ram:LineOne>#2</ram:LineOne>
+}%
+\tl_if_blank:nF {#3} {%
+\__zugferd_indent: <ram:LineTwo>#3</ram:LineTwo>
+}%
+\__zugferd_indent: <ram:CityName>#4</ram:CityName>
+\__zugferd_indent: <ram:CountryID>#5</ram:CountryID>
+</ram:PostalTradeAddress>%
+}
+\__zugferd_define_xml_content:Nn \__zugferd_PostalTradeAddress:nnnnnnn {%
+\__zugferd_PostalTradeAddress:nnnnn {#1} {#2} {#3} {#4} {#5}
+\tl_if_empty:nF {#6} {%
+<ram:URIUniversalCommunication>
+\__zugferd_indent: <ram:URIID~schemeID="EM">#6</ram:URIID>
+</ram:URIUniversalCommunication>%
+}%
+\tl_if_empty:nF {#7} {
+<ram:SpecifiedTaxRegistration>
+\__zugferd_indent: <ram:ID~schemeID="VA">#7</ram:ID>
+</ram:SpecifiedTaxRegistration>%
+}%
+}%
+\__zugferd_define_xml_content:Nn \__zugferd_DefinedTradeContact:nnnn {%
+\tl_if_blank:nT {#1} {\use_none:nnn} %
+\bool_if:NT \g__zugferd_writeTradeContact_bool {%
+<ram:DefinedTradeContact>
+\__zugferd_indent: <ram:PersonName>#1</ram:PersonName>
+\tl_if_blank:nF {#2} {%
+\__zugferd_indent: <ram:DepartmentName>#2</ram:DepartmentName>
+}%
+\tl_if_blank:nF {#3} {%
+\__zugferd_indent: <ram:TelephoneUniversalCommunication>
+\__zugferd_indent:n {2} <ram:CompleteNumber>#3</ram:CompleteNumber>
+\__zugferd_indent: </ram:TelephoneUniversalCommunication>
+}%
+\tl_if_blank:nF {#4} {%
+\__zugferd_indent: <ram:EmailURIUniversalCommunication>
+\__zugferd_indent:n {2} <ram:URIID>#4</ram:URIID>
+\__zugferd_indent: </ram:EmailURIUniversalCommunication>
+}%
+</ram:DefinedTradeContact>%
+}%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_ApplicableHeaderTradeAgreement: {%
+\__zugferd_write_xml:n {<ram:ApplicableHeaderTradeAgreement>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+<ram:BuyerReference>\g__zugferd_buyer_reference_tl</ram:BuyerReference>
+<ram:SellerTradeParty>%
+}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+<ram:Name>\prop_item:Nn \g__zugferd_seller_AddressData_prop {name}</ram:Name>
+\__zugferd_DefinedTradeContact:N \g__zugferd_seller_AddressData_prop%
+\__zugferd_PostalTradeAddress:N \g__zugferd_seller_AddressData_prop%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+</ram:SellerTradeParty>
+<ram:BuyerTradeParty>%
+}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+<ram:Name>\prop_item:Nn \g__zugferd_buyer_AddressData_prop {name}</ram:Name>
+\__zugferd_DefinedTradeContact:N \g__zugferd_buyer_AddressData_prop%
+\__zugferd_PostalTradeAddress:N \g__zugferd_buyer_AddressData_prop%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:BuyerTradeParty>}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:ApplicableHeaderTradeAgreement>}
+\__zugferd_ApplicableHeaderTradeDelivery:V \g__zugferd_delivery_date_tl%
+}%
+\__zugferd_define_xml_content:Nn \__zugferd_ApplicableHeaderTradeDelivery:n {%
+\bool_lazy_and:nnF {\prop_if_empty_p:N \g__zugferd_shipto_AddressData_prop}%
+{\tl_if_blank_p:n {#1}}%
+{%
+\__zugferd_write_xml:n {<ram:ApplicableHeaderTradeDelivery>}%
+\prop_if_empty:NF \g__zugferd_shipto_AddressData_prop {%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {<ram:ShipToTradeParty>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+\__zugferd_PostalTradeAddress_short:N \g__zugferd_shipto_AddressData_prop%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:ShipToTradeParty>}%
+\int_gdecr:N \g__zugferd_indent_int%
+}%
+\tl_if_blank:nF {#1} {%
+\__zugferd_write_xml:n {%
+\__zugferd_indent: <ram:ActualDeliverySupplyChainEvent>
+\__zugferd_indent:n {2} <ram:OccurrenceDateTime>
+\__zugferd_indent:n {3}<udt:DateTimeString~format="102">#1</udt:DateTimeString>
+\__zugferd_indent:n {2} </ram:OccurrenceDateTime>
+\__zugferd_indent: </ram:ActualDeliverySupplyChainEvent>%
+}%
+}%
+\__zugferd_write_xml:n {</ram:ApplicableHeaderTradeDelivery>}%
+}%
+}%
+\cctab_end:
+\cs_generate_variant:Nn \__zugferd_DefinedTradeContact:nnnn {eeee}
+\cs_generate_variant:Nn \__zugferd_PostalTradeAddress:nnnnn {eeeee}%
+\cs_generate_variant:Nn \__zugferd_PostalTradeAddress:nnnnnnn {eeeeeee}
+\cs_generate_variant:Nn \__zugferd_ApplicableHeaderTradeDelivery:n {V}
+\tl_new:N \g__zugferd_buyer_reference_tl
+\keys_define:nn {zugferd/buyer} {
+reference .choice:,
+reference / komavar .code:n = {
+\tl_gset:Nf \g__zugferd_buyer_reference_tl {\scr@yourref@var}
+},
+reference / unknown .code:n = {
+\tl_gset:Nn \g__zugferd_buyer_reference_tl {#1}
+}
+}
+\ExplSyntaxOff
+\providecommand*{\zugferd@paymentMeans@german}{
+ 1 = Keine Zahlungsart definiert,
+10 = Bargeld,
+30 = Überweisung,
+42 = Zahlung an Bankkonto,
+48 = Kartenzahlung,
+49 = Lastschriftverfahren,
+57 = Dauerauftrag,
+58 = Zahlung per SEPA Überweisung.,
+59 = SEPA Lastschrift,
+97 = Ausgleich zwischen Partnern
+}
+\def\zugferd@paymentMeans@ngerman{\zugferd@paymentMeans@german}
+\providecommand*{\zugferd@paymentMeans@english}{
+ 1 = Instrument not defined,
+10 = In cash,
+30 = Credit Transfer,
+31 = Debit Transfer,
+42 = Payment to bank account,
+48 = Bank card,
+49 = Direct Debit,
+57 = Standing agreement,
+58 = SEPA credit transfer,
+59 = SEPA direct debit,
+97 = Clearing between partners
+}
+\ExplSyntaxOn
+\tl_new:N \g__zugferd_payment_means_tl
+\keys_define:nn {zugferd} {
+payment-means / type .choices:nn = {1,10,30,42,48,49,57,58,59,97} {
+\tl_gset_eq:NN \g__zugferd_payment_means_tl \l_keys_choice_tl
+},
+payment-means / unknown .code:n = {
+\msg_warning:nnn { zugferd } {unknown-value} {payment-means} {#1}
+\tl_gset:Nn \g__zugferd_payment_means_tl {\int_eval:n {#1}}
+}
+}
+
+\clist_map_inline:nn {iban,account-holder,bic} {
+\keys_define:nn {zugferd/payment-means} {
+#1 .tl_gset:c = {g__zugferd_payment_#1_tl}
+}
+}
+
+\prop_new:c {g__zugferd_payment-means_names_prop}
+\newcommand*{\setupZUGFeRDStrings}[2]{
+\prop_gset_from_keyval:cn {g__zugferd_#1_names_prop} {
+#2
+}
+}
+
+\hook_gput_code:nnn {begindocument/end}{zugferd/payment-means}{
+\prop_if_empty:cT {g__zugferd_payment-means_names_prop} {
+\exp_args:Nne \setupZUGFeRDStrings{payment-means}{
+\use:c {zugferd@paymentMeans@
+\cs_if_exist:cTF {zugferd@paymentMeans@\languagename} {\languagename} {english}
+}
+}
+}
+}
+\keys_define:nn { zugferd } {
+unit .choices:nn = {HUR,DAY,C62,H87} {
+\tl_set_eq:NN \l__zugferd_unit_code_tl \l_keys_choice_tl
+},
+unit / hour .meta:n = {unit=HUR},
+unit / day .meta:n = {unit=DAY},
+unit / one .meta:n= {unit= C62},
+unit / piece .meta:n = {unit=H87},
+unit / unknown .code:n = {
+\tl_set:Nx \l_tmpa_tl {\str_uppercase:f {#1}}
+\exp_args:NnnV \keys_if_choice_exist:nnnTF {zugferd} {unit}
+\l_tmpa_tl
+{
+\keys_set:ne { zugferd } {unit= {\l_tmpa_tl}}
+} {
+\msg_warning:nnn { zugferd } {unknown-unit} {#1}
+\tl_set_eq:NN \l__zugferd_unit_code_tl \l_tmpa_tl
+}
+},
+unit .usage:n = general,
+}
+
+\msg_new:nnnn {zugferd} {unknown-unit} {
+You~selected~a~unit~which~was~not~predefined.\\
+I~~will~directly~use~your~selection~'unit=#1'~as~Common~Code.
+Please~ensure~the~selection~is~valid!
+} {
+For~more~information~see~the~zugferd~documentation\\
+and~the~/UN/CEFACT~Common~Code~list.
+}
+\msg_new:nnnn {zugferd} {unknown-tax-category} {
+You~selected~an~unknown~tax~category.\\
+I~~will~directly~use~your~selection~'category=#1'~as~Code.\\
+Please~ensure~the~selection~is~valid!
+} {
+For~more~information~see~the~zugferd~documentation\\
+and~the~corresponding~code~list.
+}
+\msg_new:nnnn {zugferd} {no-auto-exemption} {
+You~selected~tax/category=#1~together~with~the~auto-exemption~option.\\
+I~don't~have~any~pre-configured~exemption~setting~for~category=#1.\\
+Please~make~sure~you~add~a~valid~setting~yourself.
+} {
+For~more~information~see~the~zugferd~documentation.
+}
+\keys_define:nn { zugferd / tax } {
+category .choices:nn = {S,Z,E,AE,K,G,O,L,M} {
+\tl_set_eq:NN \l__zugferd_tax_category_code_tl \l_keys_choice_tl
+\bool_if:NT \g__zugferd_auto_exemption_bool {
+\keys_if_choice_exist:nnnTF {zugferd/tax} {exemption-reason-auto} {#1} {
+\keys_set:nn {zugferd/tax} {exemption-reason-auto=#1}
+} {
+\msg_warning:nnn { zugferd } {no-auto-exemption} {#1}
+}
+}
+},
+exemption-reason .tl_set:N = \l__zugferd_tax_exemption_reason_tl,
+exemption-reason .initial:V = \c_empty_tl,
+exemption-reason .usage:n = general,
+exemption-reason-code .tl_set:N = \l__zugferd_tax_exemption_code_tl,
+exemption-reason-code .initial:V = \c_empty_tl,
+exemption-reason .usage:n = general,
+exemption-reason-auto .choice:,
+exemption-reason-auto / S .code:n = {
+\keys_set:nn {zugferd/tax} {exemption-reason=,exemption-reason-code=}
+},
+exemption-reason-auto / K .code:n = {
+\keys_set:nn {zugferd/tax} {
+exemption-reason= Intra-Community~Supply,
+exemption-reason-code={vatex-eu-ic}
+}
+},
+exemption-reason-auto / AE .code:n = {
+\keys_set:nn {zugferd/tax}{
+exemption-reason=Reverse~Charge,
+exemption-reason-code={vatex-eu-ae}
+}
+},
+exemption-reason-auto / G .code:n = {
+\keys_set:nn {zugferd/tax}{
+exemption-reason=Export~outside~the~EU,
+exemption-reason-code={vatex-eu-g}
+}
+},
+exemption-reason-auto / O .code:n = {
+\keys_set:nn {zugferd/tax}{
+exemption-reason=No~subject~to~VAT,
+exemption-reason-code={vatex-eu-o}
+}
+},
+standard .meta:n = {category=S},
+zero .meta:n = {category=Z},
+exempt .meta:n = {category=E},
+reverse-charge .meta:n = {category=AE},
+intra-community .meta:n = {category=K},
+EEA .meta:n = {category=K},
+export .meta:n = {category=G},
+canary-islands .meta:n = {category=L},
+ceuta .meta:n = {category=M},
+melilla .meta:n = {category=M},
+category / unknown .code:n = {
+\exp_args:Nnnx \keys_if_choice_exist:nnnTF {zugferd} {category}
+{\str_uppercase:f {#1}}
+{
+\keys_set:nx { zugferd } {category= {\str_uppercase:f {#1}}}
+} {
+\msg_warning:nnn { zugferd } {unknown-tax-category} {#1}
+}
+},
+category .initial:n = S,
+category .usage:n = general,
+rate .fp_set:N = \l__zugferd_tax_rate_fp,
+rate .initial:n = 19,
+rate .usage:n = general,
+}
+\__zugferd_define_xml_writer:Nn \__zugferd_write_inline:nn {
+\tl_if_blank:nF {#2} {
+<#1>#2</#1>
+}
+}
+\cs_generate_variant:Nn \__zugferd_write_inline:nn {ne}
+\__zugferd_define_xml_writer:Nn \__zugferd_write_inline_i:nn {
+\__zugferd_indent: \__zugferd_write_inline:nn {#1} {#2}
+}
+\cctab_begin:N \g__zugferd_xml_cctab%
+\__zugferd_define_xml_writer:Nn \__zugferd_write_note:n {%
+\begingroup%
+\let\\\iow_newline:%
+\__zugferd_write_xml:e {%
+<ram:IncludedNote>
+\__zugferd_indent: <ram:Content>
+#1
+\__zugferd_indent: </ram:Content>
+</ram:IncludedNote>%
+}%
+\endgroup%
+}%
+\begingroup%
+\char_set_catcode_other:N \#%
+\char_set_catcode:nn {32}{10}%
+\__zugferd_define_xml_writer:Nn \__zugferd_insert_Header: {%
+\__zugferd_write_xml:e {%
+<?xml version='1.0' encoding='UTF-8' ?>
+<rsm:CrossIndustryInvoice %
+xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" %
+xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" %
+xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" %
+xmlns:xs="http://www.w3.org/2001/XMLSchema" %
+xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">%
+}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {<rsm:ExchangedDocumentContext>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+\str_if_empty:NF \g__zugferd_businessProcessId_str {%
+<ram:BusinessProcessSpecifiedDocumentContextParameter>
+\__zugferd_indent: <ram:ID>\g__zugferd_businessProcessId_str</ram:ID>
+</ram:BusinessProcessSpecifiedDocumentContextParameter>
+}%
+<ram:GuidelineSpecifiedDocumentContextParameter>
+\__zugferd_indent: <ram:ID>\g__zugferd_format_str</ram:ID>
+</ram:GuidelineSpecifiedDocumentContextParameter>%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</rsm:ExchangedDocumentContext>}%
+}%
+\endgroup%
+\__zugferd_define_xml_writer:Nn \__zugferd_insert_FrontMatter: {%
+\__zugferd_write_xml:n {<rsm:ExchangedDocument>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+<ram:ID>\g__zugferd_id_tl</ram:ID>
+<ram:TypeCode>\g__zugferd_DocumentTypeCode_tl</ram:TypeCode>
+<ram:IssueDateTime>
+\__zugferd_indent:<udt:DateTimeString~format="102">\g__zugferd_date_tl</udt:DateTimeString>
+</ram:IssueDateTime>%
+}%
+\__zugferd_note_if_not_empty:N \g__zugferd_subject_tl%
+\__zugferd_note_if_not_empty:N \g__zugferd_fromaddress_tl%
+\seq_map_inline:Nn \g__zugferd_notes_seq {%
+\__zugferd_write_note:n {##1}%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+</rsm:ExchangedDocument>
+<rsm:SupplyChainTradeTransaction>%
+}%
+\int_gincr:N \g__zugferd_indent_int%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_insert_Footer: {%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</rsm:SupplyChainTradeTransaction>}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</rsm:CrossIndustryInvoice>}%
+}%
+\cctab_end:
+\cctab_begin:N \g__zugferd_xml_cctab%
+\__zugferd_define_xml_writer:Nn \__zugferd_AssociatedDocumentLineDocument:n {%
+<ram:AssociatedDocumentLineDocument>
+\__zugferd_indent: <ram:LineID>#1</ram:LineID>
+</ram:AssociatedDocumentLineDocument>%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradeProduct:nn {%
+<ram:SpecifiedTradeProduct>
+\tl_if_empty:nF {#1} {%
+\__zugferd_indent: <ram:SellerAssignedID>#1</ram:SellerAssignedID>
+}%
+\__zugferd_indent: <ram:Name>#2</ram:Name>
+</ram:SpecifiedTradeProduct>%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_ProductTradePrice:nn {%
+<ram:\str_uppercase:n #1PriceProductTradePrice>
+\__zugferd_indent: <ram:ChargeAmount>#2</ram:ChargeAmount>
+</ram:\str_uppercase:n #1PriceProductTradePrice>%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedLineTradeAgreement:nn {%
+<ram:SpecifiedLineTradeAgreement>
+\__zugferd_indent:<ram:GrossPriceProductTradePrice>
+\__zugferd_indent:n {2} <ram:ChargeAmount>#1</ram:ChargeAmount>
+\__zugferd_indent:</ram:GrossPriceProductTradePrice>
+\__zugferd_indent:<ram:NetPriceProductTradePrice>
+\__zugferd_indent:n {2} <ram:ChargeAmount>#2</ram:ChargeAmount>
+\__zugferd_indent:</ram:NetPriceProductTradePrice>
+</ram:SpecifiedLineTradeAgreement>
+}%
+%%%\subsubsection{SpecifiedLineTradeDelivery}%:nn <unit code > <number>
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedLineTradeDelivery:nn {%
+<ram:SpecifiedLineTradeDelivery>
+\__zugferd_indent: <ram:BilledQuantity~unitCode="#1">#2</ram:BilledQuantity>
+</ram:SpecifiedLineTradeDelivery>
+}%
+\__zugferd_define_xml_content:Nn \__zugferd_SpecifiedLineTradeSettlement:nnn {%
+<ram:SpecifiedLineTradeSettlement>
+\__zugferd_indent: <ram:ApplicableTradeTax>
+\__zugferd_indent:n {2} <ram:TypeCode>VAT</ram:TypeCode>
+\__zugferd_indent:n {2} <ram:CategoryCode>#1</ram:CategoryCode>
+\__zugferd_indent:n {2} <ram:RateApplicablePercent>#2</ram:RateApplicablePercent>
+\__zugferd_indent: </ram:ApplicableTradeTax>
+\__zugferd_indent: <ram:SpecifiedTradeSettlementLineMonetarySummation>
+\__zugferd_indent:n {2} <ram:LineTotalAmount>#3</ram:LineTotalAmount>
+\__zugferd_indent: </ram:SpecifiedTradeSettlementLineMonetarySummation>
+</ram:SpecifiedLineTradeSettlement>%
+}%
+\cctab_end:
+\cs_generate_variant:Nn \__zugferd_SpecifiedLineTradeSettlement:nnn {Vnn}
+\cs_new:Nn \__zugferd_SpecifiedLineTradeSettlement:nnnn {
+\msg_warning:nnnn {zugferd} {macro-deprecated}
+{ \__zugferd_SpecifiedLineTradeSettlement:nnnn }
+{ \__zugferd_SpecifiedLineTradeSettlement:nnn }
+\__zugferd_SpecifiedLineTradeSettlement:nnn {#2} {#3} {#4}
+}
+\cs_generate_variant:Nn \__zugferd_SpecifiedLineTradeSettlement:nnnn {VVnn}
+\__zugferd_define_xml_writer:Nn \__zugferd_insert_TradeLineItem:nnnnnn {
+\__zugferd_write_xml:n {<ram:IncludedSupplyChainTradeLineItem>}
+\int_gincr:N \g__zugferd_indent_int
+\__zugferd_write_xml:e {\__zugferd_AssociatedDocumentLineDocument:n {#1}}%
+
+\begingroup
+\zugferd_disable_macros:
+\__zugferd_write_xml:e {\__zugferd_SpecifiedTradeProduct:nn {#2} {#3}}
+\endgroup
+
+\__zugferd_write_xml:n {<ram:SpecifiedLineTradeAgreement>}
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {\__zugferd_ProductTradePrice:nn {net} {#4}}
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:SpecifiedLineTradeAgreement>}
+\__zugferd_write_xml:e {%
+\__zugferd_SpecifiedLineTradeDelivery:nn { \l__zugferd_unit_code_tl } {#5}
+\__zugferd_SpecifiedLineTradeSettlement:Vnn \l__zugferd_tax_category_code_tl %
+{ \fp_use:N \l__zugferd_tax_rate_fp} {#6}
+}%
+\int_gdecr:N \g__zugferd_indent_int
+\__zugferd_write_xml:n {</ram:IncludedSupplyChainTradeLineItem>}
+}
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradeSettlementHeaderMonetarySummation:nnnnnnnn {%
+\__zugferd_write_xml:n {<ram:SpecifiedTradeSettlementHeaderMonetarySummation>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_rounded:nnn {2} {LineTotalAmount} {#1}
+\__zugferd_write_rounded:nnn {2} {ChargeTotalAmount} {#2}
+\__zugferd_write_rounded:nnn {2} {AllowanceTotalAmount} {#3}
+\__zugferd_write_rounded:nnn {2} {TaxBasisTotalAmount} {#4}
+\__zugferd_write_rounded:nnnn {2} {TaxTotalAmount} {~currencyID="\l__zugferd_currency_tl "} {#5}
+\__zugferd_write_rounded:nnn {2} {GrandTotalAmount} {#6}
+\__zugferd_write_rounded:nnn {2} {TotalPrepaidAmount} {#7}
+\__zugferd_write_rounded:nnn {2} {DuePayableAmount} {#8}
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:SpecifiedTradeSettlementHeaderMonetarySummation>}%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_ApplicableTradeTax:nnnn {%
+\__zugferd_write_xml:n {<ram:ApplicableTradeTax>}
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_rounded:nnn {2} {CalculatedAmount} {#4}%BT117
+\__zugferd_write_xml:n {<ram:TypeCode>VAT</ram:TypeCode>}%BT118
+\tl_if_blank:VF \l__zugferd_tax_exemption_reason_tl {%BT-120
+\__zugferd_write_xml:e {<ram:ExemptionReason>
+\l__zugferd_tax_exemption_reason_tl
+</ram:ExemptionReason>}
+}
+{{\__zugferd_write_rounded:nnn {2} {BasisAmount} {#3}}}%BT-116
+\__zugferd_write_xml:e {<ram:CategoryCode>#1</ram:CategoryCode>}%BT-118
+\tl_if_blank:VF \l__zugferd_tax_exemption_code_tl {%BT121
+\__zugferd_write_xml:e {<ram:ExemptionReasonCode>
+\l__zugferd_tax_exemption_code_tl
+</ram:ExemptionReasonCode>}
+}
+\__zugferd_write_xml:n {<ram:RateApplicablePercent>#2</ram:RateApplicablePercent>}%BT-119
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:ApplicableTradeTax>}
+}%
+\cctab_begin:N \g__zugferd_xml_cctab%
+\__zugferd_define_xml_writer:Nn \__zugferd_ApplicableHeaderTradeSettlement:nnnnnnnn {%
+
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_ApplicableHeaderTradeSettlement_start: {%
+\__zugferd_write_xml:n {<ram:ApplicableHeaderTradeSettlement>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {<ram:InvoiceCurrencyCode>\l__zugferd_currency_tl</ram:InvoiceCurrencyCode>}%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_ApplicableHeaderTradeSettlement_stop: {%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:ApplicableHeaderTradeSettlement>}%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradePaymentTerms:nn {%
+\__zugferd_write_xml:n {<ram:SpecifiedTradePaymentTerms>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+\tl_if_blank:nF {#1} {%
+<ram:Description>#1</ram:Description>%
+}%
+\tl_if_blank:nF {#2} {%
+<ram:DueDateDateTime>
+\__zugferd_indent: <udt:DateTimeString~format="102">#2</udt:DateTimeString>
+</ram:DueDateDateTime>%
+}%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:SpecifiedTradePaymentTerms>}%
+}%
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradeSettlementPaymentMeans:nnn {%
+\bool_if:NT \g__zugferd_writePaymentMeans_bool {%
+\__zugferd_write_xml:n {<ram:SpecifiedTradeSettlementPaymentMeans>}%
+\int_gincr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:e {%
+<ram:TypeCode>\g__zugferd_payment_means_tl</ram:TypeCode>
+\__zugferd_write_inline:ne {ram:Information} {\prop_item:cV {g__zugferd_payment-means_names_prop} \g__zugferd_payment_means_tl}%
+\tl_if_blank:nF {#1#2} {%
+<ram:PayeePartyCreditorFinancialAccount>
+\__zugferd_write_inline_i:nn {ram:IBANID} {#2}
+\__zugferd_write_inline_i:nn {ram:AccountName} {#1}
+</ram:PayeePartyCreditorFinancialAccount>
+}%
+\tl_if_blank:nF {#3} {%
+<ram:PayeeSpecifiedCreditorFinancialInstitution>
+\__zugferd_write_inline_i:nn {ram:BICID} {#3}
+</ram:PayeeSpecifiedCreditorFinancialInstitution>%
+}%
+}%
+\int_gdecr:N \g__zugferd_indent_int%
+\__zugferd_write_xml:n {</ram:SpecifiedTradeSettlementPaymentMeans>}%
+}%
+}%
+\cctab_end:
+\cs_generate_variant:Nn \__zugferd_SpecifiedTradePaymentTerms:nn {VV}
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradePaymentTerms: {
+\__zugferd_SpecifiedTradePaymentTerms:VV \__zugferd_payment_terms_str \__zugferd_due_date_tl
+}
+\cs_generate_variant:Nn \__zugferd_SpecifiedTradeSettlementPaymentMeans:nnn {vvv}
+\__zugferd_define_xml_writer:Nn \__zugferd_SpecifiedTradeSettlementPaymentMeans: {
+\tl_if_blank:VF \g__zugferd_payment_means_tl {
+\__zugferd_SpecifiedTradeSettlementPaymentMeans:vvv
+{g__zugferd_payment_account-holder_tl} {g__zugferd_payment_iban_tl} {g__zugferd_payment_bic_tl}
+}
+}
+\msg_new:nnn {zugferd} {macro-deprecated} {
+The~function~#1~is~deprecated.\\
+It~was~replaced~by~#2.\\
+Please~adjust~your~mechanism~to~use~the~new~version.
+}
+\endinput
+%%
+%% End of file `zugferd.sty'.