summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev')
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty6
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/alltt.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ansinew.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/applemac.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/article.cls4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/article.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ascii.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/bezier.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/bk10.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/bk11.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/bk12.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/book.cls4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/book.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/checkencodingsubset.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp1250.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp1252.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp1257.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp437.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp437de.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp850.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp852.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp858.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/cp865.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/decmulti.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/doc.sty5
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/docstrip.tex22
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/exscale.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fix-cm.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/flafter.sty107
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fleqn.clo2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fleqn.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fltrace.sty214
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fontenc.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fontmath.cfg2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fontmath.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fonttext.cfg2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/fonttext.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/graphpap.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/hyphen.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/idx.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ifthen.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/inputenc.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/lablst.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latex.ltx2840
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latex209.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latexrelease.sty4011
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latexsym.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin1.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin10.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin2.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin3.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin4.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin5.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latin9.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/leqno.clo2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/leqno.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/letter.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/letter.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltluatex.lua2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltluatex.tex4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltnews.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltxdoc.cfg2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ltxguide.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/macce.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/makeidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/minimal.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/newlfont.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/next.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/nfssfont.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/oldlfont.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omlcmm.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omlcmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omlenc.def4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omllcmm.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omscmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omscmsy.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omsenc.def4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omsenc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omxcmex.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/openbib.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1enc.def4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ot4enc.def4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/preload.cfg2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/preload.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/proc.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/proc.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/report.cls4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/report.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/sfonts.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/shortvrb.sty5
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/showidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/size10.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/size11.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/size12.clo4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/slides.cls2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/slides.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/slides.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/structuredlog.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/syntonly.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1enc.def6
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1enc.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t2benc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/testpage.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/textcomp.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tracefnt.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tuenc.def4
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmdh.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmssq.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ucmr.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ucmss.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ucmtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ulasy.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/ullasy.fd2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/utf8-2018.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/utf8.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/x2enc.dfu2
-rw-r--r--Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx13
-rw-r--r--Master/texmf-dist/tex/latex-dev/firstaid/underscore-ltx.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/color.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/dvipdf.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/dvipsnam.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/dvipsone.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/dviwin.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/emtex.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/epsfig.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/graphics.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty7
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/keyval.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/lscape.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/pctex32.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/pctexhp.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/pctexps.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/pctexwin.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/rotating.sty16
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/tcidvi.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/trig.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/truetex.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx9
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx47
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx4
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-amsmath.ltx710
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx30
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty14
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx528
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathintent.ltx60
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathpkg.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtools.ltx243
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty73
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty35
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty12
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-marginpar.sty8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty10
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty62
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty200
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty31
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-table.sty72
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty51
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-title.sty6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty24
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-unicode-math.ltx92
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/marginpar-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/table-latex-lab-testphase.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/tabular-latex-lab-testphase.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def5
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx8
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/title-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/afterpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/array.sty50
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/bm.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/calc.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/dcolumn.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/delarray.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/e.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/enumerate.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/fontsmpl.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/fontsmpl.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/ftnright.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/h.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/hhline.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/l3sys-query.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/layout.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/longtable.sty7
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/multicol.sty6
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/q.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/r.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/rawfonts.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/s.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/shellesc.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/showkeys.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/somedefs.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/tabularx.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thb.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thc.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thcb.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/theorem.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thm.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thmb.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/thp.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/trace.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/varioref.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/verbatim.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/verbtest.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/x.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/xr.sty8
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/xspace.sty2
275 files changed, 8069 insertions, 2164 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty
index 8f9f97ed311..20a116ca412 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty
@@ -7,7 +7,7 @@
%% amsbsy.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty
index a32842d8c3f..80316916471 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty
@@ -7,7 +7,7 @@
%% amscd.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty
index 39240727511..b39c5bf2b1f 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty
@@ -7,7 +7,7 @@
%% amsgen.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
index 4e3165add6a..6f7fd3ebb0d 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty
@@ -7,7 +7,7 @@
%% amsmath.dtx
%%
%% Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -26,7 +26,7 @@
\DeclareRelease{}{1994-06-01}{amsmath-2018-12-01.sty}
\DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty}
\DeclareCurrentRelease{}{2019-04-01}
-\ProvidesPackage{amsmath}[2024/11/05 v2.17t AMS math features]
+\ProvidesPackage{amsmath}[2025/01/19 v2.17u AMS math features]
\edef\@temp{\catcode 96=\number\catcode 96 }
\catcode\string `\`=12
\def\do#1{\catcode\number`#1=\number\catcode`#1}
@@ -1240,7 +1240,7 @@ ill-advised in LaTeX.%
\gdef\df@label
}
\toks@\@xp{\@arrayparboxrestore \let\label\ltx@label}%
-\edef\@arrayboxrestore{\the\toks@}
+\edef\@arrayparboxrestore{\the\toks@}
\let\df@label\@empty
\def\make@display@tag{%
\if@eqnsw \incr@eqnum \print@eqnum
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty
index f4ee5958472..12429b29467 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty
@@ -7,7 +7,7 @@
%% amsopn.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty
index 2cedcc35a82..b68bcad3884 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty
@@ -7,7 +7,7 @@
%% amstext.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amstext}[2021/08/26 v2.01 AMS text]
+\ProvidesPackage{amstext}[2024/11/17 v2.01 AMS text]
\RequirePackage{amsgen}
\DeclareRobustCommand{\text}{%
\ifmmode\expandafter\text@\else\expandafter\mbox\fi}
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty
index 43f10f187a8..c80634efc8e 100644
--- a/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty
+++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty
@@ -7,7 +7,7 @@
%% amsxtra.dtx
%%
%% Copyright (C) 1995, 1999 American Mathematical Society.
-%% Copyright (C) 2016-2024 LaTeX Project and American Mathematical Society.
+%% Copyright (C) 2016-2025 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex-dev/base/alltt.sty b/Master/texmf-dist/tex/latex-dev/base/alltt.sty
index 2cbaf54abb0..99af51ce653 100644
--- a/Master/texmf-dist/tex/latex-dev/base/alltt.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/alltt.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ansinew.def b/Master/texmf-dist/tex/latex-dev/base/ansinew.def
index 071d9a49f8c..e892893fa20 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ansinew.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ansinew.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/applemac.def b/Master/texmf-dist/tex/latex-dev/base/applemac.def
index 85032040d8c..e8fd7822271 100644
--- a/Master/texmf-dist/tex/latex-dev/base/applemac.def
+++ b/Master/texmf-dist/tex/latex-dev/base/applemac.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/article.cls b/Master/texmf-dist/tex/latex-dev/base/article.cls
index 0dcb9da0226..5ab6daa7b97 100644
--- a/Master/texmf-dist/tex/latex-dev/base/article.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/article.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{article}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX document class]
\newcommand\@ptsize{}
\newif\if@restonecol
diff --git a/Master/texmf-dist/tex/latex-dev/base/article.sty b/Master/texmf-dist/tex/latex-dev/base/article.sty
index cc34e8a7443..48ad87d515c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/article.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/article.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ascii.def b/Master/texmf-dist/tex/latex-dev/base/ascii.def
index 0f08f8091f8..ddfede3bbb3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ascii.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ascii.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty
index 992a4278526..2917fa3f011 100644
--- a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, The LaTeX Project
%%
%%% From File: ltshipout.dtx
diff --git a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty
index 76d4e001d38..00771d4998b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/bezier.sty b/Master/texmf-dist/tex/latex-dev/base/bezier.sty
index 2bc376dfb33..88940623b60 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bezier.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/bezier.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk10.clo b/Master/texmf-dist/tex/latex-dev/base/bk10.clo
index 958c45b467e..d43ae2d5f8c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk10.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk10.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{bk10.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xiipt
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk11.clo b/Master/texmf-dist/tex/latex-dev/base/bk11.clo
index cbcbd0dae62..d8ff5c4eed6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk11.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk11.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{bk11.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xipt{13.6}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/bk12.clo b/Master/texmf-dist/tex/latex-dev/base/bk12.clo
index ccdb40f6d42..5648bcd1214 100644
--- a/Master/texmf-dist/tex/latex-dev/base/bk12.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/bk12.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{bk12.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xiipt{14.5}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/book.cls b/Master/texmf-dist/tex/latex-dev/base/book.cls
index e73e83ea3c0..11cd0ee0f9e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/book.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/book.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{book}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX document class]
\newcommand\@ptsize{}
\newif\if@restonecol
diff --git a/Master/texmf-dist/tex/latex-dev/base/book.sty b/Master/texmf-dist/tex/latex-dev/base/book.sty
index b2cb30a2e14..fc94e98b95b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/book.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/book.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/checkencodingsubset.tex b/Master/texmf-dist/tex/latex-dev/base/checkencodingsubset.tex
index 54663361c3d..7abc9c491c6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/checkencodingsubset.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/checkencodingsubset.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1250.def b/Master/texmf-dist/tex/latex-dev/base/cp1250.def
index a4dfaed86d7..a8019bd2d0c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1250.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1250.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1252.def b/Master/texmf-dist/tex/latex-dev/base/cp1252.def
index ae5a89e75cc..d467834178c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1252.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1252.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp1257.def b/Master/texmf-dist/tex/latex-dev/base/cp1257.def
index 78fdbcbdf76..b71b5a0941f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp1257.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp1257.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp437.def b/Master/texmf-dist/tex/latex-dev/base/cp437.def
index 17a2a2e7784..9e1ab356554 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp437.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp437.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp437de.def b/Master/texmf-dist/tex/latex-dev/base/cp437de.def
index edaccf6a2f4..2b0d6c49ee3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp437de.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp437de.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp850.def b/Master/texmf-dist/tex/latex-dev/base/cp850.def
index 40f3cb6eea9..a855f916c31 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp850.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp850.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp852.def b/Master/texmf-dist/tex/latex-dev/base/cp852.def
index 0fc6c20a561..a24c6a50c21 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp852.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp852.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp858.def b/Master/texmf-dist/tex/latex-dev/base/cp858.def
index 5760e667642..f1ecc9629b8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp858.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp858.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/cp865.def b/Master/texmf-dist/tex/latex-dev/base/cp865.def
index dc86f46bde3..359f7dfaee0 100644
--- a/Master/texmf-dist/tex/latex-dev/base/cp865.def
+++ b/Master/texmf-dist/tex/latex-dev/base/cp865.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/decmulti.def b/Master/texmf-dist/tex/latex-dev/base/decmulti.def
index ae98cc99728..33c90c4c408 100644
--- a/Master/texmf-dist/tex/latex-dev/base/decmulti.def
+++ b/Master/texmf-dist/tex/latex-dev/base/decmulti.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty
index 31930d29767..bfbb99b4d7c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/doc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -52,7 +52,7 @@
\DeclareCurrentRelease{v3}{2022-06-01}
\ProvidesPackage{doc}
- [2024/10/23 v3.0q
+ [2024/12/25 v3.0q
Standard LaTeX documentation package V3 (FMi)]
%%
%% Package `doc' to use with LaTeX 2e
@@ -62,6 +62,7 @@
+
\@ifundefined{macro@cnt}{}{\endinput}
\catcode`\^^A=14
\catcode`\^^X=14
diff --git a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
index e96e04ef127..6b8c95cea7d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/docstrip.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -44,9 +44,9 @@
\catcode`\{=1
\catcode`\}=2
\def\filename{docstrip.dtx}
-\def\fileversion{v2.6b}
-\def\filedate{2022-09-03}
-\def\docdate {2024-02-08}
+\def\fileversion{v2.6c}
+\def\filedate{2024-12-23}
+\def\docdate {2024-12-23}
%%
%% The docstrip program for use with TeX.
%% Copyright (C) 1989-1991 Frank Mittelbach
@@ -573,8 +573,22 @@ Z
\fi
}
\def\@fileX#1#2{%
+ \ifx#1\relax \else
+ \errmessage{Command \string#1 for denoting the output \noexpand
+ \file stream already defined!^^J
+ \space Current meaning is:^^J^^J\meaning#1^^J^^J
+ \space Extraction will probably fail - check result}%
+ \fi
\chardef#1=\stream@closed
\def\curout{#1}%
+ \ifx\curout\currentpreamble
+ \errmessage{Declared preamble name \string#1 not allowed if
+ \string\file{\@stripstring#1} is used}%
+ \fi
+ \ifx\curout\currentpostamble
+ \errmessage{Declared postamble name \string#1 not allowed if
+ \string\file{\@stripstring#1} is used}%
+ \fi
\let\curinfiles\empty
\let\curinnames\empty
\def\curref{\MetaPrefix ^^J%
diff --git a/Master/texmf-dist/tex/latex-dev/base/exscale.sty b/Master/texmf-dist/tex/latex-dev/base/exscale.sty
index 41d64bbffea..992c3bbcf04 100644
--- a/Master/texmf-dist/tex/latex-dev/base/exscale.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/exscale.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty b/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty
index e16030b13e5..536e385e4a9 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fix-cm.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty b/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty
index a5f6f4cc948..1c004fa7e6b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fixltx2e.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/flafter.sty b/Master/texmf-dist/tex/latex-dev/base/flafter.sty
index ca332b7b16b..fc61febca28 100644
--- a/Master/texmf-dist/tex/latex-dev/base/flafter.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/flafter.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,8 +43,111 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutput.dtx
\ProvidesPackage{flafter}
- [2024/11/16 v1.4k
+ [2025/02/20 v1.4n
Standard LaTeX floats after reference (FMi)]
+\IncludeInRelease{2025/06/01}%
+ {\@addtocurcol}{float order in 2-column}%
+\def \@addtocurcol {%
+ \fl@trace{***Start addtocurcol}%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \fl@trace{fpstype !p only (addtocurcol): \the \@fpstype = 8?}%
+ \else
+ \ifnum \@fpstype=24
+ \fl@trace{fpstype p only (addtocurcol): \the \@fpstype = 24?}%
+ \else
+ \@flsettextmin
+ \fl@trace{textfloatsheight (before) = \the \@textfloatsheight}%
+ \advance \@textmin \@textfloatsheight
+ \@reqcolroom \@pageht
+ \fl@trace{textmin + textfloatsheight: \the \@textmin}%
+ \fl@trace{page-so-far: \the \@reqcolroom}%
+ \ifdim \@textmin>\@reqcolroom
+ \@reqcolroom \@textmin
+ \fl@trace{ORD? textmin being used}%
+ \fi
+ \advance \@reqcolroom \ht\@currbox
+ \saved@reqcolroom \@reqcolroom
+ \fl@trace{float size = \the \ht \@currbox (addtocurcol)}%
+ \fl@trace{colroom = \the \@colroom (addtocurcol)}%
+ \fl@trace{reqcolroom = \the \@reqcolroom (addtocurcol)}%
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum \@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \fl@trace{deferlist: \@deferlist: (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list: defer (addtocurcol)}%
+ \else
+ \@bitor\@currtype\@botlist
+ \fl@trace{botlist: \@botlist: (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list: bot---sent to addtobot}%
+ \@addtobot
+ \else
+ \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi
+ here: \the \@fpstype}%
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m@ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \fl@trace{***Success: here}%
+ \fl@trace{textfloatsheight (after-here) =
+ \the \@textfloatsheight}%
+ \fl@trace{colnum (after-here) = \the \@colnum}%
+ \if@nobreak
+ \nobreak
+ \@nobreakfalse
+ \everypar{}%
+ \else
+ \addpenalty \interlinepenalty
+ \fi
+ \vskip \intextsep
+ \box\@currbox
+ \penalty\interlinepenalty
+ \vskip\intextsep
+ \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+ \outputpenalty \z@
+ \@inserttrue
+ \else
+ \fl@trace{Fail---no room at 2nd test of colroom
+ (addtocorcol \string\intextsep)}%
+ \fi
+ \fi
+ \if@insert
+ \else
+ \fl@trace{not here: sent to addtobot}%
+ \@addtobot
+ \fi
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail: colnum = \the \@colnum:
+ fpstype \the \@fpstype=ORD?}%
+ \ifnum \@fpstype<\sixt@@n
+ \fl@trace{ERROR: BANG float not successful (addtocurcol)}%
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail---no room: fl box ht: \the \ht \@currbox
+ (addtocurcol)}%
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@resethfps
+ \fl@trace{put on deferlist (addtocurcol)}%
+ \@cons\@deferlist\@currbox
+ \fl@trace{deferlist: \@deferlist: (addtocurcol-after)}%
+ \fi
+}%
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\@addtocurcol}{float order in 2-column}%
\def \@addtocurcol {%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fleqn.clo b/Master/texmf-dist/tex/latex-dev/base/fleqn.clo
index f2a45b8ade4..f8f3e1a5840 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fleqn.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/fleqn.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fleqn.sty b/Master/texmf-dist/tex/latex-dev/base/fleqn.sty
index 56fb8376599..c2b06ef81bd 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fleqn.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fleqn.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty
index 17adc6c4771..5f0de43a898 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutput.dtx
\ProvidesPackage{fltrace}
- [2024/11/16 v1.4k
+ [2025/02/20 v1.4n
Tracing LaTeX floats algorithm (FMi)]
\def\onecolumn{%
\clearpage
@@ -234,16 +234,11 @@
\global \@mparbottom \z@ \global \@textfloatsheight \z@
\@floatplacement
}
-\gdef \@makespecialcolbox {%
+\def \@make@specialcolbox {%
\fl@trace{Kludgeins ht \the\ht\@kludgeins\space
dp \the\dp\@kludgeins\space
wd \the\wd\@kludgeins}%
- \setbox\@outputbox \vbox {%
- \@texttop
- \dimen@ \dp\@outputbox
- \unvbox\@outputbox
- \vskip-\dimen@
- }%
+ \@outputbox@append {\vskip-\@outputbox@depth}%
\@tempdima \@colht
\ifdim \wd\@kludgeins>\z@
\advance \@tempdima -\ht\@outputbox
@@ -405,6 +400,109 @@
\@addtobot
\fi
}
+\IncludeInRelease{2025/06/01}%
+ {\@addtocurcol}{float order in 2-column}%
+\def \@addtocurcol {%
+ \fl@trace{***Start addtocurcol}%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \fl@trace{fpstype !p only (addtocurcol): \the \@fpstype = 8?}%
+ \else
+ \ifnum \@fpstype=24
+ \fl@trace{fpstype p only (addtocurcol): \the \@fpstype = 24?}%
+ \else
+ \@flsettextmin
+ \fl@trace{textfloatsheight (before) = \the \@textfloatsheight}%
+ \advance \@textmin \@textfloatsheight
+ \@reqcolroom \@pageht
+ \fl@trace{textmin + textfloatsheight: \the \@textmin}%
+ \fl@trace{page-so-far: \the \@reqcolroom}%
+ \ifdim \@textmin>\@reqcolroom
+ \@reqcolroom \@textmin
+ \fl@trace{ORD? textmin being used}%
+ \fi
+ \advance \@reqcolroom \ht\@currbox
+ \saved@reqcolroom \@reqcolroom
+ \fl@trace{float size = \the \ht \@currbox (addtocurcol)}%
+ \fl@trace{colroom = \the \@colroom (addtocurcol)}%
+ \fl@trace{reqcolroom = \the \@reqcolroom (addtocurcol)}%
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum \@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \fl@trace{deferlist: \@deferlist: (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list: defer (addtocurcol)}%
+ \else
+ \@bitor\@currtype\@botlist
+ \fl@trace{botlist: \@botlist: (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list: bot---sent to addtobot}%
+ \@addtobot
+ \else
+ \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi
+ here: \the \@fpstype}%
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m@ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \fl@trace{***Success: here}%
+ \fl@trace{textfloatsheight (after-here) =
+ \the \@textfloatsheight}%
+ \fl@trace{colnum (after-here) = \the \@colnum}%
+ \if@nobreak
+ \nobreak
+ \@nobreakfalse
+ \everypar{}%
+ \else
+ \addpenalty \interlinepenalty
+ \fi
+ \vskip \intextsep
+ \box\@currbox
+ \penalty\interlinepenalty
+ \vskip\intextsep
+ \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+ \outputpenalty \z@
+ \@inserttrue
+ \else
+ \fl@trace{Fail---no room at 2nd test of colroom
+ (addtocorcol \string\intextsep)}%
+ \fi
+ \fi
+ \if@insert
+ \else
+ \fl@trace{not here: sent to addtotoporbot}%
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail: colnum = \the \@colnum:
+ fpstype \the \@fpstype=ORD?}%
+ \ifnum \@fpstype<\sixt@@n
+ \fl@trace{ERROR: BANG float not successful (addtocurcol)}%
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail---no room: fl box ht: \the \ht \@currbox
+ (addtocurcol)}%
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@resethfps
+ \fl@trace{put on deferlist (addtocurcol)}%
+ \@cons\@deferlist\@currbox
+ \fl@trace{deferlist: \@deferlist: (addtocurcol-after)}%
+ \fi
+}%
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\@addtocurcol}{float order in 2-column}%
\def \@addtocurcol {%
@@ -629,6 +727,59 @@
\fi
}%
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}
+ {\@addtonextcol}{float order in 2-column}%
+\def\@addtonextcol{%
+ \begingroup
+ \fl@trace{***Start addtonextcol}%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \fl@trace{fpstype not curcol: \the \@fpstype = 8?}%
+ \else
+ \ifnum \@fpstype=24
+ \fl@trace{fpstype not curcol: \the \@fpstype = 24?}%
+ \else
+ \@flsettextmin
+ \fl@trace{text-so-far: 0pt (top of col)}%
+ \@reqcolroom \ht\@currbox
+ \fl@trace{float size: \the \@reqcolroom (addtonextcol)}%
+ \advance \@reqcolroom \@textmin
+ \saved@reqcolroom \@reqcolroom
+ \fl@trace{colroom = \the \@colroom (addtonextcol)}%
+ \fl@trace{reqcolroom = \the \@reqcolroom (addtonextcol)}%
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum\@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \fl@trace{deferlist: \@deferlist: (addtonextcol-before)}%
+ \@testwrongwidth\@currbox
+ \if@test
+ \fl@trace{type already on list: defer (addtonextcol)}%
+ \else
+ \fl@trace{sent to addtotoporbot (addtonextcol)}%
+ \@addtotoporbot
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail---no room: fl box ht: \the \ht \@currbox
+ (addtonextcol)}%
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \fl@trace{put back on deferlist (addtonextcol)}%
+ \@cons\@deferlist\@currbox
+ \fl@trace{deferlist: \@deferlist: (addtonextcol-after)}%
+ \fi
+ \fl@trace{End of addtonextcol -- locally counts:}%
+ \fl@trace{col: \the\@colnum. top: \the \@topnum. bot: \the \@botnum.}%
+ \endgroup
+ \fl@trace{End of addtonextcol -- globally counts:}%
+ \fl@trace{col: \the\@colnum. top: \the \@topnum. bot: \the \@botnum.}%
+}%
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}
{\@addtonextcol}{float order in 2-column}%
\def\@addtonextcol{%
@@ -1066,7 +1217,10 @@
\fl@trace{ORD textmin = \the \@textmin}%
\fi
}
+\IncludeInRelease{2025/06/01}%
+ {\@flcheckspace}{float placement calculation}%
\def \@flcheckspace #1#2{%
+ \@reqcolroom \saved@reqcolroom
\advance \@reqcolroom
\ifx #2\@empty \textfloatsep \else \floatsep \fi
\fl@trace{colroom = \the \@colroom
@@ -1085,13 +1239,13 @@
\fl@trace{BANG float ignoring #1
(flcheckspace \string#1 \string#2):}%
\fl@trace{\@spaces #1 = \the #1. Ht float: \the \ht \@currbox
- BANG}%
+ \space BANG}%
\@tempswatrue
\else
\fl@trace{Fail---no room (flcheckspace \string#1 \string#2)
(fpstype \the \@fpstype=ORD?):}%
\fl@trace{\@spaces #1 = \the #1. Ht float: \the \ht \@currbox
- ORD?}%
+ \space ORD?}%
\fi
\fi
\else
@@ -1099,6 +1253,44 @@
(flcheckspace \string#1 \string#2)}%
\fi
}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@flcheckspace}{float placement calculation}%
+
+\def \@flcheckspace #1#2{%
+ \advance \@reqcolroom
+ \ifx #2\@empty \textfloatsep \else \floatsep \fi
+ \fl@trace{colroom = \the \@colroom
+ (flcheckspace \string#1 \string#2)}%
+ \fl@trace{reqcolroom = \the \@reqcolroom
+ (flcheckspace \string#1 \string#2)}%
+ \ifdim \@colroom>\@reqcolroom
+ \ifdim #1>\ht\@currbox
+ \@tempswatrue
+ \fl@trace{Space OK: #1 = \the #1 > \the \ht \@currbox
+ (flcheckspace \string#1 \string#2)}%
+ \else
+ \fl@trace{fpstype: \the \@fpstype
+ (flcheckspace \string#1 \string#2)}%
+ \ifnum \@fpstype<\sixt@@n
+ \fl@trace{BANG float ignoring #1
+ (flcheckspace \string#1 \string#2):}%
+ \fl@trace{\@spaces #1 = \the #1. Ht float: \the \ht \@currbox
+ \space BANG}%
+ \@tempswatrue
+ \else
+ \fl@trace{Fail---no room (flcheckspace \string#1 \string#2)
+ (fpstype \the \@fpstype=ORD?):}%
+ \fl@trace{\@spaces #1 = \the #1. Ht float: \the \ht \@currbox
+ \space ORD?}%
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail---no room at 2nd test of colroom
+ (flcheckspace \string#1 \string#2)}%
+ \fi
+}
+\EndIncludeInRelease
\IncludeInRelease{2017/01/01}%
{\@makefcolumn}{negative height floats}%
\def\@makefcolumn #1{%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
index 51c2f7df284..1024221d541 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesPackage{fontenc}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX package]
\def\update@uclc@with@cyrillic{%
\expandafter\def\expandafter\@uclclist\expandafter
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
index 0edfc33f6fe..4d81b64482e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
index c4a7d49a36e..e3921e51b9f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
index dffaf71b43d..ea67ad0b7f5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
index 06eb08221ae..11b7f905dc3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/graphpap.sty b/Master/texmf-dist/tex/latex-dev/base/graphpap.sty
index 07b03c71b7c..c0788af6c96 100644
--- a/Master/texmf-dist/tex/latex-dev/base/graphpap.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/graphpap.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx b/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx
index 81358f46845..87d7a6223c0 100644
--- a/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/hyphen.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/idx.tex b/Master/texmf-dist/tex/latex-dev/base/idx.tex
index 001595bb7d5..6e7dc676b70 100644
--- a/Master/texmf-dist/tex/latex-dev/base/idx.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/idx.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ifthen.sty b/Master/texmf-dist/tex/latex-dev/base/ifthen.sty
index 780b457e3f0..72ef84711dc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ifthen.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/ifthen.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -44,7 +44,7 @@
%%
%% File `ifthen.dtx'.
%% Copyright (C) 1991 by Leslie Lamport
-%% Copyright (C) 1994-2024 LaTeX project, David Carlisle
+%% Copyright (C) 1994-2025 LaTeX project, David Carlisle
%% all rights reserved.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
diff --git a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
index 8d4a01b46d2..c9a77770870 100644
--- a/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/inputenc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/lablst.tex b/Master/texmf-dist/tex/latex-dev/base/lablst.tex
index 961928d5ad8..5115204512f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/lablst.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/lablst.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index eeaba260833..8c8610d3314 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -65,7 +65,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -710,7 +710,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2025-06-01}
-\def\patch@level{-1}
+\def\patch@level{-2}
\edef\development@branch@name{develop \the\year-\the\month-\the\day}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
@@ -1811,15 +1811,17 @@
\xdef#1{\the\toks@}%
\endgroup}
%%% From File: ltcmd.dtx
-\def\ltcmdversion{v1.2f}
-\def\ltcmddate{2024-07-06}
+\def\ltcmdversion{v1.3b}
+\def\ltcmddate{2025-02-01}
\message{document commands,}
\ExplSyntaxOn
+\cs_generate_variant:Nn \tl_head:n { e }
\tl_new:N \l__cmd_arg_spec_tl
\tl_new:N \l__cmd_args_tl
\tl_new:N \l__cmd_args_i_tl
\tl_new:N \l__cmd_args_ii_tl
\int_new:N \l__cmd_current_arg_int
+\int_new:N \l__cmd_total_args_int
\bool_new:N \l__cmd_defaults_bool
\tl_new:N \l__cmd_defaults_tl
\bool_new:N \l__cmd_environment_bool
@@ -1850,6 +1852,7 @@
\bool_new:N \l__cmd_some_obey_spaces_bool
\bool_new:N \l__cmd_some_long_bool
\bool_new:N \l__cmd_some_short_bool
+\bool_new:N \l__cmd_final_verb_bool
\quark_new:N \q__cmd_recursion_tail
\quark_new:N \q__cmd_recursion_stop
\__kernel_quark_new_test:N \__cmd_if_recursion_tail_stop_do:Nn
@@ -2434,17 +2437,22 @@
\__cmd_normalize_arg_spec_loop:n
}
\cs_new_protected:Npn \__cmd_normalize_type_b:w #1
+ { \__cmd_normalize_type_b_or_c:nn {#1} { b } }
+\cs_new_protected:Npn \__cmd_normalize_type_c:w #1
+ { \__cmd_normalize_type_b_or_c:nn {#1} { c } }
+\cs_new_protected:Npn \__cmd_normalize_type_b_or_c:nn #1#2
{
\bool_if:NF \l__cmd_environment_bool
{
\msg_error:nnxx { cmd } { invalid-command-arg }
- { \__cmd_environment_or_command: } { b }
+ { \__cmd_environment_or_command: } {#2}
\__cmd_bad_def:wn
}
\tl_clear:N \l__cmd_last_delimiters_tl
- \__cmd_add_arg_spec:n { b }
+ \__cmd_add_arg_spec:n {#2}
\quark_if_recursion_tail_stop:n {#1}
- \msg_error:nnxx { cmd } { arg-after-body }
+ \msg_error:nnxxx { cmd } { arg-after-body }
+ {#2}
{ \__cmd_environment_or_command: }
{ \tl_to_str:n {#1} }
\__cmd_bad_def:wn
@@ -2535,7 +2543,10 @@
{ \bool_set_true:N \l__cmd_some_short_bool }
\tl_put_right:Nx \l__cmd_arg_spec_tl
{
- \bool_if:NT \l__cmd_long_bool { + }
+ \bool_lazy_and:nnT
+ { \l__cmd_long_bool }
+ { ! \str_if_eq_p:nn {#1} { c } }
+ { + }
\bool_if:NT \l__cmd_obey_spaces_bool { ! }
\exp_not:n {#1}
}
@@ -2560,6 +2571,7 @@
}
\cs_new_protected:Npn \__cmd_prepare_signature:n #1
{
+ \int_set_eq:NN \l__cmd_total_args_int \l__cmd_current_arg_int
\int_zero:N \l__cmd_current_arg_int
\bool_set_false:N \l__cmd_long_bool
\bool_set_false:N \l__cmd_obey_spaces_bool
@@ -2571,9 +2583,16 @@
\tl_clear:N \l__cmd_process_one_tl
\bool_set_false:N \l__cmd_process_some_bool
\tl_clear:N \l__cmd_signature_tl
+ \__cmd_prepare_signature_verb_chk:n {#1}
\__cmd_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
\bool_if:NF \l__cmd_expandable_bool { \__cmd_flush_m_args: }
}
+\cs_new_protected:Npn \__cmd_prepare_signature_verb_chk:n #1
+ {
+ \str_if_eq:eeTF { \tl_head:e { \tl_reverse:n {#1} } } { c }
+ { \bool_set_true:N \l__cmd_final_verb_bool }
+ { \bool_set_false:N \l__cmd_final_verb_bool }
+ }
\cs_new_protected:Npn \__cmd_prepare_signature:N
{
\bool_set_false:N \l__cmd_prefixed_bool
@@ -2622,10 +2641,14 @@
\__cmd_prepare_signature_bypass:N
}
\cs_new_protected:Npn \__cmd_add_type_b:w
+ { \__cmd_add_type_b_or_c:N b }
+\cs_new_protected:Npn \__cmd_add_type_c:w
+ { \__cmd_add_type_b_or_c:N c }
+\cs_new_protected:Npn \__cmd_add_type_b_or_c:N #1
{
\__cmd_flush_m_args:
\__cmd_add_default:
- \__cmd_add_grabber:N b
+ \__cmd_add_grabber:N #1
\__cmd_prepare_signature:N
}
\cs_new_protected:Npn \__cmd_add_type_D:w #1#2#3
@@ -2715,12 +2738,23 @@
{ \l__cmd_suppress_strip_bool }
{ \str_if_eq_p:nn {#1} { D } }
{ _no_strip }
+ \bool_lazy_all:nT
+ {
+ { \l__cmd_final_verb_bool }
+ { \str_if_eq_p:nn {#1} { D } }
+ {
+ \int_compare_p:nNn \l__cmd_current_arg_int
+ = { \l__cmd_total_args_int - 1 }
+ }
+ }
+ { _verb_safe }
:w
}
}
\bool_set_false:N \l__cmd_long_bool
\bool_set_false:N \l__cmd_obey_spaces_bool
\bool_set_false:N \l__cmd_suppress_strip_bool
+ \bool_set_false:N \l__cmd_verb_safe_bool
\tl_put_right:Nx \l__cmd_process_all_tl
{
{
@@ -3273,56 +3307,249 @@
\__cmd_run_code:
\end
}
-\cs_new_protected:Npn \__cmd_grab_D:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c:w #1 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_nonspace_remove:NTF \use_ii:nn
+ \bool_set_false:N \l__cmd_obey_spaces_bool
+ \__cmd_grab_c_start:n {#1}
}
-\cs_new_protected:Npn \__cmd_grab_D_long:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_obey_spaces:w #1 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_nonspace_remove:NTF \use_ii:nn
+ \bool_set_true:N \l__cmd_obey_spaces_bool
+ \__cmd_grab_c_start:n {#1}
}
-\cs_new_protected:Npn \__cmd_grab_D_obey_spaces:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_start:n #1
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_meaning_remove:NTF \use_ii:nn
+ \tl_set:Nn \l__cmd_signature_tl {#1}
+ \group_begin:
+ \tl_clear:N \l__cmd_v_arg_tl
+ \tex_escapechar:D = 92 \scan_stop:
+ \tex_endlinechar:D = `\^^M \scan_stop:
+ \cs_set_eq:NN \do \char_set_catcode_other:N
+ \dospecials
+ \char_set_catcode_other:n { `\^^M }
+ \__cmd_grab_c_first:w
}
-\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces:w #1#2#3 \__cmd_run_code:
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npn \__cmd_grab_c_first:w #1 ^^M %
+ { %
+ \tl_if_blank:nF {#1} %
+ { %
+ \msg_warning:nnee { cmd } { chars-dropped-first-line } %
+ { \exp_not:n {#1} } %
+ { \exp_not:V \@currenvir } %
+ } %
+ \__cmd_grab_c_loop:w #1 ^^M %
+ } %
+ \cs_new_protected:Npe \__cmd_grab_c_loop:w #1 ^^M %
+ { %
+ \exp_not:N \__cmd_grab_c_auxi:w #1 %
+ \c_backslash_str end %
+ \scan_stop: %
+ } %
+\group_end:
+\use:e
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_meaning_remove:NTF \use_ii:nn
+ \cs_new_protected:Npn \exp_not:N \__cmd_grab_c_auxi:w
+ #1 \c_backslash_str end #2 \scan_stop:
}
-\cs_new_protected:Npn \__cmd_grab_D_no_strip:w
- #1#2#3 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_nonspace_remove:NTF \use_none:n
+ \tl_put_right:Nn \l__cmd_v_arg_tl {#1}
+ \tl_if_empty:nTF {#2}
+ {
+ \tl_put_right:Nn \l__cmd_v_arg_tl { \obeyedline }
+ \__cmd_grab_c_loop:w
+ }
+ { \__cmd_grab_c_auxii:w #2 \scan_stop: }
}
-\cs_new_protected:Npn \__cmd_grab_D_long_no_strip:w
- #1#2#3 \__cmd_run_code:
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \use:e %
+ { %
+ \cs_new_protected:Npe \exp_not:N \__cmd_grab_c_auxii:w %
+ #1 \c_backslash_str end \scan_stop: %
+ } %
+ { %
+ \tl_set:Nn \exp_not:N \l__cmd_tmpa_tl
+ { \c_backslash_str end } %
+ \exp_not:N \__cmd_grab_c_auxiii:N #1 ^^M %
+ } %
+ \cs_new_protected:Npn \__cmd_grab_c_auxiii:N #1 %
+ { %
+ \token_case_charcode:NnF #1 %
+ { %
+ ^^M %
+ { \__cmd_grab_c_auxiv: } %
+ \c_space_token %
+ { %
+ \tl_put_right:Nn \l__cmd_tmpa_tl {#1} %
+ \__cmd_grab_c_auxiii:N %
+ } %
+ \c_group_begin_token %
+ { %
+ \tl_set:Nn \l__cmd_tmpb_tl {#1} %
+ \__cmd_grab_c_auxvi:N %
+ } %
+ } %
+ { \__cmd_grab_c_auxv: } %
+ } %
+\group_end:
+\cs_new_protected:Npn \__cmd_grab_c_auxiv:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_nonspace_remove:NTF \use_none:n
+ \tl_put_right:Ne \l__cmd_v_arg_tl
+ {
+ \exp_not:V \l__cmd_tmpa_tl
+ \exp_not:N \obeyedline
+ }
+ \__cmd_grab_c_loop:w
}
-\cs_new_protected:Npn \__cmd_grab_D_obey_spaces_no_strip:w
- #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_auxv:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_meaning_remove:NTF \use_none:n
+ \tl_put_right:NV \l__cmd_v_arg_tl \l__cmd_tmpa_tl
+ \__cmd_grab_c_loop:w
}
-\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces_no_strip:w
- #1#2#3 \__cmd_run_code:
- {
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_meaning_remove:NTF \use_none:n
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npe \__cmd_grab_c_auxvi:N #1 %
+ { %
+ \exp_not:N \token_case_charcode:NnF #1 %
+ { %
+ ^^M %
+ {
+ \exp_not:N \__cmd_grab_c_auxvii: %
+ \exp_not:N \__cmd_grab_c_auxiv: %
+ }%
+ \c_backslash_str %
+ { %
+ \exp_not:N \__cmd_grab_c_auxvii: %
+ \exp_not:N \__cmd_grab_c_auxv: #1
+ } %
+ \c_group_end_token %
+ { %
+ \tl_put_right:Nn \exp_not:N \l__cmd_tmpb_tl {#1} %
+ \exp_not:N \__cmd_grab_c_auxviii: %
+ } %
+ } %
+ { %
+ \tl_put_right:Nn \exp_not:N \l__cmd_tmpb_tl {#1} %
+ \exp_not:N \__cmd_grab_c_auxvi:N %
+ } %
+ } %
+\group_end: %
+\cs_new_protected:Npn \__cmd_grab_c_auxvii:
+ { \tl_put_right:NV \l__cmd_tmpa_tl \l__cmd_tmpb_tl }
+\cs_new_protected:Npn \__cmd_grab_c_auxviii:
+ {
+ \str_if_eq:eeTF { \exp_not:V \l__cmd_tmpb_tl } { { \@currenvir } }
+ { \__cmd_grab_c_end:w }
+ {
+ \__cmd_grab_c_auxvii:
+ \__cmd_grab_c_auxv:
+ }
+ }
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npn \__cmd_grab_c_end:w #1 ^^M %
+ { %
+ \tl_if_blank:nF {#1} %
+ { %
+ \msg_warning:nnee { cmd } { chars-dropped-last-line } %
+ { \exp_not:n {#1} } %
+ { \exp_not:V \@currenvir } %
+ } %
+ \exp_args:NNNo \group_end: %
+ \tl_set:Nn \l__cmd_v_arg_tl { \l__cmd_v_arg_tl } %
+ \__cmd_add_arg:x %
+ { %
+ \bool_if:NTF \l__cmd_obey_spaces_bool %
+ { \exp_not:V } %
+ { \exp_args:NV \__cmd_grab_c_end:n } %
+ \l__cmd_v_arg_tl %
+ } %
+ \exp_args:NV \end \@currenvir %
+ } %
+\group_end: %
+\cs_new:Npn \__cmd_grab_c_end:n #1
+ {
+ \__cmd_grab_c_end_auxi:w \q_nil #1 \q_nil
+ \obeyedline \obeyedline \q_nil \q_stop
+ }
+\cs_new:Npn \__cmd_grab_c_end_auxi:w #1 \q_nil \obeyedline
+ { \__cmd_grab_c_end_auxii:w #1 \q_nil }
+\cs_new:Npn \__cmd_grab_c_end_auxii:w \q_nil #1 \obeyedline \q_nil
+ { \__cmd_grab_c_end_auxiii:w #1 \q_nil }
+\cs_new:Npn \__cmd_grab_c_end_auxiii:w #1 \q_nil #2 \q_stop
+ { \exp_not:n {#1} }
+\tl_map_inline:nn { { } { _long } }
+ {
+ \tl_map_inline:nn { { } { _obey_spaces } }
+ {
+ \tl_map_inline:nn { { } { _no_strip } }
+ {
+ \tl_map_inline:nn { { } { _verb_safe } }
+ {
+ \cs_new_protected:cpe { __cmd_grab_D #1 ##1 ####1 ########1 :w }
+ ################1################2################3
+ \__cmd_run_code:
+ {
+ \exp_not:N \__cmd_grab_D_aux:NNnNNNN
+ ################1 ################2 {################3}
+ \str_if_eq:nnTF {#1} { _long }
+ \cs_set_protected:Npn
+ \cs_set_protected_nopar:Npn
+ \str_if_eq:nnTF {##1} { _obey_spaces }
+ { \exp_not:N \__cmd_peek_meaning_remove:NTF }
+ { \exp_not:N \__cmd_peek_nonspace_remove:NTF }
+ \str_if_eq:nnTF {####1} { _no_strip }
+ { \exp_not:N \use_none:n }
+ { \exp_not:N \use_ii:nn }
+ \str_if_eq:nnTF {########1} { _verb_safe }
+ { \exp_not:N \use:n }
+ { \exp_not:N \use_none:n }
+ }
+ }
+ }
+ }
}
-\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNNN #1#2#3#4#5#6
+\group_begin:
+ \char_set_catcode_other:N \^^M
+ \cs_new_protected:Npn \__cmd_grab_D_aux:NNnNNNN #1#2#3#4#5#6#7
+ {
+ \__cmd_grab_D_aux:NNnNN #1#2 {#3} #4 #6
+ #7
+ {
+ \group_begin:
+ \__cmd_grab_D_verb_safe:NN #1#5
+ }
+ #5 #1
+ {
+ #7 { \group_end: }
+ \__cmd_grab_D_call:Nw #1
+ }
+ {
+ #7 { \group_end: }
+ \__cmd_add_arg:o \c_novalue_tl
+ }
+ }
+\group_end:
+\cs_new_protected:Npn \__cmd_grab_D_verb_safe:NN #1#2
{
- \__cmd_grab_D_aux:NNnNN #1#2 {#3} #4 #6
- #5 #1
- { \__cmd_grab_D_call:Nw #1 }
- { \__cmd_add_arg:o \c_novalue_tl }
+ \cs_set_eq:NN \do \char_set_catcode_other:N
+ \dospecials
+ \char_set_catcode_other:N \^^M
+ \token_if_eq_meaning:NNT #2 \__cmd_peek_nonspace_remove:NTF
+ { \char_set_catcode_space:n { `\ } }
+ \use:c
+ {
+ char_set_catcode_
+ \if_catcode:w \c_math_toggle_token #1 math_toggle \else:
+ \if_catcode:w ^ #1 math_superscript \else:
+ \if_catcode:w \c_math_subscript_token #1 math_subscript \else:
+ \if_catcode:w A #1 letter \else:
+ other \fi: \fi: \fi: \fi:
+ :N
+ }
+ #1
}
\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNN #1#2#3#4#5
{
@@ -3674,6 +3901,8 @@
{
\cs_set_eq:NN \do \char_set_catcode_other:N
\dospecials
+ \char_set_catcode_active:n { `\ }
+ \char_set_catcode_active:n { `\^^I }
\bool_if:NTF \l__cmd_long_bool
{ \char_set_catcode_other:n { \tex_endlinechar:D } }
{ \char_set_catcode_parameter:n { \tex_endlinechar:D } }
@@ -3702,13 +3931,9 @@
{
\tl_put_right:Nx \l__cmd_v_arg_tl
{
- \token_if_active:NTF #1
+ \int_compare:nNnTF {`#1} = \tex_endlinechar:D
+ { \exp_not:N \obeyedline }
{ \exp_not:N #1 }
- {
- \int_compare:nNnTF {`#1} = \tex_endlinechar:D
- { \exp_not:N \obeyedline }
- { \token_to_str:N #1 }
- }
}
}
\cs_new_protected:Npn \__cmd_grab_v_token_if_char:NTF #1
@@ -4264,10 +4489,10 @@
}
}
\msg_new:nnnn { cmd } { arg-after-body }
- { Argument~type~'b'~must~be~last~in~#1. }
+ { Argument~type~'#1'~must~be~last~in~#2. }
{
- The~'b'~argument~type~must~come~last~but~it~is~followed~
- by~'#2'~in~the~argument~specification.~This~is~not~allowed.
+ The~'#1'~argument~type~must~come~last~but~it~is~followed~
+ by~'#3'~in~the~argument~specification.~This~is~not~allowed.
\c__cmd_ignore_def_tl
}
\msg_new:nnnn { cmd } { bad-arg-spec }
@@ -4291,6 +4516,18 @@
with~a~command~that~was~never~defined.
\c__cmd_ignore_def_tl
}
+\msg_new:nnnn { cmd } { chars-dropped-first-line }
+ { Characters~'#1'~dropped~on~first~line~of~#2~environment. }
+ {
+ LaTeX~was~collecting~a~verbatim-like~environment,~and~the~characters~
+ '#1'~were~found~after~'\begin{#2}~on~the~first~line:~this~is~not~supported.
+ }
+\msg_new:nnnn { cmd } { chars-dropped-last-line }
+ { Characters~'#1'~dropped~after~end~of~#2~environment. }
+ {
+ LaTeX~was~collecting~a~verbatim-like~environment,~and~the~characters~
+ '#1'~were~found~after~\end{#2}~on~the~last~line:~this~is~not~supported.
+ }
\msg_new:nnnn { cmd } { env-already-defined }
{ Environment~'#1'~already~defined. }
{
@@ -4668,7 +4905,7 @@
\cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn
\cs_new_eq:NN \SplitList \__cmd_split_list:nn
\cs_new_eq:NN \TrimSpaces \__cmd_trim_spaces:n
-\cs_new_eq:NN \ProcessList \tl_map_function:nN
+\cs_new_eq:NN \ProcessList \tl_map_tokens:nn
\ExplSyntaxOff
%%% From File: lthooks.dtx
@@ -5050,10 +5287,11 @@
}
\cs_new_protected:Npn \__hook_hook_gput_code_do:nnn #1 #2 #3
{
- \__hook_debug:n{\iow_term:x{****~ Add~ to~
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
\__hook_if_usable:nF {#1} { undeclared~ }
- hook~ #1~ (#2)
- \on@line\space <-~ \tl_to_str:n{#3}} }
+ hook~ '#1'~ (#2) \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#3}} }
\str_if_eq:nnTF {#2} { top-level }
{
\str_if_eq:eeTF { top-level } { \__hook_currname_or_default: }
@@ -5541,7 +5779,7 @@
}
\__hook_debug:n
{
- \iow_term:x { ^^J All~initialized~(non-empty)~hooks: }
+ \iow_term:x { ^^J[lthooks]~ All~initialized~(non-empty)~hooks: }
\prop_map_inline:Nn \g__hook_used_prop
{
\iow_term:x
@@ -5553,7 +5791,7 @@
\cs_new_protected:Npn \__hook_initialize_hook_code:n #1
{
\__hook_debug:n
- { \iow_term:x { ^^J Update~code~for~hook~'#1' \on@line :^^J } }
+ { \iow_term:x { ^^J[lthooks]~ Update~code~for~hook~'#1' \on@line :^^J } }
\__hook_include_legacy_code_chunk:n {#1}
\__hook_if_usable:nT {#1}
{
@@ -5631,7 +5869,7 @@
\prop_get:NVN \l__hook_work_prop \l__hook_front_tl \l__hook_return_tl
\exp_args:NNV \__hook_tl_gput:Nn #1 \l__hook_return_tl
\__hook_clist_gput:NV #2 \l__hook_front_tl
- \__hook_debug:n{ \iow_term:x{Handled~ code~ for~ \l__hook_front_tl} }
+ \__hook_debug:n{ \iow_term:x{[lthooks]~ Handled~ code~ for~ \l__hook_front_tl} }
\seq_map_inline:cn { \__hook_seq_csname:n { \l__hook_front_tl } }
{
\tl_set:cx { \__hook_tl_csname:n {##1} }
@@ -5960,12 +6198,28 @@
{
\__hook_replacing_args_false:
\__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} {#2}
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
+ \__hook_if_usable:nF {#1} { undeclared~ }
+ hook~ '#1'~ ( next~ invocation~ only )
+ \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#2}
+ }
+ }
\__hook_replacing_args_reset:
}
\cs_new_protected:Npn \hook_gput_next_code_with_args:nn #1 #2
{
\__hook_replacing_args_true:
\__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} {#2}
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
+ \__hook_if_usable:nF {#1} { undeclared~ }
+ hook~ '#1'~ ( next~ invocation~ only )
+ \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#2}
+ }
+ }
\__hook_replacing_args_reset:
}
\cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2
@@ -6471,7 +6725,7 @@
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% From File: ltcmdhooks.dtx
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, Phelype Oleinik, The LaTeX Project
%%% From File: lthooks.dtx
\ExplSyntaxOn
@@ -6496,7 +6750,13 @@
#1 / #2 / #3 / #4 \s__hook_mark #5
{
\__hook_debug:n { \iow_term:n { ->~Adding~cmd~hook~to~'#2'~(#3): } }
- \exp_args:Nc \__hook_patch_cmd_or_delay:Nnn {#2} {#2} {#3}
+ \group_begin:
+ \exp_after:wN
+ \group_end:
+ \exp_after:wN
+ \__hook_patch_cmd_or_delay:Nnn
+ \cs:w #2\cs_end:
+ {#2} {#3}
}
\cs_new_protected:Npn \__hook_patch_cmd_or_delay:Nnn #1 #2 #3
{
@@ -6937,7 +7197,7 @@
{ \iow_term:x { ^^J [Sockets]~ ==>~ ##1} } }
}
\cs_new_protected:Npn \socket_new:nn #1 #2 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
\msg_error:nnn { socket } { already-declared } {#1}
}
@@ -6962,9 +7222,14 @@
}
}
}
+\prg_new_conditional:Npnn \socket_if_exist:n #1 { p , T , F , TF }
+ { \str_if_exist:cTF { l__socket_#1_plug_str }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_log:n #1 {
\typeout{ Socket~ #1:}
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
\typeout{ \@spaces number~ of~ inputs~ =~
\int_use:c { c__socket_#1_args_int } }
@@ -6983,9 +7248,9 @@
}
\cs_new_protected:Npn \socket_show:n #1 {\socket_log:n {#1} \errmessage{}}
\cs_new_protected:Npn \socket_new_plug:nnn #1#2#3 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\msg_error:nnnn { socket } { plug-already-declared } {#1} {#2}
}
@@ -7000,14 +7265,12 @@
{ Plug~ '#2'~ for~ socket~ '#1'~ declared. }
}
}
- {
- \msg_error:nnn { socket } { undeclared } {#1}
- }
+ { \msg_error:nnn { socket } { undeclared } {#1} }
}
\cs_new_protected:Npn \socket_set_plug:nnn #1#2#3 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\cs_generate_from_arg_count:cNnn
{ __socket_#1_plug_#2:w }
@@ -7021,14 +7284,17 @@
\msg_error:nnnn { socket } { plug-undeclared } {#1} {#2}
}
}
- {
- \msg_error:nnn { socket } { undeclared } {#1}
- }
+ { \msg_error:nnn { socket } { undeclared } {#1} }
}
+\prg_new_conditional:Npnn \socket_if_plug_exist:nn #1#2 { p , T , F , TF }
+ { \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_assign_plug:nn #1 #2 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\__socket_debug_term:n
{ Replacing~ plug~ '\str_use:c { l__socket_#1_plug_str }'~
@@ -7041,6 +7307,12 @@
}
{ \msg_error:nnn { socket } { undeclared } {#1} }
}
+\prg_new_conditional:Npnn \socket_if_plug_assigned:nn #1#2 { p , T , F , TF }
+ { \exp_args:Ne
+ \str_if_eq:nvTF {#2} { l__socket_#1_plug_str }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_use:nw #1 {
\__socket_debug_term:n
{ Socket~ '#1'~ containing~ plug~
@@ -7088,9 +7360,19 @@
\cs_new_eq:NN \UseSocket \socket_use:nw
\cs_new_eq:NN \DebugSocketsOn \socket_debug_on:
\cs_new_eq:NN \DebugSocketsOff \socket_debug_off:
+\cs_new_eq:NN \IfSocketExistsTF \socket_if_exist:nTF
+\cs_new_eq:NN \IfSocketExistsT \socket_if_exist:nT
+\cs_new_eq:NN \IfSocketExistsF \socket_if_exist:nF
+\cs_new_eq:NN \IfSocketPlugExistsTF \socket_if_plug_exist:nnTF
+\cs_new_eq:NN \IfSocketPlugExistsT \socket_if_plug_exist:nnT
+\cs_new_eq:NN \IfSocketPlugExistsF \socket_if_plug_exist:nnF
+\cs_new_eq:NN \IfSocketPlugAssignedTF \socket_if_plug_assigned:nnTF
+\cs_new_eq:NN \IfSocketPlugAssignedT \socket_if_plug_assigned:nnT
+\cs_new_eq:NN \IfSocketPlugAssignedF \socket_if_plug_assigned:nnF
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: lttemplates.dtx
+
\message{templates,}
\ExplSyntaxOn
\tl_const:Nn \c__template_code_root_tl { template~code~>~ }
@@ -7467,8 +7749,15 @@
\__template_if_keys_exist:nnT {#1} {#2}
{
\__template_store_key_implementation:nnn {#1} {#2} {#4}
- \regex_match:nnTF { \c { AssignTemplateKeys } } {#5}
- { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} }
+ \str_if_in:nnTF {#5} { AssignTemplateKeys }
+ {
+ \regex_match:nnTF { \c { AssignTemplateKeys } } {#5}
+ { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} }
+ {
+ \__template_declare_template_code:nnnn
+ {#1} {#2} {#3} { \AssignTemplateKeys #5 }
+ }
+ }
{
\__template_declare_template_code:nnnn
{#1} {#2} {#3} { \AssignTemplateKeys #5 }
@@ -8278,8 +8567,24 @@
{ \__template_if_instance_exist:nnF {#1} {#2} }
\cs_new_protected:Npn \KeyValue #1 {#1}
\cs_new_protected:Npn \AssignTemplateKeys { \__template_assignments_pop: }
+\cs_new_protected:Npn \SetKnownTemplateKeys #1#2#3
+ {
+ \tl_if_empty:oTF {#3}
+ {
+ \tl_set_eq:NN \UnusedTemplateKeys \c_empty_tl
+ }
+ {
+ \keys_set_known:noN { template / #1 / #2 } {#3} \UnusedTemplateKeys
+ }
+ }
\cs_new_protected:Npn \SetTemplateKeys #1#2#3
- { \keys_set_known:nnN { template / #1 / #2 } {#3} \l__template_tmp_clist }
+ {
+ \tl_if_empty:oF {#3}
+ {
+ \keys_set:no { template / #1 / #2 } {#3}
+ }
+ }
+\tl_new:N \UnusedTemplateKeys
\ExplSyntaxOff
%%% From File: ltalloc.dtx
\chardef\@xxxii=32
@@ -8600,7 +8905,7 @@ Type H <return> for immediate help.}%
\def\@par{\let\par\@@par\par}
\def\@restorepar{\def\par{\@par}}
%% File: ltpara.dtx
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltpara.dtx
@@ -8729,7 +9034,7 @@ Type H <return> for immediate help.}%
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: ltmeta.dtx
-%% Copyright (C) 2021-2024
+%% Copyright (C) 2021-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltmeta.dtx
\let \IfDocumentMetadataTF \@secondoftwo
@@ -9390,7 +9695,25 @@ Type H <return> for immediate help.}%
\@dec@text@cmd\newcommand}
\def\ProvideTextCommand{%
\@dec@text@cmd\providecommand}
+\def\@enc@info#1{%
+ \GenericInfo{(Encoding)\@spaces\@spaces\@spaces\space\space}%
+ {LaTeX Encoding Info: \space\space\space#1}}%
\def\@dec@text@cmd#1#2#3{%
+ \ifcsname #3\string#2\endcsname
+ \@enc@info{%
+ \ifx#1\providecommand
+ Ignoring declaration for
+ \else
+ Redeclaring
+ \fi
+ text
+ \ifx#1\chardef@text@cmd
+ symbol
+ \else
+ command
+ \fi
+ \string#2 (encoding #3)}%
+ \fi
\expandafter\def\expandafter#2%
\expandafter{%
\csname#3-cmd\expandafter\endcsname
@@ -9462,8 +9785,8 @@ Type H <return> for immediate help.}%
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
\ifx\reserved@a\relax
\DeclareTextCommand#1{#2}{%
- \@latex@error{\string#1 undeclared in encoding #2}\@eha}%
- \@latex@info{Composite with undeclared \string#1 in encoding #2}%
+ \@latex@error{Text composite \string#1 undeclared in encoding #2}\@eha}%
+ \@enc@info{Text composite with undeclared \string#1 in encoding #2}%
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
\fi
\expandafter\expandafter\expandafter\ifx
@@ -9533,8 +9856,8 @@ Type H <return> for immediate help.}%
\@onlypreamble\DeclareTextSymbolDefault
\@onlypreamble\DeclareTextAccentDefault
\def\UndeclareTextCommand#1#2{%
- \expandafter\ifx\csname#2\string#1\endcsname\relax
- \else
+ \ifcsname #2\string#1\endcsname
+ \@enc@info{Undeclare text command \string#1 (encoding #2)}%
\global\expandafter\let\csname#2\string#1\endcsname
\@undefined
\expandafter\expandafter\expandafter
@@ -9543,7 +9866,9 @@ Type H <return> for immediate help.}%
{\csname ?-cmd\expandafter\endcsname\expandafter
#1\csname?\string#1\endcsname}%
\fi
- \fi
+ \else
+ \@enc@info{Text command \string#1 (encoding #2) is not declared}%
+ \fi
}
\@onlypreamble\UndeclareTextCommand
\def\@tabacckludge#1{\expandafter\@changed@cmd
@@ -9656,7 +9981,6 @@ Type H <return> for immediate help.}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: ltcounts.dtx
-
\def\setcounter#1#2{%
\@ifundefined{c@#1}%
{\@nocounterr{#1}}%
@@ -9670,6 +9994,8 @@ Type H <return> for immediate help.}%
{\@definecounter{#1}}%
\@ifnextchar[{\@newctr{#1}}{}}
\def\value#1{\csname c@#1\endcsname}
+\protected\expandafter
+ \def\csname c@*\endcsname{\value\@currentcounter}
\def\@newctr#1[#2]{%
\@ifundefined{c@#2}{\@nocounterr{#2}}{\@addtoreset{#1}{#2}}}
\def\stepcounter#1{%
@@ -9713,13 +10039,15 @@ Type H <return> for immediate help.}%
\expandafter\xdef\csname cl@#2\endcsname
{\csname cl@#2\endcsname}%
\endgroup}}
-
+\begingroup\catcode`\*=11 \lowercase{\endgroup
\def\@ifbothcounters#1#2#3{%
+ \begingroup\let\c@*\@undefined
\@ifundefined{c@#1}{\@nocounterr{#1}}%
{% else counter is defined
\@ifundefined{c@#2}{\@nocounterr{#2}}%
{% else both counter and within are defined
- #3}}}
+ #3}}%
+ \endgroup}}
\NewDocumentCommand \counterwithout {sO{\arabic}mm}{%
\@ifbothcounters{#3}{#4}{%
\@removefromreset{#3}{#4}%
@@ -9746,7 +10074,6 @@ Type H <return> for immediate help.}%
\def\fnsymbol#1{\expandafter\@fnsymbol\csname c@#1\endcsname}
\def\@arabic#1{\number #1} %% changed 29 Apr 86
\def\@roman#1{\romannumeral #1}
-
\def\@Roman#1{\expandafter\@slowromancap\romannumeral #1@}
\def\@slowromancap#1{\ifx @#1% then terminate
\else
@@ -9970,7 +10297,10 @@ Type H <return> for immediate help.}%
\global\@namedef{#1:#2}{#3}}
\def\CheckEncodingSubset#1#2#3#4#5{%
- \ifnum #4>%
+ \expandafter\ifx\csname #2:\f@family\endcsname\relax
+ \LoadFontDefinitionFile{#2}\f@family
+ \fi
+ \ifnum #4>%
\expandafter\ifx\csname #2:\f@family\endcsname\relax
0\csname #2:?\endcsname
\else
@@ -10086,27 +10416,36 @@ Type H <return> for immediate help.}%
{\@nomath\mathversion
\expandafter\ifx\csname mv@#1\endcsname\relax
\@latex@error{Math version `#1' is not defined}\@eha\else
- \ifcsname mv@\math@version @frozen\endcsname
- \expandafter\let
- \csname mv@\math@version @frozen\expandafter\endcsname
- \csname mv@\math@version\endcsname
+ \ifcsname mv@#1@frozen\endcsname
+ \ifnum \@math@level = \@ne
+ \unconditionally@reset@math@version {#1}%
+ \fi
\fi
\edef\math@version{#1}%
\gdef\glb@currsize{}%
\aftergroup\glb@settings
\fi}
+\ExplSyntaxOn
+\cs_new_protected:Npn \unconditionally@reset@math@version #1 {
+ \cs_gset_eq:cc { mv@#1 }{ mv@#1@frozen }
+ \int_gset:cn { c@mv@#1 }{ \tl_use:c {g__nfss_frozen_mv_ #1 _tl} }
+}
+\ExplSyntaxOff
\let\frozen@everymath\everymath
\let\frozen@everydisplay\everydisplay
\newtoks\everymath
\newtoks\everydisplay
+\newcount\@math@level
\frozen@everydisplay = {%
\aftergroup\@ignoretrue \aftergroup\ignorespaces
+ \advance\@math@level\@ne
\check@mathfonts
\the\everydisplay}
\frozen@everymath = {%
\aftergroup\@ignorefalse
+ \advance\@math@level\@ne
\check@mathfonts
\the\everymath}
\let\curr@math@size\@empty
@@ -10359,387 +10698,1433 @@ Type H <return> for immediate help.}%
\def\@xxvpt{24.88}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: ltfssaxes.dtx
-%% Copyright (C) 2019-2020 Frank Mittelbach
+%% Copyright (C) 2019-2020 Frank Mittelbach (initial implementation)
\message{NFSS axes,}
\def\DeclareFontSeriesChangeRule#1#2#3#4{%
\@namedef{series@#1@#2}{{#3}{#4}}}
-\DeclareFontSeriesChangeRule {bc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {bc}{c}{bc}{}
-\DeclareFontSeriesChangeRule {bc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {bc}{ec}{bec} {bc}
-\DeclareFontSeriesChangeRule {bc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {bc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {bc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {bc}{sc}{bsc} {bc}
-\DeclareFontSeriesChangeRule {bc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {bc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {bc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {bc}{x}{bx}{}
-\DeclareFontSeriesChangeRule {bx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {bx}{c} {bc} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {bx}{ec} {bec} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {bx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {}
-\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {bx} %<-----
-\DeclareFontSeriesChangeRule {bx}{sl}{slx} {}
-\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
-\DeclareFontSeriesChangeRule {b}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{c} {bc} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{ec} {bec} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{sb} {sb} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{x} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {c}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {c}{b}{bc}{}
-\DeclareFontSeriesChangeRule {c}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {c}{el}{elc}{}
-\DeclareFontSeriesChangeRule {c}{l}{lc}{}
-\DeclareFontSeriesChangeRule {c}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {c}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {c}{x}{x}{m} %<-----
-\DeclareFontSeriesChangeRule {ebc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ebc}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {ebc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ebc}{ec}{ebec}{ebc}
-\DeclareFontSeriesChangeRule {ebc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ebc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ebc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ebc}{sc}{ebsc}{ebc}
-\DeclareFontSeriesChangeRule {ebc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {ec}{b}{bec}{}
-\DeclareFontSeriesChangeRule {ec}{eb}{ebec}{}
-\DeclareFontSeriesChangeRule {ec}{el}{elec}{}
-\DeclareFontSeriesChangeRule {ec}{l}{lec}{}
-\DeclareFontSeriesChangeRule {ec}{sb}{sbec}{}
-\DeclareFontSeriesChangeRule {ec}{sl}{slec}{}
-\DeclareFontSeriesChangeRule {ec}{ub}{ubec}{}
-\DeclareFontSeriesChangeRule {ec}{ul}{ulec}{}
-\DeclareFontSeriesChangeRule {ec}{x}{x}{m} %<-----
-\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {sc}{b}{bsc}{}
-\DeclareFontSeriesChangeRule {sc}{eb}{ebsc}{}
-\DeclareFontSeriesChangeRule {sc}{el}{elsc}{}
-\DeclareFontSeriesChangeRule {sc}{l}{lsc}{}
-\DeclareFontSeriesChangeRule {sc}{sb}{sbsc}{}
-\DeclareFontSeriesChangeRule {sc}{sl}{slsc}{}
-\DeclareFontSeriesChangeRule {sc}{ub}{ubsc}{}
-\DeclareFontSeriesChangeRule {sc}{ul}{ulsc}{}
-\DeclareFontSeriesChangeRule {sc}{x}{x}{m} %<-----
-\DeclareFontSeriesChangeRule {ebx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ebx}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {ebx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ebx}{ec}{ebec}{}
-\DeclareFontSeriesChangeRule {ebx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ebx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ebx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ebx}{sc}{ebsc}{}
-\DeclareFontSeriesChangeRule {ebx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
-\DeclareFontSeriesChangeRule {eb}{ec}{ebec}{}
-\DeclareFontSeriesChangeRule {eb}{sc}{ebsc}{}
-\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {elc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {elc}{c}{elc}{}
-\DeclareFontSeriesChangeRule {elc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {elc}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {elc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {elc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {elc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {elc}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {elc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
-\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {elx}{c}{elc}{}
-\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {elx}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {elx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {elx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {elx}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {elx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
-\DeclareFontSeriesChangeRule {el}{c}{elc}{}
-\DeclareFontSeriesChangeRule {el}{ec}{elec}{}
-\DeclareFontSeriesChangeRule {el}{sc}{elsc}{}
-\DeclareFontSeriesChangeRule {el}{x}{elx}{}
-\DeclareFontSeriesChangeRule {lc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {lc}{c}{lc}{}
-\DeclareFontSeriesChangeRule {lc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {lc}{ec}{lec}{}
-\DeclareFontSeriesChangeRule {lc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {lc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {lc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {lc}{sc}{lsc}{}
-\DeclareFontSeriesChangeRule {lc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
-\DeclareFontSeriesChangeRule {lx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {lx}{c}{lc}{}
-\DeclareFontSeriesChangeRule {lx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {lx}{ec}{lec}{}
-\DeclareFontSeriesChangeRule {lx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {lx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {lx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {lx}{sc}{lsc}{}
-\DeclareFontSeriesChangeRule {lx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
-\DeclareFontSeriesChangeRule {l}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {l}{b} {b} {bx} %<-----
-\DeclareFontSeriesChangeRule {l}{c} {lc} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{ec} {lec} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{sb} {sb} {b} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{sc} {lsc} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{x} {lx} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {m}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {m}{b} {b} {bx} %<-----
-\DeclareFontSeriesChangeRule {m}{c} {c} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{ec} {ec} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{l} {l} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{sb} {sb} {b} %<-----
-\DeclareFontSeriesChangeRule {m}{sc} {sc} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{x} {x} {m} %<-----
-\DeclareFontSeriesChangeRule {sbc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {sbc}{c}{sbc}{}
-\DeclareFontSeriesChangeRule {sbc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {sbc}{ec}{sbec}{sbc}
-\DeclareFontSeriesChangeRule {sbc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {sbc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {sbc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {sbc}{sc}{sbsc}{sbc}
-\DeclareFontSeriesChangeRule {sbc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
-\DeclareFontSeriesChangeRule {sbx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {sbx}{c}{sbc}{}
-\DeclareFontSeriesChangeRule {sbx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {sbx}{ec}{sbec}{}
-\DeclareFontSeriesChangeRule {sbx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {sbx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {sbx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {sbx}{sc}{sbsc}{}
-\DeclareFontSeriesChangeRule {sbx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
-\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {sbc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {sbc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx} %? %<-----
-\DeclareFontSeriesChangeRule {slc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {slc}{c}{slc}{}
-\DeclareFontSeriesChangeRule {slc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {slc}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {slc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {slc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {slc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {slc}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {slc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
-\DeclareFontSeriesChangeRule {slx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {slx}{c}{slc}{}
-\DeclareFontSeriesChangeRule {slx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {slx}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {slx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {slx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {slx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {slx}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {slx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {slx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {slx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
-\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
-\DeclareFontSeriesChangeRule {sl}{ec}{slec}{}
-\DeclareFontSeriesChangeRule {sl}{sc}{slsc}{}
-\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
-\DeclareFontSeriesChangeRule {ubc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ubc}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ubc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ubc}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ubc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ubc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ubc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ubc}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ubc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {ubx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ubx}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ubx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ubx}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ubx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ubx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ubx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ubx}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ubx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
-\DeclareFontSeriesChangeRule {ub}{ec}{ubec}{}
-\DeclareFontSeriesChangeRule {ub}{sc}{ubsc}{}
-\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {ulc}{b}{bc}{}
-\DeclareFontSeriesChangeRule {ulc}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ulc}{eb}{ebc}{}
-\DeclareFontSeriesChangeRule {ulc}{ec}{ulec}{ulc}
-\DeclareFontSeriesChangeRule {ulc}{el}{elc}{}
-\DeclareFontSeriesChangeRule {ulc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ulc}{sb}{sbc}{}
-\DeclareFontSeriesChangeRule {ulc}{sc}{ulsc}{ulc}
-\DeclareFontSeriesChangeRule {ulc}{sl}{slc}{}
-\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {ulx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {ulx}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ulx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {ulx}{ec}{ulec}{}
-\DeclareFontSeriesChangeRule {ulx}{el}{elx}{}
-\DeclareFontSeriesChangeRule {ulx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ulx}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {ulx}{sc}{ulsc}{}
-\DeclareFontSeriesChangeRule {ulx}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {ulx}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {ulx}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
-\DeclareFontSeriesChangeRule {ul}{ec}{ulec}{}
-\DeclareFontSeriesChangeRule {ul}{sc}{ulsc}{}
-\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {x}{b}{bx}{}
-\DeclareFontSeriesChangeRule {x}{c}{c}{}
-\DeclareFontSeriesChangeRule {x}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {x}{ec}{ec}{}
-\DeclareFontSeriesChangeRule {x}{el}{elx}{}
-\DeclareFontSeriesChangeRule {x}{l}{lx}{}
-\DeclareFontSeriesChangeRule {x}{sb}{sbx}{}
-\DeclareFontSeriesChangeRule {x}{sc}{sc}{}
-\DeclareFontSeriesChangeRule {x}{sl}{slx}{}
-\DeclareFontSeriesChangeRule {x}{ub}{ubx}{}
-\DeclareFontSeriesChangeRule {x}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {bc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {bec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {bsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {bx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {b}{m?}{m}{}
-\DeclareFontSeriesChangeRule {c}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ebsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ebx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {eb}{m?}{m}{}
-\DeclareFontSeriesChangeRule {ec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {elec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {elx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {el}{m?}{m}{}
-\DeclareFontSeriesChangeRule {lc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {lec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {lsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {lx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {l}{m?}{m}{}
-\DeclareFontSeriesChangeRule {m}{m?}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {sbec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {sbsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {sbx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sb}{m?}{m}{}
-\DeclareFontSeriesChangeRule {sc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {slec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {slsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sl}{m?}{m}{}
-\DeclareFontSeriesChangeRule {ubc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ubec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ubsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ubx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ub}{m?}{ub}{}
-\DeclareFontSeriesChangeRule {ulc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ulec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ulsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ulx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ul}{m?}{m}{}
-\DeclareFontSeriesChangeRule {x}{m?}{x}{}
-\DeclareFontSeriesChangeRule {bc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bec}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bx}{?m}{b}{}
-\DeclareFontSeriesChangeRule {b}{?m}{b}{}
-\DeclareFontSeriesChangeRule {c}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ebc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebec}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebx}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {eb}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ec}{?m}{m}{}
-\DeclareFontSeriesChangeRule {elc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elec}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elx}{?m}{el}{}
-\DeclareFontSeriesChangeRule {el}{?m}{el}{}
-\DeclareFontSeriesChangeRule {lc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lec}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lx}{?m}{l}{}
-\DeclareFontSeriesChangeRule {l}{?m}{l}{}
-\DeclareFontSeriesChangeRule {m}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbec}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbx}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sb}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {slc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slec}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slx}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {sl}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {ubc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubec}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubx}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ub}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ulc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulec}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulx}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ul}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {x}{?m}{m}{}
+\DeclareFontSeriesChangeRule {uluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {uluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {uluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {uluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {uluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {uluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {uluc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {uluc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {uluc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {uluc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {uluc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {uluc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {uluc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ulec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ulec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ulec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ulec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ulec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulec}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulec}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulec}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulec}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulec}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulec}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulec}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ulc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ulc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ulc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ulc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ulc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulsc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulsc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulsc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulsc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ul}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ul}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ul}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ul}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ul}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ul}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ul}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ul}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ul}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {ul}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {ul}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {ulsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulsx}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulsx}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulsx}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsx}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulsx}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulsx}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ulx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ulx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ulx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ulx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ulx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulx}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulx}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulx}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulx}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulx}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulx}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulx}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ulex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ulex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ulex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ulex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ulex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulex}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulex}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulex}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulex}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulex}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulex}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulex}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ulux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ulux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ulux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ulux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ulux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulux}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulux}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulux}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulux}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulux}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulux}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulux}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {eluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {eluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {eluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {eluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {eluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {eluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {eluc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {eluc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {eluc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {eluc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {eluc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {eluc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {eluc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {elec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {elec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {elec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {elec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {elec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {elec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {elec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {elec}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elec}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elec}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elec}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elec}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elec}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elec}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elec}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {elc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {elc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {elc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {elc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {elc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {elc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {elc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {elc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {elsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {elsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {elsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elsc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elsc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elsc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elsc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elsc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elsc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {el}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {el}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {el}{c} {elc} {}
+\DeclareFontSeriesChangeRule {el}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {el}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {el}{x} {elx} {}
+\DeclareFontSeriesChangeRule {el}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {el}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {el}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {el}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {el}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {elsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {elsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {elsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {elsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {elsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {elsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elsx}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elsx}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elsx}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elsx}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elsx}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elsx}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elsx}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {elx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {elx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {elx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {elx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {elx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {elx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {elx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {elx}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elx}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elx}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elx}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elx}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elx}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elx}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elx}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {elex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {elex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {elex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {elex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {elex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {elex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {elex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {elex}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elex}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elex}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elex}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elex}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elex}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elex}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elex}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {elux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {elux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {elux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {elux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {elux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {elux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {elux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {elux}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elux}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elux}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elux}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elux}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elux}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elux}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elux}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {luc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {luc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {luc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {luc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {luc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {luc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {luc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {luc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {luc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {luc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {luc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {luc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {luc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {lec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {lec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {lec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {lec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {lec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {lec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {lec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {lec}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lec}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lec}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lec}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lec}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lec}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lec}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lec}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {lc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {lc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {lc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {lc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {lc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {lc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {lc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {lc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {lsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {lsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {lsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lsc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lsc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lsc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lsc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lsc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lsc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {l}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {l}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {l}{c} {lc} {}
+\DeclareFontSeriesChangeRule {l}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {l}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {l}{x} {lx} {}
+\DeclareFontSeriesChangeRule {l}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {l}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {l}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {l}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {l}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {lsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {lsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {lsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {lsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {lsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {lsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lsx}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lsx}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lsx}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lsx}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lsx}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lsx}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lsx}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {lx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {lx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {lx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {lx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {lx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {lx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {lx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {lx}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lx}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lx}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lx}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lx}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lx}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lx}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lx}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {lex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {lex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {lex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {lex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {lex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {lex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {lex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {lex}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lex}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lex}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lex}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lex}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lex}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lex}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lex}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {lux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {lux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {lux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {lux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {lux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {lux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {lux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {lux}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lux}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lux}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lux}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lux}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lux}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lux}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lux}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {sluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {sluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {sluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {sluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {sluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {sluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {sluc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {sluc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {sluc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {sluc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {sluc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {sluc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {sluc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {slec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {slec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {slec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {slec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {slec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {slec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {slec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {slec}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slec}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slec}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slec}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slec}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slec}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slec}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slec}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {slc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {slc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {slc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {slc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {slc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {slc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {slc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {slc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {slsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {slsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {slsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slsc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slsc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slsc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slsc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slsc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slsc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {sl}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {sl}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {sl}{c} {slc} {}
+\DeclareFontSeriesChangeRule {sl}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {sl}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {sl}{x} {slx} {}
+\DeclareFontSeriesChangeRule {sl}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {sl}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {sl}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {sl}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {sl}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {slsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {slsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {slsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {slsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {slsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {slsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slsx}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slsx}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slsx}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slsx}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slsx}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slsx}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slsx}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {slx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {slx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {slx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {slx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {slx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {slx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {slx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {slx}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slx}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slx}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slx}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slx}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slx}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slx}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slx}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {slex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {slex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {slex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {slex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {slex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {slex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {slex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {slex}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slex}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slex}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slex}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slex}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slex}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slex}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slex}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {slux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {slux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {slux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {slux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {slux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {slux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {slux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {slux}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slux}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slux}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slux}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slux}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slux}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slux}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slux}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {uc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {uc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {uc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {uc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {uc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {uc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {uc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {uc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {ec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {ec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {c}{ul} {ulc} {c}
+\DeclareFontSeriesChangeRule {c}{el} {elc} {c}
+\DeclareFontSeriesChangeRule {c}{l} {lc} {c}
+\DeclareFontSeriesChangeRule {c}{sl} {slc} {c}
+\DeclareFontSeriesChangeRule {c}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {c}{b} {bc} {}
+\DeclareFontSeriesChangeRule {c}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {c}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {c}{uc} {uc} {c}
+\DeclareFontSeriesChangeRule {c}{ec} {ec} {c}
+\DeclareFontSeriesChangeRule {c}{sc} {sc} {c}
+\DeclareFontSeriesChangeRule {sc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {sc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {sc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {sc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {sc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {sc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {sc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {sc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {m}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {m}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {m}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {m}{b} {b} {bx}
+\DeclareFontSeriesChangeRule {sx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {sx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {sx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {sx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {sx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {sx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {sx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {sx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {x}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {x}{el} {elx} {}
+\DeclareFontSeriesChangeRule {x}{l} {lx} {}
+\DeclareFontSeriesChangeRule {x}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {x}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {x}{b} {bx} {}
+\DeclareFontSeriesChangeRule {x}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {x}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {ex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {ex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {ux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {ux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {sbuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sb} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {sbuc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {sbuc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {sbuc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbuc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbuc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbuc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbuc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbuc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {sbec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {sbec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {sbec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {sbec}{sb} {sbec} {}
+\DeclareFontSeriesChangeRule {sbec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {sbec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {sbec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {sbec}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbec}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbec}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbec}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbec}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbec}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbec}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbec}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {sbc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {sbc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {sbc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {sbc}{sb} {sbc} {}
+\DeclareFontSeriesChangeRule {sbc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {sbc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {sbc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {sbc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sb} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {sbsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {sbsc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbsc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbsc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbsc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbsc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sb}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sb}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sb}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sb}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sb}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sb}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sb}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {sb}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {sbsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{sb} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {sbsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {sbsx}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbsx}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbsx}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbsx}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsx}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbsx}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbsx}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {sbx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {sbx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {sbx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {sbx}{sb} {sbx} {}
+\DeclareFontSeriesChangeRule {sbx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {sbx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {sbx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {sbx}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbx}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbx}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbx}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbx}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbx}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbx}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbx}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {sbex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {sbex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {sbex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {sbex}{sb} {sbex} {}
+\DeclareFontSeriesChangeRule {sbex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {sbex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {sbex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {sbex}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbex}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbex}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbex}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbex}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbex}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbex}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbex}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {sbux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {sbux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {sbux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {sbux}{sb} {sbux} {}
+\DeclareFontSeriesChangeRule {sbux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {sbux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {sbux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {sbux}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbux}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbux}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbux}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbux}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbux}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbux}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbux}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {buc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {buc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {buc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {buc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {buc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {buc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {buc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {buc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {buc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {buc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {buc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {buc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {buc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {bec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {bec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {bec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {bec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {bec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {bec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {bec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {bec}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bec}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bec}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bec}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bec}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bec}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bec}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bec}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {bc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {bc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {bc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {bc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {bc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {bc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {bc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {bc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {bsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {bsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {bsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bsc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bsc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bsc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bsc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bsc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bsc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {b}{uc} {buc} {b}
+\DeclareFontSeriesChangeRule {b}{ec} {bec} {b}
+\DeclareFontSeriesChangeRule {b}{c} {bc} {b}
+\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b}
+\DeclareFontSeriesChangeRule {b}{sx} {bsx} {b}
+\DeclareFontSeriesChangeRule {b}{x} {bx} {b}
+\DeclareFontSeriesChangeRule {b}{ex} {bex} {b}
+\DeclareFontSeriesChangeRule {b}{ux} {bux} {b}
+\DeclareFontSeriesChangeRule {b}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {b}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {b}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {bsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {bsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {bsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {bsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {bsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {bsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bsx}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bsx}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bsx}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bsx}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bsx}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bsx}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bsx}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {bx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {bx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {bx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {bx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {bx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {bx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {bx}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bx}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bx}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bx}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bx}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bx}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bx}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {bex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {bex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {bex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {bex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {bex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {bex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {bex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {bex}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bex}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bex}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bex}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bex}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bex}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bex}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bex}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {bux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {bux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {bux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {bux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {bux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {bux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {bux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {bux}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bux}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bux}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bux}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bux}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bux}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bux}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bux}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {ebuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {ebuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {ebuc}{eb} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebuc}{ub} {ubuc} {ebuc}
+\DeclareFontSeriesChangeRule {ebuc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebuc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebuc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebuc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebuc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebuc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ebec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ebec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ebec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ebec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ebec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ebec}{eb} {ebec} {}
+\DeclareFontSeriesChangeRule {ebec}{ub} {ubec} {ebec}
+\DeclareFontSeriesChangeRule {ebec}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebec}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebec}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebec}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebec}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebec}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebec}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebec}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ebc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ebc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ebc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ebc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ebc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ebc}{eb} {ebc} {}
+\DeclareFontSeriesChangeRule {ebc}{ub} {ubc} {ebc}
+\DeclareFontSeriesChangeRule {ebc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ebsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{eb} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{ub} {ubsc} {ebsc}
+\DeclareFontSeriesChangeRule {ebsc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebsc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebsc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebsc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebsc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {eb}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {eb}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {eb}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {eb}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {eb}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {eb}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {eb}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {eb}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {eb}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {eb}{ub} {ub} {eb}
+\DeclareFontSeriesChangeRule {ebsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ebsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{eb} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{ub} {ubsx} {ebsx}
+\DeclareFontSeriesChangeRule {ebsx}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebsx}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebsx}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebsx}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsx}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebsx}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebsx}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ebx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ebx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ebx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ebx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ebx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ebx}{eb} {ebx} {}
+\DeclareFontSeriesChangeRule {ebx}{ub} {ubx} {ebx}
+\DeclareFontSeriesChangeRule {ebx}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebx}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebx}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebx}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebx}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebx}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebx}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebx}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ebex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ebex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ebex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ebex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ebex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ebex}{eb} {ebex} {}
+\DeclareFontSeriesChangeRule {ebex}{ub} {ubex} {ebex}
+\DeclareFontSeriesChangeRule {ebex}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebex}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebex}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebex}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebex}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebex}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebex}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebex}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ebux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ebux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ebux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ebux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ebux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ebux}{eb} {ebux} {}
+\DeclareFontSeriesChangeRule {ebux}{ub} {ubux} {ebux}
+\DeclareFontSeriesChangeRule {ebux}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebux}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebux}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebux}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebux}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebux}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebux}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebux}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ubuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {ubuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {ubuc}{eb} {ebuc} {ubuc}
+\DeclareFontSeriesChangeRule {ubuc}{ub} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubuc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubuc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubuc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubuc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubuc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubuc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ubec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ubec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ubec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ubec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ubec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ubec}{eb} {ebec} {ubec}
+\DeclareFontSeriesChangeRule {ubec}{ub} {ubec} {}
+\DeclareFontSeriesChangeRule {ubec}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubec}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubec}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubec}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubec}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubec}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubec}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubec}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ubc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ubc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ubc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ubc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ubc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ubc}{eb} {ebc} {ubc}
+\DeclareFontSeriesChangeRule {ubc}{ub} {ubc} {}
+\DeclareFontSeriesChangeRule {ubc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ubsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{eb} {ebsc} {ubsc}
+\DeclareFontSeriesChangeRule {ubsc}{ub} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubsc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubsc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubsc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubsc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ub}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ub}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ub}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ub}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ub}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ub}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ub}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ub}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ub}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {ub}{eb} {eb} {ub}
+\DeclareFontSeriesChangeRule {ubsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ubsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{eb} {ebsx} {ubsx}
+\DeclareFontSeriesChangeRule {ubsx}{ub} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubsx}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubsx}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubsx}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsx}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubsx}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubsx}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ubx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ubx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ubx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ubx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ubx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ubx}{eb} {ebx} {ubx}
+\DeclareFontSeriesChangeRule {ubx}{ub} {ubx} {}
+\DeclareFontSeriesChangeRule {ubx}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubx}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubx}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubx}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubx}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubx}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubx}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubx}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ubex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ubex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ubex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ubex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ubex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ubex}{eb} {ebex} {ubex}
+\DeclareFontSeriesChangeRule {ubex}{ub} {ubex} {}
+\DeclareFontSeriesChangeRule {ubex}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubex}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubex}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubex}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubex}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubex}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubex}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubex}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ubux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ubux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ubux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ubux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ubux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ubux}{eb} {ebux} {ubux}
+\DeclareFontSeriesChangeRule {ubux}{ub} {ubux} {}
+\DeclareFontSeriesChangeRule {ubux}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubux}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubux}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubux}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubux}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubux}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubux}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubux}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {uluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ul}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {eluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {el}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {luc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {l}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sl}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sb}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {buc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {b}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {eb}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ub}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {uc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {c}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {m}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {x}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {uluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ulec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ulc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ulsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {ul}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ulsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ulx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ulex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ulux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {eluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {elec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {elc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {elsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {el}{m?} {m} {}
+\DeclareFontSeriesChangeRule {elsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {elx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {elex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {elux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {luc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {lec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {lc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {lsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {l}{m?} {m} {}
+\DeclareFontSeriesChangeRule {lsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {lx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {lex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {lux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {sluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {slec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {slc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {slsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {sl}{m?} {m} {}
+\DeclareFontSeriesChangeRule {slsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {slx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {slex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {slux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {uc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {c}{m?} {c} {}
+\DeclareFontSeriesChangeRule {sc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {m}{m?} {m} {}
+\DeclareFontSeriesChangeRule {sx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {x}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {sbuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {sbec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {sbc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {sbsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {sb}{m?} {m} {}
+\DeclareFontSeriesChangeRule {sbsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {sbx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {sbex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {sbux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {buc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {bec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {bc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {bsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {b}{m?} {m} {}
+\DeclareFontSeriesChangeRule {bsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {bx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {bex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {bux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {ebuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ebec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ebc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ebsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {eb}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ebsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ebx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ebex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ebux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {ubuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ubec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ubc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ubsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {ub}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ubsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ubx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ubex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ubux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {uluc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulec}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulsc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ul}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulsx}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulx}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulex}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulux}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {eluc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elec}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elsc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {el}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elsx}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elx}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elex}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elux}{?m} {el} {}
+\DeclareFontSeriesChangeRule {luc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lec}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lsc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {l}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lsx}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lx}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lex}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lux}{?m} {l} {}
+\DeclareFontSeriesChangeRule {sluc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slec}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slsc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {sl}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slsx}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slx}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slex}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slux}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {uc}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ec}{?m} {m} {}
+\DeclareFontSeriesChangeRule {c}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sc}{?m} {m} {}
+\DeclareFontSeriesChangeRule {m}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sx}{?m} {m} {}
+\DeclareFontSeriesChangeRule {x}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ex}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ux}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sbuc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbec}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbsc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sb}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbsx}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbx}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbex}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbux}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {buc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bec}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bsc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {b}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bsx}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bx}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bex}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bux}{?m} {b} {}
+\DeclareFontSeriesChangeRule {ebuc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebec}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebsc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {eb}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebsx}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebx}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebex}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebux}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ubuc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubec}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubsc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ub}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubsx}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubx}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubex}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubux}{?m} {ub} {}
\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@series{#1}}}
@@ -10844,42 +12229,79 @@ Type H <return> for immediate help.}%
\newcommand\sscdefault{ssc}
\DeclareFontShapeChangeRule {n}{it} {it} {sl}
\DeclareFontShapeChangeRule {n}{sl} {sl} {it}
+\DeclareFontShapeChangeRule {n}{sw} {sw} {it}
\DeclareFontShapeChangeRule {n}{ulc} {n} {}
-\DeclareFontShapeChangeRule {n}{up} {n} {}
+\DeclareFontShapeChangeRule {n}{up} {n} {}
+\DeclareFontShapeChangeRule {n}{ssc} {ssc} {sc}
\DeclareFontShapeChangeRule {it}{sl} {sl} {it}
+\DeclareFontShapeChangeRule {it}{sw} {sw} {it}
\DeclareFontShapeChangeRule {it}{sc} {scit} {scsl}
\DeclareFontShapeChangeRule {it}{ulc} {it} {}
-\DeclareFontShapeChangeRule {it}{up} {n} {}
+\DeclareFontShapeChangeRule {it}{up} {n} {}
+\DeclareFontShapeChangeRule {it}{ssc} {sscit} {scit}
\DeclareFontShapeChangeRule {sl}{it} {it} {sl}
+\DeclareFontShapeChangeRule {sl}{sw} {sw} {it}
\DeclareFontShapeChangeRule {sl}{sc} {scsl} {scit}
\DeclareFontShapeChangeRule {sl}{ulc} {sl} {}
-\DeclareFontShapeChangeRule {sl}{up} {n} {}
+\DeclareFontShapeChangeRule {sl}{up} {n} {}
+\DeclareFontShapeChangeRule {sl}{ssc} {sscsl} {scsl}
\DeclareFontShapeChangeRule {sc}{it} {scit} {scsl}
\DeclareFontShapeChangeRule {sc}{sl} {scsl} {scit}
-\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw}
-\DeclareFontShapeChangeRule {sc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sc}{sw} {scsw} {scit}
+\DeclareFontShapeChangeRule {sc}{ulc} {n} {}
\DeclareFontShapeChangeRule {sc}{up} {n} {}
\DeclareFontShapeChangeRule {scit}{it} {scit} {}
\DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit}
-\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit?
+\DeclareFontShapeChangeRule {scit}{sw} {scsw} {scit}
\DeclareFontShapeChangeRule {scit}{sc} {scit} {}
\DeclareFontShapeChangeRule {scit}{ulc} {it} {}
-\DeclareFontShapeChangeRule {scit}{up} {sc} {}
+\DeclareFontShapeChangeRule {scit}{up} {sc} {}
+\DeclareFontShapeChangeRule {scit}{ssc} {sscit} {scit}
\DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl}
\DeclareFontShapeChangeRule {scsl}{sl} {scsl} {}
-\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl?
+\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {scsl}
\DeclareFontShapeChangeRule {scsl}{sc} {scsl} {}
\DeclareFontShapeChangeRule {scsl}{ulc} {sl} {}
-\DeclareFontShapeChangeRule {scsl}{up} {sc} {}
+\DeclareFontShapeChangeRule {scsl}{up} {sc} {}
+\DeclareFontShapeChangeRule {scsl}{ssc} {sscsl} {scsl}
\DeclareFontShapeChangeRule {scsw}{it} {scit} {scsw}
\DeclareFontShapeChangeRule {scsw}{sl} {scsl} {}
\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{ulc} {sw} {}
-\DeclareFontShapeChangeRule {scsw}{up} {sc} {}
-\DeclareFontShapeChangeRule {sw}{sc} {scsw} {}
+\DeclareFontShapeChangeRule {scsw}{up} {sc} {}
+\DeclareFontShapeChangeRule {scsw}{ssc} {sscsw} {scsw}
+\DeclareFontShapeChangeRule {sw}{sc} {scsw} {scit}
\DeclareFontShapeChangeRule {sw}{ulc} {sw} {}
-\DeclareFontShapeChangeRule {sw}{up} {n} {}
+\DeclareFontShapeChangeRule {sw}{up} {n} {}
+\DeclareFontShapeChangeRule {sw}{ssc} {sscsw} {scsw}
+\DeclareFontShapeChangeRule {ssc}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {ssc}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {ssc}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {ssc}{sc} {sc} {}
+\DeclareFontShapeChangeRule {ssc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {ssc}{up} {n} {}
+\DeclareFontShapeChangeRule {sscit}{it} {sscit} {}
+\DeclareFontShapeChangeRule {sscit}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {sscit}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {sscit}{ssc} {sscit} {}
+\DeclareFontShapeChangeRule {sscit}{sc} {scit} {}
+\DeclareFontShapeChangeRule {sscit}{ulc} {it} {}
+\DeclareFontShapeChangeRule {sscit}{up} {ssc} {}
+\DeclareFontShapeChangeRule {sscsl}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {sscsl}{sl} {sscsl} {}
+\DeclareFontShapeChangeRule {sscsl}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {sscsl}{sc} {scsl} {}
+\DeclareFontShapeChangeRule {sscsl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {sscsl}{up} {ssc} {}
+\DeclareFontShapeChangeRule {sscsw}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {sscsw}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {sscsw}{sw} {sscsw} {}
+\DeclareFontShapeChangeRule {sscsw}{ssc} {sscsw} {}
+\DeclareFontShapeChangeRule {sscsw}{sc} {scsw} {scit}
+\DeclareFontShapeChangeRule {sscsw}{ulc} {sw} {it}
+\DeclareFontShapeChangeRule {sscsw}{up} {ssc} {}
+
\DeclareRobustCommand\fontshape[1]
{\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\delayed@merge@font@shape{#1}}}
@@ -11432,20 +12854,35 @@ Type H <return> for immediate help.}%
\tl_gset:cx { g__nfss_frozen_mv_ #1 _tl }{ \int_use:c { c@mv@#1 } }
\cs_gset:cpn{mv@#1@reset}
{
+ \int_compare:nNnTF \@math@level = 0
+ {
\int_compare:nNnTF { \int_use:c{c@mv@#1} } >
{ \tl_use:c{g__nfss_frozen_mv_ #1 _tl} }
{
- \@font@info{Undo~ math~ alphabet~ allocation~ in~ version~ #1}
+ \@font@info{ Undo~ math~ alphabet~ allocation~ in~ version~ #1 }
\cs_gset_eq:cc { mv@#1 }{ mv@#1@frozen }
\int_gset:cn { c@mv@#1 }{ \tl_use:c {g__nfss_frozen_mv_ #1 _tl} }
- \group_begin:
- \cs_set_eq:NN \getanddefine@fonts \use_none:nn
- \use:c {mv@#1}
- \group_end:
+ \tl_if_eq:NnTF \math@version {#1}
+ {
+ \group_begin:
+ \cs_set_eq:NN \getanddefine@fonts \use_none:nn
+ \use:c {mv@ \math@version }
+ \group_end:
+ }
+ {
+ \@font@info{ ...~ but~ do~ not~ reset~ the~
+ top-level~ math~ alphabet~ definitions }
+ }
}
{
- \@font@info{No~ math~ alphabet~ change~ to~ frozen~ version~ #1}
+ \@font@info{ No~ math~ alphabet~ change~
+ to~ frozen~ version~ #1 }
}
+ }
+ {
+ \@font@info{ Nested~ math:~ keeping~ math~ alphabet~
+ allocation~ in~ version~ #1}
+ }
\if@ignore \ignorespaces \fi
}
}
@@ -13336,6 +14773,7 @@ Type H <return> for immediate help.}%
{\@currentlabelname}{\@currentHref}{\@kernel@reserved@label@data}}}%
\endgroup
\@esphack}
+\def\ltx@star@counter{*}
\def\@currentcounter{}
\NewSocket{refstepcounter}{1}
\NewSocket{refstepcounter/target}{1}
@@ -13345,7 +14783,10 @@ Type H <return> for immediate help.}%
\def\refstepcounter#1{%
\UseSocket{refstepcounter}{%
\stepcounter{#1}%
- \edef\@currentcounter{#1}%
+ \edef\reserved@a{#1}%
+ \ifx\reserved@a\ltx@star@counter\else
+ \let\@currentcounter\reserved@a
+ \fi
\protected@edef\@currentlabel
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
\UseSocket{refstepcounter/target}{#1}%
@@ -13355,14 +14796,17 @@ Type H <return> for immediate help.}%
\def\@kernel@refstepcounter#1{%
\UseSocket{refstepcounter}{%
\stepcounter{#1}%
- \edef\@currentcounter{#1}%
+ \edef\reserved@a{#1}%
+ \ifx\reserved@a\ltx@star@counter\else
+ \let\@currentcounter\reserved@a
+ \fi
\protected@edef\@currentlabel
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}}}%
\def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
-\def\@kernel@Ref#1{\protected@edef\@tempa{\@kernel@ref{#1}}%
- \expandafter\MakeUppercase\@tempa}
-\def\@kernel@sRef#1{\protected@edef\@tempa{\@kernel@sref{#1}}%
- \expandafter\MakeUppercase\@tempa}
+\def\@kernel@Ref#1{\protected@edef\reserved@a{\@kernel@ref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
+\def\@kernel@sRef#1{\protected@edef\reserved@a{\@kernel@sref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
\NewDocumentCommand\Ref{s}
{\IfBooleanTF{#1}{\@kernel@sRef}{\@kernel@Ref}}
\def\@currentlabel{}
@@ -14323,9 +15767,16 @@ Type H <return> for immediate help.}%
\def\@endpefalse{\global\let\if@endpe\iffalse}
\def\@endpetrue {%
\global\let\if@endpe\iftrue
- \ifnum\currentgrouplevel>\z@
- \aftergroup\propagate@doendpe
- \fi
+ \ifnum\currentgrouptype =14 % semi-simple group
+ \aftergroup\propagate@doendpe
+ \else
+ \ifnum\currentgrouptype =\z@ % no group: top-level
+ \else
+ \ifnum\currentgrouptype =\@ne % simple group
+ \aftergroup\propagate@doendpe
+ \fi
+ \fi
+ \fi
}
\def\propagate@doendpe{\if@endpe \@doendpe \fi}
\def\@mklab#1{\hfil #1}
@@ -15719,9 +17170,15 @@ Type H <return> for immediate help.}%
\def\addcontentsline#1#2#3{%
\addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}{}%
\protected@file@percent}}
+\DeclareExpandableDocumentCommand\@gobble@om{+o+m}{}
+\DeclareExpandableDocumentCommand\@gobble@som{s+o+m}{}
+\DeclareDocumentCommand\@gobble@with@sphack@om{+o+m}{\@bsphack\@esphack}
+\DeclareDocumentCommand\@gobble@with@sphack@som{s+o+m}{\@bsphack\@esphack}
\long\def\addtocontents#1#2{%
\protected@write\@auxout
- {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble}%
+ {\let\label\@gobble@om
+ \let\index\@gobble@som
+ \let\glossary\@gobble@om}%
{\string\@writefile{#1}{#2}}}
\def\contentsline#1#2#3#4{\gdef\@contentsline@destination{#4}%
\csname l@#1\endcsname{#2}{#3}}
@@ -16161,7 +17618,7 @@ Type H <return> for immediate help.}%
\let\@cite@ofmt\hbox
\def\@biblabel#1{[#1]}
%% File: ltmarks.dtx
-%% Copyright (C) 2022-2024
+%% Copyright (C) 2022-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltmarks.dtx
@@ -16216,9 +17673,9 @@ Type H <return> for immediate help.}%
\tl_new:c { g__mark_#1_top_ #2 _tl }
\tl_new:c { g__mark_#1_first_ #2 _tl }
\tl_new:c { g__mark_#1_last_ #2 _tl }
- \tl_set_eq:cN { g__mark_#1_top_ #2 _tl } \c__mark_empty_tl
- \tl_set_eq:cN { g__mark_#1_first_ #2 _tl } \c__mark_empty_tl
- \tl_set_eq:cN { g__mark_#1_last_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_top_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_first_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_last_ #2 _tl } \c__mark_empty_tl
}
\tl_const:Nn \c__mark_empty_tl { \__mark_value:nn{0}{} }
\box_new:N \l__mark_box
@@ -16327,13 +17784,15 @@ Type H <return> for immediate help.}%
}
{
\__mark_debug:n { \iow_term:x { Marks:~ extract~ last~
- mark~ for~ class~ '##1'~ =~ \g__mark_tmp_tl } }
+ mark~ for~ class~ '##1'~ =~ \exp_not:o \g__mark_tmp_tl } }
\tl_gput_right:Ne \g__mark_last_marks_tl
{ \mark_insert:nn {##1} { \__mark_drop_id:o { \g__mark_tmp_tl } } }
- \__mark_debug:n { \iow_term:x { Marks:~ extract~ first~
- mark~ for~ class~ '##1'~ =~
- \tex_splitfirstmarks:D
+ \__mark_debug:n { \iow_term:x {
+ Marks:~ extract~ first~ mark~ for~ class~ '##1'~ =~
+ \exp_not:o {
+ \tex_splitfirstmarks:D
\use:c { c__mark_class_##1_mark }
+ }
} }
\tl_gput_right:Ne \g__mark_first_marks_tl
{ \mark_insert:nn {##1}
@@ -17238,7 +18697,6 @@ Type H <return> for immediate help.}%
\@onlypreamble\AtEndOfClass
\DeclareRobustCommand\AtBeginDocument{\AddToHook{begindocument}}
\DeclareRobustCommand\AtEndDocument {\AddToHook{enddocument}}
-\@onlypreamble\AtBeginDocument
\def\@cls@pkg{%
\ifx\@currext\@clsextension
document class%
@@ -17688,11 +19146,14 @@ Type H <return> for immediate help.}%
{ \__keys_options_expand_module:Nn \__keys_options_aux:n {#1} }
\cs_new_protected:Npn \__keys_options_aux:n #1
{
- \cs_gset_protected:cpn { opt@handler@\@currname.\@currext }
- { \ProcessKeyOptions [ #1 ] }
\cs_set_protected:Npn \__keys_option_end: { }
\clist_clear:N \l__keys_options_clist
- \__keys_options_global:n {#1}
+ \cs_if_exist:cF { opt@handler@ \@currname . \@currext }
+ {
+ \__keys_options_global:n {#1}
+ \cs_gset_protected:cpn { opt@handler@ \@currname . \@currext }
+ { \ProcessKeyOptions [ #1 ] }
+ }
\__keys_options_local:
\keys_if_exist:nnF {#1} { unknown }
{
@@ -18170,7 +19631,7 @@ Type H <return> for immediate help.}%
\declare@file@substitution{atveryend.sty}{atveryend-ltx.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, The LaTeX Project
%%
%%% From File: ltshipout.dtx
@@ -18607,7 +20068,6 @@ Type H <return> for immediate help.}%
\declare@file@substitution{atbegshi.sty}{atbegshi-ltx.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: ltoutput.dtx
-\expandafter\let\csname ver@autoout1.sty\endcsname\fmtversion
\message{output,}
\maxdeadcycles = 100
\let\@elt\relax
@@ -18940,50 +20400,35 @@ Type H <return> for immediate help.}%
\global \@mparbottom \z@ \global \@textfloatsheight \z@
\@floatplacement
}
-\gdef \@makecol {%
- \ifvoid\footins
- \setbox\@outputbox \box\@cclv
- \else
- \setbox\@outputbox \vbox {%
- \boxmaxdepth \@maxdepth
- \unvbox \@cclv
- \vskip \skip\footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \unvbox \footins
- \color@endgroup
- }%
- \fi
- \let\@elt\relax
- \xdef\@freelist{\@freelist\@midlist}%
- \global \let \@midlist \@empty
- \@combinefloats
- \ifvbox\@kludgeins
- \@makespecialcolbox
- \else
- \setbox\@outputbox \vbox to\@colht {%
+\def \@makecol {%
+ \UseHook {build/column/before}%
+ \setbox\@outputbox \box\@cclv
+ \@outputbox@removebskip
+ \UseTaggingSocket{build/column/outputbox}%
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \UseSocket {build/column/outputbox}%
+ \ifvbox\@kludgeins
+ \@make@specialcolbox
+ \else
+ \@make@normalcolbox
+ \fi
+ \global \maxdepth \@maxdepth
+ \UseHook {build/column/after}%
+}
+\newdimen\@outputbox@depth
+\def \@make@normalcolbox {%
+ \setbox\@outputbox \vbox to\@colht {%
\@texttop
- \dimen@ \dp\@outputbox
+ \@outputbox@depth \dp\@outputbox
\unvbox \@outputbox
- \vskip -\dimen@
+ \vskip -\@outputbox@depth
\@textbottom
- }%
- \fi
- \global \maxdepth \@maxdepth
-}
-\gdef \@reinserts{%
- \ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
- \ifvbox\@kludgeins\insert\@kludgeins
- {\unvbox\@kludgeins}\fi
+ }%
}
-\gdef \@makespecialcolbox {%
- \setbox\@outputbox \vbox {%
- \@texttop
- \dimen@ \dp\@outputbox
- \unvbox\@outputbox
- \vskip-\dimen@
- }%
+\def \@make@specialcolbox {%
+ \@outputbox@append {\vskip-\@outputbox@depth}%
\@tempdima \@colht
\ifdim \wd\@kludgeins>\z@
\advance \@tempdima -\ht\@outputbox
@@ -19003,6 +20448,140 @@ Type H <return> for immediate help.}%
\fi
{\setbox \@tempboxa \box \@kludgeins}%
}
+\def\@outputbox@removebskip{%
+ \ifx\@textbottom\relax \else
+ \ifvoid \@outputbox
+ \global\let\@outputbox@reinsertbskip\relax
+ \else
+ \@outputbox@append{%
+ \@tempskipa\lastskip
+ \ifnum \gluestretchorder\@tempskipa>\z@
+ \unskip
+ \xdef\@outputbox@reinsertbskip
+ {\noexpand\@outputbox@append{\vskip\the\@tempskipa}}%
+ \else
+ \global\let\@outputbox@reinsertbskip\relax
+ \fi
+ }%
+ \fi
+ \fi
+}
+\let \@outputbox@reinsertbskip \relax
+\def\@outputbox@append #1{%
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \@outputbox@depth\dp\@outputbox % if needed in #1
+ \unvbox \@outputbox
+ #1%
+ }%
+}
+\def\@outputbox@appendfootnotes {%
+ \ifvoid\footins \else
+ \@makecol@handlesplitfootnotes
+ \UseSocket{build/column/footnotes}%
+ \@outputbox@append{%
+ \vskip \skip\footins
+ \UseTaggingSocket{build/column/footins}%
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \csname pdfcolfoot@current\endcsname
+ \unvbox \footins
+ \color@endgroup
+ }%
+ \fi
+}
+\let \@makecol@handlesplitfootnotes \@empty
+\def \@outputbox@attachfloats {%
+ \ifx \@toplist\@empty \else \@cflt \fi
+ \ifx \@botlist\@empty \else \@cflb \fi
+}
+\def \@outputbox@attachtopfloats {%
+ \ifx \@toplist\@empty \else \@cflt \fi
+}
+\def \@outputbox@attachbottomfloats {%
+ \ifx \@botlist\@empty \else \@cflb \fi
+}
+\def\@if@flushbottom@TF{%
+ \ifx\@textbottom\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+\def\@if@footnotes@TF{%
+ \ifvoid\footins
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\def\@if@bottomfloats@TF{%
+ \ifx \@botlist\@empty
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\NewSocket{build/column/outputbox}{0}
+\NewSocketPlug {build/column/outputbox}{space-footnotes-floats} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ }%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-space-floats} {%
+ \@outputbox@appendfootnotes
+ \@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {build/column/outputbox}{floats-space-footnotes} {%
+ \@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {build/column/outputbox}{space-floats-footnotes} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}}%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {build/column/outputbox}{floats-footnotes} {%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+ \@outputbox@reinsertbskip
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-floats} {%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+ \@outputbox@reinsertbskip
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-floats-legacy} {%
+ \@outputbox@reinsertbskip
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+}
+\AssignSocketPlug {build/column/outputbox}{footnotes-floats-legacy}
+\NewSocket{build/column/footnotes}{0}
+\NewMirroredHookPair{build/page/before}{build/page/after}
+\NewHook {build/page/reset}
+\NewMirroredHookPair{build/column/before}{build/column/after}
+\gdef \@reinserts{%
+ \ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
+ \ifvbox\@kludgeins\insert\@kludgeins
+ {\unvbox\@kludgeins}\fi
+}
\let \@texttop \relax
\let \@textbottom \relax
\def\@activechar@info #1{%
@@ -19020,7 +20599,10 @@ Type H <return> for immediate help.}%
\def {\@activechar@info{space}\space}%
\let'\active@math@prime}%
\endgroup
-\def\@outputpage{%
+\protected \def \pdfannot@link@on@@ { \csname pdfannot_link_on:\endcsname }
+\protected \def \pdfannot@link@off@@ { \csname pdfannot_link_off:\endcsname }
+\def \@outputpage {%
+ \UseHook {build/page/before}%
\begingroup
\let \protect \noexpand
\language\document@default@language
@@ -19028,60 +20610,77 @@ Type H <return> for immediate help.}%
\global\let\@@if@newlist\if@newlist
\global\@newlistfalse
\@parboxrestore
+ \UseHook {build/page/reset}%
\shipout \vbox{%
\set@typeset@protect
\aftergroup \endgroup
\aftergroup \set@typeset@protect
\if@specialpage
- \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
+ \global \@specialpagefalse
+ \@nameuse {ps@\@specialstyle}%
\fi
\if@twoside
- \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
- \let\@themargin\oddsidemargin
- \else \let\@thehead\@evenhead
- \let\@thefoot\@evenfoot \let\@themargin\evensidemargin
+ \ifodd\count\z@
+ \let \@thehead \@oddhead
+ \let \@thefoot \@oddfoot
+ \let \@themargin \oddsidemargin
+ \else
+ \let \@thehead \@evenhead
+ \let \@thefoot \@evenfoot
+ \let \@themargin \evensidemargin
\fi
\fi
\reset@font
\normalsize
\normalsfcodes
- \let\label\@gobble
- \let\index\@gobble
- \let\glossary\@gobble
- \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
+ \let \label \@gobble@with@sphack@om
+ \let \index \@gobble@with@sphack@som
+ \let \glossary \@gobble@with@sphack@om
+ \baselineskip \z@skip
+ \lineskip \z@skip
+ \lineskiplimit \z@
\@begindvi
\vskip \topmargin
\moveright\@themargin \vbox {%
- \setbox\@tempboxa \vbox to\headheight{%
+ \setbox\@tempboxa \vbox to\headheight {%
\vfil
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thehead}%
- \color@endbox
- }%
- \dp\@tempboxa \z@
- \box\@tempboxa
+ \pdfannot@link@off@@
+ \UseTaggingSocket{build/page/header}{}%
+ {
+ \color@hbox
+ \normalcolor
+ \hb@xt@ \textwidth {\@thehead }%
+ \color@endbox
+ }
+ \pdfannot@link@on@@
+ }
+ \dp \@tempboxa \z@
+ \box \@tempboxa
\vskip \headsep
- \box\@outputbox
+ \box \@outputbox
\baselineskip \footskip
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thefoot}%
- \color@endbox
- }%
- }%
- \global\let\if@newlist\@@if@newlist
+ \pdfannot@link@off@@
+ \UseTaggingSocket{build/page/footer}{}%
+ {
+ \color@hbox
+ \normalcolor
+ \hb@xt@ \textwidth {\@thefoot }%
+ \color@endbox
+ }
+ \pdfannot@link@on@@
+ }
+ }
+ \global \let \if@newlist \@@if@newlist
\global \@colht \textheight
\stepcounter{page}%
+ \UseHook {build/page/after}%
}
\def \@begindvi{%
\unvbox \@begindvibox
\global\let \@begindvi \@empty
}
-\def \@combinefloats {%
- \ifx \@toplist\@empty \else \@cflt \fi
- \ifx \@botlist\@empty \else \@cflb \fi
-}
+\let \@combinefloats \@outputbox@attachfloats
+
\def \@cflt{%
\let \@elt \@comflelt
\setbox\@tempboxa \vbox{}%
@@ -19297,6 +20896,7 @@ Type H <return> for immediate help.}%
\@reqcolroom \@textmin
\fi
\advance \@reqcolroom \ht\@currbox
+ \saved@reqcolroom \@reqcolroom
\ifdim \@colroom>\@reqcolroom
\@flsetnum \@colnum
\ifnum \@colnum>\z@
@@ -19358,6 +20958,7 @@ Type H <return> for immediate help.}%
\@flsettextmin
\@reqcolroom \ht\@currbox
\advance \@reqcolroom \@textmin
+ \saved@reqcolroom \@reqcolroom
\ifdim \@colroom>\@reqcolroom
\@flsetnum \@colnum
\ifnum\@colnum>\z@
@@ -19461,6 +21062,7 @@ Type H <return> for immediate help.}%
\box\@marbox \hss}%
\nointerlineskip
\hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}}
+%% Similar to |\enlargethispage| but it tries to squeeze the column to
\newinsert \@kludgeins
\global\dimen\@kludgeins \maxdimen
\global\count\@kludgeins 1000
@@ -19523,6 +21125,7 @@ Type H <return> for immediate help.}%
\newcount \@fpstype
\newdimen \@reqcolroom
\newdimen \@textfloatsheight
+\newdimen \saved@reqcolroom
\def \@fpsadddefault {%
\edef \@fps {\@fps\csname fps@\@captype \endcsname}%
\@latex@warning {%
@@ -19584,6 +21187,7 @@ Type H <return> for immediate help.}%
\fi
}
\def \@flcheckspace #1#2{%
+ \@reqcolroom \saved@reqcolroom
\advance \@reqcolroom
\ifx #2\@empty \textfloatsep \else \floatsep \fi
\ifdim \@colroom>\@reqcolroom
@@ -19707,6 +21311,8 @@ Type H <return> for immediate help.}%
}
\ERRORusetaggingsocket % that should get a proper error message
}
+\cs_new_protected:Npn\MathCollectTrue{}
+\cs_new_protected:Npn\MathCollectFalse{}
\int_new:N \l__tag_block_flattened_level_int
\NewSocket{tagsupport/para/restore}{0}
\NewSocketPlug{tagsupport/para/restore}{default}
@@ -19736,10 +21342,17 @@ Type H <return> for immediate help.}%
\NewSocket{tagsupport/toc/contentsline/before}{1}
\NewSocket{tagsupport/toc/contentsline/after}{1}
+\AssignSocketPlug{tagsupport/toc/contentsline/before}{noop}
+\AssignSocketPlug{tagsupport/toc/contentsline/after}{noop}
\NewSocket{tagsupport/toc/starttoc/before}{1}
\NewSocket{tagsupport/toc/starttoc/after}{1}
+\AssignSocketPlug{tagsupport/toc/starttoc/before}{noop}
+\AssignSocketPlug{tagsupport/toc/starttoc/after}{noop}
\NewSocket{tagsupport/toc/leaders/before}{0}
\NewSocket{tagsupport/toc/leaders/after}{0}
+\NewSocket{tagsupport/marginpar/begin}{0}
+\NewSocket{tagsupport/marginpar/end}{0}
+
\NewSocket{tagsupport/tbl/cell/begin}{0}
\NewSocket{tagsupport/tbl/cell/end}{0}
\NewSocket{tagsupport/tbl/row/begin}{0}
@@ -19752,6 +21365,7 @@ Type H <return> for immediate help.}%
\NewSocket{tagsupport/tbl/restore/celldata}{0}
\NewSocket{tagsupport/tbl/colspan}{1}
+\AssignSocketPlug{tagsupport/tbl/colspan}{noop}
\NewSocket{tagsupport/tbl/hmode/begin}{0}
\NewSocket{tagsupport/tbl/hmode/end}{0}
@@ -19769,8 +21383,66 @@ Type H <return> for immediate help.}%
\NewSocket{tagsupport/float/end}{0}
\NewSocket{tagsupport/caption/begin}{1}
\NewSocket{tagsupport/caption/end}{0}
+\AssignSocketPlug{tagsupport/caption/begin}{noop}
\NewSocket{tagsupport/caption/label/begin}{0}
\NewSocket{tagsupport/caption/label/end}{0}
+\NewSocket{tagsupport/build/page/header}{2}
+\NewSocket{tagsupport/build/page/footer}{2}
+\NewSocketPlug{tagsupport/build/page/header}{transparent}{#2}
+\NewSocketPlug{tagsupport/build/page/footer}{transparent}{#2}
+\AssignSocketPlug{tagsupport/build/page/header}{transparent}
+\AssignSocketPlug{tagsupport/build/page/footer}{transparent}
+\NewSocket{tagsupport/build/column/outputbox}{0}
+\NewSocket{tagsupport/build/column/footins}{0}
+\NewSocket{tagsupport/math/inline/begin}{0}
+\NewSocket{tagsupport/math/inline/end}{0}
+\NewSocket{tagsupport/math/inline/formula/begin}{2}
+\NewSocket{tagsupport/math/inline/formula/end}{0}
+\NewSocket{tagsupport/math/display/begin}{0}
+\NewSocket{tagsupport/math/display/end}{0}
+\NewSocket{tagsupport/math/display/formula/begin}{2}
+\NewSocket{tagsupport/math/display/formula/end}{0}
+\NewSocket{tagsupport/math/display/tag/begin}{0}
+\NewSocket{tagsupport/math/display/tag/end}{0}
+\NewSocketPlug{tagsupport/math/inline/formula/begin}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/inline/formula/begin}{transparent}
+\NewSocketPlug{tagsupport/math/display/formula/begin}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/display/formula/begin}{transparent}
+\NewSocket{tagsupport/math/luamml/save/nn}{1}
+\AssignSocketPlug{tagsupport/math/luamml/save/nn}{noop}
+\NewSocket{tagsupport/math/luamml/save/nNn}{1}
+\AssignSocketPlug{tagsupport/math/luamml/save/nNn}{noop}
+\NewSocket{tagsupport/math/luamml/annotate/false}{2}
+\NewSocketPlug{tagsupport/math/luamml/annotate/false}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/annotate/false}{transparent}
+\NewSocket{tagsupport/math/luamml/array/save}{0}
+\NewSocket{tagsupport/math/luamml/array/finalize}{0}
+\NewSocket{tagsupport/math/luamml/array/initcol}{0}
+\NewSocket{tagsupport/math/luamml/array/finalizecol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/array/finalizecol}{noop}
+\NewSocket{tagsupport/math/luamml/mtable/finalizecol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/finalizecol}{noop}
+\NewSocket{tagsupport/math/luamml/mtable/finalize}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/finalize}{noop}
+\NewSocket{tagsupport/math/luamml/mtable/aligncol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/aligncol}{noop}
+
+\NewSocket{tagsupport/math/luamml/mtable/innertable/save}{0}
+\NewSocket{tagsupport/math/luamml/mtable/smallmatrix/save}{0}
+\NewSocket{tagsupport/math/luamml/mtable/innertable/finalize}{0}
+\NewSocket{tagsupport/math/luamml/mtable/tag/save}{0}
+
+\NewSocket{tagsupport/math/luamml/mtable/tag/set}{0}
+\NewSocket{tagsupport/math/luamml/hbox}{2}
+\NewSocketPlug{tagsupport/math/luamml/hbox}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/hbox}{transparent}
+\NewSocket{tagsupport/math/luamml/finph@nt}{2}
+\NewSocketPlug{tagsupport/math/luamml/finph@nt}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/finph@nt}{transparent}
+\NewSocket{tagsupport/math/luamml/finsm@sh}{2}
+\NewSocketPlug{tagsupport/math/luamml/finsm@sh}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/finsm@sh}{transparent}
+\NewSocket{tagsupport/math/luamml/artifact}{0}
\ExplSyntaxOn
\int_new:N \g__tbl_col_int
\int_new:N \g__tbl_row_int
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex209.def b/Master/texmf-dist/tex/latex-dev/base/latex209.def
index c4a6450ac4f..d8443efe944 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex209.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latex209.def
@@ -15,7 +15,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index 8a463b97ddb..f47bf743f4e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -68,7 +68,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -432,7 +432,7 @@
\@skipping@modulefalse
\fi}
\ProvidesPackage{latexrelease}
- [2024/08/11 v1.0p LaTeX release emulation and tests
+ [2025/01/31 v1.0q LaTeX release emulation and tests
(including releases up to \latexreleaseversion)]
\NeedsTeXFormat{LaTeX2e}[1996/06/01]
\@ifundefined{sourceLaTeXdate}{%
@@ -556,6 +556,8 @@ of this package available from CTAN}
\q_recursion_stop
\msg_redirect_name:nnn { hooks } { exists } { none }
\msg_redirect_name:nnn { mark } { class-already-defined }{ none }
+\msg_redirect_name:nnn { socket } { already-declared } { none }
+\msg_redirect_name:nnn { socket } { plug-already-declared } { none }
\cs_gset_protected:Npn \latexrelease@postltcmd
{
\__latexrelease_redefines:w
@@ -1990,18 +1992,20 @@ of this package available from CTAN}
\EndIncludeInRelease
%%% From File: ltcmd.dtx
-\def\ltcmdversion{v1.2f}
-\def\ltcmddate{2024-07-06}
+\def\ltcmdversion{v1.3b}
+\def\ltcmddate{2025-02-01}
\edef\@latexrelease@catcode@null{\the\catcode`\^^@ }
\catcode`\^^@=12
\ExplSyntaxOn
\NewModuleRelease{2020/10/01}{ltcmd}
{Document~command~parser}%
+\cs_generate_variant:Nn \tl_head:n { e }
\tl_new:N \l__cmd_arg_spec_tl
\tl_new:N \l__cmd_args_tl
\tl_new:N \l__cmd_args_i_tl
\tl_new:N \l__cmd_args_ii_tl
\int_new:N \l__cmd_current_arg_int
+\int_new:N \l__cmd_total_args_int
\bool_new:N \l__cmd_defaults_bool
\tl_new:N \l__cmd_defaults_tl
\bool_new:N \l__cmd_environment_bool
@@ -2032,6 +2036,7 @@ of this package available from CTAN}
\bool_new:N \l__cmd_some_obey_spaces_bool
\bool_new:N \l__cmd_some_long_bool
\bool_new:N \l__cmd_some_short_bool
+\bool_new:N \l__cmd_final_verb_bool
\quark_new:N \q__cmd_recursion_tail
\quark_new:N \q__cmd_recursion_stop
\__kernel_quark_new_test:N \__cmd_if_recursion_tail_stop_do:Nn
@@ -2642,17 +2647,22 @@ of this package available from CTAN}
\__cmd_normalize_arg_spec_loop:n
}
\cs_new_protected:Npn \__cmd_normalize_type_b:w #1
+ { \__cmd_normalize_type_b_or_c:nn {#1} { b } }
+\cs_new_protected:Npn \__cmd_normalize_type_c:w #1
+ { \__cmd_normalize_type_b_or_c:nn {#1} { c } }
+\cs_new_protected:Npn \__cmd_normalize_type_b_or_c:nn #1#2
{
\bool_if:NF \l__cmd_environment_bool
{
\msg_error:nnxx { cmd } { invalid-command-arg }
- { \__cmd_environment_or_command: } { b }
+ { \__cmd_environment_or_command: } {#2}
\__cmd_bad_def:wn
}
\tl_clear:N \l__cmd_last_delimiters_tl
- \__cmd_add_arg_spec:n { b }
+ \__cmd_add_arg_spec:n {#2}
\quark_if_recursion_tail_stop:n {#1}
- \msg_error:nnxx { cmd } { arg-after-body }
+ \msg_error:nnxxx { cmd } { arg-after-body }
+ {#2}
{ \__cmd_environment_or_command: }
{ \tl_to_str:n {#1} }
\__cmd_bad_def:wn
@@ -2743,7 +2753,10 @@ of this package available from CTAN}
{ \bool_set_true:N \l__cmd_some_short_bool }
\tl_put_right:Nx \l__cmd_arg_spec_tl
{
- \bool_if:NT \l__cmd_long_bool { + }
+ \bool_lazy_and:nnT
+ { \l__cmd_long_bool }
+ { ! \str_if_eq_p:nn {#1} { c } }
+ { + }
\bool_if:NT \l__cmd_obey_spaces_bool { ! }
\exp_not:n {#1}
}
@@ -2768,6 +2781,7 @@ of this package available from CTAN}
}
\cs_new_protected:Npn \__cmd_prepare_signature:n #1
{
+ \int_set_eq:NN \l__cmd_total_args_int \l__cmd_current_arg_int
\int_zero:N \l__cmd_current_arg_int
\bool_set_false:N \l__cmd_long_bool
\bool_set_false:N \l__cmd_obey_spaces_bool
@@ -2779,9 +2793,16 @@ of this package available from CTAN}
\tl_clear:N \l__cmd_process_one_tl
\bool_set_false:N \l__cmd_process_some_bool
\tl_clear:N \l__cmd_signature_tl
+ \__cmd_prepare_signature_verb_chk:n {#1}
\__cmd_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
\bool_if:NF \l__cmd_expandable_bool { \__cmd_flush_m_args: }
}
+\cs_new_protected:Npn \__cmd_prepare_signature_verb_chk:n #1
+ {
+ \str_if_eq:eeTF { \tl_head:e { \tl_reverse:n {#1} } } { c }
+ { \bool_set_true:N \l__cmd_final_verb_bool }
+ { \bool_set_false:N \l__cmd_final_verb_bool }
+ }
\cs_new_protected:Npn \__cmd_prepare_signature:N
{
\bool_set_false:N \l__cmd_prefixed_bool
@@ -2830,10 +2851,14 @@ of this package available from CTAN}
\__cmd_prepare_signature_bypass:N
}
\cs_new_protected:Npn \__cmd_add_type_b:w
+ { \__cmd_add_type_b_or_c:N b }
+\cs_new_protected:Npn \__cmd_add_type_c:w
+ { \__cmd_add_type_b_or_c:N c }
+\cs_new_protected:Npn \__cmd_add_type_b_or_c:N #1
{
\__cmd_flush_m_args:
\__cmd_add_default:
- \__cmd_add_grabber:N b
+ \__cmd_add_grabber:N #1
\__cmd_prepare_signature:N
}
\cs_new_protected:Npn \__cmd_add_type_D:w #1#2#3
@@ -2923,12 +2948,23 @@ of this package available from CTAN}
{ \l__cmd_suppress_strip_bool }
{ \str_if_eq_p:nn {#1} { D } }
{ _no_strip }
+ \bool_lazy_all:nT
+ {
+ { \l__cmd_final_verb_bool }
+ { \str_if_eq_p:nn {#1} { D } }
+ {
+ \int_compare_p:nNn \l__cmd_current_arg_int
+ = { \l__cmd_total_args_int - 1 }
+ }
+ }
+ { _verb_safe }
:w
}
}
\bool_set_false:N \l__cmd_long_bool
\bool_set_false:N \l__cmd_obey_spaces_bool
\bool_set_false:N \l__cmd_suppress_strip_bool
+ \bool_set_false:N \l__cmd_verb_safe_bool
\tl_put_right:Nx \l__cmd_process_all_tl
{
{
@@ -3538,56 +3574,249 @@ of this package available from CTAN}
\__cmd_run_code:
\end
}
-\cs_new_protected:Npn \__cmd_grab_D:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c:w #1 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_nonspace_remove:NTF \use_ii:nn
+ \bool_set_false:N \l__cmd_obey_spaces_bool
+ \__cmd_grab_c_start:n {#1}
}
-\cs_new_protected:Npn \__cmd_grab_D_long:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_obey_spaces:w #1 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_nonspace_remove:NTF \use_ii:nn
+ \bool_set_true:N \l__cmd_obey_spaces_bool
+ \__cmd_grab_c_start:n {#1}
}
-\cs_new_protected:Npn \__cmd_grab_D_obey_spaces:w #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_start:n #1
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_meaning_remove:NTF \use_ii:nn
+ \tl_set:Nn \l__cmd_signature_tl {#1}
+ \group_begin:
+ \tl_clear:N \l__cmd_v_arg_tl
+ \tex_escapechar:D = 92 \scan_stop:
+ \tex_endlinechar:D = `\^^M \scan_stop:
+ \cs_set_eq:NN \do \char_set_catcode_other:N
+ \dospecials
+ \char_set_catcode_other:n { `\^^M }
+ \__cmd_grab_c_first:w
}
-\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces:w #1#2#3 \__cmd_run_code:
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npn \__cmd_grab_c_first:w #1 ^^M %
+ { %
+ \tl_if_blank:nF {#1} %
+ { %
+ \msg_warning:nnee { cmd } { chars-dropped-first-line } %
+ { \exp_not:n {#1} } %
+ { \exp_not:V \@currenvir } %
+ } %
+ \__cmd_grab_c_loop:w #1 ^^M %
+ } %
+ \cs_new_protected:Npe \__cmd_grab_c_loop:w #1 ^^M %
+ { %
+ \exp_not:N \__cmd_grab_c_auxi:w #1 %
+ \c_backslash_str end %
+ \scan_stop: %
+ } %
+\group_end:
+\use:e
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_meaning_remove:NTF \use_ii:nn
+ \cs_new_protected:Npn \exp_not:N \__cmd_grab_c_auxi:w
+ #1 \c_backslash_str end #2 \scan_stop:
}
-\cs_new_protected:Npn \__cmd_grab_D_no_strip:w
- #1#2#3 \__cmd_run_code:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_nonspace_remove:NTF \use_none:n
+ \tl_put_right:Nn \l__cmd_v_arg_tl {#1}
+ \tl_if_empty:nTF {#2}
+ {
+ \tl_put_right:Nn \l__cmd_v_arg_tl { \obeyedline }
+ \__cmd_grab_c_loop:w
+ }
+ { \__cmd_grab_c_auxii:w #2 \scan_stop: }
}
-\cs_new_protected:Npn \__cmd_grab_D_long_no_strip:w
- #1#2#3 \__cmd_run_code:
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \use:e %
+ { %
+ \cs_new_protected:Npe \exp_not:N \__cmd_grab_c_auxii:w %
+ #1 \c_backslash_str end \scan_stop: %
+ } %
+ { %
+ \tl_set:Nn \exp_not:N \l__cmd_tmpa_tl
+ { \c_backslash_str end } %
+ \exp_not:N \__cmd_grab_c_auxiii:N #1 ^^M %
+ } %
+ \cs_new_protected:Npn \__cmd_grab_c_auxiii:N #1 %
+ { %
+ \token_case_charcode:NnF #1 %
+ { %
+ ^^M %
+ { \__cmd_grab_c_auxiv: } %
+ \c_space_token %
+ { %
+ \tl_put_right:Nn \l__cmd_tmpa_tl {#1} %
+ \__cmd_grab_c_auxiii:N %
+ } %
+ \c_group_begin_token %
+ { %
+ \tl_set:Nn \l__cmd_tmpb_tl {#1} %
+ \__cmd_grab_c_auxvi:N %
+ } %
+ } %
+ { \__cmd_grab_c_auxv: } %
+ } %
+\group_end:
+\cs_new_protected:Npn \__cmd_grab_c_auxiv:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_nonspace_remove:NTF \use_none:n
+ \tl_put_right:Ne \l__cmd_v_arg_tl
+ {
+ \exp_not:V \l__cmd_tmpa_tl
+ \exp_not:N \obeyedline
+ }
+ \__cmd_grab_c_loop:w
}
-\cs_new_protected:Npn \__cmd_grab_D_obey_spaces_no_strip:w
- #1#2#3 \__cmd_run_code:
+\cs_new_protected:Npn \__cmd_grab_c_auxv:
{
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected_nopar:Npn
- \__cmd_peek_meaning_remove:NTF \use_none:n
+ \tl_put_right:NV \l__cmd_v_arg_tl \l__cmd_tmpa_tl
+ \__cmd_grab_c_loop:w
}
-\cs_new_protected:Npn \__cmd_grab_D_long_obey_spaces_no_strip:w
- #1#2#3 \__cmd_run_code:
- {
- \__cmd_grab_D_aux:NNnNNN #1 #2 {#3} \cs_set_protected:Npn
- \__cmd_peek_meaning_remove:NTF \use_none:n
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npe \__cmd_grab_c_auxvi:N #1 %
+ { %
+ \exp_not:N \token_case_charcode:NnF #1 %
+ { %
+ ^^M %
+ {
+ \exp_not:N \__cmd_grab_c_auxvii: %
+ \exp_not:N \__cmd_grab_c_auxiv: %
+ }%
+ \c_backslash_str %
+ { %
+ \exp_not:N \__cmd_grab_c_auxvii: %
+ \exp_not:N \__cmd_grab_c_auxv: #1
+ } %
+ \c_group_end_token %
+ { %
+ \tl_put_right:Nn \exp_not:N \l__cmd_tmpb_tl {#1} %
+ \exp_not:N \__cmd_grab_c_auxviii: %
+ } %
+ } %
+ { %
+ \tl_put_right:Nn \exp_not:N \l__cmd_tmpb_tl {#1} %
+ \exp_not:N \__cmd_grab_c_auxvi:N %
+ } %
+ } %
+\group_end: %
+\cs_new_protected:Npn \__cmd_grab_c_auxvii:
+ { \tl_put_right:NV \l__cmd_tmpa_tl \l__cmd_tmpb_tl }
+\cs_new_protected:Npn \__cmd_grab_c_auxviii:
+ {
+ \str_if_eq:eeTF { \exp_not:V \l__cmd_tmpb_tl } { { \@currenvir } }
+ { \__cmd_grab_c_end:w }
+ {
+ \__cmd_grab_c_auxvii:
+ \__cmd_grab_c_auxv:
+ }
+ }
+\group_begin:
+ \char_set_catcode_other:N \^^M %
+ \cs_new_protected:Npn \__cmd_grab_c_end:w #1 ^^M %
+ { %
+ \tl_if_blank:nF {#1} %
+ { %
+ \msg_warning:nnee { cmd } { chars-dropped-last-line } %
+ { \exp_not:n {#1} } %
+ { \exp_not:V \@currenvir } %
+ } %
+ \exp_args:NNNo \group_end: %
+ \tl_set:Nn \l__cmd_v_arg_tl { \l__cmd_v_arg_tl } %
+ \__cmd_add_arg:x %
+ { %
+ \bool_if:NTF \l__cmd_obey_spaces_bool %
+ { \exp_not:V } %
+ { \exp_args:NV \__cmd_grab_c_end:n } %
+ \l__cmd_v_arg_tl %
+ } %
+ \exp_args:NV \end \@currenvir %
+ } %
+\group_end: %
+\cs_new:Npn \__cmd_grab_c_end:n #1
+ {
+ \__cmd_grab_c_end_auxi:w \q_nil #1 \q_nil
+ \obeyedline \obeyedline \q_nil \q_stop
+ }
+\cs_new:Npn \__cmd_grab_c_end_auxi:w #1 \q_nil \obeyedline
+ { \__cmd_grab_c_end_auxii:w #1 \q_nil }
+\cs_new:Npn \__cmd_grab_c_end_auxii:w \q_nil #1 \obeyedline \q_nil
+ { \__cmd_grab_c_end_auxiii:w #1 \q_nil }
+\cs_new:Npn \__cmd_grab_c_end_auxiii:w #1 \q_nil #2 \q_stop
+ { \exp_not:n {#1} }
+\tl_map_inline:nn { { } { _long } }
+ {
+ \tl_map_inline:nn { { } { _obey_spaces } }
+ {
+ \tl_map_inline:nn { { } { _no_strip } }
+ {
+ \tl_map_inline:nn { { } { _verb_safe } }
+ {
+ \cs_new_protected:cpe { __cmd_grab_D #1 ##1 ####1 ########1 :w }
+ ################1################2################3
+ \__cmd_run_code:
+ {
+ \exp_not:N \__cmd_grab_D_aux:NNnNNNN
+ ################1 ################2 {################3}
+ \str_if_eq:nnTF {#1} { _long }
+ \cs_set_protected:Npn
+ \cs_set_protected_nopar:Npn
+ \str_if_eq:nnTF {##1} { _obey_spaces }
+ { \exp_not:N \__cmd_peek_meaning_remove:NTF }
+ { \exp_not:N \__cmd_peek_nonspace_remove:NTF }
+ \str_if_eq:nnTF {####1} { _no_strip }
+ { \exp_not:N \use_none:n }
+ { \exp_not:N \use_ii:nn }
+ \str_if_eq:nnTF {########1} { _verb_safe }
+ { \exp_not:N \use:n }
+ { \exp_not:N \use_none:n }
+ }
+ }
+ }
+ }
}
-\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNNN #1#2#3#4#5#6
+\group_begin:
+ \char_set_catcode_other:N \^^M
+ \cs_new_protected:Npn \__cmd_grab_D_aux:NNnNNNN #1#2#3#4#5#6#7
+ {
+ \__cmd_grab_D_aux:NNnNN #1#2 {#3} #4 #6
+ #7
+ {
+ \group_begin:
+ \__cmd_grab_D_verb_safe:NN #1#5
+ }
+ #5 #1
+ {
+ #7 { \group_end: }
+ \__cmd_grab_D_call:Nw #1
+ }
+ {
+ #7 { \group_end: }
+ \__cmd_add_arg:o \c_novalue_tl
+ }
+ }
+\group_end:
+\cs_new_protected:Npn \__cmd_grab_D_verb_safe:NN #1#2
{
- \__cmd_grab_D_aux:NNnNN #1#2 {#3} #4 #6
- #5 #1
- { \__cmd_grab_D_call:Nw #1 }
- { \__cmd_add_arg:o \c_novalue_tl }
+ \cs_set_eq:NN \do \char_set_catcode_other:N
+ \dospecials
+ \char_set_catcode_other:N \^^M
+ \token_if_eq_meaning:NNT #2 \__cmd_peek_nonspace_remove:NTF
+ { \char_set_catcode_space:n { `\ } }
+ \use:c
+ {
+ char_set_catcode_
+ \if_catcode:w \c_math_toggle_token #1 math_toggle \else:
+ \if_catcode:w ^ #1 math_superscript \else:
+ \if_catcode:w \c_math_subscript_token #1 math_subscript \else:
+ \if_catcode:w A #1 letter \else:
+ other \fi: \fi: \fi: \fi:
+ :N
+ }
+ #1
}
\cs_new_protected:Npn \__cmd_grab_D_aux:NNnNN #1#2#3#4#5
{
@@ -3935,6 +4164,21 @@ of this package available from CTAN}
}
{ \__cmd_grab_v_aux_abort:n {#1} #1 }
}
+\IncludeInRelease{2025/06/01}{\__cmd_grab_v_aux_catcodes:}%
+ {Active~spaces~and~tabs}
+\cs_new_protected:Npn \__cmd_grab_v_aux_catcodes:
+ {
+ \cs_set_eq:NN \do \char_set_catcode_other:N
+ \dospecials
+ \char_set_catcode_active:n { `\ }
+ \char_set_catcode_active:n { `\^^I }
+ \bool_if:NTF \l__cmd_long_bool
+ { \char_set_catcode_other:n { \tex_endlinechar:D } }
+ { \char_set_catcode_parameter:n { \tex_endlinechar:D } }
+ }
+\EndIncludeInRelease
+\IncludeInRelease{2020/10/01}{\__cmd_grab_v_aux_catcodes:}%
+ {Active~spaces~and~tabs}
\cs_new_protected:Npn \__cmd_grab_v_aux_catcodes:
{
\cs_set_eq:NN \do \char_set_catcode_other:N
@@ -3943,6 +4187,7 @@ of this package available from CTAN}
{ \char_set_catcode_other:n { \tex_endlinechar:D } }
{ \char_set_catcode_parameter:n { \tex_endlinechar:D } }
}
+\EndIncludeInRelease
\cs_new_protected:Npn \__cmd_grab_v_aux_abort:n #1
{
\__cmd_grab_v_group_end:
@@ -3963,6 +4208,18 @@ of this package available from CTAN}
\__cmd_add_arg:o \c_novalue_tl
}
}
+\IncludeInRelease{2025-06-01}{\__cmd_grab_v_aux_put:N}%
+ {Use~more~std~catcodes}
+\cs_new_protected:Npn \__cmd_grab_v_aux_put:N #1
+ {
+ \tl_put_right:Nx \l__cmd_v_arg_tl
+ {
+ \int_compare:nNnTF {`#1} = \tex_endlinechar:D
+ { \exp_not:N \obeyedline }
+ { \exp_not:N #1 }
+ }
+ }
+\EndIncludeInRelease
\IncludeInRelease{2024/06/01}{\__cmd_grab_v_aux_put:N}%
{Endlines~as~\obeyedline}
\cs_new_protected:Npn \__cmd_grab_v_aux_put:N #1
@@ -4543,10 +4800,10 @@ of this package available from CTAN}
}
}
\msg_new:nnnn { cmd } { arg-after-body }
- { Argument~type~'b'~must~be~last~in~#1. }
+ { Argument~type~'#1'~must~be~last~in~#2. }
{
- The~'b'~argument~type~must~come~last~but~it~is~followed~
- by~'#2'~in~the~argument~specification.~This~is~not~allowed.
+ The~'#1'~argument~type~must~come~last~but~it~is~followed~
+ by~'#3'~in~the~argument~specification.~This~is~not~allowed.
\c__cmd_ignore_def_tl
}
\msg_new:nnnn { cmd } { bad-arg-spec }
@@ -4570,6 +4827,18 @@ of this package available from CTAN}
with~a~command~that~was~never~defined.
\c__cmd_ignore_def_tl
}
+\msg_new:nnnn { cmd } { chars-dropped-first-line }
+ { Characters~'#1'~dropped~on~first~line~of~#2~environment. }
+ {
+ LaTeX~was~collecting~a~verbatim-like~environment,~and~the~characters~
+ '#1'~were~found~after~'\begin{#2}~on~the~first~line:~this~is~not~supported.
+ }
+\msg_new:nnnn { cmd } { chars-dropped-last-line }
+ { Characters~'#1'~dropped~after~end~of~#2~environment. }
+ {
+ LaTeX~was~collecting~a~verbatim-like~environment,~and~the~characters~
+ '#1'~were~found~after~\end{#2}~on~the~last~line:~this~is~not~supported.
+ }
\msg_new:nnnn { cmd } { env-already-defined }
{ Environment~'#1'~already~defined. }
{
@@ -4990,7 +5259,7 @@ of this package available from CTAN}
\cs_new_eq:NN \SplitArgument \__cmd_split_argument:nnn
\cs_new_eq:NN \SplitList \__cmd_split_list:nn
\cs_new_eq:NN \TrimSpaces \__cmd_trim_spaces:n
-\cs_new_eq:NN \ProcessList \tl_map_function:nN
+\cs_new_eq:NN \ProcessList \tl_map_tokens:nn
\cs_gset_eq:NN \__kernel_chk_if_free_cs:N \__cmd_chk_if_free_cs:N
\cs_undefine:N \__cmd_chk_if_free_cs:N
@@ -5532,10 +5801,11 @@ of this package available from CTAN}
}
\cs_new_protected:Npn \__hook_hook_gput_code_do:nnn #1 #2 #3
{
- \__hook_debug:n{\iow_term:x{****~ Add~ to~
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
\__hook_if_usable:nF {#1} { undeclared~ }
- hook~ #1~ (#2)
- \on@line\space <-~ \tl_to_str:n{#3}} }
+ hook~ '#1'~ (#2) \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#3}} }
\str_if_eq:nnTF {#2} { top-level }
{
\str_if_eq:eeTF { top-level } { \__hook_currname_or_default: }
@@ -5677,7 +5947,7 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}
{\__hook_try_declaring_generic_hook:nnn}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_gset_protected:Npn \__hook_try_declaring_generic_hook:nnn #1
{
\__hook_try_declaring_generic_hook:wnTF #1 / / / \scan_stop:
@@ -5698,7 +5968,7 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}
{\__hook_try_declaring_generic_hook:nnn}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_new_protected:Npn
\__hook_try_declaring_generic_hook:nnn #1
{
@@ -5790,7 +6060,7 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}
{\__hook_try_declaring_generic_hook:wn}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\prg_new_protected_conditional:Npnn
\__hook_try_declaring_generic_hook:wn
#1 / #2 / #3 / #4 \scan_stop: #5 { TF }
@@ -5878,10 +6148,10 @@ of this package available from CTAN}
}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\__hook_if_file_hook:w}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\__hook_if_file_hook:w}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\prg_new_conditional:Npnn \__hook_if_file_hook:w
#1 / #2 / #3 \s__hook_mark { TF }
{
@@ -5901,10 +6171,10 @@ of this package available from CTAN}
}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\__hook_file_hook_normalize:n}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\__hook_file_hook_normalize:n}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_new:Npn \__hook_file_hook_normalize:n #1
{ \__hook_strip_double_slash:n {#1} }
\cs_new:Npn \__hook_strip_double_slash:n #1
@@ -5917,7 +6187,7 @@ of this package available from CTAN}
}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\c__hook_generics_prop}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\clist_map_inline:nn { cmd , env , file , package , class , include }
{
\tl_const:cn { c__hook_generic_#1/./before_tl } { + }
@@ -5935,15 +6205,15 @@ of this package available from CTAN}
\tl_const:cn { c__hook_deprecated_include/./end_tl } { }
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\c__hook_generics_prop}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\prop_const_from_keyval:Nn \c__hook_generics_prop
{cmd=,env=,file=,package=,class=,include=}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\c__hook_generics_reversed_ii_prop}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\c__hook_generics_reversed_ii_prop}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\prop_const_from_keyval:Nn
\c__hook_generics_reversed_ii_prop {after=,end=}
\prop_const_from_keyval:Nn
@@ -6437,7 +6707,7 @@ of this package available from CTAN}
}
\__hook_debug:n
{
- \iow_term:x { ^^J All~initialized~(non-empty)~hooks: }
+ \iow_term:x { ^^J[lthooks]~ All~initialized~(non-empty)~hooks: }
\prop_map_inline:Nn \g__hook_used_prop
{
\iow_term:x
@@ -6477,7 +6747,7 @@ of this package available from CTAN}
\cs_new_protected:Npn \__hook_initialize_hook_code:n #1
{
\__hook_debug:n
- { \iow_term:x { ^^J Update~code~for~hook~'#1' \on@line :^^J } }
+ { \iow_term:x { ^^J[lthooks]~ Update~code~for~hook~'#1' \on@line :^^J } }
\__hook_include_legacy_code_chunk:n {#1}
\__hook_if_usable:nT {#1}
{
@@ -6597,7 +6867,7 @@ of this package available from CTAN}
\prop_get:NVN \l__hook_work_prop \l__hook_front_tl \l__hook_return_tl
\exp_args:NNV \__hook_tl_gput:Nn #1 \l__hook_return_tl
\__hook_clist_gput:NV #2 \l__hook_front_tl
- \__hook_debug:n{ \iow_term:x{Handled~ code~ for~ \l__hook_front_tl} }
+ \__hook_debug:n{ \iow_term:x{[lthooks]~ Handled~ code~ for~ \l__hook_front_tl} }
\seq_map_inline:cn { \__hook_seq_csname:n { \l__hook_front_tl } }
{
\tl_set:cx { \__hook_tl_csname:n {##1} }
@@ -7126,12 +7396,28 @@ of this package available from CTAN}
{
\__hook_replacing_args_false:
\__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} {#2}
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
+ \__hook_if_usable:nF {#1} { undeclared~ }
+ hook~ '#1'~ ( next~ invocation~ only )
+ \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#2}
+ }
+ }
\__hook_replacing_args_reset:
}
\cs_new_protected:Npn \hook_gput_next_code_with_args:nn #1 #2
{
\__hook_replacing_args_true:
\__hook_normalize_hook_args:Nn \__hook_gput_next_code:nn {#1} {#2}
+ \__hook_debug:n{\iow_term:x{[lthooks]~ Add~ to~
+ \__hook_if_usable:nF {#1} { undeclared~ }
+ hook~ '#1'~ ( next~ invocation~ only )
+ \on@line
+ ^^J [lthooks] \@spaces
+ <-~ \tl_to_str:n{#2}
+ }
+ }
\__hook_replacing_args_reset:
}
\EndIncludeInRelease
@@ -7217,7 +7503,7 @@ of this package available from CTAN}
}
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\hook_use:n}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_new_protected:Npn \hook_use:n #1
{
\tl_if_exist:cT { __hook~#1 }
@@ -7237,7 +7523,7 @@ of this package available from CTAN}
\cs_new:Npn \hook_use:nnw #1 { }
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\hook_use:n}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_new_protected:Npn \hook_use:n #1
{
\tl_if_exist:cTF { __hook~#1 }
@@ -7304,10 +7590,10 @@ of this package available from CTAN}
\cs_undefine:N \__hook_post_initialization_defs:
\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\__hook_use:wn}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}{\__hook_use:wn}
- {Standardise~generic~hook~names}
+ {Standardize~generic~hook~names}
\cs_new:Npn \__hook_use:wn #1 / #2 \s__hook_mark #3
{
\str_if_eq:nnTF {#1} { file }
@@ -7950,7 +8236,7 @@ of this package available from CTAN}
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% From File: ltcmdhooks.dtx
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, Phelype Oleinik, The LaTeX Project
%%% From File: lthooks.dtx
\ExplSyntaxOn
@@ -7971,6 +8257,23 @@ of this package available from CTAN}
\cs_new_protected:Npn \__hook_patch_debug:x #1
{ \__hook_debug:n { \iow_term:x { [lthooks]~#1 } } }
\cs_generate_variant:Nn \tl_rescan:nn { nV }
+\IncludeInRelease{2024/12/22}{\__hook_try_put_cmd_hook:n}%
+ {Don't~define~command}
+\cs_new_protected:Npn \__hook_try_put_cmd_hook:n #1
+ { \__hook_try_put_cmd_hook:w #1 / / / \s__hook_mark {#1} }
+\cs_new_protected:Npn \__hook_try_put_cmd_hook:w
+ #1 / #2 / #3 / #4 \s__hook_mark #5
+ {
+ \__hook_debug:n { \iow_term:n { ->~Adding~cmd~hook~to~'#2'~(#3): } }
+ \group_begin:
+ \exp_after:wN
+ \group_end:
+ \exp_after:wN
+ \__hook_patch_cmd_or_delay:Nnn
+ \cs:w #2\cs_end:
+ {#2} {#3}
+ }
+\EndIncludeInRelease
\IncludeInRelease{2021/11/15}{\__hook_try_put_cmd_hook:n}%
{Standardise~generic~hook~names}
\cs_new_protected:Npn \__hook_try_put_cmd_hook:n #1
@@ -8587,7 +8890,7 @@ of this package available from CTAN}
{ \iow_term:x { ^^J [Sockets]~ ==>~ ##1} } }
}
\cs_new_protected:Npn \socket_new:nn #1 #2 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
\msg_error:nnn { socket } { already-declared } {#1}
}
@@ -8612,9 +8915,14 @@ of this package available from CTAN}
}
}
}
+\prg_new_conditional:Npnn \socket_if_exist:n #1 { p , T , F , TF }
+ { \str_if_exist:cTF { l__socket_#1_plug_str }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_log:n #1 {
\typeout{ Socket~ #1:}
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
\typeout{ \@spaces number~ of~ inputs~ =~
\int_use:c { c__socket_#1_args_int } }
@@ -8633,9 +8941,9 @@ of this package available from CTAN}
}
\cs_new_protected:Npn \socket_show:n #1 {\socket_log:n {#1} \errmessage{}}
\cs_new_protected:Npn \socket_new_plug:nnn #1#2#3 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\msg_error:nnnn { socket } { plug-already-declared } {#1} {#2}
}
@@ -8650,14 +8958,12 @@ of this package available from CTAN}
{ Plug~ '#2'~ for~ socket~ '#1'~ declared. }
}
}
- {
- \msg_error:nnn { socket } { undeclared } {#1}
- }
+ { \msg_error:nnn { socket } { undeclared } {#1} }
}
\cs_new_protected:Npn \socket_set_plug:nnn #1#2#3 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\cs_generate_from_arg_count:cNnn
{ __socket_#1_plug_#2:w }
@@ -8671,14 +8977,17 @@ of this package available from CTAN}
\msg_error:nnnn { socket } { plug-undeclared } {#1} {#2}
}
}
- {
- \msg_error:nnn { socket } { undeclared } {#1}
- }
+ { \msg_error:nnn { socket } { undeclared } {#1} }
}
+\prg_new_conditional:Npnn \socket_if_plug_exist:nn #1#2 { p , T , F , TF }
+ { \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_assign_plug:nn #1 #2 {
- \str_if_exist:cTF { l__socket_#1_plug_str }
+ \socket_if_exist:nTF {#1}
{
- \cs_if_exist:cTF { __socket_#1_plug_#2:w }
+ \socket_if_plug_exist:nnTF {#1} {#2}
{
\__socket_debug_term:n
{ Replacing~ plug~ '\str_use:c { l__socket_#1_plug_str }'~
@@ -8691,6 +9000,12 @@ of this package available from CTAN}
}
{ \msg_error:nnn { socket } { undeclared } {#1} }
}
+\prg_new_conditional:Npnn \socket_if_plug_assigned:nn #1#2 { p , T , F , TF }
+ { \exp_args:Ne
+ \str_if_eq:nvTF {#2} { l__socket_#1_plug_str }
+ \prg_return_true:
+ \prg_return_false:
+ }
\cs_new_protected:Npn \socket_use:nw #1 {
\__socket_debug_term:n
{ Socket~ '#1'~ containing~ plug~
@@ -8738,6 +9053,15 @@ of this package available from CTAN}
\cs_new_eq:NN \UseSocket \socket_use:nw
\cs_new_eq:NN \DebugSocketsOn \socket_debug_on:
\cs_new_eq:NN \DebugSocketsOff \socket_debug_off:
+\cs_new_eq:NN \IfSocketExistsTF \socket_if_exist:nTF
+\cs_new_eq:NN \IfSocketExistsT \socket_if_exist:nT
+\cs_new_eq:NN \IfSocketExistsF \socket_if_exist:nF
+\cs_new_eq:NN \IfSocketPlugExistsTF \socket_if_plug_exist:nnTF
+\cs_new_eq:NN \IfSocketPlugExistsT \socket_if_plug_exist:nnT
+\cs_new_eq:NN \IfSocketPlugExistsF \socket_if_plug_exist:nnF
+\cs_new_eq:NN \IfSocketPlugAssignedTF \socket_if_plug_assigned:nnTF
+\cs_new_eq:NN \IfSocketPlugAssignedT \socket_if_plug_assigned:nnT
+\cs_new_eq:NN \IfSocketPlugAssignedF \socket_if_plug_assigned:nnF
\IncludeInRelease{0000/00/00}{ltsockets}
{The~socket~management~(undo)}%
@@ -8752,10 +9076,21 @@ of this package available from CTAN}
\let \DebugSocketsOn \@undefined
\let \DebugSocketsOff \@undefined
+\let \IfSocketExistsTF \@undefined
+\let \IfSocketExistsT \@undefined
+\let \IfSocketExistsF \@undefined
+\let \IfSocketPlugExistsTF \@undefined
+\let \IfSocketPlugExistsT \@undefined
+\let \IfSocketPlugExistsF \@undefined
+\let \IfSocketPlugAssignedTF \@undefined
+\let \IfSocketPlugAssignedT \@undefined
+\let \IfSocketPlugAssignedF \@undefined
+
\EndModuleRelease
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: lttemplates.dtx
+
\ExplSyntaxOn
\NewModuleRelease{2024/06/01}{lttemplates}
{Prototype~document~commands}%
@@ -9133,8 +9468,15 @@ of this package available from CTAN}
\__template_if_keys_exist:nnT {#1} {#2}
{
\__template_store_key_implementation:nnn {#1} {#2} {#4}
- \regex_match:nnTF { \c { AssignTemplateKeys } } {#5}
- { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} }
+ \str_if_in:nnTF {#5} { AssignTemplateKeys }
+ {
+ \regex_match:nnTF { \c { AssignTemplateKeys } } {#5}
+ { \__template_declare_template_code:nnnn {#1} {#2} {#3} {#5} }
+ {
+ \__template_declare_template_code:nnnn
+ {#1} {#2} {#3} { \AssignTemplateKeys #5 }
+ }
+ }
{
\__template_declare_template_code:nnnn
{#1} {#2} {#3} { \AssignTemplateKeys #5 }
@@ -9944,8 +10286,24 @@ of this package available from CTAN}
{ \__template_if_instance_exist:nnF {#1} {#2} }
\cs_new_protected:Npn \KeyValue #1 {#1}
\cs_new_protected:Npn \AssignTemplateKeys { \__template_assignments_pop: }
+\cs_new_protected:Npn \SetKnownTemplateKeys #1#2#3
+ {
+ \tl_if_empty:oTF {#3}
+ {
+ \tl_set_eq:NN \UnusedTemplateKeys \c_empty_tl
+ }
+ {
+ \keys_set_known:noN { template / #1 / #2 } {#3} \UnusedTemplateKeys
+ }
+ }
\cs_new_protected:Npn \SetTemplateKeys #1#2#3
- { \keys_set_known:nnN { template / #1 / #2 } {#3} \l__template_tmp_clist }
+ {
+ \tl_if_empty:oF {#3}
+ {
+ \keys_set:no { template / #1 / #2 } {#3}
+ }
+ }
+\tl_new:N \UnusedTemplateKeys
\IncludeInRelease{0000/00/00}{lttemplates}%
{Prototype~document~commands}%
@@ -9997,7 +10355,7 @@ of this package available from CTAN}
\EndIncludeInRelease
%%% From File: ltpar.dtx
%% File: ltpara.dtx
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltpara.dtx
@@ -10186,7 +10544,7 @@ of this package available from CTAN}
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: ltmeta.dtx
-%% Copyright (C) 2021-2024
+%% Copyright (C) 2021-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltmeta.dtx
\NewModuleRelease{2022/06/01}{ltmeta}
@@ -11291,8 +11649,8 @@ of this package available from CTAN}
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
\ifx\reserved@a\relax
\DeclareTextCommand#1{#2}{%
- \@latex@error{\string#1 undeclared in encoding #2}\@eha}%
- \@latex@info{Composite with undeclared \string#1 in encoding #2}%
+ \@latex@error{Text composite \string#1 undeclared in encoding #2}\@eha}%
+ \@enc@info{Text composite with undeclared \string#1 in encoding #2}%
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
\fi
\expandafter\expandafter\expandafter\ifx
@@ -11407,7 +11765,6 @@ of this package available from CTAN}
\EndIncludeInRelease
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: ltcounts.dtx
-
\IncludeInRelease{2015/01/01}{\@stpelt}
{Reset nested counters}%
\def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}%
@@ -11478,13 +11835,15 @@ of this package available from CTAN}
\expandafter\xdef\csname cl@#2\endcsname
{\csname cl@#2\endcsname}%
\endgroup}}
-
+\begingroup\catcode`\*=11 \lowercase{\endgroup
\def\@ifbothcounters#1#2#3{%
+ \begingroup\let\c@*\@undefined
\@ifundefined{c@#1}{\@nocounterr{#1}}%
{% else counter is defined
\@ifundefined{c@#2}{\@nocounterr{#2}}%
{% else both counter and within are defined
- #3}}}
+ #3}}%
+ \endgroup}}
\EndIncludeInRelease
\IncludeInRelease{0000-00-00}
{\@removefromreset}{Add interfaces}%
@@ -11657,6 +12016,46 @@ of this package available from CTAN}
\fi
}
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\CheckEncodingSubset}{preload .fd file}%
+\def\CheckEncodingSubset#1#2#3#4#5{%
+ \expandafter\ifx\csname #2:\f@family\endcsname\relax
+ \LoadFontDefinitionFile{#2}\f@family
+ \fi
+ \ifnum #4>%
+ \expandafter\ifx\csname #2:\f@family\endcsname\relax
+ 0\csname #2:?\endcsname
+ \else
+ \csname #2:\f@family\endcsname
+ \fi
+ \relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#1{#2}}{#3}%
+ #5%
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\CheckEncodingSubset}{preload .fd file}%
+
+\def\CheckEncodingSubset#1#2#3#4#5{%
+ \ifnum #4>%
+ \expandafter\ifx\csname #2:\f@family\endcsname\relax
+ 0\csname #2:?\endcsname
+ \else
+ \csname #2:\f@family\endcsname
+ \fi
+ \relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#1{#2}}{#3}%
+ #5%
+}
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}{\@DeclareMathSizes}%
{Arbitrary units in \DeclareMathSizes}%
\def\@DeclareMathSizes #1#2#3#4#5{%
@@ -11728,11 +12127,13 @@ of this package available from CTAN}
{\frozen@everydisplay}{Handle spaces after math}%
\frozen@everydisplay = {%
\aftergroup\@ignoretrue \aftergroup\ignorespaces
+ \advance\@math@level\@ne
\check@mathfonts
\the\everydisplay}
\frozen@everymath = {%
\aftergroup\@ignorefalse
+ \advance\@math@level\@ne
\check@mathfonts
\the\everymath}
\EndIncludeInRelease
@@ -11968,388 +12369,2775 @@ of this package available from CTAN}
\EndIncludeInRelease
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% From File: ltfssaxes.dtx
-%% Copyright (C) 2019-2020 Frank Mittelbach
+%% Copyright (C) 2019-2020 Frank Mittelbach (initial implementation)
+\IncludeInRelease{2025/06/01}%
+ {\DeclareFontSeriesChangeRule}{Series change rules}%
+\def\DeclareFontSeriesChangeRule#1#2#3#4{%
+ \@namedef{series@#1@#2}{{#3}{#4}}}
+\DeclareFontSeriesChangeRule {uluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {uluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {uluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {uluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {uluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {uluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {uluc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {uluc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {uluc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {uluc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {uluc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {uluc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {uluc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {uluc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ulec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ulec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ulec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ulec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ulec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {ulec}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulec}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulec}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulec}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulec}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulec}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulec}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulec}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ulc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ulc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ulc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ulc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ulc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {ulc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {ulsc}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulsc}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulsc}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsc}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsc}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulsc}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulsc}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ul}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ul}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ul}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ul}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ul}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ul}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ul}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ul}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ul}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {ul}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {ul}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {ulsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {ulsx}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulsx}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulsx}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulsx}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulsx}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulsx}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulsx}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulsx}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ulx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ulx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ulx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ulx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ulx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {ulx}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulx}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulx}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulx}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulx}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulx}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulx}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulx}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ulex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ulex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ulex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ulex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ulex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {ulex}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulex}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulex}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulex}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulex}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulex}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulex}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulex}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {ulux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ulux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ulux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ulux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ulux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ulux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {ulux}{uc} {uluc} {}
+\DeclareFontSeriesChangeRule {ulux}{ec} {ulec} {}
+\DeclareFontSeriesChangeRule {ulux}{c} {ulc} {}
+\DeclareFontSeriesChangeRule {ulux}{sc} {ulsc} {}
+\DeclareFontSeriesChangeRule {ulux}{sx} {ulsx} {}
+\DeclareFontSeriesChangeRule {ulux}{x} {ulx} {}
+\DeclareFontSeriesChangeRule {ulux}{ex} {ulex} {}
+\DeclareFontSeriesChangeRule {ulux}{ux} {ulux} {}
+\DeclareFontSeriesChangeRule {eluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {eluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {eluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {eluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {eluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {eluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {eluc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {eluc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {eluc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {eluc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {eluc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {eluc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {eluc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {eluc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {elec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {elec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {elec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {elec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {elec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {elec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {elec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {elec}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elec}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elec}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elec}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elec}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elec}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elec}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elec}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {elc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {elc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {elc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {elc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {elc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {elc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {elc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {elc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {elsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {elsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {elsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {elsc}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elsc}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elsc}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elsc}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elsc}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elsc}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elsc}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elsc}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {el}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {el}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {el}{c} {elc} {}
+\DeclareFontSeriesChangeRule {el}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {el}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {el}{x} {elx} {}
+\DeclareFontSeriesChangeRule {el}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {el}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {el}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {el}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {el}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {elsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {elsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {elsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {elsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {elsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {elsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {elsx}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elsx}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elsx}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elsx}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elsx}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elsx}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elsx}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elsx}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {elx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {elx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {elx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {elx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {elx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {elx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {elx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {elx}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elx}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elx}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elx}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elx}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elx}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elx}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elx}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {elex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {elex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {elex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {elex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {elex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {elex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {elex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {elex}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elex}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elex}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elex}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elex}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elex}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elex}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elex}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {elux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {elux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {elux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {elux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {elux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {elux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {elux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {elux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {elux}{uc} {eluc} {}
+\DeclareFontSeriesChangeRule {elux}{ec} {elec} {}
+\DeclareFontSeriesChangeRule {elux}{c} {elc} {}
+\DeclareFontSeriesChangeRule {elux}{sc} {elsc} {}
+\DeclareFontSeriesChangeRule {elux}{sx} {elsx} {}
+\DeclareFontSeriesChangeRule {elux}{x} {elx} {}
+\DeclareFontSeriesChangeRule {elux}{ex} {elex} {}
+\DeclareFontSeriesChangeRule {elux}{ux} {elux} {}
+\DeclareFontSeriesChangeRule {luc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {luc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {luc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {luc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {luc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {luc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {luc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {luc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {luc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {luc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {luc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {luc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {luc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {luc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {lec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {lec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {lec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {lec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {lec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {lec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {lec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {lec}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lec}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lec}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lec}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lec}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lec}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lec}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lec}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {lc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {lc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {lc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {lc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {lc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {lc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {lc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {lc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {lsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {lsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {lsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {lsc}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lsc}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lsc}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lsc}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lsc}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lsc}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lsc}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lsc}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {l}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {l}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {l}{c} {lc} {}
+\DeclareFontSeriesChangeRule {l}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {l}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {l}{x} {lx} {}
+\DeclareFontSeriesChangeRule {l}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {l}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {l}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {l}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {l}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {lsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {lsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {lsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {lsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {lsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {lsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {lsx}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lsx}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lsx}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lsx}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lsx}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lsx}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lsx}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lsx}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {lx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {lx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {lx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {lx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {lx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {lx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {lx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {lx}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lx}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lx}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lx}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lx}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lx}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lx}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lx}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {lex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {lex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {lex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {lex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {lex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {lex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {lex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {lex}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lex}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lex}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lex}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lex}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lex}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lex}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lex}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {lux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {lux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {lux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {lux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {lux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {lux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {lux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {lux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {lux}{uc} {luc} {}
+\DeclareFontSeriesChangeRule {lux}{ec} {lec} {}
+\DeclareFontSeriesChangeRule {lux}{c} {lc} {}
+\DeclareFontSeriesChangeRule {lux}{sc} {lsc} {}
+\DeclareFontSeriesChangeRule {lux}{sx} {lsx} {}
+\DeclareFontSeriesChangeRule {lux}{x} {lx} {}
+\DeclareFontSeriesChangeRule {lux}{ex} {lex} {}
+\DeclareFontSeriesChangeRule {lux}{ux} {lux} {}
+\DeclareFontSeriesChangeRule {sluc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {sluc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {sluc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {sluc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {sluc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {sluc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {sluc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {sluc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {sluc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {sluc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {sluc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {sluc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {sluc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {sluc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {slec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {slec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {slec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {slec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {slec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {slec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {slec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {slec}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slec}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slec}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slec}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slec}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slec}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slec}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slec}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {slc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {slc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {slc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {slc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {slc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {slc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {slc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {slc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {slsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {slsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {slsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {slsc}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slsc}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slsc}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slsc}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slsc}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slsc}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slsc}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slsc}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {sl}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {sl}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {sl}{c} {slc} {}
+\DeclareFontSeriesChangeRule {sl}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {sl}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {sl}{x} {slx} {}
+\DeclareFontSeriesChangeRule {sl}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {sl}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {sl}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {sl}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {sl}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {slsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {slsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {slsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {slsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {slsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {slsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {slsx}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slsx}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slsx}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slsx}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slsx}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slsx}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slsx}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slsx}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {slx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {slx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {slx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {slx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {slx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {slx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {slx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {slx}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slx}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slx}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slx}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slx}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slx}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slx}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slx}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {slex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {slex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {slex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {slex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {slex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {slex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {slex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {slex}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slex}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slex}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slex}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slex}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slex}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slex}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slex}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {slux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {slux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {slux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {slux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {slux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {slux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {slux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {slux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {slux}{uc} {sluc} {}
+\DeclareFontSeriesChangeRule {slux}{ec} {slec} {}
+\DeclareFontSeriesChangeRule {slux}{c} {slc} {}
+\DeclareFontSeriesChangeRule {slux}{sc} {slsc} {}
+\DeclareFontSeriesChangeRule {slux}{sx} {slsx} {}
+\DeclareFontSeriesChangeRule {slux}{x} {slx} {}
+\DeclareFontSeriesChangeRule {slux}{ex} {slex} {}
+\DeclareFontSeriesChangeRule {slux}{ux} {slux} {}
+\DeclareFontSeriesChangeRule {uc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {uc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {uc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {uc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {uc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {uc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {uc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {uc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {ec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {ec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {c}{ul} {ulc} {c}
+\DeclareFontSeriesChangeRule {c}{el} {elc} {c}
+\DeclareFontSeriesChangeRule {c}{l} {lc} {c}
+\DeclareFontSeriesChangeRule {c}{sl} {slc} {c}
+\DeclareFontSeriesChangeRule {c}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {c}{b} {bc} {}
+\DeclareFontSeriesChangeRule {c}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {c}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {c}{uc} {uc} {c}
+\DeclareFontSeriesChangeRule {c}{ec} {ec} {c}
+\DeclareFontSeriesChangeRule {c}{sc} {sc} {c}
+\DeclareFontSeriesChangeRule {sc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {sc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {sc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {sc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {sc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {sc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {sc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {sc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {m}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {m}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {m}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {m}{b} {b} {bx}
+\DeclareFontSeriesChangeRule {sx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {sx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {sx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {sx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {sx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {sx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {sx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {sx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {x}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {x}{el} {elx} {}
+\DeclareFontSeriesChangeRule {x}{l} {lx} {}
+\DeclareFontSeriesChangeRule {x}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {x}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {x}{b} {bx} {}
+\DeclareFontSeriesChangeRule {x}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {x}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {ex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {ex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {ux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {ux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {sbuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sb} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {sbuc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {sbuc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {sbuc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbuc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbuc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbuc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbuc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbuc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbuc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {sbec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {sbec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {sbec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {sbec}{sb} {sbec} {}
+\DeclareFontSeriesChangeRule {sbec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {sbec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {sbec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {sbec}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbec}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbec}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbec}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbec}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbec}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbec}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbec}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {sbc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {sbc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {sbc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {sbc}{sb} {sbc} {}
+\DeclareFontSeriesChangeRule {sbc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {sbc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {sbc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {sbc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sb} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {sbsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {sbsc}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbsc}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbsc}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsc}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsc}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbsc}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbsc}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sb}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sb}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sb}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sb}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sb}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sb}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sb}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {sb}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {sbsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{sb} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {sbsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {sbsx}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbsx}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbsx}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbsx}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbsx}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbsx}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbsx}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbsx}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {sbx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {sbx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {sbx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {sbx}{sb} {sbx} {}
+\DeclareFontSeriesChangeRule {sbx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {sbx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {sbx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {sbx}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbx}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbx}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbx}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbx}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbx}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbx}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbx}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {sbex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {sbex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {sbex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {sbex}{sb} {sbex} {}
+\DeclareFontSeriesChangeRule {sbex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {sbex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {sbex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {sbex}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbex}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbex}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbex}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbex}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbex}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbex}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbex}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {sbux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {sbux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {sbux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {sbux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {sbux}{sb} {sbux} {}
+\DeclareFontSeriesChangeRule {sbux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {sbux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {sbux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {sbux}{uc} {sbuc} {}
+\DeclareFontSeriesChangeRule {sbux}{ec} {sbec} {}
+\DeclareFontSeriesChangeRule {sbux}{c} {sbc} {}
+\DeclareFontSeriesChangeRule {sbux}{sc} {sbsc} {}
+\DeclareFontSeriesChangeRule {sbux}{sx} {sbsx} {}
+\DeclareFontSeriesChangeRule {sbux}{x} {sbx} {}
+\DeclareFontSeriesChangeRule {sbux}{ex} {sbex} {}
+\DeclareFontSeriesChangeRule {sbux}{ux} {sbux} {}
+\DeclareFontSeriesChangeRule {buc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {buc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {buc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {buc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {buc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {buc}{eb} {ebuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{ub} {ubuc} {buc}
+\DeclareFontSeriesChangeRule {buc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {buc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {buc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {buc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {buc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {buc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {buc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {buc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {bec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {bec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {bec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {bec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {bec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {bec}{eb} {ebec} {bec}
+\DeclareFontSeriesChangeRule {bec}{ub} {ubec} {bec}
+\DeclareFontSeriesChangeRule {bec}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bec}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bec}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bec}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bec}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bec}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bec}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bec}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {bc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {bc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {bc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {bc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {bc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {bc}{eb} {ebc} {bc}
+\DeclareFontSeriesChangeRule {bc}{ub} {ubc} {bc}
+\DeclareFontSeriesChangeRule {bc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {bsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {bsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {bsc}{eb} {ebsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{ub} {ubsc} {bsc}
+\DeclareFontSeriesChangeRule {bsc}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bsc}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bsc}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bsc}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bsc}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bsc}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bsc}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bsc}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {b}{uc} {buc} {b}
+\DeclareFontSeriesChangeRule {b}{ec} {bec} {b}
+\DeclareFontSeriesChangeRule {b}{c} {bc} {b}
+\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b}
+\DeclareFontSeriesChangeRule {b}{sx} {bsx} {b}
+\DeclareFontSeriesChangeRule {b}{x} {bx} {b}
+\DeclareFontSeriesChangeRule {b}{ex} {bex} {b}
+\DeclareFontSeriesChangeRule {b}{ux} {bux} {b}
+\DeclareFontSeriesChangeRule {b}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {b}{eb} {eb} {b}
+\DeclareFontSeriesChangeRule {b}{ub} {ub} {b}
+\DeclareFontSeriesChangeRule {bsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {bsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {bsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {bsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {bsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {bsx}{eb} {ebsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{ub} {ubsx} {bsx}
+\DeclareFontSeriesChangeRule {bsx}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bsx}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bsx}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bsx}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bsx}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bsx}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bsx}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bsx}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {bx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {bx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {bx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {bx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {bx}{eb} {ebx} {bx}
+\DeclareFontSeriesChangeRule {bx}{ub} {ubx} {bx}
+\DeclareFontSeriesChangeRule {bx}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bx}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bx}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bx}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bx}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bx}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bx}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {bex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {bex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {bex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {bex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {bex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {bex}{eb} {ebex} {bex}
+\DeclareFontSeriesChangeRule {bex}{ub} {ubex} {bex}
+\DeclareFontSeriesChangeRule {bex}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bex}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bex}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bex}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bex}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bex}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bex}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bex}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {bux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {bux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {bux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {bux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {bux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {bux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {bux}{eb} {ebux} {bux}
+\DeclareFontSeriesChangeRule {bux}{ub} {ubux} {bux}
+\DeclareFontSeriesChangeRule {bux}{uc} {buc} {}
+\DeclareFontSeriesChangeRule {bux}{ec} {bec} {}
+\DeclareFontSeriesChangeRule {bux}{c} {bc} {}
+\DeclareFontSeriesChangeRule {bux}{sc} {bsc} {}
+\DeclareFontSeriesChangeRule {bux}{sx} {bsx} {}
+\DeclareFontSeriesChangeRule {bux}{x} {bx} {}
+\DeclareFontSeriesChangeRule {bux}{ex} {bex} {}
+\DeclareFontSeriesChangeRule {bux}{ux} {bux} {}
+\DeclareFontSeriesChangeRule {ebuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {ebuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {ebuc}{eb} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebuc}{ub} {ubuc} {ebuc}
+\DeclareFontSeriesChangeRule {ebuc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebuc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebuc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebuc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebuc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebuc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebuc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ebec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ebec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ebec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ebec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ebec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ebec}{eb} {ebec} {}
+\DeclareFontSeriesChangeRule {ebec}{ub} {ubec} {ebec}
+\DeclareFontSeriesChangeRule {ebec}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebec}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebec}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebec}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebec}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebec}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebec}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebec}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ebc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ebc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ebc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ebc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ebc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ebc}{eb} {ebc} {}
+\DeclareFontSeriesChangeRule {ebc}{ub} {ubc} {ebc}
+\DeclareFontSeriesChangeRule {ebc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ebsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{eb} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{ub} {ubsc} {ebsc}
+\DeclareFontSeriesChangeRule {ebsc}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebsc}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebsc}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsc}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsc}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebsc}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebsc}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {eb}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {eb}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {eb}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {eb}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {eb}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {eb}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {eb}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {eb}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {eb}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {eb}{ub} {ub} {eb}
+\DeclareFontSeriesChangeRule {ebsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ebsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{eb} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{ub} {ubsx} {ebsx}
+\DeclareFontSeriesChangeRule {ebsx}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebsx}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebsx}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebsx}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebsx}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebsx}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebsx}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebsx}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ebx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ebx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ebx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ebx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ebx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ebx}{eb} {ebx} {}
+\DeclareFontSeriesChangeRule {ebx}{ub} {ubx} {ebx}
+\DeclareFontSeriesChangeRule {ebx}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebx}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebx}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebx}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebx}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebx}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebx}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebx}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ebex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ebex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ebex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ebex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ebex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ebex}{eb} {ebex} {}
+\DeclareFontSeriesChangeRule {ebex}{ub} {ubex} {ebex}
+\DeclareFontSeriesChangeRule {ebex}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebex}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebex}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebex}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebex}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebex}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebex}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebex}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ebux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ebux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ebux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ebux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ebux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ebux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ebux}{eb} {ebux} {}
+\DeclareFontSeriesChangeRule {ebux}{ub} {ubux} {ebux}
+\DeclareFontSeriesChangeRule {ebux}{uc} {ebuc} {}
+\DeclareFontSeriesChangeRule {ebux}{ec} {ebec} {}
+\DeclareFontSeriesChangeRule {ebux}{c} {ebc} {}
+\DeclareFontSeriesChangeRule {ebux}{sc} {ebsc} {}
+\DeclareFontSeriesChangeRule {ebux}{sx} {ebsx} {}
+\DeclareFontSeriesChangeRule {ebux}{x} {ebx} {}
+\DeclareFontSeriesChangeRule {ebux}{ex} {ebex} {}
+\DeclareFontSeriesChangeRule {ebux}{ux} {ebux} {}
+\DeclareFontSeriesChangeRule {ubuc}{ul} {uluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{el} {eluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{l} {luc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sl} {sluc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sb} {sbuc} {buc}
+\DeclareFontSeriesChangeRule {ubuc}{b} {buc} {}
+\DeclareFontSeriesChangeRule {ubuc}{eb} {ebuc} {ubuc}
+\DeclareFontSeriesChangeRule {ubuc}{ub} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubuc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubuc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubuc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubuc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubuc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubuc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubuc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubec}{ul} {ulec} {}
+\DeclareFontSeriesChangeRule {ubec}{el} {elec} {}
+\DeclareFontSeriesChangeRule {ubec}{l} {lec} {}
+\DeclareFontSeriesChangeRule {ubec}{sl} {slec} {}
+\DeclareFontSeriesChangeRule {ubec}{sb} {sbec} {bec}
+\DeclareFontSeriesChangeRule {ubec}{b} {bec} {}
+\DeclareFontSeriesChangeRule {ubec}{eb} {ebec} {ubec}
+\DeclareFontSeriesChangeRule {ubec}{ub} {ubec} {}
+\DeclareFontSeriesChangeRule {ubec}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubec}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubec}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubec}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubec}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubec}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubec}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubec}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubc}{ul} {ulc} {}
+\DeclareFontSeriesChangeRule {ubc}{el} {elc} {}
+\DeclareFontSeriesChangeRule {ubc}{l} {lc} {}
+\DeclareFontSeriesChangeRule {ubc}{sl} {slc} {}
+\DeclareFontSeriesChangeRule {ubc}{sb} {sbc} {bc}
+\DeclareFontSeriesChangeRule {ubc}{b} {bc} {}
+\DeclareFontSeriesChangeRule {ubc}{eb} {ebc} {ubc}
+\DeclareFontSeriesChangeRule {ubc}{ub} {ubc} {}
+\DeclareFontSeriesChangeRule {ubc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubsc}{ul} {ulsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{el} {elsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{l} {lsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sl} {slsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sb} {sbsc} {bsc}
+\DeclareFontSeriesChangeRule {ubsc}{b} {bsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{eb} {ebsc} {ubsc}
+\DeclareFontSeriesChangeRule {ubsc}{ub} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubsc}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubsc}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsc}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsc}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubsc}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubsc}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ub}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ub}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ub}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ub}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ub}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ub}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ub}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ub}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ub}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {ub}{eb} {eb} {ub}
+\DeclareFontSeriesChangeRule {ubsx}{ul} {ulsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{el} {elsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{l} {lsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{sl} {slsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{sb} {sbsx} {bsx}
+\DeclareFontSeriesChangeRule {ubsx}{b} {bsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{eb} {ebsx} {ubsx}
+\DeclareFontSeriesChangeRule {ubsx}{ub} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubsx}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubsx}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubsx}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubsx}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubsx}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubsx}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubsx}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubx}{ul} {ulx} {}
+\DeclareFontSeriesChangeRule {ubx}{el} {elx} {}
+\DeclareFontSeriesChangeRule {ubx}{l} {lx} {}
+\DeclareFontSeriesChangeRule {ubx}{sl} {slx} {}
+\DeclareFontSeriesChangeRule {ubx}{sb} {sbx} {bx}
+\DeclareFontSeriesChangeRule {ubx}{b} {bx} {}
+\DeclareFontSeriesChangeRule {ubx}{eb} {ebx} {ubx}
+\DeclareFontSeriesChangeRule {ubx}{ub} {ubx} {}
+\DeclareFontSeriesChangeRule {ubx}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubx}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubx}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubx}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubx}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubx}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubx}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubx}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubex}{ul} {ulex} {}
+\DeclareFontSeriesChangeRule {ubex}{el} {elex} {}
+\DeclareFontSeriesChangeRule {ubex}{l} {lex} {}
+\DeclareFontSeriesChangeRule {ubex}{sl} {slex} {}
+\DeclareFontSeriesChangeRule {ubex}{sb} {sbex} {bex}
+\DeclareFontSeriesChangeRule {ubex}{b} {bex} {}
+\DeclareFontSeriesChangeRule {ubex}{eb} {ebex} {ubex}
+\DeclareFontSeriesChangeRule {ubex}{ub} {ubex} {}
+\DeclareFontSeriesChangeRule {ubex}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubex}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubex}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubex}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubex}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubex}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubex}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubex}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {ubux}{ul} {ulux} {}
+\DeclareFontSeriesChangeRule {ubux}{el} {elux} {}
+\DeclareFontSeriesChangeRule {ubux}{l} {lux} {}
+\DeclareFontSeriesChangeRule {ubux}{sl} {slux} {}
+\DeclareFontSeriesChangeRule {ubux}{sb} {sbux} {bux}
+\DeclareFontSeriesChangeRule {ubux}{b} {bux} {}
+\DeclareFontSeriesChangeRule {ubux}{eb} {ebux} {ubux}
+\DeclareFontSeriesChangeRule {ubux}{ub} {ubux} {}
+\DeclareFontSeriesChangeRule {ubux}{uc} {ubuc} {}
+\DeclareFontSeriesChangeRule {ubux}{ec} {ubec} {}
+\DeclareFontSeriesChangeRule {ubux}{c} {ubc} {}
+\DeclareFontSeriesChangeRule {ubux}{sc} {ubsc} {}
+\DeclareFontSeriesChangeRule {ubux}{sx} {ubsx} {}
+\DeclareFontSeriesChangeRule {ubux}{x} {ubx} {}
+\DeclareFontSeriesChangeRule {ubux}{ex} {ubex} {}
+\DeclareFontSeriesChangeRule {ubux}{ux} {ubux} {}
+\DeclareFontSeriesChangeRule {uluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ul}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ulux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {eluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {el}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {elux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {luc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {l}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {lux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sluc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sl}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {slux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sb}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sbux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {buc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {b}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {bux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {eb}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ebux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubuc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubsc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ub}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubsx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ubux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {uc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {c}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {m}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sx}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {x}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ex}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ux}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {uluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ulec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ulc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ulsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {ul}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ulsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ulx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ulex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ulux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {eluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {elec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {elc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {elsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {el}{m?} {m} {}
+\DeclareFontSeriesChangeRule {elsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {elx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {elex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {elux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {luc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {lec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {lc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {lsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {l}{m?} {m} {}
+\DeclareFontSeriesChangeRule {lsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {lx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {lex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {lux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {sluc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {slec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {slc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {slsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {sl}{m?} {m} {}
+\DeclareFontSeriesChangeRule {slsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {slx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {slex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {slux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {uc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {c}{m?} {c} {}
+\DeclareFontSeriesChangeRule {sc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {m}{m?} {m} {}
+\DeclareFontSeriesChangeRule {sx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {x}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {sbuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {sbec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {sbc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {sbsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {sb}{m?} {m} {}
+\DeclareFontSeriesChangeRule {sbsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {sbx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {sbex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {sbux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {buc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {bec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {bc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {bsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {b}{m?} {m} {}
+\DeclareFontSeriesChangeRule {bsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {bx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {bex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {bux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {ebuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ebec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ebc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ebsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {eb}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ebsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ebx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ebex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ebux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {ubuc}{m?} {uc} {}
+\DeclareFontSeriesChangeRule {ubec}{m?} {ec} {}
+\DeclareFontSeriesChangeRule {ubc}{m?} {c} {}
+\DeclareFontSeriesChangeRule {ubsc}{m?} {sc} {}
+\DeclareFontSeriesChangeRule {ub}{m?} {m} {}
+\DeclareFontSeriesChangeRule {ubsx}{m?} {sx} {}
+\DeclareFontSeriesChangeRule {ubx}{m?} {x} {}
+\DeclareFontSeriesChangeRule {ubex}{m?} {ex} {}
+\DeclareFontSeriesChangeRule {ubux}{m?} {ux} {}
+\DeclareFontSeriesChangeRule {uluc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulec}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulsc}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ul}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulsx}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulx}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulex}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {ulux}{?m} {ul} {}
+\DeclareFontSeriesChangeRule {eluc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elec}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elsc}{?m} {el} {}
+\DeclareFontSeriesChangeRule {el}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elsx}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elx}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elex}{?m} {el} {}
+\DeclareFontSeriesChangeRule {elux}{?m} {el} {}
+\DeclareFontSeriesChangeRule {luc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lec}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lsc}{?m} {l} {}
+\DeclareFontSeriesChangeRule {l}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lsx}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lx}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lex}{?m} {l} {}
+\DeclareFontSeriesChangeRule {lux}{?m} {l} {}
+\DeclareFontSeriesChangeRule {sluc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slec}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slsc}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {sl}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slsx}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slx}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slex}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {slux}{?m} {sl} {}
+\DeclareFontSeriesChangeRule {uc}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ec}{?m} {m} {}
+\DeclareFontSeriesChangeRule {c}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sc}{?m} {m} {}
+\DeclareFontSeriesChangeRule {m}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sx}{?m} {m} {}
+\DeclareFontSeriesChangeRule {x}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ex}{?m} {m} {}
+\DeclareFontSeriesChangeRule {ux}{?m} {m} {}
+\DeclareFontSeriesChangeRule {sbuc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbec}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbsc}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sb}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbsx}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbx}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbex}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {sbux}{?m} {sb} {}
+\DeclareFontSeriesChangeRule {buc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bec}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bsc}{?m} {b} {}
+\DeclareFontSeriesChangeRule {b}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bsx}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bx}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bex}{?m} {b} {}
+\DeclareFontSeriesChangeRule {bux}{?m} {b} {}
+\DeclareFontSeriesChangeRule {ebuc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebec}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebsc}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {eb}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebsx}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebx}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebex}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ebux}{?m} {eb} {}
+\DeclareFontSeriesChangeRule {ubuc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubec}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubsc}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ub}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubsx}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubx}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubex}{?m} {ub} {}
+\DeclareFontSeriesChangeRule {ubux}{?m} {ub} {}
+\EndIncludeInRelease
\IncludeInRelease{2020/02/02}%
{\DeclareFontSeriesChangeRule}{Series change rules}%
+
\def\DeclareFontSeriesChangeRule#1#2#3#4{%
\@namedef{series@#1@#2}{{#3}{#4}}}
+
+\DeclareFontSeriesChangeRule {bc}{bx} {} {}
\DeclareFontSeriesChangeRule {bc}{b}{bc}{}
\DeclareFontSeriesChangeRule {bc}{c}{bc}{}
\DeclareFontSeriesChangeRule {bc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {bc}{ec}{bec} {bc}
\DeclareFontSeriesChangeRule {bc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {bc}{ex} {} {}
\DeclareFontSeriesChangeRule {bc}{l}{lc}{}
\DeclareFontSeriesChangeRule {bc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {bc}{sc}{bsc} {bc}
\DeclareFontSeriesChangeRule {bc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {bc}{sx} {} {}
\DeclareFontSeriesChangeRule {bc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {bc}{uc} {} {}
\DeclareFontSeriesChangeRule {bc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {bc}{ux} {} {}
\DeclareFontSeriesChangeRule {bc}{x}{bx}{}
+\DeclareFontSeriesChangeRule {bec}{bx} {} {}
+\DeclareFontSeriesChangeRule {bec}{b} {} {}
+\DeclareFontSeriesChangeRule {bec}{c} {} {}
+\DeclareFontSeriesChangeRule {bec}{eb} {} {}
+\DeclareFontSeriesChangeRule {bec}{ec} {} {}
+\DeclareFontSeriesChangeRule {bec}{el} {} {}
+\DeclareFontSeriesChangeRule {bec}{ex} {} {}
+\DeclareFontSeriesChangeRule {bec}{l} {} {}
+\DeclareFontSeriesChangeRule {bec}{sb} {} {}
+\DeclareFontSeriesChangeRule {bec}{sc} {} {}
+\DeclareFontSeriesChangeRule {bec}{sl} {} {}
+\DeclareFontSeriesChangeRule {bec}{sx} {} {}
+\DeclareFontSeriesChangeRule {bec}{ub} {} {}
+\DeclareFontSeriesChangeRule {bec}{uc} {} {}
+\DeclareFontSeriesChangeRule {bec}{ul} {} {}
+\DeclareFontSeriesChangeRule {bec}{ux} {} {}
+\DeclareFontSeriesChangeRule {bec}{x} {} {}
+\DeclareFontSeriesChangeRule {bex}{?m} {} {}
+\DeclareFontSeriesChangeRule {bex}{bx} {} {}
+\DeclareFontSeriesChangeRule {bex}{b} {} {}
+\DeclareFontSeriesChangeRule {bex}{c} {} {}
+\DeclareFontSeriesChangeRule {bex}{eb} {} {}
+\DeclareFontSeriesChangeRule {bex}{ec} {} {}
+\DeclareFontSeriesChangeRule {bex}{el} {} {}
+\DeclareFontSeriesChangeRule {bex}{ex} {} {}
+\DeclareFontSeriesChangeRule {bex}{l} {} {}
+\DeclareFontSeriesChangeRule {bex}{m?} {} {}
+\DeclareFontSeriesChangeRule {bex}{sb} {} {}
+\DeclareFontSeriesChangeRule {bex}{sc} {} {}
+\DeclareFontSeriesChangeRule {bex}{sl} {} {}
+\DeclareFontSeriesChangeRule {bex}{sx} {} {}
+\DeclareFontSeriesChangeRule {bex}{ub} {} {}
+\DeclareFontSeriesChangeRule {bex}{uc} {} {}
+\DeclareFontSeriesChangeRule {bex}{ul} {} {}
+\DeclareFontSeriesChangeRule {bex}{ux} {} {}
+\DeclareFontSeriesChangeRule {bex}{x} {} {}
+\DeclareFontSeriesChangeRule {bsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {bsc}{b} {} {}
+\DeclareFontSeriesChangeRule {bsc}{c} {} {}
+\DeclareFontSeriesChangeRule {bsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {bsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {bsc}{el} {} {}
+\DeclareFontSeriesChangeRule {bsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {bsc}{l} {} {}
+\DeclareFontSeriesChangeRule {bsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {bsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {bsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {bsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {bsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {bsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {bsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {bsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {bsc}{x} {} {}
+\DeclareFontSeriesChangeRule {bsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {bsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {bsx}{b} {} {}
+\DeclareFontSeriesChangeRule {bsx}{c} {} {}
+\DeclareFontSeriesChangeRule {bsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {bsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {bsx}{el} {} {}
+\DeclareFontSeriesChangeRule {bsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {bsx}{l} {} {}
+\DeclareFontSeriesChangeRule {bsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {bsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {bsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {bsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {bsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {bsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {bsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {bsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {bsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {bsx}{x} {} {}
+\DeclareFontSeriesChangeRule {buc}{?m} {} {}
+\DeclareFontSeriesChangeRule {buc}{bx} {} {}
+\DeclareFontSeriesChangeRule {buc}{b} {} {}
+\DeclareFontSeriesChangeRule {buc}{c} {} {}
+\DeclareFontSeriesChangeRule {buc}{eb} {} {}
+\DeclareFontSeriesChangeRule {buc}{ec} {} {}
+\DeclareFontSeriesChangeRule {buc}{el} {} {}
+\DeclareFontSeriesChangeRule {buc}{ex} {} {}
+\DeclareFontSeriesChangeRule {buc}{l} {} {}
+\DeclareFontSeriesChangeRule {buc}{m?} {} {}
+\DeclareFontSeriesChangeRule {buc}{sb} {} {}
+\DeclareFontSeriesChangeRule {buc}{sc} {} {}
+\DeclareFontSeriesChangeRule {buc}{sl} {} {}
+\DeclareFontSeriesChangeRule {buc}{sx} {} {}
+\DeclareFontSeriesChangeRule {buc}{ub} {} {}
+\DeclareFontSeriesChangeRule {buc}{uc} {} {}
+\DeclareFontSeriesChangeRule {buc}{ul} {} {}
+\DeclareFontSeriesChangeRule {buc}{ux} {} {}
+\DeclareFontSeriesChangeRule {buc}{x} {} {}
+\DeclareFontSeriesChangeRule {bux}{?m} {} {}
+\DeclareFontSeriesChangeRule {bux}{bx} {} {}
+\DeclareFontSeriesChangeRule {bux}{b} {} {}
+\DeclareFontSeriesChangeRule {bux}{c} {} {}
+\DeclareFontSeriesChangeRule {bux}{eb} {} {}
+\DeclareFontSeriesChangeRule {bux}{ec} {} {}
+\DeclareFontSeriesChangeRule {bux}{el} {} {}
+\DeclareFontSeriesChangeRule {bux}{ex} {} {}
+\DeclareFontSeriesChangeRule {bux}{l} {} {}
+\DeclareFontSeriesChangeRule {bux}{m?} {} {}
+\DeclareFontSeriesChangeRule {bux}{sb} {} {}
+\DeclareFontSeriesChangeRule {bux}{sc} {} {}
+\DeclareFontSeriesChangeRule {bux}{sl} {} {}
+\DeclareFontSeriesChangeRule {bux}{sx} {} {}
+\DeclareFontSeriesChangeRule {bux}{ub} {} {}
+\DeclareFontSeriesChangeRule {bux}{uc} {} {}
+\DeclareFontSeriesChangeRule {bux}{ul} {} {}
+\DeclareFontSeriesChangeRule {bux}{ux} {} {}
+\DeclareFontSeriesChangeRule {bux}{x} {} {}
+\DeclareFontSeriesChangeRule {bx}{bx} {} {}
\DeclareFontSeriesChangeRule {bx}{b}{bx}{}
-\DeclareFontSeriesChangeRule {bx}{c} {bc} {bx} %<-----
+\DeclareFontSeriesChangeRule {bx}{c} {bc} {bx}
\DeclareFontSeriesChangeRule {bx}{eb}{ebx}{}
-\DeclareFontSeriesChangeRule {bx}{ec} {bec} {bx} %<-----
+\DeclareFontSeriesChangeRule {bx}{ec} {bec} {bx}
\DeclareFontSeriesChangeRule {bx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {bx}{ex} {} {}
\DeclareFontSeriesChangeRule {bx}{l}{lx}{}
\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {}
-\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {bx} %<-----
+\DeclareFontSeriesChangeRule {bx}{sc} {bsc} {bx}
\DeclareFontSeriesChangeRule {bx}{sl}{slx} {}
+\DeclareFontSeriesChangeRule {bx}{sx} {} {}
\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {bx}{uc} {} {}
\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {bx}{ux} {} {}
\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
-\DeclareFontSeriesChangeRule {b}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{c} {bc} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{ec} {bec} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{sb} {sb} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{x} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {c}{bx} {bx} {b} %<-----
+\DeclareFontSeriesChangeRule {b}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {b}{c} {bc} {b}
+\DeclareFontSeriesChangeRule {b}{eb} {} {}
+\DeclareFontSeriesChangeRule {b}{ec} {bec} {b}
+\DeclareFontSeriesChangeRule {b}{ex} {} {}
+\DeclareFontSeriesChangeRule {b}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {b}{sc} {bsc} {b}
+\DeclareFontSeriesChangeRule {b}{sx} {} {}
+\DeclareFontSeriesChangeRule {b}{ub} {} {}
+\DeclareFontSeriesChangeRule {b}{uc} {} {}
+\DeclareFontSeriesChangeRule {b}{ux} {} {}
+\DeclareFontSeriesChangeRule {b}{x} {bx} {b}
+\DeclareFontSeriesChangeRule {c}{bx} {bx} {b}
\DeclareFontSeriesChangeRule {c}{b}{bc}{}
\DeclareFontSeriesChangeRule {c}{eb}{ebc}{}
+\DeclareFontSeriesChangeRule {c}{ec} {} {}
\DeclareFontSeriesChangeRule {c}{el}{elc}{}
\DeclareFontSeriesChangeRule {c}{l}{lc}{}
\DeclareFontSeriesChangeRule {c}{sb}{sbc}{}
+\DeclareFontSeriesChangeRule {c}{sc} {} {}
\DeclareFontSeriesChangeRule {c}{sl}{slc}{}
\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
-\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
-\DeclareFontSeriesChangeRule {c}{x}{x}{m} %<-----
+\DeclareFontSeriesChangeRule {c}{uc} {} {}
+\DeclareFontSeriesChangeRule {c}{x}{x}{m}
+\DeclareFontSeriesChangeRule {ebc}{bx} {} {}
\DeclareFontSeriesChangeRule {ebc}{b}{bc}{}
\DeclareFontSeriesChangeRule {ebc}{c}{ebc}{}
\DeclareFontSeriesChangeRule {ebc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ebc}{ec}{ebec}{ebc}
\DeclareFontSeriesChangeRule {ebc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ebc}{ex} {} {}
\DeclareFontSeriesChangeRule {ebc}{l}{lc}{}
\DeclareFontSeriesChangeRule {ebc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ebc}{sc}{ebsc}{ebc}
\DeclareFontSeriesChangeRule {ebc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ebc}{sx} {} {}
\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ebc}{uc} {} {}
\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ebc}{ux} {} {}
\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {ec}{b}{bec}{}
-\DeclareFontSeriesChangeRule {ec}{eb}{ebec}{}
-\DeclareFontSeriesChangeRule {ec}{el}{elec}{}
-\DeclareFontSeriesChangeRule {ec}{l}{lec}{}
-\DeclareFontSeriesChangeRule {ec}{sb}{sbec}{}
-\DeclareFontSeriesChangeRule {ec}{sl}{slec}{}
-\DeclareFontSeriesChangeRule {ec}{ub}{ubec}{}
-\DeclareFontSeriesChangeRule {ec}{ul}{ulec}{}
-\DeclareFontSeriesChangeRule {ec}{x}{x}{m} %<-----
-\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {sc}{b}{bsc}{}
-\DeclareFontSeriesChangeRule {sc}{eb}{ebsc}{}
-\DeclareFontSeriesChangeRule {sc}{el}{elsc}{}
-\DeclareFontSeriesChangeRule {sc}{l}{lsc}{}
-\DeclareFontSeriesChangeRule {sc}{sb}{sbsc}{}
-\DeclareFontSeriesChangeRule {sc}{sl}{slsc}{}
-\DeclareFontSeriesChangeRule {sc}{ub}{ubsc}{}
-\DeclareFontSeriesChangeRule {sc}{ul}{ulsc}{}
-\DeclareFontSeriesChangeRule {sc}{x}{x}{m} %<-----
+\DeclareFontSeriesChangeRule {ebec}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebec}{b} {} {}
+\DeclareFontSeriesChangeRule {ebec}{c} {} {}
+\DeclareFontSeriesChangeRule {ebec}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebec}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebec}{el} {} {}
+\DeclareFontSeriesChangeRule {ebec}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebec}{l} {} {}
+\DeclareFontSeriesChangeRule {ebec}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebec}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebec}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebec}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebec}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebec}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebec}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebec}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebec}{x} {} {}
+\DeclareFontSeriesChangeRule {ebex}{?m} {} {}
+\DeclareFontSeriesChangeRule {ebex}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebex}{b} {} {}
+\DeclareFontSeriesChangeRule {ebex}{c} {} {}
+\DeclareFontSeriesChangeRule {ebex}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebex}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebex}{el} {} {}
+\DeclareFontSeriesChangeRule {ebex}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebex}{l} {} {}
+\DeclareFontSeriesChangeRule {ebex}{m?} {} {}
+\DeclareFontSeriesChangeRule {ebex}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebex}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebex}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebex}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebex}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebex}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebex}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebex}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebex}{x} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{b} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{c} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{el} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{l} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebsc}{x} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{b} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{c} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{el} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{l} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebsx}{x} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{?m} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{b} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{c} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{el} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{l} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{m?} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebuc}{x} {} {}
+\DeclareFontSeriesChangeRule {ebux}{?m} {} {}
+\DeclareFontSeriesChangeRule {ebux}{bx} {} {}
+\DeclareFontSeriesChangeRule {ebux}{b} {} {}
+\DeclareFontSeriesChangeRule {ebux}{c} {} {}
+\DeclareFontSeriesChangeRule {ebux}{eb} {} {}
+\DeclareFontSeriesChangeRule {ebux}{ec} {} {}
+\DeclareFontSeriesChangeRule {ebux}{el} {} {}
+\DeclareFontSeriesChangeRule {ebux}{ex} {} {}
+\DeclareFontSeriesChangeRule {ebux}{l} {} {}
+\DeclareFontSeriesChangeRule {ebux}{m?} {} {}
+\DeclareFontSeriesChangeRule {ebux}{sb} {} {}
+\DeclareFontSeriesChangeRule {ebux}{sc} {} {}
+\DeclareFontSeriesChangeRule {ebux}{sl} {} {}
+\DeclareFontSeriesChangeRule {ebux}{sx} {} {}
+\DeclareFontSeriesChangeRule {ebux}{ub} {} {}
+\DeclareFontSeriesChangeRule {ebux}{uc} {} {}
+\DeclareFontSeriesChangeRule {ebux}{ul} {} {}
+\DeclareFontSeriesChangeRule {ebux}{ux} {} {}
+\DeclareFontSeriesChangeRule {ebux}{x} {} {}
+\DeclareFontSeriesChangeRule {ebx}{bx} {} {}
\DeclareFontSeriesChangeRule {ebx}{b}{bx}{}
\DeclareFontSeriesChangeRule {ebx}{c}{ebc}{}
\DeclareFontSeriesChangeRule {ebx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ebx}{ec}{ebec}{}
\DeclareFontSeriesChangeRule {ebx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ebx}{ex} {} {}
\DeclareFontSeriesChangeRule {ebx}{l}{lx}{}
\DeclareFontSeriesChangeRule {ebx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ebx}{sc}{ebsc}{}
\DeclareFontSeriesChangeRule {ebx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ebx}{sx} {} {}
\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ebx}{uc} {} {}
\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ebx}{ux} {} {}
\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {eb}{bx} {} {}
\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
\DeclareFontSeriesChangeRule {eb}{ec}{ebec}{}
+\DeclareFontSeriesChangeRule {eb}{ex} {} {}
+\DeclareFontSeriesChangeRule {eb}{sb} {} {}
\DeclareFontSeriesChangeRule {eb}{sc}{ebsc}{}
+\DeclareFontSeriesChangeRule {eb}{sx} {} {}
+\DeclareFontSeriesChangeRule {eb}{ub} {} {}
+\DeclareFontSeriesChangeRule {eb}{uc} {} {}
+\DeclareFontSeriesChangeRule {eb}{ux} {} {}
\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {ec}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {ec}{b}{bec}{}
+\DeclareFontSeriesChangeRule {ec}{eb}{ebec}{}
+\DeclareFontSeriesChangeRule {ec}{el}{elec}{}
+\DeclareFontSeriesChangeRule {ec}{l}{lec}{}
+\DeclareFontSeriesChangeRule {ec}{sb}{sbec}{}
+\DeclareFontSeriesChangeRule {ec}{sl}{slec}{}
+\DeclareFontSeriesChangeRule {ec}{ub}{ubec}{}
+\DeclareFontSeriesChangeRule {ec}{x}{x}{m}
+\DeclareFontSeriesChangeRule {elc}{bx} {} {}
\DeclareFontSeriesChangeRule {elc}{b}{bc}{}
\DeclareFontSeriesChangeRule {elc}{c}{elc}{}
\DeclareFontSeriesChangeRule {elc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {elc}{ec}{elec}{}
\DeclareFontSeriesChangeRule {elc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {elc}{ex} {} {}
\DeclareFontSeriesChangeRule {elc}{l}{lc}{}
\DeclareFontSeriesChangeRule {elc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {elc}{sc}{elsc}{}
\DeclareFontSeriesChangeRule {elc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {elc}{sx} {} {}
\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {elc}{uc} {} {}
\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {elc}{ux} {} {}
\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
+\DeclareFontSeriesChangeRule {elec}{bx} {} {}
+\DeclareFontSeriesChangeRule {elec}{b} {} {}
+\DeclareFontSeriesChangeRule {elec}{c} {} {}
+\DeclareFontSeriesChangeRule {elec}{eb} {} {}
+\DeclareFontSeriesChangeRule {elec}{ec} {} {}
+\DeclareFontSeriesChangeRule {elec}{el} {} {}
+\DeclareFontSeriesChangeRule {elec}{ex} {} {}
+\DeclareFontSeriesChangeRule {elec}{l} {} {}
+\DeclareFontSeriesChangeRule {elec}{sb} {} {}
+\DeclareFontSeriesChangeRule {elec}{sc} {} {}
+\DeclareFontSeriesChangeRule {elec}{sl} {} {}
+\DeclareFontSeriesChangeRule {elec}{sx} {} {}
+\DeclareFontSeriesChangeRule {elec}{ub} {} {}
+\DeclareFontSeriesChangeRule {elec}{uc} {} {}
+\DeclareFontSeriesChangeRule {elec}{ul} {} {}
+\DeclareFontSeriesChangeRule {elec}{ux} {} {}
+\DeclareFontSeriesChangeRule {elec}{x} {} {}
+\DeclareFontSeriesChangeRule {elex}{?m} {} {}
+\DeclareFontSeriesChangeRule {elex}{bx} {} {}
+\DeclareFontSeriesChangeRule {elex}{b} {} {}
+\DeclareFontSeriesChangeRule {elex}{c} {} {}
+\DeclareFontSeriesChangeRule {elex}{eb} {} {}
+\DeclareFontSeriesChangeRule {elex}{ec} {} {}
+\DeclareFontSeriesChangeRule {elex}{el} {} {}
+\DeclareFontSeriesChangeRule {elex}{ex} {} {}
+\DeclareFontSeriesChangeRule {elex}{l} {} {}
+\DeclareFontSeriesChangeRule {elex}{m?} {} {}
+\DeclareFontSeriesChangeRule {elex}{sb} {} {}
+\DeclareFontSeriesChangeRule {elex}{sc} {} {}
+\DeclareFontSeriesChangeRule {elex}{sl} {} {}
+\DeclareFontSeriesChangeRule {elex}{sx} {} {}
+\DeclareFontSeriesChangeRule {elex}{ub} {} {}
+\DeclareFontSeriesChangeRule {elex}{uc} {} {}
+\DeclareFontSeriesChangeRule {elex}{ul} {} {}
+\DeclareFontSeriesChangeRule {elex}{ux} {} {}
+\DeclareFontSeriesChangeRule {elex}{x} {} {}
+\DeclareFontSeriesChangeRule {elsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {elsc}{b} {} {}
+\DeclareFontSeriesChangeRule {elsc}{c} {} {}
+\DeclareFontSeriesChangeRule {elsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {elsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {elsc}{el} {} {}
+\DeclareFontSeriesChangeRule {elsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {elsc}{l} {} {}
+\DeclareFontSeriesChangeRule {elsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {elsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {elsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {elsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {elsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {elsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {elsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {elsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {elsc}{x} {} {}
+\DeclareFontSeriesChangeRule {elsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {elsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {elsx}{b} {} {}
+\DeclareFontSeriesChangeRule {elsx}{c} {} {}
+\DeclareFontSeriesChangeRule {elsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {elsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {elsx}{el} {} {}
+\DeclareFontSeriesChangeRule {elsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {elsx}{l} {} {}
+\DeclareFontSeriesChangeRule {elsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {elsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {elsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {elsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {elsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {elsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {elsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {elsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {elsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {elsx}{x} {} {}
+\DeclareFontSeriesChangeRule {eluc}{?m} {} {}
+\DeclareFontSeriesChangeRule {eluc}{bx} {} {}
+\DeclareFontSeriesChangeRule {eluc}{b} {} {}
+\DeclareFontSeriesChangeRule {eluc}{c} {} {}
+\DeclareFontSeriesChangeRule {eluc}{eb} {} {}
+\DeclareFontSeriesChangeRule {eluc}{ec} {} {}
+\DeclareFontSeriesChangeRule {eluc}{el} {} {}
+\DeclareFontSeriesChangeRule {eluc}{ex} {} {}
+\DeclareFontSeriesChangeRule {eluc}{l} {} {}
+\DeclareFontSeriesChangeRule {eluc}{m?} {} {}
+\DeclareFontSeriesChangeRule {eluc}{sb} {} {}
+\DeclareFontSeriesChangeRule {eluc}{sc} {} {}
+\DeclareFontSeriesChangeRule {eluc}{sl} {} {}
+\DeclareFontSeriesChangeRule {eluc}{sx} {} {}
+\DeclareFontSeriesChangeRule {eluc}{ub} {} {}
+\DeclareFontSeriesChangeRule {eluc}{uc} {} {}
+\DeclareFontSeriesChangeRule {eluc}{ul} {} {}
+\DeclareFontSeriesChangeRule {eluc}{ux} {} {}
+\DeclareFontSeriesChangeRule {eluc}{x} {} {}
+\DeclareFontSeriesChangeRule {elux}{?m} {} {}
+\DeclareFontSeriesChangeRule {elux}{bx} {} {}
+\DeclareFontSeriesChangeRule {elux}{b} {} {}
+\DeclareFontSeriesChangeRule {elux}{c} {} {}
+\DeclareFontSeriesChangeRule {elux}{eb} {} {}
+\DeclareFontSeriesChangeRule {elux}{ec} {} {}
+\DeclareFontSeriesChangeRule {elux}{el} {} {}
+\DeclareFontSeriesChangeRule {elux}{ex} {} {}
+\DeclareFontSeriesChangeRule {elux}{l} {} {}
+\DeclareFontSeriesChangeRule {elux}{m?} {} {}
+\DeclareFontSeriesChangeRule {elux}{sb} {} {}
+\DeclareFontSeriesChangeRule {elux}{sc} {} {}
+\DeclareFontSeriesChangeRule {elux}{sl} {} {}
+\DeclareFontSeriesChangeRule {elux}{sx} {} {}
+\DeclareFontSeriesChangeRule {elux}{ub} {} {}
+\DeclareFontSeriesChangeRule {elux}{uc} {} {}
+\DeclareFontSeriesChangeRule {elux}{ul} {} {}
+\DeclareFontSeriesChangeRule {elux}{ux} {} {}
+\DeclareFontSeriesChangeRule {elux}{x} {} {}
+\DeclareFontSeriesChangeRule {elx}{bx} {} {}
\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
\DeclareFontSeriesChangeRule {elx}{c}{elc}{}
\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {elx}{ec}{elec}{}
\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {elx}{ex} {} {}
\DeclareFontSeriesChangeRule {elx}{l}{lx}{}
\DeclareFontSeriesChangeRule {elx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {elx}{sc}{elsc}{}
\DeclareFontSeriesChangeRule {elx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {elx}{sx} {} {}
\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {elx}{uc} {} {}
\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {elx}{ux} {} {}
\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
+\DeclareFontSeriesChangeRule {el}{bx} {} {}
\DeclareFontSeriesChangeRule {el}{c}{elc}{}
+\DeclareFontSeriesChangeRule {el}{eb} {} {}
\DeclareFontSeriesChangeRule {el}{ec}{elec}{}
+\DeclareFontSeriesChangeRule {el}{ex} {} {}
+\DeclareFontSeriesChangeRule {el}{sb} {} {}
\DeclareFontSeriesChangeRule {el}{sc}{elsc}{}
+\DeclareFontSeriesChangeRule {el}{sx} {} {}
+\DeclareFontSeriesChangeRule {el}{ub} {} {}
+\DeclareFontSeriesChangeRule {el}{uc} {} {}
+\DeclareFontSeriesChangeRule {el}{ux} {} {}
\DeclareFontSeriesChangeRule {el}{x}{elx}{}
+\DeclareFontSeriesChangeRule {ex}{?m} {} {}
+\DeclareFontSeriesChangeRule {ex}{bx} {} {}
+\DeclareFontSeriesChangeRule {ex}{b} {} {}
+\DeclareFontSeriesChangeRule {ex}{eb} {} {}
+\DeclareFontSeriesChangeRule {ex}{el} {} {}
+\DeclareFontSeriesChangeRule {ex}{l} {} {}
+\DeclareFontSeriesChangeRule {ex}{m?} {} {}
+\DeclareFontSeriesChangeRule {ex}{sb} {} {}
+\DeclareFontSeriesChangeRule {ex}{sl} {} {}
+\DeclareFontSeriesChangeRule {ex}{ub} {} {}
+\DeclareFontSeriesChangeRule {ex}{ul} {} {}
+\DeclareFontSeriesChangeRule {lc}{bx} {} {}
\DeclareFontSeriesChangeRule {lc}{b}{bc}{}
\DeclareFontSeriesChangeRule {lc}{c}{lc}{}
\DeclareFontSeriesChangeRule {lc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {lc}{ec}{lec}{}
\DeclareFontSeriesChangeRule {lc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {lc}{ex} {} {}
\DeclareFontSeriesChangeRule {lc}{l}{lc}{}
\DeclareFontSeriesChangeRule {lc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {lc}{sc}{lsc}{}
\DeclareFontSeriesChangeRule {lc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {lc}{sx} {} {}
\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {lc}{uc} {} {}
\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {lc}{ux} {} {}
\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
+\DeclareFontSeriesChangeRule {lec}{bx} {} {}
+\DeclareFontSeriesChangeRule {lec}{b} {} {}
+\DeclareFontSeriesChangeRule {lec}{c} {} {}
+\DeclareFontSeriesChangeRule {lec}{eb} {} {}
+\DeclareFontSeriesChangeRule {lec}{ec} {} {}
+\DeclareFontSeriesChangeRule {lec}{el} {} {}
+\DeclareFontSeriesChangeRule {lec}{ex} {} {}
+\DeclareFontSeriesChangeRule {lec}{l} {} {}
+\DeclareFontSeriesChangeRule {lec}{sb} {} {}
+\DeclareFontSeriesChangeRule {lec}{sc} {} {}
+\DeclareFontSeriesChangeRule {lec}{sl} {} {}
+\DeclareFontSeriesChangeRule {lec}{sx} {} {}
+\DeclareFontSeriesChangeRule {lec}{ub} {} {}
+\DeclareFontSeriesChangeRule {lec}{uc} {} {}
+\DeclareFontSeriesChangeRule {lec}{ul} {} {}
+\DeclareFontSeriesChangeRule {lec}{ux} {} {}
+\DeclareFontSeriesChangeRule {lec}{x} {} {}
+\DeclareFontSeriesChangeRule {lex}{?m} {} {}
+\DeclareFontSeriesChangeRule {lex}{bx} {} {}
+\DeclareFontSeriesChangeRule {lex}{b} {} {}
+\DeclareFontSeriesChangeRule {lex}{c} {} {}
+\DeclareFontSeriesChangeRule {lex}{eb} {} {}
+\DeclareFontSeriesChangeRule {lex}{ec} {} {}
+\DeclareFontSeriesChangeRule {lex}{el} {} {}
+\DeclareFontSeriesChangeRule {lex}{ex} {} {}
+\DeclareFontSeriesChangeRule {lex}{l} {} {}
+\DeclareFontSeriesChangeRule {lex}{m?} {} {}
+\DeclareFontSeriesChangeRule {lex}{sb} {} {}
+\DeclareFontSeriesChangeRule {lex}{sc} {} {}
+\DeclareFontSeriesChangeRule {lex}{sl} {} {}
+\DeclareFontSeriesChangeRule {lex}{sx} {} {}
+\DeclareFontSeriesChangeRule {lex}{ub} {} {}
+\DeclareFontSeriesChangeRule {lex}{uc} {} {}
+\DeclareFontSeriesChangeRule {lex}{ul} {} {}
+\DeclareFontSeriesChangeRule {lex}{ux} {} {}
+\DeclareFontSeriesChangeRule {lex}{x} {} {}
+\DeclareFontSeriesChangeRule {lsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {lsc}{b} {} {}
+\DeclareFontSeriesChangeRule {lsc}{c} {} {}
+\DeclareFontSeriesChangeRule {lsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {lsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {lsc}{el} {} {}
+\DeclareFontSeriesChangeRule {lsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {lsc}{l} {} {}
+\DeclareFontSeriesChangeRule {lsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {lsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {lsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {lsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {lsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {lsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {lsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {lsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {lsc}{x} {} {}
+\DeclareFontSeriesChangeRule {lsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {lsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {lsx}{b} {} {}
+\DeclareFontSeriesChangeRule {lsx}{c} {} {}
+\DeclareFontSeriesChangeRule {lsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {lsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {lsx}{el} {} {}
+\DeclareFontSeriesChangeRule {lsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {lsx}{l} {} {}
+\DeclareFontSeriesChangeRule {lsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {lsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {lsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {lsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {lsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {lsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {lsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {lsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {lsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {lsx}{x} {} {}
+\DeclareFontSeriesChangeRule {luc}{?m} {} {}
+\DeclareFontSeriesChangeRule {luc}{bx} {} {}
+\DeclareFontSeriesChangeRule {luc}{b} {} {}
+\DeclareFontSeriesChangeRule {luc}{c} {} {}
+\DeclareFontSeriesChangeRule {luc}{eb} {} {}
+\DeclareFontSeriesChangeRule {luc}{ec} {} {}
+\DeclareFontSeriesChangeRule {luc}{el} {} {}
+\DeclareFontSeriesChangeRule {luc}{ex} {} {}
+\DeclareFontSeriesChangeRule {luc}{l} {} {}
+\DeclareFontSeriesChangeRule {luc}{m?} {} {}
+\DeclareFontSeriesChangeRule {luc}{sb} {} {}
+\DeclareFontSeriesChangeRule {luc}{sc} {} {}
+\DeclareFontSeriesChangeRule {luc}{sl} {} {}
+\DeclareFontSeriesChangeRule {luc}{sx} {} {}
+\DeclareFontSeriesChangeRule {luc}{ub} {} {}
+\DeclareFontSeriesChangeRule {luc}{uc} {} {}
+\DeclareFontSeriesChangeRule {luc}{ul} {} {}
+\DeclareFontSeriesChangeRule {luc}{ux} {} {}
+\DeclareFontSeriesChangeRule {luc}{x} {} {}
+\DeclareFontSeriesChangeRule {lux}{?m} {} {}
+\DeclareFontSeriesChangeRule {lux}{bx} {} {}
+\DeclareFontSeriesChangeRule {lux}{b} {} {}
+\DeclareFontSeriesChangeRule {lux}{c} {} {}
+\DeclareFontSeriesChangeRule {lux}{eb} {} {}
+\DeclareFontSeriesChangeRule {lux}{ec} {} {}
+\DeclareFontSeriesChangeRule {lux}{el} {} {}
+\DeclareFontSeriesChangeRule {lux}{ex} {} {}
+\DeclareFontSeriesChangeRule {lux}{l} {} {}
+\DeclareFontSeriesChangeRule {lux}{m?} {} {}
+\DeclareFontSeriesChangeRule {lux}{sb} {} {}
+\DeclareFontSeriesChangeRule {lux}{sc} {} {}
+\DeclareFontSeriesChangeRule {lux}{sl} {} {}
+\DeclareFontSeriesChangeRule {lux}{sx} {} {}
+\DeclareFontSeriesChangeRule {lux}{ub} {} {}
+\DeclareFontSeriesChangeRule {lux}{uc} {} {}
+\DeclareFontSeriesChangeRule {lux}{ul} {} {}
+\DeclareFontSeriesChangeRule {lux}{ux} {} {}
+\DeclareFontSeriesChangeRule {lux}{x} {} {}
+\DeclareFontSeriesChangeRule {lx}{bx} {} {}
\DeclareFontSeriesChangeRule {lx}{b}{bx}{}
\DeclareFontSeriesChangeRule {lx}{c}{lc}{}
\DeclareFontSeriesChangeRule {lx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {lx}{ec}{lec}{}
\DeclareFontSeriesChangeRule {lx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {lx}{ex} {} {}
\DeclareFontSeriesChangeRule {lx}{l}{lx}{}
\DeclareFontSeriesChangeRule {lx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {lx}{sc}{lsc}{}
\DeclareFontSeriesChangeRule {lx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {lx}{sx} {} {}
\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {lx}{uc} {} {}
\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {lx}{ux} {} {}
\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
-\DeclareFontSeriesChangeRule {l}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {l}{b} {b} {bx} %<-----
-\DeclareFontSeriesChangeRule {l}{c} {lc} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{ec} {lec} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{sb} {sb} {b} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{sc} {lsc} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{x} {lx} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {m}{bx} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {m}{b} {b} {bx} %<-----
-\DeclareFontSeriesChangeRule {m}{c} {c} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{ec} {ec} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{l} {l} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{sb} {sb} {b} %<-----
-\DeclareFontSeriesChangeRule {m}{sc} {sc} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{x} {x} {m} %<-----
+\DeclareFontSeriesChangeRule {l}{b} {b} {bx}
+\DeclareFontSeriesChangeRule {l}{c} {lc} {l}
+\DeclareFontSeriesChangeRule {l}{eb} {} {}
+\DeclareFontSeriesChangeRule {l}{ec} {lec} {l}
+\DeclareFontSeriesChangeRule {l}{ex} {} {}
+\DeclareFontSeriesChangeRule {l}{sb} {sb} {b}
+\DeclareFontSeriesChangeRule {l}{sc} {lsc} {l}
+\DeclareFontSeriesChangeRule {l}{sx} {} {}
+\DeclareFontSeriesChangeRule {l}{ub} {} {}
+\DeclareFontSeriesChangeRule {l}{uc} {} {}
+\DeclareFontSeriesChangeRule {l}{ux} {} {}
+\DeclareFontSeriesChangeRule {l}{x} {lx} {l}
+\DeclareFontSeriesChangeRule {m}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {m}{c} {c} {m}
+\DeclareFontSeriesChangeRule {m}{l} {l} {m}
+\DeclareFontSeriesChangeRule {m}{sc} {sc} {m}
+\DeclareFontSeriesChangeRule {m}{x} {x} {m}
+\DeclareFontSeriesChangeRule {sbc}{bx} {} {}
\DeclareFontSeriesChangeRule {sbc}{b}{bc}{}
\DeclareFontSeriesChangeRule {sbc}{c}{sbc}{}
\DeclareFontSeriesChangeRule {sbc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {sbc}{ec}{sbec}{sbc}
\DeclareFontSeriesChangeRule {sbc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {sbc}{ex} {} {}
\DeclareFontSeriesChangeRule {sbc}{l}{lc}{}
\DeclareFontSeriesChangeRule {sbc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {sbc}{sc}{sbsc}{sbc}
\DeclareFontSeriesChangeRule {sbc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {sbc}{sx} {} {}
\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {sbc}{uc} {} {}
\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {sbc}{ux} {} {}
\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
+\DeclareFontSeriesChangeRule {sbec}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbec}{b} {} {}
+\DeclareFontSeriesChangeRule {sbec}{c} {} {}
+\DeclareFontSeriesChangeRule {sbec}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbec}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbec}{el} {} {}
+\DeclareFontSeriesChangeRule {sbec}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbec}{l} {} {}
+\DeclareFontSeriesChangeRule {sbec}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbec}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbec}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbec}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbec}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbec}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbec}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbec}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbec}{x} {} {}
+\DeclareFontSeriesChangeRule {sbex}{?m} {} {}
+\DeclareFontSeriesChangeRule {sbex}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbex}{b} {} {}
+\DeclareFontSeriesChangeRule {sbex}{c} {} {}
+\DeclareFontSeriesChangeRule {sbex}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbex}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbex}{el} {} {}
+\DeclareFontSeriesChangeRule {sbex}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbex}{l} {} {}
+\DeclareFontSeriesChangeRule {sbex}{m?} {} {}
+\DeclareFontSeriesChangeRule {sbex}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbex}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbex}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbex}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbex}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbex}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbex}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbex}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbex}{x} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{b} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{c} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{el} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{l} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbsc}{x} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{b} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{c} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{el} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{l} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbsx}{x} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{?m} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{b} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{c} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{el} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{l} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{m?} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbuc}{x} {} {}
+\DeclareFontSeriesChangeRule {sbux}{?m} {} {}
+\DeclareFontSeriesChangeRule {sbux}{bx} {} {}
+\DeclareFontSeriesChangeRule {sbux}{b} {} {}
+\DeclareFontSeriesChangeRule {sbux}{c} {} {}
+\DeclareFontSeriesChangeRule {sbux}{eb} {} {}
+\DeclareFontSeriesChangeRule {sbux}{ec} {} {}
+\DeclareFontSeriesChangeRule {sbux}{el} {} {}
+\DeclareFontSeriesChangeRule {sbux}{ex} {} {}
+\DeclareFontSeriesChangeRule {sbux}{l} {} {}
+\DeclareFontSeriesChangeRule {sbux}{m?} {} {}
+\DeclareFontSeriesChangeRule {sbux}{sb} {} {}
+\DeclareFontSeriesChangeRule {sbux}{sc} {} {}
+\DeclareFontSeriesChangeRule {sbux}{sl} {} {}
+\DeclareFontSeriesChangeRule {sbux}{sx} {} {}
+\DeclareFontSeriesChangeRule {sbux}{ub} {} {}
+\DeclareFontSeriesChangeRule {sbux}{uc} {} {}
+\DeclareFontSeriesChangeRule {sbux}{ul} {} {}
+\DeclareFontSeriesChangeRule {sbux}{ux} {} {}
+\DeclareFontSeriesChangeRule {sbux}{x} {} {}
+\DeclareFontSeriesChangeRule {sbx}{bx} {} {}
\DeclareFontSeriesChangeRule {sbx}{b}{bx}{}
\DeclareFontSeriesChangeRule {sbx}{c}{sbc}{}
\DeclareFontSeriesChangeRule {sbx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {sbx}{ec}{sbec}{}
\DeclareFontSeriesChangeRule {sbx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {sbx}{ex} {} {}
\DeclareFontSeriesChangeRule {sbx}{l}{lx}{}
\DeclareFontSeriesChangeRule {sbx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {sbx}{sc}{sbsc}{}
\DeclareFontSeriesChangeRule {sbx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {sbx}{sx} {} {}
\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {sbx}{uc} {} {}
\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {sbx}{ux} {} {}
\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
-\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {sbc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {sbc} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx} %? %<-----
+\DeclareFontSeriesChangeRule {sb}{bx} {} {}
+\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc}
+\DeclareFontSeriesChangeRule {sb}{eb} {} {}
+\DeclareFontSeriesChangeRule {sb}{ec} {sbec} {sbc}
+\DeclareFontSeriesChangeRule {sb}{ex} {} {}
+\DeclareFontSeriesChangeRule {sb}{sc} {sbsc} {sbc}
+\DeclareFontSeriesChangeRule {sb}{sx} {} {}
+\DeclareFontSeriesChangeRule {sb}{ub} {} {}
+\DeclareFontSeriesChangeRule {sb}{uc} {} {}
+\DeclareFontSeriesChangeRule {sb}{ux} {} {}
+\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx}
+\DeclareFontSeriesChangeRule {sc}{bx} {bx} {b}
+\DeclareFontSeriesChangeRule {sc}{b}{bsc}{}
+\DeclareFontSeriesChangeRule {sc}{eb}{ebsc}{}
+\DeclareFontSeriesChangeRule {sc}{el}{elsc}{}
+\DeclareFontSeriesChangeRule {sc}{l}{lsc}{}
+\DeclareFontSeriesChangeRule {sc}{sb}{sbsc}{}
+\DeclareFontSeriesChangeRule {sc}{sl}{slsc}{}
+\DeclareFontSeriesChangeRule {sc}{ub}{ubsc}{}
+\DeclareFontSeriesChangeRule {sc}{x}{x}{m}
+\DeclareFontSeriesChangeRule {slc}{bx} {} {}
\DeclareFontSeriesChangeRule {slc}{b}{bc}{}
\DeclareFontSeriesChangeRule {slc}{c}{slc}{}
\DeclareFontSeriesChangeRule {slc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {slc}{ec}{slec}{}
\DeclareFontSeriesChangeRule {slc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {slc}{ex} {} {}
\DeclareFontSeriesChangeRule {slc}{l}{lc}{}
\DeclareFontSeriesChangeRule {slc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {slc}{sc}{slsc}{}
\DeclareFontSeriesChangeRule {slc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {slc}{sx} {} {}
\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {slc}{uc} {} {}
\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {slc}{ux} {} {}
\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
+\DeclareFontSeriesChangeRule {slec}{bx} {} {}
+\DeclareFontSeriesChangeRule {slec}{b} {} {}
+\DeclareFontSeriesChangeRule {slec}{c} {} {}
+\DeclareFontSeriesChangeRule {slec}{eb} {} {}
+\DeclareFontSeriesChangeRule {slec}{ec} {} {}
+\DeclareFontSeriesChangeRule {slec}{el} {} {}
+\DeclareFontSeriesChangeRule {slec}{ex} {} {}
+\DeclareFontSeriesChangeRule {slec}{l} {} {}
+\DeclareFontSeriesChangeRule {slec}{sb} {} {}
+\DeclareFontSeriesChangeRule {slec}{sc} {} {}
+\DeclareFontSeriesChangeRule {slec}{sl} {} {}
+\DeclareFontSeriesChangeRule {slec}{sx} {} {}
+\DeclareFontSeriesChangeRule {slec}{ub} {} {}
+\DeclareFontSeriesChangeRule {slec}{uc} {} {}
+\DeclareFontSeriesChangeRule {slec}{ul} {} {}
+\DeclareFontSeriesChangeRule {slec}{ux} {} {}
+\DeclareFontSeriesChangeRule {slec}{x} {} {}
+\DeclareFontSeriesChangeRule {slex}{?m} {} {}
+\DeclareFontSeriesChangeRule {slex}{bx} {} {}
+\DeclareFontSeriesChangeRule {slex}{b} {} {}
+\DeclareFontSeriesChangeRule {slex}{c} {} {}
+\DeclareFontSeriesChangeRule {slex}{eb} {} {}
+\DeclareFontSeriesChangeRule {slex}{ec} {} {}
+\DeclareFontSeriesChangeRule {slex}{el} {} {}
+\DeclareFontSeriesChangeRule {slex}{ex} {} {}
+\DeclareFontSeriesChangeRule {slex}{l} {} {}
+\DeclareFontSeriesChangeRule {slex}{m?} {} {}
+\DeclareFontSeriesChangeRule {slex}{sb} {} {}
+\DeclareFontSeriesChangeRule {slex}{sc} {} {}
+\DeclareFontSeriesChangeRule {slex}{sl} {} {}
+\DeclareFontSeriesChangeRule {slex}{sx} {} {}
+\DeclareFontSeriesChangeRule {slex}{ub} {} {}
+\DeclareFontSeriesChangeRule {slex}{uc} {} {}
+\DeclareFontSeriesChangeRule {slex}{ul} {} {}
+\DeclareFontSeriesChangeRule {slex}{ux} {} {}
+\DeclareFontSeriesChangeRule {slex}{x} {} {}
+\DeclareFontSeriesChangeRule {slsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {slsc}{b} {} {}
+\DeclareFontSeriesChangeRule {slsc}{c} {} {}
+\DeclareFontSeriesChangeRule {slsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {slsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {slsc}{el} {} {}
+\DeclareFontSeriesChangeRule {slsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {slsc}{l} {} {}
+\DeclareFontSeriesChangeRule {slsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {slsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {slsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {slsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {slsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {slsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {slsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {slsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {slsc}{x} {} {}
+\DeclareFontSeriesChangeRule {slsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {slsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {slsx}{b} {} {}
+\DeclareFontSeriesChangeRule {slsx}{c} {} {}
+\DeclareFontSeriesChangeRule {slsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {slsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {slsx}{el} {} {}
+\DeclareFontSeriesChangeRule {slsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {slsx}{l} {} {}
+\DeclareFontSeriesChangeRule {slsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {slsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {slsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {slsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {slsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {slsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {slsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {slsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {slsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {slsx}{x} {} {}
+\DeclareFontSeriesChangeRule {sluc}{?m} {} {}
+\DeclareFontSeriesChangeRule {sluc}{bx} {} {}
+\DeclareFontSeriesChangeRule {sluc}{b} {} {}
+\DeclareFontSeriesChangeRule {sluc}{c} {} {}
+\DeclareFontSeriesChangeRule {sluc}{eb} {} {}
+\DeclareFontSeriesChangeRule {sluc}{ec} {} {}
+\DeclareFontSeriesChangeRule {sluc}{el} {} {}
+\DeclareFontSeriesChangeRule {sluc}{ex} {} {}
+\DeclareFontSeriesChangeRule {sluc}{l} {} {}
+\DeclareFontSeriesChangeRule {sluc}{m?} {} {}
+\DeclareFontSeriesChangeRule {sluc}{sb} {} {}
+\DeclareFontSeriesChangeRule {sluc}{sc} {} {}
+\DeclareFontSeriesChangeRule {sluc}{sl} {} {}
+\DeclareFontSeriesChangeRule {sluc}{sx} {} {}
+\DeclareFontSeriesChangeRule {sluc}{ub} {} {}
+\DeclareFontSeriesChangeRule {sluc}{uc} {} {}
+\DeclareFontSeriesChangeRule {sluc}{ul} {} {}
+\DeclareFontSeriesChangeRule {sluc}{ux} {} {}
+\DeclareFontSeriesChangeRule {sluc}{x} {} {}
+\DeclareFontSeriesChangeRule {slux}{?m} {} {}
+\DeclareFontSeriesChangeRule {slux}{bx} {} {}
+\DeclareFontSeriesChangeRule {slux}{b} {} {}
+\DeclareFontSeriesChangeRule {slux}{c} {} {}
+\DeclareFontSeriesChangeRule {slux}{eb} {} {}
+\DeclareFontSeriesChangeRule {slux}{ec} {} {}
+\DeclareFontSeriesChangeRule {slux}{el} {} {}
+\DeclareFontSeriesChangeRule {slux}{ex} {} {}
+\DeclareFontSeriesChangeRule {slux}{l} {} {}
+\DeclareFontSeriesChangeRule {slux}{m?} {} {}
+\DeclareFontSeriesChangeRule {slux}{sb} {} {}
+\DeclareFontSeriesChangeRule {slux}{sc} {} {}
+\DeclareFontSeriesChangeRule {slux}{sl} {} {}
+\DeclareFontSeriesChangeRule {slux}{sx} {} {}
+\DeclareFontSeriesChangeRule {slux}{ub} {} {}
+\DeclareFontSeriesChangeRule {slux}{uc} {} {}
+\DeclareFontSeriesChangeRule {slux}{ul} {} {}
+\DeclareFontSeriesChangeRule {slux}{ux} {} {}
+\DeclareFontSeriesChangeRule {slux}{x} {} {}
+\DeclareFontSeriesChangeRule {slx}{bx} {} {}
\DeclareFontSeriesChangeRule {slx}{b}{bx}{}
\DeclareFontSeriesChangeRule {slx}{c}{slc}{}
\DeclareFontSeriesChangeRule {slx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {slx}{ec}{slec}{}
\DeclareFontSeriesChangeRule {slx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {slx}{ex} {} {}
\DeclareFontSeriesChangeRule {slx}{l}{lx}{}
\DeclareFontSeriesChangeRule {slx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {slx}{sc}{slsc}{}
\DeclareFontSeriesChangeRule {slx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {slx}{sx} {} {}
\DeclareFontSeriesChangeRule {slx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {slx}{uc} {} {}
\DeclareFontSeriesChangeRule {slx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {slx}{ux} {} {}
\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
+\DeclareFontSeriesChangeRule {sl}{bx} {} {}
\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
+\DeclareFontSeriesChangeRule {sl}{eb} {} {}
\DeclareFontSeriesChangeRule {sl}{ec}{slec}{}
+\DeclareFontSeriesChangeRule {sl}{ex} {} {}
+\DeclareFontSeriesChangeRule {sl}{sb} {} {}
\DeclareFontSeriesChangeRule {sl}{sc}{slsc}{}
+\DeclareFontSeriesChangeRule {sl}{sx} {} {}
+\DeclareFontSeriesChangeRule {sl}{ub} {} {}
+\DeclareFontSeriesChangeRule {sl}{uc} {} {}
+\DeclareFontSeriesChangeRule {sl}{ux} {} {}
\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
+\DeclareFontSeriesChangeRule {sx}{?m} {} {}
+\DeclareFontSeriesChangeRule {sx}{bx} {} {}
+\DeclareFontSeriesChangeRule {sx}{b} {} {}
+\DeclareFontSeriesChangeRule {sx}{eb} {} {}
+\DeclareFontSeriesChangeRule {sx}{el} {} {}
+\DeclareFontSeriesChangeRule {sx}{l} {} {}
+\DeclareFontSeriesChangeRule {sx}{m?} {} {}
+\DeclareFontSeriesChangeRule {sx}{sb} {} {}
+\DeclareFontSeriesChangeRule {sx}{sl} {} {}
+\DeclareFontSeriesChangeRule {sx}{ub} {} {}
+\DeclareFontSeriesChangeRule {sx}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubc}{bx} {} {}
\DeclareFontSeriesChangeRule {ubc}{b}{bc}{}
\DeclareFontSeriesChangeRule {ubc}{c}{ubc}{}
\DeclareFontSeriesChangeRule {ubc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ubc}{ec}{ubec}{}
\DeclareFontSeriesChangeRule {ubc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ubc}{ex} {} {}
\DeclareFontSeriesChangeRule {ubc}{l}{lc}{}
\DeclareFontSeriesChangeRule {ubc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ubc}{sc}{ubsc}{}
\DeclareFontSeriesChangeRule {ubc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ubc}{sx} {} {}
\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ubc}{uc} {} {}
\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ubc}{ux} {} {}
\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {ubec}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubec}{b} {} {}
+\DeclareFontSeriesChangeRule {ubec}{c} {} {}
+\DeclareFontSeriesChangeRule {ubec}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubec}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubec}{el} {} {}
+\DeclareFontSeriesChangeRule {ubec}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubec}{l} {} {}
+\DeclareFontSeriesChangeRule {ubec}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubec}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubec}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubec}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubec}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubec}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubec}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubec}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubec}{x} {} {}
+\DeclareFontSeriesChangeRule {ubex}{?m} {} {}
+\DeclareFontSeriesChangeRule {ubex}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubex}{b} {} {}
+\DeclareFontSeriesChangeRule {ubex}{c} {} {}
+\DeclareFontSeriesChangeRule {ubex}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubex}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubex}{el} {} {}
+\DeclareFontSeriesChangeRule {ubex}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubex}{l} {} {}
+\DeclareFontSeriesChangeRule {ubex}{m?} {} {}
+\DeclareFontSeriesChangeRule {ubex}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubex}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubex}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubex}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubex}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubex}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubex}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubex}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubex}{x} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{b} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{c} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{el} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{l} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubsc}{x} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{b} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{c} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{el} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{l} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubsx}{x} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{?m} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{b} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{c} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{el} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{l} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{m?} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubuc}{x} {} {}
+\DeclareFontSeriesChangeRule {ubux}{?m} {} {}
+\DeclareFontSeriesChangeRule {ubux}{bx} {} {}
+\DeclareFontSeriesChangeRule {ubux}{b} {} {}
+\DeclareFontSeriesChangeRule {ubux}{c} {} {}
+\DeclareFontSeriesChangeRule {ubux}{eb} {} {}
+\DeclareFontSeriesChangeRule {ubux}{ec} {} {}
+\DeclareFontSeriesChangeRule {ubux}{el} {} {}
+\DeclareFontSeriesChangeRule {ubux}{ex} {} {}
+\DeclareFontSeriesChangeRule {ubux}{l} {} {}
+\DeclareFontSeriesChangeRule {ubux}{m?} {} {}
+\DeclareFontSeriesChangeRule {ubux}{sb} {} {}
+\DeclareFontSeriesChangeRule {ubux}{sc} {} {}
+\DeclareFontSeriesChangeRule {ubux}{sl} {} {}
+\DeclareFontSeriesChangeRule {ubux}{sx} {} {}
+\DeclareFontSeriesChangeRule {ubux}{ub} {} {}
+\DeclareFontSeriesChangeRule {ubux}{uc} {} {}
+\DeclareFontSeriesChangeRule {ubux}{ul} {} {}
+\DeclareFontSeriesChangeRule {ubux}{ux} {} {}
+\DeclareFontSeriesChangeRule {ubux}{x} {} {}
+\DeclareFontSeriesChangeRule {ubx}{bx} {} {}
\DeclareFontSeriesChangeRule {ubx}{b}{bx}{}
\DeclareFontSeriesChangeRule {ubx}{c}{ubc}{}
\DeclareFontSeriesChangeRule {ubx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ubx}{ec}{ubec}{}
\DeclareFontSeriesChangeRule {ubx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ubx}{ex} {} {}
\DeclareFontSeriesChangeRule {ubx}{l}{lx}{}
\DeclareFontSeriesChangeRule {ubx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ubx}{sc}{ubsc}{}
\DeclareFontSeriesChangeRule {ubx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ubx}{sx} {} {}
\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ubx}{uc} {} {}
\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ubx}{ux} {} {}
\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {ub}{bx} {} {}
\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
+\DeclareFontSeriesChangeRule {ub}{eb} {} {}
\DeclareFontSeriesChangeRule {ub}{ec}{ubec}{}
+\DeclareFontSeriesChangeRule {ub}{ex} {} {}
+\DeclareFontSeriesChangeRule {ub}{sb} {} {}
\DeclareFontSeriesChangeRule {ub}{sc}{ubsc}{}
+\DeclareFontSeriesChangeRule {ub}{sx} {} {}
+\DeclareFontSeriesChangeRule {ub}{uc} {} {}
+\DeclareFontSeriesChangeRule {ub}{ux} {} {}
\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {uc}{?m} {} {}
+\DeclareFontSeriesChangeRule {uc}{bx} {} {}
+\DeclareFontSeriesChangeRule {uc}{b} {} {}
+\DeclareFontSeriesChangeRule {uc}{eb} {} {}
+\DeclareFontSeriesChangeRule {uc}{el} {} {}
+\DeclareFontSeriesChangeRule {uc}{l} {} {}
+\DeclareFontSeriesChangeRule {uc}{m?} {} {}
+\DeclareFontSeriesChangeRule {uc}{sb} {} {}
+\DeclareFontSeriesChangeRule {uc}{sl} {} {}
+\DeclareFontSeriesChangeRule {uc}{ub} {} {}
+\DeclareFontSeriesChangeRule {uc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulc}{bx} {} {}
\DeclareFontSeriesChangeRule {ulc}{b}{bc}{}
\DeclareFontSeriesChangeRule {ulc}{c}{ulc}{}
\DeclareFontSeriesChangeRule {ulc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ulc}{ec}{ulec}{ulc}
\DeclareFontSeriesChangeRule {ulc}{el}{elc}{}
+\DeclareFontSeriesChangeRule {ulc}{ex} {} {}
\DeclareFontSeriesChangeRule {ulc}{l}{lc}{}
\DeclareFontSeriesChangeRule {ulc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ulc}{sc}{ulsc}{ulc}
\DeclareFontSeriesChangeRule {ulc}{sl}{slc}{}
+\DeclareFontSeriesChangeRule {ulc}{sx} {} {}
\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
+\DeclareFontSeriesChangeRule {ulc}{uc} {} {}
\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
+\DeclareFontSeriesChangeRule {ulc}{ux} {} {}
\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
+\DeclareFontSeriesChangeRule {ulec}{bx} {} {}
+\DeclareFontSeriesChangeRule {ulec}{b} {} {}
+\DeclareFontSeriesChangeRule {ulec}{c} {} {}
+\DeclareFontSeriesChangeRule {ulec}{eb} {} {}
+\DeclareFontSeriesChangeRule {ulec}{ec} {} {}
+\DeclareFontSeriesChangeRule {ulec}{el} {} {}
+\DeclareFontSeriesChangeRule {ulec}{ex} {} {}
+\DeclareFontSeriesChangeRule {ulec}{l} {} {}
+\DeclareFontSeriesChangeRule {ulec}{sb} {} {}
+\DeclareFontSeriesChangeRule {ulec}{sc} {} {}
+\DeclareFontSeriesChangeRule {ulec}{sl} {} {}
+\DeclareFontSeriesChangeRule {ulec}{sx} {} {}
+\DeclareFontSeriesChangeRule {ulec}{ub} {} {}
+\DeclareFontSeriesChangeRule {ulec}{uc} {} {}
+\DeclareFontSeriesChangeRule {ulec}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulec}{ux} {} {}
+\DeclareFontSeriesChangeRule {ulec}{x} {} {}
+\DeclareFontSeriesChangeRule {ulex}{?m} {} {}
+\DeclareFontSeriesChangeRule {ulex}{bx} {} {}
+\DeclareFontSeriesChangeRule {ulex}{b} {} {}
+\DeclareFontSeriesChangeRule {ulex}{c} {} {}
+\DeclareFontSeriesChangeRule {ulex}{eb} {} {}
+\DeclareFontSeriesChangeRule {ulex}{ec} {} {}
+\DeclareFontSeriesChangeRule {ulex}{el} {} {}
+\DeclareFontSeriesChangeRule {ulex}{ex} {} {}
+\DeclareFontSeriesChangeRule {ulex}{l} {} {}
+\DeclareFontSeriesChangeRule {ulex}{m?} {} {}
+\DeclareFontSeriesChangeRule {ulex}{sb} {} {}
+\DeclareFontSeriesChangeRule {ulex}{sc} {} {}
+\DeclareFontSeriesChangeRule {ulex}{sl} {} {}
+\DeclareFontSeriesChangeRule {ulex}{sx} {} {}
+\DeclareFontSeriesChangeRule {ulex}{ub} {} {}
+\DeclareFontSeriesChangeRule {ulex}{uc} {} {}
+\DeclareFontSeriesChangeRule {ulex}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulex}{ux} {} {}
+\DeclareFontSeriesChangeRule {ulex}{x} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{bx} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{b} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{c} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{eb} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{ec} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{el} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{ex} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{l} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{sb} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{sc} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{sl} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{sx} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{ub} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{uc} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{ux} {} {}
+\DeclareFontSeriesChangeRule {ulsc}{x} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{?m} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{bx} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{b} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{c} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{eb} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{ec} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{el} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{ex} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{l} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{m?} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{sb} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{sc} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{sl} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{sx} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{ub} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{uc} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{ux} {} {}
+\DeclareFontSeriesChangeRule {ulsx}{x} {} {}
+\DeclareFontSeriesChangeRule {uluc}{?m} {} {}
+\DeclareFontSeriesChangeRule {uluc}{bx} {} {}
+\DeclareFontSeriesChangeRule {uluc}{b} {} {}
+\DeclareFontSeriesChangeRule {uluc}{c} {} {}
+\DeclareFontSeriesChangeRule {uluc}{eb} {} {}
+\DeclareFontSeriesChangeRule {uluc}{ec} {} {}
+\DeclareFontSeriesChangeRule {uluc}{el} {} {}
+\DeclareFontSeriesChangeRule {uluc}{ex} {} {}
+\DeclareFontSeriesChangeRule {uluc}{l} {} {}
+\DeclareFontSeriesChangeRule {uluc}{m?} {} {}
+\DeclareFontSeriesChangeRule {uluc}{sb} {} {}
+\DeclareFontSeriesChangeRule {uluc}{sc} {} {}
+\DeclareFontSeriesChangeRule {uluc}{sl} {} {}
+\DeclareFontSeriesChangeRule {uluc}{sx} {} {}
+\DeclareFontSeriesChangeRule {uluc}{ub} {} {}
+\DeclareFontSeriesChangeRule {uluc}{uc} {} {}
+\DeclareFontSeriesChangeRule {uluc}{ul} {} {}
+\DeclareFontSeriesChangeRule {uluc}{ux} {} {}
+\DeclareFontSeriesChangeRule {uluc}{x} {} {}
+\DeclareFontSeriesChangeRule {ulux}{?m} {} {}
+\DeclareFontSeriesChangeRule {ulux}{bx} {} {}
+\DeclareFontSeriesChangeRule {ulux}{b} {} {}
+\DeclareFontSeriesChangeRule {ulux}{c} {} {}
+\DeclareFontSeriesChangeRule {ulux}{eb} {} {}
+\DeclareFontSeriesChangeRule {ulux}{ec} {} {}
+\DeclareFontSeriesChangeRule {ulux}{el} {} {}
+\DeclareFontSeriesChangeRule {ulux}{ex} {} {}
+\DeclareFontSeriesChangeRule {ulux}{l} {} {}
+\DeclareFontSeriesChangeRule {ulux}{m?} {} {}
+\DeclareFontSeriesChangeRule {ulux}{sb} {} {}
+\DeclareFontSeriesChangeRule {ulux}{sc} {} {}
+\DeclareFontSeriesChangeRule {ulux}{sl} {} {}
+\DeclareFontSeriesChangeRule {ulux}{sx} {} {}
+\DeclareFontSeriesChangeRule {ulux}{ub} {} {}
+\DeclareFontSeriesChangeRule {ulux}{uc} {} {}
+\DeclareFontSeriesChangeRule {ulux}{ul} {} {}
+\DeclareFontSeriesChangeRule {ulux}{ux} {} {}
+\DeclareFontSeriesChangeRule {ulux}{x} {} {}
+\DeclareFontSeriesChangeRule {ulx}{bx} {} {}
\DeclareFontSeriesChangeRule {ulx}{b}{bx}{}
\DeclareFontSeriesChangeRule {ulx}{c}{ulc}{}
\DeclareFontSeriesChangeRule {ulx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ulx}{ec}{ulec}{}
\DeclareFontSeriesChangeRule {ulx}{el}{elx}{}
+\DeclareFontSeriesChangeRule {ulx}{ex} {} {}
\DeclareFontSeriesChangeRule {ulx}{l}{lx}{}
\DeclareFontSeriesChangeRule {ulx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ulx}{sc}{ulsc}{}
\DeclareFontSeriesChangeRule {ulx}{sl}{slx}{}
+\DeclareFontSeriesChangeRule {ulx}{sx} {} {}
\DeclareFontSeriesChangeRule {ulx}{ub}{ubx}{}
+\DeclareFontSeriesChangeRule {ulx}{uc} {} {}
\DeclareFontSeriesChangeRule {ulx}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {ulx}{ux} {} {}
\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
+\DeclareFontSeriesChangeRule {ul}{bx} {} {}
\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
+\DeclareFontSeriesChangeRule {ul}{eb} {} {}
\DeclareFontSeriesChangeRule {ul}{ec}{ulec}{}
+\DeclareFontSeriesChangeRule {ul}{ex} {} {}
+\DeclareFontSeriesChangeRule {ul}{sb} {} {}
\DeclareFontSeriesChangeRule {ul}{sc}{ulsc}{}
+\DeclareFontSeriesChangeRule {ul}{sx} {} {}
+\DeclareFontSeriesChangeRule {ul}{ub} {} {}
+\DeclareFontSeriesChangeRule {ul}{uc} {} {}
+\DeclareFontSeriesChangeRule {ul}{ux} {} {}
\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {x}{b}{bx}{}
+\DeclareFontSeriesChangeRule {ux}{?m} {} {}
+\DeclareFontSeriesChangeRule {ux}{bx} {} {}
+\DeclareFontSeriesChangeRule {ux}{b} {} {}
+\DeclareFontSeriesChangeRule {ux}{eb} {} {}
+\DeclareFontSeriesChangeRule {ux}{el} {} {}
+\DeclareFontSeriesChangeRule {ux}{l} {} {}
+\DeclareFontSeriesChangeRule {ux}{m?} {} {}
+\DeclareFontSeriesChangeRule {ux}{sb} {} {}
+\DeclareFontSeriesChangeRule {ux}{sl} {} {}
+\DeclareFontSeriesChangeRule {ux}{ub} {} {}
+\DeclareFontSeriesChangeRule {ux}{ul} {} {}
+\DeclareFontSeriesChangeRule {x}{bx} {} {}
\DeclareFontSeriesChangeRule {x}{c}{c}{}
-\DeclareFontSeriesChangeRule {x}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {x}{ec}{ec}{}
\DeclareFontSeriesChangeRule {x}{el}{elx}{}
\DeclareFontSeriesChangeRule {x}{l}{lx}{}
-\DeclareFontSeriesChangeRule {x}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {x}{sc}{sc}{}
\DeclareFontSeriesChangeRule {x}{sl}{slx}{}
\DeclareFontSeriesChangeRule {x}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {x}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {bc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {bec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {bsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {bx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {b}{m?}{m}{}
-\DeclareFontSeriesChangeRule {c}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ebec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ebsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ebx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {eb}{m?}{m}{}
-\DeclareFontSeriesChangeRule {ec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {elec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {elsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {elx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {el}{m?}{m}{}
-\DeclareFontSeriesChangeRule {lc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {lec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {lsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {lx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {l}{m?}{m}{}
-\DeclareFontSeriesChangeRule {m}{m?}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {sbec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {sbsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {sbx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sb}{m?}{m}{}
-\DeclareFontSeriesChangeRule {sc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {slec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {slsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {slx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {sl}{m?}{m}{}
-\DeclareFontSeriesChangeRule {ubc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ubec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ubsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ubx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ub}{m?}{ub}{}
-\DeclareFontSeriesChangeRule {ulc}{m?}{c}{}
-\DeclareFontSeriesChangeRule {ulec}{m?}{ec}{}
-\DeclareFontSeriesChangeRule {ulsc}{m?}{sc}{}
-\DeclareFontSeriesChangeRule {ulx}{m?}{x}{}
-\DeclareFontSeriesChangeRule {ul}{m?}{m}{}
-\DeclareFontSeriesChangeRule {x}{m?}{x}{}
-\DeclareFontSeriesChangeRule {bc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bec}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bsc}{?m}{b}{}
-\DeclareFontSeriesChangeRule {bx}{?m}{b}{}
-\DeclareFontSeriesChangeRule {b}{?m}{b}{}
-\DeclareFontSeriesChangeRule {c}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ebc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebec}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebsc}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ebx}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {eb}{?m}{eb}{}
-\DeclareFontSeriesChangeRule {ec}{?m}{m}{}
-\DeclareFontSeriesChangeRule {elc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elec}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elsc}{?m}{el}{}
-\DeclareFontSeriesChangeRule {elx}{?m}{el}{}
-\DeclareFontSeriesChangeRule {el}{?m}{el}{}
-\DeclareFontSeriesChangeRule {lc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lec}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lsc}{?m}{l}{}
-\DeclareFontSeriesChangeRule {lx}{?m}{l}{}
-\DeclareFontSeriesChangeRule {l}{?m}{l}{}
-\DeclareFontSeriesChangeRule {m}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sbc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbec}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbsc}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sbx}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sb}{?m}{sb}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {sc}{?m}{m}{}
-\DeclareFontSeriesChangeRule {slc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slec}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slsc}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {slx}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {sl}{?m}{sl}{}
-\DeclareFontSeriesChangeRule {ubc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubec}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubsc}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ubx}{?m}{ub}{}
-\DeclareFontSeriesChangeRule {ub}{?m}{m}{}
-\DeclareFontSeriesChangeRule {ulc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulec}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulsc}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ulx}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {ul}{?m}{ul}{}
-\DeclareFontSeriesChangeRule {x}{?m}{m}{}
+
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}%
{\DeclareFontSeriesChangeRule}{Series change rules}%
@@ -12483,7 +15271,7 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{2020/02/02}%
- {\DeclareFontShapeChangeRule}{Font shape change rules}%
+ {\ulcshape}{Font shape change rules}%
\def\DeclareFontShapeChangeRule #1#2#3#4{%
\@namedef{shape@#1@#2}{{#3}{#4}}}
\DeclareRobustCommand\ulcshape
@@ -12501,6 +15289,99 @@ of this package available from CTAN}
\fontshape\sscdefault\selectfont}
\let\sscdefault\@undefined % for rollback
\newcommand\sscdefault{ssc}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\ulcshape}{Font shape change rules}%
+
+\let\DeclareFontShapeChangeRule\@undefined
+\let\ulcshape\@undefined
+\let\ulcdefault\@undefined
+\let\swshape\@undefined
+\let\swdefault\@undefined
+\let\sscshape\@undefined
+\let\sscdefault\@undefined
+
+\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\DeclareFontShapeChangeRule}{Rules for ssc and sw}%
+\DeclareFontShapeChangeRule {n}{it} {it} {sl}
+\DeclareFontShapeChangeRule {n}{sl} {sl} {it}
+\DeclareFontShapeChangeRule {n}{sw} {sw} {it}
+\DeclareFontShapeChangeRule {n}{ulc} {n} {}
+\DeclareFontShapeChangeRule {n}{up} {n} {}
+\DeclareFontShapeChangeRule {n}{ssc} {ssc} {sc}
+\DeclareFontShapeChangeRule {it}{sl} {sl} {it}
+\DeclareFontShapeChangeRule {it}{sw} {sw} {it}
+\DeclareFontShapeChangeRule {it}{sc} {scit} {scsl}
+\DeclareFontShapeChangeRule {it}{ulc} {it} {}
+\DeclareFontShapeChangeRule {it}{up} {n} {}
+\DeclareFontShapeChangeRule {it}{ssc} {sscit} {scit}
+\DeclareFontShapeChangeRule {sl}{it} {it} {sl}
+\DeclareFontShapeChangeRule {sl}{sw} {sw} {it}
+\DeclareFontShapeChangeRule {sl}{sc} {scsl} {scit}
+\DeclareFontShapeChangeRule {sl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {sl}{up} {n} {}
+\DeclareFontShapeChangeRule {sl}{ssc} {sscsl} {scsl}
+\DeclareFontShapeChangeRule {sc}{it} {scit} {scsl}
+\DeclareFontShapeChangeRule {sc}{sl} {scsl} {scit}
+\DeclareFontShapeChangeRule {sc}{sw} {scsw} {scit}
+\DeclareFontShapeChangeRule {sc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sc}{up} {n} {}
+\DeclareFontShapeChangeRule {scit}{it} {scit} {}
+\DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit}
+\DeclareFontShapeChangeRule {scit}{sw} {scsw} {scit}
+\DeclareFontShapeChangeRule {scit}{sc} {scit} {}
+\DeclareFontShapeChangeRule {scit}{ulc} {it} {}
+\DeclareFontShapeChangeRule {scit}{up} {sc} {}
+\DeclareFontShapeChangeRule {scit}{ssc} {sscit} {scit}
+\DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl}
+\DeclareFontShapeChangeRule {scsl}{sl} {scsl} {}
+\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {scsl}
+\DeclareFontShapeChangeRule {scsl}{sc} {scsl} {}
+\DeclareFontShapeChangeRule {scsl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {scsl}{up} {sc} {}
+\DeclareFontShapeChangeRule {scsl}{ssc} {sscsl} {scsl}
+\DeclareFontShapeChangeRule {scsw}{it} {scit} {scsw}
+\DeclareFontShapeChangeRule {scsw}{sl} {scsl} {}
+\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {}
+\DeclareFontShapeChangeRule {scsw}{sc} {scsw} {}
+\DeclareFontShapeChangeRule {scsw}{ulc} {sw} {}
+\DeclareFontShapeChangeRule {scsw}{up} {sc} {}
+\DeclareFontShapeChangeRule {scsw}{ssc} {sscsw} {scsw}
+\DeclareFontShapeChangeRule {sw}{sc} {scsw} {scit}
+\DeclareFontShapeChangeRule {sw}{ulc} {sw} {}
+\DeclareFontShapeChangeRule {sw}{up} {n} {}
+\DeclareFontShapeChangeRule {sw}{ssc} {sscsw} {scsw}
+\DeclareFontShapeChangeRule {ssc}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {ssc}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {ssc}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {ssc}{sc} {sc} {}
+\DeclareFontShapeChangeRule {ssc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {ssc}{up} {n} {}
+\DeclareFontShapeChangeRule {sscit}{it} {sscit} {}
+\DeclareFontShapeChangeRule {sscit}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {sscit}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {sscit}{ssc} {sscit} {}
+\DeclareFontShapeChangeRule {sscit}{sc} {scit} {}
+\DeclareFontShapeChangeRule {sscit}{ulc} {it} {}
+\DeclareFontShapeChangeRule {sscit}{up} {ssc} {}
+\DeclareFontShapeChangeRule {sscsl}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {sscsl}{sl} {sscsl} {}
+\DeclareFontShapeChangeRule {sscsl}{sw} {sscsw} {sscit}
+\DeclareFontShapeChangeRule {sscsl}{sc} {scsl} {}
+\DeclareFontShapeChangeRule {sscsl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {sscsl}{up} {ssc} {}
+\DeclareFontShapeChangeRule {sscsw}{it} {sscit} {sscsl}
+\DeclareFontShapeChangeRule {sscsw}{sl} {sscsl} {sscit}
+\DeclareFontShapeChangeRule {sscsw}{sw} {sscsw} {}
+\DeclareFontShapeChangeRule {sscsw}{ssc} {sscsw} {}
+\DeclareFontShapeChangeRule {sscsw}{sc} {scsw} {scit}
+\DeclareFontShapeChangeRule {sscsw}{ulc} {sw} {it}
+\DeclareFontShapeChangeRule {sscsw}{up} {ssc} {}
+\EndIncludeInRelease
+\IncludeInRelease{2020/02/02}%
+ {\DeclareFontShapeChangeRule}{Rules for ssc and sw}%
+
\DeclareFontShapeChangeRule {n}{it} {it} {sl}
\DeclareFontShapeChangeRule {n}{sl} {sl} {it}
\DeclareFontShapeChangeRule {n}{ulc} {n} {}
@@ -12539,19 +15420,50 @@ of this package available from CTAN}
\DeclareFontShapeChangeRule {sw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {sw}{ulc} {sw} {}
\DeclareFontShapeChangeRule {sw}{up} {n} {}
+
+\DeclareFontShapeChangeRule {n}{ssc} {ssc} {}
+\DeclareFontShapeChangeRule {it}{ssc} {ssc} {}
+\DeclareFontShapeChangeRule {sl}{ssc} {ssc} {}
+\DeclareFontShapeChangeRule {sw}{ssc} {ssc} {}
+
+\DeclareFontShapeChangeRule {scit}{ssc}{ssc} {}
+\DeclareFontShapeChangeRule {scsl}{ssc}{ssc} {}
+\DeclareFontShapeChangeRule {scsw}{ssc}{ssc} {}
+
+\DeclareFontShapeChangeRule {ssc}{it} {it} {}
+\DeclareFontShapeChangeRule {ssc}{sl} {sl} {}
+\DeclareFontShapeChangeRule {ssc}{sw} {sw} {}
+\DeclareFontShapeChangeRule {ssc}{sc} {sc} {}
+\DeclareFontShapeChangeRule {ssc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {ssc}{up} {n} {}
+
+\DeclareFontShapeChangeRule {sscit}{it} {it} {}
+\DeclareFontShapeChangeRule {sscit}{sl} {sl} {}
+\DeclareFontShapeChangeRule {sscit}{sw} {sw} {}
+\DeclareFontShapeChangeRule {sscit}{ssc} {ssc}{}
+\DeclareFontShapeChangeRule {sscit}{sc} {sc} {}
+\DeclareFontShapeChangeRule {sscit}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sscit}{up} {ssc}{}
+
+\DeclareFontShapeChangeRule {sscsl}{it} {it} {}
+\DeclareFontShapeChangeRule {sscsl}{sl} {sl} {}
+\DeclareFontShapeChangeRule {sscsl}{sw} {sw} {}
+\DeclareFontShapeChangeRule {sscsl}{sc} {sc} {}
+\DeclareFontShapeChangeRule {sscsl}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sscsl}{up} {ssc}{}
+
+\DeclareFontShapeChangeRule {sscsw}{it} {it} {}
+\DeclareFontShapeChangeRule {sscsw}{sl} {sl} {}
+\DeclareFontShapeChangeRule {sscsw}{sw} {sw} {}
+\DeclareFontShapeChangeRule {sscsw}{ssc} {ssc}{}
+\DeclareFontShapeChangeRule {sscsw}{sc} {sc} {}
+\DeclareFontShapeChangeRule {sscsw}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sscsw}{up} {ssc}{}
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}%
- {\DeclareFontShapeChangeRule}{Font shape change rules}%
-
-\let\DeclareFontShapeChangeRule\@undefined
-\let\ulcshape\@undefined
-\let\ulcdefault\@undefined
-\let\swshape\@undefined
-\let\swdefault\@undefined
-\let\sscshape\@undefined
-\let\sscdefault\@undefined
-
+ {\DeclareFontShapeChangeRule}{Rules for ssc and sw}%
\EndIncludeInRelease
+
\IncludeInRelease{2021/06/01}%
{\fontshape}{Font shape change}%
\DeclareRobustCommand\fontshape[1]
@@ -12950,20 +15862,35 @@ of this package available from CTAN}
\tl_gset:cx { g__nfss_frozen_mv_ #1 _tl }{ \int_use:c { c@mv@#1 } }
\cs_gset:cpn{mv@#1@reset}
{
+ \int_compare:nNnTF \@math@level = 0
+ {
\int_compare:nNnTF { \int_use:c{c@mv@#1} } >
{ \tl_use:c{g__nfss_frozen_mv_ #1 _tl} }
{
- \@font@info{Undo~ math~ alphabet~ allocation~ in~ version~ #1}
+ \@font@info{ Undo~ math~ alphabet~ allocation~ in~ version~ #1 }
\cs_gset_eq:cc { mv@#1 }{ mv@#1@frozen }
\int_gset:cn { c@mv@#1 }{ \tl_use:c {g__nfss_frozen_mv_ #1 _tl} }
- \group_begin:
- \cs_set_eq:NN \getanddefine@fonts \use_none:nn
- \use:c {mv@#1}
- \group_end:
+ \tl_if_eq:NnTF \math@version {#1}
+ {
+ \group_begin:
+ \cs_set_eq:NN \getanddefine@fonts \use_none:nn
+ \use:c {mv@ \math@version }
+ \group_end:
+ }
+ {
+ \@font@info{ ...~ but~ do~ not~ reset~ the~
+ top-level~ math~ alphabet~ definitions }
+ }
}
{
- \@font@info{No~ math~ alphabet~ change~ to~ frozen~ version~ #1}
+ \@font@info{ No~ math~ alphabet~ change~
+ to~ frozen~ version~ #1 }
}
+ }
+ {
+ \@font@info{ Nested~ math:~ keeping~ math~ alphabet~
+ allocation~ in~ version~ #1}
+ }
\if@ignore \ignorespaces \fi
}
}
@@ -14778,6 +17705,7 @@ of this package available from CTAN}
\endgroup
\@esphack}
\EndIncludeInRelease
+\def\ltx@star@counter{*}
\IncludeInRelease{2022/06/01}%
{\Ref}{Add starred version}%
\def\@currentcounter{}
@@ -14792,7 +17720,10 @@ of this package available from CTAN}
\def\refstepcounter#1{%
\UseSocket{refstepcounter}{%
\stepcounter{#1}%
- \edef\@currentcounter{#1}%
+ \edef\reserved@a{#1}%
+ \ifx\reserved@a\ltx@star@counter\else
+ \let\@currentcounter\reserved@a
+ \fi
\protected@edef\@currentlabel
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
\UseSocket{refstepcounter/target}{#1}%
@@ -14802,7 +17733,10 @@ of this package available from CTAN}
\def\@kernel@refstepcounter#1{%
\UseSocket{refstepcounter}{%
\stepcounter{#1}%
- \edef\@currentcounter{#1}%
+ \edef\reserved@a{#1}%
+ \ifx\reserved@a\ltx@star@counter\else
+ \let\@currentcounter\reserved@a
+ \fi
\protected@edef\@currentlabel
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}}}%
\EndIncludeInRelease
@@ -14818,10 +17752,10 @@ of this package available from CTAN}
\IncludeInRelease{2022/06/01}%
{\Ref}{Add starred version}%
\def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
-\def\@kernel@Ref#1{\protected@edef\@tempa{\@kernel@ref{#1}}%
- \expandafter\MakeUppercase\@tempa}
-\def\@kernel@sRef#1{\protected@edef\@tempa{\@kernel@sref{#1}}%
- \expandafter\MakeUppercase\@tempa}
+\def\@kernel@Ref#1{\protected@edef\reserved@a{\@kernel@ref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
+\def\@kernel@sRef#1{\protected@edef\reserved@a{\@kernel@sref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
\NewDocumentCommand\Ref{s}
{\IfBooleanTF{#1}{\@kernel@sRef}{\@kernel@Ref}}
\EndIncludeInRelease
@@ -14844,8 +17778,8 @@ of this package available from CTAN}
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
}
\def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
-\DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
- \expandafter\MakeUppercase\@tempa}
+\DeclareRobustCommand\Ref[1]{\protected@edef\reserved@a{\ref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
\EndIncludeInRelease
\IncludeInRelease{2019/10/01}%
{\refstepcounter}{Add \labelformat and \Ref}%
@@ -14855,8 +17789,8 @@ of this package available from CTAN}
{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
}
\def\labelformat#1{\expandafter\def\csname p@#1\endcsname##1}
-\DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
- \expandafter\MakeUppercase\@tempa}
+\DeclareRobustCommand\Ref[1]{\protected@edef\reserved@a{\ref{#1}}%
+ \expandafter\MakeUppercase\reserved@a}
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}%
{\refstepcounter}{Add \labelformat and \Ref}%
@@ -15958,9 +18892,16 @@ of this package available from CTAN}
\def\@endpefalse{\global\let\if@endpe\iffalse}
\def\@endpetrue {%
\global\let\if@endpe\iftrue
- \ifnum\currentgrouplevel>\z@
- \aftergroup\propagate@doendpe
- \fi
+ \ifnum\currentgrouptype =14 % semi-simple group
+ \aftergroup\propagate@doendpe
+ \else
+ \ifnum\currentgrouptype =\z@ % no group: top-level
+ \else
+ \ifnum\currentgrouptype =\@ne % simple group
+ \aftergroup\propagate@doendpe
+ \fi
+ \fi
+ \fi
}
\def\propagate@doendpe{\if@endpe \@doendpe \fi}
\EndIncludeInRelease
@@ -17028,6 +19969,31 @@ of this package available from CTAN}
\def\addcontentsline#1#2#3{%
\addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}}}
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\@gobble@som}{Extended index/label}%
+\DeclareExpandableDocumentCommand\@gobble@om{+o+m}{}
+\DeclareExpandableDocumentCommand\@gobble@som{s+o+m}{}
+\DeclareDocumentCommand\@gobble@with@sphack@om{+o+m}{\@bsphack\@esphack}
+\DeclareDocumentCommand\@gobble@with@sphack@som{s+o+m}{\@bsphack\@esphack}
+\long\def\addtocontents#1#2{%
+ \protected@write\@auxout
+ {\let\label\@gobble@om
+ \let\index\@gobble@som
+ \let\glossary\@gobble@om}%
+ {\string\@writefile{#1}{#2}}}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@gobble@som}{Extended index/label}%
+\long\def\addtocontents#1#2{%
+ \protected@write\@auxout
+ {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble}%
+ {\string\@writefile{#1}{#2}}}
+
+\let\@gobble@om\@undefined
+\let\@gobble@som\@undefined
+\let\@gobble@with@sphack@om\@undefined
+\let\@gobble@with@sphack@som\@undefined
+\EndIncludeInRelease
\IncludeInRelease{2021/11/15}%
{\contentsline}{Four arguments}%
\def\contentsline#1#2#3#4{\gdef\@contentsline@destination{#4}%
@@ -17473,7 +20439,7 @@ of this package available from CTAN}
\EndIncludeInRelease
%% File: ltmarks.dtx
-%% Copyright (C) 2022-2024
+%% Copyright (C) 2022-2025
%% Frank Mittelbach, The LaTeX Project
%%% From File: ltmarks.dtx
@@ -17529,9 +20495,9 @@ of this package available from CTAN}
\tl_new:c { g__mark_#1_top_ #2 _tl }
\tl_new:c { g__mark_#1_first_ #2 _tl }
\tl_new:c { g__mark_#1_last_ #2 _tl }
- \tl_set_eq:cN { g__mark_#1_top_ #2 _tl } \c__mark_empty_tl
- \tl_set_eq:cN { g__mark_#1_first_ #2 _tl } \c__mark_empty_tl
- \tl_set_eq:cN { g__mark_#1_last_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_top_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_first_ #2 _tl } \c__mark_empty_tl
+ \tl_gset_eq:cN { g__mark_#1_last_ #2 _tl } \c__mark_empty_tl
}
\tl_const:Nn \c__mark_empty_tl { \__mark_value:nn{0}{} }
\box_new:N \l__mark_box
@@ -19560,7 +22526,7 @@ of this package available from CTAN}
\fi}
\EndIncludeInRelease
\IncludeInRelease{2020/10/01}%
- {@@_set_curr_file:nNN}{Set curr file}%
+ {\__filehook_set_curr_file:nNN}{Set curr file}%
\ExplSyntaxOn
\cs_new_protected:Npn \__filehook_set_curr_file:nNN #1
{
@@ -19690,7 +22656,7 @@ of this package available from CTAN}
\EndIncludeInRelease
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% Frank Mittelbach, The LaTeX Project
%%
%%% From File: ltshipout.dtx
@@ -20346,8 +23312,270 @@ of this package available from CTAN}
}%
\EndIncludeInRelease
\IncludeInRelease{2025/06/01}%
+ {\@makecol}{\@makecol adding hooks/sockets}%
+\def \@makecol {%
+ \UseHook {build/column/before}%
+ \setbox\@outputbox \box\@cclv
+ \@outputbox@removebskip
+ \UseTaggingSocket{build/column/outputbox}%
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \UseSocket {build/column/outputbox}%
+ \ifvbox\@kludgeins
+ \@make@specialcolbox
+ \else
+ \@make@normalcolbox
+ \fi
+ \global \maxdepth \@maxdepth
+ \UseHook {build/column/after}%
+}
+\newdimen\@outputbox@depth
+\def \@make@normalcolbox {%
+ \setbox\@outputbox \vbox to\@colht {%
+ \@texttop
+ \@outputbox@depth \dp\@outputbox
+ \unvbox \@outputbox
+ \vskip -\@outputbox@depth
+ \@textbottom
+ }%
+}
+\def \@make@specialcolbox {%
+ \@outputbox@append {\vskip-\@outputbox@depth}%
+ \@tempdima \@colht
+ \ifdim \wd\@kludgeins>\z@
+ \advance \@tempdima -\ht\@outputbox
+ \advance \@tempdima \pageshrink
+ \setbox\@outputbox \vbox to \@colht {%
+ \unvbox\@outputbox
+ \vskip \@tempdima
+ \@textbottom
+ }%
+ \else
+ \advance \@tempdima -\ht\@kludgeins
+ \setbox \@outputbox \vbox to \@colht {%
+ \vbox to \@tempdima {%
+ \unvbox\@outputbox
+ \@textbottom}%
+ \vss}%
+ \fi
+ {\setbox \@tempboxa \box \@kludgeins}%
+}
+\def\@outputbox@removebskip{%
+ \ifx\@textbottom\relax \else
+ \ifvoid \@outputbox
+ \global\let\@outputbox@reinsertbskip\relax
+ \else
+ \@outputbox@append{%
+ \@tempskipa\lastskip
+ \ifnum \gluestretchorder\@tempskipa>\z@
+ \unskip
+ \xdef\@outputbox@reinsertbskip
+ {\noexpand\@outputbox@append{\vskip\the\@tempskipa}}%
+ \else
+ \global\let\@outputbox@reinsertbskip\relax
+ \fi
+ }%
+ \fi
+ \fi
+}
+\let \@outputbox@reinsertbskip \relax
+\def\@outputbox@append #1{%
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \@outputbox@depth\dp\@outputbox % if needed in #1
+ \unvbox \@outputbox
+ #1%
+ }%
+}
+\def\@outputbox@appendfootnotes {%
+ \ifvoid\footins \else
+ \@makecol@handlesplitfootnotes
+ \UseSocket{build/column/footnotes}%
+ \@outputbox@append{%
+ \vskip \skip\footins
+ \UseTaggingSocket{build/column/footins}%
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \csname pdfcolfoot@current\endcsname
+ \unvbox \footins
+ \color@endgroup
+ }%
+ \fi
+}
+\let \@makecol@handlesplitfootnotes \@empty
+\def \@outputbox@attachfloats {%
+ \ifx \@toplist\@empty \else \@cflt \fi
+ \ifx \@botlist\@empty \else \@cflb \fi
+}
+\def \@outputbox@attachtopfloats {%
+ \ifx \@toplist\@empty \else \@cflt \fi
+}
+\def \@outputbox@attachbottomfloats {%
+ \ifx \@botlist\@empty \else \@cflb \fi
+}
+\def\@if@flushbottom@TF{%
+ \ifx\@textbottom\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+\def\@if@footnotes@TF{%
+ \ifvoid\footins
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\def\@if@bottomfloats@TF{%
+ \ifx \@botlist\@empty
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+}
+\NewSocket{build/column/outputbox}{0}
+\NewSocketPlug {build/column/outputbox}{space-footnotes-floats} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ }%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-space-floats} {%
+ \@outputbox@appendfootnotes
+ \@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {build/column/outputbox}{floats-space-footnotes} {%
+ \@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {build/column/outputbox}{space-floats-footnotes} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bottomfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}}%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {build/column/outputbox}{floats-footnotes} {%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+ \@outputbox@reinsertbskip
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-floats} {%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+ \@outputbox@reinsertbskip
+}
+\NewSocketPlug {build/column/outputbox}{footnotes-floats-legacy} {%
+ \@outputbox@reinsertbskip
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+}
+\AssignSocketPlug {build/column/outputbox}{footnotes-floats-legacy}
+\NewSocket{build/column/footnotes}{0}
+\NewMirroredHookPair{build/page/before}{build/page/after}
+\NewHook {build/page/reset}
+\NewMirroredHookPair{build/column/before}{build/column/after}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@makecol}{\@makecol adding hooks/sockets}%
+
+\gdef \@makecol {%
+ \ifvoid\footins
+ \setbox\@outputbox \box\@cclv
+ \else
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \unvbox \@cclv
+ \vskip \skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ }%
+ \fi
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \@combinefloats
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \setbox\@outputbox \vbox to\@colht {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox \@outputbox
+ \vskip -\dimen@
+ \@textbottom
+ }%
+ \fi
+ \global \maxdepth \@maxdepth
+}
+
+\gdef \@makespecialcolbox {%
+ \setbox\@outputbox \vbox {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox\@outputbox
+ \vskip-\dimen@
+ }%
+ \@tempdima \@colht
+ \ifdim \wd\@kludgeins>\z@
+ \advance \@tempdima -\ht\@outputbox
+ \advance \@tempdima \pageshrink
+ \setbox\@outputbox \vbox to \@colht {%
+ \unvbox\@outputbox
+ \vskip \@tempdima
+ \@textbottom
+ }%
+ \else
+ \advance \@tempdima -\ht\@kludgeins
+ \setbox \@outputbox \vbox to \@colht {%
+ \vbox to \@tempdima {%
+ \unvbox\@outputbox
+ \@textbottom}%
+ \vss}%
+ \fi
+ {\setbox \@tempboxa \box \@kludgeins}%
+}
+
+ \let \@make@normalcolbox \@undefined
+ \let \@make@specialcolbox \@undefined
+ \let \@outputbox@removebskip \@undefined
+ \let \@outputbox@reinsertbskip \@undefined
+
+ \let \@outputbox@append \@undefined
+ \let \@outputbox@appendfootnotes \@undefined
+ \let \@outputbox@attachfloats \@undefined
+ \let \@outputbox@attachtopfloats \@undefined
+ \let \@outputbox@attachbottomfloats \@undefined
+
+ \let \@if@flushbottom@TF \@undefined
+ \let \@if@footnotes@TF \@undefined
+ \let \@if@bottomfloats@TF \@undefined
+
+\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
{\@outputpage}{Use new mark mechanism}%
-\def\@outputpage{%
+\protected \def \pdfannot@link@on@@ { \csname pdfannot_link_on:\endcsname }
+\protected \def \pdfannot@link@off@@ { \csname pdfannot_link_off:\endcsname }
+\def \@outputpage {%
+ \UseHook {build/page/before}%
\begingroup
\let \protect \noexpand
\language\document@default@language
@@ -20355,51 +23583,70 @@ of this package available from CTAN}
\global\let\@@if@newlist\if@newlist
\global\@newlistfalse
\@parboxrestore
+ \UseHook {build/page/reset}%
\shipout \vbox{%
\set@typeset@protect
\aftergroup \endgroup
\aftergroup \set@typeset@protect
\if@specialpage
- \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
+ \global \@specialpagefalse
+ \@nameuse {ps@\@specialstyle}%
\fi
\if@twoside
- \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
- \let\@themargin\oddsidemargin
- \else \let\@thehead\@evenhead
- \let\@thefoot\@evenfoot \let\@themargin\evensidemargin
+ \ifodd\count\z@
+ \let \@thehead \@oddhead
+ \let \@thefoot \@oddfoot
+ \let \@themargin \oddsidemargin
+ \else
+ \let \@thehead \@evenhead
+ \let \@thefoot \@evenfoot
+ \let \@themargin \evensidemargin
\fi
\fi
\reset@font
\normalsize
\normalsfcodes
- \let\label\@gobble
- \let\index\@gobble
- \let\glossary\@gobble
- \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
+ \let \label \@gobble@with@sphack@om
+ \let \index \@gobble@with@sphack@som
+ \let \glossary \@gobble@with@sphack@om
+ \baselineskip \z@skip
+ \lineskip \z@skip
+ \lineskiplimit \z@
\@begindvi
\vskip \topmargin
\moveright\@themargin \vbox {%
- \setbox\@tempboxa \vbox to\headheight{%
+ \setbox\@tempboxa \vbox to\headheight {%
\vfil
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thehead}%
- \color@endbox
- }%
- \dp\@tempboxa \z@
- \box\@tempboxa
+ \pdfannot@link@off@@
+ \UseTaggingSocket{build/page/header}{}%
+ {
+ \color@hbox
+ \normalcolor
+ \hb@xt@ \textwidth {\@thehead }%
+ \color@endbox
+ }
+ \pdfannot@link@on@@
+ }
+ \dp \@tempboxa \z@
+ \box \@tempboxa
\vskip \headsep
- \box\@outputbox
+ \box \@outputbox
\baselineskip \footskip
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thefoot}%
- \color@endbox
- }%
- }%
- \global\let\if@newlist\@@if@newlist
+ \pdfannot@link@off@@
+ \UseTaggingSocket{build/page/footer}{}%
+ {
+ \color@hbox
+ \normalcolor
+ \hb@xt@ \textwidth {\@thefoot }%
+ \color@endbox
+ }
+ \pdfannot@link@on@@
+ }
+ }
+ \global \let \if@newlist \@@if@newlist
\global \@colht \textheight
\stepcounter{page}%
+ \UseHook {build/page/after}%
}
\EndIncludeInRelease
\IncludeInRelease{2017/04/15}%
@@ -20629,6 +23876,74 @@ of this package available from CTAN}
\@tempdima\@tempdimb
\fi}%
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\@addtocurcol}{float order in 2-column}%
+\def \@addtocurcol {%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \else
+ \ifnum \@fpstype=24
+ \else
+ \@flsettextmin
+ \advance \@textmin \@textfloatsheight
+ \@reqcolroom \@pageht
+ \ifdim \@textmin>\@reqcolroom
+ \@reqcolroom \@textmin
+ \fi
+ \advance \@reqcolroom \ht\@currbox
+ \saved@reqcolroom \@reqcolroom
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum \@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \if@test
+ \else
+ \@bitor\@currtype\@botlist
+ \if@test
+ \@addtobot
+ \else
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m@ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \if@nobreak
+ \nobreak
+ \@nobreakfalse
+ \everypar{}%
+ \else
+ \addpenalty \interlinepenalty
+ \fi
+ \vskip \intextsep
+ \box\@currbox
+ \penalty\interlinepenalty
+ \vskip\intextsep
+ \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+ \outputpenalty \z@
+ \@inserttrue
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@resethfps
+ \@cons\@deferlist\@currbox
+ \fi
+}%
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\@addtocurcol}{float order in 2-column}%
\def \@addtocurcol {%
@@ -20766,6 +24081,40 @@ of this package available from CTAN}
\fi
}%
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}
+ {\@addtonextcol}{float order in 2-column}%
+\def\@addtonextcol{%
+ \begingroup
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \else
+ \ifnum \@fpstype=24
+ \else
+ \@flsettextmin
+ \@reqcolroom \ht\@currbox
+ \advance \@reqcolroom \@textmin
+ \saved@reqcolroom \@reqcolroom
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum\@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \if@test
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@cons\@deferlist\@currbox
+ \fi
+ \endgroup
+}%
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}
{\@addtonextcol}{float order in 2-column}%
\def\@addtonextcol{%
@@ -20955,6 +24304,48 @@ of this package available from CTAN}
\let\fl@traceval\@undefined
\let\fl@tracemessage\@undefined
\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\saved@reqcolroom}{float placement calculation}%
+\newdimen \saved@reqcolroom
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\saved@reqcolroom}{float placement calculation}%
+\let \saved@reqcolroom \@undefined
+\EndIncludeInRelease
+\IncludeInRelease{2025/06/01}%
+ {\@flcheckspace}{float placement calculation}%
+\def \@flcheckspace #1#2{%
+ \@reqcolroom \saved@reqcolroom
+ \advance \@reqcolroom
+ \ifx #2\@empty \textfloatsep \else \floatsep \fi
+ \ifdim \@colroom>\@reqcolroom
+ \ifdim #1>\ht\@currbox
+ \@tempswatrue
+ \else
+ \ifnum \@fpstype<\sixt@@n
+ \@tempswatrue
+ \fi
+ \fi
+ \fi
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@flcheckspace}{float placement calculation}%
+
+\def \@flcheckspace #1#2{%
+ \advance \@reqcolroom
+ \ifx #2\@empty \textfloatsep \else \floatsep \fi
+ \ifdim \@colroom>\@reqcolroom
+ \ifdim #1>\ht\@currbox
+ \@tempswatrue
+ \else
+ \ifnum \@fpstype<\sixt@@n
+ \@tempswatrue
+ \fi
+ \fi
+ \fi
+}
+\EndIncludeInRelease
\IncludeInRelease{2017/01/01}%
{\@makefcolumn}{negative height floats}%
\def\@makefcolumn #1{%
@@ -21556,6 +24947,8 @@ of this package available from CTAN}
\tl_clear:N \l__latexrelease_restores_tl
\msg_redirect_name:nnn { hooks } { exists } { }
\msg_redirect_name:nnn { mark } { class-already-defined } { }
+\msg_redirect_name:nnn { socket } { already-declared } { }
+\msg_redirect_name:nnn { socket } { plug-already-declared } { }
\ExplSyntaxOff}%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexsym.sty b/Master/texmf-dist/tex/latex-dev/base/latexsym.sty
index 25d6b0e52e4..4d126b86f29 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexsym.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexsym.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin1.def b/Master/texmf-dist/tex/latex-dev/base/latin1.def
index b4784628978..f283f007d9c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin1.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin1.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin10.def b/Master/texmf-dist/tex/latex-dev/base/latin10.def
index 457b7112ab5..9c94bc98e7e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin10.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin10.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin2.def b/Master/texmf-dist/tex/latex-dev/base/latin2.def
index 764c5d0de5d..845ed31a476 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin2.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin2.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin3.def b/Master/texmf-dist/tex/latex-dev/base/latin3.def
index 04e1030b37c..a9c32412acc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin3.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin3.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin4.def b/Master/texmf-dist/tex/latex-dev/base/latin4.def
index 6e2739c8704..9e1d5913a00 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin4.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin4.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin5.def b/Master/texmf-dist/tex/latex-dev/base/latin5.def
index 8a6fb46905b..26399768e99 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin5.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin5.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/latin9.def b/Master/texmf-dist/tex/latex-dev/base/latin9.def
index 35e87e2e564..3701c84ae7b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latin9.def
+++ b/Master/texmf-dist/tex/latex-dev/base/latin9.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu
index 60b8482da17..565f970d713 100644
--- a/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/lcyenc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/leqno.clo b/Master/texmf-dist/tex/latex-dev/base/leqno.clo
index 37e057bc7a4..3b65c07c0eb 100644
--- a/Master/texmf-dist/tex/latex-dev/base/leqno.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/leqno.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/leqno.sty b/Master/texmf-dist/tex/latex-dev/base/leqno.sty
index 8622218b9f3..93146debd9c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/leqno.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/leqno.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/letter.cls b/Master/texmf-dist/tex/latex-dev/base/letter.cls
index 484203d5777..d97813cfa06 100644
--- a/Master/texmf-dist/tex/latex-dev/base/letter.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/letter.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/letter.sty b/Master/texmf-dist/tex/latex-dev/base/letter.sty
index 687f7ca76a2..6735fc0bb9e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/letter.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/letter.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
index 8a650531558..db7a1e850c0 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
+++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua
@@ -13,7 +13,7 @@
-- (but please observe conditions on bug reports sent to that address!)
--
--
--- Copyright (C) 2015-2024
+-- Copyright (C) 2015-2025
-- The LaTeX Project and any individual authors listed elsewhere
-- in this file.
--
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
index fc23e470097..b2b7b9489f5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -47,7 +47,7 @@
#1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}}
\fi
\ProvidesFile{ltluatex.tex}
-[2024/08/16 v1.2e
+[2025/01/11 v1.2e
LuaTeX support for plain TeX (core)%
]
\edef\etatcatcode{\the\catcode`\@}
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltnews.cls b/Master/texmf-dist/tex/latex-dev/base/ltnews.cls
index fa86ce17b72..fef89a60df2 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltnews.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/ltnews.cls
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex b/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex
index 244bddffceb..d383af1f4df 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/ltxcheck.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cfg b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cfg
index edf3638e08d..d7231d4120c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cfg
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls
index adee1bf9604..f9eac389d85 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls b/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls
index c202b56acb5..4402a5a56b4 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/ltxguide.cls
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu
index 4a530edee59..e4f199185cf 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/ly1enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/macce.def b/Master/texmf-dist/tex/latex-dev/base/macce.def
index 49b810b1320..7edccd8034b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/macce.def
+++ b/Master/texmf-dist/tex/latex-dev/base/macce.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/makeidx.sty b/Master/texmf-dist/tex/latex-dev/base/makeidx.sty
index c1c1e7db523..23c6495a4d5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/makeidx.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/makeidx.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/minimal.cls b/Master/texmf-dist/tex/latex-dev/base/minimal.cls
index 64efdd5287f..c7d420494f8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/minimal.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/minimal.cls
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/newlfont.sty b/Master/texmf-dist/tex/latex-dev/base/newlfont.sty
index 30e629743e1..0fa43ad4a32 100644
--- a/Master/texmf-dist/tex/latex-dev/base/newlfont.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/newlfont.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/next.def b/Master/texmf-dist/tex/latex-dev/base/next.def
index 6cc4d6aaae7..25f7842acd8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/next.def
+++ b/Master/texmf-dist/tex/latex-dev/base/next.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex b/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex
index 464b881ffbb..d83ff4a1f76 100644
--- a/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/nfssfont.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty b/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty
index ae886f9bf9a..4c1f5fb7409 100644
--- a/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/oldlfont.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd
index bf6ad9d0a7c..2ec66c54e49 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omlcmm.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd
index 98b20aedd0d..231a10309f3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omlcmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omlenc.def b/Master/texmf-dist/tex/latex-dev/base/omlenc.def
index e1df971f089..88c9eb94234 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omlenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/omlenc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{omlenc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\DeclareFontEncoding{OML}{}{}
\DeclareTextSymbol{\textless}{OML}{`\<}
diff --git a/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd b/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd
index 322903455a3..ef76469428e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omllcmm.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd
index 707ace394f1..b50c1aaa182 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omscmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omscmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd
index b4389f2e858..f1e221b0941 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omscmsy.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.def b/Master/texmf-dist/tex/latex-dev/base/omsenc.def
index 6bb512e53f7..cdf6c965f55 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omsenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{omsenc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\DeclareFontEncoding{OMS}{}{}
\DeclareTextSymbol{\textasteriskcentered}{OMS}{3} % "03
diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu
index d834c655fde..d378a9ce453 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd b/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd
index 89295e21cd7..1d55ec731cc 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omslcmsy.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd
index 5e32aebc6db..4e36e120dbb 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omxcmex.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd b/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd
index 12315a1fceb..3d1548bf949 100644
--- a/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/omxlcmex.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/openbib.sty b/Master/texmf-dist/tex/latex-dev/base/openbib.sty
index 0d269866872..5b9dc4a045a 100644
--- a/Master/texmf-dist/tex/latex-dev/base/openbib.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/openbib.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd
index 935344838ad..84e94766c1e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmdh.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd
index 77373fbb58e..3badc1b6d19 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfib.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd
index bd4d21551d5..f09fdd7e456 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmfr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd
index 2393e7caedd..0b039577741 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd
index 6c724c2effe..11a152d68cd 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd
index 2716074395a..281af704ddf 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd
index b787fea9dfc..06c00f8b163 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1cmvtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
index 634b28158f3..4777baf81ce 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{ot1enc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\DeclareFontEncoding{OT1}{}{}
\DeclareTextAccent{\"}{OT1}{127}
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu
index f5f012d3f07..59046763a15 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd b/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd
index d7a5cb11f79..73474e95d40 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1lcmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd
index 2d6d825ffe8..94dda67ffd5 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ot1lcmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu
index b239d2833f5..80ac4a2aa98 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/ot2enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
index 75ab485f172..7558e0fe98a 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{ot4enc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\DeclareFontEncoding{OT4}{}{}
\DeclareFontSubstitution{OT4}{cmr}{m}{n}
diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.cfg b/Master/texmf-dist/tex/latex-dev/base/preload.cfg
index 2c128ff0719..0021b410d4e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/preload.cfg
+++ b/Master/texmf-dist/tex/latex-dev/base/preload.cfg
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.ltx b/Master/texmf-dist/tex/latex-dev/base/preload.ltx
index a63a1ebde85..253c91b80ea 100644
--- a/Master/texmf-dist/tex/latex-dev/base/preload.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/preload.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/proc.cls b/Master/texmf-dist/tex/latex-dev/base/proc.cls
index 6d287880a19..f1e7c6aeb35 100644
--- a/Master/texmf-dist/tex/latex-dev/base/proc.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/proc.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/proc.sty b/Master/texmf-dist/tex/latex-dev/base/proc.sty
index 043ad962730..78a0add7e06 100644
--- a/Master/texmf-dist/tex/latex-dev/base/proc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/proc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/report.cls b/Master/texmf-dist/tex/latex-dev/base/report.cls
index b0f60a1f5db..402b3673b04 100644
--- a/Master/texmf-dist/tex/latex-dev/base/report.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/report.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{report}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX document class]
\newcommand\@ptsize{}
\newif\if@restonecol
diff --git a/Master/texmf-dist/tex/latex-dev/base/report.sty b/Master/texmf-dist/tex/latex-dev/base/report.sty
index 855e160f245..ee44bcdea71 100644
--- a/Master/texmf-dist/tex/latex-dev/base/report.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/report.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/sfonts.def b/Master/texmf-dist/tex/latex-dev/base/sfonts.def
index f95ded8243e..98ec9518f10 100644
--- a/Master/texmf-dist/tex/latex-dev/base/sfonts.def
+++ b/Master/texmf-dist/tex/latex-dev/base/sfonts.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
index 4a9ae8833df..1354536a46d 100644
--- a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{shortvrb}
- [2024/10/23 v3.0q
+ [2024/12/25 v3.0q
Standard LaTeX documentation package V3 (FMi)]
%%
%% Package `doc' to use with LaTeX 2e
@@ -53,6 +53,7 @@
+
\def\MakeShortVerb{%
\@ifstar
{\def\@shortvrbdef{\verb*}\@MakeShortVerb}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/showidx.sty b/Master/texmf-dist/tex/latex-dev/base/showidx.sty
index 911b1d762e5..dbeb3459405 100644
--- a/Master/texmf-dist/tex/latex-dev/base/showidx.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/showidx.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/size10.clo b/Master/texmf-dist/tex/latex-dev/base/size10.clo
index a2c22c047f8..2835447c09f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size10.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size10.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{size10.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xiipt
diff --git a/Master/texmf-dist/tex/latex-dev/base/size11.clo b/Master/texmf-dist/tex/latex-dev/base/size11.clo
index 0259727c40c..ccde0fb6049 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size11.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size11.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{size11.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xipt{13.6}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/size12.clo b/Master/texmf-dist/tex/latex-dev/base/size12.clo
index e1dd32b0325..6f73a9b41b3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/size12.clo
+++ b/Master/texmf-dist/tex/latex-dev/base/size12.clo
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesFile{size12.clo}
- [2024/06/29 v1.4n
+ [2025/01/22 v1.4n
Standard LaTeX file (size option)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xiipt{14.5}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/slides.cls b/Master/texmf-dist/tex/latex-dev/base/slides.cls
index df4cd3a3b68..c97a0436cfe 100644
--- a/Master/texmf-dist/tex/latex-dev/base/slides.cls
+++ b/Master/texmf-dist/tex/latex-dev/base/slides.cls
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/slides.def b/Master/texmf-dist/tex/latex-dev/base/slides.def
index d8e5e34fb71..f740db83331 100644
--- a/Master/texmf-dist/tex/latex-dev/base/slides.def
+++ b/Master/texmf-dist/tex/latex-dev/base/slides.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/slides.sty b/Master/texmf-dist/tex/latex-dev/base/slides.sty
index 5208aa6eadd..250dcf7412a 100644
--- a/Master/texmf-dist/tex/latex-dev/base/slides.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/slides.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty
index 6473fbc96fd..1faa3b18d47 100644
--- a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -42,7 +42,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%% From File: ltfilehook.dtx
-\def\ltfilehookdate{2024/03/13}
+\def\ltfilehookdate{2025/01/25}
\def\ltfilehookversion{v1.0o}
\ProvidesExplPackage
{structuredlog}{\ltfilehookdate}{\ltfilehookversion}
diff --git a/Master/texmf-dist/tex/latex-dev/base/syntonly.sty b/Master/texmf-dist/tex/latex-dev/base/syntonly.sty
index 4d8aa24f88f..4b0a29783da 100644
--- a/Master/texmf-dist/tex/latex-dev/base/syntonly.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/syntonly.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd
index 3ae4a12f0a0..d6f8085632a 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmdh.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd
index 04c5389628f..c78b29a70a9 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfib.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd
index 1278f2b65ab..b7b43ac661f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmfr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd
index 698686aa6e8..7d68639b1e6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd
index 5bc389b29aa..1d8763a923c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd
index 044c63a222d..36c5d173523 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd
index ffdbeade0c7..c4ae105c965 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1cmvtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.def b/Master/texmf-dist/tex/latex-dev/base/t1enc.def
index 6178c89a96c..9f80c177b64 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{t1enc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\DeclareFontEncoding{T1}{}{}
\DeclareTextAccent{\`}{T1}{0}
@@ -291,7 +291,7 @@
\DeclareTextCompositeCommand{\c}{T1}{R}{\textcommabelow{R}}
\DeclareTextCompositeCommand{\c}{T1}{r}{\textcommabelow{r}}
\fi
-\DeclareTextCompositeCommand{\=}{T1}{\i}{\=\i}
+\DeclareTextCompositeCommand{\=}{T1}{i}{\=\i}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu
index 0ca48c54712..fb3847d384e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.sty b/Master/texmf-dist/tex/latex-dev/base/t1enc.sty
index 50d9897d906..60c6c04f6fb 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1enc.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd b/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd
index 17e05a62eb5..6b2c980d258 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1lcmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd b/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd
index 72ad4664b2e..c0e8fb9d301 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/t1lcmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu
index aae8bfa09e3..8fd1a7a5f31 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/t2aenc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu
index 884997b63da..ae17c6cd5d0 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/t2benc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu
index 0a62592f495..c520e0de460 100644
--- a/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/t2cenc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/testpage.tex b/Master/texmf-dist/tex/latex-dev/base/testpage.tex
index e8f06313fbf..77f955b7980 100644
--- a/Master/texmf-dist/tex/latex-dev/base/testpage.tex
+++ b/Master/texmf-dist/tex/latex-dev/base/testpage.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2024
+% Copyright (C) 1993-2025
% The LaTeX Project and any individual authors listed elsewhere
% in this file.
%
diff --git a/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty b/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty
index 3108e802e95..ea88385b6be 100644
--- a/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/textcomp-2018-08-11.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/textcomp.sty b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty
index df0d53634de..736b280bb18 100644
--- a/Master/texmf-dist/tex/latex-dev/base/textcomp.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty b/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty
index 70180dcbcc9..d1eea5cff4b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/tracefnt.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd
index fb97c97abeb..321e927fa5b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd
index 98a5d38e738..151bbfdefe1 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd
index 1d6ae48c351..37d38abb89b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd
index fce8290fb12..005a56cb374 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1cmvtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1enc.def b/Master/texmf-dist/tex/latex-dev/base/ts1enc.def
index 5cd97fb8357..9769bec5e17 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1enc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1enc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu
index 9615fb36d96..c94dfdb06f3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/ts1enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tuenc.def b/Master/texmf-dist/tex/latex-dev/base/tuenc.def
index c85c620c6bb..84cf8d103f8 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tuenc.def
+++ b/Master/texmf-dist/tex/latex-dev/base/tuenc.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutenc.dtx
\ProvidesFile{tuenc.def}
- [2024/11/06 v2.1b
+ [2024/12/21 v2.1c
Standard LaTeX file]
\providecommand\UnicodeEncodingName{TU}
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd b/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd
index 3d7993d8aae..b7d93f17a56 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmdh.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmr.fd b/Master/texmf-dist/tex/latex-dev/base/tulmr.fd
index 7e77b3cfdb9..579548cb95e 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmss.fd b/Master/texmf-dist/tex/latex-dev/base/tulmss.fd
index 0927f951ba3..26e852760f6 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd b/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd
index 3d19e8d06ca..f14388dc7bf 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmssq.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd b/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd
index 28ad4efa9e1..bb0f9285129 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd b/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd
index 6d0ba2299ab..17aaa7c9123 100644
--- a/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/tulmvtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2016-2024
+%% Copyright (C) 2016-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd
index 367aab2f0e4..a83e477bdb1 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ucmr.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ucmr.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd
index 24c6e14bf3b..450efb2f4ff 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ucmss.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ucmss.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd
index cd9cd439b0d..3fa1107e213 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ucmtt.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ulasy.fd b/Master/texmf-dist/tex/latex-dev/base/ulasy.fd
index da1be444688..d7d9ae0ea14 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ulasy.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ulasy.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ullasy.fd b/Master/texmf-dist/tex/latex-dev/base/ullasy.fd
index f244ab86e46..1f5b0cf7105 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ullasy.fd
+++ b/Master/texmf-dist/tex/latex-dev/base/ullasy.fd
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def b/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def
index 6e6f97feaba..76041f9ee4f 100644
--- a/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def
+++ b/Master/texmf-dist/tex/latex-dev/base/utf8-2018.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8.def b/Master/texmf-dist/tex/latex-dev/base/utf8.def
index 58308e13a07..e46edd2ee0b 100644
--- a/Master/texmf-dist/tex/latex-dev/base/utf8.def
+++ b/Master/texmf-dist/tex/latex-dev/base/utf8.def
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu
index 668359b4742..f868941e894 100644
--- a/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/utf8enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu
index 1b26bf5dee4..3cb1363d98c 100644
--- a/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu
+++ b/Master/texmf-dist/tex/latex-dev/base/x2enc.dfu
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty
index 3b41426d703..11d894c2116 100644
--- a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty
+++ b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty
@@ -11,7 +11,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -30,7 +30,7 @@
%% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle'
%% without such generated files.
%%
-%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2025
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
index 6e008fb9f04..362f29c71d1 100644
--- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
+++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
@@ -11,7 +11,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -30,18 +30,19 @@
%% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle'
%% without such generated files.
%%
-%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2025
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
-\def\LaTeXFirstAidDate{2024/11/24}
-\def\LaTeXFirstAidVersion{v1.1j}
+\def\LaTeXFirstAidDate{2025/02/16}
+\def\LaTeXFirstAidVersion{v1.1m}
\ProvidesFile{latex2e-first-aid-for-external-files.ltx}
[\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
LaTeX kernel fixes to external files and packages]
\ExplSyntaxOn
\cs_new:Npn\FirstAidNeededT#1#2#3{
- \exp_args:Ncx\str_if_eq:onF{ver@#1.#2}{#3}
+ \exp_args:Ncx\str_if_eq:onTF{ver@#1.#2}{#3}
+ { \typeout{==>~ First~ Aid~ for~ #1.#2~ applied! } }
{ \typeout{==>~ First~ Aid~ for~ #1.#2~ no~ longer~ applied!^^J
\@spaces Expected:^^J
\@spaces\@spaces #3^^J
@@ -59,7 +60,7 @@
\AddToHook{package/unicode-math/after}{%
\AddToHook{cmd/mod@math@codes/after}{\mathcode`\|=28796 }}
\ExplSyntaxOn
-\AddToHook{file/pgfpages.sty/after}[firstaid]{%
+\AddToHook{file/pgfpages.sty/after}[firstaid]{
\cs_gset_eq:NN \shipout \pgfpages@originalshipout
\cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
\cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/underscore-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/underscore-ltx.sty
index 0c5afe8215b..5a858cdf4c8 100644
--- a/Master/texmf-dist/tex/latex-dev/firstaid/underscore-ltx.sty
+++ b/Master/texmf-dist/tex/latex-dev/firstaid/underscore-ltx.sty
@@ -11,7 +11,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 2020-2024
+%% Copyright (C) 2020-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -30,7 +30,7 @@
%% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle'
%% without such generated files.
%%
-%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2024
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2025
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/color.sty b/Master/texmf-dist/tex/latex-dev/graphics/color.sty
index 6eac5d7e41a..72e94be15ce 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/color.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/color.sty
@@ -12,7 +12,7 @@
%%
%%
%% color.dtx Copyright (C) 1994--1999 David Carlisle
-%% Copyright (C) 2005-2024 LaTeX Project
+%% Copyright (C) 2005-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{color}
- [2024/06/23 v1.3e Standard LaTeX Color (DPC)]
+ [2025/01/14 v1.3e Standard LaTeX Color (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/dvipdf.def b/Master/texmf-dist/tex/latex-dev/graphics/dvipdf.def
index 54f14b9116d..bce08742bd3 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/dvipdf.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/dvipdf.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex-dev/graphics/dvipsnam.def
index 9c3e261c281..fb67b3bac03 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/dvipsnam.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/dvipsnam.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/dvipsone.def b/Master/texmf-dist/tex/latex-dev/graphics/dvipsone.def
index 0b052c068fd..f2e689b455c 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/dvipsone.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/dvipsone.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/dviwin.def b/Master/texmf-dist/tex/latex-dev/graphics/dviwin.def
index 6dd22108a49..fb8378704c5 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/dviwin.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/dviwin.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/emtex.def b/Master/texmf-dist/tex/latex-dev/graphics/emtex.def
index 2bb0144563d..a6ad73429ef 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/emtex.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/emtex.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/epsfig.sty b/Master/texmf-dist/tex/latex-dev/graphics/epsfig.sty
index 10bc2aa88e1..2b31dfc2023 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/epsfig.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/epsfig.sty
@@ -12,7 +12,7 @@
%%
%%
%% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
index bbbe11f3325..f07e7c6f40c 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
@@ -12,7 +12,7 @@
%%
%%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2024 LaTeX Project
+%% Copyright (C) 1995-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty b/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty
index de9d178cb06..c3af63def6d 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/graphicx.sty
@@ -12,7 +12,7 @@
%%
%%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2024 LaTeX Project
+%% Copyright (C) 1995-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{graphicx}
- [2021/09/16 v1.2d Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2024/12/31 v1.2e Enhanced LaTeX Graphics (DPC,SPQR)]
\DeclareOption{unknownkeysallowed}
{\PassOptionsToPackage\CurrentOption{keyval}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
@@ -131,6 +131,9 @@
\def\Gin@pagebox@trimbox{trimbox}%
\def\Gin@pagebox@artbox{artbox}%
\define@key{Gin}{alt}{}
+\define@key{Gin}{actualtext}{}
+\define@key{Gin}{artifact}[true]{%
+ \lowercase{\Gin@boolkey{#1}}{artifact}}
\def\Gin@boolkey#1#2{%
\csname Gin@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
\def\Gin@eresize{\height}
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/keyval.sty b/Master/texmf-dist/tex/latex-dev/graphics/keyval.sty
index c422add543c..02b89b74b63 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/keyval.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/keyval.sty
@@ -12,7 +12,7 @@
%%
%%
%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 David Carlisle, LaTeX Project
+%% Copyright (C) 2000-2025 David Carlisle, LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/lscape.sty b/Master/texmf-dist/tex/latex-dev/graphics/lscape.sty
index 372fdcea132..676fdff2cce 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/lscape.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/lscape.sty
@@ -12,7 +12,7 @@
%%
%%
%% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/pctex32.def b/Master/texmf-dist/tex/latex-dev/graphics/pctex32.def
index 92943879a60..6c6f711556d 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/pctex32.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/pctex32.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/pctexhp.def b/Master/texmf-dist/tex/latex-dev/graphics/pctexhp.def
index f334eb179ab..25b168ad94f 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/pctexhp.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/pctexhp.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/pctexps.def b/Master/texmf-dist/tex/latex-dev/graphics/pctexps.def
index d8c324574b0..6409bc90c31 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/pctexps.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/pctexps.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/pctexwin.def b/Master/texmf-dist/tex/latex-dev/graphics/pctexwin.def
index a25c2a7265b..3361192568e 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/pctexwin.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/pctexwin.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/rotating.sty b/Master/texmf-dist/tex/latex-dev/graphics/rotating.sty
index 5d4596be493..6f423ce791c 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/rotating.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/rotating.sty
@@ -13,12 +13,12 @@
%%
%% Copyright (C) 1995-1999 Sebastian Rahtz and Leonor Barroca
%% Copyright (C) 2001-2003,2007-2009 Robin Fairbairns
-%% Copyright (C) 2016-2024 LaTeX Project
+%% Copyright (C) 2016-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rotating}%
- [2016/08/11 v2.16d
+ [2025/01/14 v2.16e
rotated objects in LaTeX%
]
\DeclareOption{clockwise}{%
@@ -67,6 +67,7 @@
\newskip\rotFPtop \rotFPtop=\@fptop
\newskip\rotFPbot \rotFPbot=\@fpbot
\def\sideways{%
+ \leavevmode
\Grot@setangle{90}%
\setbox\z@\color@hbox\ignorespaces}
\def\endsideways{%
@@ -76,6 +77,7 @@
\Grot@box
}
\def\turn#1{%
+ \leavevmode
\Grot@setangle{#1}%
\setbox\z@\color@hbox\ignorespaces}
\def\endturn{%
@@ -85,6 +87,7 @@
\Grot@box
}
\def\rotate#1{%
+ \leavevmode
\Grot@setangle{#1}%
\setbox\z@\color@hbox\ignorespaces}
\def\endrotate{%
@@ -95,6 +98,7 @@
\Grot@box
}
\def\turnbox#1#2{%
+ \leavevmode
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
\Grot@x\z@\Grot@y\z@
@@ -110,10 +114,16 @@
\def\@xrotfloat#1[#2]{%
\@float{#1}[#2]%
\begin{lrbox}\rot@float@box
+ \SuspendTagging{\minipage}%
\begin{minipage}\textheight
+ \ResumeTagging{\minipage}%
+ \UseTaggingSocket{para/restore}%
}
\def\end@rotfloat{%
- \end{minipage}\end{lrbox}%
+ \par\SuspendTagging{\minipage}%
+ \end{minipage}%
+ \ResumeTagging{\minipage}%
+ \end{lrbox}%
\stepcounter{r@tfl@t}%
\rot@label{RF\ther@tfl@t}%
\rot@pageref{RF\ther@tfl@t}{\R@@page}%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/tcidvi.def b/Master/texmf-dist/tex/latex-dev/graphics/tcidvi.def
index 2e0a032dcfc..a4a964e22ae 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/tcidvi.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/tcidvi.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/trig.sty b/Master/texmf-dist/tex/latex-dev/graphics/trig.sty
index b5114838368..a3412372517 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/trig.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/trig.sty
@@ -12,7 +12,7 @@
%%
%%
%% File: trig.dtx Copyright (C) 1993-1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/truetex.def b/Master/texmf-dist/tex/latex-dev/graphics/truetex.def
index 28f11e78c86..305901385c7 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/truetex.def
+++ b/Master/texmf-dist/tex/latex-dev/graphics/truetex.def
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2024 LaTeX Project
+%% Copyright (C) 2000-2025 LaTeX Project
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
index d0fb0b78fa5..be1475f9536 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx
index 41d2430e8e6..ec39578cc46 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,10 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-block.dtx (C) Copyright 2021-2024 LaTeX Project
-\def\ltlabblockdate{2024-11-25}
-\def\ltlabblockversion{0.8w}
+%% File: latex-lab-block.dtx (C) Copyright 2021-2025 LaTeX Project
+\def\ltlabblockdate{2025-01-20}
+\def\ltlabblockversion{0.9a}
+
\ProvidesFile{block-latex-lab-testphase.ltx}
[\ltlabblockdate\space v\ltlabblockversion\space
blockenv implementation]
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
index 765755ee106..37e18ac70b6 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
%%
%%
%% File: documentmetadata-support.dtx
-\def\documentmetadatasupportversion{1.0j}
-\def\documentmetadatasupportdate{2024-09-13}
+\def\documentmetadatasupportversion{1.0m}
+\def\documentmetadatasupportdate{2025-02-17}
\RequirePackage{pdfmanagement-testphase}
@@ -68,7 +68,8 @@
\ExplSyntaxOn\makeatletter
\file_input:n {l3backend-testphase-\c_sys_backend_str.def}
\ExplSyntaxOff\makeatother
- \keys_set_filter:nnn { document / metadata } { init } { #1 }
+ \pdf_version_gset:n { 2.0 }
+ \keys_set_exclude_groups:nnn { document / metadata } { init } { #1 }
\bool_if:NT \g__pdfmanagement_active_bool
{
\PassOptionsToPackage{customdriver=hgeneric-testphase}{hyperref}
@@ -90,7 +91,7 @@
\hook_use_once:n {pdfmanagement/add}
\cs_set_protected:Npn \DocumentMetadata ##1
{
- \keys_set_filter:nnn { document / metadata } { init } { ##1 }
+ \keys_set_exclude_groups:nnn { document / metadata } { init } { ##1 }
\str_remove_all:cn {opt@hyperref.sty}{customdriver=hgeneric-testphase}
\bool_if:NT \g__pdfmanagement_active_bool
{
@@ -139,34 +140,17 @@
,_pdfstandard .choices:nn =
{A-1B,A-2A,A-2B,A-2U,A-3A,A-3B,A-3U,A-4}
{
- \prop_if_exist:cT { g__pdfmeta_standard_pdf/#1_prop }
- {
- \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/#1 _prop }
- }
+ \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/#1 _prop }
\AddToDocumentProperties [document]{pdfstandard}{#1}
}
,_pdfstandard / A-4F .code:n =
{
- \prop_if_exist:cTF { g__pdfmeta_standard_pdf/A-4F_prop }
- {
- \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4F_prop }
- }
- {
- \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4_prop }
- \prop_gput:Nnn \g__pdfmeta_standard_prop{conformance}{F}
- }
+ \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4F_prop }
\AddToDocumentProperties [document]{pdfstandard}{A-4F}
}
,_pdfstandard / A-4E .code:n =
{
- \prop_if_exist:cTF { g__pdfmeta_standard_pdf/A-4E_prop }
- {
- \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4E_prop }
- }
- {
- \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4_prop }
- \prop_gput:Nnn \g__pdfmeta_standard_prop{conformance}{E}
- }
+ \prop_gset_eq:Nc \g__pdfmeta_standard_prop { g__pdfmeta_standard_pdf/A-4E_prop }
\AddToDocumentProperties [document]{pdfstandard}{A-4E}
}
,_pdfstandard / unknown .code:n =
@@ -174,6 +158,14 @@
\msg_error:nnn{pdf}{unknown-standard}{#1}
}
,testphase .multichoice:
+ ,testphase / latest .code:n =
+ {
+ \keys_set:nn
+ {document / metadata}
+ {testphase={phase-III,title,table,math,firstaid}}
+ \msg_note:nnn { meta } { testphase-latest-loading }
+ { phase-III,~title,~table,~math,~firstaid }
+ }
,testphase / tagpdf .code:n =
{
\tl_gput_right:Nn\g__pdfmanagement_testphase_tl
@@ -267,6 +259,11 @@
The~language~has~not~been~set~in~\token_to_str:N
\DocumentMetadata.\\Setting~it~to~'#1'~as~fallback.
}
+\msg_new:nnn { meta } { testphase-latest-loading }
+ {
+ Loading~testphase~modules\\
+ #1
+ }
\ExplSyntaxOff\makeatother
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
index 6103a8fd9d6..7c010fccea1 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabfirstaiddate{2024-11-23}
+%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabfirstaiddate{2025-01-27}
\def\ltlabfirstaidversion{0.85i}
\ProvidesFile{firstaid-latex-lab-testphase.ltx}
[\ltlabfirstaiddate\space v\ltlabfirstaidversion\space
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
index 9dff3eac3ec..fc3fd41c502 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
%%
%%
%% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project
-\def\ltlabfloatdate{2024-11-21}
-\def\ltlabfloatversion{0.81g}
+\def\ltlabfloatdate{2024-12-27}
+\def\ltlabfloatversion{0.81h}
\ProvidesFile{float-latex-lab-testphase.ltx}
[\ltlabfloatdate\space v\ltlabfloatversion\space latex-lab wrapper float]
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
index 30d6cd9efd0..6ecbdcf2103 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,7 +32,7 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-graphic.dtx (C) Copyright 2022-2024 LaTeX Project
+%% File: latex-lab-graphic.dtx (C) Copyright 2022-2025 LaTeX Project
\def\ltlabgraphicdate{2024-09-18}
\def\ltlabgraphicversion{0.80e}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-amsmath.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-amsmath.ltx
index 0ca17cffdce..1f51c7e360c 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-amsmath.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-amsmath.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -34,38 +34,678 @@
%%
%% File: latex-lab-amsmath.dtx
\ProvidesFile{latex-lab-amsmath.ltx}
- [2024-09-18 v0.1c amsmath adaptions]
+ [2025-01-31 v0.1e amsmath adaptions]
\RequirePackage{tagpdf-base}
\ExplSyntaxOn
-\AddToHook{package/amsmath/after}
+\def\measuring@true{\let\ifmeasuring@\iftrue\tag_suspend:n{\measuring}\luamml_ignore:}
+\def\maketag@@@#1
+ {%
+ \ifmeasuring@
+ \hbox{\m@th\normalfont#1}%
+ \else
+ \UseTaggingSocket{math/display/tag/begin}
+ \hbox{\m@th\normalfont#1
+ \UseTaggingSocket{math/luamml/mtable/tag/save}
+ }%
+ \UseTaggingSocket{math/display/tag/end}
+ \fi
+ }
+\def\maketag@@@notag#1{\hbox{\m@th\normalfont#1}}
+\DeclareRobustCommand{\eqref}[1]
+ {\textup{\let\maketag@@@\maketag@@@notag\tagform@{\ref{#1}}}}
+\def\common@align@ending {
+ \math@cr \black@\totwidth@
+ \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {align}
+ \egroup
+ \ifingather@
+ \restorealignstate@
+ \egroup
+ \nonumber
+ \ifnum0=`{\fi\iffalse}\fi
+ \else
+ $$%
+ \fi
+ \ignorespacesafterend
+}
+\renewenvironment{align}{%
+ \start@align\@ne\st@rredfalse\m@ne
+}{%
+ \common@align@ending
+}
+\renewenvironment{align*}{%
+ \start@align\@ne\st@rredtrue\m@ne
+}{%
+ \common@align@ending
+}
+\renewenvironment{alignat}{%
+ \start@align\z@\st@rredfalse
+}{%
+ \common@align@ending
+}
+\renewenvironment{alignat*}{%
+ \start@align\z@\st@rredtrue
+}{%
+ \common@align@ending
+}
+\renewenvironment{flalign}{%
+ \start@align\tw@\st@rredfalse\m@ne
+}{%
+ \common@align@ending
+}
+\renewenvironment{flalign*}{%
+ \start@align\tw@\st@rredtrue\m@ne
+}{%
+ \common@align@ending
+}
+\renewenvironment{xalignat}{%
+ \start@align\@ne\st@rredfalse
+}{%
+ \common@align@ending
+}
+\renewenvironment{xalignat*}{%
+ \start@align\@ne\st@rredtrue
+}{%
+ \common@align@ending
+}
+\renewenvironment{xxalignat}{%
+ \start@align\tw@\st@rredtrue
+}{%
+ \common@align@ending
+}
+ \math_register_halign_env:nn {align}{}
+ \math_register_halign_env:nn {align*}{}
+ \math_register_halign_env:nn {alignat}{}
+ \math_register_halign_env:nn {alignat*}{}
+ \math_register_halign_env:nn {flalign}{}
+ \math_register_halign_env:nn {flalign*}{}
+ \math_register_halign_env:nn {xalignat}{}
+ \math_register_halign_env:nn {xalignat*}{}
+ \math_register_halign_env:nn {xxalignat}{}
+\def\align@preamble{%
+ &\hfil
+ \strut@
+ \setboxz@h
+ {
+ \@lign
+ $
+ \m@th\displaystyle{##}
+ \ifmeasuring@
+ \luamml_ignore:
+ \else
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ \fi
+ $
+ }%
+ \ifmeasuring@
+ \savefieldlength@
+ \else
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{box}
+ \fi
+ \set@field
+ \tabskip\z@skip
+ &\setboxz@h
+ {
+ \@lign
+ $
+ \m@th\displaystyle{{}##}
+ \ifmeasuring@
+ \luamml_ignore:
+ \else
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ \fi
+ $
+ }%
+ \ifmeasuring@
+ \savefieldlength@
+ \else
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{box}
+ \fi
+ \set@field
+ \hfil
+ \tabskip\alignsep@
+}
+\def\math@cr@@@align{%
+ \ifst@rred\nonumber\fi
+ \if@eqnsw \global\tag@true \fi
+ \global\advance\row@\@ne
+ \add@amps\maxfields@
+ \omit
+ \kern-\alignsep@
+ \iftag@
+ \setboxz@h{\@lign\strut@{\make@display@tag}}%
+ \place@tag
+ \fi
+ \UseTaggingSocket{math/luamml/mtable/tag/set}
+ \ifst@rred\else\global\@eqnswtrue\fi
+ \global\lineht@\z@
+ \cr
+}
+\def\gather@#1{%
+ \ingather@true \let\split\insplit@
+ \let\tag\tag@in@align \let\label\label@in@display
+ \chardef\dspbrk@context\z@
+ \intertext@ \displ@y@ \Let@
+ \let\math@cr@@@\math@cr@@@gather
+ \gmeasure@{#1}%
+ \global\shifttag@false
+ \tabskip\z@skip
+ \global\row@\@ne
+ \halign to\displaywidth\bgroup
+ \strut@
+ \setboxz@h
+ {
+ $\m@th\displaystyle{##}
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ }%
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{box}
+ \calc@shift@gather
+ \set@gather@field
+ \tabskip\@centering
+ &\setboxz@h{\strut@{##}}%
+ \place@tag@gather
+ \UseTaggingSocket{math/luamml/mtable/tag/set}
+ \tabskip \iftagsleft@ \gdisplaywidth@ \else \z@skip \span\fi
+ \crcr
+ #1%
+}
+\def\endgather{
+ \math@cr
+ \black@ \totwidth@
+ \UseExpandableTaggingSocket{math/luamml/mtable/finalize} {gather}
+ \egroup
+ $$
+ \ignorespacesafterend
+}
+\renewenvironment{gather*}
+ {
+ \start@gather\st@rredtrue
+ }
+ {
+ \math@cr
+ \black@\totwidth@
+ \UseExpandableTaggingSocket{math/luamml/mtable/finalize} {gather}
+ \egroup
+ $$\ignorespacesafterend
+ }
+\math_register_halign_env:nn {gather}{}
+\math_register_halign_env:nn {gather*}{}
+\renewcommand{\start@aligned}[2]{
+ \RIfM@
+ \else
+ \nonmatherr@ {\begin{\@currenvir}}
+ \fi
+ \savecolumn@ % Assumption: called inside a group
+ \UseTaggingSocket{math/luamml/annotate/false}{}{ \alignedspace@left }
+ \ams@start@box {#1} \bgroup
+ \maxfields@ #2 \relax
+ \ifnum \maxfields@ > \m@ne
+ \multiply \maxfields@ \tw@
+ \let \math@cr@@@ \math@cr@@@alignedat
+ \alignsep@ \z@skip
+ \else
+ \let \math@cr@@@ \math@cr@@@aligned
+ \alignsep@ \minalignsep
+ \fi
+ \Let@ \chardef \dspbrk@context \@ne
+ \default@tag
+ \spread@equation % no-op if already called
+ \global \column@ \z@
+ \ialign \bgroup
+ & \column@plus
+ \hfil
+ \strut@
+ $
+ \m@th
+ \displaystyle
+ {##}
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \tabskip \z@skip
+ & \column@plus
+ $
+ \m@th
+ \displaystyle
+ {
+ {}
+ ##
+ }
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \hfil
+ \tabskip\alignsep@
+ \crcr
+ \ams@return@opt@arg
+}
+\renewenvironment{gathered}[1][c]{%
+ \RIfM@\else
+ \nonmatherr@{\begin{gathered}}%
+ \fi
+ \UseTaggingSocket{ math/luamml/annotate/false } {}{ \alignedspace@left }
+ \ams@start@box{#1}\bgroup
+ \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
+ \spread@equation
+ \ialign\bgroup
+ \hfil\strut@$\m@th\displaystyle##
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \hfil
+ \crcr
+ \ams@return@opt@arg
+}{%
+ \endaligned
+}
+\def\endaligned
{
- \def\intertext@{%
- \def\intertext##1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip-\belowdisplayskip
- \vbox{
- \ifmeasuring@\tag_suspend:n{\measuring}\fi
- \normalbaselines
- \ifdim\linewidth=\columnwidth
- \else \parshape\@ne \@totalleftmargin \linewidth
+ \crcr
+ \UseExpandableTaggingSocket{math/luamml/mtable/innertable/save}
+ \egroup
+ \restorecolumn@
+ \egroup
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}
+ }
+\renewenvironment{multline*}{\start@multline\st@rredtrue}
+ {%
+ \iftagsleft@ \@xp\lendmultline@ \else \@xp\rendmultline@ \fi
+ \ignorespacesafterend
+ }
+\math_register_halign_env:nn {multline}{}
+\math_register_halign_env:nn {multline*}{}
+\def\multline@#1{%
+ \Let@
+ \@display@init{\global\advance\row@\@ne \global\dspbrk@lvl\m@ne}%
+ \chardef\dspbrk@context\z@
+ \restore@math@cr
+ \let\tag\tag@in@align
+ \global\tag@false \global\let\raise@tag\@empty
+ \mmeasure@{#1}%
+ \let\tag\gobble@tag \let\label\@gobble
+ \tabskip \if@fleqn \@mathmargin \else \z@skip \fi
+ \totwidth@\displaywidth
+ \if@fleqn
+ \advance\totwidth@-\@mathmargin
+ \fi
+ \halign\bgroup
+ \hbox to\totwidth@{%
+ \if@fleqn
+ \hskip \@centering \relax
+ \else
+ \hfil
\fi
- \tag_mc_end_push:
- \tagpdfsetup{para/tag=P}%
- \tagpdfparaOn
- \noindent\ignorespaces##1\par
- \tag_mc_begin_pop:n{}}%
- \penalty\predisplaypenalty\vskip\abovedisplayskip%
+ \strut@
+ $\m@th\displaystyle{}##\endmultline@math
+ \hfil
}%
- }}
- }
+ \crcr
+ \if@fleqn
+ \hskip-\@mathmargin
+ \def\multline@indent{\hskip\@mathmargin}% put it back
+ \else
+ \hfilneg
+ \def\multline@indent{\hskip\multlinegap}%
+ \fi
+ \iftagsleft@
+ \iftag@
+ \begingroup
+ \ifshifttag@
+ \rlap{\vbox{%
+ \normalbaselines
+ \hbox{%
+ \strut@
+ \make@display@tag
+ }%
+ \vbox to\lineht@{}%
+ \raise@tag
+ }}%
+ \multline@indent
+ \else
+ \setbox\z@\hbox{\make@display@tag}%
+ \dimen@\@mathmargin \advance\dimen@-\wd\z@
+ \ifdim\dimen@<\multlinetaggap
+ \dimen@\multlinetaggap
+ \fi
+ \box\z@ \hskip\dimen@\relax
+ \fi
+ \endgroup
+ \else
+ \multline@indent
+ \fi
+ \else
+ \multline@indent
+ \fi
+ \ifmeasuring@ \else
+ \UseTaggingSocket{math/luamml/mtable/aligncol} {left}
+ \fi
+ #1%
+ \ifmeasuring@ \else
+ \UseTaggingSocket{math/luamml/mtable/aligncol} {right}
+ \fi
+}
+\def\endmultline@math
+ {
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ }
+\def\rendmultline@{%
+ \iftag@
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \let\endmultline@math\relax
+ \ifshifttag@
+ \hskip\multlinegap
+ \llap{\vtop{%
+ \raise@tag
+ \normalbaselines
+ \setbox\@ne\null
+ \dp\@ne\lineht@
+ \box\@ne
+ \hbox{\strut@\make@display@tag}%
+ }}%
+ \else
+ \hskip\multlinetaggap
+ \make@display@tag
+ \fi
+ \UseTaggingSocket{math/luamml/mtable/tag/set}
+ \else
+ \hskip\multlinegap
+ \fi
+ \hfilneg
+ \math@cr
+ \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
+ \egroup$$%
+}
+\def\lendmultline@{%
+ \hfilneg
+ \hskip\multlinegap
+ \math@cr
+ \UseExpandableTaggingSocket {math/luamml/mtable/finalize} {multline}
+ \egroup
+ $$%
+}
+\def\env@cases{%
+ \let\@ifnextchar\new@ifnextchar
+ \left\lbrace
+ \def\arraystretch{1.2}%
+ \array{@{}l@{\quad}l@{\luamml_ignore:}}%
+}
+
+\renewenvironment {smallmatrix} {
+ \UseTaggingSocket{ math/luamml/annotate/false } {} { \null\, }
+ \vcenter \bgroup
+ \Let@
+ \restore@math@cr
+ \default@tag
+ \baselineskip 6 \ex@
+ \lineskip 1.5 \ex@
+ \lineskiplimit \lineskip
+ \ialign \bgroup
+ \hfil
+ $
+ \m@th
+ \scriptstyle
+ ##
+ % No \scriptsize here since we want to add the mstyle nodes
+ \UseTaggingSocket{math/luamml/save/nn}{ {} {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \hfil
+ &&
+ \thickspace
+ \hfil
+ $
+ \m@th
+ \scriptstyle
+ ##
+ % No \scriptsize here since we want to add the mstyle nodes
+ \UseTaggingSocket{math/luamml/save/nn}{ {} {mtd} }
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \hfil
+ \crcr
+}{%
+ \crcr
+ \UseExpandableTaggingSocket{math/luamml/mtable/smallmatrix/save}
+ \egroup
+ \egroup
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}
+ \UseTaggingSocket{ math/luamml/annotate/false } {}{ \, }
+}
+\cs_new:Npn\__math_split_debug_typeout:n#1{\use_none:n{#1}}
+\bool_new:N\l__math_gathersplit_bool
+\renewenvironment{split}{%
+ \__math_split_debug_typeout:n {begin~split}
+ \if@display
+ \ifinner
+ \@xp\@xp\@xp\split@aligned
+ \else
+ \ifst@rred \else \global\@eqnswtrue \fi
+ \fi
+ \else
+ \let\endsplit\@empty \@xp\collect@body\@xp\split@err
+ \fi
+ \collect@body\gather@split
+}{\__math_split_debug_typeout:n{end~split}%
+ \crcr
+ \UseExpandableTaggingSocket{math/luamml/mtable/innertable/save}%
+ \egroup
+ \egroup
+ \iftagsleft@ \@xp\lendsplit@ \else \@xp\rendsplit@ \fi
+}
+\def\gather@split#1#2#3{
+ \__math_split_debug_typeout:n{gather@split}%
+ \@xp\endgroup \reset@equation % math@cr will handle equation numbering
+ \iftag@
+ \toks@\@xp{\df@tag}%
+ \edef\split@tag{%
+ \gdef\@nx\df@tag{\the\toks@}%
+ \global\@nx\tag@true \@nx\nonumber
+ }%
+ \else \let\split@tag\@empty
+ \fi
+ \bool_set_true:N\l__math_gathersplit_bool
+ \spread@equation
+ \vcenter\bgroup
+ \gather@{\split@tag
+ \begin{split}#1\end{split}}%
+ \def\endmathdisplay@a{%
+ \__math_split_debug_typeout:n{endmathdisplay@a}
+ \__math_split_debug_typeout:n{finalize~innertable~endmathdisplay@a}
+ \math@cr
+ \black@ \totwidth@
+ \egroup
+ \egroup
+ \UseExpandableTaggingSocket{math/luamml/mtable/innertable/finalize}%
+ }%
+}
+\def\insplit@{\__math_split_debug_typeout:n{insplit@}%
+ \global\setbox\z@\vbox\bgroup
+ \Let@ \chardef\dspbrk@context\@ne \restore@math@cr
+ \default@tag % disallow use of \tag here
+ \ialign\bgroup
+ \hfil
+ \strut@
+ $\m@th\displaystyle {##}%
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }%
+ $%
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}%
+ &$\m@th\displaystyle {{}##}%
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd} }%
+ $%
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}%
+ \hfill % Why not \hfil?---dmj, 1994/12/28
+ \crcr
+}
+\def\lendsplit@{%
+ \global\setbox9\vtop{\unvcopy\z@}%
+ \ifinalign@
+ \setbox\@ne\vbox{%
+ \unvcopy\z@
+ \global\setbox8\lastbox
+ }%
+ \setbox\@ne\hbox{%
+ \unhcopy8%
+ \unskip
+ \setbox\tw@\lastbox
+ \unskip
+ \global\setbox\thr@@\lastbox
+ }%
+ \__math_split_debug_typeout:n{lendsplit@/aligncase}
+ \ifctagsplit@
+ \__math_split_debug_typeout:n{lendsplit@/aligncase/centertags}
+ \gdef\split@{%
+ \hbox to\wd\thr@@{}%
+ &\vcenter{\vbox{\moveleft\wd\thr@@\box9}}%
+ \__math_split_debug_typeout:n{finalize~innertable~aligncase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}%
+ }%
+ \else
+ %TODO, not correct yet.
+ \__math_split_debug_typeout:n{lendsplit@/aligncase/tbtags}
+ \gdef\split@{%
+ \hbox to\wd\thr@@{}%
+ &\vbox{\moveleft\wd\thr@@\box9}%
+ \__math_split_debug_typeout:n{finalize~innertable~aligncase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}%
+ }%
+ \fi
+ \else
+ \ifctagsplit@
+ \bool_if:NTF \l__math_gathersplit_bool
+ {
+ \__math_split_debug_typeout:n{lendsplit/equationcase/centertags}
+ \gdef\split@%
+ {\UseTaggingSocket{math/luamml/annotate/false}{}{\vcenter{\box9}}}
+ }
+ {
+ \__math_split_debug_typeout:n {lendsplit/gathercase/centertags}
+ \gdef\split@{\vcenter{\box9}%
+ \__math_split_debug_typeout:n {finalize~innertable~gathercase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}}
+ }
+ \else
+ % TODO tbtags not correct yet.
+ \bool_if:NTF \l__math_gathersplit_bool
+ {
+ \__math_split_debug_typeout:n {lendsplit/equationcase/tbtags}
+ \gdef\split@%
+ {\UseTaggingSocket{math/luamml/annotate/false}{}{\box9}}
+ }
+ {
+ \__math_split_debug_typeout:n {lendsplit/gathercase/tbtags}
+ \gdef\split@{
+ \box9%
+ \__math_split_debug_typeout:n {finalize~innertable~gathercase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}}
+ }
+ \fi
+ \fi
+ \aftergroup\split@
+}
+\def\rendsplit@{%
+ \ifinalign@
+ \global\setbox9 \vtop{%
+ \unvcopy\z@
+ \global\setbox8 \lastbox
+ \unskip
+ }%
+ \setbox\@ne\hbox{%
+ \unhcopy8
+ \unskip
+ \global\setbox\tw@\lastbox
+ \unskip
+ \global\setbox\thr@@\lastbox
+ }%
+ \ifctagsplit@
+ \gdef\split@{%
+ \hbox to\wd\thr@@{}
+ &\vcenter{\vbox{\moveleft\wd\thr@@\boxz@}}%
+ \__math_split_debug_typeout:n {rendsplit/aligncase/centertags}
+ \__math_split_debug_typeout:n {finalize~innertable~aligncase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}
+ }%
+ \else
+ \__math_split_debug_typeout:n{rendsplit@/aligncase/tbtags}
+ %TODO tbtags is not correct yet
+ \global\setbox7 \hbox{\unhbox\tw@\unskip}%
+ \gdef\split@{%
+ \global\@tempcnta\column@
+ &\setboxz@h{}%
+ \savetaglength@
+ \global\advance\row@\@ne
+ \vbox{\moveleft\wd\thr@@\box9}%
+ \crcr
+ \noalign{\global\lineht@\z@}%
+ \add@amps\@tempcnta
+ \UseTaggingSocket{math/luamml/annotate/false}{}{\box\thr@@}
+ &\box7
+ \__math_split_debug_typeout:n {finalize~innertable~aligncase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}%
+ }%
+ \fi
+ \else
+ \ifctagsplit@
+ \bool_if:NTF \l__math_gathersplit_bool
+ {
+ \__math_split_debug_typeout:n {rendsplit/equationcase/centertags}
+ \gdef\split@%
+ {\UseTaggingSocket{math/luamml/annotate/false}{}{\vcenter{\boxz@}}}
+ }
+ {
+ \__math_split_debug_typeout:n {rendsplit/gathercase/centertags}
+ \gdef\split@{\vcenter{\boxz@}%
+ \__math_split_debug_typeout:n {finalize~innertable~gathercase}
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}}
+ }
+ \else
+ \bool_if:NTF \l__math_gathersplit_bool
+ {
+ \__math_split_debug_typeout:n {rendsplit/equationcase/tbtags}
+ \gdef\split@{%
+ \UseTaggingSocket{math/luamml/annotate/false}{}{\boxz@}}
+ }
+ {
+ \__math_split_debug_typeout:n {rendsplit/gathercase/tbtags}
+ \gdef\split@{%
+ \boxz@
+ \UseTaggingSocket{math/luamml/mtable/innertable/finalize}}
+ }
+ \fi
+ \fi
+ \aftergroup\split@
+}
+\def\intertext@{%
+ \def\intertext##1{%
+ \ifvmode\else\\\@empty\fi
+ \noalign{%
+ \penalty\postdisplaypenalty\vskip-\belowdisplayskip
+ \vbox{
+ \ifmeasuring@\tag_suspend:n{\measuring}\fi
+ \normalbaselines
+ \ifdim\linewidth=\columnwidth
+ \else \parshape\@ne \@totalleftmargin \linewidth
+ \fi
+ \tag_mc_end_push:
+ \tagpdfsetup{para/tag=P}%
+ \tagpdfparaOn
+ \noindent\ignorespaces##1\par
+ \tag_mc_begin_pop:n{}}%
+ \penalty\predisplaypenalty\vskip\abovedisplayskip%
+ }%
+}}
\AddToHook{package/amstext/after}
{
\tag_if_active:T
{
\sys_if_engine_luatex:TF
{
- \def\text@#1{{%
+ \def\text@#1{
+ \tag_socket_use:nnn {math/luamml/hbox}{}
+ {{%
\ifcase\mathstyle
\hbox{{#1}}\or
\hbox{{#1}}\or
@@ -78,7 +718,7 @@
\ERROR
\fi
\check@mathfonts
- }}
+ }}}
}
{
\def\text@#1
@@ -109,25 +749,25 @@
}
\AddToHook{package/amsbsy/after}
{
- \def\pmb@@#1#2#3{\leavevmode\hbox_set:Nn\l__math_tmpa_box{xxx#3}
- \dimen@-\box_wd:N\l__math_tmpa_box
- \kern-.5\ex@\box_use:N\l__math_tmpa_box
+ \def\pmb@@#1#2#3{\leavevmode\hbox_set:Nn\l_@@_tmpa_box{xxx#3}
+ \dimen@-\box_wd:N\l_@@_tmpa_box
+ \kern-.5\ex@\box_use:N\l_@@_tmpa_box
\tag_mc_end:\tag_mc_begin:n{artifact}
- \tag_mc_reset_box:N\l__math_tmpa_box
- \kern\dimen@\kern.25\ex@\raise.4\ex@\box_use:N\l__math_tmpa_box
- \kern\dimen@\kern.25\ex@\box_use_drop:N\l__math_tmpa_box
+ \tag_mc_reset_box:N\l_@@_tmpa_box
+ \kern\dimen@\kern.25\ex@\raise.4\ex@\box_use:N\l_@@_tmpa_box
+ \kern\dimen@\kern.25\ex@\box_use_drop:N\l_@@_tmpa_box
\tag_mc_end:\tag_mc_begin:n{}
}
- \def\pmb@#1#2{\hbox_set:Nn\l__math_tmpa_box{$\m@th#1{#2}$}
+ \def\pmb@#1#2{\hbox_set:Nn\l_@@_tmpa_box{$\m@th#1{#2}$}
\setboxz@h{$\m@th#1\mkern.5mu$}\pmbraise@\wdz@
\binrel@{#2}
- \dimen@-\box_wd:N\l__math_tmpa_box
+ \dimen@-\box_wd:N\l_@@_tmpa_box
\binrel@@{
- \mkern-.8mu\box_use:N\l__math_tmpa_box
+ \mkern-.8mu\box_use:N\l_@@_tmpa_box
\tag_mc_end:\tag_mc_begin:n{artifact}
- \tag_mc_reset_box:N\l__math_tmpa_box
- \kern\dimen@\mkern.4mu\raise\pmbraise@\box_use:N\l__math_tmpa_box
- \kern\dimen@\mkern.4mu\box_use_drop:N\l__math_tmpa_box
+ \tag_mc_reset_box:N\l_@@_tmpa_box
+ \kern\dimen@\mkern.4mu\raise\pmbraise@\box_use:N\l_@@_tmpa_box
+ \kern\dimen@\mkern.4mu\box_use_drop:N\l_@@_tmpa_box
\tag_mc_end:\tag_mc_begin:n{}
}
}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
index 3fb53a3934a..34a8969084b 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
%%
%%
%% File: latex-lab-footnotes.dtx
-\def\ltlabfootnotedate{2024-09-30}
-\def\ltlabfootnoteversion{0.8g}
+\def\ltlabfootnotedate{2025-02-20}
+\def\ltlabfootnoteversion{0.8k}
%%
%% Copyright (c) 1995-2011 Robin Fairbairns
@@ -60,7 +60,7 @@
\DeclareRelease{v5}{2011-06-06}{footmisc-2011-06-06.sty}
\DeclareCurrentRelease{}{2022-02-14}
\ProvidesPackage{latex-lab-footmisc}%
- [2022/03/08 v6.0d
+ [2025/02/20 v6.0e
a miscellany of footnote facilities -- latex-lab version%
]
@@ -167,10 +167,10 @@
\DeclareOption{multiple}{\FN@multiplefootnotetrue}
\ProcessOptions
\ifFN@para
- \NewSocketPlug{@makecol/footnotes}{para}{%
+ \NewSocketPlug{build/column/footnotes}{para}{%
\global\setbox\footins\vbox{\FN@makefootnoteparagraph}%
}
- \AssignSocketPlug{@makecol/footnotes}{para}
+ \AssignSocketPlug{build/column/footnotes}{para}
\fi
\ifFN@fixskip
\def\@outputbox@removebskip{%
@@ -194,23 +194,23 @@
\fi
\ifcase \FN@bottomcases\relax
\ERROR
-\or %1
+\or %1 bottom option
\ifFN@abovefloats
- \AssignSocketPlug {@makecol/outputbox}{space-footnotes-floats}
+ \AssignSocketPlug {build/column/outputbox}{space-footnotes-floats}
\else
- \AssignSocketPlug {@makecol/outputbox}{floats-footnotes-space}
+ \AssignSocketPlug {build/column/outputbox}{floats-space-footnotes}
\fi
-\or %2
+\or %2 bottomfloats
\ifFN@abovefloats
- \AssignSocketPlug {@makecol/outputbox}{footnotes-space-floats}
+ \AssignSocketPlug {build/column/outputbox}{footnotes-space-floats}
\else
- \AssignSocketPlug {@makecol/outputbox}{space-floats-footnotes}
+ \AssignSocketPlug {build/column/outputbox}{space-floats-footnotes}
\fi
-\or %3
+\or %3 neither bottom nor bottomfloats
\ifFN@abovefloats
- \AssignSocketPlug {@makecol/outputbox}{footnotes-floats}
+ \AssignSocketPlug {build/column/outputbox}{footnotes-floats}
\else
- \AssignSocketPlug {@makecol/outputbox}{floats-footnotes}
+ \AssignSocketPlug {build/column/outputbox}{floats-footnotes}
\fi
\else
\ERROR
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
index 85a3b2b32a7..5e2e1306f11 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
%%
%%
%% File: latex-lab-footnotes.dtx
-\def\ltlabfootnotedate{2024-09-30}
-\def\ltlabfootnoteversion{0.8g}
+\def\ltlabfootnotedate{2025-02-20}
+\def\ltlabfootnoteversion{0.8k}
\ProvidesFile{latex-lab-footnotes.ltx}
[\ltlabfootnotedate\space v\ltlabfootnoteversion\space
@@ -157,7 +157,7 @@
\cs_new_eq:NN \__fnote_footnotemark_finish: \__fnote_footnotemark_default_finish:
\NewSocket{tagsupport/fnmark}{1}
\cs_set_eq:NN \@footnotemark \fnote_footnotemark:
-\str_if_exist:cF { l__socket_tagsupport/para/restore_plug_str }
+\socket_if_exist:nF {tagsupport/para/restore}
{
\NewSocket{tagsupport/para/restore}{0}
\NewSocketPlug{tagsupport/para/restore}{default}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
index 762391f091f..e9d3c8acd1e 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
@@ -9,7 +9,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,9 +33,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabkerneldate{2024-07-11}
-\def\ltlabkernelversion{0.85d}
+%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabkerneldate{2024-12-27}
+\def\ltlabkernelversion{0.85e}
\ProvidesPackage{latex-lab-kernel-changes}
[\ltlabkerneldate\space v\ltlabkernelversion\space
General kernel and class changes]
@@ -66,9 +66,9 @@
}
}
\ExplSyntaxOff
-%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabsecdate{2024-10-04}
-\def\ltlabsecversion{0.84f}
+%% File: latex-lab-sec.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabsecdate{2025-02-18}
+\def\ltlabsecversion{0.84i}
\ifdefined\directlua
\ifnum\outputmode > 0
\pdfvariable gentounicode =1
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx
index e76fcff474e..b57ea34becd 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,9 @@
%%
%%
%% File: latex-lab-math.dtx
-\def\ltlabmathdate{2024-11-26}
-\def\ltlabmathversion{0.6j}
+
+\def\ltlabmathdate{2025-02-20}
+\def\ltlabmathversion{0.6l}
\ProvidesFile{latex-lab-math.ltx}
[\ltlabmathdate\space
v\ltlabmathversion\space
@@ -115,7 +116,7 @@
{
<!DOCTYPE~html>
\iow_newline:
- <html>
+ <html~ xmlns="http://www.w3.org/1999/xhtml">
\iow_newline:
}
\tl_new:N \l__math_mathml_write_before_tl
@@ -168,103 +169,12 @@
}
\sys_if_engine_luatex:TF
{
- \cs_new_protected:Npn \__math_correct_luamml_array_patches:
- {
- \AddToHook{package/array/after}
- {
- \cs_set:Npn \endarray
- {
- \tbl_crcr:n{endarray}
- \__luamml_array_save_array:
- \egroup
- \UseTaggingSocket{tbl/finalize}
- \tbl_restore_outer_cell_data:
- \egroup
- \mode_if_math:T { \__luamml_array_finalize_array: }
- \@arrayright
- \gdef \@preamble {}
- }
- \cs_set:Npn \@classz
- {
- \@classx
- \@tempcnta \count@
- \prepnext@tok
- \@addtopreamble {
- \ifcase \@chnum
- \hfil
- \hskip 1sp
- \d@llarbegin
- \cs_if_eq:NNTF \d@llarbegin \begingroup {
- \insert@column
- \d@llarend
- } {
- \__luamml_array_init_col:
- \insert@column
- \luamml_flag_save:nn {} {mtd}
- \d@llarend
- \__luamml_array_finalize_col:w 0~
- }
- \do@row@strut
- \hfil
- \or
- \hskip 1sp
- \d@llarbegin
- \cs_if_eq:NNTF \d@llarbegin \begingroup {
- \insert@column
- \d@llarend
- } {
- \__luamml_array_init_col:
- \insert@column
- \luamml_flag_save:nn {} {mtd}
- \d@llarend
- \__luamml_array_finalize_col:w 1~
- }
- \do@row@strut
- \hfil
- \or
- \hfil
- \hskip 1sp
- \d@llarbegin
- \cs_if_eq:NNTF \d@llarbegin \begingroup {
- \insert@column
- \d@llarend
- } {
- \__luamml_array_init_col:
- \insert@column
- \luamml_flag_save:nn {} {mtd}
- \d@llarend
- \__luamml_array_finalize_col:w 2~
- }
- \do@row@strut
- \or
- \setbox \ar@mcellbox \vbox \@startpbox { \@nextchar }
- \insert@pcolumn
- \@endpbox
- \ar@align@mcell
- \do@row@strut
- \or
- \vtop \@startpbox { \@nextchar }
- \insert@pcolumn
- \@endpbox
- \do@row@strut
- \or
- \vbox \@startpbox { \@nextchar }
- \insert@pcolumn
- \@endpbox
- \do@row@strut
- \fi
- }
- \prepnext@tok
- }
- }
- }
\AddToHook{begindocument/before}
{
\str_case:on \g__math_luamml_load_tl
{
{ 1 } {
\RequirePackage { luamml }
- \__math_correct_luamml_array_patches:
\AddToHook{begindocument/end}
{
\__math_luamml_activate_write:
@@ -282,7 +192,6 @@
\@ifpackageloaded { unicode-math }
{
\RequirePackage { luamml }
- \__math_correct_luamml_array_patches:
\AddToHook{begindocument/end}
{
\__math_luamml_activate_write:
@@ -295,7 +204,10 @@
}
}
{
- \__math_provide_luamml_commands:
+ \AddToHook{begindocument/before}
+ {
+ \__math_provide_luamml_commands:
+ }
}
\msg_new:nnn { tag }{ luamml-status }
{
@@ -319,8 +231,6 @@
\bool_gset_true:N\g__tag_math_mathml_AF_bool
\AssignSocketPlug{tagsupport/math/struct/begin}{mathml-AF}
\AssignSocketPlug{tagsupport/math/struct/end}{mathml-AF}
- \AssignSocketPlug{tagsupport/math/substruct/begin}{single}
- \AssignSocketPlug{tagsupport/math/substruct/end}{single}
\int_set:Nn \l__luamml_pretty_int { 7 }
\RegisterFamilyMapping\symsymbols{oms}
\RegisterFamilyMapping\symletters{oml}
@@ -332,6 +242,9 @@
{
\tl_if_empty:NF \l__math_mathml_write_before_tl
{
+ \int_compare:nNnF
+ { \@math@level } = { 1 }
+ { \tl_put_right:Ne \l__math_content_hash_tl {-INNER} }
\iow_now:Ne \g__math_luamml_iow
{
\l__math_mathml_write_before_tl
@@ -408,7 +321,7 @@
\iow_now:Ne \g__math_writedummy_iow
{
\l__math_mathml_write_before_tl
- <math></math>
+ <math~ xmlns="http://www.w3.org/1998/Math/MathML"></math>
\c__math_mathml_write_after_tl
}
}
@@ -470,8 +383,6 @@
\typeout{Info:~Activating~mathml~support}
\AssignSocketPlug{tagsupport/math/struct/begin}{mathml-AF}
\AssignSocketPlug{tagsupport/math/struct/end}{mathml-AF}
- \AssignSocketPlug{tagsupport/math/substruct/begin}{single}
- \AssignSocketPlug{tagsupport/math/substruct/end}{single}
\AddToHook{enddocument/info}
{
\iow_term:n{MathML~statistic}
@@ -532,10 +443,54 @@
\bool_set_true:N\l__tag_math_alt_bool
}
}
-\socket_new:nn {tagsupport/math/inline/begin}{0}
-\socket_new:nn {tagsupport/math/inline/end}{0}
-\socket_new:nn {tagsupport/math/inline/formula/begin}{2} %
-\socket_new:nn {tagsupport/math/inline/formula/end}{0}
+\keys_define:nn {__tag / setup}
+ {
+ math/setup .code:n =
+ {
+ %deactivate loading of luamml
+ \tl_gset:Nn \g__math_luamml_load_tl{-1}
+ \keys_set:nn {__tag / setup}
+ {
+ %deactivate tex source AF
+ math/tex/AF = false,
+ %deactivate reading of mathml-AF
+ math/mathml/sources=,
+ math/mathml/AF=false,
+ %deactivate structelem
+ math/mathml/structelem=false,
+ %handle value
+ }
+ \clist_map_inline:nn { #1}
+ {
+ \keys_set:nn {__tag/ setup}{math/__setup/##1}
+ }
+ },
+ math/__setup / mathml-SE .code:n =
+ {
+ \tl_gset:Nn \g__math_luamml_load_tl{1}
+ \keys_set:nn {__tag / setup}
+ {
+ math/mathml/structelem=true
+ }
+ },
+ math/__setup / mathml-AF .code:n =
+ {
+ \tl_gset:Nn \g__math_luamml_load_tl{1}
+ \clist_put_right:Ne\l__tag_math_mathml_files_clist
+ {\c_sys_jobname_str-mathml,\c_sys_jobname_str-luamml-mathml}
+ \keys_set:nn {__tag / setup}
+ {
+ math/mathml/AF=true
+ }
+ },
+ math/__setup / tex-AF .code:n =
+ {
+ \keys_set:nn {__tag / setup}
+ {
+ math/tex/AF =true
+ }
+ },
+ }
\socket_new_plug:nnn
{tagsupport/math/inline/begin}
{MC}
@@ -551,8 +506,6 @@
\__math_luamml_structelem:
\tag_socket_use:n{math/content}
\tag_socket_use:n{math/struct/begin}
- % inner formula if multiple parts (not really implemented yet)
- \tag_socket_use:n{math/substruct/begin}
#2
\tag_socket_use:n{math/end}
}
@@ -560,13 +513,8 @@
{tagsupport/math/inline/formula/end}
{default}
{
- \socket_use:n{tagsupport/math/substruct/end}
\socket_use:n{tagsupport/math/struct/end}
}
-\socket_new:nn {tagsupport/math/display/begin}{0}
-\socket_new:nn {tagsupport/math/display/end}{0}
-\socket_new:nn {tagsupport/math/display/formula/begin}{2} %
-\socket_new:nn {tagsupport/math/display/formula/end}{0}
\socket_new_plug:nnn
{tagsupport/math/display/begin}
@@ -586,7 +534,6 @@
\__math_luamml_structelem:
\tag_socket_use:n{math/content}
\tag_socket_use:n{math/struct/begin}
- \tag_socket_use:n{math/substruct/begin}
#2
\tag_socket_use:n{math/end}
}
@@ -594,9 +541,26 @@
{tagsupport/math/display/formula/end}
{default}
{
- \socket_use:n{tagsupport/math/substruct/end}
\socket_use:n{tagsupport/math/struct/end}
}
+\socket_new_plug:nnn
+ {tagsupport/math/display/tag/begin}
+ {default}
+ {
+ \tag_mc_end:
+ \tag_struct_begin:n {tag=Lbl}
+ \tag_mc_begin:n {}
+ }
+\socket_new_plug:nnn
+ {tagsupport/math/display/tag/end}
+ {default}
+ {
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin:n{}
+ }
+\socket_assign_plug:nn {tagsupport/math/display/tag/begin}{default}
+\socket_assign_plug:nn {tagsupport/math/display/tag/end}{default}
\tl_new:N\l__math_content_template_tl
\tl_set:Nn \l__math_content_template_tl
{
@@ -685,11 +649,13 @@
actualtext = \l__math_content_actual_tl,
alt = \l__math_content_alt_tl
}
+ \typeout{====>grabbed~math=\meaning\g__math_grabbed_math_tl}
+ \tag_mc_begin:n{}
}
\socket_new_plug:nnn
{tagsupport/math/struct/end}
{default}
- { \tag_struct_end: }
+ { \tag_mc_end: \tag_struct_end: }
\socket_assign_plug:nn {tagsupport/math/struct/begin}{default}
\socket_assign_plug:nn {tagsupport/math/struct/end}{default}
@@ -749,43 +715,16 @@
title-o = \g__math_grabbed_env_tl, %
alt = \l__math_content_alt_tl
}
+ \typeout{====>grabbed~math=\meaning\g__math_grabbed_math_tl}
+ \tag_mc_begin:n{}
}
\socket_new_plug:nnn
{tagsupport/math/struct/end}
{mathml-AF}
{
+ \tag_mc_end:
\tag_struct_end:
}
-\socket_new:nn {tagsupport/math/substruct/begin}{0}
-\socket_new:nn {tagsupport/math/substruct/end}{0}
-\socket_new_plug:nnn
- {tagsupport/math/substruct/begin}
- {default}
- { \grabaformulapartandstart }
-\socket_new_plug:nnn
- {tagsupport/math/substruct/end}
- {default}
- {
- \tagmcend
- \if@subformulas
- \tagstructend
- \fi
- }
-\socket_assign_plug:nn {tagsupport/math/substruct/begin}{default}
-\socket_assign_plug:nn {tagsupport/math/substruct/end}{default}
-
-\socket_new_plug:nnn
- {tagsupport/math/substruct/begin}
- {single}
- {
- \typeout{====>subpart~splitting~deactivated}
- \typeout{====>grabbed~math=\meaning\g__math_grabbed_math_tl}
- \tag_mc_begin:n{}
- }
-\socket_new_plug:nnn
- {tagsupport/math/substruct/end}
- {single}
- { \tag_mc_end:}
\socket_new:nn {tagsupport/math/end}{0}
\socket_assign_plug:nn {tagsupport/math/inline/begin}{MC}
\socket_assign_plug:nn {tagsupport/math/inline/end}{MC}
@@ -814,6 +753,8 @@
\cs_new_protected:Npn \__math_process_auxii:nn #1#2 { }
\cs_new_protected:Npn \math_processor:n #1
{ \cs_set_protected:Npn \__math_process_auxii:nn ##1##2 {#1} }
+\cs_set_protected:Npn\MathCollectTrue{\bool_set_false:N \l__math_collected_bool}
+\cs_set_protected:Npn\MathCollectFalse{\bool_set_true:N \l__math_collected_bool}
\cs_new_protected:Npn \__math_grab_dollar:w { \__math_grab_dollar_delim:w }
\cs_new_protected:Npn \__math_grab_dollar:n #1
{
@@ -857,10 +798,12 @@
\l__math_tmpa_skip \lastskip
\tag_socket_use:n{math/display/formula/end}
\nobreak
- \skip_vertical:n { -\l__math_tmpa_skip } % remove the negative belowdisplayskip
+ \skip_vertical:n { -\l__math_tmpa_skip }
\penalty \postdisplaypenalty
\skip_vertical:n { -\l__math_tmpa_skip } % insert the correct skip
- \@doendpe % this has no \end{...} to take care of it
+ \skip_vertical:n { -\tex_parskip:D }
+ \@domathendpetrue
+ \@doendpe % this has no \end{...} to take care of it
}
\cs_new_protected:Npn \__math_grab_inline:w % \(
@@ -992,7 +935,6 @@
{
}
}
-
\cs_new_protected:Npn \math_register_halign_env:nn #1#2
{
\tl_set:Nn \l__math_env_name_tl {#1}
@@ -1051,7 +993,6 @@
}
}
-
\cs_new:Npn \@kernel@math@registered@begin {
\mode_if_vertical:TF
{
@@ -1149,19 +1090,10 @@
\math_register_env:n { eqnarray }
\math_register_env:n { eqnarray* }
\RequirePackage{array}
-\tl_if_in:NnT\@tabular{$}
+\tl_if_exist:NT\@kernel@tabular@init
{
- \def\@tabular{%
- \leavevmode
- \UseTaggingSocket{tbl/hmode/begin}%
- \hbox \bgroup
- \bool_set_true:N \l__math_collected_bool
- $
- \bool_set_false:N \l__math_collected_bool
- \col@sep\tabcolsep \let\d@llarbegin\begingroup
- \let\d@llarend\endgroup
- \cs_set_protected:Npn \__math_grab_dollar:w { \__math_grab_dollar_loop: }
- \@tabarray}
+ \tl_put_right:Nn\@kernel@tabular@init
+ {\cs_set_protected:Npn \__math_grab_dollar:w { \__math_grab_dollar_loop: }}
}
\cs_new_eq:NN \__math_m@th: \m@th
\cs_gset_protected:Npn \m@th
@@ -1169,6 +1101,25 @@
\bool_set_true:N \l__math_collected_bool
\__math_m@th:
}
+\sys_if_engine_luatex:T
+ {
+ \def\mathpalette#1#2{%
+ \ifcase\mathstyle
+ #1\displaystyle{#2}\or
+ #1\displaystyle{#2}\or
+ #1\textstyle{#2}\or
+ #1\textstyle{#2}\or
+ #1\scriptstyle{#2}\or
+ #1\scriptstyle{#2}\or
+ #1\scriptscriptstyle{#2}\or
+ #1\scriptscriptstyle{#2}
+ \fi}
+ }
+\def\mathsm@sh#1#2{%
+ \setbox\z@\hbox{$\m@th#1{#2}
+ \UseTaggingSocket{math/luamml/save/nNn}{{mathsmash} #1 {mpadded}}
+ $}%
+ \UseTaggingSocket{math/luamml/finsm@sh}{}{{}\finsm@sh}}
\tl_gput_right:Nn\@kernel@before@begindocument
{
\bool_set_true:N\l__math_collected_bool
@@ -1177,259 +1128,6 @@
{
\bool_set_false:N\l__math_collected_bool
}
-
-\tl_gput_right:Nn \@kernel@before@begindocument {
-\renewenvironment{gather*}{%
- \start@gather\st@rredtrue
-}
-{%
- % \endgather
- \math@cr \black@\totwidth@ \egroup
- $$\ignorespacesafterend
-}
-\def\common@align@ending {
- \math@cr \black@\totwidth@
- \egroup
- \ifingather@
- \restorealignstate@
- \egroup
- \nonumber
- \ifnum0=`{\fi\iffalse}\fi
- \else
- $$%
- \fi
- \ignorespacesafterend
-}
-\renewenvironment{alignat}{%
- \start@align\z@\st@rredfalse
-}{%
- \common@align@ending
-}
-\renewenvironment{alignat*}{%
- \start@align\z@\st@rredtrue
-}{%
- \common@align@ending
-}
-\renewenvironment{xalignat}{%
- \start@align\@ne\st@rredfalse
-}{%
- \common@align@ending
-}
-\renewenvironment{xalignat*}{%
- \start@align\@ne\st@rredtrue
-}{%
- \common@align@ending
-}
-\renewenvironment{xxalignat}{%
- \start@align\tw@\st@rredtrue
-}{%
- \common@align@ending
-}
-\renewenvironment{align}{%
- \start@align\@ne\st@rredfalse\m@ne
-}{%
- \common@align@ending
-}
-\renewenvironment{align*}{%
- \start@align\@ne\st@rredtrue\m@ne
-}{%
- \common@align@ending
-}
-\renewenvironment{flalign}{%
- \start@align\tw@\st@rredfalse\m@ne
-}{%
- \common@align@ending
-}
-\renewenvironment{flalign*}{%
- \start@align\tw@\st@rredtrue\m@ne
-}{%
- \common@align@ending
-}
-\renewenvironment{multline*}{\start@multline\st@rredtrue}
-{%
- \iftagsleft@ \@xp\lendmultline@ \else \@xp\rendmultline@ \fi
- \ignorespacesafterend
-}
-\def\measuring@true{\let\ifmeasuring@\iftrue\tag_suspend:n{\measuring}}
- \math_register_halign_env:nn {align}{}
- \math_register_halign_env:nn {align*}{}
- \math_register_halign_env:nn {alignat}{}
- \math_register_halign_env:nn {alignat*}{}
- \math_register_halign_env:nn {flalign}{}
- \math_register_halign_env:nn {flalign*}{}
- \math_register_halign_env:nn {gather}{}
- \math_register_halign_env:nn {gather*}{}
- \math_register_halign_env:nn {multline}{}
- \math_register_halign_env:nn {multline*}{}
- \math_register_halign_env:nn {xalignat}{}
- \math_register_halign_env:nn {xalignat*}{}
- \math_register_halign_env:nn {xxalignat}{}
- %
- \@namedef{maketag @ @ @} #1{%
- \ifmeasuring@
- \hbox{\m@th\normalfont#1}%
- \else
- \tagmcend \tagstructbegin{tag=Lbl}%
- \tagmcbegin{tag=Lbl}%
- \hbox{\m@th\normalfont#1}%
- \tagmcend \tagstructend \tagmcbegin{}%
- \fi
- }
-\@namedef{math@cr @ @ @ gather}{%
- \ifst@rred\nonumber\fi
- &\relax
- \make@display@tag
- \maybestartnewformulatag
- \ifst@rred\else\global\@eqnswtrue\fi
- \global\advance\row@\@ne
- \cr
-}
-\@namedef{math@cr @ @ @ align}{%
- \ifst@rred\nonumber\fi
- \if@eqnsw \global\tag@true \fi
- \global\advance\row@\@ne
- \add@amps\maxfields@
- \omit
- \kern-\alignsep@
- \iftag@
- \setboxz@h{\@lign\strut@{\make@display@tag}}%
- \place@tag
- \fi
- \maybestartnewformulatag
- \ifst@rred\else\global\@eqnswtrue\fi
- \global\lineht@\z@
- \cr
-}
-\def\restore@math@cr{\@namedef{math@cr @ @ @}{
- \maybestartnewformulatag
- \cr}}
-\restore@math@cr
-}
-
-\cs_new:Npn \__math_split_at_nl:NN #1#2 {
- \tl_set:Nf \l__math_tmpa_tl {
- \exp_after:wN \__math_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop }
- \exp_after:wN \__math_split_at_nl_aux:nnNN \l__math_tmpa_tl #1 #2
-}
-\cs_new:Npn \__math_split_at_nl_first:w #1 \\ #2 \\ #3 \s_stop
- {
- \quark_if_nil:nTF {#2}
- { {#1} { } }
- {
- \__math_split_chk_if_begin:ww #1 \begin \q_nil \s_mark
- #2 \\ #3 \s_stop
- }
- }
-
-\cs_new_protected:Npn \__math_split_at_nl_aux:nnNN #1 #2 #3 #4
- {
- \tl_gset:Nn #4 {#1}
- \tl_gset:Nn #3 {#2}
- }
-
-\cs_new:Npn \__math_split_chk_if_begin:ww
- #1 \begin #2 #3 \s_mark #4 \\ \q_nil \\ \s_stop
- {
- \quark_if_nil:nTF {#2}
- { {#1} {#4} }
- {
- \exp_after:wN \__math_split_collect_one_end:w
- \__math_split_cleanup_begin_q_nil:w #1 \begin{#2} #3 \\ #4 \s_stop
- { } { 1 }
- }
- }
-
-\cs_new:Npn \__math_split_cleanup_begin_q_nil:w #1 \begin \q_nil {#1}
-
-\cs_new:Npn \__math_split_collect_one_end:w #1 \end #2 #3 \s_stop #4 #5
- {
- \exp_args:Nf \__math_split_check_count_begins:nnnn
- { \__math_split_count_begins:n { #4 #1 } } {#5}
- { #4 #1 \end{#2} } {#3}
- }
-\cs_new:Npn \__math_split_count_begins:n #1
- { \int_eval:n { 0 \__math_split_count_begins:w #1 \begin \q_nil } }
-
-\cs_new:Npn \__math_split_count_begins:w #1 \begin #2
- { \quark_if_nil:nF {#2} { +1 \__math_split_count_begins:w } }
-
-\cs_new:Npn \__math_split_check_count_begins:nnnn #1 #2 #3 #4
- {
- \int_compare:nNnTF {#1} = {#2}
- {
- \exp_last_unbraced:Nf \__math_split_final_cleanup:nn
- { \__math_split:n { \__math_split_guard:n {#3} #4 } }
- }
- {
- \exp_args:No \use_ii_i:nn
- { \exp_after:wN { \int_value:w \int_eval:n { #2 + 1 } } }
- { \__math_split_collect_one_end:w #4 \s_stop {#3} }
- }
- }
-\cs_new:Npn \__math_split_final_cleanup:nn #1 #2
- {
- \exp:w \__math_split_final_cleanup:w #1
- \__math_split_guard:n \q_nil \s_mark { }
- {#2}
- }
-\cs_new:Npn \__math_split_final_cleanup:w #1 \__math_split_guard:n #2 #3 \s_mark #4
- {
- \quark_if_nil:nTF {#2}
- { \exp_end: { #4 #1 } }
- { \__math_split_final_cleanup:w #3 \s_mark { #4 #1 #2 } }
- }
-
-\cs_new:Npn \__math_split:n #1 {
- \__math_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop }
-
-
-\newif\if@subformulas
-\tl_new:N \result
-
-\cs_new_protected:Npn\grabaformulapartandstart {
- \__math_split_at_nl:NN \g__math_grabbed_math_tl \result
- \typeout{====>first-result=\meaning\result}
- \typeout{====>first-tmpmathcontent=\meaning\g__math_grabbed_math_tl}
- \tl_if_empty:NTF \g__math_grabbed_math_tl
- {
- \typeout{====>formula~ has~ no~ subparts}
- \global\@subformulasfalse
- }
- {
- \typeout{====>formula~ has~ subparts}
- \global\@subformulastrue
- \edef\resulttitle{\g__math_grabbed_env_tl\space (part)}
- \tagstructbegin{tag=Formula,
- alt = subformula,
- title-o=\resulttitle
- }
- }
- \tagmcbegin{}
-}
-
-\cs_new_protected:Npn\grabaformulapartandmayberestart {
- \__math_split_at_nl:NN \g__math_grabbed_math_tl \result
- \typeout{====>result=\meaning\result}
- \typeout{====>tmpmathcontent=\meaning\g__math_grabbed_math_tl}
- \edef\resulttitle{\g__math_grabbed_env_tl\space (part)}
- \tagstructbegin{tag=Formula,
- alt=\result,
- title-o=\resulttitle
- }
- \tagmcbegin{}
-}
-\def\maybestartnewformulatag {
-\if@subformulas
- \ifmeasuring@\else
- \tl_if_empty:NF \g__math_grabbed_math_tl
- {
- \tagmcend
- \tagstructend
- \grabaformulapartandmayberestart
- }
- \fi
-\fi
-}
\ExplSyntaxOff
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathintent.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathintent.ltx
new file mode 100644
index 00000000000..394d63c7b5d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathintent.ltx
@@ -0,0 +1,60 @@
+%%
+%% This is file `latex-lab-mathintent.ltx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% latex-lab-mathintent.dtx (with options: `kernel')
+%%
+%% This is a generated file.
+%%
+%% Copyright 2021-2025 LaTeX Project
+%%
+%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
+%% ------------------------------------------------------------------------------------
+%%
+%% It 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 or later.
+%%
+%% This file may only be distributed together with a copy of the LaTeX
+%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle'
+%% without such generated files.
+%%
+%% The newest sources can be found below
+%%
+%% https://github.com/latex3/latex2e/required/latex-lab
+%%
+%% where one can also log issues in case there are any.
+%%
+%%
+%% File: latex-lab-mathintent.dtx
+\ProvidesFile{latex-lab-mathintent.ltx}
+ [2025-01-17 v0.1a intent experiments]
+\ExplSyntaxOn
+\protected\def\invisibletimes{
+\if_cs_exist:N\luamml_annotate:en
+ \luamml_annotate:en {
+ core = {[0] = 'mo', intent="times","^^^^2062"},
+}{
+ \latelua{}
+}
+\fi:
+}
+\protected\def\functionapplication{
+\if_cs_exist:N\luamml_annotate:en
+ \luamml_annotate:en {
+ core = {[0] = 'mo', intent="applied_to","^^^^2061"},
+}{
+ \latelua{}
+}
+\fi:
+}
+\ExplSyntaxOff
+\endinput
+%%
+%% End of file `latex-lab-mathintent.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathpkg.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathpkg.ltx
index 71a110c602f..c033d6e3648 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathpkg.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathpkg.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtools.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtools.ltx
index ec0624be4d6..4fc9554672f 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtools.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtools.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -40,116 +40,141 @@
\RequirePackage{tagpdf-base}
\ExplSyntaxOn
\tl_new:N\l__math_mathtools_init_tl
-\AddToHook{package/mathtools/after}
- {%
- \cs_if_eq:NNTF\intertext@ \MT_intertext:
- {
- \tl_set:Nn \l__math_mathtools_init_tl {\MT_orig_intertext_false:}
- }
- {
- \tl_set:Nn \l__math_mathtools_init_tl {\MT_orig_intertext_true:}
- }
- \cs_if_eq:NNTF\shortintertext@ \MT_shortintertext:n
- {
- \tl_put_right:Nn \l__math_mathtools_init_tl
- {\MT_orig_shortintertext_false:}
- }
- {
- \tl_put_right:Nn \l__math_mathtools_init_tl
- {\MT_orig_shortintertext_true:}
- }
- \def\MT_intertext: {%
- \def\intertext##1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip-\belowdisplayskip
- \vskip-\lineskiplimit % CCS
- \vskip\normallineskiplimit % CCS
- \vskip\l_MT_above_intertext_sep
- \vbox{%
- \ifmeasuring@\tag_suspend:n{\measuring}\fi
- \normalbaselines
- \ifdim
- \ifdim\@totalleftmargin=\z@
- \linewidth
- \else
- -\maxdimen
- \fi
- =\columnwidth
- \else \parshape\@ne \@totalleftmargin \linewidth
- \fi
- \tag_mc_end_push:
- \tagpdfsetup{para/tag=Span}
- \noindent\ignorespaces##1\par
- \tag_mc_begin_pop:n{}}%
- \penalty\predisplaypenalty\vskip\abovedisplayskip%
- \vskip-\lineskiplimit % CCS
- \vskip\normallineskiplimit % CCS
- \vskip\l_MT_below_intertext_sep
- }%
- }%
- \MH_let:NwN \shortintertext \shortintertext@
- }
- \def\MT_orig_shortintertext:n #1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
- \vbox{%
- \ifmeasuring@\tag_suspend:n{\measuring}\fi
- \normalbaselines
- \MH_if_dim:w
- \MH_if_dim:w \@totalleftmargin=\z@
- \linewidth
- \MH_else:
- -\maxdimen
- \MH_fi:
- =\columnwidth
- \MH_else:
- \parshape\@ne \@totalleftmargin \linewidth
- \MH_fi:
- \tag_mc_end_push:
- \tagpdfsetup{para/tag=Span}
- \tagpdfparaOn
- \noindent\ignorespaces#1\par
- \tag_mc_begin_pop:n{}}
- \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
- }%
- }
-
- \def\MT_shortintertext:n #1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
- \vskip-\lineskiplimit
- \vskip\normallineskiplimit
- \vskip\l_MT_above_shortintertext_sep
+\cs_if_eq:NNTF\intertext@ \MT_intertext:
+ {
+ \tl_set:Nn \l__math_mathtools_init_tl {\MT_orig_intertext_false:}
+ }
+ {
+ \tl_set:Nn \l__math_mathtools_init_tl {\MT_orig_intertext_true:}
+ }
+\cs_if_eq:NNTF\shortintertext@ \MT_shortintertext:n
+ {
+ \tl_put_right:Nn \l__math_mathtools_init_tl
+ {\MT_orig_shortintertext_false:}
+ }
+ {
+ \tl_put_right:Nn \l__math_mathtools_init_tl
+ {\MT_orig_shortintertext_true:}
+ }
+\def\MT_intertext: {%
+ \def\intertext##1{%
+ \ifvmode\else\\\@empty\fi
+ \noalign{%
+ \penalty\postdisplaypenalty\vskip-\belowdisplayskip
+ \vskip-\lineskiplimit % CCS
+ \vskip\normallineskiplimit % CCS
+ \vskip\l_MT_above_intertext_sep
\vbox{%
- \ifmeasuring@\tag_suspend:n{\measuring}\fi
- \normalbaselines
- \MH_if_dim:w
- \MH_if_dim:w \@totalleftmargin=\z@
- \linewidth
- \MH_else:
- -\maxdimen
- \MH_fi:
- =\columnwidth
- \MH_else:
- \parshape\@ne \@totalleftmargin \linewidth
- \MH_fi:
- \tag_mc_end_push:
- \tagpdfsetup{para/tag=P}
- \tagpdfparaOn
- \noindent\ignorespaces#1\par
- \tag_mc_begin_pop:n{}}%
- \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
- \vskip-\lineskiplimit
- \vskip\normallineskiplimit
- \vskip\l_MT_below_shortintertext_sep
- }%
- }
-
- \l__math_mathtools_init_tl
+ \ifmeasuring@\tag_suspend:n{\measuring}\fi
+ \normalbaselines
+ \ifdim
+ \ifdim\@totalleftmargin=\z@
+ \linewidth
+ \else
+ -\maxdimen
+ \fi
+ =\columnwidth
+ \else \parshape\@ne \@totalleftmargin \linewidth
+ \fi
+ \tag_mc_end_push:
+ \tagpdfsetup{para/tag=Span}
+ \noindent\ignorespaces##1\par
+ \tag_mc_begin_pop:n{}}%
+ \penalty\predisplaypenalty\vskip\abovedisplayskip%
+ \vskip-\lineskiplimit % CCS
+ \vskip\normallineskiplimit % CCS
+ \vskip\l_MT_below_intertext_sep
+ }%
+ }%
+ \MH_let:NwN \shortintertext \shortintertext@
+}
+\def\MT_orig_shortintertext:n #1{%
+ \ifvmode\else\\\@empty\fi
+ \noalign{%
+ \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
+ \vbox{%
+ \ifmeasuring@\tag_suspend:n{\measuring}\fi
+ \normalbaselines
+ \MH_if_dim:w
+ \MH_if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \MH_else:
+ -\maxdimen
+ \MH_fi:
+ =\columnwidth
+ \MH_else:
+ \parshape\@ne \@totalleftmargin \linewidth
+ \MH_fi:
+ \tag_mc_end_push:
+ \tagpdfsetup{para/tag=Span}
+ \tagpdfparaOn
+ \noindent\ignorespaces#1\par
+ \tag_mc_begin_pop:n{}}
+ \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
+ }%
}
+\def\MT_shortintertext:n #1{%
+ \ifvmode\else\\\@empty\fi
+ \noalign{%
+ \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
+ \vskip-\lineskiplimit
+ \vskip\normallineskiplimit
+ \vskip\l_MT_above_shortintertext_sep
+ \vbox{%
+ \ifmeasuring@\tag_suspend:n{\measuring}\fi
+ \normalbaselines
+ \MH_if_dim:w
+ \MH_if_dim:w \@totalleftmargin=\z@
+ \linewidth
+ \MH_else:
+ -\maxdimen
+ \MH_fi:
+ =\columnwidth
+ \MH_else:
+ \parshape\@ne \@totalleftmargin \linewidth
+ \MH_fi:
+ \tag_mc_end_push:
+ \tagpdfsetup{para/tag=P}
+ \tagpdfparaOn
+ \noindent\ignorespaces#1\par
+ \tag_mc_begin_pop:n{}}%
+ \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
+ \vskip-\lineskiplimit
+ \vskip\normallineskiplimit
+ \vskip\l_MT_below_shortintertext_sep
+ }%
+}
+ \renewcommand*\MT_mult_internal:n [1]{
+ \MH_if_boolean:nF {outer_mult}{\alignedspace@left} %<-- requires amsmath 2016/11/05
+ \MT_next:
+ \bgroup
+ \Let@
+ \def\l_MT_multline_lastline_fint{0 }
+ \chardef\dspbrk@context\@ne \restore@math@cr
+ \MH_let:NwN \math@cr__math\MT_mult_mathcr_atat:w
+ \MH_let:NwN \shoveleft\MT_shoveleft:wn
+ \MH_let:NwN \shoveright\MT_shoveright:wn
+ \spread@equation
+ \MH_set_boolean_F:n {mult_firstline}
+ \MT_measure_mult:n {#1}
+ \MH_if_dim:w \l_MT_multwidth_dim<\l_MT_multline_measure_fdim
+ \MH_setlength:dn \l_MT_multwidth_dim{\l_MT_multline_measure_fdim}
+ \fi
+ \MH_set_boolean_T:n {mult_firstline}
+ \MH_if_num:w \l_MT_multline_lastline_fint=\@ne
+ \MH_let:NwN \math@cr__math \MT_mult_firstandlast_mathcr:w
+ \MH_fi:
+ \ialign\bgroup
+ \hfil\strut@$\m@th\displaystyle{}##
+ \UseTaggingSocket{math/luamml/save/nNn}{ {} \displaystyle {mtd}}
+ $
+ \UseTaggingSocket{math/luamml/mtable/finalizecol}{last}
+ \hfil
+ \crcr
+ \hfilneg
+ #1
+ }
+ \l__math_mathtools_init_tl
\ExplSyntaxOff
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
index 49f0207bc39..60a1c0a2ab3 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty
index e3b4f050f3e..dcfaf9fec48 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,10 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-block.dtx (C) Copyright 2021-2024 LaTeX Project
-\def\ltlabblockdate{2024-11-25}
-\def\ltlabblockversion{0.8w}
+%% File: latex-lab-block.dtx (C) Copyright 2021-2025 LaTeX Project
+\def\ltlabblockdate{2025-01-20}
+\def\ltlabblockversion{0.9a}
+
\ProvidesPackage {latex-lab-testphase-block}
[\ltlabblockdate\space v\ltlabblockversion\space
blockenv implementation]
@@ -43,6 +44,10 @@
\def\@doendpe{\@endpetrue
\def\par
{
+ \if@domathendpe
+ \skip_vertical:n { \tex_parskip:D }
+ \@domathendpefalse
+ \fi
\@restorepar
\clubpenalty\@clubpenalty
\__kernel_displayblock_doendpe:
@@ -53,9 +58,13 @@
\everypar{{\setbox\z@\lastbox}
\everypar{}
\@endpefalse
+ \@domathendpefalse
}
}
\cs_new_eq:NN \__kernel_displayblock_doendpe: \prg_do_nothing:
+\newif\if@domathendpe
+\def\@domathendpefalse{\global\let\if@domathendpe\iffalse}
+\def\@domathendpetrue {\global\let\if@domathendpe\iftrue}
\NewTemplateType{blockenv}{1}
\NewTemplateType{block}{1}
\NewTemplateType{para}{1}
@@ -182,7 +191,7 @@
}
{
\__block_debug_typeout:n{\l__block_env_name_tl -env-start}
- \tl_if_empty:nF {#1} { \SetTemplateKeys{blockenv}{display}{#1} }
+ \SetKnownTemplateKeys{blockenv}{display}{#1}
% \begin{macrocode}
\int_compare:nNnTF \l__tag_block_flattened_level_int > 0
{
@@ -223,7 +232,8 @@
\UseInstance{block}
{ \l__block_block_instance_tl - \int_use:N
\g_block_nesting_depth_int }
- {#1}
+ \UnusedTemplateKeys
+ \tl_set_eq:NN \l__block_unused_blockenv_keys_tl \UnusedTemplateKeys
\tl_if_empty:NF \l__block_para_instance_tl
{
\__block_debug_typeout:n{ use~ para~ instance:~
@@ -241,10 +251,16 @@
% not clean use "o"?
{ - \int_use:N \l__block_inner_level_counter_tl }
}
- {#1}
+ \l__block_unused_blockenv_keys_tl
+ \tl_set_eq:NN \l__block_unused_blockenv_keys_tl \UnusedTemplateKeys
+ }
+ \tl_if_empty:NF \l__block_unused_blockenv_keys_tl
+ {
+ % check if only item template keys remain
}
\l__block_final_code_tl
}
+\tl_new:N \l__block_unused_blockenv_keys_tl
\int_if_exist:NF \l__tag_block_flattened_level_int
{
\int_new:N \l__tag_block_flattened_level_int
@@ -303,7 +319,7 @@
para-class = \l__tag_para_attr_class_tl ,
}
{
- \tl_if_empty:nF {#1} { \SetTemplateKeys{para}{std}{#1} }
+ \SetTemplateKeys{para}{std}{#1}
\skip_set:Nn \@rightskip \rightskip
}
\DeclareTemplateCode{block}{display}{1}
@@ -322,7 +338,7 @@
parindent = \l__block_parindent_dim ,
}
{
- \tl_if_empty:nF {#1} { \SetTemplateKeys{block}{display}{#1} }
+ \SetKnownTemplateKeys{block}{display}{#1}
\tl_if_blank:oF \l__block_heading_tl
{ \mode_leave_vertical:
\textbf{\l__block_heading_tl} } % TODO customize
@@ -437,12 +453,23 @@
}
{
\__block_debug_typeout:n{template:list:std}
- \tl_if_empty:nTF {#1}
+ \tl_if_empty:oTF {#1}
{ \cs_set_eq:NN \__block_evaluate_saved_user_keys:nn \use_none:nn }
{
- \SetTemplateKeys{list}{std}{#1}
+ \SetKnownTemplateKeys{list}{std}{#1}
\cs_set:Npe \__block_evaluate_saved_user_keys:nn ##1##2
- { \SetTemplateKeys{##1}{##2}{ \exp_not:n{#1} } }
+ { \SetKnownTemplateKeys{##1}{##2}{
+ \exp_not:o { \UnusedTemplateKeys }
+ }
+ \exp_not:n {
+ \tl_if_empty:NF \UnusedTemplateKeys
+ {
+ \msg_error:nnee { block } { unknown-keys }
+ { \l__block_env_name_tl \space environment}
+ \UnusedTemplateKeys
+ }
+ }
+ }
}
\tl_if_empty:NTF \l__block_counter_tl
{
@@ -472,6 +499,15 @@
\cs_set_eq:NN \__block_item_everypar: \__block_item_everypar_first:
\__block_debug_typeout:n{template:list:std~end}
}
+\msg_new:nnnn { block } { unknown-keys }
+ { Some~ keys~ specified~ on~ the~ #1~ are~ unknown. }
+ {
+ The~ following~ keys~ are~ unknown~ and~ their~
+ values~ are~ ignored:\\
+ \space\space #2\\
+ Perhaps~ a~ misspelling~ or~ the~ current~ template~
+ instance~ uses~ special~ keys.
+ }
\keys_define:nn { template/list/std }
{
,nosep .code:n =
@@ -507,7 +543,14 @@
\__block_debug_typeout:n{template:item:std}
\tl_set_eq:NN \l__block_label_given_tl \c_novalue_tl
\__block_evaluate_saved_user_keys:nn {item}{std}
- \tl_if_empty:nF{#1}{ \SetTemplateKeys{item}{std}{#1} }
+ % \begin{macrocode}
+ \SetKnownTemplateKeys{item}{std}{#1}
+ \tl_if_empty:NF \UnusedTemplateKeys
+ {
+ \msg_error:nnee { block } { unknown-keys }
+ { \noexpand\item command }
+ \UnusedTemplateKeys
+ }
\tl_if_novalue:oTF \l__block_label_given_tl
{
\tl_if_blank:oF \@listctr { \@kernel@refstepcounter \@listctr }
@@ -1021,8 +1064,7 @@
\let\do\@makeother \dospecials
\obeylines \verbatim@font \@noligs
\everypar \expandafter{\the\everypar \unpenalty}%
- \tl_set:Nn \l__tag_para_main_tag_tl {codeline}
- \tagtool{paratag=Code}% oder faster: \tl_set:Nn\l__tag_para_tag_tl{Code}
+ \tl_set:Nn \l__tag_para_tag_tl {codeline}
}
\newcommand\@setupverbinvisiblespace{}
\tag_if_active:T {
@@ -1294,6 +1336,7 @@
tag-name = verbatim,
tag-class = ,
tagging-recipe = standard,
+ para-flattened = true,
inner-level-counter = ,
level-increase = false,
setup-code = ,
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
index 465eaf84795..8dcdce9f4ff 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabfirstaiddate{2024-11-23}
+%% File: latex-lab-firstaid.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabfirstaiddate{2025-01-27}
\def\ltlabfirstaidversion{0.85i}
\ProvidesPackage {latex-lab-testphase-firstaid} [%
\ltlabfirstaiddate\space v\ltlabfirstaiddate\space
@@ -58,13 +58,36 @@
\AddToHook{class/amsproc/after}
{\def\@author{\authors}}
\AddToHook{class/amsart/after}[latex-lab-testphase-firstaid/amsthm]
- {\tag_if_active:T{\__tag_firstaid_amsthm:}}
+ {\tag_if_active:T{\__tag_firstaid_amsthm:}\__tag_firstaid_ams_abstract:}
\AddToHook{class/amsbook/after}[latex-lab-testphase-firstaid/amsthm]
- {\tag_if_active:T{\__tag_firstaid_amsthm:}}
+ {\tag_if_active:T{\__tag_firstaid_amsthm:}\__tag_firstaid_ams_abstract:}
\AddToHook{class/amsproc/after}[latex-lab-testphase-firstaid/amsthm]
{\tag_if_active:T{\__tag_firstaid_amsthm:}}
\AddToHook{package/amsthm/after}[latex-lab-testphase-firstaid/amsthm]
{\tag_if_active:T{\__tag_firstaid_amsthm:}}
+\cs_new_protected:Npn \__tag_firstaid_ams_abstract:
+ {
+\renewenvironment{abstract}{%
+ \ifx\maketitle\relax
+ \ClassWarning{\@classname}{Abstract~ should~ precede~
+ \protect\maketitle\space in~ AMS~ document~ classes;~ reported}%
+ \fi
+ \global\setbox\abstractbox=\vtop \bgroup
+ \normalfont\Small
+ \list{}{\labelwidth\z@
+ \leftmargin3pc \rightmargin\leftmargin
+ \listparindent\normalparindent \itemindent\z@
+ \parsep\z@ \@plus\p@
+ \let\fullwidthdisplay\relax
+ }%
+ \item[\hskip\labelsep\scshape\abstractname.]%
+}{%
+ \endlist
+ \par % <--- added
+ \egroup
+ \ifx\@setabstract\relax \@setabstracta \fi
+}
+ }
\cs_new_protected:Npn \__tag_firstaid_amsthm:
{
\def\@endtheorem{\endblockenv}
@@ -282,6 +305,7 @@
\hbox to \hsize{%
\kern\leftmargin
\hbox to \linewidth{%
+ \tag_struct_begin:n{tag=codeline}
\cs_if_exist:NT \FV@LeftListNumber
{
\tag_struct_begin:n{tag=Lbl}
@@ -296,7 +320,6 @@
\FV@LeftListFrame
\tag_mc_end:
}
- \tag_struct_begin:n{tag=codeline}
\tag_mc_begin:n{}%
\FancyVerbFormatLine{#1}%
\tag_mc_end:
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
index 71d5e771574..4599f621a26 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
%%
%%
%% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project
-\def\ltlabfloatdate{2024-11-21}
-\def\ltlabfloatversion{0.81g}
+\def\ltlabfloatdate{2024-12-27}
+\def\ltlabfloatversion{0.81h}
\ProvidesExplPackage {latex-lab-testphase-float} {\ltlabfloatdate} {\ltlabfloatversion}
{Code related to the tagging of floats}
\prop_new:N \g__tag_float_sect_prop
@@ -103,7 +103,7 @@
\MakeLinkTarget*{floatstructure.\@current@float@struct}
}
}
-\str_if_exist:cF { l__socket_tagsupport/float/begin_plug_str }
+\socket_if_exist:nF {tagsupport/float/begin}
{
\NewSocket{tagsupport/float/hmode/begin}{0}
\NewSocket{tagsupport/float/hmode/end}{0}
@@ -276,14 +276,14 @@
}%
\ExplSyntaxOn
\def\hyper@nopatch@caption{}
-\str_if_exist:cF { l__socket_tagsupport/caption/begin_plug_str }
+\socket_if_exist:nF {tagsupport/caption/begin}
{
\NewSocket{tagsupport/caption/begin}{1}
\NewSocket{tagsupport/caption/end}{0}
\NewSocket{tagsupport/caption/label/begin}{0}
\NewSocket{tagsupport/caption/label/end}{0}
}
-\str_if_exist:cF { l__socket_tagsupport/para/begin_plug_str }
+\socket_if_exist:nF {tagsupport/para/begin}
{
\NewSocket{tagsupport/para/begin}{0}
\NewSocket{tagsupport/para/end}{0}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
index 942f2deeddf..391f242fcf0 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,7 +32,7 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-graphic.dtx (C) Copyright 2022-2024 LaTeX Project
+%% File: latex-lab-graphic.dtx (C) Copyright 2022-2025 LaTeX Project
\def\ltlabgraphicdate{2024-09-18}
\def\ltlabgraphicversion{0.80e}
\ProvidesExplPackage {latex-lab-testphase-graphic} {\ltlabgraphicdate} {\ltlabgraphicversion}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-marginpar.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-marginpar.sty
index 0f8001ce861..662a06bded4 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-marginpar.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-marginpar.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -34,14 +34,12 @@
%%
%% File: latex-lab-marginpar.dtx
%%
-\def\ltlabmarginpardate{2024-09-18}
-\def\ltlabmarginparversion{0.85d}
+\def\ltlabmarginpardate{2025-02-21}
+\def\ltlabmarginparversion{0.85e}
\ProvidesExplPackage {latex-lab-testphase-marginpar} {\ltlabmarginpardate} {\ltlabmarginparversion}
{Changes related to the tagging of the margin notes}
\int_new:N \g__kernel_marginpar_int
-\socket_new:nn {tagsupport/marginpar/begin}{0}
-\socket_new:nn {tagsupport/marginpar/end}{0}
\cs_new_protected:Npn\__tag_get_marginpar_parent_aux:nn #1 #2
{
\str_if_eq:eeT{\use_ii:nn #1}{Part}{\seq_put_right:Nn\l__tag_tmpa_seq {#2}}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
index 592dca80c1b..4abdbc9a911 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -36,11 +36,13 @@
\ProvidesPackage{latex-lab-testphase-math}
- [2023-07-20 v0.8a code related to the math tagging]
+ [2025-01-24 v0.8c code related to the math tagging]
\input{latex-lab-math.ltx}
-\input{latex-lab-amsmath.ltx}
-\input{latex-lab-mathtools.ltx}
+\AddToHook{package/amsmath/after}{\input{latex-lab-amsmath.ltx}}
+\AddToHook{package/mathtools/after}{\input{latex-lab-mathtools.ltx}}
\input{latex-lab-mathpkg.ltx}
+\input{latex-lab-mathintent.ltx}
+\AddToHook{package/unicode-math/after}{\input{latex-lab-unicode-math.ltx}}
\endinput
%%
%% End of file `latex-lab-testphase-math.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
index a82944e5d10..d364a45814d 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
index 1a46498b353..d68f431f91b 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,64 +32,12 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2024 Frank Mittelbach
-\def\ltlabneworIdate{2024-11-12}
-\def\ltlabneworIversion{0.85b}
+%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2025 Frank Mittelbach
+\def\ltlabneworIdate{2025-02-11}
+\def\ltlabneworIversion{0.85c}
\ProvidesPackage{latex-lab-testphase-new-or-1}
[\ltlabneworIdate\space v\ltlabneworIversion\space
- Temporary output patches for tagging and better link support]
-\RequirePackage{etoolbox}
-\providecommand\@kernel@before@head{}
-\providecommand\@kernel@before@foot{}
-\providecommand\@kernel@after@head{}
-\providecommand\@kernel@after@foot{}
-\providecommand\@mult@ptagging@hook{}% should be replaced with a socket, eventually
-
-\patchcmd\@outputpage
- {\vfil\color@hbox\normalcolor\hb@xt@\textwidth{\@thehead}\color@endbox}
- {\vfil\@kernel@before@head\color@hbox\normalcolor\hb@xt@\textwidth{\@thehead}\color@endbox\@kernel@after@head}
- {\typeout{Patching header in \string\@outputpage}}{\PATCHerror }
-
-\patchcmd\@outputpage
- {\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox}
- {\@kernel@before@foot\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox\@kernel@after@foot}
- {\typeout{Patching footer in \string\@outputpage}}{\PATCHerror }
-\providecommand\@kernel@before@footins{}
-\providecommand\@kernel@tagsupport@@makecol{}
-
-\patchcmd\@makecol
- {\vskip\skip\footins}
- {\vskip\skip\footins\@kernel@before@footins}
- {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
-
-\patchcmd\@makecol
- {\let\@elt\relax}
- {\@kernel@tagsupport@@makecol\let\@elt\relax}
- {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
-
-\AddToHook{package/footmisc/after}
- {%
- \def\@makecol{%
- \setbox\@outputbox \box\@cclv
- \@outputbox@removebskip
- \@kernel@tagsupport@@makecol
- \let\@elt\relax
- \xdef\@freelist{\@freelist\@midlist}%
- \global \let \@midlist \@empty
- \@makecol@appendblocks
- \ifvbox\@kludgeins
- \@makespecialcolbox
- \else
- \@makenormalcolbox
- \fi
- \global \maxdepth \@maxdepth}
-}
-\ExplSyntaxOn
-\def\@kernel@before@head{\pdfannot_link_off:}
-\def\@kernel@before@foot{\pdfannot_link_off:}
-\def\@kernel@after@head {\pdfannot_link_on:}
-\def\@kernel@after@foot {\pdfannot_link_on:}
-\ExplSyntaxOff
+ Temporary output patches for tagging and better link support -- no longer active]
\endinput
%%
%% End of file `latex-lab-testphase-new-or-1.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
index cb81b74c017..6b37bc654e5 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -33,179 +33,51 @@
%%
%%
%% File: latex-lab-new-or-2.dtx
-\def\ltlabneworIIdate{2023-09-04}
-\def\ltlabneworIIversion{0.85c}
+\def\ltlabneworIIdate{2025-02-12}
+\def\ltlabneworIIversion{0.86b}
\ProvidesPackage{latex-lab-testphase-new-or-2}
[\ltlabneworIIdate\space v\ltlabneworIIversion\space
Changes to the output routine]
-\def \@makecol {%
- \setbox\@outputbox \box\@cclv
- \@outputbox@removebskip
- \@kernel@tagsupport@@makecol
- \let\@elt\relax
- \xdef\@freelist{\@freelist\@midlist}%
- \global \let \@midlist \@empty
- \UseSocket{@makecol/outputbox}%
- \ifvbox\@kludgeins
- \@make@specialcolbox
- \else
- \@make@normalcolbox
- \fi
- \global \maxdepth \@maxdepth
-}
-\newdimen\@outputbox@depth
-\def \@make@normalcolbox {%
- \setbox\@outputbox \vbox to\@colht {%
- \@texttop
- \@outputbox@depth \dp\@outputbox
- \unvbox \@outputbox
- \vskip -\@outputbox@depth
- \@textbottom
- }%
-}
-\def \@make@specialcolbox {%
- \@outputbox@append {\vskip-\@outputbox@depth}%
- \@tempdima \@colht
- \ifdim \wd\@kludgeins>\z@
- \advance \@tempdima -\ht\@outputbox
- \advance \@tempdima \pageshrink
- \setbox\@outputbox \vbox to \@colht {%
- \unvbox\@outputbox
- \vskip \@tempdima
- \@textbottom
- }%
- \else
- \advance \@tempdima -\ht\@kludgeins
- \setbox \@outputbox \vbox to \@colht {%
- \vbox to \@tempdima {%
- \unvbox\@outputbox
- \@textbottom}%
- \vss}%
- \fi
- {\setbox \@tempboxa \box \@kludgeins}%
-}
-\def\@outputbox@removebskip{%
- \ifx\@textbottom\relax \else
- \@outputbox@append{%
- \@tempskipa\lastskip
- \ifnum \gluestretchorder\@tempskipa>\z@
- \vskip-\@tempskipa
- \xdef\@outputbox@reinsertbskip
- {\noexpand\@outputbox@append{\vskip\the\@tempskipa}}%
- \else
- \global\let\@outputbox@reinsertbskip\relax
- \fi
- }%
- \fi
-}
-\let\@outputbox@reinsertbskip\relax
-\providecommand\@kernel@before@cclv{}
-\providecommand\@kernel@before@footins{}
-\def\@outputbox@append #1{%
- \setbox\@outputbox \vbox {%
- \boxmaxdepth \@maxdepth
- \@outputbox@depth\dp\@outputbox % if needed in #1
- \unvbox \@outputbox
- #1%
- }%
-}
-\def\@outputbox@appendfootnotes {%
- \ifvoid\footins \else
- \@makecol@handlesplitfootnotes
- \UseSocket{@makecol/footnotes}%
- \@outputbox@append{%
- \vskip \skip\footins
- \@kernel@before@footins
- \color@begingroup
- \normalcolor
- \footnoterule
- \csname pdfcolfoot@current\endcsname
- \unvbox \footins
- \color@endgroup
- }%
- \fi
-}
-\let \@outputbox@attachfloats \@combinefloats
-\def \@outputbox@attachtopfloats {%
- \ifx \@toplist\@empty \else \@cflt \fi
-}
-\def \@outputbox@attachbottomfloats {%
- \ifx \@botlist\@empty \else \@cflb \fi
-}
+\AssignSocketPlug {build/column/outputbox}{footnotes-floats}
\def\@makecol@handlesplitfootnotes {%
\ifnum\insertpenalties>\z@
\@makecol@splitfootnotemessagehook
\fi
}
\let \@makecol@splitfootnotemessagehook \@empty
-\NewSocket{@makecol/footnotes}{0}
-\def\@if@flushbottom@TF{%
- \ifx\@textbottom\relax
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
-\def\@if@footnotes@TF{%
- \ifvoid\footins
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
-}
-\def\@if@bfloats@TF{%
- \ifx \@botlist\@empty
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
-}
-\NewSocket{@makecol/outputbox}{0}
-\NewSocketPlug {@makecol/outputbox}{space-footnotes-floats} {%
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@if@bfloats@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}%
- }%
- \@outputbox@appendfootnotes
- \@outputbox@attachfloats
-}
-\NewSocketPlug {@makecol/outputbox}{floats-footnotes-space} {%
- \@outputbox@attachfloats
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}%
- \@outputbox@appendfootnotes
-}
-\NewSocketPlug {@makecol/outputbox}{footnotes-space-floats} {%
- \@outputbox@appendfootnotes
- \@if@bfloats@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}%
- \@outputbox@attachfloats
-}
-\NewSocketPlug {@makecol/outputbox}{space-floats-footnotes} {%
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@if@bfloats@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}}%
- \@outputbox@attachfloats
- \@outputbox@appendfootnotes
-}
-\NewSocketPlug {@makecol/outputbox}{floats-footnotes} {%
- \@outputbox@attachfloats
- \@outputbox@appendfootnotes
- \@outputbox@reinsertbskip
-}
-\NewSocketPlug {@makecol/outputbox}{footnotes-floats} {%
- \@outputbox@appendfootnotes
- \@outputbox@attachfloats
- \@outputbox@reinsertbskip
-}
-\AssignSocketPlug {@makecol/outputbox}{footnotes-floats}
+\ExplSyntaxOn
+\NewSocketPlug{tagsupport/build/page/header}{default}
+ {
+ \__tag_hook_kernel_before_head:
+ #2
+ \__tag_hook_kernel_after_head:
+ }
+\AssignSocketPlug{tagsupport/build/page/header}{default}
+
+\NewSocketPlug{tagsupport/build/page/footer}{default}
+ {
+ \__tag_hook_kernel_before_foot:
+ #2
+ \__tag_hook_kernel_after_foot:
+ }
+\AssignSocketPlug{tagsupport/build/page/footer}{default}
+
+\NewSocketPlug{tagsupport/build/column/outputbox}{default}
+ {
+ \__tag_check_typeout_v:n { ====>~In~\token_to_str:N \@makecol
+ \c_space_tl\the\c@page }
+ \tag_mc_add_missing_to_stream:Nn \@outputbox {main}
+ }
+\NewSocketPlug{tagsupport/build/column/footins}{default}
+ { \tag_mc_add_missing_to_stream:Nn \footins {footnote} }
+\sys_if_engine_luatex:F
+ {
+ \AssignSocketPlug{tagsupport/build/column/outputbox}{default}
+ \AssignSocketPlug{tagsupport/build/column/footins}{default}
+ }
+\ExplSyntaxOff
+
\declare@file@substitution{footmisc.sty}{latex-lab-footmisc.ltx}
\input{latex-lab-footnotes.ltx}
\endinput
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
index b0c5a1c2fd4..af840b4c42a 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabsecdate{2024-10-04}
-\def\ltlabsecversion{0.84f}
+%% File: latex-lab-sec.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabsecdate{2025-02-18}
+\def\ltlabsecversion{0.84i}
\ProvidesExplPackage {latex-lab-testphase-sec} {\ltlabsecdate} {\ltlabsecversion}
{Code related to the tagging of sectioning commands}
\RequirePackage{latex-lab-kernel-changes}
@@ -106,10 +106,10 @@
}
\hook_gput_code:nnn{tagpdf/finish/before}{tagpdf/sec}{\__tag_sec_end:n{-10}}
\hook_gset_rule:nnnn {tagpdf/finish/before}{tagpdf/sec}{before}{tagpdf}
-\AddToHook{cmd/frontmatter/before}{\__tag_sec_end:n{-10}}
-\AddToHook{cmd/mainmatter/before} {\__tag_sec_end:n{-10}}
-\AddToHook{cmd/backmatter/before} {\__tag_sec_end:n{-10}}
-\AddToHook{cmd/appendix/before} {\__tag_sec_end:n{-10}}
+\AddToHook{cmd/frontmatter/before}{\par\__tag_sec_end:n{-10}}
+\AddToHook{cmd/mainmatter/before} {\par\__tag_sec_end:n{-10}}
+\AddToHook{cmd/backmatter/before} {\par\__tag_sec_end:n{-10}}
+\AddToHook{cmd/appendix/before} {\par\__tag_sec_end:n{-10}}
\cs_if_free:NT \tag_tool:n
{
\cs_new_protected:Npn \tag_tool:n #1
@@ -293,18 +293,19 @@
\@ifstar
{\@ssect{#3}{#4}{#5}{#6}}%
{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\RemoveFromHook{package/latex-lab-testphase-sec/after}[tagpdf]
\cs_new_protected:Npn \@kernel@tag@hangfrom #1
{
\tagstructbegin{tag=\l__tag_para_tag_tl}
\cs_if_exist_use:N \__tag_gincr_para_begin_int:
- \tagstructbegin{tag=Lbl}
+ \tagstructbegin{tag=section-number}
\setbox\@tempboxa
\hbox
{
\bool_lazy_and:nnT
{\tag_if_active_p:}
{\g__tag_mode_lua_bool}
- {\tagmcbegin{tag=Lbl}}
+ {\tagmcbegin{tag=section-number}}
{#1}
}
\tag_suspend:n{hangfrom}
@@ -314,7 +315,7 @@
\cs_new_protected:Npn \@kernel@tag@svsec
{
\tag_mc_end_push:
- \tag_struct_begin:n{tag=Lbl}
+ \tag_struct_begin:n{tag=section-number}
\tag_mc_begin:n{}
\@svsec
\tag_mc_end:
@@ -323,12 +324,12 @@
}
\def\@sect#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
- \def\@svsec{\@hyp@section@target@nnn{[section]}{}{#3}}
+ \def\@svsec{\NoCaseChange{\@hyp@section@target@nnn{[section]}{}{#3}}}
\else
\LinkTargetOff
\refstepcounter{#1}%
\LinkTargetOn
- \protected@edef\@svsec{\@hyp@section@target@nnn{}{#1}{#3}\@seccntformat{#1}\relax}%
+ \protected@edef\@svsec{\NoCaseChange{\@hyp@section@target@nnn{}{#1}{#3}}\@seccntformat{#1}\relax}%
\fi
\@tempskipa #5\relax
\ifdim \@tempskipa>\z@
@@ -370,11 +371,11 @@
\begingroup
\tagtool{para-flattened=true}
#4{%
- \@hangfrom{\hskip #1\relax\@hyp@section@target@nnn{[section]}{}{#1}}%
+ \@hangfrom{\hskip #1\relax\NoCaseChange{\@hyp@section@target@nnn{[section]}{}{#1}}}%
\interlinepenalty \@M #5\@@par}%
\endgroup
\else
- \def\@svsechd{#4{\hskip #1\relax\@hyp@section@target@nnn{[section]}{}{#3}\relax #5}}%
+ \def\@svsechd{#4{\hskip #1\relax\NoCaseChange{\@hyp@section@target@nnn{[section]}{}{#3}}\relax #5}}%
\fi
\@xsect{#3}}
\def\@xsect#1{%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-table.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-table.sty
index 91a750b20a5..bd5cd4db5c4 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-table.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-table.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtbldate{2024-09-18}
-\def\ltlabtblversion{0.85n}
+%% File: latex-lab-table.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtbldate{2025-01-05}
+\def\ltlabtblversion{0.85p}
\ProvidesExplPackage {latex-lab-testphase-table} {\ltlabtbldate} {\ltlabtblversion}
{Code related to the tagging of tables}
\RequirePackage{array}
@@ -55,7 +55,7 @@
\clist_new:N \l__tbl_tmpa_clist
\tl_new:N \l__tbl_tmpa_tl
\str_new:N \l__tbl_tmpa_str
-\str_if_exist:cF { l__socket_tagsupport/tbl/init/celldata_plug_str }
+\socket_if_exist:nF {tagsupport/tbl/init/celldata}
{
\NewSocket{tagsupport/tbl/init/celldata}{0}
\NewSocket{tagsupport/tbl/restore/celldata}{0}
@@ -349,6 +349,15 @@
\tag_struct_begin:n {tag=\l__tbl_tabletag_tl}
\tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} }
}
+\NewSocketPlug{tagsupport/tbl/hmode/begin}{LayoutTable}
+ {
+ \tag_mc_end_push:
+ \bool_lazy_and:nnT
+ { \bool_if_exist_p:N \l__tag_para_bool } { \l__tag_para_bool }
+ { \tag_struct_end:n { text } }
+ \tag_struct_begin:n {tag=\l__tbl_tabletag_tl,attribute-class=ARIA-role-presentation}
+ \tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} }
+ }
\NewSocketPlug{tagsupport/tbl/hmode/end}{Table}
{
\tag_struct_end:
@@ -362,6 +371,11 @@
\tag_struct_begin:n {tag=\l__tbl_tabletag_tl}
\tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} }
}
+\NewSocketPlug{tagsupport/tbl/vmode/begin}{LayoutTable}
+ {
+ \tag_struct_begin:n {tag=\l__tbl_tabletag_tl,attribute-class=ARIA-role-presentation}
+ \tl_gset:Ne \g__tbl_struct_table_tl { \tag_get:n {struct_num} }
+ }
\NewSocketPlug{tagsupport/tbl/vmode/end}{Table}
{
\tag_struct_end:
@@ -440,24 +454,50 @@
\AssignSocketPlug{tagsupport/tbl/leaders/begin}{code}
\AssignSocketPlug{tagsupport/tbl/leaders/end}{code}
}
+\cs_new_protected:Npn\__tbl_init_tagnames_default:
+ {
+ \tl_set:Nn\l__tbl_rowtag_tl {TR}
+ \tl_set:Nn\l__tbl_pcelltag_tl {TD}
+ \tl_set:Nn\l__tbl_celltag_tl {TD}
+ \tl_set:Nn\l__tbl_tabletag_tl {Table}
+ }
+
+\cs_new_protected:Npn\__tbl_init_tagnames_div:
+ {
+ \tl_set:Nn\l__tbl_rowtag_tl {NonStruct}
+ \tl_set:Nn\l__tbl_pcelltag_tl {NonStruct}
+ \tl_set:Nn\l__tbl_celltag_tl {text}
+ \tl_set:Nn\l__tbl_tabletag_tl {Div}
+ }
\keys_define:nn { __tag / setup }
{
table/tagging .choices:nn = { true, on }
- { \__tag_tbl_enable: },
+ {
+ \__tag_tbl_enable:
+ \__tbl_init_tagnames_default:
+ },
table/tagging .choices:nn = { false, off }
{ \__tag_tbl_disable: },
table/tagging .choice:,
table/tagging / presentation .code:n =
- {
- \__tag_tbl_enable:
- \tl_set:Nn\l__tbl_rowtag_tl {NonStruct}
- \tl_set:Nn\l__tbl_pcelltag_tl {NonStruct}
- \tl_set:Nn\l__tbl_celltag_tl {text}
- \tl_set:Nn\l__tbl_tabletag_tl {Div}
- \clist_clear:N \l__tbl_header_rows_clist
- \clist_clear:N \l__tbl_header_columns_clist
- },
+ {
+ \__tag_tbl_enable:
+ \__tbl_init_tagnames_default:
+ \AssignSocketPlug{tagsupport/tbl/hmode/begin}{LayoutTable}
+ \AssignSocketPlug{tagsupport/tbl/vmode/begin}{LayoutTable}
+ \clist_clear:N \l__tbl_header_rows_clist
+ \clist_clear:N \l__tbl_header_columns_clist
+ },
+ table/tagging / div .code:n =
+ {
+ \__tag_tbl_enable:
+ \__tbl_init_tagnames_div:
+ \AssignSocketPlug{tagsupport/tbl/hmode/begin}{LayoutTable}
+ \AssignSocketPlug{tagsupport/tbl/vmode/begin}{LayoutTable}
+ \clist_clear:N \l__tbl_header_rows_clist
+ \clist_clear:N \l__tbl_header_columns_clist
+ },
table/tagging .default:n = true,
table/tagging .initial:n = true
}
@@ -477,6 +517,8 @@
{TH-row}{/O /Table /Scope /Row},
role/new-attribute =
{TH-both}{/O /Table /Scope /Both},
+ role/new-attribute =
+ {ARIA-role-presentation}{/O /ARIA-1.1/role (presentation)}
}
\seq_gput_left:Ne\g__tag_attr_class_used_seq
{\pdf_name_from_unicode_e:n{TH-col}}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
index 2eea229b6d5..39b0e34397d 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-text.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtextdate{2024-09-18}
-\def\ltlabtextversion{0.85b}
+%% File: latex-lab-text.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtextdate{2025-02-18}
+\def\ltlabtextversion{0.85e}
\ProvidesExplPackage {latex-lab-testphase-text} {\ltlabtextdate} {\ltlabtextversion}
{Code related to the tagging of various small text commands}
@@ -43,7 +43,7 @@
{
\mode_leave_vertical:
\tag_mc_end_push:
- \tag_struct_begin:n{tag=Span,actualtext=LaTeX}
+ \tag_struct_begin:n{tag=Span,actualtext=LaTeX,phoneme=[ˈlaːtɛx]}
\tag_mc_begin:n{}
\tag_suspend:n{LaTeX}
}
@@ -81,6 +81,47 @@
\tag_struct_end:
\tag_mc_begin_pop:n{}
}
+\DeclareRobustCommand\mbox[1]
+ {
+ \leavevmode
+ \tag_socket_use:nnn {math/luamml/hbox}
+ {}{ \hbox{#1} }
+ }
+\long\def\@imakebox[#1][#2]#3{%
+ \tag_socket_use:nnn {math/luamml/hbox}{}
+ {
+ \@begin@tempboxa\hbox{#3}%
+ \setlength\@tempdima{#1}% support calc
+ \hb@xt@\@tempdima{%
+ \expandafter\ifx\csname bm@#2\endcsname\relax
+ \bm@c
+ \@latex@warning{Unexpected~alignment~#2}%
+ \else
+ \csname bm@#2\endcsname
+ \fi}%
+ \@end@tempboxa
+ }}
+\def\makeph@nt#1{%
+ \setbox\z@\hbox
+ {\SuspendTagging{\makeph@nt}%
+ \color@begingroup#1\color@endgroup\ResumeTagging{\makeph@nt}}\finph@nt}
+\def\@kernel@mathph@nt#1#2{%
+ \setbox\z@\hbox{\SuspendTagging{\mathph@nt}$\m@th#1{#2}$\ResumeTagging{\mathph@nt}}\finph@nt}
+\def\mathph@nt#1#2
+ {
+ \setbox \z@ = \hbox {
+ $
+ \m@th
+ #1
+ {
+ \let\mathph@nt\@kernel@mathph@nt
+ #2
+ }
+ \UseTaggingSocket{math/luamml/save/nNn}{{mathphant} #1 {mphantom}}
+ $
+ }
+ \UseTaggingSocket{math/luamml/finph@nt}{}{\finph@nt}
+ }
\endinput
%%
%% End of file `latex-lab-testphase-text.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-title.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-title.sty
index f3518622dfa..725b88c5b4f 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-title.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-title.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-title.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtitledate{2024-02-09}
+%% File: latex-lab-title.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtitledate{2024-12-12}
\def\ltlabtitleversion{0.85c}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
index 558041fccc4..6faa0c2f1d8 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
@@ -11,7 +11,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -35,16 +35,16 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabtocdate{2024-09-26}
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabtocdate{2024-12-27}
\def\ltlabtocversion{0.85e}
\ProvidesExplPackage {latex-lab-testphase-toc} {\ltlabtocdate} {\ltlabtocversion}
{ Code related to the tagging of toc-like lists}
-%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabkerneldate{2024-07-11}
-\def\ltlabkernelversion{0.85d}
+%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabkerneldate{2024-12-27}
+\def\ltlabkernelversion{0.85e}
\RequirePackage{latex-lab-kernel-changes}
-\str_if_exist:cF { l__socket_tagsupport/toc/contentsline/before_plug_str }
+\socket_if_exist:nF {tagsupport/toc/contentsline/before}
{
\NewSocket{tagsupport/toc/contentsline/before}{1}
\NewSocket{tagsupport/toc/contentsline/after}{1}
@@ -60,7 +60,7 @@
\addtocontents{#1}{%
\protect\contentsline{#2}{#3}{\thepage}{\@currentHref}\protected@file@percent
}}
-\str_if_exist:cF { l__socket_tagsupport/toc/starttoc/before_plug_str }
+\socket_if_exist:nF {tagsupport/toc/starttoc/before}
{
\NewSocket{tagsupport/toc/starttoc/before}{1}
\NewSocket{tagsupport/toc/starttoc/after}{1}
@@ -80,7 +80,7 @@
\NewMirroredHookPairWithArguments{contentsline/number/before}{contentsline/number/after}{1}%
\NewMirroredHookPairWithArguments{contentsline/text/before}{contentsline/text/after}{4}%
\NewMirroredHookPairWithArguments{contentsline/page/before}{contentsline/page/after}{4}%
-\str_if_exist:cF { l__socket_tagsupport/toc/leaders/before_plug_str }
+\socket_if_exist:nF {tagsupport/toc/leaders/before}
{
\NewSocket{tagsupport/toc/leaders/before}{0}
\NewSocket{tagsupport/toc/leaders/after}{0}
@@ -285,8 +285,8 @@
\endgroup
\fi}
}
-%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabtocdate{2024-09-26}
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabtocdate{2024-12-27}
\def\ltlabtocversion{0.85e}
\tl_new:N \l__tag_toc_tmpa_tl
\str_if_exist:cF { l__socket_tagsupport/recordtarget_plug_str }
@@ -436,7 +436,7 @@
{\nobreak\tag_mc_end:}
\AssignSocketPlug{tagsupport/toc/leaders/before}{artifact}
\AssignSocketPlug{tagsupport/toc/leaders/after}{artifact}
-%% File: latex-lab-toc-hyperref-changes.dtx (C) Copyright 2022-2024 LaTeX Project
+%% File: latex-lab-toc-hyperref-changes.dtx (C) Copyright 2022-2025 LaTeX Project
\def\ltlabtochyperdate{2023-07-20}
\def\ltlabtochyperversion{0.85a}
\def\hyper@nopatch@toc{}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-unicode-math.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-unicode-math.ltx
new file mode 100644
index 00000000000..52b6594c3a3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-unicode-math.ltx
@@ -0,0 +1,92 @@
+%%
+%% This is file `latex-lab-unicode-math.ltx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% latex-lab-unicode-math.dtx (with options: `kernel')
+%%
+%% This is a generated file.
+%%
+%% Copyright 2021-2025 LaTeX Project
+%%
+%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
+%% ------------------------------------------------------------------------------------
+%%
+%% It 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 or later.
+%%
+%% This file may only be distributed together with a copy of the LaTeX
+%% `LaTeX-lab Bundle'. You may however distribute the `LaTeX-lab Bundle'
+%% without such generated files.
+%%
+%% The newest sources can be found below
+%%
+%% https://github.com/latex3/latex2e/required/latex-lab
+%%
+%% where one can also log issues in case there are any.
+%%
+%%
+%% File: latex-lab-unicode-math.dtx
+\ProvidesExplFile
+ {latex-lab-unicode-math.ltx}
+ {2025-02-00}
+ {0.1b}
+ {unicode-math adaptions}
+\str_if_exist:cF { l__socket_tagsupport/math/luamml/artifact_plug_str }
+ {
+ \NewSocket{tagsupport/math/luamml/artifact}{0}
+ }
+\def\bBigg@#1#2
+ {{\ensuremath {\Uvextensible height~#1 \big@size axis~exact~#2}}}
+\protected\def\varinjlim
+ {{\Udelimiterunder 0 "2192 {\qopname\relax o{\luamml_ignore:\mathstrut lim}}}}
+\protected\def\varprojlim
+ {{\Udelimiterunder 0 "2190 {\qopname\relax o{\luamml_ignore:\mathstrut lim}}}}
+\protected\def\varlimsup
+ {{\overline{\qopname\relax o{\luamml_ignore:\mathstrut lim}}}}
+\protected\def\varliminf
+ {{\underline{\qopname\relax o{lim}}}}
+\AtBeginDocument
+ {
+ \cs_gset_protected_nopar:Npn \sqrtsign
+ {
+ \tag_socket_use:n {math/luamml/artifact}
+ \tex_Uradical:D \symoperators "0221A\scan_stop:
+ }
+ }
+\cs_set_nopar:Npn \plainroot@ #1 \of #2
+ {
+ \bool_if:nTF
+ {
+ \__um_int_if_zero_p:n \uproot@ && \__um_int_if_zero_p:n \leftroot@
+ }
+ {
+ \tag_socket_use:n {math/luamml/artifact}
+ \Uroot \c__um_radical_sqrt_tl { #1 } { #2 }
+ }
+ {
+ \hbox_set:Nn \rootbox
+ {
+ \c_math_toggle_token \m@th
+ \scriptscriptstyle { #1 }
+ \c_math_toggle_token
+ }
+ \mathchoice
+ { \r@@t \displaystyle { #2 } }
+ { \r@@t \textstyle { #2 } }
+ { \r@@t \scriptstyle { #2 } }
+ { \r@@t \scriptscriptstyle { #2 } }
+ }
+ \c_group_end_token
+ }
+\DeclareRobustCommand {\frac}[2]
+ {{\tag_socket_use:n{math/luamml/artifact}\Ustack{\begingroup#1\endgroup\@@over#2}}}
+\endinput
+%%
+%% End of file `latex-lab-unicode-math.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/marginpar-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/marginpar-latex-lab-testphase.ltx
index 0c55110f9d5..507ac0311b2 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/marginpar-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/marginpar-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -34,8 +34,8 @@
%%
%% File: latex-lab-marginpar.dtx
%%
-\def\ltlabmarginpardate{2024-09-18}
-\def\ltlabmarginparversion{0.85d}
+\def\ltlabmarginpardate{2025-02-21}
+\def\ltlabmarginparversion{0.85e}
\ProvidesFile{marginpar-latex-lab-testphase.ltx}
[\ltlabmarginpardate\space v\ltlabmarginparversion\space
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
index 2c89d19d494..9189ea9f24e 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
index b11a23987c1..f62654143cb 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
index b4e311b2e2a..a1edb929183 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2024 Frank Mittelbach
-\def\ltlabneworIdate{2024-11-12}
-\def\ltlabneworIversion{0.85b}
+%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2025 Frank Mittelbach
+\def\ltlabneworIdate{2025-02-11}
+\def\ltlabneworIversion{0.85c}
\ProvidesFile{new-or-1-latex-lab-testphase.ltx}
[\ltlabneworIdate\space v\ltlabneworIversion\space
latex-lab wrapper new-or-1]
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
index 45354f15d36..7c666fc8d6b 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
index a672afc5968..c54861e2123 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
index 0958d99b119..dadb14f9242 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
index c782abde3ad..2e3a55d8415 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx
index fa037aca3bf..7e3be98dbf1 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-sec.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabsecdate{2024-10-04}
-\def\ltlabsecversion{0.84f}
+%% File: latex-lab-sec.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabsecdate{2025-02-18}
+\def\ltlabsecversion{0.84i}
\ProvidesFile{sec-latex-lab-testphase.ltx}
[\ltlabsecdate\space v\ltlabsecversion\space latex-lab wrapper sec]
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/table-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/table-latex-lab-testphase.ltx
index eee19904436..2746edd5882 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/table-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/table-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtbldate{2024-09-18}
-\def\ltlabtblversion{0.85n}
+%% File: latex-lab-table.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtbldate{2025-01-05}
+\def\ltlabtblversion{0.85p}
\ProvidesFile{table-latex-lab-testphase.ltx}
[\ltlabtbldate\space v\ltlabtblversion\space latex-lab wrapper table]
\RequirePackage{latex-lab-testphase-table}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/tabular-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/tabular-latex-lab-testphase.ltx
index 093b38ef924..13fad4dfc1f 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/tabular-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/tabular-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-table.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtbldate{2024-09-18}
-\def\ltlabtblversion{0.85n}
+%% File: latex-lab-table.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtbldate{2025-01-05}
+\def\ltlabtblversion{0.85p}
\ProvidesFile{tabular-latex-lab-testphase.ltx}
[\ltlabtbldate\space v\ltlabtblversion\space latex-lab wrapper tabular]
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
index e7303e398e0..7979e9202e5 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def
index 13054a4f295..8e83e8180d9 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def
@@ -23,7 +23,7 @@ enumerate, L, pdf2,
description, L, pdf2,
quote, BlockQuote,pdf,
quotation, BlockQuote,pdf,
-verbatim, Div, pdf2, % overwritten by block
+verbatim, Code, pdf, % overwritten by block
item, LI, pdf2,
itemlabel, Lbl, pdf2,
itembody, LBody, pdf2,
@@ -32,8 +32,9 @@ footnotemark, Lbl, pdf2,
footnotelabel,Lbl, pdf2,
text-unit, Part, pdf2,
text, P, pdf2,
+section-number, Span, pdf2,
theorem-like, Sect, pdf2,
-verbatim, P, pdf2,
+verbatim, Code, pdf,
codeline, Sub, pdf2,
float, Aside, pdf2,
figures, Sect, pdf2,
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
index 290c185f0d2..0bbe89f883f 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,9 +32,9 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-text.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtextdate{2024-09-18}
-\def\ltlabtextversion{0.85b}
+%% File: latex-lab-text.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtextdate{2025-02-18}
+\def\ltlabtextversion{0.85e}
\ProvidesFile{text-latex-lab-testphase.ltx}
[\ltlabtextdate\space v\ltlabtextversion\space
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/title-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/title-latex-lab-testphase.ltx
index 17f603db23e..b47484be696 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/title-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/title-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-title.dtx (C) Copyright 2023-2024 LaTeX Project
-\def\ltlabtitledate{2024-02-09}
+%% File: latex-lab-title.dtx (C) Copyright 2023-2025 LaTeX Project
+\def\ltlabtitledate{2024-12-12}
\def\ltlabtitleversion{0.85c}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx
index 8985e57bc7b..20b27d88e5d 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2021-2023 LaTeX Project
+%% Copyright 2021-2025 LaTeX Project
%%
%% This file was generated from file(s) of the `LaTeX-lab Bundle'.
%% ------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc.dtx (C) Copyright 2022-2024 LaTeX Project
-\def\ltlabtocdate{2024-09-26}
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2025 LaTeX Project
+\def\ltlabtocdate{2024-12-27}
\def\ltlabtocversion{0.85e}
\ProvidesFile{toc-latex-lab-testphase.ltx}
[\ltlabtocdate\space v\ltlabtocversion latex-lab wrapper toc]
diff --git a/Master/texmf-dist/tex/latex-dev/tools/.tex b/Master/texmf-dist/tex/latex-dev/tools/.tex
index a6b7144e01d..798f86a095c 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/afterpage.sty b/Master/texmf-dist/tex/latex-dev/tools/afterpage.sty
index 2a487eac7e9..46bb6f38ce5 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/afterpage.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/afterpage.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/array.sty b/Master/texmf-dist/tex/latex-dev/tools/array.sty
index a190c9f7714..d58db3f1a2f 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/array.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/array.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -47,7 +47,7 @@
\NeedsTeXFormat{LaTeX2e}[2024/06/01]
\ProvidesPackage{array}
- [2024/10/17 v2.6g Tabular extension package (FMi)]
+ [2025/02/18 v2.6h Tabular extension package (FMi)]
%%
\ExplSyntaxOn
@@ -129,6 +129,14 @@
\@acol \@firstampfalse \or
\@addamp
\fi}
+\str_if_exist:cF { l__socket_tagsupport/math/luamml/array/save_plug_str }
+ {
+ \NewSocket{tagsupport/math/luamml/array/save}{0}
+ \NewSocket{tagsupport/math/luamml/array/finalize}{0}
+ \NewSocket{tagsupport/math/luamml/array/initcol}{0}
+ \NewSocket{tagsupport/math/luamml/array/finalizecol}{1}
+ \AssignSocketPlug{tagsupport/math/luamml/array/finalizecol}{noop}
+ }
\def\@classz{\@classx
\@tempcnta \count@
\prepnext@tok
@@ -137,9 +145,12 @@
\hskip1sp%
\d@llarbegin
\insert@column
- \d@llarend \do@row@strut \hfil \or
- \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or
- \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or
+ \d@llarend
+ \do@row@strut \hfil \or
+ \hskip1sp\d@llarbegin\insert@column\d@llarend
+ \do@row@strut \hfil \or
+ \hfil\hskip1sp\d@llarbegin\insert@column\d@llarend
+ \do@row@strut \or
\setbox\ar@mcellbox\vbox
\@startpbox{\@nextchar}\insert@pcolumn \@endpbox
\ar@align@mcell
@@ -182,6 +193,7 @@
\vrule \@height \ht\@arstrutbox \@width \z@
\everypar{}}%
}
+\let\@startpbox@action\@startpbox
\def\@endpbox{\@finalstrut\@arstrutbox \par \color@endgroup \egroup\hfil}
\def\@array[#1]#2{
\@tempdima \ht \strutbox
@@ -258,23 +270,39 @@
\let\d@llarbegin\begingroup
\let\d@llarend\endgroup
\def\array{\col@sep\arraycolsep
- \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%
+ \def\d@llarbegin{$\tag_socket_use:n { math/luamml/array/initcol }}
+ \def\d@llarend
+ {
+ \tag_socket_use:nn { math/luamml/save/nn }{{}{mtd}}
+ $
+ \tag_socket_use:nn { math/luamml/array/finalizecol}{\the\@chnum}
+ }
+ \def\@halignto{}%
\@tabarray}
\def\tabular{\def\@halignto{}\@tabular}
\expandafter\def\csname tabular*\endcsname#1{%
\setlength\dimen@{#1}%
\edef\@halignto{to\the\dimen@}\@tabular}
+\providecommand\MathCollectTrue{}
+\providecommand\MathCollectFalse{}
+\providecommand\@kernel@tabular@init{}
\def\@tabular{%
\leavevmode
\UseTaggingSocket{tbl/hmode/begin}%
- \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup
+ \hbox \bgroup
+ \MathCollectFalse$\MathCollectTrue
+ \col@sep\tabcolsep \let\d@llarbegin\begingroup
\let\d@llarend\endgroup
+ \@kernel@tabular@init
\@tabarray}
\def\endarray {
- \tbl_crcr:n{endarray} \egroup
- \UseTaggingSocket{tbl/finalize}
+ \tbl_crcr:n{endarray}
+ \tag_socket_use_expandable:n { math/luamml/array/save }
+ \egroup
+ \tag_socket_use:n { tbl/finalize }
\tbl_restore_outer_cell_data:
\egroup
+ \tag_socket_use:n { math/luamml/array/finalize }
\@arrayright \gdef\@preamble{}%
}
\def\endtabular{\endarray\m@th $\egroup
@@ -348,7 +376,9 @@
\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
\let\@sharp\relax
\def\@startpbox##1{\unexpanded\expandafter{\expandafter
- \@startpbox\expandafter{##1}}}\let\@endpbox\relax
+ \@startpbox@action\expandafter{##1}}}%
+ \def\@startpbox@action##1{\unexpanded{\@startpbox@action{##1}}}%
+ \let\@endpbox\relax
\let\do@row@strut\relax
\let\ar@align@mcell\relax
\@temptokena{#1}\@tempswatrue
diff --git a/Master/texmf-dist/tex/latex-dev/tools/bm.sty b/Master/texmf-dist/tex/latex-dev/tools/bm.sty
index 175a3c6e84e..7f479ac47ca 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/bm.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/bm.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/calc.sty b/Master/texmf-dist/tex/latex-dev/tools/calc.sty
index dfb61a5b942..38768af2781 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/calc.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/calc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/dcolumn.sty b/Master/texmf-dist/tex/latex-dev/tools/dcolumn.sty
index 552e282aa81..2d3555242e6 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/dcolumn.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/dcolumn.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/delarray.sty b/Master/texmf-dist/tex/latex-dev/tools/delarray.sty
index a5b7f5c43fe..ed9dd267338 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/delarray.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/delarray.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/e.tex b/Master/texmf-dist/tex/latex-dev/tools/e.tex
index 987b7fc8fcf..b7e888fbe5e 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/e.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/e.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/enumerate.sty b/Master/texmf-dist/tex/latex-dev/tools/enumerate.sty
index 189b630df7d..dd0c3280af6 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/enumerate.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/enumerate.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.sty
index 781e333f1e5..a3445dfb85f 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.tex
index 8c1671492fd..f9a9d2df27a 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/fontsmpl.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/ftnright.sty b/Master/texmf-dist/tex/latex-dev/tools/ftnright.sty
index 06d26677fbc..a17fddceefc 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/ftnright.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/ftnright.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/h.tex b/Master/texmf-dist/tex/latex-dev/tools/h.tex
index e17174333b4..cf398b8a340 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/h.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/h.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/hhline.sty b/Master/texmf-dist/tex/latex-dev/tools/hhline.sty
index e4fb937acb8..dbed1739da4 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/hhline.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/hhline.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty b/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty
index 68ba4564107..14cd6433da6 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/indentfirst.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/l3sys-query.sty b/Master/texmf-dist/tex/latex-dev/tools/l3sys-query.sty
index 792ef9c0416..f493a434f04 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/l3sys-query.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/l3sys-query.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -35,7 +35,7 @@
%% given in the file `manifest.txt'.
%%
%% Source File: l3sys-query.dtx
-%% Copyright (C) 2024
+%% Copyright (C) 2024-2025
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/layout.sty b/Master/texmf-dist/tex/latex-dev/tools/layout.sty
index 33d9bd36333..ff38eb4fb79 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/layout.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/layout.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/longtable.sty b/Master/texmf-dist/tex/latex-dev/tools/longtable.sty
index 0bc422eb465..5824ecb2e0a 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/longtable.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/longtable.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -43,7 +43,7 @@
\DeclareCurrentRelease{}{2020-02-07}
\ProvidesPackage{longtable}
- [2024-10-27 v4.22 Multi-page Table package (DPC)]
+ [2024-12-18 v4.23 Multi-page Table package (DPC)]
\def\LT@err{\PackageError{longtable}}
\def\LT@warn{\PackageWarning{longtable}}
\def\LT@final@warn{%
@@ -148,7 +148,8 @@
\else
\advance\@tempdima\extrarowheight
\col@sep\tabcolsep
- \let\@startpbox\LT@startpbox\let\LT@LL@FM@cr\@arraycr
+ \let\@startpbox@action\LT@startpbox
+ \let\LT@LL@FM@cr\@arraycr
\fi
\setbox\@arstrutbox\hbox{\vrule
\@height \arraystretch \@tempdima
diff --git a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
index 3cc9d82e039..c5e34ca2211 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -35,7 +35,7 @@
%% given in the file `manifest.txt'.
%%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2024 Frank Mittelbach
+%% Copyright 1989-2025 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -106,7 +106,7 @@
\DeclareCurrentRelease{}{2021-11-15}
\ProvidesPackage{multicol}
- [2024/11/21 v2.0a multicolumn formatting (FMi)]
+ [2024/11/27 v2.0a multicolumn formatting (FMi)]
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
diff --git a/Master/texmf-dist/tex/latex-dev/tools/q.tex b/Master/texmf-dist/tex/latex-dev/tools/q.tex
index ef93425302e..0868d65f9f8 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/q.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/q.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/r.tex b/Master/texmf-dist/tex/latex-dev/tools/r.tex
index 0031b8b56f8..c578198e815 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/r.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/r.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/rawfonts.sty b/Master/texmf-dist/tex/latex-dev/tools/rawfonts.sty
index 1dec5d108fa..9bb9b651219 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/rawfonts.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/rawfonts.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/s.tex b/Master/texmf-dist/tex/latex-dev/tools/s.tex
index 67068e8f3ee..ecdd420948f 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/s.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/s.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty b/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
index ddeb937bb21..07cf35881e2 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -36,7 +36,7 @@
%% given in the file `manifest.txt'.
%%
%% Source File: shellesc.dtx
-%% Copyright (C) 2015-2024
+%% Copyright (C) 2015-2025
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/showkeys.sty b/Master/texmf-dist/tex/latex-dev/tools/showkeys.sty
index 67811019e39..588833a1c64 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/showkeys.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/showkeys.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -36,7 +36,7 @@
%% given in the file `manifest.txt'.
%%
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006-2024 David Carlisle, LaTeX Project
+%% File: showkeys.dtx Copyright (C) 2006-2025 David Carlisle, LaTeX Project
\NeedsTeXFormat{LaTeX2e}
\DeclareRelease{}{1994-06-01}{showkeys-2014-10-28.sty}
diff --git a/Master/texmf-dist/tex/latex-dev/tools/somedefs.sty b/Master/texmf-dist/tex/latex-dev/tools/somedefs.sty
index 8c5226d39bc..6ffa977355f 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/somedefs.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/somedefs.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/tabularx.sty b/Master/texmf-dist/tex/latex-dev/tools/tabularx.sty
index 9cedcd02754..5b836cc27ea 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/tabularx.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thb.sty b/Master/texmf-dist/tex/latex-dev/tools/thb.sty
index c7c01d6d8f8..e028a445060 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thb.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thb.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thc.sty b/Master/texmf-dist/tex/latex-dev/tools/thc.sty
index 77b0c88c478..85daccb109e 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thc.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thc.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thcb.sty b/Master/texmf-dist/tex/latex-dev/tools/thcb.sty
index e02fb365d80..8fee05b235a 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thcb.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thcb.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/theorem.sty b/Master/texmf-dist/tex/latex-dev/tools/theorem.sty
index 474a44eacca..3dd191b993b 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/theorem.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/theorem.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thm.sty b/Master/texmf-dist/tex/latex-dev/tools/thm.sty
index 18837285335..c441d455918 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thm.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thm.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thmb.sty b/Master/texmf-dist/tex/latex-dev/tools/thmb.sty
index d5f9b089190..20206f28d2a 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thmb.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thmb.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/thp.sty b/Master/texmf-dist/tex/latex-dev/tools/thp.sty
index 16f97840d6a..00914b1fca0 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/thp.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/thp.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/trace.sty b/Master/texmf-dist/tex/latex-dev/tools/trace.sty
index 00d42ef7af4..f4692c49a2a 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/trace.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/trace.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/varioref.sty b/Master/texmf-dist/tex/latex-dev/tools/varioref.sty
index 6b2f7cfd7ac..f6bba5ed333 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/varioref.sty
@@ -12,7 +12,7 @@
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -51,7 +51,7 @@
\DeclareCurrentRelease{}{2019-10-01}
\ProvidesPackage{varioref}
- [2024/05/23 v1.6g package for extended references (FMi)]
+ [2025/01/14 v1.6g package for extended references (FMi)]
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty b/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
index 069ed64286b..81ac99c1609 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/verbtest.tex b/Master/texmf-dist/tex/latex-dev/tools/verbtest.tex
index a5c40684c96..0c9b9f20a33 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/verbtest.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/verbtest.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/x.tex b/Master/texmf-dist/tex/latex-dev/tools/x.tex
index 8c5e356a45b..39a01c6bcda 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/x.tex
+++ b/Master/texmf-dist/tex/latex-dev/tools/x.tex
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/xr.sty b/Master/texmf-dist/tex/latex-dev/tools/xr.sty
index 9e3f16cd92b..5fdf97d0cee 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/xr.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -35,12 +35,12 @@
%% The list of all files belonging to the LaTeX `Tools Bundle' is
%% given in the file `manifest.txt'.
%%
-%% File: xr.dtx Copyright (C) 1993-2024 David Carlisle
+%% File: xr.dtx Copyright (C) 1993-2025 David Carlisle
\NeedsTeXFormat{LaTeX2e}
\DeclareRelease{v5}{2023-07-04}{xr-2023-07-04.sty}
-\DeclareCurrentRelease{}{2024-04-10}
+\DeclareCurrentRelease{}{2024-12-22}
\ProvidesPackage{xr}
- [2024-04-10 v6.00 eXternal References (DPC)]
+ [2024-12-22 v6.00 eXternal References (DPC)]
\def\externaldocument{\@testopt\XR@cite{}}
\let\externalcitedocument\externaldocument
\def\XR@cite[#1]{\@testopt{\XR@[#1]}{}}
diff --git a/Master/texmf-dist/tex/latex-dev/tools/xspace.sty b/Master/texmf-dist/tex/latex-dev/tools/xspace.sty
index 7c4532b2a07..1aa10c6fc44 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/xspace.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/xspace.sty
@@ -13,7 +13,7 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright (C) 1993-2024
+%% Copyright (C) 1993-2025
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%