summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r--Master/texmf-dist/doc/latex/acronym/CHANGES12
-rw-r--r--Master/texmf-dist/doc/latex/acronym/acronym.pdfbin275707 -> 299705 bytes
-rw-r--r--Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction-source-code.zipbin0 -> 628449 bytes
-rw-r--r--Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction.pdfbin0 -> 505453 bytes
-rw-r--r--Master/texmf-dist/doc/latex/aiplans/LICENSE.txt415
-rw-r--r--Master/texmf-dist/doc/latex/aiplans/README.md80
-rw-r--r--Master/texmf-dist/doc/latex/aiplans/README.pdfbin0 -> 67103 bytes
-rw-r--r--Master/texmf-dist/doc/latex/animate/ChangeLog20
-rw-r--r--Master/texmf-dist/doc/latex/animate/README.txt21
-rw-r--r--Master/texmf-dist/doc/latex/animate/animate.pdfbin3781023 -> 3797724 bytes
-rw-r--r--Master/texmf-dist/doc/latex/argumentation/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/argumentation/argumentation-doc.pdfbin307239 -> 516606 bytes
-rw-r--r--Master/texmf-dist/doc/latex/argumentation/argumentation-doc.tex556
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/asy/jh.asy17
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/asy_overview.pdfbin2057271 -> 2057627 bytes
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/appendix/appendix.tex19
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/asy_tut.tex4
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter1/chapter1.tex4
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter1/main.tex2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/cos.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/exponential.asy4
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot_after.asy5
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter2/chapter2.tex68
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/integral.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_iterate.asy22
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_times.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter3/chapter3.tex42
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/planes.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/vectors.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/washer.asy2
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter4/chapter4.tex56
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/chapter4/main_3d.tex9
-rw-r--r--Master/texmf-dist/doc/latex/asy-overview/src/preface/preface.tex2
-rw-r--r--Master/texmf-dist/doc/latex/babel/README.md16
-rw-r--r--Master/texmf-dist/doc/latex/babel/babel-code.pdfbin650953 -> 675546 bytes
-rw-r--r--Master/texmf-dist/doc/latex/babel/babel.pdfbin422487 -> 458414 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/MANIFEST.md301
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/README.md127
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann11
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.note3
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-blueprint.pdfbin0 -> 1355 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdfbin0 -> 656010 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.tex14
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdfbin0 -> 463334 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex1094
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdfbin0 -> 280401 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex65
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdfbin0 -> 282846 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex66
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdfbin0 -> 30349 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.tex8
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-layout.pdfbin0 -> 7446 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-logo.pdfbin0 -> 1455 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-safetybox.pdf70
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdfbin0 -> 229912 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.tex14
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdfbin0 -> 1055055 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/section-Beamer.tex379
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/section-Conclusion.tex37
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex398
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-tcolorbox/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc-settings.sty7
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.pdfbin178055 -> 178136 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.tex8
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdfbin465495 -> 465824 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex29
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdfbin473027 -> 473527 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex29
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdfbin469483 -> 470053 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex29
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdfbin597953 -> 637441 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdfbin469617 -> 469903 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex29
-rw-r--r--Master/texmf-dist/doc/latex/bmstu-iu8/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/bmstu-iu8/bmstu-example.pdfbin177182 -> 177191 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/README4
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/bookcover-example1.pdfbin717536 -> 717518 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/bookcover-example2.pdfbin82335 -> 81927 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/bookcover-example2.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/bookcover.pdfbin1594968 -> 1615495 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-barcode.pdfbin12109 -> 12701 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-description.pdfbin43758 -> 46190 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-dustjacket.pdfbin276931 -> 278101 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-foldingmargin.pdfbin33182 -> 35595 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-margins.pdfbin1569 -> 1531 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-newpart.pdfbin68274 -> 45226 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-parts.pdfbin84132 -> 79690 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-pi.pdfbin12568 -> 13591 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-ruler.pdfbin12332 -> 12134 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-foldingmargin.pdfbin11013 -> 11786 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-widthflaps.pdfbin0 -> 11465 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-withoutflaps.pdfbin10332 -> 11103 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikz.pdfbin1524 -> 1412 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikzclip.pdfbin1568 -> 1490 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bookcover/figures/bookcover-trimming.pdfbin67794 -> 71847 bytes
-rw-r--r--Master/texmf-dist/doc/latex/changelog/README.md13
-rw-r--r--Master/texmf-dist/doc/latex/changelog/changelog.pdfbin54725 -> 55176 bytes
-rw-r--r--Master/texmf-dist/doc/latex/changelog/changelog.tex24
-rw-r--r--Master/texmf-dist/doc/latex/changelog/example.pdfbin17624 -> 17536 bytes
-rw-r--r--Master/texmf-dist/doc/latex/changelog/example.tex35
-rw-r--r--Master/texmf-dist/doc/latex/circledtext/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/circledtext/circledtext.pdfbin214742 -> 216253 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circledtext/circledtext.tex4
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md31
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdfbin240562 -> 240576 bytes
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex2
-rw-r--r--Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.pdfbin214341 -> 215171 bytes
-rw-r--r--Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.tex4
-rw-r--r--Master/texmf-dist/doc/latex/commalists-tools/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.pdfbin0 -> 61757 bytes
-rw-r--r--Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.tex415
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/README2
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/cs-techrep.pdfbin187505 -> 190900 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/cpn_all_all.bib226
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/cpn_supervised_all.bib1
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.pdfbin145442 -> 155959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.tex75
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/selfref.bib4
-rw-r--r--Master/texmf-dist/doc/latex/cs-techrep/template/webdev_commons.bib1550
-rw-r--r--Master/texmf-dist/doc/latex/csthm/README.md89
-rw-r--r--Master/texmf-dist/doc/latex/csthm/csthm-example.pdfbin0 -> 410446 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csthm/csthm-example.tex407
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/CHANGES.md14
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty9
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdfbin72044 -> 72044 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdfbin951198 -> 951769 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex9
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdfbin690985 -> 691190 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdfbin295659 -> 295267 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex2
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdfbin210026 -> 213959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex57
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdfbin1475123 -> 1568902 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex289
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.pdfbin148026 -> 149933 bytes
-rw-r--r--Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.tex20
-rw-r--r--Master/texmf-dist/doc/latex/easybook/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin638352 -> 646658 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex135
-rw-r--r--Master/texmf-dist/doc/latex/edmac/COPYRIGHT16
-rw-r--r--Master/texmf-dist/doc/latex/edmac/braonain.tex149
-rw-r--r--Master/texmf-dist/doc/latex/edmac/copying281
-rw-r--r--Master/texmf-dist/doc/latex/edmac/ed-nfss.txt64
-rw-r--r--Master/texmf-dist/doc/latex/edmac/edmac.doc7655
-rw-r--r--Master/texmf-dist/doc/latex/edmac/edstanza.doc242
-rw-r--r--Master/texmf-dist/doc/latex/edmac/edszadoc.tex6
-rw-r--r--Master/texmf-dist/doc/latex/edmac/features.tex138
-rw-r--r--Master/texmf-dist/doc/latex/edmac/readme40
-rw-r--r--Master/texmf-dist/doc/latex/euromoney/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/euromoney/euromoney-doc.pdfbin0 -> 2409702 bytes
-rw-r--r--Master/texmf-dist/doc/latex/euromoney/euromoney-doc.tex461
-rw-r--r--Master/texmf-dist/doc/latex/ezedits/README.md47
-rw-r--r--Master/texmf-dist/doc/latex/ezedits/ezedits_docs.pdfbin0 -> 143133 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ezedits/ezedits_docs.tex171
-rw-r--r--Master/texmf-dist/doc/latex/fancyqr/README.md40
-rw-r--r--Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.pdfbin247479 -> 262328 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.tex23
-rw-r--r--Master/texmf-dist/doc/latex/fancyqr/qr-example.tex12
-rw-r--r--Master/texmf-dist/doc/latex/fancyqr/qr-minimal.tex12
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/CHANGES8
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/README9
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdfbin563008 -> 629876 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md13
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/beery.cls2
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale.pdfbin105543 -> 106313 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale.tex34
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/README2
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdfbin566412 -> 580990 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex17
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdfbin27714 -> 32601 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdfbin26645 -> 31498 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdfbin30994 -> 32639 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdfbin21396 -> 22438 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdfbin25282 -> 29383 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdfbin44495 -> 35319 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdfbin33605 -> 37112 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdfbin0 -> 25650 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex120
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdfbin23376 -> 26496 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample.pdfbin35019 -> 34450 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontsetup/fspsample.tex45
-rw-r--r--Master/texmf-dist/doc/latex/framedsyntax/FramedSyntax.pdfbin0 -> 460751 bytes
-rw-r--r--Master/texmf-dist/doc/latex/framedsyntax/README.txt12
-rw-r--r--Master/texmf-dist/doc/latex/fvextra/CHANGELOG.md46
-rw-r--r--Master/texmf-dist/doc/latex/fvextra/fvextra.pdfbin895911 -> 916979 bytes
-rw-r--r--Master/texmf-dist/doc/latex/heria/heria-proposal.pdfbin311063 -> 311062 bytes
-rw-r--r--Master/texmf-dist/doc/latex/heria/heria.pdfbin305316 -> 305232 bytes
-rw-r--r--Master/texmf-dist/doc/latex/homework/README.md30
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes3
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin11613770 -> 11614944 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex3
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/README20
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/iaria-lite.pdfbin170730 -> 174380 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/template/cpn_all_all.bib226
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/template/cpn_supervised_all.bib1
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.pdfbin132913 -> 142941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.tex72
-rw-r--r--Master/texmf-dist/doc/latex/iaria/README18
-rw-r--r--Master/texmf-dist/doc/latex/iaria/iaria.pdfbin172223 -> 175722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iaria/template/cpn_all_all.bib226
-rw-r--r--Master/texmf-dist/doc/latex/iaria/template/cpn_supervised_all.bib1
-rw-r--r--Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.pdfbin132891 -> 142007 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.tex61
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/appendix/updateinfo.tex3
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/overleaf.tex4
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/preface.tex2
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/ubuntu.tex4
-rw-r--r--Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdfbin829826 -> 829916 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isosafety/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/isosafety/isosafety-docs.pdfbin113148 -> 104036 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isosafety/isosafety-docs.tex86
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/README-ja.md5
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html138
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdfbin387548 -> 388777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html4
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html6
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq.html1108
-rw-r--r--Master/texmf-dist/doc/latex/jlreq/jlreq.pdfbin209167 -> 209385 bytes
-rw-r--r--Master/texmf-dist/doc/latex/joinbox/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/joinbox/joinbox.pdfbin411301 -> 411317 bytes
-rw-r--r--Master/texmf-dist/doc/latex/joinbox/joinbox.tex2
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdfbin430658 -> 434099 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex20
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/README.md61
-rwxr-xr-xMaster/texmf-dist/doc/latex/jupynotex/example/build5
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/example/example.tex27
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/example/notebook.ipynb593
-rwxr-xr-xMaster/texmf-dist/doc/latex/jupynotex/tests/run3
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/tests/test_cellparser.py79
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/tests/test_main.py111
-rw-r--r--Master/texmf-dist/doc/latex/jupynotex/tests/test_notebook.py237
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/README.md26
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.pdfbin125619 -> 129845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.tex4
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.pdfbin0 -> 201988 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.tex118
-rw-r--r--Master/texmf-dist/doc/latex/keytheorems/CHANGELOG.md44
-rw-r--r--Master/texmf-dist/doc/latex/keytheorems/README.md609
-rw-r--r--Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.pdfbin0 -> 147471 bytes
-rw-r--r--Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.tex1157
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md21
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/expl3.pdfbin610834 -> 610540 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/interface3.pdfbin1791477 -> 1791096 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/interface3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3doc.pdfbin565816 -> 565509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdfbin151526 -> 151188 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news.pdfbin396223 -> 402148 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news01.pdfbin122959 -> 122973 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news02.pdfbin150919 -> 150932 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news03.pdfbin148747 -> 154694 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news04.pdfbin114754 -> 114764 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news05.pdfbin112524 -> 112536 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news06.pdfbin151591 -> 151602 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news07.pdfbin128344 -> 128356 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news08.pdfbin163484 -> 163496 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news09.pdfbin250161 -> 256116 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news10.pdfbin150302 -> 156270 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news11.pdfbin170102 -> 176082 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news12.pdfbin205020 -> 210972 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv1
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdfbin83133 -> 83163 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdfbin296814 -> 296526 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdfbin231657 -> 231357 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdfbin242449 -> 242159 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3.pdfbin7611739 -> 7614229 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3body.tex8
-rw-r--r--Master/texmf-dist/doc/latex/latex-doc-ptr/README14
-rw-r--r--Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.css.replacement148
-rw-r--r--Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.html927
-rw-r--r--Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.pdfbin169323 -> 179459 bytes
-rw-r--r--Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.tex13
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings-devel.pdfbin1454841 -> 1457040 bytes
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings.pdfbin1028632 -> 1028426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/listings/lstdrvrs.pdfbin790575 -> 791320 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/README.md14
-rw-r--r--Master/texmf-dist/doc/latex/litetable/favicon.pngbin17761 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-cn.pdfbin304570 -> 174081 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-cn.tex427
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-demo.pdfbin106969 -> 55242 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-demo.tex211
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-en.pdfbin178911 -> 118263 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-en.tex381
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-hk.pdfbin0 -> 189869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/litetable/litetable-hk.tex143
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog15
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin3685849 -> 3685924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/minted/CHANGELOG_LATEXMINTED_PYTHON_PACKAGE.md38
-rw-r--r--Master/texmf-dist/doc/latex/minted/CHANGELOG_MINTED_LATEX_PACKAGE.md960
-rw-r--r--Master/texmf-dist/doc/latex/minted/DEPENDS.txt10
-rw-r--r--Master/texmf-dist/doc/latex/minted/README4
-rw-r--r--Master/texmf-dist/doc/latex/minted/minted.pdfbin872465 -> 505845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdfbin484200 -> 552860 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex31
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixa.tex4
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixb.tex108
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/committee_members.tex69
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex4
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex5
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mitthesis-sample.bib12
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/README.md23
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdfbin480892 -> 550995 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdfbin349865 -> 374324 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdfbin152948 -> 169587 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdfbin461124 -> 484379 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdfbin173088 -> 191692 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdfbin278894 -> 294664 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdfbin320084 -> 339125 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdfbin162721 -> 179016 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdfbin164333 -> 181040 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdfbin160667 -> 177446 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex188
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex191
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex192
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex188
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex188
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex191
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex187
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt5
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex188
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex187
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex187
-rwxr-xr-xMaster/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh89
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdfbin108977 -> 109707 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex54
-rw-r--r--Master/texmf-dist/doc/latex/mlacls/mla-example.pdfbin2697255 -> 2683255 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mlacls/mla.pdfbin393101 -> 351909 bytes
-rw-r--r--Master/texmf-dist/doc/latex/naive-ebnf/README.md17
-rw-r--r--Master/texmf-dist/doc/latex/naive-ebnf/naive-ebnf.pdfbin727116 -> 772430 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nfssext-cfr/README26
-rw-r--r--Master/texmf-dist/doc/latex/nfssext-cfr/README.md114
-rw-r--r--Master/texmf-dist/doc/latex/nfssext-cfr/manifest.txt71
-rw-r--r--Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdfbin180398 -> 920135 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex196
-rw-r--r--Master/texmf-dist/doc/latex/ocgx2/ChangeLog9
-rw-r--r--Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.pdfbin670553 -> 736292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.tex75
-rw-r--r--Master/texmf-dist/doc/latex/pas-tableur/README37
-rw-r--r--Master/texmf-dist/doc/latex/pas-tableur/README.txt40
-rw-r--r--Master/texmf-dist/doc/latex/pas-tableur/pas-tableur.tex35
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md31
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdfbin988844 -> 990245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdfbin711589 -> 711375 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdfbin603025 -> 602781 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdfbin516309 -> 515753 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdfbin558991 -> 558768 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin542144 -> 520855 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdfbin544112 -> 523018 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin538574 -> 517529 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin594625 -> 573028 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdfbin516817 -> 516601 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdfbin753951 -> 732912 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdfbin568542 -> 568185 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdfbin686108 -> 685763 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdfbin850174 -> 834408 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfoutline.pdfbin0 -> 596723 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdfbin530920 -> 530692 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdfbin428630 -> 427806 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdfbin588321 -> 588349 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin435158 -> 434607 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin465204 -> 464470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin302686 -> 302226 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/README9
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex8
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex4
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex26
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex30
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex16
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex3
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdfbin7558395 -> 7558172 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/SiO2.jpgbin0 -> 20587 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.pdfbin1349245 -> 1530651 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.tex52
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/sample-refs.bib10
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.pdfbin0 -> 165951 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.tex134
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex10
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/LICENSE.txt20
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdfbin71193 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex114
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-chinese.tex61
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-japanese.tex33
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-korean.pdfbin20230 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-korean.tex37
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-odia.tex73
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-thai.pdfbin14190 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-thai.tex57
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex128
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/examples.pdfbin147304 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/examples.tex151
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdfbin386065 -> 387379 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex44
-rw-r--r--Master/texmf-dist/doc/latex/polyglossia/test-welsh.tex20
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdfbin10839547 -> 10841130 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zipbin5709797 -> 5711174 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdfbin1793092 -> 2191096 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zipbin277006 -> 279698 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdfbin80800 -> 80865 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proflycee/README.md7
-rw-r--r--Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdfbin333019 -> 341735 bytes
-rw-r--r--Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zipbin105641 -> 106378 bytes
-rw-r--r--Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.pdfbin547576 -> 555201 bytes
-rw-r--r--Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.tex34
-rw-r--r--Master/texmf-dist/doc/latex/quran/README24
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-doc.pdfbin373941 -> 377332 bytes
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-doc.tex629
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-test.pdfbin60033 -> 60027 bytes
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-test1.pdfbin58234 -> 57642 bytes
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-test1.tex1
-rw-r--r--Master/texmf-dist/doc/latex/quran/quran-test2.pdfbin523833 -> 523836 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randintlist/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/randintlist/randintlist-doc.pdfbin0 -> 84893 bytes
-rw-r--r--Master/texmf-dist/doc/latex/randintlist/randintlist-doc.tex351
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/README.md1
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example1-en.pdfbin25756 -> 27096 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example1-en.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example1-nl.pdfbin25600 -> 27052 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example1-nl.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example2-en.pdfbin52555 -> 49921 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example2-en.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example2-nl.pdfbin52599 -> 50114 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/example2-nl.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdfbin227678 -> 229664 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdfbin228133 -> 229738 bytes
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory-preamble.tex2
-rw-r--r--Master/texmf-dist/doc/latex/regulatory/regulatory.tex12
-rw-r--r--Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdfbin274602 -> 286557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.pdfbin36684 -> 143716 bytes
-rw-r--r--Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.tex95
-rw-r--r--Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte.pdfbin232043 -> 318756 bytes
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/LICENSE.md19
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/README.md207
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/float.hak121
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/floatrow.hak108
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/hyperref.hak132
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/listings.hak115
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/lscape.hak49
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/nomencl.hak118
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/scrhack-2023-07-07.pdfbin0 -> 301798 bytes
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/scrhack.pdfbin0 -> 301231 bytes
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/setspace.hak118
-rw-r--r--Master/texmf-dist/doc/latex/scrhack/standardsections.hak568
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md18
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdfbin232002 -> 231998 bytes
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdfbin366813 -> 366777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdfbin86126 -> 91942 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex21
-rw-r--r--Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdfbin217903 -> 233107 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.pdfbin408693 -> 430723 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.tex136
-rw-r--r--Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.pdfbin399623 -> 422751 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.tex228
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md10
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin645515 -> 645497 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin703916 -> 703918 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/1.0.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0-2.oggbin58385 -> 65853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-1.oggbin92122 -> 42525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-2.oggbin45754 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.m3u5
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.oggbin16077 -> 11709 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-1.oggbin38925 -> 109773 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-2.oggbin53387 -> 51597 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.oggbin13645 -> 18333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-1.oggbin0 -> 38637 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-2.oggbin0 -> 59373 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.m3u9
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.oggbin15843 -> 12861 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0-1.oggbin33768 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.oggbin18610 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-1.oggbin41577 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-star-1.oggbin8290 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.m3u5
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.oggbin19424 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.oggbin0 -> 15165 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0-1.oggbin0 -> 37197 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.oggbin0 -> 18189 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-1.oggbin0 -> 48141 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-star-1.oggbin0 -> 7245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.m3u5
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.oggbin0 -> 19629 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example-spel/date.oggbin13533 -> 14589 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example.pdfbin84377 -> 92810 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/Example/example.tex37
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-1.oggbin0 -> 49149 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-star-1.oggbin0 -> 6381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.0.0.0.0.m3u57
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-1.oggbin110781 -> 132381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-3.oggbin133965 -> 131229 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.0.0.0.m3u22
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.1.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0-2.oggbin55773 -> 58797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0.m3u12
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-10.oggbin156141 -> 120573 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-11.oggbin123021 -> 115389 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-12.oggbin103869 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-2.oggbin201069 -> 257949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-6.oggbin75645 -> 75213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-7.oggbin181773 -> 129213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-8.oggbin127485 -> 88173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-9.oggbin88173 -> 156141 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0.m3u25
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.0.0.0.0.m3u104
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0-6.oggbin86733 -> 87597 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0.m3u16
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.0.0.0.m3u65
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-1.oggbin39501 -> 62109 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-10.oggbin0 -> 121581 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-11.oggbin0 -> 167085 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-2.oggbin20925 -> 163053 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-3.oggbin21933 -> 114381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-4.oggbin28269 -> 106893 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-5.oggbin0 -> 121725 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-6.oggbin0 -> 315549 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-7.oggbin0 -> 85437 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-8.ogg (renamed from Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-9.ogg)bin30717 -> 30717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-9.ogg (renamed from Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-10.ogg)bin61965 -> 61965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.m3u18
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.oggbin22720 -> 23517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-1.oggbin62109 -> 153261 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-11.oggbin52461 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-12.oggbin166509 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-2.oggbin61764 -> 186525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-3.oggbin130653 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-4.oggbin112797 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-5.oggbin104013 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-6.oggbin118845 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-7.oggbin440685 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-8.oggbin97101 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.m3u17
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.oggbin19907 -> 22797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-1.oggbin153261 -> 251757 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-2.oggbin186237 -> 34173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-3.oggbin0 -> 29565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-4.oggbin0 -> 19341 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-5.oggbin0 -> 188397 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-6.oggbin0 -> 54909 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.oggbin22940 -> 23517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-1.oggbin251757 -> 177309 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-2.oggbin29567 -> 80829 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-3.oggbin26498 -> 126045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-4.oggbin18524 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-5.oggbin140974 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-6.oggbin47150 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.m3u11
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.oggbin22754 -> 19629 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-1.oggbin177309 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-2.oggbin80829 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.m3u5
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.oggbin19849 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-1.oggbin81405 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-2.oggbin183645 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-3.oggbin141597 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.oggbin23853 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.3.0.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-2.oggbin55341 -> 328941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-3.oggbin300141 -> 78381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-4.oggbin64604 -> 49725 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-5.oggbin37835 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0.m3u11
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.0.0.0.0.m3u49
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-2.oggbin183501 -> 102429 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-3.oggbin106029 -> 117261 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.0.0.0.m3u28
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0-4.oggbin64989 -> 65853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0.m3u12
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-1.oggbin142605 -> 142749 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-2.oggbin74205 -> 74493 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-5.oggbin74925 -> 74925 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0.m3u14
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0-1.oggbin139725 -> 94797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0-3.oggbin0 -> 74349 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0.m3u7
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.0.0.0.0.m3u104
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-1.oggbin52029 -> 53037 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-2.oggbin20882 -> 10557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-3.oggbin15532 -> 14445 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-4.oggbin13888 -> 12573 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-5.oggbin15770 -> 15453 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-6.oggbin28759 -> 28989 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-7.oggbin29062 -> 29565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-8.oggbin84905 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0.m3u90
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0-4.oggbin97379 -> 85005 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-1.oggbin104589 -> 178029 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-2.oggbin39789 -> 44109 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-3.oggbin39789 -> 41661 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-5.oggbin39789 -> 44685 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0.m3u12
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-1.oggbin99435 -> 78957 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-2.oggbin53793 -> 73629 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-3.oggbin56626 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-4.oggbin94077 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.oggbin27772 -> 26541 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-1.oggbin100656 -> 115101 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-2.oggbin47203 -> 59661 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-3.oggbin71665 -> 65277 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-4.oggbin41316 -> 94077 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.oggbin30051 -> 29277 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-1.oggbin71887 -> 117837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-2.oggbin31328 -> 51021 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-3.oggbin44852 -> 85869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-4.oggbin50015 -> 46413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-5.oggbin9840 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.m3u11
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.oggbin45999 -> 31725 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-1.oggbin31747 -> 86013 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-2.oggbin60813 -> 33165 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-3.oggbin33885 -> 51741 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-4.oggbin52605 -> 54765 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-5.oggbin0 -> 8541 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.m3u11
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.oggbin22597 -> 49581 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-1.oggbin0 -> 33885 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-2.oggbin0 -> 60813 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-3.oggbin0 -> 33309 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-4.oggbin0 -> 52605 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.m3u7
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.oggbin0 -> 22221 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.2.0.0.0.m3u12
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/5.0.0.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.0.0.0.0.m3u93
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.1.0.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.0.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.1.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.2.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.0.0.0.m3u24
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.1.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.2.0.0.m3u14
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.3.0.0.m3u4
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0-2.oggbin64241 -> 75069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.5.0.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.0.0.0.m3u15
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0-2.oggbin84898 -> 97821 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-1.oggbin63161 -> 19773 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-2.oggbin0 -> 71757 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0.m3u5
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.7.0.0.0.m3u24
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.0.0.0.0.m3u51
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.1.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.oggbin26219 -> 28845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.oggbin27910 -> 32301 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.oggbin26519 -> 23517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.oggbin28484 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.oggbin28780 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.m3u6
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.oggbin22365 -> 24381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.oggbin0 -> 28413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.oggbin0 -> 27693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.oggbin0 -> 29565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.oggbin0 -> 29709 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.oggbin0 -> 20637 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.2.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.3.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.4.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.5.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.6.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.7.0.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.m3u8
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.oggbin25282 -> 19773 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.oggbin21077 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.oggbin20091 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.oggbin22221 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.oggbin21213 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.oggbin18621 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.oggbin27261 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.m3u10
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.oggbin26916 -> 26829 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.oggbin30677 -> 22509 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.m3u2
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.oggbin23949 -> 20925 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.oggbin0 -> 22653 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.oggbin0 -> 21789 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.oggbin0 -> 19341 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.m3u3
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.oggbin0 -> 27981 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-1.oggbin22653 -> 22941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-1.oggbin6381 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-2.oggbin7101 -> 6381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-3.oggbin5517 -> 7101 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-4.oggbin0 -> 5517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0.m3u14
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex-spel/date.oggbin26829 -> 26397 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spelatex/spelatex.pdfbin332348 -> 356938 bytes
-rw-r--r--Master/texmf-dist/doc/latex/suanpan-l3/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.pdfbin466724 -> 439455 bytes
-rw-r--r--Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.tex572
-rw-r--r--Master/texmf-dist/doc/latex/tableof/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/tableof/tableof.pdfbin58824 -> 62790 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tableof/tableoftest.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf98
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdfbin34295 -> 34624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf86
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf74
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf158
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf52
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf74
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf66
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf100
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf94
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdfbin1737121 -> 1277086 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.tex14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf-docelements.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdfbin1124473 -> 1136355 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex99
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md19
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdfbin137729 -> 137729 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdfbin287734 -> 287728 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdfbin247127 -> 247644 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex14
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex40
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex53
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex12
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex52
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex2
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty3
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex13
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex14
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdfbin4856594 -> 4868793 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex8
-rw-r--r--Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdfbin605728 -> 745046 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.tex159
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdfbin1222359 -> 1222889 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex5
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdfbin1309490 -> 1401637 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex239
-rw-r--r--Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.pdfbin714026 -> 777038 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.tex839
-rw-r--r--Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.pdfbin748835 -> 831570 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.tex855
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/Eksempel.tex4
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/Example.tex4
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-doc.pdfbin268481 -> 270526 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-man.pdfbin164864 -> 166576 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-doc.pdfbin270492 -> 273650 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-man.pdfbin169129 -> 171925 bytes
-rw-r--r--Master/texmf-dist/doc/latex/udiss/README.txt7
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss-fonts-english.tex75
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss-fonts-hindi.tex100
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss-fonts-malayalam.tex94
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss-fonts-marathi.tex126
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss-style-ukerala.tex43
-rw-r--r--Master/texmf-dist/doc/latex/udiss/udiss.pdfbin0 -> 471468 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/README31
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdfbin132716 -> 132635 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdfbin127947 -> 127866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdfbin201366 -> 201366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdfbin200967 -> 200967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdfbin172712 -> 172484 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdfbin167812 -> 167577 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdfbin227180 -> 227180 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdfbin224983 -> 224983 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdfbin190497 -> 347337 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdfbin186645 -> 343435 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdfbin250474 -> 250470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdfbin250365 -> 250364 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.pdfbin0 -> 344951 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.tex238
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdfbin461588 -> 464581 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex37
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdfbin450553 -> 454292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex33
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdfbin459207 -> 462306 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex37
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdfbin457851 -> 457853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex2
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdfbin462143 -> 465942 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex78
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdfbin350542 -> 354003 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex52
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdfbin365821 -> 365619 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex4
-rw-r--r--Master/texmf-dist/doc/latex/useclass/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/useclass/useclass.pdfbin539822 -> 541385 bytes
-rw-r--r--Master/texmf-dist/doc/latex/verifycommand/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/verifycommand/verifycommand.pdfbin226262 -> 264745 bytes
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.pdfbin0 -> 95898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.tex26
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.pdfbin476435 -> 477237 bytes
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.tex6
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.pdfbin612911 -> 617253 bytes
-rw-r--r--Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.tex21
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/ChangeLog9
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor.lox6
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor.pdfbin864842 -> 865002 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor1.tex8
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor2.pdfbin91845 -> 88550 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor2.tex8
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor3.tex8
-rw-r--r--Master/texmf-dist/doc/latex/xcolor/xcolor4.tex8
-rw-r--r--Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md7
-rw-r--r--Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdfbin890025 -> 891606 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdfbin228899 -> 229279 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex7
-rw-r--r--Master/texmf-dist/doc/latex/zugferd/DEMO-rechnung-zugferd.tex95
-rw-r--r--Master/texmf-dist/doc/latex/zugferd/DEPENDS.txt7
-rw-r--r--Master/texmf-dist/doc/latex/zugferd/README.md27
-rw-r--r--Master/texmf-dist/doc/latex/zugferd/zugferd.pdfbin0 -> 245735 bytes
878 files changed, 22168 insertions, 17158 deletions
diff --git a/Master/texmf-dist/doc/latex/acronym/CHANGES b/Master/texmf-dist/doc/latex/acronym/CHANGES
index 95a9095483f..b4a3b731061 100644
--- a/Master/texmf-dist/doc/latex/acronym/CHANGES
+++ b/Master/texmf-dist/doc/latex/acronym/CHANGES
@@ -1,3 +1,15 @@
+Version 1.49 (Mar 2024)
+
+- Adds noforwardlinks option
+-- Chris Landis
+- Fixes targets for forward links to acs/acl/etc.-only use
+-- Chris Landis
+
+Version 1.48 (Oct 2021)
+
+- corrected capitalization of acronyms with a custom plural form
+-- Bruno Le Floch
+
Version 1.47 (Apr 2020)
- Fixed \Iac macro expansion bug
diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index b65f18794c1..2ab41525718 100644
--- a/Master/texmf-dist/doc/latex/acronym/acronym.pdf
+++ b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction-source-code.zip b/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction-source-code.zip
new file mode 100644
index 00000000000..2b526ed7b49
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction-source-code.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction.pdf b/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction.pdf
new file mode 100644
index 00000000000..9c8cc894602
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/aiplans/Aiplans-Introduction.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/aiplans/LICENSE.txt b/Master/texmf-dist/doc/latex/aiplans/LICENSE.txt
new file mode 100644
index 00000000000..4db9b5af292
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/aiplans/LICENSE.txt
@@ -0,0 +1,415 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
diff --git a/Master/texmf-dist/doc/latex/aiplans/README.md b/Master/texmf-dist/doc/latex/aiplans/README.md
new file mode 100644
index 00000000000..e987285804a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/aiplans/README.md
@@ -0,0 +1,80 @@
+# <aiplans>: A TikZ-Based Library for Drawing POCL Plans
+
+<aiplans> is a specialized LaTeX package designed to assist scientists, students, and professionals in creating high-quality graphical representations, particularly Partial Order Causal Link (POCL) plans. Built on the robust TikZ framework, this library simplifies the process of generating complex, precise diagrams that are essential for academic and scientific communication. Our package is especially useful in fields such as artificial intelligence and automated planned, where visualizing causal relationships and dependencies is fundamental.
+
+## Content
+
+- [Project Structure](#project-structure)
+- [License](#license)
+- [Future Improvements Plan](#future-improvements-plan)
+- [Contact Information](#contact-information)
+- [Team Members](#team-members)
+
+## Project Structure
+
+Aiplans/
+
+├── **README.md**
+
+├── **README.pdf**
+
+├── **Aiplans-Introdution-source-code.zip**
+
+├── **Aiplans-Introdution.pdf**
+
+├── **tikzlibraryaiplans.code.tex**
+
+└── **License.txt**
+
+
+### Explanation
+
+- **README**: This file provides an overview of the project, including installation instructions, system requirements, and other essential information.
+- **Aiplans-Introdution-source-code.zip**: Introduction file Latex source code.
+- **Aiplans-Introdution.pdf**: Detailed instructions on how to use the TikZ library included in this package. It covers the steps needed to generate diagrams using LaTeX.
+- **tikzlibraryaiplans.code.tex**: The core of the project, this file contains the TikZ library specifically designed for generating AI plan diagrams. This package is crucial for the functionality provided by this project.
+- **License.txt**: The license file outlines the terms under which the package can be used, modified, and distributed.
+
+
+## License
+
+This material is subject to the [LaTeX Project Public License 1.3c](https://ctan.org/license/lppl1.3).
+
+## Future Improvements Plan
+
+As we continue to improve and expand the `<aiplans>` package, the following developments are planned for the upcoming future:
+
+### In Scope
+
+1. **Extension Features for v1.0**:
+ - **Vertical Diagram Support**: We aim to enhance the package by introducing the ability to create vertical diagrams, which will provide more flexibility in visualizing POCL plans.
+ - **Dynamic Precondition/Effect Lengths**: After the package update, the lengths of the lines will be automatically adjusted based on the actual length of the text labels. In other words, if the label's text content is longer, the corresponding line will also be lengthened; if the label's text content is shorter, the line will be shortened accordingly. This dynamic adjustment allows the diagram to more flexibly adapt to various content requirements, resulting in a final diagram that is more visually appealing and clear.
+
+2. **Code Translator**:
+ - **PDDL/HDDL Code Translation**: We are developing a code translator that can accurately convert PDDL (Planning Domain Definition Language) and HDDL (Hierarchical Domain Definition Language) code into the schema format used by our `<aiplans>` library. This feature will streamline the process of diagram creation from existing codebases or at least allow to specify the tikz code in another syntax that might be more familiar to some.
+
+## Contact Information
+
+If you have any questions, feedback, or suggestions regarding this project, please feel free to reach out to us. We are always happy to assist and appreciate your input.
+
+**Email:** [u7166251@anu.edu.au](mailto:u7166251@anu.edu.au) (Yikai Ge)
+For reporting bugs or requesting features.
+
+We strive to respond to all inquiries as quickly as possible.
+
+## Team Members
+
+This project is developed by a team of students from the Australian National University (ANU), guided by our client. He provided us with the initial idea and relevant references, playing a crucial role in shaping the direction of our research.
+
+### Client
+- **Pascal Bercher**
+
+### Maintainers
+- **Yikai Ge**
+- **Chen Wang**
+- **Cheng Zhou**
+- **Lujia Li**
+- **Yinyin Chen**
+- **Xinni Song**
+
+We have worked closely with our client to ensure that the project meets their requirements and delivers high-quality results.
diff --git a/Master/texmf-dist/doc/latex/aiplans/README.pdf b/Master/texmf-dist/doc/latex/aiplans/README.pdf
new file mode 100644
index 00000000000..cca41d75a7b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/aiplans/README.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/animate/ChangeLog b/Master/texmf-dist/doc/latex/animate/ChangeLog
index 237adc19acc..4faf3429d77 100644
--- a/Master/texmf-dist/doc/latex/animate/ChangeLog
+++ b/Master/texmf-dist/doc/latex/animate/ChangeLog
@@ -1,3 +1,13 @@
+2024-09-17
+ * change: `method=widget' now default for extended range of supporting viewers
+ * fix: documentation revised
+
+2024-09-06
+ * fix: documentation PDF re-compiled and minor README additions
+
+2024-09-05
+ * new: animation support in PDF.js, version 4.4.168+
+
2023-06-18
* fix: missing file `pstmetronome.tex' added
@@ -51,10 +61,10 @@
* fix: pausing on the 0th frame
2020-08-29
- * new: \multiframebreak for terminating \multiframe loop
+ * new: \multiframebreak for terminating \multiframe loop
2020-08-04
- * fix: typesetting failure with `latex-dev'
+ * fix: typesetting failure with `latex-dev'
2020-05-29
* fix: `autoplay' option non-functional in combination with `poster=last';
@@ -225,12 +235,12 @@
* fix: bug related to XObject referencing
2016-03-11
- * new: now uses pdfbase.sty for low level PDF operations
+ * new: now uses pdfbase.sty for low level PDF operations
2016-02-28
* Fix: workaround for bug http://tex.stackexchange.com/q/295715 : different
behaviour of AR versions with regard to PageOpen and PageVisible events
- where animation initialisation takes place
+ where animation initialisation takes place
2016-02-15
* Fix: bug http://tex.stackexchange.com/q/292805
@@ -448,7 +458,7 @@
* New: the transparency stack can now be cleared using `c' in the
timeline file
* improved documentation of the timeline option
- * New animateinline example (Lorenz Attractor)
+ * New animateinline example (Lorenz Attractor)
* Fix: animfp.sty: trailing zeros are now removed from the fractional part
of the result of the addition of two reals
diff --git a/Master/texmf-dist/doc/latex/animate/README.txt b/Master/texmf-dist/doc/latex/animate/README.txt
index 320227faac4..a6c8c749519 100644
--- a/Master/texmf-dist/doc/latex/animate/README.txt
+++ b/Master/texmf-dist/doc/latex/animate/README.txt
@@ -19,10 +19,13 @@ It supports the usual PDF making workflows, i. e. pdfLaTeX, LaTeX -> dvips
-> ps2pdf (Ghostscript)/Distiller, (Xe)LaTeX -> (x)dvipdfmx, LuaLaTeX, and
LaTeX -> dvisvgm for SVG.
-The resulting PDF with animations can be viewed in Acrobat Reader (except
-on mobile devices), KDE Okular, PDF-XChange and Foxit Reader. Animated SVG are
-self-contained files that can be embedded into HTML using the `<object>` tag or
-opened directly in a Web browser, such as Firefox or Chromium.
+The resulting PDF with animations can be viewed in Acrobat Reader (except on
+mobile devices), KDE Okular, PDF-XChange, Foxit Reader, PDF.js (Firefox'
+built-in PDF viewer and extension for Chromium-based browsers).
+
+Animated SVG are self-contained files that can be embedded into HTML using
+the `<object>' tag or opened directly in a Web browser, such as Firefox or
+Chromium.
Note, this file only gives a summary of usage and available package and
command options. Please refer to the documentation `animate.pdf' for details
@@ -33,7 +36,7 @@ and examples.
LaTeX pdfLaTeX LuaLaTeX PSTricks pgf TikZ LaTeX-picture MetaPost
inline graphics vector graphics animated GIF LaTeX dvips ps2pdf
dvipdfmx XeLaTeX JavaScript Acrobat Reader KDE Okular PDF-XChange
- Foxit Reader Firefox Chrome Chromium
+ Foxit Reader PDF.js Firefox Chrome Chromium
2. Usage
@@ -102,8 +105,8 @@ and examples.
timeline=<timeline file>,
method=icon | widget | ocg,
every=<number>, label=<label text>
-
-
+
+
3. Requirements
===============
@@ -111,8 +114,8 @@ Recent versions of
* Ghostscript or Adobe Distiller
* dvipdfmx
* dvisvgm
- * Acrobat Reader, KDE Okular, PDF-XChange, Foxit Reader
- * Blink-based (Chromium, Chrome, Opera, ...) web browsers or Firefox
+ * PDF: Acrobat Reader, KDE Okular, PDF-XChange, Foxit Reader, PDF.js, Firefox
+ * SVG: Blink-based (Chromium, Chrome, Opera, ...) web browsers or Firefox
4. Installation
diff --git a/Master/texmf-dist/doc/latex/animate/animate.pdf b/Master/texmf-dist/doc/latex/animate/animate.pdf
index 518115d6afc..a117175261c 100644
--- a/Master/texmf-dist/doc/latex/animate/animate.pdf
+++ b/Master/texmf-dist/doc/latex/animate/animate.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/argumentation/README.md b/Master/texmf-dist/doc/latex/argumentation/README.md
index b0df71dbd01..0c78428ee2a 100644
--- a/Master/texmf-dist/doc/latex/argumentation/README.md
+++ b/Master/texmf-dist/doc/latex/argumentation/README.md
@@ -4,5 +4,5 @@ The argumentation package provides utility to create abstract argumentation fram
For bug reports and feedback, please contact:
Lars Bengel <lars.bengel@fernuni-hagen.de>
-Version: 1.2 [2024/06/07]
+Version: 1.3 [2024/09/25]
This package is subject to the LaTeX Project Public License 1.3c \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.pdf b/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.pdf
index 48f396a1feb..7a203014791 100644
--- a/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.pdf
+++ b/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.tex b/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.tex
index d524e50afd3..aab7c32a48e 100644
--- a/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.tex
+++ b/Master/texmf-dist/doc/latex/argumentation/argumentation-doc.tex
@@ -1,16 +1,28 @@
-\documentclass{article}
+\documentclass[headings=normal]{scrartcl}
+%======================================================================================================
+\KOMAoptions{
+ paper=a4,
+ fontsize=10pt,
+ cleardoublepage=empty,
+ footinclude=true
+}
+
+\usepackage[top=1.35in, bottom=1.33in, left=1.35in, right=1.35in]{geometry}
+\usepackage[macros]{argumentation} % Main Package
+\usepackage[T1]{fontenc} % Font encoding
+\usepackage[utf8]{inputenc} % Input font encoding
+\usepackage[english]{babel} % Language
+\usepackage[hidelinks]{hyperref} % Hyperlinks
+\usepackage{subcaption} % Multi-part figures
+\usepackage[breakable,]{tcolorbox} % Fancier Examples
+\usepackage{booktabs} % Fancier tables
\title{The \argumentation Package}
\author{Lars Bengel\footnote{Please report any issues at \url{https://github.com/aig-hagen/tikz_argumentation}}\\\small lars.bengel@fernuni-hagen.de}
-\date{Version 1.2 [2024/06/07]}
+\date{Version 1.3 [2024/09/25]}
%%%%%%%%% IMPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[]{argumentation} % Main Package
-\usepackage{amsmath} % For example environment
-\usepackage{xspace} % For dynamic spacing after commands
-\usepackage{xcolor} % Coloring
-\usepackage[hidelinks]{hyperref} % Hyperlinks
-\usepackage{subcaption} % For two-part figures
+
%%% Various commands used in the document
\newcommand{\todo}[1]{\textcolor{magenta}{TODO: #1}} % for todos
@@ -18,18 +30,19 @@
\newcommand{\argumentation}{\texttt{argumentation}\xspace}
\newcommand{\opt}[2][red]{\ensuremath{\textcolor{#1}{\langle #2\rangle}}}
\newtheorem{example}{Example}
+\tcolorboxenvironment{example}{colframe=aigblue,colback=aigyellow!30,breakable,before skip=10pt,after skip=10pt}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
\maketitle
-\begin{minipage}{.28\textwidth}
+\begin{minipage}{.26\textwidth}
\centering
- \begin{af}
- \argument{$a$}
- \argument[right=of a1]{$b$}
- \argument[below=of a1]{$c$}
- \argument[right=of a3]{$d$}
+ \begin{af}[argumentstyle=gray,namestyle=monospace]
+ \argument{a}
+ \argument[right=of a1]{b}
+ \argument[below=of a1]{c}
+ \argument[right=of a3]{d}
\attack{a1}{a2}
\attack{a2}{a3}
@@ -37,18 +50,20 @@
\end{af}
\end{minipage}
\begin{minipage}{.5\textwidth}
+ \begin{small}
\begin{verbatim}
- \begin{af}
- \argument{$a$}
- \argument[right=of a1]{$b$}
- \argument[below=of a1]{$c$}
- \argument[right=of a3]{$d$}
+ \begin{af}[argumentstyle=gray,namestyle=monospace]
+ \argument{a}
+ \argument[right=of a1]{b}
+ \argument[below=of a1]{c}
+ \argument[right=of a3]{d}
\attack{a1}{a2}
\attack{a2}{a3}
\attack[bend right]{a3}{a4}
\end{af}
\end{verbatim}
+ \end{small}
\end{minipage}
@@ -60,7 +75,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\noindent
-To create an argumentation framework in your \LaTeX document, you have to import the \argumentation package:\\
+To create an argumentation framework in your \LaTeX-document, you have to import the \argumentation package:\\
\vspace{-0.3cm}
\verb|\usepackage{argumentation}|\\
@@ -77,6 +92,7 @@ You can then create a new \texttt{af} environment in which the argumentation fra
\noindent
You may want to wrap the \texttt{af} environment in a \texttt{figure} environment in order to add a caption and reference label.
+
The easiest way to create an argument in the argumentation framework is:\\
\vspace{-0.3cm}
@@ -94,7 +110,7 @@ The \argumentation package offers two easy ways of doing that:\\
\verb|\argument{|\opt{name}\verb|}| \verb|at (|\opt{posX},\opt{posY}\verb|)|\\
\noindent
-The first instance is \emph{relative position} where \opt{dir} is the direction of placement relative to the argument with the identifier \opt{arg\_id}, with \opt{dir} typically being one of the values: \textsf{right}, \textsf{left}, \textsf{above}, \textsf{below}.
+The first instance is \emph{relative positioning} where \opt{dir} is the direction of placement relative to the argument with the identifier \opt{arg\_id}, with \opt{dir} typically being one of: \textsf{right}, \textsf{left}, \textsf{above}, \textsf{below}.
The second instance is \emph{absolute positioning} where (\opt{posX}, \opt{posY}) is a set of coordinates, for example something like $(2, 0)$, $(0, -2)$ or $(2, 4)$.\\
@@ -119,24 +135,24 @@ To customize the look of the arguments and attacks and for a detailed overview o
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newpage\section{Example}\label{sec:example}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\vspace{-0.7cm}
+
\begin{figure}[ht]
\centering
\begin{af}
\argument{a}
\argument[right=of a1]{b}
\argument[right=of a2]{c}
- \argument[right=of a3]{d}
+ \argument[rejected,right=of a3]{d}
\argument[right=of a4,incomplete]{e}
\argument[below=of a1]{f}
\argument[inactive,right=of a6]{g}
- \argument[inactive,argin,right=of a7]{h}
+ \argument[accepted,right=of a7]{h}
\argument[right=of a8]{i}
\argument[right=of a9]{j}
- %\annotation[right]{a5}{$a\lor b$}
+ \annotation[right,yshift=-0.4cm]{a5}{$a\lor b$}
- \afname[left of=a1,yshift=-0.8cm,xshift=-0.2cm]{\textbf{F:}}
+ \afname{$F_{\ref{af:ex1}}:$} at (-1,-0.9)
\selfattack{a1}
\dualattack{a1}{a6}
@@ -144,7 +160,7 @@ To customize the look of the arguments and attacks and for a detailed overview o
\attack[inactive]{a8}{a7}
\attack[inactive]{a7}{a2}
- \annotatedattack{a3}{a2}{$3$}
+ \annotatedattack[above]{a3}{a2}{$3$}
\attack[incomplete]{a4}{a5}
\attack{a5}{a10}
\attack{a10}{a9}
@@ -152,54 +168,63 @@ To customize the look of the arguments and attacks and for a detailed overview o
\support{a4}{a3}
\support{a9}{a3}
+ \label{af:ex1}
\end{af}
- \caption{An exemplary AF created with the \argumentation package.}
+ \caption{The AF $F_{\ref{af:ex1}}$ created with the \argumentation package.}
\label{fig:example}
\end{figure}
-\vspace{-0.4cm}
+
+\hspace{-1.2cm}
+\begin{minipage}[c]{0.99\textwidth}
+%\begin{small}
\begin{verbatim}
\usepackage{argumentation}
\begin{figure}[ht]
\centering
\begin{af}
- \argument{a}
- \argument[right=of a1]{b}
- \argument[right=of a2]{c}
- \argument[right=of a3]{d}
- \argument[right=of a4,incomplete]{e}
- \argument[below=of a1]{f}
- \argument[inactive,right=of a6]{g}
- \argument[inactive,argin,right=of a7]{h}
- \argument[right=of a8]{i}
- \argument[right=of a9]{j}
-
- \afname[left of=a1,yshift=-0.8cm,xshift=-0.2cm]{\textbf{F:}}
-
- \selfattack{a1}
- \dualattack{a1}{a6}
- \dualattack[inactive]{a6}{a7}
-
- \attack[inactive]{a8}{a7}
- \attack[inactive]{a7}{a2}
- \annotatedattack{a3}{a2}{$3$}
- \attack[incomplete]{a4}{a5}
- \attack{a5}{a10}
- \attack{a10}{a9}
- \attack{a9}{a4}
-
- \support{a4}{a3}
- \support{a9}{a3}
- \end{af}
- \caption{An exemplary AF created with the \argumentation package.}
+ \argument{a}
+ \argument[right=of a1]{b}
+ \argument[right=of a2]{c}
+ \argument[rejected,right=of a3]{d}
+ \argument[right=of a4,incomplete]{e}
+ \argument[below=of a1]{f}
+ \argument[inactive,right=of a6]{g}
+ \argument[accepted,right=of a7]{h}
+ \argument[right=of a8]{i}
+ \argument[right=of a9]{j}
+
+ \annotation[right,yshift=-0.4cm]{a5}{$a\lor b$}
+
+ \afname{$F_{\ref{af:ex1}}:$} at (-1,-0.9)
+
+ \selfattack{a1}
+ \dualattack{a1}{a6}
+ \dualattack[inactive]{a6}{a7}
+
+ \attack[inactive]{a8}{a7}
+ \attack[inactive]{a7}{a2}
+ \annotatedattack[above]{a3}{a2}{$3$}
+ \attack[incomplete]{a4}{a5}
+ \attack{a5}{a10}
+ \attack{a10}{a9}
+ \attack{a9}{a4}
+
+ \support{a4}{a3}
+ \support{a9}{a3}
+ \label{af:ex1}
+ \end{af}
+ \caption{The AF $F_{\ref{af:ex1}}$ created with the \argumentation package.}
\label{fig:example}
\end{figure}
\end{verbatim}
+%\end{small}
+\end{minipage}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newpage\section{Documentation for Version 1.2 [2024/06/07]}\label{sec:documentation}
+\newpage\section{Documentation for Version 1.3 [2024/09/25]}\label{sec:documentation}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-The \argumentation package provides an easy way for creating argumentation frameworks\footnote{Dung, P. M. (1995). On the acceptability of arguments and its fundamental role in nonmonotonic reasoning, logic programming and n-person games. Artificial intelligence.} in \LaTeX documents.
+The \argumentation package provides an easy way for creating argumentation frameworks\footnote{Dung, P. M. (1995). On the acceptability of arguments and its fundamental role in nonmonotonic reasoning, logic programming and n-person games. Artificial intelligence.} in \LaTeX-documents.
It builds on the \tikzname package for drawing the graphs and provides simplified syntax while keeping the same customisation options and keeping full compatibility with all \tikzname commands.
The package comes with multiple predefined style options for arguments, attacks and supports.
In the following, we give an overview over the functionality of the \argumentation package.
@@ -212,7 +237,10 @@ The \argumentation package can be imported via the command
\verb|\usepackage[|\opt{options}\verb|]{argumentation}|
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Style Options}\label{sec:style}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{list}{}{\leftmargin=\parindent\rightmargin=0pt}
\item The \argumentation package provides the following options to customize the look of the argumentation frameworks. They can both be set globally (as an option for the \emph{usepackage} command) and also locally for each \texttt{af} environment (see Section~\ref{sec:af}).
\end{list}
@@ -221,18 +249,21 @@ The \argumentation package can be imported via the command
\mathsf{argumentstyle} &\quad \text{Customizes the appearance of argument nodes.}\\
\mathsf{attackstyle} &\quad \text{Customizes the appearance of attack edges.}\\
\mathsf{supportstyle} &\quad \text{Customizes the appearance of support edges.}\\
- \mathsf{namestyle} &\quad \text{Customizes the font style of the argument names.}\\
+ \mathsf{namestyle} &\quad \text{Customizes the font style of the argument names.}
\end{align*}
- In the following, we list the available options for each of the style parameters.\\
+ In the following, we list the available options for each of the style parameters.
+ Detailed definitions of each of these style parameters can be found in Section~\ref{sec:style-definitions}.\\
-\noindent\texttt{argumentstyle=}\opt{option}
+{\bfseries\sffamily\noindent argumentstyle=\opt{option}}
- The \textsf{argumentstyle} parameter accepts three options
+ The \textsf{argumentstyle} parameter accepts five options
\begin{align*}
\mathsf{standard} &\quad \text{(default) Standard style for the argument nodes.}\\
- \mathsf{large} &\quad \text{Same node size, but larger font.}\\
- \mathsf{thick} &\quad \text{Same node size, thicker outline.}\\
+ \mathsf{large} &\quad \text{Larger font.}\\
+ \mathsf{thick} &\quad \text{Thick outline.}\\
+ \mathsf{gray} &\quad \text{Thick gray outline, light gray background.}\\
+ \mathsf{colored} &\quad \text{Thick blue outline, light blue background.}
\end{align*}
\begin{figure}[!h]
@@ -272,18 +303,45 @@ The \argumentation package can be imported via the command
\caption{\textsf{argumentstyle}=\textit{thick}}
\label{fig:argumentstyle_thick}
\end{subfigure}
- \caption{The available options for \textsf{argumentstyle}.}
+
+ \par\bigskip
+
+ \begin{subfigure}{0.49\textwidth}
+ \centering
+ \begin{af}[argumentstyle=gray]
+ \argument{a}
+ \argument[right=of a1]{b}
+
+ \attack[]{a1}{a2}
+ \end{af}
+ \caption{\textsf{argumentstyle}=\textit{gray}}
+ \label{fig:argumentstyle_gray}
+ \end{subfigure}
+ \hfill
+ \begin{subfigure}{0.49\textwidth}
+ \centering
+ \begin{af}[argumentstyle=colored]
+ \argument{a}
+ \argument[right=of a1]{b}
+
+ \attack[]{a1}{a2}
+ \end{af}
+ \caption{\textsf{argumentstyle}=\textit{colored}}
+ \label{fig:argumentstyle_colored}
+ \end{subfigure}
+
+ \caption{Available options for \textsf{argumentstyle}.}
\label{fig:argumentstyle}
\end{figure}
\newpage
-\noindent\texttt{attackstyle=}\opt{option}
+{\bfseries\sffamily\noindent attackstyle=\opt{option}}
The \textsf{attackstyle} parameter accepts three options
\begin{align*}
\mathsf{standard} &\quad \text{(default) Standard style for the attack arrow tips.}\\
\mathsf{large} &\quad \text{Arrow tip is larger and sharper.}\\
- \mathsf{modern} &\quad \text{\tikzname ModernCS arrow tip.}\\
+ \mathsf{modern} &\quad \text{\tikzname ModernCS arrow tip.}
\end{align*}
\begin{figure}[!h]
@@ -322,17 +380,17 @@ The \argumentation package can be imported via the command
\caption{\textsf{attackstyle}=\textit{modern}}
\label{fig:attackstyle_thick}
\end{subfigure}
- \caption{The available options for \textsf{attackstyle}.}
+ \caption{Available options for \textsf{attackstyle}.}
\label{fig:attackstyle}
\end{figure}
-\noindent\texttt{supportstyle=}\opt{option}
+{\bfseries\sffamily\noindent supportstyle=\opt{option}}
The \textsf{supportstyle} parameter accepts three options
\begin{align*}
\mathsf{standard} &\quad \text{(default) Standard style for the attack arrow tips.}\\
\mathsf{dashed} &\quad \text{Dashed arrow line, same tip.}\\
- \mathsf{double} &\quad \text{Double arrow line and large flat tip.}\\
+ \mathsf{double} &\quad \text{Double arrow line and large flat tip.}
\end{align*}
\begin{figure}[!h]
@@ -371,29 +429,27 @@ The \argumentation package can be imported via the command
\caption{\textsf{supportstyle}=\textit{double}}
\label{fig:supportstyle_double}
\end{subfigure}
- \caption{The available options for \textsf{supportstyle}. Note that for \textit{standard} and \textit{dashed} the arrow tip of the selected \textsf{attackstyle} will be used.}
+ \caption{Available options for \textsf{supportstyle}. Note that for \textit{standard} and \textit{dashed} the arrow tip of the selected \textsf{attackstyle} will be used.}
\label{fig:supportstyle}
\end{figure}
-\newpage
-\noindent\texttt{namestyle=}\opt{option}
+
+{\bfseries\sffamily\noindent namestyle=\opt{option}}
- The \textsf{namestyle} parameter offers five different options
+ The \textsf{namestyle} parameter offers four different options
\begin{align*}
\mathsf{none} &\quad \text{(default) No effect applied to argument name.}\\
\mathsf{math} &\quad \text{The argument name is rendered as $math$ text.}\\
&\quad\quad \text{(name must be given without mathmode).}\\
- \mathsf{italics} &\quad \text{The argument name is rendered in \textit{italics}.}\\
- &\quad\quad \text{(name must be given in mathmode to apply effect).}\\
\mathsf{bold} &\quad \text{The argument name is rendered in $\boldsymbol{bold}$.}\\
- &\quad\quad \text{(name must be given in mathmode to apply effect).}\\
+ &\quad\quad \text{(name must be given without mathmode).}\\
\mathsf{monospace} &\quad \text{The argument name is rendered in \texttt{monospace} font.}\\
- &\quad\quad \text{(name must be given in mathmode to apply effect).}\\
+ &\quad\quad \text{(name must be given without mathmode).}\\
+ \mathsf{monoemph} &\quad \text{The argument name is rendered as {\ttfamily\emph{name}}.}
\end{align*}
-
-\begin{figure}[!h]
- \begin{subfigure}{0.3\textwidth}
+\begin{figure}[!ht]
+ \begin{subfigure}{0.32\textwidth}
\centering
\begin{af}[namestyle=none]
\argument{a}
@@ -405,7 +461,7 @@ The \argumentation package can be imported via the command
\label{fig:namestyle_none}
\end{subfigure}
\hfill
- \begin{subfigure}{0.3\textwidth}
+ \begin{subfigure}{0.32\textwidth}
\centering
\begin{af}[namestyle=math]
\argument{a}
@@ -417,46 +473,50 @@ The \argumentation package can be imported via the command
\label{fig:namestyle_math}
\end{subfigure}
\hfill
- \begin{subfigure}{0.3\textwidth}
+ \begin{subfigure}{0.32\textwidth}
\centering
- \begin{af}[namestyle=italics]
- \argument{$a$}
- \argument[right=of a1]{$b$}
+ \begin{af}[namestyle=bold]
+ \argument{a}
+ \argument[right=of a1]{b}
\attack[]{a1}{a2}
\end{af}
- \caption{\textsf{namestyle}=\textit{italics}}
- \label{fig:namestyle_italics}
+ \caption{\textsf{namestyle}=\textit{bold}}
+ \label{fig:namestyle_bold}
\end{subfigure}
+ \hfill
\par\bigskip
\begin{subfigure}{0.49\textwidth}
\centering
- \begin{af}[namestyle=bold]
- \argument{$a$}
- \argument[right=of a1]{$b$}
+ \begin{af}[namestyle=monospace]
+ \argument{a}
+ \argument[right=of a1]{b}
\attack[]{a1}{a2}
\end{af}
- \caption{\textsf{namestyle}=\textit{bold}}
- \label{fig:namestyle_bold}
+ \caption{\textsf{namestyle}=\textit{monospace}}
+ \label{fig:namestyle_monospace}
\end{subfigure}
\hfill
\begin{subfigure}{0.49\textwidth}
\centering
- \begin{af}[namestyle=monospace]
- \argument{$a$}
- \argument[right=of a1]{$b$}
+ \begin{af}[namestyle=monoemph]
+ \argument{a}
+ \argument[right=of a1]{b}
\attack[]{a1}{a2}
\end{af}
- \caption{\textsf{namestyle}=\textit{monospace}}
- \label{fig:namestyle_monospace}
+ \caption{\textsf{namestyle}=\textit{monoemph}}
+ \label{fig:namestyle_monoemph}
\end{subfigure}
- \caption{The available options for \textsf{namestyle}. You can of course apply any formatting yourself when using the default \textsf{namestyle}=\textit{none}.}
+ \caption{Available options for \textsf{namestyle}. You can of course apply any formatting yourself when using the default \textsf{namestyle}=\textit{none}.}
\label{fig:namestyle}
\end{figure}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{The \texttt{af} Environment}\label{sec:af}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
The \argumentation package provides an environment for creating abstract argumentation frameworks and many of its extensions in \LaTeX-documents.\\
\vspace{-0.2cm}
@@ -475,7 +535,7 @@ The \argumentation package provides an environment for creating abstract argumen
for examples).
The \texttt{af} environment extends the \textsf{tikzpicture} environment, meaning all \tikzname commands can be used inside the \texttt{af} environment as well.
- Furthermore, all options for the \textsf{tikzpicture} environment can be used for the \texttt{af} environment as well, e.\,g the option \verb|node distance|, which is set to \verb|1cm| per default.
+ Furthermore, all options for the \textsf{tikzpicture} environment can be used for the \texttt{af} environment as well, e.\,g the option \verb|node distance|, which is set to \verb|1cm| (\verb|6.6ex|) per default.
If you want to create an argumentation framework with limited space available, you can use one of the following predefined options for the \texttt{af} environment.
This is especially useful for two-column layout documents.
@@ -566,9 +626,32 @@ The \argumentation package provides an environment for creating abstract argumen
\label{fig:mini_afs}
\end{figure}
-While the following commands are intended to be used inside the \texttt{af} environment, they can also be used inside the \textsf{tikzpicture} environment.
+\subsubsection{Referencing}
+The package provides to ability to label the created argumentation frameworks and reference them via the \verb|\ref| command.
+For that, place the command \verb|\label{|\opt{name}\verb|}| anywhere in an \texttt{af}-environment and you can reference to it via \verb|\ref{|\opt{name}\verb|}| anywhere in the document.
+
+Additionally, the following commands are provided to facilitate referencing argumentation frameworks.
+To activate them, add the parameter \textsf{macros=true} when loading the package.
+Most importantly the command \verb|\afref{|\opt{name}\verb|}| which works like the \verb|ref| command but adds the reference number directly into the index of the \verb|\AF| symbol.
+You may redefine any of the first four commands if you prefer a different naming scheme for AFs.
+\begin{table}[ht]
+ \centering
+ \begin{tabular}{lll}
+ \verb|\AF|&& \AF \\
+ \verb|\arguments|&& \arguments\\
+ \verb|\attacks|&&\attacks\\
+ \verb|\AFcomplete|&&\AFcomplete\\
+ \verb|\afref{af:ex1}|&&\afref{af:ex1}\\
+ \verb|\fullafref{af:ex1}|&\qquad\qquad\qquad&\fullafref{af:ex1}
+ \end{tabular}
+ \caption{Commands and their respective output.}
+ \label{tab:referencing}
+\end{table}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Creating Arguments}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Arguments can be created with the \verb|\argument| command.
The full command is defined as follows\\
@@ -585,27 +668,30 @@ While the following commands are intended to be used inside the \texttt{af} envi
The \opt{id} of an argument is used for referencing, e.\,g., when creating attacks or for the relative positioning of other arguments.
\end{list}
-\newpage
\begin{example}~
- \begin{verbatim}
- \begin{af}
- \argument{$a$}
- \argument{$b$} at (1, 1)
- \argument[right=of a2]{$c$}
- \argument(argD){$d$} at (-2, 0)
- \argument[above=of argD]{$e$}
- \end{af}
- \end{verbatim}
+ \begin{minipage}{0.35\textwidth}
\begin{center}
\begin{af}
- \argument{$a$}
- \argument{$b$} at (1, 1)
- \argument[right=of a2]{$c$}
- \argument(argD){$d$} at (-2, 0)
- \argument[above=of argD]{$e$}
+ \argument{a}
+ \argument{b} at (1, 1)
+ \argument[right=of a2]{c}
+ \argument(argD){d} at (-2, 0)
+ \argument[above=of argD]{e}
\end{af}
\end{center}
+ \end{minipage}
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
+ \begin{af}
+ \argument{a}
+ \argument{b} at (1, 1)
+ \argument[right=of a2]{c}
+ \argument(argD){d} at (-2, 0)
+ \argument[above=of argD]{e}
+ \end{af}
+ \end{verbatim}
+ \end{minipage}%
\end{example}
\subsubsection{Relative Positioning}\label{sec:relpos}
@@ -619,45 +705,44 @@ While the following commands are intended to be used inside the \texttt{af} envi
\item\opt{dir}~ has to be one of: \emph{right}, \emph{left}, \emph{below} and \emph{above}
\item\opt{arg\_id}~ is the identifier of another argument
\item Additionally, you can adjust the horizontal/vertical position of an argument via the options \verb|xshift=|\opt{v} and \verb|yshift=|\opt{v}.
- The value \opt{v} is the horizontal/vertical offset, e.\,g., \verb|5pt|, \verb|-3ex| or \verb|0.2cm|.
+ The value \opt{v} is the horizontal/vertical offset, e.\,g., \verb|-6.6ex| or \verb|1cm|.
\end{list}
\begin{example}~
- \begin{verbatim}
+ \begin{minipage}{0.25\textwidth}
+ \begin{center}
\begin{af}
\argument{a}
- \argument[below=of a1]{b}
- \argument[right=of a1, yshift=-24pt,xshift=-8pt]{c}
- \argument[right=of a3, xshift=-0.5cm]{d}
- \argument[right=of a4, yshift=5ex]{e}
+ \argument[right=of a1,yshift=0.75cm]{b}
+ \argument[below=of a2,xshift=-2ex]{c}
+ \argument[right=of a3,yshift=5.5ex]{d}
\end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
\argument{a}
- \argument[below=of a1]{b}
- \argument[right=of a1, yshift=-24pt,xshift=-8pt]{c}
- \argument[right=of a3, xshift=-0.5cm]{d}
- \argument[right=of a4, yshift=5ex]{e}
+ \argument[right=of a1,yshift=0.75cm]{b}
+ \argument[below=of a2,xshift=-2ex]{c}
+ \argument[right=of a3,yshift=5.5ex]{d}
\end{af}
- \end{center}
-
+ \end{verbatim}
+ \end{minipage}%
\end{example}
-%\subsubsection{Absolute Positioning}
\subsubsection{Argument Identifiers}
When creating an argument, it is automatically assigned an identifier for the sake of simplicity.
You can override this identifier by giving another identifier in parenthesis to the \verb|\argument| command.
Per default, the argument identifiers will be numerical of the form $a1, a2, a3, \dots$ based on their order of creation inside the \texttt{af} environment.
- If you preferred alphabetical identifiers, you can set the package option \textsf{indexing}=\emph{alphabetic} and the argument identifiers will instead be $a, b, c, \dots$.
+ If you prefer alphabetical identifiers, you can set the package option \textsf{indexing}=\emph{alphabetic} and the argument identifiers will instead be $a, b, c, \dots$.
-\subsubsection{Additional Argument Styles}
+\subsubsection{Additional Argument Styling}
Furthermore, you can provide optional parameters to adjust the style of the argument node.
- For that you can use all \tikzname-style options and additionally the following predefined style parameters:
+ For that you can use all \tikzname-style options and additionally the following predefined style parameters (Refer to Section~\ref{sec:style-definitions} for a detailed description of these parameters):
\begin{align*}
\mathsf{inactive} &\quad \text{The argument is displayed with grey outline and text.}\\
\mathsf{incomplete} &\quad \text{The argument is displayed with a dotted outline.}\\
@@ -665,23 +750,13 @@ While the following commands are intended to be used inside the \texttt{af} envi
\mathsf{accepted} &\quad \text{The argument is displayed with green background color.}\\
\mathsf{rejected} &\quad \text{The argument is displayed with red background color.}\\
\mathsf{undecided} &\quad \text{The argument is displayed with cyan background color.}\\
+ \mathsf{highlight} &\quad \text{The argument is displayed with yellow background color.}\\
\end{align*}
-
- %Some relevant \tikzname style-parameters are
- %\begin{align*}
- %\textsf{circle} &\quad \text{the shape of the argument.}\\
- % \textsf{minimum~size=0.75cm} &\quad \text{the minimum size of the circle, to ensure consistent}\\
- % &\quad \text{argument size.}\\
- % \textsf{draw=black} &\quad \text{outline and text color of the argument.}\\
- %\textsf{thick} &\quad \text{the outline of the circle is rendered in \textsf{thick} mode.}\\
- % \textsf{fill=white} &\quad \text{the background color of the argument.}\\
- % \textsf{font=large} &\quad \text{the font size of the argument name.}\\
- %\textsf{text~centered} &\quad \text{positioning of the argument name inside the circle.}\\
- % \textsf{inner~sep=0} &\quad \text{inner margins of the circle, set to \textsf{0} to optimize space.}
- %\end{align*}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Creating Attacks}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Attacks between two arguments can be created with the command\\
\noindent
@@ -706,8 +781,11 @@ While the following commands are intended to be used inside the \texttt{af} envi
Of course, all \tikzname style parameters can be used here as well.
+ \newpage
\begin{example}~
- \begin{verbatim}
+
+ \begin{minipage}{0.32\textwidth}
+ \begin{center}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
@@ -718,9 +796,10 @@ While the following commands are intended to be used inside the \texttt{af} envi
\attack[bend right]{a2}{a3}
\attack[bend left=10,inactive]{a3}{a4}
\end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
@@ -731,7 +810,9 @@ While the following commands are intended to be used inside the \texttt{af} envi
\attack[bend right]{a2}{a3}
\attack[bend left=10,inactive]{a3}{a4}
\end{af}
- \end{center}
+ \end{verbatim}
+ \end{minipage}%
+
\end{example}
Additionally, there is a shortcut for creating a symmetric attack between two arguments with
@@ -749,29 +830,35 @@ While the following commands are intended to be used inside the \texttt{af} envi
For both commands, you can use the same optional parameters as for the \verb|\attack| command.
\begin{example}~
- \begin{verbatim}
+
+ \begin{minipage}{0.4\textwidth}
+ \begin{center}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
\selfattack{a2}
\dualattack{a1}{a2}
- \end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{af}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
\selfattack{a2}
\dualattack{a1}{a2}
- \end{af}
- \end{center}
+ \end{af}
+ \end{verbatim}
+ \end{minipage}
\end{example}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Creating Support Relations}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
You can create a support relation between two arguments with the command\\
\noindent
@@ -783,30 +870,37 @@ While the following commands are intended to be used inside the \texttt{af} envi
Supports can be customized in the same way as attacks.
\end{list}
\begin{example}~
- \begin{verbatim}
+
+ \begin{minipage}{0.4\textwidth}
+ \begin{center}
\begin{af}
- \argument{a}
- \argument[right=of a1]{b}
- \argument[right=of a2]{c}
+ \argument{$a_1$}
+ \argument[right=of a1]{$a_2$}
+ \argument[right=of a2]{$a_3$}
\support{a1}{a2}
\support[bend right]{a2}{a3}
- \end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{af}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
- \argument{a}
- \argument[right=of a1]{b}
- \argument[right=of a2]{c}
+ \argument{$a_1$}
+ \argument[right=of a1]{$a_2$}
+ \argument[right=of a2]{$a_3$}
\support{a1}{a2}
\support[bend right]{a2}{a3}
- \end{af}
- \end{center}
+ \end{af}
+ \end{verbatim}
+ \end{minipage}
\end{example}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Annotated Attacks}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Many extensions of the original abstract argumentation framework rely on attacks with an associated value.
This may, for instance, be probabilities in the case of probabilistic argumentation frameworks or numerical weights in the case of weighted argumentation frameworks.
These annotations can be added manually via \tikzname or via the following command\\
@@ -820,30 +914,37 @@ While the following commands are intended to be used inside the \texttt{af} envi
\end{list}
\begin{example}~
- \begin{verbatim}
+
+ \begin{minipage}{0.18\textwidth}
+ \begin{center}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
- \argument[right=of a2]{c}
+ \argument[below=of a2]{c}
\annotatedattack[below]{a1}{a2}{$x$}
- \annotatedattack[above,bend right]{a2}{a3}{$0.6$}
+ \annotatedattack[left,bend right]{a2}{a3}{$0.6$}
\end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
\argument{a}
\argument[right=of a1]{b}
- \argument[right=of a2]{c}
+ \argument[below=of a2]{c}
\annotatedattack[below]{a1}{a2}{$x$}
- \annotatedattack[above,bend right]{a2}{a3}{$0.6$}
+ \annotatedattack[left,bend right]{a2}{a3}{$0.6$}
\end{af}
- \end{center}
+ \end{verbatim}
+ \end{minipage}%
\end{example}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Further Commands}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
If you want to display an name (or some other text) for your argumentation framework in the picture, you can use the \verb|\afname| command.
Just like the \verb|\argument| command it can include an optional identifier and supports both relative and absolute positioning.
Some example usages:\\
@@ -873,30 +974,39 @@ While the following commands are intended to be used inside the \texttt{af} envi
Additionally, positioning information, via \textsf{xshift} or \textsf{yshift}, can be provided via the optional parameters.
\end{list}
+ \newpage
\begin{example}~
- \begin{verbatim}
+
+ \begin{minipage}{0.11\textwidth}
+ \begin{center}
\begin{af}
\argument{a}
- \argument[right=of a1]{b}
- \afname{$F:$} at (-1,0)
- \annotation[yshift=-0.4cm,xshift=0.4cm]{a2}{$\neg a$}
+ \argument[below=of a1]{b}
+ \afname{$F:$} at (-1,-1)
+ \annotation[yshift=-0.5cm,xshift=0.4cm]{a2}{$\neg a$}
\support{a1}{a2}
\end{af}
- \end{verbatim}
-
- \begin{center}
+ \end{center}
+ \end{minipage}%
+ \begin{minipage}{0.5\textwidth}
+ \begin{verbatim}
\begin{af}
\argument{a}
- \argument[right=of a1]{b}
- \afname{$F:$} at (-1,0)
- \annotation[yshift=-0.4cm,xshift=0.4cm]{a2}{$\neg a$}
+ \argument[below=of a1]{b}
+ \afname{$F:$} at (-1,-1)
+ \annotation[yshift=-0.5cm,xshift=0.4cm]{a2}{$\neg a$}
\support{a1}{a2}
\end{af}
- \end{center}
+ \end{verbatim}
+ \end{minipage}%
\end{example}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Style Definitions}\label{sec:style-definitions}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
You can manually override the \textsf{argumentstyle}, \textsf{attackstyle} and \textsf{supportstyle} parameters and set a custom style globally via the following commands respectively.\\
\vspace{-0.3cm}
@@ -912,12 +1022,66 @@ While the following commands are intended to be used inside the \texttt{af} envi
\begin{list}{}{\leftmargin=\parindent\rightmargin=0pt}
\item
where \opt{style} is a list of \tikzname style parameters.
+ For reference, the style parameters provided by this package are listed below.
+ You may use or override them at your own discretion.
+ For instance, one could use them to combine or adapt styles, e.\,g.,
+
+ \noindent
+ \verb|\setargumentstyle{argument large,argument gray,text=white}|
\end{list}
-%\section{Style Definitions}
+ \begin{table}[ht]
+ \centering
+ \ttfamily
+ \begin{tabular}{l|l}
+ \toprule
+ \tikzname-keyword & style parameters \\
+ \midrule
+ \textsf{argument size} & \emph{contains the currently selected argument size}\\
+ \textsf{argument} & \emph{contains the currently selected argument style and size}\\
+ \textsf{argument standard} & circle,inner sep=0,outer sep=0,draw=black\\
+ \textsf{argument large} & circle,inner sep=0,outer sep=0,draw=black,font=\verb|\|large\\
+ \textsf{argument thick} & circle,inner sep=0,outer sep=0,draw=black,line width=0.1em\\
+ \textsf{argument gray} & argument thick,fill=gray!30,draw=gray!65,text=black!80\\
+ \textsf{argument colored} & argument thick,fill=aigblue!40,draw=aigblue!80,text=black!80\\
+ \midrule
+ \textsf{attack} & \emph{contains the currently selected attack style}\\
+ \textsf{attack standard} & -\{stealth'\}\\
+ \textsf{attack large} & -\{Stealth[scale=1.25]\}\\
+ \textsf{attack modern} & -\{To[sharp,length=0.65ex,line width=0.05em]\}\\
+ \textsf{selfattack} & loop,min distance=0.4em,in=0,out=60,looseness=4.5\\
+ \midrule
+ \textsf{support} & \emph{contains the currently selected support style}\\
+ \textsf{support standard} & attack,postaction=\{decorate,decoration=\{\dots\}\}\\
+ \textsf{support dashed} & attack,densely dashed\\
+ \textsf{support double} & -\{Classical TikZ Rightarrow\},double\\
+ \midrule
+ \textsf{inactive} & fill=none,draw=gray!50,text=gray!60\\
+ \textsf{incomplete} & densely dashed\\
+ \textsf{accepted} & fill=green!40\\
+ \textsf{rejected} & fill=red!40\\
+ \textsf{undecided} & fill=cyan!40\\
+ \textsf{highlight} & fill=aigyellow!60\\
+ \textsf{invisible} & draw=none,text=black!0,fill=none\\
+ \bottomrule
+ \end{tabular}
+ \caption{Reference list of \tikzname-style parameters provided by the \argumentation package.}
+ \label{tab:styles}
+ \end{table}
\newpage
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Version History}\label{sec:history}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection*{[v1.3 2024/09/25]}
+\begin{itemize}
+ \item Added support for \verb|\label{ }| and \verb|\ref{ }| to \texttt{af} environment.
+ \item Added commands \verb|\AF|, \verb|\arguments|, \verb|\attacks| and \verb|\AFcomplete| to facilitate consistent naming of AFs. Have to be loaded with the package option \textsf{macros=true}.
+ \item Added commands \verb|\afref{ }| and \verb|\fullafref{ }| to reference AFs.
+ \item adjusted scaling of nodes and arrows for larger page sizes.
+ \item added new style options for arguments.
+ \item Various minor fixes and changes regarding the \textsf{namestyle} package option.
+\end{itemize}
\subsection*{[v1.2 2024/06/07]}
\begin{itemize}
diff --git a/Master/texmf-dist/doc/latex/asy-overview/asy/jh.asy b/Master/texmf-dist/doc/latex/asy-overview/asy/jh.asy
index a6bd31400f9..94bc1fa5604 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/asy/jh.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/asy/jh.asy
@@ -1,15 +1,12 @@
// Common definitions for asy_tut
-// Function to call the texpreamble() function
-void define_texpreamble() {
- texpreamble("\usepackage{mathtools}
- \usepackage[utf8]{inputenc}
- \usepackage[osf,scaled=.92,loosest]{heuristica}
- \usepackage[heuristica,vvarbb,bigdelims]{newtxmath}
- \usepackage[T1]{fontenc}
- \renewcommand*\oldstylenums[1]{\textosf{#1}}");
-}
-
+// Set up LaTeX for each label
+texpreamble("\usepackage{mathtools}
+ \usepackage[utf8]{inputenc}
+ \usepackage[osf,scaled=.92,loosest]{heuristica}
+ \usepackage[heuristica,vvarbb,bigdelims]{newtxmath}
+ \usepackage[T1]{fontenc}
+ \renewcommand*\oldstylenums[1]{\textosf{#1}}");
// Change default size of fonts
import fontsize;
defaultpen(fontsize(9pt)); // Like LaTeX \small
diff --git a/Master/texmf-dist/doc/latex/asy-overview/asy_overview.pdf b/Master/texmf-dist/doc/latex/asy-overview/asy_overview.pdf
index 7a7b8a13410..524c6c53e6a 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/asy_overview.pdf
+++ b/Master/texmf-dist/doc/latex/asy-overview/asy_overview.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/appendix/appendix.tex b/Master/texmf-dist/doc/latex/asy-overview/src/appendix/appendix.tex
index f4016f9cd6a..1c21dc0bfac 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/appendix/appendix.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/appendix/appendix.tex
@@ -4,19 +4,20 @@ Rather than copy and paste code common across graphics,
we can put them in a separate file and import them.
In the earlier \Asy{} sources the lines
\begin{minted}{Asymptote}
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
\end{minted}
-will first run the commands in the file \path{../../../asy/jh.asy},
-and then run the function defined in that file.
+will run the commands in the file \path{../../../asy/jh.asy}
+and also make available the routines and data defined there.
-Here is the file.
-Its first few lines define the command to set the fonts,
+Here is the file's contents.
+First, it sets the fonts
and changes the default font size.
-(This change leaves more room for graphic elements and
-also helps the graphics have a visually cohesive identity.)
+(The smaller size leaves more room for graphic elements and
+also helps the graphics have a visually cohesive identity distinct from
+the document's body.)
Then it defines a color scheme.\footnote{%
- Thank you to \protect\texttt{color.adobe.com} user Michelle Delapenha.}
-Lastly, it defines the
+ Credit to \protect\texttt{color.adobe.com} user Michelle Delapenha for this scheme.}
+Last, it gives the
\mintinline{Asymptote}{material} defaults
for 3D graphics.
\begin{center}
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/asy_tut.tex b/Master/texmf-dist/doc/latex/asy-overview/src/asy_tut.tex
index fc88e07b2b2..c90d49037e9 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/asy_tut.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/asy_tut.tex
@@ -5,8 +5,8 @@
% See: https://github.com/vectorgraphics/asymptote/blob/master/doc/externalprc.tex
% Compile .asy files with asy -inlineimage <fn>
\RequirePackage{asymptote}
-\def\asydir{chapter4/asy/}
-\graphicspath{{asy/}}
+\def\asydir{chapter4/asy}
+\graphicspath{ {asy/} {chapter4/asy/} }
% uncomment for 3D graphics:
\input chapter4/asy/vectors.pre
\input chapter4/asy/planes.pre
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/chapter1.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/chapter1.tex
index 40c4ecb1be9..bc7946a58dc 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/chapter1.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/chapter1.tex
@@ -3,7 +3,7 @@
Making an \Asy{} input file is like making a \LaTeX{} input file,
so you already have a feel for the basics.
To start,
-in your favorite editor open an \Asy{} input file \path{asy/unit_circle.asy}.
+use your favorite editor to open a file \path{asy/unit_circle.asy}.
\begin{minted}{Bash}
jim@millstone:~/Documents/asy_tut/src$ cd asy
jim@millstone:~/Documents/asy_tut/src/asy$ emacs unit_circle.asy
@@ -88,7 +88,7 @@ for a list of the options.)
Second, the dot showing the generic point on the unit circle is too big.
In the revised source below we've adjusted the size by inserting
-\mintinline{Asymptote}{dotfactor = 4} in line~23
+\mintinline{Asymptote}{dotfactor = 4} in line~22
(the default factor is $6$).
Finally, the $(\cos\theta,\sin\theta)$ label is in a different font than
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/main.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/main.tex
index 4617cd0c207..4ca0d66228a 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/main.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter1/main.tex
@@ -11,6 +11,6 @@ include the output PDF in your \LaTeX{} file.
\includegraphics{asy/unit_circle_after.pdf}
% Can instead include the .asy source in the text body.
% \asyinclude{asy/unit_circle_after.asy}
- % There is also an environment where you type the .asy source directly.
+ % There is also an environment where you type the Asy source directly.
\end{center}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/cos.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/cos.asy
index bc053d3bf48..2e4ca0e5b3d 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/cos.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/cos.asy
@@ -1,6 +1,6 @@
// cos.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/exponential.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/exponential.asy
index e81c9545b50..b9d1f2f26c9 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/exponential.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/exponential.asy
@@ -1,6 +1,6 @@
// exponential.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
@@ -25,7 +25,7 @@ dot(Label("$(\ln(2),2)$",filltype=Fill(white)), (log(2),2), 2*E);
// Axes making graph paper
pen GRAPHPAPERPEN=(0.25*LIGHT_COLOR+0.75*white)
- +squarecap; // Make graph paper lines
+ +squarecap; // For graph paper lines
xaxis(axis=YEquals(ymax+0.2),
xmin=xmin-0.5, xmax=xmax+0.5,
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot.asy
index 77ad978bc59..3893038233b 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot.asy
@@ -7,7 +7,7 @@ texpreamble("\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\renewcommand*\oldstylenums[1]{\textosf{#1}}");
-import graph; // Access plotting routines
+import graph;
// Function to be plotted
real fcn(real x) {
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot_after.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot_after.asy
index 0d5ab883c6a..09f131a02ee 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot_after.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/asy/plot_after.asy
@@ -1,7 +1,8 @@
// plot_after.asy
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+settings.outformat="pdf";
+import "../../../asy/jh.asy" as jh;
-import graph; // Access plotting routines
+import graph;
// Function to be plotted
real fcn(real x) {
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/chapter2.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/chapter2.tex
index 658d4c38969..ae454e7cb9a 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/chapter2.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter2/chapter2.tex
@@ -9,8 +9,8 @@ we can't ask \Asy{} to plot all $x$'s.
We will instead plot the $x$'s where the associated $y$'s
are between $-5$ and~$5$.
To find these
-we can use \textit{Sage} to solve
-$5=x+(1/(x-1))$ and $-5=x+(1/(x-1))$.
+we can use a computer algebra system such as \textit{Sage} to solve
+$5=x+1/(x-1)$ and $-5=x+1/(x-1)$.
\begin{minted}{Python}
sage: x = var('x')
sage: solve( [5==x+(1/(x-1))], x )
@@ -51,24 +51,25 @@ We make the $y$~unit height be half of the $x$ unit width by adding this command
\begin{minted}{Asymptote}
scale(Linear, Linear(0.5))
\end{minted}
-(the \mintinline{Asymptote}{Linear} is in contrast with
-\mintinline{Asymptote}{Logarithmic}).
+(\mintinline{Asymptote}{Linear} is in contrast with a
+\mintinline{Asymptote}{Logarithmic} scale).
The axes and graph now come out rescaled but
we must also adjust the location
of points, the ones defining the vertical asymptote line, using for example
-line~29's \mintinline{Asymptote}{Scale((1,ymin))}.
+line~26's \mintinline{Asymptote}{Scale((1,ymin))}.
-That tweak of the $y$~axis causes the tick labels to be scrunched together,
-so we arrange that \Asy{} lists only every fifth label.
+That tweak of the $y$~axis causes its tick labels to be scrunched together,
+so we arrange that \Asy{} labels only every fifth tick
+(the labeled ones are called major ticks and the others are minor ticks).
\begin{minted}{Asymptote}
yaxis(ymin=ymin-0.4, ymax=ymax+0.4,
LeftTicks(Step=5, step=1, OmitTick(0), Size=3pt, size=2pt),
Arrows(TeXHead));
\end{minted}
-That command also sets the length of the major and minor ticks.
+That command also sets the length of these major and minor ticks.
-Here is \path{asy/plot_after.asy}
-(more on the first couple of lines in the next section).
+Here is \path{asy/plot_after.asy}.
+An explanation of line~3 is in the next section.
\begin{center}
\inputminted{Asymptote}{chapter2/asy/plot_after.asy}
\end{center}
@@ -82,9 +83,16 @@ Here is the output.
\section{Defaults}
Rather than copy and paste elements common across graphics
such as the font commands or colors,
-we can put them in a separate file \path{jh.asy} and import them,
-as in the prior source's line~2.
-That file's source is in the Appendix.
+we can put them in a separate file and import them,
+as in the prior source's line~3.
+The source of that file, \path{jh.asy}, is in the Appendix.
+(About the
+\mintinline{Asymptote}{"../../../asy/"}
+directory stuff:~usually we set up \Asy{} with a directory for common files
+and then just say \mintinline{Asymptote}{import jh}.
+But for this document we want that a user can compile without setup
+so the relative path is in the source.)
+
\section{Ticks}
@@ -108,10 +116,10 @@ Note line~25's \mintinline{Asymptote}{NW}, which prints
the $3\pi/2$ northwest of its tick.
Our other tick example has a graph paper effect,
-where ticks in a light color extending across the graph.
+with lines in a light color extending across the graph.
(I sometimes use this for lectures; here,
-to estimate by eye that the slope of the tangent line
-at $y=2$ is $2$.)
+to estimate by eye that at $y=2$ the slope of the tangent line
+is~$2$.)
\begin{center}
\includegraphics{chapter2/asy/exponential.pdf}
\end{center}
@@ -120,28 +128,32 @@ The source has a number of interesting features.
\begin{center}
\inputminted{Asymptote}{chapter2/asy/exponential.asy}
\end{center}
-The graph paper effect is due to the input in lines 30 through~46.
+The graph paper effect is due to the input in lines 26 through~46.
The horizontal lines are a little clearer so we will cover them.
-They are created by the first two \mintinline{Asymptote}{yaxis(..)} commands,
-which produce two vertical axes, one on the left and one on the right,
-These are drawn with a \mintinline{Asymptote}{nullpen} so we don't see
-vertical black lines at those locations.
+They are created by the \mintinline{Asymptote}{yaxis(..)} commands
+in lines 39--46.
+These two vertical axes, one on the left and one on the right,
+are drawn with a \mintinline{Asymptote}{nullpen} so we don't see
+vertical black lines at \mintinline{Asymptote}{xmin-0.2}
+and \mintinline{Asymptote}{xmax+0.2}.
What we do see are
-the ticks extending back and forth between them in the color given by
+the ticks for those axes,
+extending back and forth between them in the color given by
\mintinline{Asymptote}{GRAPHPAPERPEN}, because of
the \mintinline{Asymptote}{extend=true}.
These ticks have a null label because of the
\LaTeX{} comment character~\mintinline{Asymptote}{"%"}.
-(The $y$~axis on the left produces the horizontal
+The $y$~axis on the left produces the horizontal
graph paper marks between
-$x=\text{\mintinline{Asymptote}{xmin-0.2}}$ and the third $y$~axis at
+$x=\text{\mintinline{Asymptote}{xmin-0.2}}$ and
$x=0$, while the one on the right generates the marks
-from $x=0$ to $x=\text{\mintinline{Asymptote}{xmax+0.2}}$.)
+from $x=0$ to $x=\text{\mintinline{Asymptote}{xmax+0.2}}$.
+(The $x=0$ comes from the $y$~axis in lines 52--54.)
-The commands from line~49 to the end produce the black line axes.
+The commands from line~49 to the end produce the axes shown in black.
% Note that \mintinline{Asymptote}{yaxis(..)} produces only one arrow.
-This is a long file but we will discuss a few finer points.
+This is a long file but we will discuss a few fine points.
One is that the $(\ln(2),2)$ label has a white background
obscuring some of the graph paper lines, from the
\mintinline{Asymptote}{Label("$(\ln(2),2)$",filltype=Fill(white))}
@@ -152,7 +164,7 @@ is there because \Asy{} draws the graph by connecting dots that
evaluate
\mintinline{Asymptote}{fcn}
at a finite number of points, and the default was too small so that
-the graphic had jaggies on the left.
+the graphic had visible jaggies.
Finally, lines 18 and~19 as well as lines 27 and~28 make clear that
essential to understanding \Asy{} is understanding the ideas of
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/integral.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/integral.asy
index 1b756c04042..ccc2249a17d 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/integral.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/integral.asy
@@ -1,6 +1,6 @@
// integral.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom.asy
index 462bf9d0489..8c45316b58e 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom.asy
@@ -1,6 +1,6 @@
// zoom.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_iterate.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_iterate.asy
index 2c6268fa8c9..3ecf6d9c866 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_iterate.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_iterate.asy
@@ -1,12 +1,18 @@
// zoom_iterate.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
path f = GENERIC_FCN_PLOT; // Shorter to type
real c = 3.1;
+// Find f(c) on f and get f'(c)
+real c_time = times(f, c)[0];
+pair c_point = point(f,c_time);
+pair d = dir(f, c_time);
+real t_line_fcn(real x) { return (d.y/d.x)*(x-c_point.x) + c_point.y; }
+
string OUTPUT_FN = "zoom_iterate%03d";
for (int i=0; i<4; ++i) {
picture pic; // Generate a new picture
@@ -16,20 +22,14 @@ for (int i=0; i<4; ++i) {
real delta = 1/2^(i);
real xmin = c-delta; real xmax = c+delta;
- // Find f(c) on f, and get f'(c) as a pair
- real c_time = times(f, c)[0];
- pair c_point = point(f,c_time);
- pair d = dir(f, c_time);
- real t_line_fcn(real x) { return (d.y/d.x)*(x-c_point.x) + c_point.y; }
- path t_line = graph(t_line_fcn, xmin, xmax);
-
- // Limits of f to show
+ // Limits of f and tangent line to show
real left_time = times(f, xmin)[0];
real right_time = times(f, xmax)[0];
path f_shown = subpath(f, left_time, right_time);
+ path t_line = graph(t_line_fcn, xmin, xmax);
- // Draw f and tangent line
- transform f_trans = shift(0, 0.5*delta)*shift(0, -1*c_point.y); // Shift f close to axis
+ // Shift f and tangent line close to x-axis, then draw
+ transform f_trans = shift(0, 0.5*delta)*shift(0, -1*c_point.y);
draw(pic, f_trans*f_shown, BOLD_COLOR);
draw(pic, f_trans*t_line, HIGHLIGHT_COLOR);
dotfactor = 3;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_times.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_times.asy
index a3d3964883a..d7d4628b296 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_times.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/asy/zoom_times.asy
@@ -1,6 +1,6 @@
// zoom_times.asy
settings.outformat="pdf";
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/chapter3.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/chapter3.tex
index 162ef87df71..d592b69c22f 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/chapter3.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter3/chapter3.tex
@@ -2,12 +2,13 @@
\chapter{Paths and pens}
\section{Paths}
-This plots a function that is generic in that it isn't $f(x)=x^2$ or some
-other function derived from a simple expression.
-We will use this it for the classic Calculus
-lesson of zooming in on a point of tangency to
-illustrate that
-the curve is locally well-approximated by the line.
+This plots a function that is generic in that it isn't
+derived from a simple expression such as $\cos x$ or $x+(1/(x-1))$.
+We will use it for the classic Calculus
+lesson
+illustrating that
+the curve is locally well-approximated by the line,
+by zooming in on a point of tangency.
\begin{center}
\includegraphics{chapter3/asy/zoom.pdf}
\end{center}
@@ -24,6 +25,7 @@ so I included a copy in \path{jh.asy}
as \mintinline{Asymptote}{GENERIC_FCN_PLOT}.)
Earlier, when we drew a vertical asymptote line we instead connected two
points with a \mintinline{Asymptote}{--} operator, which gives a line segment.
+There are other connectors but these two are the most common.
In line~17, \Asy's
\mintinline{Asymptote}{dir(..)} command gives the direction of the
@@ -40,7 +42,7 @@ As to line~15's \mintinline{Asymptote}{c_time = times(f, c)[0]},
just as \MF{} and \MP{} do.
These curves are
parametrized by a variable called `time'.
-By definition, the initial point $(0,-25)$ is at time~$0$, the next point
+By definition, the initial point $(0,-0.25)$ is at time~$0$, the next point
$(1,0.35)$ is at time~$1$, etc.
(To forestall any confusion:~the time has nothing to do with the
first coordinate, it comes from when the point is specified in the
@@ -51,7 +53,7 @@ This illustrates, showing some times.
\includegraphics{chapter3/asy/zoom_times.pdf}
\end{center}
The \mintinline{Asymptote}{times(..)} command returns an array of times
-where the path it intersects the vertical line
+where the path intersects the vertical line
$x=\text{\mintinline{Asymptote}{c}}$.
We extract the first one (in this case the only one) with the
\mintinline{Asymptote}{[0]}.
@@ -66,11 +68,11 @@ The source for the prior graphic shows two useful aspects of
\begin{center}
\inputminted{Asymptote}{chapter3/asy/zoom_times.asy}
\end{center}
-The first aspect is in line~19.
+The first of those is in line~19.
The \mintinline{Asymptote}{format("$%0.02f$",t)}
turns the floating point number~$t$ into the string used in the label.
-A larger point is in lines~17 through~20, where the code has an iteration.
+The other is in lines~17 through~20, where the code has an iteration.
One strength of \Asy{} is that it is a standard programming language,
with clean constructs that are like those you use in other languages
in your daily work.
@@ -98,8 +100,8 @@ is more complex than the others that we have seen.
One reason is that this one file produces four pictures,
so that we needn't maintain
four separate \path{.asy} files with lots of overlap.
-The four output files are produced in the loop between lines~11 and~47.
-Line~12 creates a new
+The four output files are produced in the loop between lines~17 and~47.
+Line~18 creates a new
\mintinline{Asymptote}{picture}
and line~46 outputs it.
The files are named
@@ -112,15 +114,15 @@ form of that name is given by the string
Besides using a single input to create multiple output files,
there are two other things that are new here.
-One is line~13's
+One is line~19's
\mintinline{Asymptote}{size(pic, 3cm, 0)}.
-This makes each output graphic be three centimeters wide, and as tall as
+This makes each output graphic be three centimeters wide and as tall as
required, setting the size of the $x$ and~$y$ units as needed to
get that width.
The result is a zooming-in on successively shorter intervals of the $x$~axis.
The other new thing
-is that when the $x$~axis interval is small, rescaling the units to make the
+is that rescaling the units to make the
entire figure three centimeters wide
would put the plotted function very far above the
$x$~axis.
@@ -128,8 +130,8 @@ So we have moved the function down near the axis.
This transformation applies not just to the function but also to the tangent
line and to the point $(c,f(c))$, so we have broken this
transformation out as a separate thing,
-line~32's
-\mintinline{Asymptote}{transform f_trans = shift(0,0.5*delta)*shift(0,-1*c_point.y)}.
+in line~32.
+%\mintinline{Asymptote}{transform f_trans = shift(0,0.5*delta)*shift(0,-1*c_point.y)}.
Transformations are applied with the star operator,
as on lines~33, 34, and~36.
@@ -158,8 +160,8 @@ Here is the resulting graphic.
The
\mintinline{Asymptote}{buildcycle(left_side, f, right_side, bottom)}
on line~20 is new.
-It takes the paths surrounding the region of interest and
-constructs the path that is its boundary.
+It takes paths surrounding the region of interest and
+constructs the path that is the region's boundary.
(A more common way to make a cyclic path is to end with
\mintinline{Asymptote}{cycle}, as with
\mintinline{Asymptote}{path triangle = (0,0)--(0,1)--(1,0)--cycle}.)
@@ -167,7 +169,7 @@ constructs the path that is its boundary.
Then line~23's \mintinline{Asymptote}{fill(region, NEUTRAL_COLOR+opacity(0.5))}
covers the region using a pen that, in addition to
its color, allows some of the material behind it to show through.
-Note that some PDF viewers have trouble with opacity so your results may vary,
+Note that some PDF viewers have trouble with opacity so your results may vary
but one viewer that gives good results is Adobe's Reader.
The \Asy{} reference gives many options for pens.
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/planes.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/planes.asy
index 6f7d6efc9e6..b5b0ea81dcd 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/planes.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/planes.asy
@@ -3,7 +3,7 @@ settings.outformat="pdf";
settings.tex="pdflatex";
settings.prc = true;
settings.render = 0;
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph3;
projection default_projection = orthographic(3,1.5,0.5,up=Z);
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/vectors.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/vectors.asy
index b1f2ad1700c..a0c965a8233 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/vectors.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/vectors.asy
@@ -3,7 +3,7 @@ settings.outformat = "pdf";
settings.tex = "pdflatex"; // For compiling in-pic text
settings.prc = true; // Manipulable in a PDF file
settings.render = 0; // Needed for "poster" image, i.e., picture to click on
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import fontsize;
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/washer.asy b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/washer.asy
index c74f6c0d160..1f071aad17b 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/washer.asy
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/asy/washer.asy
@@ -3,7 +3,7 @@ settings.tex = "pdflatex";
settings.outformat = "pdf";
settings.render = 8; // Tweaked this until poster pic looked better
settings.prc = true;
-cd("../../../asy"); import jh; cd(""); define_texpreamble();
+import "../../../asy/jh.asy" as jh;
import graph3;
projection default_projection = orthographic(3,1.5,0.5,up=Z);
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/chapter4.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/chapter4.tex
index ff1f3064f40..4e12c76957c 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/chapter4.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/chapter4.tex
@@ -1,9 +1,10 @@
% Chapter 4 from Asymptote tutorial Jim Hefferon
-\def\asydir{chapter4/asy/}
+\def\asydir{chapter4/asy}
\chapter{3D}
A strength of \Asy{} is its ability in three dimensions.
-It can easily draw what you want to draw, including
+It can easily draw what you want to draw.
+That includes
% that it extends to three dimensions constructs for good-looking paths
% that come from two-dimensional \MF{} and \MP.
doing projections, which can be tricky to get right by eye.
@@ -11,16 +12,15 @@ doing projections, which can be tricky to get right by eye.
In addition, you can choose to make these graphics manipulable, so that you can
use your mouse to turn them around or peek under them, and in
general have an explore.
-This is great for a Calculus lecture so its what I'm showing here.
-
-Note that only some PDF viewers let you manipulate.
-For instance, Adobe's Reader works but the readers embedded in web
+This is great for a Calculus lecture so it is what I'm showing here.
+(Note that only some PDF viewers let you manipulate.
+For instance, Adobe's Reader works but the ones embedded in web
browsers do not.
To test your reader just click on the graphic below.
-(You may be asked to let the reader
+You may be asked to let the reader
run the code that does the manipulation.)
-We start with a picture showing the vector of displacements $(2,1,1)$ at a
+We start with a picture showing the displacement vector $(2,1,1)$ at a
number of initial points.
% \begin{center}
% \asyinclude{chapter4/asy/vectors}
@@ -29,8 +29,8 @@ number of initial points.
\input chapter4/asy/vectors.tex
\end{center}
-The input code has two different things going on.
-First, so that the vectors are scattered about,
+The input code shows two new things.
+First, to scatter the vectors about,
in lines 34--36 they get a randomly-chosen initial point.
The randomization uses the seed from line~24.
To find that number I uncommented lines 21--23 and commented out line~24,
@@ -43,7 +43,7 @@ until there are such eight vectors.
\begin{center}
\inputminted{Asymptote}{chapter4/asy/vectors.asy}
\end{center}
-The other thing in the code is the 3D stuff.
+However, the really new stuff is the 3D stuff.
It is surprisingly like the 2D constructs that we have seen.
Line~10's
\mintinline{Asymptote}{import graph3} gives access to
@@ -57,10 +57,15 @@ and instead of
you say
\mintinline{Asymptote}{xaxis3(..)}.
But much of it is at least similar.
+(Lines~11 and~12 give the projection,
+essentially setting the location of the camera
+that is taking this picture.
+Even if we use a reader that allows us to manipulate the image,
+we still need a starting view.)
-The next graphic shows surfaces,
-which are genuinely different than what we saw in 2D.
-It illustrates that the angle between two
+We next see something
+genuinely different from a 2D context, surfaces.
+This graphic illustrates that the angle between two
intersecting planes is the same as the angle between their normal
vectors.
% \begin{center}
@@ -69,15 +74,11 @@ vectors.
\begin{center}
\vcenteredhbox{\input chapter4/asy/planes.tex }%
\end{center}
-We can imagine that lines~19 and~20 set the location of the camera
-that is taking this picture.
-Even if we use a reader where the image is manipulable,
-we need a starting view.
\begin{center}
\inputminted{Asymptote}{chapter4/asy/planes.asy}
\end{center}
-This graphic's code
+This code
spotlights the power of transforms.
We don't have to give the equations of the planes or specify their normals.
Instead, in line~17 we define the edge of
@@ -91,12 +92,12 @@ The new plane with its edge and its normal vector
then comes from applying that transform
to the horizontal plane, its edge, and its normal.
-To color the surfaces, in lines~24 and~26 we use
-\mintinline{Asymptote}{figure material}.
-We will reuse these later so the definition is in \path{jh.sty};
-see lines~28--35 in the Appendix.
-This coloring involves \mintinline{Asymptote}{opacity(..)} and
-note that you can indeed see through the planes to some extent.
+In lines~24 and~26 we use
+\mintinline{Asymptote}{figure_material} to give the surfaces color.
+We will reuse this later so the definition is in \path{jh.sty};
+see lines~26--32 in the Appendix.
+This involves \mintinline{Asymptote}{opacity(..)} and
+note that you can indeed see through the planes.
Finally, in lines~40--46 we take advantage of one of \Asy's many helper functions
to find and draw the arc of the angle between the planes and the normals.
@@ -144,8 +145,9 @@ Here is a shot of the output.
\framebox{\includegraphics[page=1,scale=0.325,trim=0.25in 5in 0.25in 0.25in]{chapter4/main_3d.pdf}}
\end{center}
In that output PDF,
-you should be able to click on the graphic and move it around
-(of course, your reader must supports this).
+you should be able to click on the poster graphic to bring up
+the manipulable graphic,
+if your reader supports that.
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/main_3d.tex b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/main_3d.tex
index 9af013d4ff5..40fe635435c 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/main_3d.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/chapter4/main_3d.tex
@@ -1,14 +1,15 @@
% main_3d.tex LaTeX demonstraton file showing Asymptote 3D, Jim Hefferon
\documentclass{article}
\usepackage{graphicx}
-\graphicspath{ {asy/} } % Trailing slash, dirs in curly braces
+\graphicspath{ {asy/} } % Path to poster graphic; dirs in curly braces, trailing slash
\usepackage{asymptote}
\def\asydir{asy} % No trailing slash
% For non-manipulable 3D figures, just compile with "asy vectors" and
% include the PDF output as with 2D figures.
% For manipulable 3D figures:
-% (1) Compile .asy file with "asy -inlineimage vectors".
-% It outputs a number of files, including .tex and .pre files.
+% (1) Compile the .asy file with "asy -inlineimage vectors".
+% It outputs a number of files, including .tex and .pre files,
+% and the .pdf "poster" that you click on to start the manipulation.
% (2) Include the .pre line here along with one of the lines in center below
\input asy/vectors.pre
@@ -19,6 +20,6 @@ Include the output graphic directly in the text body.
\input asy/vectors.tex %
\end{center}
If you use the commented-out way then run
-\texttt{asy -inlinimage <latex-fn>-1}
+\texttt{asy -inlineimage <latex-fn>-1}
between a pair of \LaTeX{} runs of this file.
\end{document}
diff --git a/Master/texmf-dist/doc/latex/asy-overview/src/preface/preface.tex b/Master/texmf-dist/doc/latex/asy-overview/src/preface/preface.tex
index 8a2cb9cdbf9..f3e5a6209e0 100644
--- a/Master/texmf-dist/doc/latex/asy-overview/src/preface/preface.tex
+++ b/Master/texmf-dist/doc/latex/asy-overview/src/preface/preface.tex
@@ -49,5 +49,5 @@ Showing only one option is just a question of going shorter.
\begin{flushleft}
Jim Hef{}feron \\
University of Vermont \\
-2024-May-26
+2024-Sep-29
\end{flushleft} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md
index b782b31a072..2567f7ec34d 100644
--- a/Master/texmf-dist/doc/latex/babel/README.md
+++ b/Master/texmf-dist/doc/latex/babel/README.md
@@ -1,8 +1,8 @@
-## Babel 24.9
+## Babel 24.11
-2024-08-29
+2024-10-05
-`babel` is the multilingual framework for localizing documents in
+`babel` is the multilingual framework to localize documents in
LaTeX, LuaLaTeX, XeLaTeX. It manages culturally-determined
typographical (and other) rules for about 170 to 300 languages,
depending on the engine, with several levels of coverage. A few
@@ -10,9 +10,9 @@ languages even work with Plain formats.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 24.9 are described in:
+Changes in version 24.11 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-24.9.html
+https://latex3.github.io/babel/news/whats-new-in-babel-24.11.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -48,9 +48,9 @@ respective authors.
### Summary of latest changes
```
-24.9 2024-08-29
- * New transform 'digits.native' (alternative to `mapdigits').
- * Tentative transforms for CJK spacing and line breaking.
+24.11 2024-10-05
+ * Start a thorough review of the manual.
+ * (lua) Transform variables.
```
### Previous changes
diff --git a/Master/texmf-dist/doc/latex/babel/babel-code.pdf b/Master/texmf-dist/doc/latex/babel/babel-code.pdf
index 8281aac0f5b..b4a04b50290 100644
--- a/Master/texmf-dist/doc/latex/babel/babel-code.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index 697e810aa58..6642653c91a 100644
--- a/Master/texmf-dist/doc/latex/babel/babel.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/MANIFEST.md b/Master/texmf-dist/doc/latex/beamertheme-gotham/MANIFEST.md
new file mode 100644
index 00000000000..a7334244cd9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/MANIFEST.md
@@ -0,0 +1,301 @@
+# Manifest for gotham
+
+This file is a listing of all files considered to be part of this package.
+It is automatically generated with `l3build manifest`.
+
+
+## Repository manifest
+
+The following groups list the files included in the development repository of the package.
+Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed
+with ‘‡’ are included in both.
+
+### Source files
+
+These are source files for a number of purposes, including the `unpack` process which
+generates the installation files of the package. Additional files included here will also
+be installed for processing such as testing.
+
+* gotham.dtx ‡
+* gotham.ins ‡
+* gotham-logo.pdf ‡
+* gotham-layout.pdf ‡
+* gotham-blueprint.pdf ‡
+* gotham-safetybox.pdf ‡
+
+### Text files
+
+Plain text files included as documentation or metadata.
+
+* MANIFEST.md ‡
+* README.md ‡
+
+### Derived files
+
+The files created by ‘unpacking’ the package sources. This typically includes
+`.sty` and `.cls` files created from DocStrip `.dtx` files.
+
+* beamercolorthemegotham.sty †
+* beamerfontthemegotham.sty †
+* beamerinnerthemegotham.sty †
+* beamerouterthemegotham.sty †
+* beamerthemegotham.sty †
+* gotham-blueprint.pdf ‡
+* gotham-layout.pdf ‡
+* gotham-logo.pdf ‡
+* gotham-safetybox.pdf ‡
+
+### Support files
+
+These files are used for unpacking, typesetting, or checking purposes.
+
+* gotham-example169transp-1.png
+* gotham-example43dark-1.png
+* gotham-exampleSimple-1.png
+* gotham-logo.png
+* gotham-test-035-a.png
+* gotham-test-035-b.png
+
+### Test files
+
+These files form the test suite for the package. `.lvt` or `.lte` files are the individual
+unit tests, and `.tlg` are the stored output for ensuring changes to the package produce
+the same output. These output files are sometimes shared and sometime specific for
+different engines (pdfTeX, XeTeX, LuaTeX, etc.).
+
+* gotham-test-001.lvt
+* gotham-test-035.lvt
+* gotham-test-037.lvt
+* gotham-test-040.lvt
+* gotham-test-043.lvt
+* gotham-test-044.lvt
+* gotham-test-045.lvt
+* gotham-test-1002.lvt
+* gotham-test-1002b.lvt
+* gotham-test-1003.lvt
+* gotham-test-1003b.lvt
+* gotham-test-1004.lvt
+* gotham-test-1005.lvt
+* gotham-test-1006.lvt
+* gotham-test-1007.lvt
+* gotham-test-1007b.lvt
+* gotham-test-1008.lvt
+* gotham-test-1009.lvt
+* gotham-test-1010.lvt
+* gotham-test-1011.lvt
+* gotham-test-1012.lvt
+* gotham-test-1013.lvt
+* gotham-test-1014.lvt
+* gotham-test-1015.lvt
+* gotham-test-1016.lvt
+* gotham-test-1017.lvt
+* gotham-test-1018.lvt
+* gotham-test-1019.lvt
+* gotham-test-1020.lvt
+* gotham-test-1021.lvt
+* gotham-test-1022.lvt
+* gotham-test-1024.lvt
+* gotham-test-1025.lvt
+* gotham-test-1026.lvt
+* gotham-test-1027.lvt
+* gotham-test-1028.lvt
+* gotham-test-1031.lvt
+* gotham-test-1032.lvt
+* gotham-test-1037.lvt
+* gotham-test-001.lve
+* gotham-test-035.luatex.tlg
+* gotham-test-035.tlg
+* gotham-test-035.xetex.tlg
+* gotham-test-037.luatex.tlg
+* gotham-test-037.tlg
+* gotham-test-037.xetex.tlg
+* gotham-test-040.luatex.tlg
+* gotham-test-040.tlg
+* gotham-test-040.xetex.tlg
+* gotham-test-043.luatex.tlg
+* gotham-test-043.tlg
+* gotham-test-043.xetex.tlg
+* gotham-test-044.luatex.tlg
+* gotham-test-044.tlg
+* gotham-test-044.xetex.tlg
+* gotham-test-045.luatex.tlg
+* gotham-test-045.tlg
+* gotham-test-045.xetex.tlg
+* gotham-test-1002.luatex.tlg
+* gotham-test-1002.tlg
+* gotham-test-1002.xetex.tlg
+* gotham-test-1002b.luatex.tlg
+* gotham-test-1002b.tlg
+* gotham-test-1002b.xetex.tlg
+* gotham-test-1003.luatex.tlg
+* gotham-test-1003.tlg
+* gotham-test-1003.xetex.tlg
+* gotham-test-1003b.luatex.tlg
+* gotham-test-1003b.tlg
+* gotham-test-1003b.xetex.tlg
+* gotham-test-1004.luatex.tlg
+* gotham-test-1004.tlg
+* gotham-test-1004.xetex.tlg
+* gotham-test-1005.luatex.tlg
+* gotham-test-1005.tlg
+* gotham-test-1005.xetex.tlg
+* gotham-test-1006.luatex.tlg
+* gotham-test-1006.tlg
+* gotham-test-1006.xetex.tlg
+* gotham-test-1007.luatex.tlg
+* gotham-test-1007.tlg
+* gotham-test-1007.xetex.tlg
+* gotham-test-1007b.luatex.tlg
+* gotham-test-1007b.tlg
+* gotham-test-1007b.xetex.tlg
+* gotham-test-1008.luatex.tlg
+* gotham-test-1008.tlg
+* gotham-test-1008.xetex.tlg
+* gotham-test-1009.luatex.tlg
+* gotham-test-1009.tlg
+* gotham-test-1009.xetex.tlg
+* gotham-test-1010.luatex.tlg
+* gotham-test-1010.tlg
+* gotham-test-1010.xetex.tlg
+* gotham-test-1011.luatex.tlg
+* gotham-test-1011.tlg
+* gotham-test-1011.xetex.tlg
+* gotham-test-1012.luatex.tlg
+* gotham-test-1012.tlg
+* gotham-test-1012.xetex.tlg
+* gotham-test-1013.luatex.tlg
+* gotham-test-1013.tlg
+* gotham-test-1013.xetex.tlg
+* gotham-test-1014.luatex.tlg
+* gotham-test-1014.tlg
+* gotham-test-1014.xetex.tlg
+* gotham-test-1015.luatex.tlg
+* gotham-test-1015.tlg
+* gotham-test-1015.xetex.tlg
+* gotham-test-1016.luatex.tlg
+* gotham-test-1016.tlg
+* gotham-test-1016.xetex.tlg
+* gotham-test-1017.luatex.tlg
+* gotham-test-1017.tlg
+* gotham-test-1017.xetex.tlg
+* gotham-test-1018.luatex.tlg
+* gotham-test-1018.tlg
+* gotham-test-1018.xetex.tlg
+* gotham-test-1019.luatex.tlg
+* gotham-test-1019.tlg
+* gotham-test-1019.xetex.tlg
+* gotham-test-1020.luatex.tlg
+* gotham-test-1020.tlg
+* gotham-test-1020.xetex.tlg
+* gotham-test-1021.luatex.tlg
+* gotham-test-1021.tlg
+* gotham-test-1021.xetex.tlg
+* gotham-test-1022.luatex.tlg
+* gotham-test-1022.tlg
+* gotham-test-1022.xetex.tlg
+* gotham-test-1024.luatex.tlg
+* gotham-test-1024.tlg
+* gotham-test-1024.xetex.tlg
+* gotham-test-1025.luatex.tlg
+* gotham-test-1025.tlg
+* gotham-test-1025.xetex.tlg
+* gotham-test-1026.luatex.tlg
+* gotham-test-1026.tlg
+* gotham-test-1026.xetex.tlg
+* gotham-test-1027.luatex.tlg
+* gotham-test-1027.tlg
+* gotham-test-1027.xetex.tlg
+* gotham-test-1028.luatex.tlg
+* gotham-test-1028.tlg
+* gotham-test-1028.xetex.tlg
+* gotham-test-1031.luatex.tlg
+* gotham-test-1031.tlg
+* gotham-test-1031.xetex.tlg
+* gotham-test-1032.luatex.tlg
+* gotham-test-1032.tlg
+* gotham-test-1032.xetex.tlg
+* gotham-test-1037.luatex.tlg
+* gotham-test-1037.tlg
+* gotham-test-1037.xetex.tlg
+
+
+## TDS manifest
+
+The following groups list the files included in the TeX Directory Structure used to install
+the package into a TeX distribution.
+
+### Source files (TDS)
+
+All files included in the `gotham/source` directory.
+
+* gotham.dtx
+* gotham.ins
+
+### TeX files (TDS)
+
+All files included in the `gotham/tex` directory.
+
+* beamercolorthemegotham.sty
+* beamerfontthemegotham.sty
+* beamerinnerthemegotham.sty
+* beamerouterthemegotham.sty
+* beamerthemegotham.sty
+* gotham-blueprint.pdf
+* gotham-layout.pdf
+* gotham-logo.pdf
+* gotham-safetybox.pdf
+
+### Doc files (TDS)
+
+All files included in the `gotham/doc` directory.
+
+* MANIFEST.md
+* README.md
+* ctan.ann
+* ctan.note
+* gotham-dev-impl.pdf
+* gotham-doc.pdf
+* gotham-doc.tex
+* gotham-example169transp.pdf
+* gotham-example169transp.tex
+* gotham-example43dark.pdf
+* gotham-example43dark.tex
+* gotham-exampleSimple.pdf
+* gotham-exampleSimple.tex
+* gotham-user-cmds.pdf
+* gotham.pdf
+* section-Beamer.tex
+* section-Conclusion.tex
+* section-Gotham.tex
+
+
+## CTAN manifest
+
+The following group lists the files included in the CTAN package.
+
+### CTAN files
+
+* MANIFEST.md
+* README.md
+* ctan.ann
+* ctan.note
+* gotham-blueprint.pdf
+* gotham-dev-impl.pdf
+* gotham-doc.pdf
+* gotham-doc.tex
+* gotham-example169transp.pdf
+* gotham-example169transp.tex
+* gotham-example43dark.pdf
+* gotham-example43dark.tex
+* gotham-exampleSimple.pdf
+* gotham-exampleSimple.tex
+* gotham-layout.pdf
+* gotham-logo.pdf
+* gotham-safetybox.pdf
+* gotham-user-cmds.pdf
+* gotham.dtx
+* gotham.ins
+* gotham.pdf
+* section-Beamer.tex
+* section-Conclusion.tex
+* section-Gotham.tex
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md b/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md
new file mode 100644
index 00000000000..82fa92e641a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/README.md
@@ -0,0 +1,127 @@
+# Gotham Beamer Theme
+
+<!-- Logo -->
+<p align="center">
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham">
+ <img src="support/gotham-logo.png" width="100" alt="Gotham logo">
+ </a>
+</p>
+
+<!-- BADGES -->
+<p align="center">
+ <a href="https://ctan.org/pkg/gotham"><img src="https%3A%2F%2Fctan.org%2Fjson%2F2.0%2Fpkg%2Fgotham&query=%24.version.number&logo=latex&label=CTAN"/></a>
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/release/"><img src="https://img.shields.io/badge/Latest_Release-%{latest_tag}-blue"/></a>
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/pipelines?page=1&scope=all&ref=main"><img src="https://gitlab.com/RomainNOEL/beamertheme-gotham/badges/main/pipeline.svg"/></a>
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/blob/main/LICENSE.txt"><img src="https://img.shields.io/badge/License-LPPL_1.3c--Clause-blue.svg"/></a>
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/artifacts/"><img src="https://img.shields.io/badge/Documentation-PDF_online-green"/></a>
+ <a href="https://gitlab.com/RomainNOEL/beamertheme-gotham/-/blob/main/Authors.md"><img src="https://www.repostatus.org/badges/latest/active.svg"/></a>
+</p>
+
+
+## What is Gotham ?
+This `Gotham` package is a modern, minimal-ish, versatile and extendable theme for your `Beamer` presentations using `LaTeX(3)`.
+
+
+## Table of Contents
+[[_TOC_]]
+
+
+## Why this package ?
+ONCE UPON THE TIME, I was adapting `Metropolis` Beamer theme to get my institutional templates.
+Indeed, `Metropolis` Beamer theme is a great work that is very convenient and well appreciated by many.
+
+BUT, `Metropolis` seems not maintained anymore and is not flexible enough.
+Moreover, `Metropolis` (or its successor initiative Moloch) and Beamer in some extends are not very flexible.
+For example, it requires cumbersome modifications to apply a different background for your section frames.
+
+SO, `Gotham` tries to bring that kind of flexibility and `LaTeX3` implementation on top of the good-looking `Metropolis` theme.
+
+
+## See it in action
+Here are some screenshot of what you can obtain:
+
+<img src="support/gotham-example169transp-1.png" width="700">
+
+<img src="support/gotham-example43dark-1.png" width="700">
+
+An `pdf` example/demo result is available [here](https://gitlab.com/RomainNOEL/beamertheme-gotham/-/artifacts/), and the `tex` source file to build it is available [here](/examples/section-Gotham.tex).
+
+The following code shows a **minimal example** of a Beamer presentation using Gotham.
+```latex
+\documentclass{beamer}
+\usetheme{gotham}
+\title{A minimal example}
+\date{\today}
+\author{Romain NOEL}
+\institute{Centre for Modern Beamer Themes}
+\begin{document}
+ \maketitle
+ \section{First Section}
+ \begin{frame}{First Frame}
+ Hello, world!
+ \end{frame}
+\end{document}
+```
+is yielding the following:
+
+<img src="support/gotham-exampleSimple-1.png" width="700">
+
+
+## Some of the features included
+- `l3build` a build system for LaTeX that unpack the sources, build the documentation and examples, run unit tests, check tags, prepare for CTAN publishing, etc...
+- `expl3`
+- dark, light and transparent theme
+- can adapt to 16:9 and 4:3 screen format
+- progress bar
+- **can mix** themes
+
+
+## Documentation
+The complete `pdf` documentation can be found through an [artefact](https://gitlab.com/RomainNOEL/beamertheme-gotham/-/artifacts/).
+
+
+## How to install ?
+Several possibilities are available and tested:
+- download the `.sty` released zip files,
+- build from sources using `l3build`,
+- download or update from [CTAN](https://ctan.org/pkg/beamertheme-gotham),
+- fork a example from [Overleaf](https://overleaf.com) .
+
+### Download from release
+The zip file containing the `.sty` files is downloadable through our latest [release link](https://gitlab.com/RomainNOEL/beamertheme-gotham/-/releases/)
+
+### Build from sources
+You can also install the theme from sources, in which case you need a working LaTeX installation with `l3build` installed.
+Then just follow these steps:
+```bash
+git clone https://gitlab.com/RomainNOEL/beamertheme-gotham.git
+cd beamertheme-gotham
+l3build install
+```
+
+Additionally you can use the other `l3build` target:
+- `l3build unpack` builds the theme style files.
+- `l3build doc` builds this documentation manual and the examples.
+- `l3build check` builds the theme and manual.
+- `l3build install` installs the theme into your local texmf folder.
+- STOP unless you want remove it.
+- `l3build uninstall` removes the theme from your local texmf folder.
+- `l3build clean` removes the files generated by `l3build`.
+
+### Download from CTAN
+The CTAN repository is available through the Gotham [package](https://ctan.org/pkg/beamertheme-gotham), so you can install it using your favorite LaTeX package manager. For example, with `tlmgr`:
+```bash
+tlmgr install beamertheme-gotham
+```
+
+### Fork from Overleaf example
+If you want to play with it before installing, you can fork this [Overleaf project](https://overleaf.com) and have fun.
+
+
+## License
+The LaTeX Project Public License [(LPPL)](/LICENSE.txt)
+
+
+## Project status
+The status of the project is "maintained".
+However, if you have a bit of free time and good will to help the maintenance, it will be very appreciated and welcomed. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann
new file mode 100644
index 00000000000..e34df0a4c61
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.ann
@@ -0,0 +1,11 @@
+# [Gotham](https://gitlab.com/RomainNOEL/beamertheme-gotham) announcement
+
+This `Gotham` package is a modern, minimal-ish, versatile and extendable theme for your `Beamer` presentations using `LaTeX(3)`.
+`Gotham` tries to bring higher flexibility thanks to `LaTeX3` implementation on top of the good-looking `Metropolis` theme.
+
+## Features
+- 16:9 and 4:3 compatible
+- supports different background color (dark and light)
+- can adapt beamertemplate to declared context
+- extend color set
+- improved progress bars
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.note b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.note
new file mode 100644
index 00000000000..ff43a42640c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/ctan.note
@@ -0,0 +1,3 @@
+Please see the file `gotham-exampleSimple.tex` in:
+doc/latex/gotham/examples/gotham-exampleSimple.tex
+Thanks \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-blueprint.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-blueprint.pdf
new file mode 100644
index 00000000000..04975af2102
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-blueprint.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf
new file mode 100644
index 00000000000..1038810b5ba
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.tex
new file mode 100644
index 00000000000..4d8027bfa8b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-dev-impl.tex
@@ -0,0 +1,14 @@
+\documentclass{l3doc}
+\usepackage[T1]{fontenc}
+\usepackage{pdfpages}
+\usepackage{standalone}
+\providecommand{\defopt}[1]{\underline{#1}}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+\section{Commands description for users}
+\EnableImplementation
+\DisableDocumentation
+\DocInput{gotham.dtx}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf
new file mode 100644
index 00000000000..3f6105497a4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex
new file mode 100644
index 00000000000..4072ea2504b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-doc.tex
@@ -0,0 +1,1094 @@
+\documentclass{l3doc}
+ \usepackage[T1]{fontenc}
+ \usepackage{pdfpages}
+ \usepackage{standalone}
+ % \usepackage{gotham}
+ % \usepackage{readprov}
+ % \ReadPackageInfos{beamerthemegotham}
+ \edef\GothamVersion{v1.1.0.b} %{\fileversion}
+ \edef\GothamDate{2024-09-20} %{\filedate}
+
+
+ \usepackage{parskip}
+ \usepackage{setspace}
+ \usepackage{xspace}
+ \onehalfspacing
+
+ \usepackage{xcolor}
+ \definecolor{tPrim}{HTML}{00707F} % Green-Blue
+ \definecolor{tSec}{HTML}{5FA4B0} % Green-Blue light
+ \definecolor{tAccent}{HTML}{F07F3C} % Orange
+ \definecolor{tGrey}{HTML}{E6E6E1} % Grey-Beige
+
+ \usepackage{listings}
+ \lstset{%
+ language=[LaTeX]{TeX},
+ basicstyle=\ttfamily,
+ keywordstyle=\color{tPrim}\bfseries,
+ commentstyle=\color{tSec},
+ stringstyle=\color{tSec},
+ backgroundcolor=\color{white},
+ numbers=none,
+ numberstyle=\tiny\ttfamily,
+ stepnumber=2,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ frame=none,
+ framerule=1pt,
+ tabsize=2,
+ rulesep=5em,
+ captionpos=b,
+ breaklines=true,
+ breakatwhitespace=false,
+ framexleftmargin=0em,
+ framexrightmargin=0em,
+ xleftmargin=0em,
+ xrightmargin=0em,
+ aboveskip=1em,
+ belowskip=1em,
+ morekeywords={\usetheme,\institute,\maketitle,\subtitle,
+ \gothamset,
+ \colorlet,\setbeamercolor,
+ plain,\defbeamertemplate
+ },
+ }
+ \lstMakeShortInline|
+
+ \usepackage{hyperref}
+
+ \setlength{\fboxsep}{0pt}%
+ \usepackage{subcaption} % for subfigures
+ \usepackage{cleveref} % for references
+
+ \providecommand{\defopt}[1]{default: #1}%{\underline{#1}}
+ \newenvironment{DescribeGothamOption}[3]{
+ \DescribeOption{#1} % from l3doc
+ \begin{minipage}[t]{\textwidth}
+ \textit{\textbf{\textcolor{tSec}{#2}}}\dotfill\,\defopt{#3}\par
+ \begingroup
+ \vspace{0.5em}
+ }{
+ \par
+ \endgroup
+ \end{minipage}
+ }
+
+
+%% =====================================================================
+\title{\textsc{Gotham}\\ A modern, minimal-ish, versatile and extendable theme for Beamer}
+\author{Romain NOEL \\ \url{romainoel@free.fr}}
+\date{\GothamVersion~---~\GothamDate}
+
+\providecommand{\themename}{\textbf{\textsc{Gotham}}\xspace}
+
+%% =====================================================================
+
+
+\begin{document}
+\maketitle
+\tableofcontents
+
+
+%% ------------------------------------
+\section{Introduction}
+ Beamer is an awesome way to make presentations with \LaTeX, but its theme selection is surprisingly sparse.
+ The stock themes share an aesthetic that can be a little cluttered, while the few distinctive custom themes available are often specialized for a particular corporate or institutional brand.
+
+ The goal of \themename is to provide a simple, modern Beamer theme suitable for anyone to use.
+ It tries to minimize noise and maximize space for content; some visual flourishes are offered as options.
+
+ The final product provides a modern, elegant and versatile theme with a high degree of customization.
+ So it can easily be used to build a particular corporate or institutional brand theme on top of it.
+
+ The implementation of this theme is strongly inspired from the excellent \href{https://github.com/matze/mtheme}{\textsc{Metropolis}} theme by Matthias Vogelgesang, from which it borrows numerous options.
+ \themename's codebase lives on
+ \href{https://gitlab.com/RomainNOEL/beamertheme-gotham} {Gitlab}.
+ \newline
+ If you have issues, find mistakes in the manual or want to help make the theme even better, please get in touch there.
+ Any feature request, issue report or merge requests are welcome.
+
+
+%% ------------------------------------
+\section{Getting Started}
+\subsection{Installing from CTAN}
+ The latest stable version of \themename is available on
+ \href{https://ctan.org/pkg/beamertheme-gotham}{CTAN} and should now be part of the usual \TeX\ distributions (\TeX\ Live, Mac\TeX\ , Mik\TeX\ ), under the name \textit{beamertheme-gotham}.
+ It means that if your distribution is kept up-to-date, the package should normally be already installed on your system.
+ If this is not the case, consider updating the packages of your Tex distribution.
+
+ For \TeX\ Live and Mac\TeX\ users, this usually means running
+ \begin{lstlisting}
+ tlmgr update --all
+ \end{lstlisting}
+ or if administrative privileges are required
+ \begin{lstlisting}
+ sudo tlmgr update --all
+ \end{lstlisting}
+
+ For Mik\TeX\ users, please refer to \href{https://miktex.org/howto/update-miktex}{the official Mik\TeX\ documentation}.
+
+
+\subsection{Installing from Gitlab}
+ If you want to use the cutting-edge development version of \themename, you can install it manually by following these steps:
+ \begin{description}
+ \item[Download the source] from
+ \href{https://gitlab.com/RomainNOEL/beamertheme-gotham}{\themename repository}
+ using |git clone| or as a
+ \href{https://gitlab.com/RomainNOEL/beamertheme-gotham/-/archive/master/beamertheme-gotham-master.zip}{zip archive}
+ of the latest development version.
+ \item[Compile the style files] by running |l3build unpack| inside the downloaded directory.
+ (Or run \LaTeX{} directly on |source/gothamtheme.ins|.)
+ \item[Move the resulting |*.sty| files] to the folder containing your presentation.
+ To use \themename with many presentations, run
+ |l3build install| or move the |*.sty| files to a folder in your \TeX{} path instead.
+ \item[Use the theme] by declaring \lstinline|\usetheme{gotham}| in the preamble of your document.
+ \end{description}
+
+ \themename uses the l3build system to offer the following installation options for advanced users:
+ \begin{description}
+ \item[|l3build unpack|] builds the theme style files.
+ \item[|l3build doc|] builds this documentation manual and the examples.
+ \item[|l3build check|] builds the theme and manual.
+ \item[|l3build clean|] removes the files generated by |l3build|.
+ \item[|l3build install|] installs the theme into your local texmf folder.
+ \item[|l3build uninstall|] removes the theme from your local texmf folder.
+ \end{description}
+
+
+% \subsection{Overleaf}
+% \themename is therefore automatically supported for new documents.
+% If you want to switch older documents to use the \themename theme, you need to \href{https://www.overleaf.com/blog/new-feature-select-your-tex-live-compiler-version}{select
+% TexLive 2021 or higher as your TeX Live version} (this may cause issues with other packages used in your presentation).
+
+% In addition to that, a template project was created and is publicly available in the \href{https://www.overleaf.com/latex/templates/gotham-beamer-theme/wjyyzvdzqkgf}{Overleaf Gallery} to bootstrap your presentation.
+
+
+%% ------------------------------------
+\subsection{A Minimal Example}
+ The following code shows a minimal example of a Beamer presentation using \themename, and the output generated is given on \cref{fig-minimal}.
+
+ \begin{lstlisting}
+ \documentclass{beamer}
+ \usetheme{gotham} % Loads Gotham theme
+ \title{A minimal example}
+ \subtitle{using Gotham theme}
+ \date{\today}
+ \author{John DOE}
+ \institute{Your university or company}
+
+ \begin{document}
+ \maketitle
+ \section{First Section}
+ \begin{frame}{First Frame}
+ Hello world !
+ \end{frame}
+ \end{document}
+ \end{lstlisting}
+
+ \begin{figure}[htp]
+ \centering
+ \fbox{\includegraphics[width=0.7\textwidth]{gotham-exampleSimple.pdf}}
+ \caption{A simple example.}
+ \label{fig-minimal}
+ \end{figure}
+
+
+\subsection{Dependencies}
+ \themename depends on the |beamer| class and the following standard packages:
+ \begin{itemize}
+ \item |tikz|
+ \item |expl3|
+ \item |xfp|
+ \item |etoolbox|
+ \item |ifxetex|
+ \item |ifluatex|
+ \end{itemize}
+
+ For best results, we recommend installing the fonts
+ \href{https://github.com/mozilla/Fira}{|Fira Sans|} and |Fira Mono| and compiling with \themename using XeLaTeX or LuaTeX.
+ These are optional dependencies; \themename is compatible with (e.g.) pdf\LaTeX\ and will fall back to standard fonts if |Fira Sans| or |Fira Mono| is not installed.
+
+ The packaged name of |Fira Sans| is |Fira Sans OT| in some Linux distributions; this case is automatically handled by \themename.
+
+
+%% ------------------------------------
+\section{Customization}
+\subsection{Package options}
+ \themename provides a number of options, which can be set using a key=value interface.
+ The primary way to set options is to provide a comma-separated list of option-value pairs when loading \themename in the preamble:
+ \begin{lstlisting}[gobble=2]
+ \usetheme[option1=value1, option2=value2, ...]{gotham}
+ \end{lstlisting}
+
+ Options can be changed at any time --- even mid-presentation ! --- with the |\gothamset| command.
+ \begin{lstlisting}[gobble=2]
+ \gothamset{option1=newvalue1, option2=newvalue2, ...}
+ \end{lstlisting}
+
+ The list of options is structured as shown in the following example.
+
+ \begin{DescribeGothamOption}{option key}
+ {list of possible values}{default}
+ A short description of the option.
+ \end{DescribeGothamOption}
+
+ As \themename implementation is heavily inspired from the excellent
+ \href{https://github.com/matze/mtheme}{\textsc{Metropolis}} theme by Matthias Vogelgesang, many of \textsc{Metropolis} options are also available in \themename.
+
+
+\subsubsection{Font theme}
+ \DescribeOption{format title}
+ % \begin{DescribeGothamOption}{format title}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{format subtitle}
+ % \begin{DescribeGothamOption}{format subtitle}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{format frametitle}
+ % \begin{DescribeGothamOption}{format frametitle}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{format framesubtitle}
+ % \begin{DescribeGothamOption}{format framesubtitle}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{format part}
+ % \begin{DescribeGothamOption}{format part}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{format section}
+ % \begin{DescribeGothamOption}{format section}
+ % {regular, lower, upper, titlecase}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{format subsection}
+ {regular, lower, upper, titlecase}{regular}
+ Individually controls the format/case of titles, subtitles, frametitle, framesubtitles, part, section and subsection titles.
+ \vspace{6em}
+ \end{DescribeGothamOption}
+
+ \DescribeOption{shape title}
+ % \begin{DescribeGothamOption}{shape title}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % \end{DescribeGothamOption}
+ \DescribeOption{shape subtitle}
+ % \begin{DescribeGothamOption}{shape subtitle}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{shape frametitle}
+ % \begin{DescribeGothamOption}{shape frametitle}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{shape framesubtitle}
+ % \begin{DescribeGothamOption}{shape framesubtitle}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{shape part}
+ % \begin{DescribeGothamOption}{shape part}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{shape section}
+ % \begin{DescribeGothamOption}{shape section}
+ % {regular, italic, smallcaps}{regular}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{shape subsection}
+ {regular, italic, smallcaps}{regular}{
+ Individually controls the shape/series of titles, subtitles, frametitle, framesubtitles, part, section and subsection titles.
+ \vspace{6em}
+ }\end{DescribeGothamOption}
+
+ \begin{figure}[htb]
+ \centering
+ \begin{subfigure}[b]{0.475\textwidth}
+ \centering
+ \includegraphics[width=\linewidth]{gotham-test-035-a.png}
+ \caption{Example of |format~frametitle=titlecase, shape~frametitle=smallcaps, format~framesubtitle= lower, shape~framesubtitle=regular|.}
+ \label{fig-035-a}
+ \end{subfigure}
+ \begin{subfigure}[b]{0.475\textwidth}
+ \centering
+ \includegraphics[width=\linewidth]{gotham-test-035-b.png}
+ \caption{Example of |format~frametitle=lower, shape~frametitle=italic, format~framesubtitle= regular, shape~framesubtitle=italic|.}
+ \label{fig-035-b}
+ \end{subfigure}
+ \caption{Examples of format and shape settings.}
+ \label{fig-035}
+ \end{figure}
+
+
+\subsubsection{Color theme}
+ The included \themename color theme is used by default, but its colors can be easily changed to suit your tastes.
+ All of the theme's styles are defined in terms of a few main colors:
+ \begin{itemize}
+ \item |colorA| The primary theme color, used for frametitle, standout and text if the appropriate options are selected.
+ \end{itemize}
+
+ An easy way to customize the theme is to redefine these colors using:
+ \begin{lstlisting}
+ \colorlet{colorPale}{gPaleYell} % BG in light/normal mode
+ \colorlet{colorDark}{gDarkBlack} % FG in light/normal mode
+ \colorlet{colorA}{gDarkTeal} % frametitle, standin.out,
+ \colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in,
+ \colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks
+ \colorlet{colorC}{gDeepYellOr} % progress bar
+ \colorlet{colorD}{gLightOrange} % alert
+ \colorlet{colorE}{gLightGreen} % example
+ \end{lstlisting}
+
+ \begin{DescribeGothamOption}{background}{light, dark, transparent}{transparent}{
+ Controls weather the color of all headings (title page, frame title, etc.) should be in black (|default|) or in a slightly darker shade of the theme color |theme|.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{colorset}
+ {red, anthracite}{anthracite}{% blue, green, orange, teal,
+ Predefined set colors (|colorA, colorB, ...|) leading to different ambiances.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{block}{native, transparent, fill}{native}{
+ Optionally adds a light grey background to block environments like |theorem| and |example|.
+ }\end{DescribeGothamOption}
+
+
+\subsubsection{Inner theme}
+ \begin{DescribeGothamOption}{title page}
+ {gotham~normal, gotham~reversed, gotham~dividedpic, gotham~splitvert, <your-name>}{gotham~normal}{
+ By setting this option you can change the title page according predefined style or even set your own template.
+ If you want to use your own template, this latter should be previously defined with:
+ \lstinline|\defbeamertemplate{title page}{<your-name>}{<your-defintion>}|.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{watermark default}
+ {on, off}{off}{
+ Enable or disable the watermark background template by default (ie. without using |\begin{frame}[watermark]|).
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{watermark template}
+ {gotham~draft, <your-name>}{gotham~draft}{
+ Set the watermark background template to use when the |watermark| option is activated (by default or locally).
+ If you want to use your own template, this latter should be previously defined with:
+ \lstinline|\defbeamertemplate{background}{watermark/<your-name>}{<your-defintion>}|.
+ }\end{DescribeGothamOption}
+
+ \DescribeOption{standin template}
+ % \begin{DescribeGothamOption}{standin template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{standout template}
+ {gotham, <your-name>}{default}{
+ Set the standin and stantout background template to use when the |standin| or |stantout| frame option is activated.
+ If you want to use your own template, this latter should be previously defined with:
+ \lstinline|\defbeamertemplate{background}{standin/<your-name>}{<your-defintion>}|.
+ }\end{DescribeGothamOption}
+
+
+ \DescribeOption{partframe default}
+ % \begin{DescribeGothamOption}{partframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{sectionframe default}
+ % \begin{DescribeGothamOption}{sectionframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{subsectionframe default}
+ % \begin{DescribeGothamOption}{subsectionframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{subsubsectionframe default}
+ {on, off}{on}{
+ Enable or disable the display of the part frame (section, subsection and subsubsection respectively) at each part (other respectively) increment.
+ \vspace{1em}
+ }\end{DescribeGothamOption}
+
+ \DescribeOption{partframe template}
+ % \begin{DescribeGothamOption}{partframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{sectionframe template}
+ % \begin{DescribeGothamOption}{sectionframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{subsectionframe~template}
+ % \begin{DescribeGothamOption}{subsectionframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{subsubsectionframe~template}
+ {gotham progressbar, gotham simple, gotham splitvert progressbar, gotham splitvert simple, gotham progressvert}{gotham progressbar}{
+ Set the frame template to use when the |part| (or |section|, |subsection|, |subsubsection| respectively) frame option is activated (ie. using |\begin{frame}[part]|).
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{part frame}{<your-name>}{<your-defintion>}|.
+ % \vspace{3em}
+ }\end{DescribeGothamOption}
+
+
+ \begin{DescribeGothamOption}{tocframe template}
+ {gotham simple, gotham bullet, <your-name>}{gotham bullet}{
+ Set the table of contents template to use when the |toc| option is activated.
+ If you want to use your own template, this latter should be previously defined with:
+ % \lstinline|
+ \begin{lstlisting}[gobble=6]
+ \defbeamertemplate{part in toc}{<your-name>}{<your-defintion>}
+ \defbeamertemplate{section in toc}{<your-name>}{<your-defintion>}
+ \defbeamertemplate{subsection in toc shaded}{<your-name>}{<your-defintion>}
+ \defbeamertemplate{subsubsection in toc shaded}{<your-name>}{<your-defintion>}
+ \defbeamertemplate{background canvas}{toc/<your-name>}{<your-definition>}
+ \defbeamertemplate{toc page}{<your-name>}{<your-defintion, set them now by exmaple>}
+ \end{lstlisting}
+ % |.
+ }\end{DescribeGothamOption}
+
+ \DescribeOption{parttocframe default}
+ % \begin{DescribeGothamOption}{parttocframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{sectiontocframe default}
+ % \begin{DescribeGothamOption}{sectiontocframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{subsectiontocframe default}
+ % \begin{DescribeGothamOption}{subsectiontocframe default}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{subsubsectiontocframe~default}
+ {on, off}{default}{
+ Enable or disable the display of the table of content frame after the part frame (section, subsection and subsubsection respectively) at each part (other respectively) increment.
+ \vspace{1em}
+ }\end{DescribeGothamOption}
+
+ \DescribeOption{parttocframe template}
+ % \begin{DescribeGothamOption}{parttocframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{sectiontocframe template}
+ % \begin{DescribeGothamOption}{sectiontocframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \DescribeOption{subsectiontocframe~template}
+ % \begin{DescribeGothamOption}{subsectiontocframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{subsubsectiontocframe~tem..}
+ {gotham simple, gotham bullet, <your-name>}{gotham bullet}{
+ Set the frame template to use when the table of contents at each new |part| (or |section|, |subsection|, |subsubsection| respectively).
+ This new frame is internally using the |tocpart| frame option to activate the frame template.
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{part frame}{<your-name>}{<your-defintion>}|.
+ % \vspace{3em}
+ }\end{DescribeGothamOption}
+
+ % \begin{figure}[h!]
+ % \begin{subfigure}[b]{0.3\textwidth}
+ % \fbox{\includegraphics[width=\textwidth]{screenshots/layout_example-04.jpg}}
+ % \caption*{plain (default)}
+ % \end{subfigure}
+ % \hspace{\fill}
+ % \begin{subfigure}[b]{0.3\textwidth}
+ % \fbox{\includegraphics[width=\textwidth]{screenshots/layout_example-05.jpg}}
+ % \caption*{style1}
+ % \end{subfigure}
+ % \hspace{\fill}
+ % \begin{subfigure}[b]{0.3\textwidth}
+ % \fbox{\includegraphics[width=\textwidth]{screenshots/layout_example-06.jpg}}
+ % \caption*{style2}
+ % \end{subfigure}
+ % \end{figure}
+
+
+\subsubsection{Outer theme}
+ \DescribeOption{sidebar~canvas~right~template}
+ % \begin{DescribeGothamOption}{subsectiontocframe template}
+ % {list of possible values}{default}{
+ % A short description of the option.
+ % }\end{DescribeGothamOption}
+ \begin{DescribeGothamOption}{sidebar~canvas~left~template}
+ {~gotham~filigrane, empty, <your-name>}{gotham~filigrane}{
+ Setting templates for left and right sidebar canvas which are activated when giving the frame option |\begin{frame}[edging]|.
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{sidebar canvas right}{default/<your-name>}{<your-defintion>}|
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{edging default}
+ {on, off}{off}{
+ The option |edging default=on| can enable the |sidebar canvas right| (and |sidebar canvas left|) templates on every frame; but it can still be turned off for specific frames when using the frame option |\begin{frame}[noedging]|.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{frametitle template}
+ {gotham~subsameline, gotham~subnewline, <your-name>}{gotham~subsameline}{
+ Option to set the frametitle template.
+ \themename{} offers one template that adds the subtitle on the same line (|gotham~subsameline|) and one that adds the subtitle on a new line (|gotham~subnewline|).
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{frametitle}{default/<your-name>}{<your-defintion>}|
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{framesubtitle template}
+ {gotham~subnewline, <your-name>}{gotham~subnewline}{
+ Setting the template to use when the subtitle is on a new line.
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{framesubtitle}{default/<your-name>}{<your-defintion>}|
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{frametitle continuation template}
+ {gotham, beamer, tot, <your-name>}{gotham}{
+ Setting the template that is used in the frametitle when a frame too long and is continued/broke into several frames (using the frame option |allowframebreaks|).
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{frametitle continuation}{default/<your-name>}{<your-defintion>}|
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{numbering}{none, framenumber, totalframenumber, appendixframenumber, pagenumber, totalpagenumber, circle}{none}{
+ Setting the template with the frame number at the bottom right of each slide.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{footer template}
+ {gotham, <your-name>}{gotham}{
+ Setting the template that appears in the footer of the frame.
+ |gotham| footer print the |shortdate| at right, the |shorttitle| in the middle and the |shortauthor| at left.
+ Since in 16/9 the height is precious, |gotham| template also offers the possibility to rotate |shortdate| and |shortauthor| so they appear on sides.
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ \lstinline|\defbeamertemplate{frame footer}{default/<your-name>}{<your-defintion>}|
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{rotateFooter default}
+ {on, off}{off}{
+ Enable or disable the |rotateFooter| frame option by default (ie. without using |\begin{frame}[rotateFooter]| on every frame).
+ If the option is activated, it can be deactivated locally using the frame option |\begin{frame}[noRotateFooter]|.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames shape}
+ {default (bullet from beamer), tick, box, gotham minibullet, gotham box, gotham minibox, <your-name>}{gotham~minibullet}{
+ Setting the shape of the mini frames to use, if the mini frame bundle refers to it (which is usually the case).
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ % \lstinline|\defbeamertemplate{frame~footer}{default/<your-name>}{<your-defintion>}|
+ \begin{lstlisting}[gobble=6]
+ \defbeamertemplate{mini frame}{<your-name>}{
+ <your-defintion>
+ }[action]{
+ \setbeamersize{mini frame size=.1cm, mini frame offset=.05cm}
+ }
+ \defbeamertemplate{mini frame in current subsection}{<your-name>}{
+ <your-defintion>
+ }
+ \end{lstlisting}
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames bundle}
+ {gotham~mini, beamer, gotham~nano <your-name>}{gotham~mini}{
+ Setting the set of symbols used in the mini frame navigation.
+ If you want to use your own template, before giving its name to this option, your template should be defined with:
+ % \lstinline|\defbeamertemplate{frame~footer}{default/<your-name>}{<your-defintion>}|
+ \begin{lstlisting}[gobble=6]
+ \defbeamertemplate{miniframe~home}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~current~slide}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~done~current~section}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~todo~current~section}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~done~other~section}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~todo~other~section}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~part}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~section~current}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~section~done}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~section~todo}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~subsection~current}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~subsection~todo}{<your-name>}{<your-def>}
+ \defbeamertemplate{miniframe~subsection~done}{<your-name>}{<your-def>}
+ \end{lstlisting}
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames compress}
+ {on, off}{on}{
+ A shortcut for the beamer option |compress| that affects the mini frames.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames nav spreading}
+ {spreading, centering, left, right}{spreading}{
+ Controls how the mini frame should spread in the navigation bar.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames nav sectioning}
+ {none, section, secsubsection}{none}{
+ Setting the |section in head/foot| template that is used on top of the mini frame navigation bar.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{mini frames nav position}
+ {none, head, foot, left, right}{none}{
+ Setting where the mini frame navigation bar should appear.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{progressbar position}
+ {none, head, frametitle, foot, circlehead, left, right}{none}{
+ Setting where the progressbar should appear.
+ The different positions are pretty obvious from their name, except for |circlehead|.
+ This latter option is putting a circular progressbar around the frametitle-logo (from frametitle template defined with gotham theme).
+ It worth noting that by doing so, the frametitle is using the command |\gothamInstituteLogoCircle| instead of |\gothamInstituteLogoSquare| which is used otherwise.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{progressbar style}
+ {rectangle, rounded box, moving circle, fixed circle}{rectangle}{
+ Setting how the progressbar should appear.
+ |rectangle| option is using sharp rectangle for the progressbar, while |rounded box| is using rounded box and adds the percentage of progression at its right.
+ |moving circle| and |fixed circle| are concerning the option |progressbar position=circle| only.
+ |moving circle| add the number of the frame in a circle moving (following) the progression of the bar, while |fixed circle| put this framenumber constantly at the right of the circular progressbar.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{progressbar advancement}
+ {tlbr, brlt}{tlbr}{
+ Defines in which direction the progressbar should evolve.
+ |tlbr| is the shortcut for: starting from the top left corner, it goes bottom then right, ie. anti-clockwise.
+ |brtl| is the shortcut for: starting from the bottom right corner, it goes top then left, ie. clockwise.
+ }\end{DescribeGothamOption}
+
+ \begin{DescribeGothamOption}{progressbar mfn}
+ {on, off}{off}{
+ Enable or disable the display of the mini frame navigation bar within the progressbar.
+ }\end{DescribeGothamOption}
+
+
+\subsection{Setup all the options}
+ \begin{lstlisting}
+ \gothamset{
+ % from font theme
+ format title, shape title,
+ format subtitle, shape subtitle,
+ format frametitle, shape frametitle,
+ format framesubtitle, shape framesubtitle,
+ format part, shape part,
+ format section, shape section,
+ format subsection, shape subsection,
+ % from color theme
+ background,
+ block,
+ colorset,
+ % from inner theme
+ title page,
+ watermark template, watermark default,
+ standout template, standin template,
+ partframe template, partframe default,
+ sectionframe template, sectionframe default,
+ subsectionframe template, subsectionframe default,
+ subsubsectionframe template, subsubsectionframe default,
+ tocframe template,
+ parttocframe template, parttocframe default,
+ sectiontocframe template, sectiontocframe default,
+ subsectiontocframe template, subsectiontocframe default,
+ %subsubsectiontocframe template, subsubsectiontocframe default,
+ % from outer theme
+ sidebar canvas right template, sidebar canvas left template,
+ edging default,
+ frametitle template, framesubtitle template, frametitle continuation template,
+ numbering,
+ rotateFooter default,
+ footer template,
+ mini frames shape, mini frames bundle, mini frames compress, mini frames nav spreading,
+ progressbar position, progressbar style, progressbar advancement, progressbar mfn,
+ }
+ \end{lstlisting}
+
+
+\subsection{Frame options}
+ Frame options are affecting the templates used on the current frame through the following syntax:
+ \begin{lstlisting}
+ \begin{frame}[option] ... \end{frame}
+ \end{lstlisting}
+ Below a description of the different frame options brought by \themename{}.
+
+ \DescribeOption{noBGC}
+ Apply an empty |background canvas| template.
+
+ \DescribeOption{watermark}
+ \DescribeOption{nowatermark}
+ Apply (with |watermark|) or deactivated (|nowatermark| when \lstinline|\gothamset{watermark default=on}| was given) the |background| template, through %\\
+ \lstinline|\defbeamertemplate{background}{watermark/<your-name>}{<your-def>}| and %\\
+ \lstinline|\gothamset{watermark template=<your-name>}|.
+
+ \DescribeOption{standout}
+ \DescribeOption{standin}
+ Apply the |standin| (and |standout| respectively) templates through the definition
+ \lstinline|\defbeamertemplate{standin}{<your-name>}{<your-def>}| and the option \lstinline|\gothamset{standin template=<your-name>}|.
+
+ \DescribeOption{toc}
+ Appy the |toc| template defined by \lstinline|\gothamset{tocframe template=<your-name>}|.
+
+ \DescribeOption{edging}
+ \DescribeOption{noedging}
+ Apply (with |edging|) or deactivated (|noedging| when \lstinline|\gothamset{edging default=on}| was given) the |sidebar canvas left| (and right respectively) template, through
+ \lstinline|\defbeamertemplate{sidebar canvas left}{default/<your-name>}{<your-def>}| (and right)
+ and the option
+ \lstinline|\gothamset{sidebar canvas left template=<your-name>}| (and right).
+
+ \DescribeOption{nologo}
+ \DescribeOption{nofootline}
+ \DescribeOption{nofooter}
+ Apply empty |logo| (and |footline|, |footer| respectively) templates.
+ This can be convenient when extra space is needed.
+ \vspace{1em}
+
+ \DescribeOption{rotateFooter}
+ \DescribeOption{noRotateFooter}
+ Enable or disable the rotation of the elements in the |footer|.
+ This can be convenient when extra space is needed in 16/9 mode especially.
+
+ \DescribeOption{part}
+ \DescribeOption{section}
+ \DescribeOption{subsec}
+ \DescribeOption{subsubsec}
+ Apply \lstinline|\usebeamertemplate{part frame}|, (|section frame|, |subsection frame| and |subsubsection frame| respectively) templates.
+ This makes more sense for internal use, but can be reused everywhere else.
+ \vspace{2em}
+
+ \DescribeOption{tocpart}
+ \DescribeOption{tocsec}
+ \DescribeOption{tocsubsec}
+ \DescribeOption{tocsubsubsec}
+ Apply \lstinline|\usebeamertemplate{toc part frame}|, (|toc section frame|, |toc subsection frame| and |toc subsubsection frame| respectively) templates.
+ This makes more for internal use, but can be reused everywhere else.
+ \vspace{1em}
+
+
+%% ------------------------------------
+\subsection{Commands for Customization}
+ \themename{} defines some commands that can be used as hooks, ie., that can be redefined when needed.
+
+ \begin{function}{\gothamInstituteLogoCircle[1][4ex]}
+ \begin{arguments}
+ \item |height| of the picture.
+ \end{arguments}
+ Command to include the circular logo of your institute in the frametitle when using \lstinline|\gothamset{progressbar position=circlehead}|.
+ For example, you redefine this command through:
+ \begin{lstlisting}[gobble=6]
+ \renewcommand{\gothamInstituteLogoCircle}[1][4ex]{
+ \includegraphics[height=#1]{<your-logo-circular>}
+ }
+ \end{lstlisting}
+ \end{function}
+
+ \begin{function}{\gothamInstituteLogoSquare[1][4ex]}
+ \begin{arguments}
+ \item |height| of the picture.
+ \end{arguments}
+ Command to include the circular logo of your institute in the frametitle.
+ For example, you redefine this command through:
+ \begin{lstlisting}[gobble=6]
+ \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{
+ \includegraphics[height=#1]{<your-logo-square>}
+ }
+ \end{lstlisting}
+ \end{function}
+
+ \begin{function}{\gothamFrameSubtitleSep}
+ Command defining the separator used between the frametitle and the subtitle.
+ \end{function}
+
+ \begin{function}{\gothamRightFiligrane, \gothamLeftFiligrane}
+ Commands that are used by default in the |sidebar canvas right| (and left).
+ This avoids the redefinition of the whole templates, especially since the |sidebar canvas right| is containing elements by default in Beamer theme (like the |logo|).
+ \end{function}
+
+
+\subsection{Color Customization}
+ The included \themename color theme is used by default, but its colors can be easily changed to suit your tastes.
+ All of the theme's styles are defined in terms of three Beamer colors:
+ \begin{itemize}
+ \item |normal text| (dark fg, light bg)
+ \item |alerted text| (colored fg, should be visible against dark or light)
+ \item |example text| (colored fg, should be visible against dark or light)
+ \end{itemize}
+
+ An easy way to customize the theme is to redefine these colors using
+ \begin{lstlisting}
+ \setbeamercolor{ ... }{ fg= ... , bg= ... }
+ \end{lstlisting}
+ in your preamble.
+ For greater customization, you can redefine any of the other stock Beamer colors.
+ In addition to the stock colors the theme defines a number of \themename specific colors, which can also be redefined to your liking.
+
+ \begin{lstlisting}
+ \setbeamercolor{progress bar}{ ... }
+ \setbeamercolor{title separator}{ ... }
+ \setbeamercolor{progress bar in head/foot}{ ... }
+ \setbeamercolor{progress bar in section page}{ ... }
+ \end{lstlisting}
+
+
+\subsection{Font Customization}
+ The default font for \themename is |Fira|.
+ This can be easily changed using the standard font selection commands of the \textsf{fontspec} package.
+ So if you prefer, for example, the \href{http://font.ubuntu.com}{|Ubuntu|} font family, just add the following two commands after loading the \themename theme.
+
+ \begin{lstlisting}
+ \setsansfont{Ubuntu}
+ \setmonofont{Ubuntu Mono}
+ \end{lstlisting}
+
+ If you are expecting to present in a large room or with an underpowered projector, you may want to change the font to a heavier weight of Fira to maximize readability.
+
+ \begin{lstlisting}
+ \setsansfont[BoldFont={Fira Sans SemiBold}]{Fira Sans Book}
+ \end{lstlisting}
+
+
+\subsubsection{Old style figures}
+ The regular \textsf{fontspec} mechanism for changing glyph appearance also applies to this theme.
+ If you want to have old style figures in the text but regular lined figures for math, you could add the following to your preamble:
+ \begin{lstlisting}
+ \usefonttheme{professionalfonts} % required for mathspec
+ \usepackage{mathspec}
+ \setsansfont[BoldFont={Fira Sans},
+ Numbers={OldStyle}]{Fira Sans Light}
+ \setmathsfont(Digits)[Numbers={Lining, Proportional}]{Fira Sans Light}
+ \end{lstlisting}
+
+
+% \subsection{Backgrounds available}
+% xx
+
+
+\subsection{Length Customization}
+ \begin{variable}{\sectionhoffset}
+ length controlling the horizontal offset of the (section title + progress bar) block.
+ Can be useful when extra stuff wants to be displayed on sides of the block.
+ The default value is 0pt.
+ \end{variable}
+
+ \begin{variable}{\sidebarRightHOffset, \sidebarLeftHOffset}
+ Length controling the horizontal and vertical offset in order to position |\gothamRightFiligrane| (respectively |\gothamLeftFiligrane|) when using the default sidebar canvas (right and left) from \themename.
+ \end{variable}
+
+ \begin{variable}{\gothamHposLeftRotFooter, \gothamHposRightRotFooter, \gothamVposLeftRotFooter, \gothamVposRightRotFooter}
+ length controlling the horizontal and vertical positioning of the left and right elements of the rotated footer.
+ \end{variable}
+
+ \begin{variable}{\gothamFootlineRuleLeftPadding}
+ length controlling the horizontal space between the left border of the page and the left side of the rule.
+ \end{variable}
+
+ \begin{variable}{\gothamFootlineRuleHeight, \gothamFootlineRuleLength}
+ Dimensions controlling the height and the length of the rule used to delimit the footer.
+ \end{variable}
+
+ \begin{variable}{\gothamProgressCircHeight, \gothamCounterCircleRadius, \gothamProgressCircBorderWidth}
+ Lengths controlling the aspect of |progress circle|.
+ |\gothamProgressCircHeight| is controlling the inner height of the circle (related to its diameter).
+ |\gothamCounterCircleRadius| is controlling the size of the counter circle containing the frame number.
+ |\gothamProgressCircBorderWidth| is controlling width of the progress circle.
+ \end{variable}
+
+ \begin{figure}[htp]
+ \centering
+ \fbox{\includegraphics[width=0.7\textwidth]{gotham-layout.pdf}}
+ \caption{The layout used by \themename.}
+ \end{figure}
+
+
+%% ------------------------------------
+\section{Tips \& Tricks}
+\subsection{Backup Slides}
+ Speakers will often include extra slides at the end of their presentation to refer to during audience questions.
+ One easy way to do this is to include the \verb|appendixnumberbeamer| package in your preamble and call \verb|\appendix| before your backup slides.
+
+ \themename will automatically turn off slide numbering for slides in the appendix.
+
+
+\subsection{Sources of inspiration}
+ Many Beamer themes have been used as sources of inspiration to build \themename{}:
+ \begin{itemize}
+ \item \url{https://github.com/matze/mtheme} for dark/light theme and standout page.
+ \item \url{https://github.com/hamaluik/Beamer-Theme-Execushares} and
+ \\ \url{https://github.com/pcafrica/focus-beamertheme} for titlepage and sectionpage.
+ \item \url{https://github.com/LukasPietzschmann/awesome-beamer} for titlepage.
+ \item \url{https://github.com/luistar/unina-beamer/tree/master} and
+ \\ \url{https://github.com/jkjaer/aauLatexTemplates/tree/master/aauBeamer/aausimple} for circlehead progress bar.
+ \item \url{https://github.com/povanberg/flux-beamer} for toc.
+ \item \url{https://github.com/fliptanedo/FlipBeamerTheme} for numbering circled fraction.
+ \item \url{https://gitlab.com/RomainNOEL/latex3_template_pkg} for LateX3 template.
+ \end{itemize}
+
+
+%% ------------------------------------
+\section{Known Issues}
+
+\subsection{Title formats}
+\label{sec:titleformats}
+ Be aware that not every font supports small caps, so the |smallcaps| or |upper| options may not work if you use a font other than |Fira Sans|.
+ In particular, the Computer Modern sans-serif typeface, which is used when \themename is compiled with pdf\LaTeX, does not have a small-caps variant.
+
+ The title format options |upper| and |smallcaps| are quite nice from an aesthetic point of view, but their use of |\MakeLowercase| and
+ |\MakeUppercase| can cause unexpected problems.
+ For example:
+ \begin{itemize}
+ \item Some commands, like |\\|, do not work inside |\MakeLowercase| and |\MakeUppercase|.
+ (See \href{https://github.com/matze/mtheme/issues/125}{\#125})
+ \item Only alphabetic characters are affected by |\MakeLowercase|, so numerals and punctuation remain at full height.
+ This can spoil some of the aesthetic benefits of |upper|.
+ (See \href{https://github.com/matze/mtheme/issues/33}{\#33})
+ \item |\MakeLowercase| and |\MakeUppercase| apply to math mode and |\scshape| does not.
+ This can easily introduce mathematical errors that are hard to catch.
+ \item It is impossible to typeset symbols which are encoded as uppercase letters in a different font.
+ In particular, |\mathbb| and |\mathcal| letters will be replaced by other math glyphs.
+ (See \href{https://github.com/matze/mtheme/issues/153}{\#153})
+ \end{itemize}
+
+ The |smallcaps| and |upper| options are safe to use if your titles contain only alphabetic characters and do not require the expansion of any macros.
+
+
+\subsection{Interactions with other color themes}
+ \themename can be used along with any other Beamer color theme, such as |crane| or |seahorse|.
+ If you wish to do this, it is usually best to include the \themename subpackages individually so the \themename color theme is never loaded.
+ This will prevent conflicts between the \themename color theme and your preferred theme.
+
+ For example, overriding the color theme as follows may not work as expected because |\usetheme{gotham}| loads the \themename color theme, which defines a relationship between the frametitle background and the primary palette of the theme.
+ Since |seahorse| assumes a different relationship between its palettes, the result is a grey, rather than periwinkle, frametitle background.
+
+ \begin{lstlisting}
+ \usetheme{gotham}
+ \usecolortheme{seahorse}
+ \end{lstlisting}
+
+ The correct colors are chosen if the \themename outer, inner, and font themes are loaded seperately:
+ \begin{lstlisting}
+ \useoutertheme{gotham}
+ \useinnertheme{gotham}
+ \usefonttheme{gotham}
+ \usecolortheme{seahorse} % or your preferred color theme
+ \end{lstlisting}
+
+ Please note that \themename may not use all the colors defined in your favourite Beamer color theme.
+ In particular, \themename does not set a background color for the title; this will cause issues when using color themes like |whale| which set a white foreground for the title.
+
+
+\subsection{Notes on second screen}
+ If you use the |[show notes on second screen]| option built into Beamer and compile with XeLaTeX, text on slides following the first section slide may be rendered in white instead of the regular color.
+ This is due to \href{http://tex.stackexchange.com/questions/288408/}{a bug} in Beamer or XeLaTeX itself.
+ You can work around it either by compiling with LuaTeX or by adding the following code to your preamble to reset the text color on each slide.
+
+ \begin{lstlisting}
+ \makeatletter
+ \def\beamer@framenotesbegin{% at beginning of slide
+ \usebeamercolor[fg]{normal text}
+ \gdef\beamer@noteitems{}%
+ \gdef\beamer@notes{}%
+ }
+ \makeatother
+ \end{lstlisting}
+
+
+\subsection{Standout frames with labels}
+ Because the |standout| frame option creates a group to restrict the colour change to a single slide, labels defined after calling |standout| will stay local to the group.
+ In other words, the following may result in a ``label undefined'' error.
+ \begin{lstlisting}
+ \begin{frame}[standout, label=conclusion]{Conclusion}
+ Awesome slide
+ \end{frame}
+ \end{lstlisting}
+
+ To fix this problem, change the order of the keys in the frame.
+ \begin{lstlisting}
+ \begin{frame}[label=conclusion, standout]{Conclusion}
+ Awesome slide
+ \end{frame}
+ \end{lstlisting}
+
+ This error can be unwittingly triggered if you export your slides from Emacs Org mode, which automatically adds labels after frame options.
+ Alex Branham \href{https://github.com/matze/mtheme/issues/203}{offers} the following solution for Org mode users, using |org-set-property|.
+
+ \begin{lstlisting}
+ * Start of a frame
+ :PROPERTIES:
+ :BEAMER_opt: label=conclusion,standout
+ :END:
+ \end{lstlisting}
+
+
+\subsection{Standout frames with Pandoc}
+ With Pandoc versions prior 1.17.2 it was not possible to create standout frames because Pandoc only supported a specific list of frame attributes thus ignoring additional attributes such as |{.standout}|.
+
+
+\subsection{Other issues}
+ \begin{itemize}
+ \item |enumitem| is not working with Beamer.
+ \end{itemize}
+
+
+\subsection*{Todo}
+ List of thing that could be improved (any volunteer welcome):
+ \begin{itemize}
+ \item Reduce the number of @ .
+ \item Rename a lot of length with gotham at the beginning of their name.
+ \item Turn internal length into \_dim.
+ \item Improve documentation.
+ \item Add a hexagonal, wavy and add lengths on the blueprint layout backgrounds.
+ \item Remove calc package (that can be replaced by xfp or just fp).
+ \item Remove colors from tests inner and outer.
+ \item Replace the |\setbeamertemplate{yy}[default/xx]| by |\__gotham_inner_set_template:nn{title~page}| or merge them because the default values in dict/template are interesting but |\__gotham_inner_set_template| are simpler.
+ \item add colorset more "blue-ish", "green-ish" ... from colorA etc.
+ \item add Gotham to lists of Awesome Beamer themes.
+ \end{itemize}
+
+
+\section{License}
+ \themename is licensed under the terms of the
+ \href{https://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
+ Attribution-ShareAlike 4.0} license.
+
+
+\end{document}
+% EoF
+
+
+% \begin{documentation}
+% \begin{macro|function|variable}{\nameMacro}
+% \begin{syntax}
+% \cs{nameMacro}\oarg{option1=value1, ...}\marg{gotham}
+% \textrm{where the options are (default marked as} \defopt{default}\textrm{):}
+% \meta{footer template} = \oarg{\defopt{gotham} \textbar ... }
+% \end{syntax}
+% Description of |nameMacro| which xxx.
+% \end{macro|function|variable}
+% \end{documentation}
+%%%%
+% \begin{implementation}
+% \begin{macro|function|variable}{\nameMacro}
+% \begin{arguments}
+% \item |width| Name of the option to add, this name should also correspond to the name of the environment followed by the suffix 'env'.
+% \end{arguments}
+% Description
+% \UnitTested % NOT FOR VARIABLES OF FUNCTIONS
+% \TestFiles{gotham-test-xxx} % NOT FOR VARIABLES
+% \begin{macrocode}
+
+% \end{macrocode}
+% \end{macro|function|variable}
+% \end{implementation}
+
+% \begin{implementation}
+% \begin{macro}{\nameMacro}
+% Description
+% \UnitTested
+% \TestFiles{gotham-test-048}
+% \begin{macrocode}
+
+% \end{macrocode}
+% \end{macro}
+% \end{implementation} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf
new file mode 100644
index 00000000000..c3056abee73
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex
new file mode 100644
index 00000000000..71bd8cf1e97
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example169transp.tex
@@ -0,0 +1,65 @@
+\documentclass[aspectratio=169, 10pt]{beamer}
+\usetheme{gotham}
+
+ \gothamset{
+ numbering= framenumber,
+ % tocframe template= gotham simple,
+ parttocframe default=off,
+ sectiontocframe default=off,
+ subsectiontocframe default=off,
+ }
+
+ \usepackage{standalone}
+ \usepackage{tikz}
+ \usepackage{pgfplots}
+ \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least)
+ \UseTblrLibrary{booktabs} % to load extra commands from booktabs
+ \usepackage{changepage}
+
+ \usepackage{appendixnumberbeamer}
+ \usepackage[scale=2]{ccicons}
+ % \usepackage{pgfplots}
+ \usepgfplotslibrary{dateplot}
+
+ \newcommand{\themename}{\textbf{\textsc{Gotham}}}
+
+
+\title[]{Gotham}
+\subtitle{A Modern, versatile and extendable theme for Beamer}
+\date[]{\today}
+\author[]{Romain NOËL}
+\institute{Center for modern beamer themes}
+% \titlegraphic{\hfill\includegraphics[height=1.5cm]{logo.pdf}}
+
+
+\begin{document}
+
+\maketitle
+
+ \begin{frame}[toc]{Table of contents}%
+ \tableofcontents%[hideallsubsections]
+ \end{frame}
+
+
+%%%%%%%%%%%%%%%%%%%%
+%%% MAINMATTER %%%
+%%%%%%%%%%%%%%%%%%%%
+\input{section-Beamer.tex}
+
+\input{section-Gotham.tex}
+
+\input{section-Conclusion.tex}
+
+
+\appendix
+
+ \begin{frame}[fragile]{Backup slides}
+ Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions.
+
+ The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides.
+
+ \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix.
+ \end{frame}
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf
new file mode 100644
index 00000000000..449e20c3270
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex
new file mode 100644
index 00000000000..af6e53c6aba
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-example43dark.tex
@@ -0,0 +1,66 @@
+\documentclass[aspectratio=43, 10pt]{beamer}
+\usetheme{gotham}
+
+ \gothamset{
+ background=dark,
+ numbering= framenumber,
+ % tocframe template= gotham simple,
+ parttocframe default=off,
+ sectiontocframe default=off,
+ subsectiontocframe default=off,
+ }
+
+ \usepackage{standalone}
+ \usepackage{tikz}
+ \usepackage{pgfplots}
+ \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least)
+ \UseTblrLibrary{booktabs} % to load extra commands from booktabs
+ \usepackage{changepage}
+
+ \usepackage{appendixnumberbeamer}
+ \usepackage[scale=2]{ccicons}
+ % \usepackage{pgfplots}
+ \usepgfplotslibrary{dateplot}
+
+ \newcommand{\themename}{\textbf{\textsc{Gotham}}}
+
+
+\title[]{Gotham}
+\subtitle{A Modern, versatile and extendable theme for Beamer}
+\date[]{\today}
+\author[]{Romain NOËL}
+\institute{Center for modern beamer themes}
+% \titlegraphic{\hfill\includegraphics[height=1.5cm]{logo.pdf}}
+
+
+\begin{document}
+
+\maketitle
+
+ \begin{frame}[toc]{Table of contents}%
+ \tableofcontents%[hideallsubsections]
+ \end{frame}
+
+
+%%%%%%%%%%%%%%%%%%%%
+%%% MAINMATTER %%%
+%%%%%%%%%%%%%%%%%%%%
+\input{section-Beamer.tex}
+
+\input{section-Gotham.tex}
+
+\input{section-Conclusion.tex}
+
+
+\appendix
+
+ \begin{frame}[fragile]{Backup slides}
+ Sometimes, it is useful to add slides at the end of your presentation to refer to during audience questions.
+
+ The best way to do this is to include \verb|\usepackage{appendixnumberbeamer}| in your preamble and call \verb|\appendix| before your backup slides.
+
+ \themename{} will automatically turn off slide numbering and progress bars for slides in the appendix.
+ \end{frame}
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf
new file mode 100644
index 00000000000..7ba8cef0e98
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.tex
new file mode 100644
index 00000000000..ae9db4f7121
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-exampleSimple.tex
@@ -0,0 +1,8 @@
+\documentclass{beamer}
+\usetheme{gotham}
+
+\begin{document}
+ \begin{frame}{Frame With a Title}
+ This is a simple frame.
+ \end{frame}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-layout.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-layout.pdf
new file mode 100644
index 00000000000..1965c272c90
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-layout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-logo.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-logo.pdf
new file mode 100644
index 00000000000..96d82f5bf33
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-safetybox.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-safetybox.pdf
new file mode 100644
index 00000000000..acb1efd917f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-safetybox.pdf
@@ -0,0 +1,70 @@
+%PDF-1.5
+%µí®û
+4 0 obj
+<< /Length 5 0 R
+ /Filter /FlateDecode
+>>
+stream
+xœ•AJ„1 …÷=Å»@cÒ¤ýÓÂ,F—âBTq3.æú¦ÿLe`DB
+IÞ—ä 8^–¥VYzoxÙ¥}¦ÎÒ›àþ7ÏŒ÷¯$d²hÁ1î’à#=>Eã56ØCVä)h|V•ªéðML { ú1]ÉŠ“šÁŒ¤´7òZ Þ©™\Zµþ 3‰UˆŠ!X¨(º³Oõ•Ä¬Ò8öÍÅÊ<NG!Wk±é¬„aÅd縶ÑZ{1v8%òêŠ9>× ÿAª‘¹#‡KÜ}0g¦¨’³œ™Ûô Óqa$
+endstream
+endobj
+5 0 obj
+ 231
+endobj
+3 0 obj
+<<
+ /ExtGState <<
+ /a0 << /CA 1 /ca 1 >>
+ >>
+>>
+endobj
+2 0 obj
+<< /Type /Page % 1
+ /Parent 1 0 R
+ /MediaBox [ 0 0 453.542999 255.117996 ]
+ /Contents 4 0 R
+ /Group <<
+ /Type /Group
+ /S /Transparency
+ /I true
+ /CS /DeviceRGB
+ >>
+ /Resources 3 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+ /Kids [ 2 0 R ]
+ /Count 1
+>>
+endobj
+6 0 obj
+<< /Producer (cairo 1.16.0 (https://cairographics.org))
+ /Creator <FEFF0049006E006B0073006300610070006500200031002E0031002E00320020002800680074007400700073003A002F002F0069006E006B00730063006100700065002E006F007200670029>
+ /CreationDate (D:20240630140843+02'00)
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+ /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f
+0000000649 00000 n
+0000000417 00000 n
+0000000345 00000 n
+0000000015 00000 n
+0000000323 00000 n
+0000000714 00000 n
+0000000997 00000 n
+trailer
+<< /Size 8
+ /Root 7 0 R
+ /Info 6 0 R
+>>
+startxref
+1049
+%%EOF
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf
new file mode 100644
index 00000000000..bbef48867ee
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.tex
new file mode 100644
index 00000000000..afedd191f9c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham-user-cmds.tex
@@ -0,0 +1,14 @@
+\documentclass{l3doc}
+\usepackage[T1]{fontenc}
+\usepackage{pdfpages}
+\usepackage{standalone}
+\providecommand{\defopt}[1]{\underline{#1}}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+\section{Package implementation for developers}
+\EnableDocumentation
+\DisableImplementation
+\DocInput{gotham.dtx}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf
new file mode 100644
index 00000000000..83effd45377
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/gotham.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Beamer.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Beamer.tex
new file mode 100644
index 00000000000..dd7a5e78fa6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Beamer.tex
@@ -0,0 +1,379 @@
+\documentclass[aspectratio=169]{beamer}
+
+ \usepackage{standalone}
+ \usepackage{tikz}
+ \usepackage{pgfplots}
+
+ \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least)
+ \UseTblrLibrary{booktabs} % to load extra commands from booktabs
+
+ \usepackage{natbib}
+\begin{filecontents*}[overwrite]{pres.bib}
+
+@article{Knuth92,
+ author = "D.E. Knuth",
+ title = "Two notes on notation",
+ journal = "Amer. Math. Monthly",
+ volume = "99",
+ year = "1992",
+ pages = "403--422",
+}
+
+@book{ConcreteMath,
+ author = "R.L. Graham and D.E. Knuth and O. Patashnik",
+ title = "Concrete mathematics",
+ publisher = "Addison-Wesley",
+ address = "Reading, MA",
+ year = "1989"
+}
+
+@unpublished{Simpson,
+ author = "H. Simpson",
+ title = "Proof of the {R}iemann {H}ypothesis",
+ note = "preprint (2003), available at \texttt{http://www.math.drofnats.edu/riemann.ps}",
+ year = "2003"
+}
+
+@incollection{Er01,
+ author = "P. Erd{\H o}s",
+ title = "A selection of problems and results in combinatorics",
+ booktitle = "Recent trends in combinatorics (Matrahaza, 1995)",
+ publisher = "Cambridge Univ. Press",
+ address = "Cambridge",
+ pages = "1--6",
+ year = "1995"
+}
+
+@article{greenwade93,
+ author = "George D. Greenwade",
+ title = "The {C}omprehensive {T}ex {A}rchive {N}etwork ({CTAN})",
+ year = "1993",
+ journal = "TUGBoat",
+ volume = "14",
+ number = "3",
+ pages = "342--351"
+}
+\end{filecontents*}
+
+\begin{document}
+
+\section{Introduction: Beamer}
+
+ % FRAME
+ \begin{frame}[fragile]{Title page}
+ The Title page is printed using the command:
+ \begin{verbatim} \maketitle\end{verbatim}
+
+ The element printed on this page are defined in the preamble by
+ \begin{verbatim}
+ \title[]{Gotham}
+ \subtitle{A Modern, versatile and extendable theme for Beamer}
+ \date[]{\today}
+ \author[]{Romain NOËL}
+ \institute{Center for modern beamer themes}
+ \titlegraphic{\hfill\includegraphics[height=1.5cm, draft]{Title_logo.pdf}}
+ \end{verbatim}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Plain Slide}
+ The usual page is printed and defined using the command:
+ \begin{verbatim}
+ \begin{frame}{Title on top of the frame}
+ contenu...
+ \end{frame }
+ \end{verbatim}
+
+ Note that the logo printed on this page are defined in the preamble by
+ \begin{verbatim}
+ \logo{\includegraphics[height=1.5cm, draft]{logo.pdf}}
+ \end{verbatim}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Sections}
+ Sections group slides of the same topic
+
+ \begin{verbatim} \section{Elements}\end{verbatim}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Typography}
+ \begin{verbatim}
+ The theme provides sensible defaults to
+ \emph{emphasize} text, \alert{accent} parts
+ or show \textbf{bold} results.
+ \end{verbatim}
+
+ \begin{center}becomes\end{center}
+
+ The theme provides sensible defaults to \emph{emphasize} text,
+ \alert{accent} parts or show \textbf{bold} results.
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Font feature test}
+ \begin{itemize}
+ \item Regular
+ \item \textit{Italic}
+ \item \textsc{Small Caps}
+ \item \textbf{Bold}
+ \item \textbf{\textit{Bold Italic}}
+ \item \textbf{\textsc{Bold Small Caps}}
+ \item \texttt{Monospace}
+ \item \texttt{\textit{Monospace Italic}}
+ \item \texttt{\textbf{Monospace Bold}}
+ \item \texttt{\textbf{\textit{Monospace Bold Italic}}}
+ \end{itemize}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Lists}
+ \begin{columns}[T,onlytextwidth]
+ \column{0.33\textwidth}
+ Items
+ \begin{itemize}
+ \item Milk \item Eggs \item Potatoes
+ \begin{itemize}
+ \item Milk \item Eggs \item Potatoes
+ \begin{itemize}
+ \item Milk
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+
+ \column{0.33\textwidth}
+ Enumerations
+ \begin{enumerate}
+ \item First, \item Second and \item Last.
+ \end{enumerate}
+
+ \column{0.33\textwidth}
+ Descriptions
+ \begin{description}
+ \item[PowerPoint] Meeh. \item[Beamer] Yeeeha.
+ \end{description}
+ \end{columns}
+
+ \vspace{2em}
+ Then, something below the columns, that be long enough to recover all the line-width.
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Animation}
+ \begin{itemize}[<+- | alert@+>]
+ \item \alert<4>{This is\only<4>{ really} important}
+ \item Now this
+ \item And now this
+ \end{itemize}
+ \end{frame}
+
+ % FRAME from https://www.edpif.org/documents/latex/intermediate/beamer/latex-int-beamer_handout.pdf
+ \begin{frame}[fragile]{Commands controlling overlay}
+ Beamer defines a bunch of commands intended to control overlays:
+ \verb$\only<...>{text}$ Throws away \verb$text$ content on slides not in \verb$<...>$
+ \verb$\onslide<...>{text}$ Same, but when hidden \verb$text$ still takes space.
+ \verb$\visible<...>{text}$ Same.
+ \verb$\uncover<...>{text}$ Same, but also handle transparency.
+ \verb$\invisible<...>{text}$ Opposite of \verb$\visible$
+ \verb$\alt<...>{text1}{text2}$ Alternates between \verb$text1$ and \verb$text2$ for\verb$ <...>$.
+ \verb$\temporal<...>{before}{inside}{after}$ Alternate between three texts depending on slide index before, inside or after the range of \verb$<...>$.
+ For the commands \verb$\only$ and \verb$\alt$ the \verb$<...>$ can also be after the text.
+ Then \verb$\only$ can be used to make commands \verb$<...>$-aware (§9.3) like in:
+ \verb$\newcommand{\myblue}{\only{\color{blue}}}$
+ \verb$\myblue<2> This text is blue only on slide 2.$
+ Finally, \verb$\only$ and \verb$\onslide$ without text argument work as toogles.
+ Much more options, described in §9.4 to 9.6
+ \end{frame}
+
+ % FRAME from https://www.edpif.org/documents/latex/intermediate/beamer/latex-int-beamer_handout.pdf
+ \begin{frame}[fragile]{Action specifications}
+ Inside \verb$<...>$ it is possible to add some action specifications
+ Action are specified after the slide range \& a | and followed by @ and the target slide or range.
+ For example one can write:
+ \verb$\item<3-|alert@4> Shown from slide 3 on, alerted on slide 4.$
+ which set the \verb$\alert$ for item 3 only in slide 4.
+ Actions can be defined for \verb$\item$, \verb$\action$, \verb$\begin{actionenv}\verb$
+ and the block environments and the possible actions are by default,
+ alert, uncover, only, visible, invisible, but other can be
+ defined by the user. See manual § 9.6.3
+ Simple example using uncover with specified transparency:
+ \begin{verbatim}
+ \setbeamercovered{transparent=30}
+ \begin{itemize}[<+-|uncover@+>]
+ \item first
+ \item second
+ \item third
+ \end{itemize}
+ \end{verbatim}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Figures}
+ \begin{figure}
+ \centering
+ \newcounter{density}
+ \setcounter{density}{20}
+ \begin{tikzpicture}
+ \def\couleur{alerted text.fg}
+ \path[coordinate] (0,0) coordinate(A)
+ ++( 90:5cm) coordinate(B)
+ ++(0:5cm) coordinate(C)
+ ++(-90:5cm) coordinate(D);
+ \draw[fill=\couleur!\thedensity] (A) -- (B) -- (C) --(D) -- cycle;
+ \foreach \x in {1,...,40}{%
+ \pgfmathsetcounter{density}{\thedensity+20}
+ \setcounter{density}{\thedensity}
+ \path[coordinate] coordinate(X) at (A){};
+ \path[coordinate] (A) -- (B) coordinate[pos=.10](A)
+ -- (C) coordinate[pos=.10](B)
+ -- (D) coordinate[pos=.10](C)
+ -- (X) coordinate[pos=.10](D);
+ \draw[fill=\couleur!\thedensity] (A)--(B)--(C)-- (D) -- cycle;
+ }
+ \end{tikzpicture}
+ \caption{Rotated square with Tikz package from
+ \href{http://www.texample.net/tikz/examples/rotated-polygons/}{texample.net}.}
+ \end{figure}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Tables}
+ \begin{table}
+ \centering
+ \caption{Largest cities in the world (source: Wikipedia)}
+ \begin{tabular}{@{} lr @{}}
+ \toprule
+ City & Population\\
+ \midrule
+ Mexico City & 20,116,842\\
+ Shanghai & 19,210,000\\
+ Peking & 15,796,450\\
+ Istanbul & 14,160,467\\
+ \bottomrule
+ \end{tabular}
+ \end{table}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Blocks}
+ Three different block environments are pre-defined.
+
+ \begin{block}{Default}
+ Block content.
+ \end{block}
+
+ \begin{alertblock}{Alert}
+ Block content.
+ \end{alertblock}
+
+ \begin{exampleblock}{Example}
+ Block content.
+ \end{exampleblock}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Math}
+ \begin{equation}
+ e = \lim_{n\to \infty} \left(1 + \frac{1}{n}\right)^n
+ \end{equation}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Line plots}
+ \begin{figure}
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[
+ width=0.9\textwidth,
+ height=6cm,
+ ]
+
+ \addplot {sin(deg(x))};
+ \addplot+[samples=100] {sin(deg(2*x))};
+
+ \end{axis}
+ \end{tikzpicture}
+ \caption{A nice sinus plot with Tikz.}
+ \end{figure}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Bar charts}
+ \begin{figure}
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[
+ ybar,
+ xlabel={Foo},
+ ylabel={Bar},
+ width=0.9\textwidth,
+ height=6cm,
+ nodes near coords,
+ nodes near coords align={vertical},
+ ]
+
+ \addplot plot coordinates {(1, 20) (2, 25) (3, 22.4) (4, 12.4)};
+ \addplot plot coordinates {(1, 18) (2, 24) (3, 23.5) (4, 13.2)};
+ \addplot plot coordinates {(1, 10) (2, 19) (3, 25) (4, 15.2)};
+
+ \legend{lorem, ipsum, dolor}
+
+ \end{axis}
+ \end{tikzpicture}
+ \caption{A nice bar chart with Tikz.}
+ \end{figure}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}{Quotes}
+ \begin{quote}
+ Veni, Vidi, Vici
+ \end{quote}
+ from Julius Caesar.
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{References}
+ Some references to showcase \verb|[allowframebreaks]| on next slide \cite{Knuth92,ConcreteMath,Simpson,Er01,greenwade93}
+ \end{frame}
+
+ % % FRAME
+ % \begin{frame}{References}
+ % \bibliography{pres}
+ % \bibliographystyle{abbrv}
+ % \end{frame}
+
+ % FRAME
+ \begin{frame}[allowframebreaks]{References}
+ \begin{thebibliography}{1}
+
+ \bibitem{Er01}
+ P.~Erd{\H o}s.
+ \newblock A selection of problems and results in combinatorics.
+ \newblock In {\em Recent trends in combinatorics (Matrahaza, 1995)}, pages 1--6. Cambridge Univ. Press, Cambridge, 1995.
+
+ \bibitem{ConcreteMath}
+ R.~Graham, D.~Knuth, and O.~Patashnik.
+ \newblock {\em Concrete mathematics}.
+ \newblock Addison-Wesley, Reading, MA, 1989.
+
+ \bibitem{greenwade93}
+ G.~D. Greenwade.
+ \newblock The {C}omprehensive {T}ex {A}rchive {N}etwork ({CTAN}).
+ \newblock {\em TUGBoat}, 14(3):342--351, 1993.
+
+ \bibitem{Knuth92}
+ D.~Knuth.
+ \newblock Two notes on notation.
+ \newblock {\em Amer. Math. Monthly}, 99:403--422, 1992.
+
+ \bibitem{Simpson}
+ H.~Simpson.
+ \newblock Proof of the {R}iemann {H}ypothesis.
+ \newblock preprint (2003), available at \texttt{http://www.math.drofnats.edu/riemann.ps}, 2003.
+
+ \end{thebibliography}
+ \end{frame}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Conclusion.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Conclusion.tex
new file mode 100644
index 00000000000..ec4c8a37de0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Conclusion.tex
@@ -0,0 +1,37 @@
+\documentclass[aspectratio=169]{beamer}
+% \usetheme{gotham}
+
+ \usepackage{appendixnumberbeamer}
+ \usepackage[scale=2]{ccicons}
+ \newcommand{\themename}{\textbf{\textsc{Gotham}}}
+
+
+\begin{document}
+
+\section{Conclusion}
+
+ \begin{frame}{Summary}
+ Get the source of this theme and the demo presentation from
+
+ \begin{center}\url{https://gitlab.com/RomainNOEL/beamertheme-gotham}\end{center}
+
+ The theme \emph{itself} is licensed under a \href{http://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons Attribution-ShareAlike 4.0 International License}.
+ \begin{center} \ccbysa \end{center}
+ \end{frame}
+
+ \begin{standoutenv}
+ \begin{frame}[fragile]
+ The final slide using the standout style with command:
+ \begin{verbatim}
+ \begin{frame}[standout]{Thank You !}
+ Questions ?
+ \end{frame }
+ \end{verbatim}
+
+ \begin{center}
+ Et voilà !
+ \end{center}
+ \end{frame}
+ \end{standoutenv}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex
new file mode 100644
index 00000000000..eb9b4bef0dd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamertheme-gotham/section-Gotham.tex
@@ -0,0 +1,398 @@
+\documentclass[aspectratio=169]{beamer}
+\usetheme{gotham}
+
+ \usepackage{standalone}
+ \usepackage{tikz}
+ \usepackage{pgfplots}
+ \usepackage{tabularray} % Typeset tabulars and arrays (contains equivalent of longtable, booktabs and dcolumn at least)
+ \UseTblrLibrary{booktabs} % to load extra commands from booktabs
+ \usepackage{changepage}
+
+ \newcommand{\themename}{\textbf{\textsc{Gotham}}}
+
+
+\begin{document}
+
+\section{Gotham Theme}
+
+ % FRAME
+ \begin{frame}[fragile]{Gotham}
+
+ The \themename{} theme is a Beamer theme with a minimal-ish visual style largely inspired by the \href{https://github.com/matze/mtheme}{\textsc{Metropolis} Beamer Theme} by Matthias Vogelgesang (and some other Beamer themes).
+
+ Yet, \themename{} is highly extendable and versatile.
+ \bigskip
+
+ First, enable the theme by classically loading it:
+
+ \begin{verbatim}
+ \documentclass{beamer}
+ \usetheme{gotham}
+ \end{verbatim}
+
+ Then, the all customization can be performed at any moment in the presentation using:
+
+ \begin{verbatim}
+ \gothamset{<option>=...}
+ \end{verbatim}
+ \end{frame}
+
+
+\subsection{Fonts}
+
+ % FRAME
+ \begin{frame}[fragile]{Gotham title formats}
+ Note, that you have to have Mozilla's \emph{Fira Sans} font and XeTeX or LuaTeX installed to enjoy this wonderful typography.
+
+ \begin{columns}[T,onlytextwidth]
+ \column{0.49\textwidth}
+ \themename{} supports 4 different title formats \verb|\gothamset{format frametitle=}|
+ \begin{itemize}
+ \item regular
+ \item \MakeLowercase{Lower}
+ \item \MakeUppercase{Upper}
+ \item \MakeTitlecase{Title Case}
+ \end{itemize}
+ \column{0.49\textwidth}
+ \themename{} supports 3 different title shape \verb|\gothamset{shape frametitle=...}|:
+ \begin{itemize}
+ \item regular
+ \item \textsc{Small caps}
+ \item \textit{italic}
+ \end{itemize}
+ \end{columns}
+
+ \vspace{2em}
+ They can either be set at once for every title type or individually.
+ \end{frame}
+
+ {
+ \gothamset{shape frametitle=smallcaps, format frametitle=titlecase}
+ % FRAME
+ \begin{frame}{Titles: Small caps and titlecase}
+ This frame uses the title format options: \texttt{shape frametitle=smallcaps, format frametitle=titlecase}.
+
+ \begin{alertblock}{Potential Problems}
+ Be aware that not every font supports small caps.
+ If for example you typeset your presentation with pdfTeX and the Computer Modern Sans Serif font, every text in small caps will be typeset with the Computer Modern Serif font instead.
+ Please refer to the documentation if you consider using it.
+
+ As a rule of thumb: just use it for plaintext-only titles.
+ \end{alertblock}
+ \end{frame}
+ }
+
+ {
+ \gothamset{format frametitle=upper, shape frametitle=italic}
+ % FRAME
+ \begin{frame}{Titles: Upper and italic}
+ This frame uses the title format options: \texttt{format frametitle=upper, shape frametitle=smallcaps}.
+
+ \begin{alertblock}{Potential problems}
+ As this title format also uses small caps you face the same problems as with the \texttt{smallcaps} title format.
+ Additionally this format can cause some other problems.
+ Please refer to the documentation if you consider using it.
+
+
+ \end{alertblock}
+ \end{frame}
+ }
+
+ {
+ \gothamset{format frametitle=lower}
+ % FRAME
+ \begin{frame}{Titles: LOWER and regular}
+ This frame uses the title format options: \texttt{format frametitle=lower, shape frametitle=regular}.
+ \end{frame}
+ }
+
+
+\subsection{Colors}
+
+ {
+ \gothamset{background=dark}
+ % FRAME
+ \begin{frame}[fragile]{Presentation style via background color}
+ The color mode (a.k.a. background color) can be changed using:
+ \begin{verbatim} \gothamset{background=dark | light | transparent} \end{verbatim}
+ \end{frame}
+ }
+
+ % FRAME
+ \begin{frame}[fragile]{Blocks}
+ Three different block environments are pre-defined and may be styled with an optional background color.
+
+ \begin{columns}[T,onlytextwidth]
+ \column{0.3\textwidth}
+ \begin{verbatim}\gothamset{
+ block=native}\end{verbatim}
+
+ \begin{block}{Default}
+ Block content.
+ \end{block}
+
+ \begin{alertblock}{Alert}
+ Block content.
+ \end{alertblock}
+
+ \begin{exampleblock}{Example}
+ Block content.
+ \end{exampleblock}
+
+ \column{0.3\textwidth}
+
+ \gothamset{block=transparent}
+ \begin{verbatim}\gothamset{
+ block=transparent}\end{verbatim}
+
+ \begin{block}{Default}
+ Block content.
+ \end{block}
+
+ \begin{alertblock}{Alert}
+ Block content.
+ \end{alertblock}
+
+ \begin{exampleblock}{Example}
+ Block content.
+ \end{exampleblock}
+
+ \column{0.3\textwidth}
+
+ \gothamset{block=fill}
+ \begin{verbatim}\gothamset{
+ block=fill}\end{verbatim}
+
+ \begin{block}{Default}
+ Block content.
+ \end{block}
+
+ \begin{alertblock}{Alert}
+ Block content.
+ \end{alertblock}
+
+ \begin{exampleblock}{Example}
+ Block content.
+ \end{exampleblock}
+
+ \end{columns}
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Color customization}
+ The colors can be changed using:
+ \begin{verbatim}
+ \colorlet{colorPale}{gPaleYell} % BG in light/normal mode
+ \colorlet{colorDark}{gDarkBlack} % FG in light/normal mode
+ \colorlet{colorA}{gDarkTeal} % frametitle, standin.out,
+ \colorlet{colorAreversed}{gLightTeal} % frametitle, standin.in,
+ \colorlet{colorB}{gMidGrey} % gray BG : progress bar, blocks
+ \colorlet{colorC}{gDeepYellOr} % progress bar
+ \colorlet{colorD}{gLightOrange} % alert
+ \colorlet{colorE}{gLightGreen} % example
+ \end{verbatim}
+ \end{frame}
+
+
+\subsection{Inner}
+
+ % FRAME
+ \begin{frame}[fragile]{Title page}
+ \themename{} offers the possibility to adapt the title page layout (printed with \verb|\maketitle| or \verb|\titlepage|).
+ This can be achieved using:
+
+ \begin{verbatim} \defbeamertemplate{title page}{your name}{your defintion}
+ \gothamset{title page= your name}\end{verbatim}
+
+ \themename{} also predefined several templates such as:
+ \verb$gotham normal | gotham splitvert | gotham dividedpic$ \verb$| gotham reversed$
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Table of contents}
+ \themename{} come with the possibility to apply different style for your table of contents (ToC) page.
+ You can define your own ToC style as it follows:
+ \begin{verbatim}
+ \defbeamertemplate{toc page}{your name}{your def}
+ \gothamset{tocframe template= your name}
+ \end{verbatim}
+ Then, referring to this template using the frame option \verb|[toc]| in your presentation:
+ \begin{verbatim}
+ \begin{frame}[toc]{Table of contents}
+ \tableofcontents%[hideallsubsections]
+ \end{frame }\end{verbatim}
+
+ Or using one of the \themename{} predefined template, such as: \verb$gotham simple | gotham bullet$
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Sections}
+ \themename{} provides a multiple options to tune sections (respectively \verb|part|, \verb|section|, \verb|subsection| and \verb|subsubsection|).
+ Thus, using the setting controls:
+
+ The section command \verb|\section{Elements}| from Beamer will appear very differently.
+ The section page will appear or disappear thanks to: \verb$\gothamset{sectionframe default=<on|off>}$, while its layout (when appearing) is controlled by:
+ \begin{verbatim}
+ \defbeamertemplate{part|sub|subsub|section frame}
+ {your name}{your def}
+ \gothamset{sectionframe template= your name}\end{verbatim}
+
+ \themename{} predefined template are: \verb$gotham progressbar | gotham simple |$ \verb$gotham splitvert progressbar |$ \verb$gotham splitvert simple | gotham progressvert$
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile]{Sections contents}
+ After the section page, you can (de)activate a page with table of contents in the section using \verb$\gothamset{sectiontocframe default=<on|off>}$, and its layout is controlled by:
+ \begin{verbatim}
+ \defbeamertemplate{toc subsection frame}{your name}{your def}
+ \gothamset{sectionframe template= your name}
+ \end{verbatim}
+
+ \themename{} predefined template are: \verb$gotham simple | gotham bullet$
+ \end{frame}
+
+ % FRAME
+ \begin{frame}[fragile, watermark]{Watermark}
+
+ With \themename{} you can locally or globally add watermark to your slides by using:
+ \begin{verbatim} \defbeamertemplate{background}{watermark/your name}{your def}
+ \gothamset{watermark template= your name}\end{verbatim}
+
+ Then, this watermark can be turn on locally using \verb|\begin{frame}[watermark]| or globally with \verb|\gothamset{watermark default= on}| .
+ \end{frame}
+
+ % FRAME
+ \begin{standinenv}
+ \begin{frame}[fragile]{Standin}
+
+ \themename{} comes with 2 environments/specials layouts named \verb|standin| and \verb|standout|.
+ These specials layouts can be used to emphasize some content or last slide\textellipsis
+
+ This layout can be turn on using \verb|\begin{frame}[standin]| or using the dedicated environment (\verb|\begin{standinenv}\begin{frame}...\end{frame}\end{standinenv}|).
+
+ Note that the background can also be tuned using:
+ \begin{verbatim} \defbeamertemplate{background canvas}{standin/name}{your def}
+ \gothamset{standin template= name}\end{verbatim}
+
+ \end{frame}
+ \end{standinenv}
+
+ % FRAME
+ \begin{frame}[fragile, standout, watermark]{Standout}
+ Here is an example of standout (working as standin), that can be combined with a watermark.
+
+ Another difference, apart the obvious color change is the font size and series.
+ \end{frame}
+
+
+\subsection{Outer}
+
+ {%
+ \setbeamertemplate{frame footer}{My custom footer}
+ % FRAME
+ \begin{frame}[fragile]{Frame footer}
+ \themename{} defines a custom Beamer template to add a text to the footer.
+ It can be set via
+ \begin{verbatim}\setbeamertemplate{frame footer}{My custom footer}\end{verbatim}
+
+ Even after redefining (or not) your frame footer template, you can locally remove it with the frame option \verb|\begin{frame}[nofooter]|.
+ \end{frame}
+ }
+
+ \title[your shorttitle]{Gotham}
+ \date[shortdate]{\today}
+ \author[your shortauthor name]{Romain NOËL}
+ % FRAME
+ \begin{frame}[fragile, rotateFooter]{rotateFooter}
+ The default footer from \themename{}, it displays the \verb|shortdate|, \verb|shorttitle| and \verb|shortauthor|.
+ So by filling these fields in your document setup, you will see them appear in your footer:
+ \begin{verbatim} \title[your shorttitle]{Your title}
+ \date[shortdate]{\today}
+ \author[your shortauthor name]{John DOE} \end{verbatim}
+
+ Since, we always need some extra space on some frames that would like to overlay a bit the footer, \themename{}'s footer offers also possibility to be put on side locally using \verb|\begin{frame}[rotateFooter]|, or globally with
+ \begin{verbatim} \gothamset{rotateFooter default=on} \end{verbatim}
+ If it has set globally, it can be deactivated locally with the frame option \verb|\begin{frame}[norotateFooter]|.
+ \end{frame}
+
+ \title[]{Gotham}
+ \date[]{\today}
+ \renewcommand{\gothamRightFiligrane}{%
+ \rotatebox{90}{gotham right filigrane pattern}
+ }
+ % FRAME
+ \begin{frame}[edging, fragile]{Edging}
+ \themename{} has two hook commands, \verb|\gothamRightFiligrane| and \verb|\gothamLeftFiligrane|, that can be redefined to customize what to display in the edgings (a.k.a. filigrane, a.k.a. sidebar).
+ As example, one could do:
+ \begin{verbatim}
+ \renewcommand{\gothamRightFiligrane}{%
+ \rotatebox{90}{gotham right filigrane pattern}
+ }\end{verbatim}
+
+ Then, to set if it should be displayed or not, globally \begin{verbatim} \gothamset{edging default=on} \end{verbatim}
+ or locally with the frame option \verb|\begin{frame}[edging]| or \verb|\begin{frame}[noedging]|.
+ \end{frame}
+
+ % FRAME
+ % \begin{nofootlineenv}
+ \begin{frame}[fragile,noedging,nofooter]{Really wide contents}
+ \begin{adjustwidth}{-2em}{-2em}
+ If you want a really wide content in your frame, you can change the size of your margin (requires \verb|\usepackage{changepage}| in your preamble).
+ You can also suppress the edging (\verb|[noedging]|) and footer (\verb|[nofooter]|) or even more radically footline (\verb|[nofootline]|).
+
+ Here is an example combining them:
+ \begin{verbatim}
+ \begin{frame}[noedging,nofootline]{extended frame}
+ \begin{adjustwidth}{-2em}{-2em}% 2em extra to the left and 2em for right margin.
+ wide content
+ \end{adjustwidth}
+ \end{frame }
+ \end{verbatim}
+ \end{adjustwidth}
+ \end{frame}
+ % \end{nofootlineenv}
+
+ {%
+ \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{%
+ \includegraphics[height=#1]{gotham-logo.pdf}
+ }
+ \logo{extra LOGO}
+ % FRAME
+ \begin{frame}[fragile]{Frametitle}
+ \framesubtitle{with a subtitle}
+ The frametile template brought by \themename{} is relatively classic: it supports \verb|\subframetitle| and frame continuation (with \verb|[allowframebreaks]|) through templates that can be tuned.
+ Nevertheless, it the frametitle template also includes a hook for your institute logo in the top right corner, leaving the command \verb|\logo{}| free for your extra logos.
+
+ So, one can have both logos using:
+ \begin{verbatim}
+ \renewcommand{\gothamInstituteLogoSquare}[1][4ex]{
+ \includegraphics[height=#1]{gotham-logo.pdf}
+ }
+ \logo{extra LOGO}
+ \end{verbatim}
+ \end{frame}
+ }
+
+ \author[]{Romain NOËL}
+ {%
+ \gothamset{progressbar position=foot, numbering= totalframenumber}
+ % FRAME
+ \begin{frame}[fragile]{Numbering and progressbar}
+
+ \themename{} theme can numbering your frames in the bottom right corner using different styles.
+ You can also decide to use a progression bar to indicate how much of your presentation remains.
+
+ The setup of numbering and progression bar can be performed through:
+ \begin{verbatim}
+ \gothamset{numbering= totalframenumber, progressbar position=foot}
+ \end{verbatim}
+
+ Numbering available options are: \verb$none | framenumber | totalframenumber | appendixframenumber | pagenumber | totalpagenumber | circle$
+
+ Progressbar position available options are: \verb$none | head | frametitle | foot | circlehead$
+ \end{frame}
+ }
+
+
+\end{document}
+%EoF \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/README.md b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/README.md
index b8501189d67..0215359b464 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/README.md
+++ b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/README.md
@@ -1,12 +1,12 @@
# beamertheme-tcolorbox
-[![GitHub](https://img.shields.io/github/license/samcarter/beamertheme-tcolorbox.svg?color=blue)](http://www.latex-project.org/lppl.txt)
-[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/samcarter/beamertheme-tcolorbox.svg?label=current%20version)](https://github.com/samcarter/beamertheme-tcolorbox/releases/latest)
-[![CTAN](https://img.shields.io/ctan/v/beamertheme-tcolorbox.svg)](https://ctan.org/pkg/beamertheme-tcolorbox)
+[![License](https://img.shields.io/github/license/samcarter/beamertheme-tcolorbox.svg?color=blue)](https://www.latex-project.org/lppl.txt)
+[![GitHub tag](https://img.shields.io/github/tag/samcarter/beamertheme-tcolorbox.svg?label=current%20version&color=blue)](https://github.com/samcarter/beamertheme-tcolorbox/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/beamertheme-tcolorbox.svg?color=blue)](https://ctan.org/pkg/beamertheme-tcolorbox)
A beamer inner theme which reproduces standard beamer blocks using tcolorboxes.
-This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt .
+This project is licensed under the LaTeX Project Public License v1.3c or later, see https://www.latex-project.org/lppl.txt .
The project repository, including a bug tracker, can be found at https://github.com/samcarter/beamertheme-tcolorbox .
diff --git a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc-settings.sty b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc-settings.sty
index 777cedba6ef..cd57229fcf4 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc-settings.sty
+++ b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc-settings.sty
@@ -21,7 +21,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{xcolor}
\definecolor{samyellow}{RGB}{246,193,65}
-\definecolor{samorange}{RGB}{241,147,45}
+\definecolor{samorange}{RGB}{241,147,45}% pgfplotsthemebeamer
\definecolor{samred}{RGB}{191,26,46}% TikZbricks
\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots
\definecolor{samviolet}{RGB}{136,46,114}% TikZlings
@@ -69,6 +69,7 @@
% \RequirePackage[scale=0.85]{cascadia-code}
% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}}
\RequirePackage{iexec}
+\usepackage{synthslant}% to fake slented comments in inconsolata
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -81,7 +82,7 @@
% smuggling custom pygmentize style in cache folder
% (a real pygmentise style would need installtion in some python folder)
-\begin{filecontents*}[noheader]{./sam.pygstyle}
+\begin{filecontents*}[noheader,overwrite]{./sam.pygstyle}
\makeatletter
\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
\let\PYG@ul=\relax \let\PYG@tc=\relax%
@@ -102,7 +103,7 @@
\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
% comments (italics won't work with the inconsolata font)
-\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}}
+\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{\textsynthslant{##1}}}}
\def\PYGZbs{\char`\\}
\def\PYGZus{\char`\_}
diff --git a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.pdf b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.pdf
index fe64e726397..a7c6c23efb6 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.pdf
+++ b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.tex b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.tex
index c17e7fc17e6..18c2daacc08 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.tex
+++ b/Master/texmf-dist/doc/latex/beamertheme-tcolorbox/beamertheme-tcolorbox-doc.tex
@@ -8,7 +8,7 @@
% https://github.com/samcarter/beamertheme-tcolorbox
%
% Released under the LaTeX Project Public License v1.3c or later
-% See http://www.latex-project.org/lppl.txt
+% See https://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% !TeX program = txs:///arara
@@ -31,7 +31,7 @@
\url{https://github.com/samcarter/beamertheme-tcolorbox}\\
\url{https://www.ctan.org/pkg/beamertheme-tcolorbox}
}{samcarter}}
-\date{Version v0.7 \textendash{} 2024/04/29}
+\date{Version v0.8 \textendash{} 2024/09/23}
\usepackage[
themecolor=samteal
@@ -53,10 +53,10 @@ Over the last decade of answering beamer problems and more recently also being o
For all these cases, there is now an alternative to the default beamer blocks: The tcolorbox inner beamer theme will replace the usual beamer mechanism to draw blocks with tcolorboxes. The tcolorboxes will automatically adopt the look and feel (round vs.\ sharp corners and shadows) as well as the colours of the normal beamer blocks.
-The package is included in \TeX{}Live and MiK\TeX\ and available from \textsc{CTAN} (\url{https://www.ctan.org/pkg/beamertheme-tcolorbox}).
+The package is included in \texlive and \miktex and available from \CTAN (\url{https://www.ctan.org/pkg/beamertheme-tcolorbox}).
The development version of this package is located at \url{https://github.com/samcarter/beamertheme-tcolorbox}. If you have any problems, ideas or other feedback, please make constructive use of the issue tracker.
-Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright} \texttt{samcarter}. Permission is granted to copy, distribute and\slash or modify this software under the terms of the LaTeX project public licence, version 1.3c or later \url{http://www.latex-project.org/lppl.txt}.
+Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright} \texttt{samcarter}. Permission is granted to copy, distribute and\slash or modify this software under the terms of the LaTeX project public licence, version 1.3c or later \url{https://www.latex-project.org/lppl.txt}.
\section{Usage}
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md
index c8b147bc812..a6d358af667 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md
@@ -46,7 +46,7 @@ UNIX-like systems:
oxnotes-trad1.cbx, oxnotes-trad2.cbx, oxnotes-trad3.cbx, oxyear.cbx,
oxnum.cbx, oxalph.cbx
- american-oxref.lbx, british-oxref.lbx, english-oxref.lbx,
- spanish-oxref.lbx
+ spanish-oxref.lbx, polish.lbx
- oxnotes.dbx, oxnotes-ibid.dbx, oxnotes-note.dbx, oxnotes-inote.dbx,
oxnotes-trad1.dbx, oxnotes-trad2.dbx, oxnotes-trad3.dbx, oxyear.dbx,
oxnum.dbx, oxalph.dbx
@@ -89,7 +89,8 @@ first two steps.
american-oxref.lbx,
british-oxref.lbx,
english-oxref.lbx,
- spanish-oxref.lbx
+ spanish-oxref.lbx,
+ polish-oxref.lbx,
oxalph.bbx,
oxalph.cbx,
oxalph.dbx,
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
index 0ce372ce9b6..464db54ffe6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
index ce581982ae6..eea2ab314c2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\ProvidesFile{oxalph-doc.tex}
[\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex}
@@ -237,18 +237,24 @@
\newcounter{elementcount}
\newcommand{\commaorandlist}[1]{%
+ % Counting up
\renewcommand*{\do}[1]{\stepcounter{elementcount}}%
\dolistloop{#1}%
\ifnumgreater{\value{elementcount}}{2}{%
- \def\finaland{, and }%
+ \def\thisfinaland{,\space and\space}%
}{%
- \def\finaland{ and }%
+ \def\thisfinaland{\space and\space}%
}%
+ % Counting back down
\renewcommand*{\do}[1]{%
- \ifnumequal{\value{elementcount}}{1}{%
- ##1%
+ \ifnumgreater{\value{elementcount}}{2}{% antipenultimate or earlier
+ ##1,\space
}{%
- \ifnumequal{\value{elementcount}}{2}{#1\finaland}{##1, }%
+ \ifnumequal{\value{elementcount}}{2}{% penultimate
+ ##1\thisfinaland
+ }{% last
+ ##1%
+ }%
}%
\addtocounter{elementcount}{-1}%
}%
@@ -256,6 +262,7 @@
\author{Alex Ball}
\listadd\thetranslators{Bruno Maltras}
+\listadd\thetranslators{Sebastian Wasiuta}
\date{\printdateTeX{\filedate}}
\begin{document}
\thispagestyle{empty}
@@ -797,9 +804,12 @@ This can be set globally or on a per-type or per-entry basis.
\section{Works in foreign languages}
-If you used a foreign language work, you might want to recommend a good translation.
+If you used a work in a different language from the one in which you are currently writing,
+you might want to recommend a good translation into the latter language.
-\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.}
+\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.
+ The localized bibstring reflects the current localization language:
+ \enquote{English translation}, \enquote{traducido espa\~nol}, and so on.}
\begin{bibexbox}
<NHR \S18.2.5*\textdagger>
@@ -821,7 +831,8 @@ Tschichold, J. (1955), \emph{Typographische Gestaltung} (Basle); Eng. trans. as
\end{Verbatim}
\end{bibexbox}
-\tip{To specify the translator up front, set the \code{relatedtype} to \code{bytranslator} instead.}
+\tip{To specify the translator up front, or to recommend a translation into a third language,
+ set the \code{relatedtype} to \code{bytranslator} instead.}
\begin{bibexbox}
<NHR \S18.2.14\textdagger>
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
index 649083bbeff..4ce50328b3c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
index 345ca43f2bc..041b921ccc6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\ProvidesFile{oxnotes-doc.tex}
[\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex}
@@ -237,18 +237,24 @@
\newcounter{elementcount}
\newcommand{\commaorandlist}[1]{%
+ % Counting up
\renewcommand*{\do}[1]{\stepcounter{elementcount}}%
\dolistloop{#1}%
\ifnumgreater{\value{elementcount}}{2}{%
- \def\finaland{, and }%
+ \def\thisfinaland{,\space and\space}%
}{%
- \def\finaland{ and }%
+ \def\thisfinaland{\space and\space}%
}%
+ % Counting back down
\renewcommand*{\do}[1]{%
- \ifnumequal{\value{elementcount}}{1}{%
- ##1%
+ \ifnumgreater{\value{elementcount}}{2}{% antipenultimate or earlier
+ ##1,\space
}{%
- \ifnumequal{\value{elementcount}}{2}{#1\finaland}{##1, }%
+ \ifnumequal{\value{elementcount}}{2}{% penultimate
+ ##1\thisfinaland
+ }{% last
+ ##1%
+ }%
}%
\addtocounter{elementcount}{-1}%
}%
@@ -256,6 +262,7 @@
\author{Alex Ball}
\listadd\thetranslators{Bruno Maltras}
+\listadd\thetranslators{Sebastian Wasiuta}
\date{\printdateTeX{\filedate}}
\begin{document}
\thispagestyle{empty}
@@ -812,9 +819,12 @@ This can be set globally or on a per-type or per-entry basis.
\section{Works in foreign languages}
-If you used a foreign language work, you might want to recommend a good translation.
+If you used a work in a different language from the one in which you are currently writing,
+you might want to recommend a good translation into the latter language.
-\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.}
+\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.
+ The localized bibstring reflects the current localization language:
+ \enquote{English translation}, \enquote{traducido espa\~nol}, and so on.}
\begin{bibexbox}
<NHR \S18.2.5*>
@@ -836,7 +846,8 @@ J. Tschichold, \emph{Typographische Gestaltung} (Basle, 1955); Eng. trans. as \e
\end{Verbatim}
\end{bibexbox}
-\tip{To specify the translator up front, set the \code{relatedtype} to \code{bytranslator} instead.}
+\tip{To specify the translator up front, or to recommend a translation into a third language,
+ set the \code{relatedtype} to \code{bytranslator} instead.}
\begin{bibexbox}
<NHR \S18.2.14>
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
index 7c8b8360de5..cde0ea096bf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
index b44ef6486dc..61fa3b5427a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\ProvidesFile{oxnum-doc.tex}
[\Version\space Numeric biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon,backref=true}{biblatex}
@@ -235,18 +235,24 @@
\newcounter{elementcount}
\newcommand{\commaorandlist}[1]{%
+ % Counting up
\renewcommand*{\do}[1]{\stepcounter{elementcount}}%
\dolistloop{#1}%
\ifnumgreater{\value{elementcount}}{2}{%
- \def\finaland{, and }%
+ \def\thisfinaland{,\space and\space}%
}{%
- \def\finaland{ and }%
+ \def\thisfinaland{\space and\space}%
}%
+ % Counting back down
\renewcommand*{\do}[1]{%
- \ifnumequal{\value{elementcount}}{1}{%
- ##1%
+ \ifnumgreater{\value{elementcount}}{2}{% antipenultimate or earlier
+ ##1,\space
}{%
- \ifnumequal{\value{elementcount}}{2}{#1\finaland}{##1, }%
+ \ifnumequal{\value{elementcount}}{2}{% penultimate
+ ##1\thisfinaland
+ }{% last
+ ##1%
+ }%
}%
\addtocounter{elementcount}{-1}%
}%
@@ -254,6 +260,7 @@
\author{Alex Ball}
\listadd\thetranslators{Bruno Maltras}
+\listadd\thetranslators{Sebastian Wasiuta}
\date{\printdateTeX{\filedate}}
\begin{document}
\thispagestyle{empty}
@@ -787,9 +794,12 @@ This can be set globally or on a per-type or per-entry basis.
\section{Works in foreign languages}
-If you used a foreign language work, you might want to recommend a good translation.
+If you used a work in a different language from the one in which you are currently writing,
+you might want to recommend a good translation into the latter language.
-\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.}
+\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.
+ The localized bibstring reflects the current localization language:
+ \enquote{English translation}, \enquote{traducido espa\~nol}, and so on.}
\begin{bibexbox}
<NHR \S18.2.5*>
@@ -811,7 +821,8 @@ J. Tschichold, \emph{Typographische Gestaltung} (Basle, 1955); Eng. trans. as \e
\end{Verbatim}
\end{bibexbox}
-\tip{To specify the translator up front, set the \code{relatedtype} to \code{bytranslator} instead.}
+\tip{To specify the translator up front, or to recommend a translation into a third language,
+ set the \code{relatedtype} to \code{bytranslator} instead.}
\begin{bibexbox}
<NHR \S18.2.14>
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
index 08147694cc8..5834fb1590e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
index 89a6515237f..61c1abb84e4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
index 8558da6387f..20648e32af1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2023/11/23 v3.2}
+\def\Version{2024/08/26 v3.3}
\ProvidesFile{oxyear-doc.tex}
[\Version\space Author-year biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex}
@@ -237,18 +237,24 @@
\newcounter{elementcount}
\newcommand{\commaorandlist}[1]{%
+ % Counting up
\renewcommand*{\do}[1]{\stepcounter{elementcount}}%
\dolistloop{#1}%
\ifnumgreater{\value{elementcount}}{2}{%
- \def\finaland{, and }%
+ \def\thisfinaland{,\space and\space}%
}{%
- \def\finaland{ and }%
+ \def\thisfinaland{\space and\space}%
}%
+ % Counting back down
\renewcommand*{\do}[1]{%
- \ifnumequal{\value{elementcount}}{1}{%
- ##1%
+ \ifnumgreater{\value{elementcount}}{2}{% antipenultimate or earlier
+ ##1,\space
}{%
- \ifnumequal{\value{elementcount}}{2}{#1\finaland}{##1, }%
+ \ifnumequal{\value{elementcount}}{2}{% penultimate
+ ##1\thisfinaland
+ }{% last
+ ##1%
+ }%
}%
\addtocounter{elementcount}{-1}%
}%
@@ -256,6 +262,7 @@
\author{Alex Ball}
\listadd\thetranslators{Bruno Maltras}
+\listadd\thetranslators{Sebastian Wasiuta}
\date{\printdateTeX{\filedate}}
\begin{document}
\thispagestyle{empty}
@@ -829,9 +836,12 @@ This can be set globally or on a per-type or per-entry basis.
\section{Works in foreign languages}
-If you used a foreign language work, you might want to recommend a good translation.
+If you used a work in a different language from the one in which you are currently writing,
+you might want to recommend a good translation into the latter language.
-\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.}
+\tip{Add the translation in \code{related}, and set \code{relatedtype} to \code{translationas}.
+ The localized bibstring reflects the current localization language:
+ \enquote{English translation}, \enquote{traducido espa\~nol}, and so on.}
\begin{bibexbox}
<NHR \S18.2.5*\textdagger>
@@ -853,7 +863,8 @@ Tschichold, J. (1955), \emph{Typographische Gestaltung} (Basle); Eng. trans. as
\end{Verbatim}
\end{bibexbox}
-\tip{To specify the translator up front, set the \code{relatedtype} to \code{bytranslator} instead.}
+\tip{To specify the translator up front, or to recommend a translation into a third language,
+ set the \code{relatedtype} to \code{bytranslator} instead.}
\begin{bibexbox}
<NHR \S18.2.14\textdagger>
diff --git a/Master/texmf-dist/doc/latex/bmstu-iu8/README.md b/Master/texmf-dist/doc/latex/bmstu-iu8/README.md
index 485014041c6..f5a699970b9 100644
--- a/Master/texmf-dist/doc/latex/bmstu-iu8/README.md
+++ b/Master/texmf-dist/doc/latex/bmstu-iu8/README.md
@@ -1,6 +1,6 @@
# IU8 package
-Version: v1.3 (released 17.08.2024).
+Version: v1.4 (released 2024/09/09).
This package consist of class file and style files for writing
reports at the IU8 department of IU faculty of BMSTU
diff --git a/Master/texmf-dist/doc/latex/bmstu-iu8/bmstu-example.pdf b/Master/texmf-dist/doc/latex/bmstu-iu8/bmstu-example.pdf
index b0d4cc2ea70..b13b2d86c84 100644
--- a/Master/texmf-dist/doc/latex/bmstu-iu8/bmstu-example.pdf
+++ b/Master/texmf-dist/doc/latex/bmstu-iu8/bmstu-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/README b/Master/texmf-dist/doc/latex/bookcover/README
index 2c4bdb2ed96..8f8354f92d2 100644
--- a/Master/texmf-dist/doc/latex/bookcover/README
+++ b/Master/texmf-dist/doc/latex/bookcover/README
@@ -1,4 +1,4 @@
-bookcover class, 2015-2024 by Tibor Tomacs
+bookcover class, 2015-2024 by Tibor Tómács
This class helps typesetting book covers and dust jackets.
@@ -17,5 +17,3 @@ Install:
- Run 'pdflatex bookcover-example1.tex' for bookcover-example1.pdf
- Run 'pdflatex bookcover-example2.tex' for bookcover-example2.pdf
- Run twice 'pdflatex bookcover.dtx' for bookcover.pdf
-
-
diff --git a/Master/texmf-dist/doc/latex/bookcover/bookcover-example1.pdf b/Master/texmf-dist/doc/latex/bookcover/bookcover-example1.pdf
index 9a0bf0a0fb4..11019bc2656 100644
--- a/Master/texmf-dist/doc/latex/bookcover/bookcover-example1.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/bookcover-example1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.pdf b/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.pdf
index 18f966373c4..6756b2720e6 100644
--- a/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.tex b/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.tex
index 1d6cbdd74fe..62729df6cd2 100644
--- a/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.tex
+++ b/Master/texmf-dist/doc/latex/bookcover/bookcover-example2.tex
@@ -32,13 +32,13 @@
% Title on the spine
\bookcovercomponent{center}{spine}{
\rotatebox[origin=c]{-90}{\large\bfseries
- ANNALES MATHEMATICAE 43.~(2020)}}
+ ANNALES MATHEMATICAE 43.~(2024)}}
% Text and picture on the front cover
\bookcovercomponent{normal}{front}[22mm,20mm,22mm,40mm]{
\centering
{\huge\bfseries ANNALES\\ MATHEMATICAE\\[13mm]}
- {\large\bfseries TOMUS 43.~(2020)}
+ {\large\bfseries TOMUS 43.~(2024)}
\vfill
\includegraphics{./figures/bookcover-pi.pdf}
\vfill
diff --git a/Master/texmf-dist/doc/latex/bookcover/bookcover.pdf b/Master/texmf-dist/doc/latex/bookcover/bookcover.pdf
index e6d0f8ee652..52a4edb3db9 100644
--- a/Master/texmf-dist/doc/latex/bookcover/bookcover.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/bookcover.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-barcode.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-barcode.pdf
index f648d9295c9..4b12b9343cc 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-barcode.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-barcode.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-description.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-description.pdf
index ee8755e38f5..618e8f93d7e 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-description.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-description.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-dustjacket.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-dustjacket.pdf
index c1caae30f78..8b0e19b7b07 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-dustjacket.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-dustjacket.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-foldingmargin.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-foldingmargin.pdf
index 1586332ed1c..51d1c35135a 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-foldingmargin.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-foldingmargin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-margins.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-margins.pdf
index 63869061705..7eff390a555 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-margins.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-margins.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-newpart.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-newpart.pdf
index 572224053d8..5afed2b9fd3 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-newpart.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-newpart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-parts.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-parts.pdf
index 648e6a338ad..0ca74582803 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-parts.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-parts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-pi.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-pi.pdf
index 5e1cad7ebc3..0ed517ed4bd 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-pi.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-pi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-ruler.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-ruler.pdf
index f987d3ee360..0ece76e890d 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-ruler.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-ruler.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-foldingmargin.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-foldingmargin.pdf
index 6eb0784e742..2740e419be4 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-foldingmargin.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-foldingmargin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-widthflaps.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-widthflaps.pdf
new file mode 100644
index 00000000000..24d93301f7b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-widthflaps.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-withoutflaps.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-withoutflaps.pdf
index 411e4f4194e..6a83cd7778c 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-withoutflaps.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-scheme-withoutflaps.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikz.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikz.pdf
index b0aef8e737f..757d537a91d 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikz.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikz.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikzclip.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikzclip.pdf
index 9c65cdb40ac..bbf211c0538 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikzclip.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-tikzclip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-trimming.pdf b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-trimming.pdf
index d2df8ec4a3a..fd4a9ccd191 100644
--- a/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-trimming.pdf
+++ b/Master/texmf-dist/doc/latex/bookcover/figures/bookcover-trimming.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/changelog/README.md b/Master/texmf-dist/doc/latex/changelog/README.md
index ab16196d1e6..6b7d2510836 100644
--- a/Master/texmf-dist/doc/latex/changelog/README.md
+++ b/Master/texmf-dist/doc/latex/changelog/README.md
@@ -2,12 +2,21 @@
[Available on CTAN as `changelog`][changelog]
-Changelogs are important. Unfortunately, there are few facilities
-for typesetting changelogs in LaTeX. `changelog` defines a `changelog`
+Changelogs are important. The `changelog` package defines a `changelog`
environment to make changelogs simple and intuitive.
Inspired by [keepachangelog.com].
+```latex
+\begin{changelog}[author=Rebecca Turner, simple, sectioncmd=\section*]
+\begin{version}[v=1.0.0, date=2018-12-28]
+ \item Cool features
+ \item Bug fixes
+\end{version}
+\shortversion{v=0.1.0, date=2018-10-25, changes=Initial beta}
+\end{changelog}
+```
+
File | Description
-----------------------------|-------------------------------
changelog.sty | The changelog package
diff --git a/Master/texmf-dist/doc/latex/changelog/changelog.pdf b/Master/texmf-dist/doc/latex/changelog/changelog.pdf
index c80cec01db6..f0e2277664b 100644
--- a/Master/texmf-dist/doc/latex/changelog/changelog.pdf
+++ b/Master/texmf-dist/doc/latex/changelog/changelog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/changelog/changelog.tex b/Master/texmf-dist/doc/latex/changelog/changelog.tex
index f4d07063509..9c949501fc6 100644
--- a/Master/texmf-dist/doc/latex/changelog/changelog.tex
+++ b/Master/texmf-dist/doc/latex/changelog/changelog.tex
@@ -30,14 +30,13 @@
\author{Rebecca Turner\thanks{\email{rbt@sent.as}}}
\title{The \cl\ Package}
-\date{2.5.0 (2023/02/16)}
+\date{2.5.1 (2024/09/17)}
\begin{document}
\maketitle
\begin{abstract}
- Changelogs are important. Unfortunately, there are few facilities
- for typesetting changelogs in \LaTeX. \cl\ defines a |changelog|
- environment to make changelogs simple and intuitive.
+ Changelogs are important. \cl\ defines a |changelog|
+ environment to make writing changelogs declarative and easy.
For rationale, read \keepachangelog.
\end{abstract}
@@ -346,15 +345,27 @@ an email} and I'll incorporate the translation into \cl's next release!
This is this package's actual changelog --- not an example!
\begin{changelog}[author=Rebecca Turner <\email{rbt@sent.as}>, section=false]
+\begin{version}[v=2.5.1, date=2024-09-17]
+\fixed
+ \item Fixed \href{https://github.com/9999years/latex-changelog/issues/13}{a
+ bug where a version with a date and no version number would display the
+ date twice}, like ``\textbf{2024-09-17} (2024-09-17)''. Now, the date will
+ correctly only be shown once.
+
+ \item Fixed a bug where a version with a version number but no date or author
+ would be indented.
+\end{version}
+
\begin{version}[v=2.5.0, date=2023-02-16]
\added
- \item Added the \cs{newchangelogsection} command to support custom
- sections.
+ \item Added the \cs{newchangelogsection} command to support custom
+ sections.
\item Added the |remark| and |remarks| keys to support custom remarks (like
``YANKED'') on versions.
\item Added the |\changelogremark| command, which renders the ``YANKED''
remark and other custom remarks.
\end{version}
+
\begin{version}[v=2.4.1, date=2023-02-14]
\changed
\item Converted the |changelog.sty| implementation to use the \ctan{expl3}
@@ -362,6 +373,7 @@ This is this package's actual changelog --- not an example!
environment. I believe \ctan{expl3} is the future of programming in
\LaTeX, despite its verbosity.
\end{version}
+
\begin{version}[v=2.4.0, date=2020-09-02,
author={cmplstofB <\https{github.com/cmplstofB}>}]
\added
diff --git a/Master/texmf-dist/doc/latex/changelog/example.pdf b/Master/texmf-dist/doc/latex/changelog/example.pdf
index 110ae72c38f..d31f6729c8c 100644
--- a/Master/texmf-dist/doc/latex/changelog/example.pdf
+++ b/Master/texmf-dist/doc/latex/changelog/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/changelog/example.tex b/Master/texmf-dist/doc/latex/changelog/example.tex
index 9db61a2ea7f..8b1557ee923 100644
--- a/Master/texmf-dist/doc/latex/changelog/example.tex
+++ b/Master/texmf-dist/doc/latex/changelog/example.tex
@@ -7,17 +7,28 @@
title=Example changelog]
\begin{version}
\critical
- \item A critical new feature
+ \item A critical new feature.
\added
- \item Really cool features
+ \item Really cool feature.
+ \item A second feature.
\end{version}
\begin{version}[date=2019-01-23, short]
- A version with only a date
+ A version with only a date.
+\end{version}
+
+\begin{version}[date=2019-01-23]
+\added
+ \item A ``full'' version with only a date.
\end{version}
\begin{version}[v=1.1.0, simple]
- \item A version with no date
+ \item A version with no date.
+\end{version}
+
+\begin{version}[v=1.1.0, author=]
+\added
+ \item A version with no date or author.
\end{version}
\begin{version}[v=1.0.3, remark=Remark, simple]
@@ -29,24 +40,24 @@
\end{version}
\begin{version}[v=1.0.1, yanked, simple]
- \item A version with a terrible bug
+ \item A version with a terrible bug.
\end{version}
\begin{version}[v=1.0.0, date=2018-10-26]
\added
- \item A cool feature
+ \item A cool feature.
\changed
- \item Some \textsc{api} detail
+ \item Some \textsc{api} detail.
\deprecated
- \item Something that was a bad idea in the first place
+ \item Something that was a bad idea in the first place.
\removed
- \item Something that was deprecated 3 versions ago
+ \item Something that was deprecated 3 versions ago.
\fixed
- \item A bug that would delete files instead of saving them
+ \item A bug that would delete files instead of saving them.
\security
- \item improved with addition of buffer bound checks
+ \item improved with addition of buffer bound checks.
\misc
- \item A change that doesn't fit into any other category
+ \item A change that doesn't fit into any other category.
\end{version}
\shortversion{v=0.1.0, date=2018-10-19,
diff --git a/Master/texmf-dist/doc/latex/circledtext/README.md b/Master/texmf-dist/doc/latex/circledtext/README.md
index 6c49b9f7cdf..d73cb720477 100644
--- a/Master/texmf-dist/doc/latex/circledtext/README.md
+++ b/Master/texmf-dist/doc/latex/circledtext/README.md
@@ -37,7 +37,7 @@ Contributing
Copyright and Licence
---------------------
- Copyright (C) 2020-2022 by Nan Geng <nangeng@nwafu.edu.cn>
+ Copyright (C) 2020-2024 by Nan Geng <nangeng@nwafu.edu.cn>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -56,5 +56,3 @@ Copyright and Licence
This package consists of circledtext.sty, circledtext.tex and README.md(this file),
and the derived files circledtext.pdf.
-
-
diff --git a/Master/texmf-dist/doc/latex/circledtext/circledtext.pdf b/Master/texmf-dist/doc/latex/circledtext/circledtext.pdf
index 63396e64fcd..bf721ce7100 100644
--- a/Master/texmf-dist/doc/latex/circledtext/circledtext.pdf
+++ b/Master/texmf-dist/doc/latex/circledtext/circledtext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circledtext/circledtext.tex b/Master/texmf-dist/doc/latex/circledtext/circledtext.tex
index 2df0d98782f..5c52cc15d4f 100644
--- a/Master/texmf-dist/doc/latex/circledtext/circledtext.tex
+++ b/Master/texmf-dist/doc/latex/circledtext/circledtext.tex
@@ -119,7 +119,7 @@
{ \__codedoc_cmd:no {#1} { #2 } }
\ExplSyntaxOff
-\def\vers{\texttt{v1.1.0} }
+\def\vers{\texttt{v1.1.1} }
\begin{document}
\title{
@@ -488,7 +488,7 @@ starred macro can create negative ``circled'' text.
a macro \tn{circledtextset} to set the format of ``circled''
text.
-\section{Inerface}
+\section{Interface}
\subsection{\cs{circledtext} macro}
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md b/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
index 671e47d76e5..4cb1551ac41 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [0.6.5] - 2024-10-05
+
+### Fixed
+
+- The locator in citation is converted to HTML-like tagged string ([#78](https://github.com/zepinglee/citeproc-lua/issues/78)).
+
+## [0.6.4] - 2024-09-15
+
+### Fixed
+
+- Refactor `processCitationCluster()` to fix unexpected nil ([#77](https://github.com/zepinglee/citeproc-lua/issues/77)).
+
+## [0.6.3] - 2024-08-28
+
+### Added
+
+- Add support for citation affixes.
+
+### Fixed
+
+- Fix `\ref` with underscore in citation affixes ([#74](https://github.com/zepinglee/citeproc-lua/issues/74)).
+
## [0.6.2] - 2024-08-21
### Added
@@ -15,14 +37,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
-- Fix note position in multiple chapters ([#72](https://github.com/zepinglee/citeproc-lua/discussions/72)).
+- Fix note position in multiple chapters ([#72](https://github.com/zepinglee/citeproc-lua/issues/72)).
- Fix incorrect locale map of UKenglish.
## [0.6.1] - 2024-08-15
### Fixed
-- Fix parsing quotation marks ([#71](https://github.com/zepinglee/citeproc-lua/discussions/71)).
+- Fix parsing quotation marks ([#71](https://github.com/zepinglee/citeproc-lua/issues/71)).
## [0.6.0] - 2024-07-31
@@ -231,7 +253,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial CTAN release.
-[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.2...HEAD
+[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.5...HEAD
+[0.6.5]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.4...v0.6.5
+[0.6.4]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.3...v0.6.4
+[0.6.3]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.2...v0.6.3
[0.6.2]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.1...v0.6.2
[0.6.1]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/zepinglee/citeproc-lua/compare/v0.5.1...v0.6.0
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
index ac336a3925f..626ce87db01 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
+++ b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
index 7522ad0664a..defd46e1d39 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
+++ b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
@@ -51,7 +51,7 @@
}%
}
-\date{2024-08-21 v0.6.2}
+\date{2024-10-05 v0.6.5}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.pdf b/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.pdf
index abccef51676..9cf5839b1e3 100644
--- a/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.pdf
+++ b/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.tex b/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.tex
index 875851d6002..cd5b6691d28 100644
--- a/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.tex
+++ b/Master/texmf-dist/doc/latex/coloredtheorem/coloredtheorem-doc.tex
@@ -40,9 +40,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% MAIN DOCUMENT
\begin{document}
- \title{The \tcthrm package {\footnotesize(v1.0.2)}}
+ \title{The \tcthrm package {\footnotesize(v1.0.4)}}
\author{João M. Lourenço\\\texttt{\small joao.lourenco@fct.unl.pt}}
- \date{March 31, 2024}
+ \date{September 15, 2024}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/commalists-tools/README.md b/Master/texmf-dist/doc/latex/commalists-tools/README.md
new file mode 100644
index 00000000000..2691841bce9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/commalists-tools/README.md
@@ -0,0 +1,6 @@
+This package provides some macros for manipulating numeral comma separated lists.
+Available tools are adding, removing, counting, testing, reversing, sorting, etc
+---------------------------------------------------------------------------------
+Author..: Cédric Pierquet
+email...: cpierquet@outlook.fr
+Licence.: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.pdf b/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.pdf
new file mode 100644
index 00000000000..8720ca502e8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.tex b/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.tex
new file mode 100644
index 00000000000..daab3e31833
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/commalists-tools/commalists-tools-doc.tex
@@ -0,0 +1,415 @@
+% !TeX TXS-program:compile = txs:///arara
+% arara: pdflatex: {shell: no, synctex: no, interaction: batchmode}
+% arara: pdflatex: {shell: no, synctex: no, interaction: batchmode}
+
+\documentclass[11pt,a4paper]{ltxdoc}
+\usepackage{bera}
+\usepackage{inconsolata}
+\usepackage[T1]{fontenc}
+\usepackage[scale=0.875]{cabin}
+\usepackage{commalists-tools}
+\usepackage{fancyvrb}
+\usepackage{fancyhdr}
+\usepackage{tabularray}
+\usepackage{fontawesome5}
+\fancyhf{}
+\renewcommand{\headrulewidth}{0pt}
+\lfoot{\sffamily\small [commalists-tools]}
+\cfoot{\sffamily\small - \thepage{} -}
+\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
+\usepackage{hologo}
+\providecommand\tikzlogo{Ti\textit{k}Z}
+\providecommand\TeXLive{\TeX{}Live\xspace}
+\let\TikZ\tikzlogo
+
+\usepackage{hyperref}
+\urlstyle{same}
+\hypersetup{pdfborder=0 0 0}
+\usepackage[margin=2cm]{geometry}
+\setlength{\parindent}{0pt}
+\def\TPversion{0.1.0}
+\def\TPdate{25/09/2024}
+\usepackage{tcolorbox}
+\usepackage{pgffor}
+\tcbuselibrary{breakable,skins,hooks,listingsutf8}
+%\usepackage{soul}
+%\sethlcolor{lightgray!25}
+
+\lstset{
+ language=[LaTeX]TeX,%
+ basicstyle=\ttfamily,%
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={commalists-tools},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\sortasclist,\sortdeslist,\addvalinlist,\removevalinlist,\boolvalinlist,\xintifvalinlist,\countvalinlist,\minoflist,\maxoflist,\meanoflist,\sumoflist,\prodoflist,\reverselist,\getvaluefromlist},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={},%
+ keywordstyle={\color{orange}}
+}
+
+\newtcblisting{DemoCode}[1]{%
+ enhanced,width=\linewidth,%
+ bicolor,size=title,%
+ colback=cyan!10!white,%
+ colbacklower=cyan!5!white,%
+ colframe=cyan!75!black,%
+ listing options={%
+ breaklines=true,%
+ breakatwhitespace=true,%
+ style=tcblatex,basicstyle=\small\ttfamily,%
+ tabsize=4,%
+ commentstyle={\itshape\color{gray}},
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={\usepackage,\includegraphics,xstring,listofitems,\readlist,\showitems,\xintFor,\xintSeq},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={euromoney},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\sortasclist,\sortdeslist,\addvalinlist,\removevalinlist,\boolvalinlist,\xintifvalinlist,\countvalinlist,\minoflist,\maxoflist,\meanoflist,\sumoflist,\prodoflist,\reverselist,\getvaluefromlist},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={},%
+ keywordstyle={\color{orange}}
+ },%
+ #1
+}
+
+\newtcbinputlisting\DemoCodeFile[1]{%
+ enhanced,width=\linewidth,%
+ bicolor,size=title,%
+ colback=lightgray!10!white,%
+ colbacklower=lightgray!5!white,%
+ colframe=lightgray!75!black,%
+ listing options={%
+ breaklines=true,%
+ breakatwhitespace=true,%
+ style=tcblatex,
+ basicstyle=\scriptsize\ttfamily,%
+ tabsize=4,%
+ commentstyle={\itshape\color{gray}},%
+ %lastline=148
+ },%
+ breakable,
+ listing only,%
+ listing file={#1}
+}
+
+\NewDocumentCommand\ShowCode{ m }{%
+ \lstinline{#1}%
+}
+
+\begin{document}
+
+\thispagestyle{empty}
+
+\begin{center}
+ \begin{minipage}{0.88\linewidth}
+ \begin{tcolorbox}[colframe=yellow,colback=yellow!15]
+ \begin{center}
+ \renewcommand{\arraystretch}{1.25}%
+ \begin{tabular}{c}
+ {\Huge \texttt{commalists-tools}}\\
+ \\
+ {\LARGE Macros for manipulating numeral} \\
+ {\LARGE comma separated lists :} \\
+ {\LARGE sorting, adding, removing, etc} \\
+ \\
+ {\small \texttt{Version \TPversion{} -- \TPdate}}
+ \end{tabular}
+ \end{center}
+ \end{tcolorbox}
+ \end{minipage}
+\end{center}
+
+\begin{center}
+ \begin{tabular}{c}
+ \texttt{Cédric Pierquet}\\
+ {\ttfamily c pierquet -- at -- outlook . fr}\\
+ \texttt{\url{https://github.com/cpierquet/commalists-tools}} \\
+ \end{tabular}
+\end{center}
+
+\hrule
+
+\vfill
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5,listing only}
+\def\mytestlist{14,10,15,11,9,10}
+\minoflist*{\mytestlist}
+\maxoflist*{14,10,15,11,9,10}
+\sortasclist*{\mytestlist}
+\meanoflist*{\mytestlist}
+\removevalinlist*{10}{\mytestlist}
+\xintifvalinlist{15}{\mytestlist}{true}{false}
+\end{tcblisting}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+\def\mytestlist{14,10,15,11,9,10}
+We consider the list : \mytestlist\par\smallskip
+The minimum value is \minoflist*{\mytestlist} and the maximum is \maxoflist*{14,10,15,11,9,10}\par\smallskip
+Ascending sorted list is \sortasclist*{\mytestlist}\par\smallskip
+Meaning value of the list is \meanoflist*{\mytestlist}\par\smallskip
+If we remove the value 10, the the list is \removevalinlist*{10}{\mytestlist}\par\smallskip
+We test if 15 is in the list : \xintifvalinlist{15}{\mytestlist}{true}{false}
+\end{tcolorbox}
+
+\vfill~
+
+%\hrule
+%
+%\medskip
+
+%\emph{%
+% The \textsf{luarandom} package do the same things, but with the obligation to compile with \hologo{LuaLaTeX}.
+%}
+%
+%\medskip
+
+\hrule
+
+\vspace*{5mm}
+
+\pagebreak
+
+\phantomsection
+
+\hypertarget{matoc}{}
+
+\tableofcontents
+
+\vspace*{5mm}
+
+%\hrule
+
+\pagebreak
+
+\section{Loading, useful packages}
+
+In order to load \texttt{randintlist}, simply use :
+
+\begin{DemoCode}{listing only}
+\usepackage{commalists-tools}
+\end{DemoCode}
+
+Loaded packages are \texttt{listofitems}, \texttt{xintexpr} and \texttt{xstring}.
+
+\smallskip
+
+The idea is to propose "reusage" of lists with \texttt{listofitems} or other commands, for example.
+
+\section{The Macros}
+
+\subsection{Global usage}
+
+Package \texttt{commalists-tools} supports (basic) manipulations on numeral comma separated lists :
+
+\begin{itemize}
+ \item sorting ;
+ \item adding values ;
+ \item removing values ;
+ \item counting values ;
+ \item mean, sum, product ;
+ \item etc
+\end{itemize}
+
+Starred versions only print the result, whereas non starred versions store the result into a macro.
+
+\medskip
+
+\hfill\textbf{All engines \TeX\ are compatible with this package.}\hfill~
+
+\subsection{The macros for calculing}
+
+\begin{DemoCode}{listing only}
+%getting min of list, only printing
+\minoflist*{list}
+%storing min of list into \macro (\resmin by default)
+\minoflist{list}[\macro]
+%getting max of list, only printing
+\maxoflist*{list}
+%storing max of list into \macro (\resmax by default)
+\maxoflist{list}[\macro]
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\minoflist*{14,10,15,11,9,10} and \maxoflist*{14,10,15,11,9,10} \\
+%storing min/max of list
+\def\mytestlist{10,14.5,20,12,8.5}
+\minoflist{\mytestlist}[\mymin]Min of list is \mymin\ \&
+\maxoflist{\mytestlist}[\mymax]Max of list is \mymax
+\end{DemoCode}
+
+\begin{DemoCode}{listing only}
+%getting mean of list, only printing
+\meanoflist*{list}
+%storing mean of list into \macro (\resmean by default)
+\meanoflist{list}[\macro]
+%getting sum of list, only printing
+\sumoflist*{list}
+%storing max of list into \macro (\ressum by default)
+\sumoflist{list}[\macro]
+%getting prod of list, only printing
+\prodoflist*{list}
+%storing max of list into \macro (\resprod by default)
+\prodoflist{list}[\macro]
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\meanoflist*{14,10,15,11,9,10} \\
+%storing
+\meanoflist{14,10,15,11,9,10}[\mymean]\mymean \\
+%only printing
+\sumoflist*{14,10,15,11,9,10} and \prodoflist*{14,10,15,11,9,10} \\
+%storing
+\sumoflist{14,10,15,11,9,10}[\mysum]\prodoflist{14,10,15,11,9,10}[\myprod]
+The sum is \mysum\ and the prod is \myprod
+\end{DemoCode}
+
+\subsection{Macros for manipulating}
+
+\begin{DemoCode}{listing only}
+%sorting (asc), only printing
+\sortasclist*{list}
+%sorting (asc) and storing (overwrite)
+\sortasclist{list}
+%sorting (des), only printing
+\sortdeslist*{list}
+%sorting (des) and storing (overwrite)
+\sortdeslist{list}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%sorting (asc), only printing
+\sortasclist*{14,10,15,11,9,10}\\
+%sorting (asc) and storing (overwrite)
+\def\tmpsortlist{14,10,15,11,9,10}
+\sortasclist{\tmpsortlist}\tmpsortlist\\
+%analysing
+\readlist*\tmpSORTlist{\tmpsortlist}
+\showitems{\tmpSORTlist}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%sorting (des), only printing
+\sortdeslist*{14,10,15,11,9,10}\\
+%sorting (asc) and storing (overwrite)
+\def\tmpsortlist{14,10,15,11,9,10}
+\sortdeslist{\tmpsortlist}\tmpsortlist\\
+%analysing
+\readlist*\tmpSORTlist{\tmpsortlist}
+\showitems{\tmpSORTlist}
+\end{DemoCode}
+
+\begin{DemoCode}{listing only}
+%adding, only printing
+\addvalinlist*{values}{list}
+%adding and storing (overwrite)
+\addvalinlist{values}{list}
+%removing, only printing
+\removevalinlist*{value}{list}
+%removing and storing (overwrite)
+\removevalinlist{value}{list}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\addvalinlist*{3}{1,2,5,6}\\
+%defining and adding
+\def\tmpaddlist{1,2,4,5,6}
+\addvalinlist{3}{\tmpaddlist}\tmpaddlist\\
+%analysing
+\readlist*\tmpADDlist{\tmpaddlist}
+\showitems{\tmpADDlist}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\removevalinlist*{3}{1,2,3,6,3,1,5,7,3}\\
+%defining and removing
+\def\tmpremlist{1,2,3,6,3,1,5,7,3}
+\removevalinlist{3}{\tmpremlist}\tmpremlist\\
+%analysing
+\readlist*\tmpREMlist{\tmpremlist}
+\showitems{\tmpREMlist}
+\end{DemoCode}
+
+\begin{DemoCode}{listing only}
+%reversing, only printing
+\reverselist*{list}
+%reversing and storing (overwrite)
+\reverselist{list}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\reverselist*{14,10,15,11,9,10}\\
+%reversing and storing
+%storing
+\reverselist{14,10,15,11,9,10}[\myreverse]\myreverse\\
+%analysing
+\readlist*\tmpREVERSElist{\myreverse}
+\showitems{\tmpREVERSElist}
+\end{DemoCode}
+
+\subsection{Macros with testing}
+
+\begin{DemoCode}{listing only}
+%testing if value is in list, with boolean result in \macro (\resisinlist by default)
+\boolvalinlist{value}{list}[\macro]
+%conditionnal test if value is in list, according to xint syntax
+\xintifvalinlist{3}{0,1,2,3}{true}{false}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%test with xint syntax
+\xintifvalinlist{-1}{0,1,2,3}{true}{false}\\
+%test with xint syntax
+\xintifvalinlist{3}{0,1,2,3}{true}{false}\\
+%boolean macro
+\def\myteslist{0,5,10,5,6,9,7,8}
+\boolvalinlist{5}{\myteslist}[\resisinlist]\resisinlist
+\end{DemoCode}
+
+\begin{DemoCode}{listing only}
+%counting value, only printing
+\countvalinlist*{value}{list}
+%counting value, with result in \macro (\rescount by default)
+\countvalinlist{value}{list}[\macro]
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%only printing
+\countvalinlist*{8}{1,2,3,4,5,6,6,7,8,8,8,9}\\
+%storing
+\def\tmpcountlist{1,2,3,4,5,6,6,7,8,8,8,9}
+\countvalinlist{6}{\tmpcountlist}[\rescountsix]\rescountsix\\
+\countvalinlist{10}{\tmpcountlist}[\rescountten]\rescountten
+\end{DemoCode}
+
+\pagebreak
+
+\section{History}
+
+\texttt{0.1.0 : Initial version}
+
+\section{The code}
+
+\DemoCodeFile{commalists-tools.sty}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/README b/Master/texmf-dist/doc/latex/cs-techrep/README
index bb3aefdd374..fbe8f9aff87 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/README
+++ b/Master/texmf-dist/doc/latex/cs-techrep/README
@@ -1,5 +1,5 @@
-----------------------------
- Version 0.2 of the cs-techrep class
+ Version 0.4 of the cs-techrep class
Christoph P. Neumann
-----------------------------
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/cs-techrep.pdf b/Master/texmf-dist/doc/latex/cs-techrep/cs-techrep.pdf
index 766e80d57b3..6374436b6c3 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/cs-techrep.pdf
+++ b/Master/texmf-dist/doc/latex/cs-techrep/cs-techrep.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_all_all.bib b/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_all_all.bib
index cc7abaec4a1..ba79c018327 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_all_all.bib
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_all_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{neumann2004sa,
author = {Neumann, Christoph P.},
title = {{Conceptional Design and Realization of a `Component Test Stand' for Measurements on Enterprise JavaBeans}},
@@ -7,6 +8,7 @@
type = {Studienarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Studienarbeit_ChristophPeterNeumann_revised/}
}
+
@Thesis{neumann2005da,
author = {Neumann, Christoph P.},
title = {{Design of an Open Framework for Optimizing the Distribution of Hardware and Software Components in Control Networks for Vehicles}},
@@ -16,6 +18,7 @@
type = {Diplomarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Diplomarbeit_ChristophPeterNeumann_original/}
}
+
@INPROCEEDINGS{MeNe04testejb,
author = {Marcus Meyerh{\"o}fer and Christoph Neumann},
title = {{TestEJB} -- A Measurement Framework for {EJBs}},
@@ -35,21 +38,20 @@
@INPROCEEDINGS{NHSL09oxdbs,
author = {Christoph P. Neumann and Stefan Hanisch and Bernhard Schiemann and
- Richard Lenz},
+ Richard Lenz},
title = {{OXDBS -- Erweiterung einer nativen XML\-/Datenbank um die Validierung
- und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
+ und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
booktitle = {Tagungsband der 54.\,GMDS\-/Jahrestagung},
year = {2009},
_pages = {271:1--271:2},
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS271},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds271.shtml},
}
-
@INPROCEEDINGS{NeWL09xdsrig,
author = {Christoph P. Neumann and Florian Wagner and Richard Lenz},
title = {{XdsRig -- Eine Open\-/Source IHE XDS Testumgebung}},
@@ -59,15 +61,14 @@
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS276},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds276.shtml},
}
-
@INPROCEEDINGS{NRDL09deus,
- author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
- title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
+ author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
+ title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd ACM Int'l Conf on Distributed Event\-/Based Systems (DEBS 2009)},
year = {2009},
_chapter = {14},
@@ -85,8 +86,8 @@
author = {Christoph P. Neumann and Richard Lenz},
title = {{alpha\-/Flow: A Document\-/based Approach to Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {569--580},
address = {Ulm, DE},
@@ -100,10 +101,10 @@
@INPROCEEDINGS{NeLe09dmps,
author = {Christoph P. Neumann and Richard Lenz},
title = {{A Light\-/Weight System Extension Supporting Document\-/based Processes
- in Healthcare}},
+ in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {557--568},
address = {Ulm, DE},
@@ -140,12 +141,13 @@
doi = {10.1145/1866480.1866502},
_isbn = {978\-/1\-/60558\-/900\-/8},
}
+
@INPROCEEDINGS{NSWL11alphaadaptive,
author = {Christoph P. Neumann and Peter K. Schwab and Andreas M. Wahl and Richard Lenz},
title = {{alpha\-/Adaptive: Evolutionary Workflow Metadata in Distributed Document\-/Oriented Process Management}},
booktitle = {Proc of the 4th Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
- on Business Process Management (BPM'11)},
+ in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
+ on Business Process Management (BPM'11)},
year = {2011},
pages = {225--236},
address = {Clermont\-/Ferrand, FR},
@@ -209,26 +211,26 @@
}
@MastersThesis{Neumann2012dissPreprint_OldBibTeX,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- type = {Dissertation},
- _type = {`Dissertation' (PhD thesis)},
- _type = {PhD thesis (`Dissertation' in Germany)},
- month = nov,
- year = 2012,
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ type = {Dissertation},
+ _type = {`Dissertation' (PhD thesis)},
+ _type = {PhD thesis (`Dissertation' in Germany)},
+ month = nov,
+ year = 2012,
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@phdthesis{Neumann2012dissPreprint,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- month = nov,
- year = 2012,
- address = {Erlangen},
- doi = {10.13140/RG.2.2.14719.79521},
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ month = nov,
+ year = 2012,
+ address = {Erlangen},
+ doi = {10.13140/RG.2.2.14719.79521},
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@INPROCEEDINGS{NeLe13adhocCoop,
@@ -244,7 +246,9 @@
_isbn = {978\-/3\-/642\-/36437\-/2},
doi = {10.1007/978-3-642-36438-9_8},
_url = {https://doi.org/10.1007/978-3-642-36438-9_8},
-}@incollection{Neumann2012lni,
+}
+
+@incollection{Neumann2012lni,
author={Christoph P. Neumann},
editor={Abraham Bernstein and Wolfgang Effelsberg and Steffen H{\"o}lldobler and Hans{-}Peter Lenhof and Klaus{-}Peter L{\"o}hr and Paul Molitor and Gustaf Neumann and R{\"u}diger Reischuk and Nicole Schweikardt and Myra Spiliopoulou and Harald St{\"o}rrle and Sabine S{\"u}sstrunk},
title={Verteiltes Dokumenten\-/orientiertes Prozessmanagement im Gesundheitswesen},
@@ -256,18 +260,19 @@
year={2012},
url={https://dl.gi.de/20.500.12116/33740}
}
+
@BOOK{Neumann2013dissBook,
- author = {Christoph P. Neumann},
- title = {{Distributed Case Handling}},
- year = 2013,
- publisher = {Verlag Dr.~Hut},
- address = {M{\"u}nchen},
- isbn = {9783843909198},
- _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
- _url = {https://d-nb.info/1033041637},
- _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
- _note = {\url{https://d-nb.info/1033041637}(DNB)},
- _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Case Handling}},
+ year = 2013,
+ publisher = {Verlag Dr.~Hut},
+ address = {M{\"u}nchen},
+ isbn = {9783843909198},
+ _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
+ _url = {https://d-nb.info/1033041637},
+ _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
+ _note = {\url{https://d-nb.info/1033041637}(DNB)},
+ _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
}
@INPROCEEDINGS{IND+09lzatav,
@@ -363,11 +368,10 @@
month=apr,
year={2024},
doi = {10.48550/arXiv.2404.02637},
- _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_X_YY_ZZZZZ},
- _url = {https://doi.org/10.48550/arXiv.2404.02637},
+ _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_2_10_28007},
+ _url2 = {https://doi.org/10.48550/arXiv.2404.02637},
_issn = {2308\-/4294},
- _pages = {AA--OO},
- note = {accepted for publication}
+ pages = {19--24}
}
@INPROCEEDINGS{ToNe11alphaprops,
@@ -425,6 +429,28 @@
_url2 = {https://www.oth-aw.de/files/oth-aw/Aktuelles/Veroeffentlichungen/Forschungsbericht/OTH_Forschungsbericht_2024.pdf},
_url3 = {https://www.researchgate.net/profile/Christoph-Neumann-8/publication/379109359_Analyse_von_Methoden_zur_Sicherung_der_Vertraulichkeit_in_Neuronalen_Netzen/links/65faff43a4857c7962654c5c/Analyse-von-Methoden-zur-Sicherung-der-Vertraulichkeit-in-Neuronalen-Netzen.pdf}
}
+
+@MISC{StNe24kosmosis,
+ title={The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention},
+ author={Philipp Stangl and Christoph P. Neumann},
+ year={2024},
+ eprint={2405.19762},
+ archivePrefix={arXiv},
+ primaryClass={cs.CR}
+}
+
+@TECHREPORT{StNe24kosmosis-TR,
+ author = {Philipp Stangl and Christoph P. Neumann},
+ title = {{The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab at the Department of Electrical Engineering, Media and Computer Science},
+ series = {Technischer Bericht},
+ number = {CL-2024-01},
+ year = 2024,
+ month = 2,
+ doi = {10.48550/arXiv.2405.19762},
+ _url = {https://doi.org/10.48550/arXiv.2405.19762},
+}
+
@TECHREPORT{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard,
author = {Tobias Bauer and Albert Hahn and Lukas Kleinlein and Nicolas Proske and Leonard W{\"o}llmer and Andrei Trukhin and Christoph P. Neumann},
title = {{Covidash: Eine MEAN\-/Variation-basierte Webanwendung für Inzidenz\-/Zahlen und Impffortschritt in Deutschland}},
@@ -543,7 +569,6 @@
_url = {https://dx.doi.org/10.13140/RG.2.2.33933.31209},
}
-
@TECHREPORT{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline,
author = {André Kestler and Antonio Vidos and Marcus Haberl and Tobias Dobmeier and Tobias Lettner and Tobias Weiß and Christoph P. Neumann},
title = {{Computer Vision Pipeline: Eine React- und Flask\-/basierte Webanwendung zur No\-/Code\-/Bildverarbeitung mit Cloud\-/Deployment}},
@@ -622,4 +647,107 @@
doi = {10.13140/RG.2.2.22177.79209},
_url = {https://dx.doi.org/10.13140/RG.2.2.22177.79209},
}
+@TECHREPORT{ModA-TR-2024SS-CCT-TeamGruen-CloudDice,
+ author = {Lukas Rupp and Franziska Rubenbauer and Christoph P. Neumann},
+ title = {{CloudDice: Ein React\-/basiertes Kniffel-Würfelspiel}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ series = {Technische Berichte},
+ number = {CL-2024-14},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.11229.83686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.11229.83686},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue,
+ author = {Fabian Heindl and Paul Brand and Daniel Reichert and Christoph P. Neumann},
+ title = {{SkillIssue: A MERN\-/based Low\-/Latency Multi\-/User Game for Displaying True Skill With Your Friends}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-12},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.32201.35686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.32201.35686},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru,
+ author = {Bernhard Gailer and Timo Gräf and Maria Lyoteva and Tsvetan Stanchev and Apporva Bhoir and Christoph P. Neumann},
+ title = {{GoalGuru: A React- and FastAPI\-/based Cloud Application for Predicting Soccer Games Outcome}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-11},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.18779.58407},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.18779.58407},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect,
+ author = {Sebastian Weidner and Jonas Hermann and Nils Bayerl and Dominik Schwagerl and \ Timon Spichtinger and Christoph P. Neumann},
+ title = {{InfluenzaConnect: Eine React- und Flask\-/basierte Webanwendung für Influencer\-/Marketing}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-10},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.25490.47041},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.25490.47041},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGruen-NanoVend,
+ author = {Lukas Hirsch and Johannes Küffner and Denis Tomazi and Christoph P. Neumann},
+ title = {{NanoVend: Ein Cloud\-/native E-Commerce\-/Backend als Baukasten für mittelständische Unternehmen}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-08},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.12068.69761},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.12068.69761},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamRot-StockSentinel,
+ author = {Andreas Hecht and Linus Heise and Oliver Kneidl and Eva-Maria Maurer and Christoph P. Neumann},
+ title = {{StockSentinel: AI\-/Powered Web Tool for Analyzing the Markets Perception of Stocks}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-07},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.20457.30564},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.20457.30564},
+}
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan,
+ author = {Amos Asmerom and Daniel Reichert and Fabian Heindl and Christoph P. Neumann},
+ title = {{Connect4IfYouCan: A MERN\-/based Web Game for Competitive Two Player Matches}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-06},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.27168.19200},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.27168.19200},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens,
+ author = {Viktor Hense and Johannes Lindner and Lukas Mrosek and Christoph P. Neumann},
+ title = {{Geodingens: A Web Application for Intuitive and User\-/friendly Work with Geopandas}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-04},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.13746.41929},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.13746.41929},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch,
+ author = {Juliana Kühn and Nikolett Rácz and Raffael Friedl and Maximilian Lippmann and Christoph P. Neumann},
+ title = {{MunchMunch: Eine MERN\-/basierte kulinarische Web-Anwendung für verbessertes User Engagement beim Entdecken neuer Gerichte und Rezepte}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-02},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.23812.74883},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.23812.74883},
+}
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_supervised_all.bib b/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_supervised_all.bib
index d4341f790cd..910906ac9a0 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_supervised_all.bib
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/cpn_supervised_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{kampf2012bt,
author = {Kampf, Marvin},
title = {{alpha\-/CDM: Konzeption und Implementierung eines Modells zur Inhaltsabh{\"a}ngigkeit als Baustein einer Prozessunterst{\"u}tzung auf Basis von aktiven Dokumenten}},
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.pdf b/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.pdf
index ca478d3d61e..c0c516b25b4 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.pdf
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.tex b/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.tex
index 1ae583aed03..5dc34ceb3f4 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.tex
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/cs-techrep-example-neumann.tex
@@ -1,7 +1,8 @@
+\PassOptionsToPackage{type=CC,modifier=by,version=4.0}{doclicense}
\documentclass[conference,a4paper,flushend]{cs-techrep}
\pdfoutput=1 % pdflatex hint for arxiv.org (within first 5 lines)
-% Class iaria.cls loads biblatex / biber with predefined options
+% Class cs-techrep.cls loads biblatex / biber with predefined options
\addbibresource{embedded.bib} % its content is declared below, embedded within this tex-file
\addbibresource{webdev_commons.bib} % includes REST, React, Angular, Vue, Svelte, Docker, AWS-*, Socket.IO, and many more!
\addbibresource{cpn_all_all.bib} % includes all previous CyberLytics@OTH-AW technical reports
@@ -17,7 +18,7 @@
%\cstechrepAuthorListBib{Vorname1 Nachname1 and Vorname2 Nachname2 and Vorname3 Nachname3 and Vorname4 Nachname4 and Vorname5 Nachname5 and Vorname6 Nachname6 and Christoph P. Neumann}
% Capitalization: https://capitalizemytitle.com/style/Chicago/
-\cstechrepTitleTex{The cs-techrep Example of a Technical Report in Computer Science and Software Engineering}
+\cstechrepTitleTex{The cs-techrep Paper Example of a Technical Report in Computer Science or Software Engineering}
% IF you need manual linebreaks in the titel, then clone the title without linebreaks for BibTeX:
\cstechrepTitleBib{{\cstechrepTitleTex}}
%\cstechrepTitleBib{The cs-techrep \LaTeX{} Class Example of a Software Engineering Technical Report}
@@ -27,11 +28,11 @@
\cstechrepInstitution{Ostbayerische Technische Hochschule Amberg\-/Weiden}
\cstechrepAddress{Amberg, Germany}
%\cstechrepAddress{Amberg, Deutschland} % DE
-\cstechrepSeries{Technical Reports}
-%\cstechrepSeries{Technische Berichte} % DE
-\cstechrepYear{2024}
-\cstechrepMonth{3}
-\cstechrepNumber{CL-\cstechrepYear{}-42}
+\cstechrepType{Technical Report}
+%\cstechrepType{Technischer Bericht} % DE
+\cstechrepYear{2024} % CTAN
+\cstechrepMonth{9} % CTAN
+\cstechrepNumber{CL-TR-\cstechrepYear{}-99}
\cstechrepLang{english} % en-US
%\cstechrepLang{ngerman} % DE
@@ -47,7 +48,7 @@
author = {|cstechrepAuthorListBib},
title = {\cstechrepTitleBib},
institution = {\cstechrepInstitution, \cstechrepDepartment},
- series = {\cstechrepSeries},
+ type = {\cstechrepType},
number = {\cstechrepNumber},
year = {|cstechrepYear},
month = {|cstechrepMonth},
@@ -123,7 +124,7 @@
\maketitle
\begin{abstract}
-\lipsum[1][3-10]
+\lipsum[11]%[3-10]
\{\,\faWarning{}The abstract does neither mention a teaching module nor a team/project,
it is a summary of the content of the technical report, thus, the objectives and architecture.\}
\end{abstract}
@@ -146,7 +147,7 @@ The pipe symbol \textquote{\textbar{}} in the headings represents alternatives.
The problem statement needs to be written from perspective of a subject-matter expert (\textquote{Fachkonzept}). Like an elevator pitch / mission statement \faWarning{}. NOT from a technical perspective.
\section{Optional: Related Work \textbar{} State of the Art \textbar{} Methods \textbar{} Data Acquisition}
-\lipsum[2]
+\lipsum[12]
\section{Architectural Goals} % \textbar{} \textquote{Architekturziele}}
Provides
@@ -169,13 +170,13 @@ In discussions concerning multi-tier architecture, the term \textquote{layer} is
\subsection{Presentation Tier \textbar{} Frontend}
-\lipsum[3]
+\lipsum[13]
\subsection{Application Tier \textbar{} Backend \textbar{} \textquote{Anwendungskern}}
-\lipsum[4]
+\lipsum[14]
\subsection{Data Tier \textbar{} Persistence}
-\lipsum[5]
+\lipsum[15]
\subsection{Optional: Infrastructure and Deployment \textbar{} Distribution Perspective \textbar{} \textquote{Verteilungssicht}}
Provides (1) information about configuration, exact software versions, SBOM, DevOps, Cloud, AWS, and others.
@@ -184,51 +185,54 @@ Could include (3) a software bill of materials (SBOM), at least for the major li
\section{Discussion \textbar{} Evaluation \textbar{} \\ Lessons Learned \textbar{} Impediments}
-\lipsum[6]
+\lipsum[16]
\section{Conclusion and Future Work \textbar{} \\ \textquote{Fazit und Ausblick}}
-\lipsum[7]
+\lipsum[17]
-
-%%% Advisor
-\nocite{StNe23foodfresh}
-
-%%% First-Author
+%%% CPN Peer-Rev'd
+\nocite{LeNe24vocattllm} % Co
+\nocite{PANP23seccloudfogai} % Co
+\nocite{StNe23foodfresh} % Advisor
\nocite{NeLe13adhocCoop}
\nocite{Neumann2012lni}
\nocite{NeLe12alphaFlow}
\nocite{NeHL12hydra}
\nocite{NeWL12offsync}
+\nocite{WaNe12alphaoffsync} % Co
\nocite{NSWL11alphaadaptive}
+\nocite{ToNe11alphaprops} % Co
+\nocite{JBN+10fcmdb} % Co
+\nocite{FDI+10esmmog} % Co
\nocite{NeFL10oxdbs}
\nocite{NeLe10alphaUC}
+\nocite{ILN+09semrttx} % Co
+\nocite{NHSL09oxdbs} % DE
\nocite{NeLe09alphaflow}
\nocite{NeLe09dmps}
-\nocite{NHSL09oxdbs} % DE
\nocite{NeWL09xdsrig} % DE
\nocite{NRDL09deus}
+\nocite{IND+09lzatav} % Co (DE)
+\nocite{MeNe04testejb} % Pseudo-Co
-%%% Co-Authorship
-\nocite{LeNe24vocattllm}
-\nocite{PANP23seccloudfogai}
-\nocite{WaNe12alphaoffsync}
-\nocite{ToNe11alphaprops}
-\nocite{FDI+10esmmog}
-\nocite{JBN+10fcmdb}
-\nocite{ILN+09semrttx}
-\nocite{IND+09lzatav} % DE
-\nocite{MeNe04testejb}
-
-%%% Monographic Work
+%%% CPN Monographic Work
\nocite{Neumann2013dissBook}
\nocite{Neumann2012dissPreprint}
\nocite{neumann2005da}
\nocite{neumann2004sa}
%%% TechRep / Non-Peer-Reviewed
-
+\nocite{ModA-TR-2024SS-CCT-TeamGruen-CloudDice}
+\nocite{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue}
+\nocite{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru}
+\nocite{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect}
+\nocite{ModA-TR-2024SS-BCN-TeamGruen-NanoVend}
+\nocite{ModA-TR-2024SS-BCN-TeamRot-StockSentinel}
+\nocite{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan}
+\nocite{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens}
+\nocite{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch}
\nocite{SaNe24othfb}
-
+\nocite{StNe24kosmosis-TR}
\nocite{ModA-TR-2023SS-WAE-TeamWeiss-Neunerln}
\nocite{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline}
\nocite{ModA-TR-2023SS-BDCC-TeamBlau-NauticalNonsense}
@@ -246,7 +250,6 @@ Could include (3) a software bill of materials (SBOM), at least for the major li
\nocite{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard}
\nocite{ModA-TR-2021SS-WAE-TeamRot-FireForceDefense}
\nocite{ModA-TR-2021SS-WAE-TeamGruen-MedPlanner}
-
\nocite{NeRL12deus}
\nocite{LNR+11egr}
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/selfref.bib b/Master/texmf-dist/doc/latex/cs-techrep/template/selfref.bib
index f498920efca..b6e15b23a75 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/selfref.bib
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/selfref.bib
@@ -2,9 +2,9 @@
author = {Christoph P. Neumann},
title = {\cstechrepTitleBib},
institution = {\cstechrepInstitution, \cstechrepDepartment},
- series = {\cstechrepSeries},
+ type = {\cstechrepType},
number = {\cstechrepNumber},
year = {2024},
- month = {3},
+ month = {9},
langid = {english},
}
diff --git a/Master/texmf-dist/doc/latex/cs-techrep/template/webdev_commons.bib b/Master/texmf-dist/doc/latex/cs-techrep/template/webdev_commons.bib
index 159bef9d0e8..602a25edb66 100644
--- a/Master/texmf-dist/doc/latex/cs-techrep/template/webdev_commons.bib
+++ b/Master/texmf-dist/doc/latex/cs-techrep/template/webdev_commons.bib
@@ -1,572 +1,1234 @@
-
-@Online{sqlite,
- author = {Richard Hipp},
+@online{angular,
+ title = {{Angular}},
+ author = {Google},
+ url = {https://angular.io/},
+ note = {[Online]}
+}
+@online{asp,
+ title = {{ASP.NET}},
+ author = {Microsoft},
+ url = {https://dotnet.microsoft.com/apps/aspnet},
note = {[Online]},
- title = {{SQLite}: {F}eatures},
- url = {https://sqlite.org/features.html}
+ addendum = {(aufgerufen: 22.06.2024)},
+ ids = {asp_net}
+}
+@online{authjs,
+ title = {{Auth.js}},
+ author = {Balázs Orbán},
+ url = {https://authjs.dev/},
+ note = {[Online]}
+}
+@online{aws,
+ title = {{Amazon Web Services}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/},
+ note = {[Online]}
+}
+@online{aws-apigateway,
+ title = {{AWS API Gateway}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/api-gateway/},
+ note = {[Online]}
+}
+@online{aws-apprunner,
+ title = {{AWS AppRunner}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/apprunner/},
+ note = {[Online]}
+}
+@online{aws-cli,
+ title = {{AWS CLI}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/cli/},
+ note = {[Online]}
+}
+@online{aws-codebuild,
+ title = {{AWS CodeBuild}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codebuild/},
+ note = {[Online]}
+}
+@online{aws-codecommit,
+ title = {{AWS CodeCommit}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codecommit/},
+ note = {[Online]}
+}
+@online{aws-codepipeline,
+ title = {{AWS CodePipeline}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codepipeline/},
+ note = {[Online]}
+}
+@online{aws-cognito,
+ title = {{{AWS Cognito}: Identity Platform}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/cognito/},
+ note = {[Online]}
+}
+@online{aws-ec2,
+ title = {{AWS EC2}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/ec2/},
+ note = {[Online]}
+}
+@online{aws-ecr,
+ title = {{AWS ECR}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/ecr/},
+ note = {[Online]}
+}
+@online{aws-elasticbeanstalk,
+ title = {{AWS Elastic Beanstalk}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/elasticbeanstalk/},
+ note = {[Online]}
+}
+@online{aws-iam,
+ title = {{AWS IAM}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/iam/},
+ note = {[Online]}
+}
+@online{aws-lambda,
+ title = {{AWS Lambda}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/lambda/},
+ note = {[Online]}
+}
+@online{aws-s3,
+ title = {{Amazon S3}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/s3/},
+ note = {[Online]}
+}
+@online{aws-sam,
+ title = {{AWS SAM}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/serverless/sam/},
+ note = {[Online]}
+}
+@online{aws-sdk-js,
+ title = {{{AWS SDK} for {JavaScript}}},
+ author = {Amazon},
+ url = {https://www.npmjs.com/package/aws-sdk},
+ note = {[Online]}
}
-
-@Online{django,
+@online{aws-toolkit-intelij,
+ title = {{{AWS Toolkit} for {IntelliJ IDEA}}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/intellij/},
+ note = {[Online]}
+}
+@online{axios,
+ title = {{Axios}},
+ author = {Matt Zabriskie},
+ url = {https://axios-http.com/},
+ note = {[Online]}
+}
+@online{bootstrap,
+ title = {{Bootstrap: Build fast, responsive sites}},
+ author = {Mark Otto und Jacob Thornton},
+ url = {https://getbootstrap.com/},
+ note = {[Online]}
+}
+@online{boto3,
+ title = {{{Boto3}: {AWS SDK} for Python}},
+ author = {Amazon},
+ url = {https://boto3.amazonaws.com/v1/documentation/api/latest/index.html},
+ note = {[Online]}
+}
+@online{catapi,
+ title = {{The Cat {API}}},
+ author = {Aden Forshaw},
+ url = {https://thecatapi.com/},
+ note = {[Online]}
+}
+@online{chai,
+ title = {{Chai Assertion Library}},
+ author = {Chai},
+ url = {https://www.chaijs.com/},
+ note = {[Online]}
+}
+@online{chess,
+ title = {{Chess}},
+ author = {chess.com},
+ url = {https://www.chess.com/},
+ note = {[Online]}
+}
+@online{csharp,
+ title = {{{C\#} Programming Language}},
+ author = {Microsoft},
+ url = {https://learn.microsoft.com/dotnet/csharp/},
+ note = {[Online]}
+}
+@online{cypress,
+ title = {{Cypress}},
+ author = {Brian Mann},
+ url = {https://www.cypress.io/},
+ note = {[Online]}
+}
+@online{d3js,
+ title = {{D3.js}},
+ author = {Observable},
+ url = {https://d3js.org},
+ note = {[Online]}
+}
+@online{django,
+ title = {{Django}},
author = {Adrian Holovaty and Simon Willison},
- note = {[Online]},
- title = {Django},
url = {https://www.djangoproject.com/},
+ note = {[Online]}
}
-
-@Online{fastapi,
- author = {Sebastián Ramírez},
- note = {[Online]},
- title = {FastAPI},
- url = {https://fastapi.tiangolo.com/},
-}
-
-@Online{docker,
+@online{docker,
+ title = {{Docker: Accelerated Container Application Development}},
author = {Docker},
- note = {[Online]},
- title = {Docker: Accelerated Container Application Development},
url = {https://www.docker.com/},
+ note = {[Online]}
}
-
-@Online{elasticsearch,
- author = {Elastic},
- note = {[Online]},
- title = {Elasticsearch Platform},
- url = {https://www.elastic.co/de/elasticsearch/},
-}
-
-@Online{react,
- author = {Facebook},
- note = {[Online]},
- title = {React},
- url = {https://react.dev/},
+@online{docker-compose,
+ title = {{Compose: Defining and Running Multi-Container Docker Applications}},
+ author = {Docker},
+ url = {https://docs.docker.com/compose/},
+ note = {[Online]}
}
-
-@Online{angular,
- author = {Google},
- note = {[Online]},
- title = {Angular},
- url = {https://angular.io/},
+@online{dotnet,
+ title = {{{.NET}: free, open-source, cross-platform framework}},
+ author = {Microsoft},
+ url = {https://dotnet.microsoft.com/},
+ note = {[Online]}
}
-
-@Online{vue,
- author = {Evan You},
- note = {[Online]},
- title = {Vue.js},
- url = {https://vuejs.org/},
+@online{elasticsearch,
+ title = {{Elasticsearch Platform}},
+ author = {Elastic},
+ url = {https://www.elastic.co/de/elasticsearch/},
+ note = {[Online]}
}
-
-@Online{eslint,
+@online{eslint,
+ title = {{ESLint: {P}luggable {J}avaScript linter}},
author = {Nicholas Zakas},
- note = {[Online]},
- title = {ESLint: {P}luggable {J}avaScript linter},
url = {https://eslint.org/},
+ note = {[Online]}
}
-
-@Online{express,
+@online{express,
+ title = {{Express}},
author = {Douglas Christopher Wilson},
- note = {[Online]},
- title = {Express},
url = {https://expressjs.com/},
+ note = {[Online]}
+}
+@online{fastapi,
+ title = {{FastAPI}},
+ author = {Sebastián Ramírez},
+ url = {https://fastapi.tiangolo.com/},
+ note = {[Online]}
}
-
-@Online{graphql,
+@online{flask,
+ title = {{Flask User's Guide}},
+ author = {Pallets},
+ url = {https://flask.palletsprojects.com/},
+ note = {[Online]}
+}
+@online{GitHub,
+ title = {{GitHub}},
+ url = {https://github.com/},
+ note = {[Online]}
+}
+@online{graphql,
+ title = {{GraphQL: {A} query language for your {API}}},
author = {Facebook},
- note = {[Online]},
- title = {GraphQL: {A} query language for your {API}},
url = {https://graphql.org/},
+ note = {[Online]}
+}
+@online{grpc,
+ title = {{gRPC: A high performance, open source universal RPC framework}},
+ author = {{CNCF}},
+ url = {https://grpc.io/},
+ note = {[Online]}
+}
+@online{hetzner,
+ title = {{Hetzner Cloud Hosting}},
+ author = {Hetzner},
+ url = {https://www.hetzner.com/cloud/},
+ note = {[Online]}
+}
+@online{InstaApi,
+ title = {{Instagram Basic Display API}},
+ author = {Facebook},
+ url = {https://developers.facebook.com/docs/instagram-basic-display-api},
+ note = {[Online]}
}
-
-@Online{istanbuljs,
+@online{istanbuljs,
+ title = {{Istanbul: {J}avaScript test coverage made simple}},
author = {Istanbul},
- note = {[Online]},
- title = {Istanbul: {J}avaScript test coverage made simple},
url = {https://istanbul.js.org/},
+ note = {[Online]}
}
-
-@Online{node,
- author = {Ryan Dahl},
+@online{jest,
+ title = {{Jest is a delightful JavaScript Testing Framework with a focus on simplicity}},
+ author = {Facebook},
+ url = {https://jestjs.io/},
+ note = {[Online]}
+}
+@online{json,
+ title = {{JSON}},
+ author = {Douglas Crockford},
+ url = {https://www.json.org/},
+ note = {[Online]}
+}
+@online{kaggle-elonmusktweets,
+ title = {{Kaggle Datasets: Elon Musk Tweets}},
+ author = {Google},
+ url = {https://www.kaggle.com/datasets/gpreda/elon-musk-tweets},
+ note = {[Online]}
+}
+@online{kubernetes,
+ title = {{Kubernetes/K8s: open-source system for automating deployment, scaling, and management of containerized applications}},
+ author = {{CNCF}},
+ url = {https://kubernetes.io/},
+ note = {[Online]},
+ ids = {k8s}
+}
+@online{mariadb,
+ title = {{MariaDB Community Server}},
+ author = {Michael Widenius},
+ url = {https://mariadb.com/},
+ note = {[Online]},
+ ids = {maria}
+}
+@online{mocha,
+ title = {{Mocha Testing Framework}},
+ author = {Mocha},
+ url = {https://mochajs.org/},
+ note = {[Online]}
+}
+@book{mongo_book,
+ title = {{MongoDB: The Definitive Guide}},
+ author = {Kristina Chodorow},
+ year = 2013,
+ publisher = {O'Reilly Media}
+}
+@online{mongodb,
+ title = {{MongoDB}},
+ author = {Dwight Merriman and Eliot Horowitz and Kevin Ryan},
+ url = {https://www.mongodb.com/},
note = {[Online]},
- title = {Node.js},
+ ids = {mongo}
+}
+@online{mongodb-atlas,
+ title = {{MongoDB Atlas}},
+ author = {{MongoDB, Inc.}},
+ url = {https://www.mongodb.com/atlas},
+ note = {[Online]}
+}
+@online{mongodb-atlas-serverless,
+ title = {{{AWS} Prescriptive Guidance: {MongoDB Atlas} on {AWS} -- Migrating from a self-managed environment to the {AWS} Cloud}},
+ author = {Amazon},
+ url = {https://docs.aws.amazon.com/prescriptive-guidance/latest/migration-mongodb-atlas/serverless.html},
+ note = {[Online]}
+}
+@online{mongodb-replication,
+ title = {{{MongoDB} Replication}},
+ author = {{MongoDB, Inc.}},
+ url = {https://www.mongodb.com/docs/manual/replication/},
+ note = {[Online]}
+}
+@online{mswjs,
+ title = {{Mock Service Worker: {API} mocking library for browser and Node.js}},
+ author = {Artem Zakharchenko},
+ url = {https://mswjs.io/},
+ note = {[Online]}
+}
+@online{mui,
+ title = {{{MUI}: The React component library you always wanted}},
+ author = {{Material UI SAS}},
+ url = {https://mui.com},
+ note = {[Online]}
+}
+@online{mysql,
+ title = {{MySQL: high-performance and scalable Online Transaction Processing}},
+ author = {Michael Widenius und David Axmark},
+ url = {https://www.mysql.com/},
+ note = {[Online]}
+}
+@online{nextjs,
+ title = {{Next.js}},
+ author = {Vercel},
+ url = {https://nextjs.org/},
+ note = {[Online]}
+}
+@online{node,
+ title = {{Node.js}},
+ author = {Ryan Dahl},
url = {https://www.nodejs.org/},
+ note = {[Online]},
+ ids = {nodejs}
}
-
-@Online{npm,
+@online{npm,
+ title = {{npm}},
author = {Isaac Schlueter},
- note = {[Online]},
- title = {npm},
url = {https://www.npmjs.com/},
+ note = {[Online]}
}
-
-@Online{prettier,
- author = {Prettier},
+@online{ontotext,
+ title = {{GraphDB}},
+ author = {Ontotext},
+ url = {https://www.ontotext.com/products/graphdb/},
+ note = {[Online]}
+}
+@online{opcua,
+ title = {{OPC Unified Architecture: a platform independent service-oriented architecture that integrates all the functionality of the individual OPC Classic specifications into one extensible framework}},
+ author = {{OPC}},
+ url = {https://opcfoundation.org/about/opc-technologies/opc-ua/},
+ note = {[Online]}
+}
+@online{opencv,
+ title = {{{OpenCV}: Open Source Computer Vision Library}},
+ author = {Gray Bradsky},
+ url = {https://opencv.org},
+ note = {[Online]}
+}
+@online{phaser,
+ title = {{Phaser Game Framework}},
+ author = {{Photon Storm}},
+ url = {https://phaser.io/},
+ note = {[Online]}
+}
+@online{pinia,
+ title = {{Pinia}},
+ author = {Eduardo San Martin Morote},
+ url = {https://pinia.vuejs.org/},
+ note = {[Online]}
+}
+@online{postgresql,
+ title = {{PostgreSQL: Open Source Relational Database}},
+ author = {Andrew Yu and Jolly Chen},
+ url = {https://www.postgresql.org/},
note = {[Online]},
- title = {Prettier: {O}pinionated {C}ode {F}ormatter},
+ ids = {postgres}
+}
+@online{prettier,
+ title = {{Prettier: {O}pinionated {C}ode {F}ormatter}},
+ author = {Prettier},
url = {https://prettier.io/},
+ note = {[Online]}
+}
+@online{prisma,
+ title = {{Prisma}},
+ author = {{Prisma Data, Inc.}},
+ url = {https://www.prisma.io/},
+ note = {[Online]}
+}
+@online{pydantic,
+ title = {{Pydantic Documentation}},
+ author = {Sebastián Ramírez},
+ url = {https://docs.pydantic.dev/},
+ note = {[Online]}
+}
+@online{pymongo,
+ title = {{PyMongo}},
+ author = {{MongoDB, Inc.}},
+ url = {https://pypi.org/project/pymongo/},
+ note = {[Online]}
+}
+@online{pytest,
+ title = {{pytest: helps you write better programs}},
+ author = {Guido van Rossum},
+ url = {https://docs.pytest.org/},
+ note = {[Online]}
+}
+@online{pytest,
+ title = {{Pytest}},
+ author = {Holger Krekel and {pytest Entwicklungteam}},
+ url = {https://pytest.org/},
+ note = {[Online]}
+}
+@online{python,
+ title = {{Python}},
+ author = {Guido van Rossum},
+ url = {https://www.python.org},
+ note = {[Online]}
+}
+@online{react,
+ title = {{React}},
+ author = {Facebook},
+ url = {https://react.dev/},
+ note = {[Online]}
+}
+@online{reacttestinglibrary,
+ title = {{TestingLibraryReact}},
+ author = {React Testing Library},
+ url = {https://testing-library.com/docs/react-testing-library/intro/},
+ note = {[Online]}
+}
+@book{restful,
+ title = {{Architectural styles and the design of network-based software architectures}},
+ author = {Fielding, Roy Thomas},
+ year = 2000,
+ publisher = {University of California, Irvine},
+ ids = {rest}
+}
+@online{restfulapi,
+ title = {{REST API Tutorial}},
+ author = {Lokesh Gupta},
+ url = {https://restfulapi.net/},
+ note = {[Online]}
+}
+@techreport{rfc6455,
+ title = {{The WebSocket Protocol}},
+ author = {Alexey Melnikov and Ian Fette},
+ year = 2011,
+ month = dec,
+ number = 6455,
+ doi = {10.17487/RFC6455},
+ issn = {2070-1721},
+ url = {https://www.rfc-editor.org/info/rfc6455},
+ type = {{RFC}}
+}
+@online{scikit,
+ title = {{scikit-learn: Machine Learning in Python}},
+ author = {David Cournapeau},
+ url = {https://scikit-learn.org/},
+ note = {[Online]},
+ ids = {scikit-learn}
+}
+@article{scikit-image,
+ title = {{scikit-image: image processing in {P}ython}},
+ author = {van der Walt, {S}t\'efan and {S}ch\"onberger, {J}ohannes {L}. and {Nunez-Iglesias}, {J}uan and {B}oulogne, {F}ran\c{c}ois and {W}arner, {J}oshua {D}. and {Y}ager, {N}eil and {G}ouillart, {E}mmanuelle and {Y}u, {T}ony and the scikit-image contributors},
+ year = 2014,
+ month = 6,
+ journal = {PeerJ},
+ volume = 2,
+ pages = {e453},
+ doi = {10.7717/peerj.453},
+ issn = {2167-8359},
+ url = {https://doi.org/10.7717/peerj.453},
+ keywords = {Image processing, Reproducible research, Education, Visualization, Open source, Python, Scientific programming}
+}
+@online{scratch,
+ title = {{Scratch}},
+ author = {{MIT Media Lab}},
+ url = {https://scratch.mit.edu/projects/editor/},
+ note = {[Online]}
+}
+@online{selenium,
+ title = {{Selenium}},
+ author = {Selenium},
+ url = {https://www.selenium.dev/},
+ note = {[Online]}
+}
+@online{socketio,
+ title = {{Socket.IO}},
+ author = {Guillermo Rauch},
+ url = {https://socket.io/},
+ note = {[Online]}
}
-
-@Online{svelte,
+@online{sqlite,
+ title = {{{SQLite}: {F}eatures}},
+ author = {Richard Hipp},
+ url = {https://sqlite.org/features.html},
+ note = {[Online]}
+}
+@online{starlette,
+ title = {{Starlette}},
+ author = {Sebastián Ramírez},
+ url = {https://www.starlette.io/},
+ note = {[Online]}
+}
+@online{svelte,
+ title = {{Svelte: Cybernetically enhanced web apps}},
author = {Rich Harris},
- note = {[Online]},
- title = {Svelte: Cybernetically enhanced web apps},
url = {https://www.svelte.dev/},
+ note = {[Online]}
}
-
-@Online{sveltekit,
+@online{sveltekit,
+ title = {{Svelte Kit: {T}he fastest way to build {S}velte Apps}},
author = {Rich Harris},
- note = {[Online]},
- title = {Svelte Kit: {T}he fastest way to build {S}velte Apps},
url = {https://kit.svelte.dev/},
+ note = {[Online]}
}
-
-@Online{typescript,
+@online{tailwind,
+ title = {{Tailwind {CSS}}},
+ author = {Adam Wathan and Jonathan Reinink and David Hemphill and Steve Schoger},
+ url = {https://tailwindcss.com/},
+ note = {[Online]}
+}
+@online{terraform,
+ title = {{Terraform}},
+ author = {{HashiCorp}},
+ url = {https://www.terraform.io/},
+ note = {[Online]}
+}
+@online{tinydb,
+ title = {{TinyDB: Lightweight Document-oriented Database}},
+ author = {Markus Siemens},
+ url = {https://github.com/msiemens/tinydb},
+ note = {[Online]}
+}
+@online{typescript,
+ title = {{TypeScript: JavaScript With Syntax For Types}},
author = {Microsoft},
- note = {[Online]},
- title = {TypeScript: {J}avaScript {W}ith {S}yntax {F}or {T}ypes},
url = {https://www.typescriptlang.org/},
+ note = {[Online]}
}
-
-@Online{jest,
- author = {Facebook},
- note = {[Online]},
- title = {Jest is a delightful JavaScript Testing Framework with a focus on simplicity},
- url = {https://jestjs.io/},
-
+@online{uvicorn,
+ title = {{Uvicorn}},
+ author = {Sebastián Ramírez},
+ url = {https://www.uvicorn.org/},
+ note = {[Online]}
+}
+@online{virtuoso,
+ title = {{Virtuoso Universal Server}},
+ author = {OpenLink},
+ url = {https://virtuoso.openlinksw.com/},
+ note = {[Online]}
}
-
-@Online{vite,
+@online{vite,
+ title = {{Vite: {N}ext {G}eneration {F}rontend {T}ooling}},
author = {Evan You},
- note = {[Online]},
- title = {Vite: {N}ext {G}eneration {F}rontend {T}ooling},
url = {https://github.com/vitejs/vite},
+ note = {[Online]}
}
-
-@Online{vitest,
+@online{vitest,
+ title = {{Vitest: {A} {V}ite-native unit test framework}},
author = {Anthony Fu and Matías Capeletto},
- note = {[Online]},
- title = {Vitest: {A} {V}ite-native unit test framework},
url = {https://vitest.dev/},
+ note = {[Online]}
}
-
-@Online{pinia,
- author = {Eduardo San Martin Morote},
- note = {[Online]},
- title = {Pinia},
- url = {https://pinia.vuejs.org/},
+@online{vue,
+ title = {{Vue.js}},
+ author = {Evan You},
+ url = {https://vuejs.org/},
+ note = {[Online]}
}
-
-@Online{virtuoso,
- author = {OpenLink},
- note = {[Online]},
- title = {Virtuoso Universal Server},
- url = {https://virtuoso.openlinksw.com/},
+@online{websocket-whatwg,
+ title = {{Origin of {WebSocket} ({IRC} logs: freenode / \#whatwg / 20080618)}},
+ author = {Ian Hickson and Michael Carter},
+ url = {https://krijnhoetmer.nl/irc-logs/whatwg/20080618#l-1145},
+ note = {[Online]}
}
-
-@Online{ontotext,
- author = {Ontotext},
- note = {[Online]},
- title = {GraphDB},
- url = {https://www.ontotext.com/products/graphdb/},
+@online{yfinance,
+ title = {{Yahoo Finance}},
+ author = {Yahoo},
+ url = {https://finance.yahoo.com},
+ note = {[Online]}
}
-
-@Online{mongodb,
- author = {Dwight Merriman and Eliot Horowitz and Kevin Ryan},
- note = {[Online]},
- title = {MongoDB},
- url = {https://www.mongodb.com/},
+@online{angular,
+ title = {{Angular}},
+ author = {Google},
+ url = {https://angular.io/},
+ note = {[Online]}
}
-
-@Online{dotnet,
+@online{asp,
+ title = {{ASP.NET}},
author = {Microsoft},
+ url = {https://dotnet.microsoft.com/apps/aspnet},
note = {[Online]},
- title = {{.NET}: free, open-source, cross-platform framework},
- url = {https://dotnet.microsoft.com/},
+ addendum = {(aufgerufen: 22.06.2024)},
+ ids = {asp_net}
}
-
-@Online{phaser,
- author = {{Photon Storm}},
- note = {[Online]},
- title = {Phaser Game Framework},
- url = {https://phaser.io/},
+@online{authjs,
+ title = {{Auth.js}},
+ author = {Balázs Orbán},
+ url = {https://authjs.dev/},
+ note = {[Online]}
}
-
-@Online{kubernetes,
- author = {{CNCF}},
- note = {[Online]},
- title = {Kubernetes/K8s: open-source system for automating deployment, scaling, and management of containerized applications},
- url = {https://kubernetes.io/},
+@online{aws,
+ title = {{Amazon Web Services}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/},
+ note = {[Online]}
}
-
-@Online{bootstrap,
- author = {Mark Otto und Jacob Thornton},
- note = {[Online]},
- title = {Bootstrap: Build fast, responsive sites},
- url = {https://getbootstrap.com/},
+@online{aws-apigateway,
+ title = {{AWS API Gateway}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/api-gateway/},
+ note = {[Online]}
}
-
-@Online{docker-compose,
- author = {Docker},
- note = {[Online]},
- title = {Compose: Defining and Running Multi-Container Docker Applications},
- url = {https://docs.docker.com/compose/},
+@online{aws-apprunner,
+ title = {{AWS AppRunner}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/apprunner/},
+ note = {[Online]}
}
-
-@book{restful,
- title={Architectural styles and the design of network-based software architectures},
- author={Fielding, Roy Thomas},
- year={2000},
- publisher={University of California, Irvine}
+@online{aws-cli,
+ title = {{AWS CLI}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/cli/},
+ note = {[Online]}
}
-
-@Online{grpc,
- author = {{CNCF}},
- note = {[Online]},
- title = {gRPC: A high performance, open source universal RPC framework},
- url = {https://grpc.io/},
+@online{aws-codebuild,
+ title = {{AWS CodeBuild}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codebuild/},
+ note = {[Online]}
}
-
-@Online{mysql,
- author = {Michael Widenius und David Axmark},
- note = {[Online]},
- title = {MySQL: high-performance and scalable Online Transaction Processing},
- url = {https://www.mysql.com/},
+@online{aws-codecommit,
+ title = {{AWS CodeCommit}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codecommit/},
+ note = {[Online]}
}
-
-@Online{mariadb,
- author = {Michael Widenius},
- note = {[Online]},
- title = {MariaDB Community Server},
- url = {https://mariadb.com/},
+@online{aws-codepipeline,
+ title = {{AWS CodePipeline}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/de/codepipeline/},
+ note = {[Online]}
}
-
-@Online{postgresql,
- author = {Andrew Yu and Jolly Chen},
- note = {[Online]},
- title = {PostgreSQL: Open Source Relational Database},
- url = {https://www.postgresql.org/},
+@online{aws-cognito,
+ title = {{{AWS Cognito}: Identity Platform}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/cognito/},
+ note = {[Online]}
}
-
-@Online{opcua,
- author = {{OPC}},
- note = {[Online]},
- title = {OPC Unified Architecture: a platform independent service-oriented architecture that integrates all the functionality of the individual OPC Classic specifications into one extensible framework},
- url = {https://opcfoundation.org/about/opc-technologies/opc-ua/},
+@online{aws-ec2,
+ title = {{AWS EC2}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/ec2/},
+ note = {[Online]}
}
-
-@Online{aws,
+@online{aws-ecr,
+ title = {{AWS ECR}},
author = {Amazon},
- note = {[Online]},
- title = {Amazon Web Services},
- url = {https://aws.amazon.com/}
+ url = {https://aws.amazon.com/ecr/},
+ note = {[Online]}
}
-
-@Online{aws-cognito,
+@online{aws-elasticbeanstalk,
+ title = {{AWS Elastic Beanstalk}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS Cognito}: Identity Platform},
- url = {https://aws.amazon.com/cognito/}
+ url = {https://aws.amazon.com/elasticbeanstalk/},
+ note = {[Online]}
}
-
-@Online{aws-apigateway,
+@online{aws-iam,
+ title = {{AWS IAM}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS API Gateway}},
- url = {https://aws.amazon.com/api-gateway/}
+ url = {https://aws.amazon.com/iam/},
+ note = {[Online]}
}
-
-@Online{mongodb-atlas,
- author = {{MongoDB, Inc.}},
- note = {[Online]},
- title = {{MongoDB Atlas}},
- url = {https://www.mongodb.com/atlas},
+@online{aws-lambda,
+ title = {{AWS Lambda}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/lambda/},
+ note = {[Online]}
}
-
-@Online{mongodb-atlas-serverless,
+@online{aws-s3,
+ title = {{Amazon S3}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS} Prescriptive Guidance: {MongoDB Atlas} on {AWS} -- Migrating from a self-managed environment to the {AWS} Cloud},
- url = {https://docs.aws.amazon.com/prescriptive-guidance/latest/migration-mongodb-atlas/serverless.html}
+ url = {https://aws.amazon.com/s3/},
+ note = {[Online]}
}
-
-@Online{aws-lambda,
+@online{aws-sam,
+ title = {{AWS SAM}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS Lambda}},
- url = {https://aws.amazon.com/lambda/}
+ url = {https://aws.amazon.com/serverless/sam/},
+ note = {[Online]}
}
-
-@Online{aws-ec2,
+@online{aws-sdk-js,
+ title = {{{AWS SDK} for {JavaScript}}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS EC2}},
- url = {https://aws.amazon.com/ec2/}
+ url = {https://www.npmjs.com/package/aws-sdk},
+ note = {[Online]}
}
-
-@Online{nextjs,
- author = {Vercel},
- note = {[Online]},
- title = {Next.js},
- url = {https://nextjs.org/}
+@online{aws-toolkit-intelij,
+ title = {{{AWS Toolkit} for {IntelliJ IDEA}}},
+ author = {Amazon},
+ url = {https://aws.amazon.com/intellij/},
+ note = {[Online]}
}
-
-@Online{aws-lambda-runtime,
+@online{axios,
+ title = {{Axios}},
+ author = {Matt Zabriskie},
+ url = {https://axios-http.com/},
+ note = {[Online]}
+}
+@online{bootstrap,
+ title = {{Bootstrap: Build fast, responsive sites}},
+ author = {Mark Otto und Jacob Thornton},
+ url = {https://getbootstrap.com/},
+ note = {[Online]}
+}
+@online{boto3,
+ title = {{{Boto3}: {AWS SDK} for Python}},
author = {Amazon},
- note = {[Online]},
- title = {{AWS Lambda}: Run-Time Environment},
- url = {https://docs.aws.amazon.com/de_de/lambda/latest/dg/lambda-runtime-environment.html}
+ url = {https://boto3.amazonaws.com/v1/documentation/api/latest/index.html},
+ note = {[Online]}
}
-
-@Online{authjs,
- author = {Balázs Orbán},
- note = {[Online]},
- title = {Auth.js},
- url = {https://authjs.dev/}
+@online{catapi,
+ title = {{The Cat {API}}},
+ author = {Aden Forshaw},
+ url = {https://thecatapi.com/},
+ note = {[Online]}
+}
+@online{chai,
+ title = {{Chai Assertion Library}},
+ author = {Chai},
+ url = {https://www.chaijs.com/},
+ note = {[Online]}
+}
+@online{chess,
+ title = {{Chess}},
+ author = {chess.com},
+ url = {https://www.chess.com/},
+ note = {[Online]}
+}
+@online{csharp,
+ title = {{{C\#} Programming Language}},
+ author = {Microsoft},
+ url = {https://learn.microsoft.com/dotnet/csharp/},
+ note = {[Online]}
}
-
-@Online{mongodb-via-aws,
- author = {{MongoDB, Inc.}},
- note = {[Online]},
- title = {{MongoDB Atlas} via {AWS}},
- url = {https://www.mongodb.com/docs/atlas/reference/amazon-aws/}
+@online{cypress,
+ title = {{Cypress}},
+ author = {Brian Mann},
+ url = {https://www.cypress.io/},
+ note = {[Online]}
}
-
-@Online{mongodb-replication,
- author = {{MongoDB, Inc.}},
- note = {[Online]},
- title = {{MongoDB} Replication},
- url = {https://www.mongodb.com/docs/manual/replication/}
+@online{d3js,
+ title = {{D3.js}},
+ author = {Observable},
+ url = {https://d3js.org},
+ note = {[Online]}
}
-
-@Online{prisma,
- author = {{Prisma Data, Inc.}},
- note = {[Online]},
- title = {Prisma},
- url = {https://www.prisma.io/}
+@online{django,
+ title = {{Django}},
+ author = {Adrian Holovaty and Simon Willison},
+ url = {https://www.djangoproject.com/},
+ note = {[Online]}
}
-
-@Online{prisma-schema,
- author = {{Prisma Data, Inc.}},
- note = {[Online]},
- title = {Prisma Schema},
- url = {https://www.prisma.io/docs/concepts/components/prisma-schema}
+@online{docker,
+ title = {{Docker: Accelerated Container Application Development}},
+ author = {Docker},
+ url = {https://www.docker.com/},
+ note = {[Online]}
}
-
-@Online{aws-s3,
- author = {Amazon},
- note = {[Online]},
- title = {{Amazon S3}},
- url = {https://aws.amazon.com/s3/},
+@online{docker-compose,
+ title = {{Compose: Defining and Running Multi-Container Docker Applications}},
+ author = {Docker},
+ url = {https://docs.docker.com/compose/},
+ note = {[Online]}
}
-@Online{aws-sam,
- author = {Amazon},
- note = {[Online]},
- title = {{AWS SAM}},
- url = {https://aws.amazon.com/serverless/sam/},
+@online{dotnet,
+ title = {{{.NET}: free, open-source, cross-platform framework}},
+ author = {Microsoft},
+ url = {https://dotnet.microsoft.com/},
+ note = {[Online]}
}
-
-@Online{aws-cli,
- author = {Amazon},
- note = {[Online]},
- title = {{AWS CLI}},
- url = {https://aws.amazon.com/cli/},
+@online{elasticsearch,
+ title = {{Elasticsearch Platform}},
+ author = {Elastic},
+ url = {https://www.elastic.co/de/elasticsearch/},
+ note = {[Online]}
}
-
-@Online{aws-iam,
- author = {Amazon},
- note = {[Online]},
- title = {{AWS IAM}},
- url = {https://aws.amazon.com/iam/},
+@online{eslint,
+ title = {{ESLint: {P}luggable {J}avaScript linter}},
+ author = {Nicholas Zakas},
+ url = {https://eslint.org/},
+ note = {[Online]}
}
-
-@Online{aws-toolkit-intelij,
- author = {Amazon},
- note = {[Online]},
- title = {{AWS Toolkit} for {IntelliJ IDEA}},
- url = {https://aws.amazon.com/intellij/},
+@online{express,
+ title = {{Express}},
+ author = {Douglas Christopher Wilson},
+ url = {https://expressjs.com/},
+ note = {[Online]}
}
-
-@Online{kaggle-elonmusktweets,
+@online{fastapi,
+ title = {{FastAPI}},
+ author = {Sebastián Ramírez},
+ url = {https://fastapi.tiangolo.com/},
+ note = {[Online]}
+}
+@online{flask,
+ title = {{Flask User's Guide}},
+ author = {Pallets},
+ url = {https://flask.palletsprojects.com/},
+ note = {[Online]}
+}
+@online{GitHub,
+ title = {{GitHub}},
+ url = {https://github.com/},
+ note = {[Online]}
+}
+@online{graphql,
+ title = {{GraphQL: {A} query language for your {API}}},
+ author = {Facebook},
+ url = {https://graphql.org/},
+ note = {[Online]}
+}
+@online{grpc,
+ title = {{gRPC: A high performance, open source universal RPC framework}},
+ author = {{CNCF}},
+ url = {https://grpc.io/},
+ note = {[Online]}
+}
+@online{hetzner,
+ title = {{Hetzner Cloud Hosting}},
+ author = {Hetzner},
+ url = {https://www.hetzner.com/cloud/},
+ note = {[Online]}
+}
+@online{InstaApi,
+ title = {{Instagram Basic Display API}},
+ author = {Facebook},
+ url = {https://developers.facebook.com/docs/instagram-basic-display-api},
+ note = {[Online]}
+}
+@online{istanbuljs,
+ title = {{Istanbul: {J}avaScript test coverage made simple}},
+ author = {Istanbul},
+ url = {https://istanbul.js.org/},
+ note = {[Online]}
+}
+@online{jest,
+ title = {{Jest is a delightful JavaScript Testing Framework with a focus on simplicity}},
+ author = {Facebook},
+ url = {https://jestjs.io/},
+ note = {[Online]}
+}
+@online{json,
+ title = {{JSON}},
+ author = {Douglas Crockford},
+ url = {https://www.json.org/},
+ note = {[Online]}
+}
+@online{kaggle-elonmusktweets,
+ title = {{Kaggle Datasets: Elon Musk Tweets}},
author = {Google},
- note = {[Online]},
- title = {Kaggle Datasets: Elon Musk Tweets},
url = {https://www.kaggle.com/datasets/gpreda/elon-musk-tweets},
+ note = {[Online]}
}
-
-@Online{yfinance,
- author = {Yahoo},
+@online{kubernetes,
+ title = {{Kubernetes/K8s: open-source system for automating deployment, scaling, and management of containerized applications}},
+ author = {{CNCF}},
+ url = {https://kubernetes.io/},
note = {[Online]},
- title = {Yahoo Finance},
- url = {https://finance.yahoo.com},
+ ids = {k8s}
}
-
-@Online{d3js,
- author = {Observable},
+@online{mariadb,
+ title = {{MariaDB Community Server}},
+ author = {Michael Widenius},
+ url = {https://mariadb.com/},
note = {[Online]},
- title = {D3.js},
- url = {https://d3js.org},
+ ids = {maria}
}
-
-@Online{mui,
- author = {{Material UI SAS}},
+@online{mocha,
+ title = {{Mocha Testing Framework}},
+ author = {Mocha},
+ url = {https://mochajs.org/},
+ note = {[Online]}
+}
+@book{mongo_book,
+ title = {{MongoDB: The Definitive Guide}},
+ author = {Kristina Chodorow},
+ year = 2013,
+ publisher = {O'Reilly Media}
+}
+@online{mongodb,
+ title = {{MongoDB}},
+ author = {Dwight Merriman and Eliot Horowitz and Kevin Ryan},
+ url = {https://www.mongodb.com/},
note = {[Online]},
- title = {{MUI}: The React component library you always wanted},
+ ids = {mongo}
+}
+@online{mongodb-atlas,
+ title = {{MongoDB Atlas}},
+ author = {{MongoDB, Inc.}},
+ url = {https://www.mongodb.com/atlas},
+ note = {[Online]}
+}
+@online{mongodb-atlas-serverless,
+ title = {{{AWS} Prescriptive Guidance: {MongoDB Atlas} on {AWS} -- Migrating from a self-managed environment to the {AWS} Cloud}},
+ author = {Amazon},
+ url = {https://docs.aws.amazon.com/prescriptive-guidance/latest/migration-mongodb-atlas/serverless.html},
+ note = {[Online]}
+}
+@online{mongodb-replication,
+ title = {{{MongoDB} Replication}},
+ author = {{MongoDB, Inc.}},
+ url = {https://www.mongodb.com/docs/manual/replication/},
+ note = {[Online]}
+}
+@online{mswjs,
+ title = {{Mock Service Worker: {API} mocking library for browser and Node.js}},
+ author = {Artem Zakharchenko},
+ url = {https://mswjs.io/},
+ note = {[Online]}
+}
+@online{mui,
+ title = {{{MUI}: The React component library you always wanted}},
+ author = {{Material UI SAS}},
url = {https://mui.com},
+ note = {[Online]}
}
-
-
-@Online{pytest,
- author = {Holger Krekel and {pytest Entwicklungteam}},
+@online{mysql,
+ title = {{MySQL: high-performance and scalable Online Transaction Processing}},
+ author = {Michael Widenius und David Axmark},
+ url = {https://www.mysql.com/},
+ note = {[Online]}
+}
+@online{nextjs,
+ title = {{Next.js}},
+ author = {Vercel},
+ url = {https://nextjs.org/},
+ note = {[Online]}
+}
+@online{node,
+ title = {{Node.js}},
+ author = {Ryan Dahl},
+ url = {https://www.nodejs.org/},
note = {[Online]},
- title = {Pytest},
- url = {https://pytest.org/}
+ ids = {nodejs}
}
-
-@Online{starlette,
- author = {Sebastián Ramírez},
+@online{npm,
+ title = {{npm}},
+ author = {Isaac Schlueter},
+ url = {https://www.npmjs.com/},
+ note = {[Online]}
+}
+@online{ontotext,
+ title = {{GraphDB}},
+ author = {Ontotext},
+ url = {https://www.ontotext.com/products/graphdb/},
+ note = {[Online]}
+}
+@online{opcua,
+ title = {{OPC Unified Architecture: a platform independent service-oriented architecture that integrates all the functionality of the individual OPC Classic specifications into one extensible framework}},
+ author = {{OPC}},
+ url = {https://opcfoundation.org/about/opc-technologies/opc-ua/},
+ note = {[Online]}
+}
+@online{opencv,
+ title = {{{OpenCV}: Open Source Computer Vision Library}},
+ author = {Gray Bradsky},
+ url = {https://opencv.org},
+ note = {[Online]}
+}
+@online{phaser,
+ title = {{Phaser Game Framework}},
+ author = {{Photon Storm}},
+ url = {https://phaser.io/},
+ note = {[Online]}
+}
+@online{pinia,
+ title = {{Pinia}},
+ author = {Eduardo San Martin Morote},
+ url = {https://pinia.vuejs.org/},
+ note = {[Online]}
+}
+@online{postgresql,
+ title = {{PostgreSQL: Open Source Relational Database}},
+ author = {Andrew Yu and Jolly Chen},
+ url = {https://www.postgresql.org/},
note = {[Online]},
- title = {Starlette},
- url = {https://www.starlette.io/},
+ ids = {postgres}
}
-
-@Online{pydantic,
+@online{prettier,
+ title = {{Prettier: {O}pinionated {C}ode {F}ormatter}},
+ author = {Prettier},
+ url = {https://prettier.io/},
+ note = {[Online]}
+}
+@online{prisma,
+ title = {{Prisma}},
+ author = {{Prisma Data, Inc.}},
+ url = {https://www.prisma.io/},
+ note = {[Online]}
+}
+@online{pydantic,
+ title = {{Pydantic Documentation}},
author = {Sebastián Ramírez},
- note = {[Online]},
- title = {Pydantic Documentation},
url = {https://docs.pydantic.dev/},
+ note = {[Online]}
}
-
-@Online{uvicorn,
- author = {Sebastián Ramírez},
- note = {[Online]},
- title = {Uvicorn},
- url = {https://www.uvicorn.org/}
+@online{pymongo,
+ title = {{PyMongo}},
+ author = {{MongoDB, Inc.}},
+ url = {https://pypi.org/project/pymongo/},
+ note = {[Online]}
}
-
-@Online{terraform,
- author = {{HashiCorp}},
- note = {[Online]},
- title = {Terraform},
- url = {https://www.terraform.io/}
+@online{pytest,
+ title = {{pytest: helps you write better programs}},
+ author = {Guido van Rossum},
+ url = {https://docs.pytest.org/},
+ note = {[Online]}
}
-
-@Online{cypress,
- author = {Brian Mann},
- note = {[Online]},
- title = {Cypress},
- url = {https://www.cypress.io/}
+@online{pytest,
+ title = {{Pytest}},
+ author = {Holger Krekel and {pytest Entwicklungteam}},
+ url = {https://pytest.org/},
+ note = {[Online]}
}
-
-@Online{pymongo,
- author = {{MongoDB, Inc.}},
- note = {[Online]},
- title = {PyMongo},
- url = {https://pypi.org/project/pymongo/}
+@online{python,
+ title = {{Python}},
+ author = {Guido van Rossum},
+ url = {https://www.python.org},
+ note = {[Online]}
}
-
-@Online{websocket-whatwg,
- author = {Ian Hickson and Michael Carter},
- note = {[Online]},
- title = {Origin of {WebSocket} ({IRC} logs: freenode / \#whatwg / 20080618)},
- url = {https://krijnhoetmer.nl/irc-logs/whatwg/20080618#l-1145},
+@online{react,
+ title = {{React}},
+ author = {Facebook},
+ url = {https://react.dev/},
+ note = {[Online]}
}
-
-@TechReport{rfc6455,
- type ={{RFC}},
- number = 6455,
- doi = {10.17487/RFC6455},
- url = {https://www.rfc-editor.org/info/rfc6455},
- author = {Alexey Melnikov and Ian Fette},
- title = {{The WebSocket Protocol}},
- year = 2011,
- month = dec,
- issn = {2070-1721},
-}
-
-@Online{socketio,
- author = {Guillermo Rauch},
- note = {[Online]},
+@online{reacttestinglibrary,
+ title = {{TestingLibraryReact}},
+ author = {React Testing Library},
+ url = {https://testing-library.com/docs/react-testing-library/intro/},
+ note = {[Online]}
+}
+@book{restful,
+ title = {{Architectural styles and the design of network-based software architectures}},
+ author = {Fielding, Roy Thomas},
+ year = 2000,
+ publisher = {University of California, Irvine},
+ ids = {rest}
+}
+@online{restfulapi,
+ title = {{REST API Tutorial}},
+ author = {Lokesh Gupta},
+ url = {https://restfulapi.net/},
+ note = {[Online]}
+}
+@techreport{rfc6455,
+ title = {{The WebSocket Protocol}},
+ author = {Alexey Melnikov and Ian Fette},
+ year = 2011,
+ month = dec,
+ number = 6455,
+ doi = {10.17487/RFC6455},
+ issn = {2070-1721},
+ url = {https://www.rfc-editor.org/info/rfc6455},
+ type = {{RFC}}
+}
+@online{scikit,
+ title = {{scikit-learn: Machine Learning in Python}},
+ author = {David Cournapeau},
+ url = {https://scikit-learn.org/},
+ note = {[Online]},
+ ids = {scikit-learn}
+}
+@article{scikit-image,
+ title = {{scikit-image: image processing in {P}ython}},
+ author = {van der Walt, {S}t\'efan and {S}ch\"onberger, {J}ohannes {L}. and {Nunez-Iglesias}, {J}uan and {B}oulogne, {F}ran\c{c}ois and {W}arner, {J}oshua {D}. and {Y}ager, {N}eil and {G}ouillart, {E}mmanuelle and {Y}u, {T}ony and the scikit-image contributors},
+ year = 2014,
+ month = 6,
+ journal = {PeerJ},
+ volume = 2,
+ pages = {e453},
+ doi = {10.7717/peerj.453},
+ issn = {2167-8359},
+ url = {https://doi.org/10.7717/peerj.453},
+ keywords = {Image processing, Reproducible research, Education, Visualization, Open source, Python, Scientific programming}
+}
+@online{scratch,
+ title = {{Scratch}},
+ author = {{MIT Media Lab}},
+ url = {https://scratch.mit.edu/projects/editor/},
+ note = {[Online]}
+}
+@online{selenium,
+ title = {{Selenium}},
+ author = {Selenium},
+ url = {https://www.selenium.dev/},
+ note = {[Online]}
+}
+@online{socketio,
title = {{Socket.IO}},
+ author = {Guillermo Rauch},
url = {https://socket.io/},
+ note = {[Online]}
}
-
-@Online{catapi,
- author = {Aden Forshaw},
- note = {[Online]},
- title = {The Cat {API}},
- url = {https://thecatapi.com/},
+@online{sqlite,
+ title = {{{SQLite}: {F}eatures}},
+ author = {Richard Hipp},
+ url = {https://sqlite.org/features.html},
+ note = {[Online]}
}
-
-@Online{boto3,
- author = {Amazon},
- note = {[Online]},
- title = {{Boto3}: {AWS SDK} for Python},
- url = {https://boto3.amazonaws.com/v1/documentation/api/latest/index.html},
+@online{starlette,
+ title = {{Starlette}},
+ author = {Sebastián Ramírez},
+ url = {https://www.starlette.io/},
+ note = {[Online]}
}
-
-@Online{aws-sdk-js,
- author = {Amazon},
- note = {[Online]},
- title = {{AWS SDK} for {JavaScript}},
- url = {https://www.npmjs.com/package/aws-sdk},
+@online{svelte,
+ title = {{Svelte: Cybernetically enhanced web apps}},
+ author = {Rich Harris},
+ url = {https://www.svelte.dev/},
+ note = {[Online]}
}
-
-@Online{pytest-cov,
- author = {Holger Krekel and {pytest Entwicklungteam}},
- note = {[Online]},
- title = {pytest Coverage Reports},
- url = {https://pypi.org/project/pytest-cov/},
+@online{sveltekit,
+ title = {{Svelte Kit: {T}he fastest way to build {S}velte Apps}},
+ author = {Rich Harris},
+ url = {https://kit.svelte.dev/},
+ note = {[Online]}
}
-
-@Online{scratch,
- author = {{MIT Media Lab}},
- note = {[Online]},
- title = {Scratch},
- url = {https://scratch.mit.edu/projects/editor/},
+@online{tailwind,
+ title = {{Tailwind {CSS}}},
+ author = {Adam Wathan and Jonathan Reinink and David Hemphill and Steve Schoger},
+ url = {https://tailwindcss.com/},
+ note = {[Online]}
}
-
-@Online{python,
- author = {Guido van Rossum},
- note = {[Online]},
- title = {Python},
- url = {https://www.python.org},
+@online{terraform,
+ title = {{Terraform}},
+ author = {{HashiCorp}},
+ url = {https://www.terraform.io/},
+ note = {[Online]}
}
-
-@Online{opencv,
- author = {Gray Bradsky},
- note = {[Online]},
- title = {{OpenCV}: Open Source Computer Vision Library},
- url = {https://opencv.org},
+@online{tinydb,
+ title = {{TinyDB: Lightweight Document-oriented Database}},
+ author = {Markus Siemens},
+ url = {https://github.com/msiemens/tinydb},
+ note = {[Online]}
}
-
-@article{scikit-image,
- title = {scikit-image: image processing in {P}ython},
- author = {van der Walt, {S}t\'efan and {S}ch\"onberger, {J}ohannes {L}. and
- {Nunez-Iglesias}, {J}uan and {B}oulogne, {F}ran\c{c}ois and {W}arner,
- {J}oshua {D}. and {Y}ager, {N}eil and {G}ouillart, {E}mmanuelle and
- {Y}u, {T}ony and the scikit-image contributors},
- year = {2014},
- month = {6},
- keywords = {Image processing, Reproducible research, Education,
- Visualization, Open source, Python, Scientific programming},
- volume = {2},
- pages = {e453},
- journal = {PeerJ},
- issn = {2167-8359},
- url = {https://doi.org/10.7717/peerj.453},
- doi = {10.7717/peerj.453}
-}
-
-
-@Online{flask,
- author = {Pallets},
- note = {[Online]},
- title = {Flask User's Guide},
- url = {https://flask.palletsprojects.com/},
+@online{typescript,
+ title = {{TypeScript: JavaScript With Syntax For Types}},
+ author = {Microsoft},
+ url = {https://www.typescriptlang.org/},
+ note = {[Online]}
+}
+@online{uvicorn,
+ title = {{Uvicorn}},
+ author = {Sebastián Ramírez},
+ url = {https://www.uvicorn.org/},
+ note = {[Online]}
+}
+@online{virtuoso,
+ title = {{Virtuoso Universal Server}},
+ author = {OpenLink},
+ url = {https://virtuoso.openlinksw.com/},
+ note = {[Online]}
+}
+@online{vite,
+ title = {{Vite: {N}ext {G}eneration {F}rontend {T}ooling}},
+ author = {Evan You},
+ url = {https://github.com/vitejs/vite},
+ note = {[Online]}
+}
+@online{vitest,
+ title = {{Vitest: {A} {V}ite-native unit test framework}},
+ author = {Anthony Fu and Matías Capeletto},
+ url = {https://vitest.dev/},
+ note = {[Online]}
+}
+@online{vue,
+ title = {{Vue.js}},
+ author = {Evan You},
+ url = {https://vuejs.org/},
+ note = {[Online]}
+}
+@online{websocket-whatwg,
+ title = {{Origin of {WebSocket} ({IRC} logs: freenode / \#whatwg / 20080618)}},
+ author = {Ian Hickson and Michael Carter},
+ url = {https://krijnhoetmer.nl/irc-logs/whatwg/20080618#l-1145},
+ note = {[Online]}
+}
+@online{yfinance,
+ title = {{Yahoo Finance}},
+ author = {Yahoo},
+ url = {https://finance.yahoo.com},
+ note = {[Online]}
}
-
-
@Online{bibtemplate,
- author = {},
- note = {[Online]},
title = {},
+ author = {},
url = {},
+ note = {[Online]},
} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/csthm/README.md b/Master/texmf-dist/doc/latex/csthm/README.md
new file mode 100644
index 00000000000..6a3186b8a79
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/csthm/README.md
@@ -0,0 +1,89 @@
+---
+title: Theorem Environments for Computer Science (`csthm.sty`)
+linter-yaml-title-alias: Theorem Environments for Computer Science (`csthm.sty`)
+date created: Monday, March 25th 2024, 14:13:16
+date modified: Saturday, August 31st 2024, 11:32:48
+aliases: [Theorem Environments for Computer Science (`csthm.sty`)]
+---
+
+# Theorem Environments for Computer Science (`csthm.sty`)
+
+## Overview
+
+The `csthm` package provides customized theorem-like environments specifically designed for computer science documents. It offers a set of pre-defined theorem styles and environments to streamline the creation of theorems, definitions, remarks, and other common structures in computer science papers and documents.
+
+## Features
+
+- **Pre-defined theorem styles:** `thmstyle`, `defstyle`, `remarkstyle`, and `hltstyle`
+- **Theorem environments:** theorem, fact, assumption, claim, conjecture, corollary, lemma, property, proposition
+- **Definition environments:** definition, example, exercise, problem, question
+- **Remark environments:** note, remark, solution
+- **Highlight environments:** important, highlight, key-point
+- **Custom environments:** case, axiom
+- **Accent Colour:** Customizable accent colour
+- **Cleveref Support:** Optional integration with `cleveref` package
+
+## Installation
+
+1. Download the `csthm.sty` file.
+2. Place it in the same directory as your LaTeX document or in your local TeX tree.
+
+## Usage
+
+Load the package in your LaTeX document:
+
+```latex
+\usepackage{csthm}
+```
+
+To use the package with `cleveref` support:
+
+```latex
+\usepackage[cleveref]{csthm}
+```
+
+## Examples
+
+```latex
+\begin{theorem}
+ This is a theorem.
+\end{theorem}
+
+\begin{definition}
+ This is a definition.
+\end{definition}
+
+\begin{remark}
+ This is a remark.
+\end{remark}
+
+\begin{case}
+ \item This is case 1.
+ \item This is case 2.
+\end{case}
+
+\begin{axiom}
+ \item This is axiom A.
+ \item This is axiom B.
+\end{axiom}
+```
+
+## Customization
+
+To change the accent colour:
+
+```latex
+\setaccentcolor{blue}
+```
+
+## License
+
+This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3c or later is part of all distributions of LaTeX version 2008/05/04 or later.
+
+## Author
+
+Agni Datta <agnidatta.org@gmail.com>
+
+## Bug Reports and Feature Requests
+
+Please report any issues or feature requests on the package’s GitHub repository.
diff --git a/Master/texmf-dist/doc/latex/csthm/csthm-example.pdf b/Master/texmf-dist/doc/latex/csthm/csthm-example.pdf
new file mode 100644
index 00000000000..2f33de7d874
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/csthm/csthm-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csthm/csthm-example.tex b/Master/texmf-dist/doc/latex/csthm/csthm-example.tex
new file mode 100644
index 00000000000..670f632051f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/csthm/csthm-example.tex
@@ -0,0 +1,407 @@
+\documentclass{ltxdoc}
+
+% Encoding and Fonts
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{amsfonts}
+\usepackage{amsmath}
+\usepackage{amssymb}
+\usepackage{lmodern}
+
+% Geometry and Layout
+\usepackage{csquotes}
+\usepackage[a4paper, margin=3.5cm]{geometry}
+\usepackage{microtype}
+\usepackage{parskip}
+\usepackage[onehalfspacing]{setspace}
+
+% Code Listings
+\usepackage{listings}
+\lstset{%
+ basicstyle=\scriptsize\ttfamily,
+ breaklines=true,
+ frame=single,
+ columns=fullflexible,
+ numbers=left,
+ numberstyle=\tiny\ttfamily\color{gray},
+ breakindent=0pt
+}
+
+% Colors and Hyperlinks
+\usepackage{xcolor}
+\usepackage[pdfusetitle, colorlinks=true, linkcolor=blue, urlcolor=violet]{hyperref}
+\usepackage{xurl}
+
+% Theorem-like Environments
+\usepackage{csthm}
+
+\definecolor{darkgreen}{rgb}{0,0.5,0}
+
+\newcommand{\pkg}[1]{\textsf{#1}}
+\newcommand{\opt}[1]{\texttt{#1}}
+\newcommand{\env}[1]{\texttt{#1}}
+\newcommand{\cmnd}[1]{\texttt{\textbackslash#1}}
+
+\title{The \pkg{csthm} Package}
+\author{Agni Datta \\ \texttt{agnidatta.org@gmail.com}}
+\date{Version 1.2 (August 31, 2024)}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\section{Introduction}
+
+The \pkg{csthm} package provides a set of customised theorem-like environments specifically designed for computer science documents. It offers pre-defined theorem styles and environments to streamline the creation of theorems, definitions, remarks, and other common structures in computer science papers and documents.
+
+\section{Package Options}
+
+The \pkg{csthm} package supports the following option:
+
+\begin{description}
+ \item[\opt{cleveref}] Loads the \pkg{cleveref} package for enhanced cross-referencing capabilities. This option requires the \pkg{hyperref} package to be loaded before \pkg{csthm}.
+\end{description}
+
+\section{Usage}
+
+To use the package with default settings:
+
+\begin{verbatim}
+\usepackage{csthm}
+\end{verbatim}
+
+To use the package with \pkg{cleveref} support:
+
+\begin{verbatim}
+\usepackage{hyperref}
+\usepackage[cleveref]{csthm}
+\end{verbatim}
+
+\section{Theorem Styles}
+
+The package defines four theorem styles:
+
+\begin{description}
+ \item[thmstyle] Used for theorems, lemmas, corollaries, etc.
+ \item[defstyle] Used for definitions, examples, problems, etc.
+ \item[remarkstyle] Used for remarks, notes, solutions, etc.
+ \item[hltstyle] Used for highlighted content like important points.
+\end{description}
+
+\section{Predefined Environments}
+
+\subsection{Theorem-like Environments}
+
+\begin{itemize}
+ \item \env{theorem}
+ \item \env{fact}
+ \item \env{assumption}
+ \item \env{claim}
+ \item \env{conjecture}
+ \item \env{corollary}
+ \item \env{lemma}
+ \item \env{property}
+ \item \env{proposition}
+\end{itemize}
+
+Usage:
+\begin{verbatim}
+\begin{theorem}[Optional Title]
+ Theorem content...
+\end{theorem}
+\end{verbatim}
+
+\subsection{Definition-like Environments}
+
+\begin{itemize}
+ \item \env{definition}
+ \item \env{example}
+ \item \env{exercise}
+ \item \env{problem}
+ \item \env{question}
+\end{itemize}
+
+Usage:
+\begin{verbatim}
+\begin{definition}[Optional Title]
+ Definition content...
+\end{definition}
+\end{verbatim}
+
+\subsection{Remark-like Environments}
+
+\begin{itemize}
+ \item \env{note}
+ \item \env{remark}
+ \item \env{solution}
+\end{itemize}
+
+Usage:
+\begin{verbatim}
+\begin{remark}[Optional Title]
+ Remark content...
+\end{remark}
+\end{verbatim}
+
+\subsection{Highlight Environments}
+
+\begin{itemize}
+ \item \env{important}
+ \item \env{highlight}
+ \item \env{keypoint}
+\end{itemize}
+
+Usage:
+\begin{verbatim}
+\begin{important}[Optional Title]
+ Important content...
+\end{important}
+\end{verbatim}
+
+\subsection{Special Environments}
+
+\subsubsection{Case Environment}
+
+The \env{case} environment provides an enumerated list for describing different cases in a proof or analysis.
+
+Usage:
+\begin{verbatim}
+\begin{case}[Optional arguments for enumerate]
+ \item Case 1: ...
+ \item Case 2: ...
+\end{case}
+\end{verbatim}
+
+\subsubsection{Axiom Environment}
+
+The \env{axiom} environment provides an enumerated list for stating axioms.
+
+Usage:
+\begin{verbatim}
+\begin{axiom}[Optional arguments for enumerate]
+ \item Axiom 1: ...
+ \item Axiom 2: ...
+\end{axiom}
+\end{verbatim}
+
+\section{Customization}
+
+\subsection{Accent Color}
+
+You can customise the accent colour used in the package by redefining the \cmnd{accentcolor} command:
+
+\begin{verbatim}
+\renewcommand{\accentcolor}{blue}
+\end{verbatim}
+
+Or use the provided command:
+
+\begin{verbatim}
+\setaccentcolor{blue}
+\end{verbatim}
+
+\subsection{QED Symbol}
+
+The package redefines the QED symbol to a filled black square. You can customise this by redefining the \cmnd{qedsymbol} command:
+
+\begin{verbatim}
+\renewcommand\qedsymbol{$\square$}
+\end{verbatim}
+
+\section{Examples}
+
+Here are some examples demonstrating the usage of various environments:
+
+\begin{theorem}[Complexity of Bubble Sort]
+ The time complexity of the Bubble Sort algorithm is $\mathcal{O}(n^2)$ in the worst and average cases, where $n$ is the number of elements to be sorted.
+\end{theorem}
+
+\begin{proof}
+ Bubble Sort uses two nested loops to compare and swap adjacent elements. The outer loop runs $n-1$ times, and the inner loop runs $n-i-1$ times for each iteration $i$ of the outer loop. This results in approximately $n^2/2$ comparisons, leading to a time complexity of $\mathcal{O}(n^2)$.
+\end{proof}
+
+\begin{definition}[Big O Notation]
+ For functions $f(n)$ and $g(n)$, we say $f(n) = \mathcal{O}(g(n))$ if there exist positive constants $c$ and $n_0$ such that $0 \leq f(n) \leq cg(n)$ for all $n \geq n_0$.
+\end{definition}
+
+\begin{remark}
+ While Bubble Sort has a worst-case time complexity of $\mathcal{O}(n^2)$, it can be useful for small datasets or nearly sorted arrays due to its simplicity and in-place sorting nature.
+\end{remark}
+
+\begin{important}
+ Understanding time and space complexity is crucial for designing efficient algorithms and selecting appropriate data structures.
+\end{important}
+
+\begin{case}
+ \item Best Case: The time complexity is $\mathcal{O}(n \log n)$ when the pivot always divides the array into two halves.
+ \item Average Case: The expected time complexity is $\mathcal{O}(n \log n)$ with random pivot selection.
+ \item Worst Case: The time complexity is $\mathcal{O}(n^2)$ when the pivot is always the smallest or largest element.
+\end{case}
+
+\begin{axiom}
+ \item Axiom of Extensionality: Two sets are equal if and only if they have the same elements.
+ \item Axiom of Pairing: For any two sets $a$ and $b$, there exists a set $\{a, b\}$ that contains exactly $a$ and $b$ as its elements.
+\end{axiom}
+
+\section{Requirements}
+
+The \pkg{csthm} package requires the following packages:
+
+\begin{itemize}
+ \item \pkg{amsmath}
+ \item \pkg{amssymb}
+ \item \pkg{amsthm}
+ \item \pkg{enumitem}
+ \item \pkg{thmtools}
+\end{itemize}
+
+If the \opt{cleveref} option is used, the \pkg{hyperref} package must be loaded before \pkg{csthm}.
+
+\section{Version History}
+
+\begin{description}
+ \item[v1.0 (2024/08/31)] Initial version
+ \item[v1.1 (2024/08/31)] Added \opt{cleveref} support
+ \item[v1.2 (2024/08/31)] Improved documentation, code structure, and added to CTAN
+\end{description}
+
+\section{License}
+
+This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in:
+
+\url{http://www.latex-project.org/lppl.txt}
+
+and version 1.3c or later is part of all distributions of LaTeX version 2008/05/04 or later.
+
+\section{Feedback and Contributions}
+
+For bug reports, feature requests, or general feedback, please contact the package maintainer, Agni Datta, at \texttt{\hyperlink{mailto:agnidatta.org@gmail.com}{agnidatta.org@gmail.com}}.
+
+Contributions to the package are welcome. Please submit pull requests or issues to the package's GitHub repository.
+
+\section{Package Source Code}
+
+The following listing shows the source code of the \texttt{csthm.sty} file:
+
+\lstinputlisting{csthm.sty}
+
+\appendix
+
+\section{Real-Life Usage Examples}
+
+\subsection{Theorem Environments}
+
+The \pkg{csthm} package provides several theorem-like environments commonly used in computer science literature:
+
+\begin{theorem}[Graph Colouring]
+ For any graph $G$, the chromatic number $\chi(G)$ is the minimum number of colours needed to colour the vertices of $G$ such that no two adjacent vertices share the same colour.
+\end{theorem}
+
+\begin{lemma}[Sum of Odd Numbers]
+ For every positive integer $n$, the sum of the first $n$ odd numbers is equal to $n^2$.
+\end{lemma}
+
+\begin{proof}
+ We can prove this by induction on $n$:
+
+ \begin{case}
+ \item \textbf{Base case:} For $n=1$, the first odd number is 1, and $1^2 = 1$. The statement holds.
+
+ \item \textbf{Inductive step:} Assume the statement holds for some $k \geq 1$. We need to prove it for $k+1$.
+
+ The $(k+1)$-th odd number is $2k+1$. So, we have:
+
+ $\sum_{i=1}^{k+1} (2i-1) = \sum_{i=1}^k (2i-1) + (2k+1)$
+
+ $= k^2 + (2k+1)$ (by induction hypothesis)
+
+ $= k^2 + 2k + 1$
+
+ $= (k+1)^2$
+
+ Thus, the statement holds for $k+1$, completing the proof.
+ \end{case}
+\end{proof}
+
+\begin{corollary}[Sum of Integers]
+ The sum of the first $n$ positive integers is given by $\frac{n(n+1)}{2}$.
+\end{corollary}
+
+\begin{proposition}[Even Sum Property]
+ The sum of two even integers is always even.
+\end{proposition}
+
+\begin{conjecture}[Goldbach's Conjecture]
+ Every even integer greater than 2 can be expressed as the sum of two prime numbers.
+\end{conjecture}
+
+\subsection{Definition and Example Environments}
+
+To introduce key definitions and illustrative examples:
+
+\begin{definition}[Tree]
+ A \emph{tree} is a connected, undirected graph with no cycles.
+\end{definition}
+
+\begin{example}[Binary Tree]
+ Consider a binary tree with 7 nodes labelled from 1 to 7:
+ \begin{verbatim}
+ 1
+ / \
+ 2 3
+ / \ / \
+ 4 5 6 7
+ \end{verbatim}
+ This tree has 3 levels, and each parent node has at most 2 children.
+\end{example}
+
+\subsection{Remark Environments}
+
+To include remarks and notes that highlight important observations:
+
+\begin{remark}
+ While all trees are graphs, not all graphs are trees. A graph must be acyclic and connected to be classified as a tree.
+\end{remark}
+
+\begin{note}
+ Many conjectures, like Goldbach's Conjecture, remain unproven for centuries despite numerous verified instances. This highlights the complexity of certain mathematical problems.
+\end{note}
+
+\subsection{Highlight Environments}
+
+To emphasise crucial points within the document:
+
+\begin{important}
+ Algorithm efficiency is critical in computer science. Always consider time and space complexity when designing and analysing algorithms.
+\end{important}
+
+\begin{keypoint}
+ Understanding the P vs NP problem is fundamental in computational complexity theory and has significant implications for algorithm design and cryptography.
+\end{keypoint}
+
+\subsection{Case Environment}
+
+Used to present distinct cases in an argument or proof:
+
+\begin{theorem}[Factorial Definition]
+ The factorial of a non-negative integer $n$, denoted as $n!$, is defined as follows:
+\end{theorem}
+
+\begin{case}
+ \item When $n = 0$, $0! = 1$ (by definition).
+ \item When $n > 0$, $n! = n \times (n-1) \times \cdots \times 2 \times 1$.
+\end{case}
+
+\subsection{Axiom Environment}
+
+To enumerate foundational axioms in formal proofs:
+
+\begin{axiom}
+ \item For any sets $A$ and $B$, $A \cup B = B \cup A$ (Commutative Law of Union).
+ \item For any sets $A$, $B$, and $C$, $A \cap (B \cup C) = (A \cap B) \cup (A \cap C)$ (Distributive Law).
+ \item For any set $A$, $A \cup \emptyset = A$ (Identity Law of Union).
+\end{axiom}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
index 3178395f766..e2ccf7af24c 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
@@ -17,6 +17,20 @@ and this project adheres to
+## [2.7.0] - 2024-09-27
+
+### Added
+- Warning, if the CSV file does not contain (accepted) data lines
+
+### Changed
+- Comment lines or empty line before header line are now supported (issue #41)
+- If there is no data line, `late after head` and `late after last line` are applied nonetheless
+ (loosely connected to issue #41). Note: You should not use files without data!
+- Technical information: The package documentation is now produced with lualatex instead of pdflatex
+- Technical information: The documentation loads `minted2`, if it exists, to avoid encoding errors and latexmk problems with minted v3
+
+
+
## [2.6.1] - 2024-05-16
### Changed
diff --git a/Master/texmf-dist/doc/latex/csvsimple/README.md b/Master/texmf-dist/doc/latex/csvsimple/README.md
index 29196c03e9b..47c07daf070 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/README.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+# The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
> Copyright (c) 2008-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
index c8d933c684d..12141768f52 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
@@ -1,5 +1,5 @@
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple-doc.sty: style file for the documentation
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%%
%% This work consists of all files listed in README.md
%%
-\def\version{2.6.1}%
-\def\datum{2024/05/16}%
+\def\version{2.7.0}%
+\def\datum{2024/09/27}%
\IfFileExists{csvsimple-doc.cfg}{\input{csvsimple-doc.cfg}}{}\providecommand\csvpkgprefix{}
@@ -55,6 +55,7 @@
\RequirePackage{longtable,booktabs,ifthen,etoolbox}
+\IfFileExists{minted2.sty}{\RequirePackage{minted2}}{}
\RequirePackage{tcolorbox}
\tcbuselibrary{skins,xparse,minted,breakable,documentation,raster}
@@ -112,4 +113,4 @@
\makeindex
-\pdfsuppresswarningpagegroup=1
+%\pdfsuppresswarningpagegroup=1
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
index f85684f6d10..b9168300894 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
index 0baf2183c7b..73b321be2b1 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
index f17b9183c38..66d770fefed 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
index 6c70fa30036..fba06f66600 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
@@ -1,7 +1,7 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -1027,14 +1027,14 @@ see Section~\ref{subsec:tabsupport} from page~\pageref{subsec:tabsupport}.
\clearpage
\subsection{Header Processing and Column Name Assignment}%
-\begin{docCsvKey}{head}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
- If this key is set, the first line of the CSV file is treated as a header
+\begin{docCsvKey}[doc updated=2024-09-18]{head}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
+ If this key is set, the first non-empty line of the CSV file is treated as a header
line which can be used for column name assignments.
\end{docCsvKey}
\begin{docCsvKey}{no head}{}{no value}
- Abbreviation for |head=false|, i.\,e. the first line of the CSV file is
+ Abbreviation for |head=false|, i.\,e. the first non-empty line of the CSV file is
treated as data line.
Note that this option cannot be used in combination with
the |\csvauto...| commands like \refCom{csvautotabular}, etc.
@@ -1842,6 +1842,7 @@ completeness, but are unlikely to be used directly.
\subsection{Special Characters}\label{subsec:specchar}
Be default, the CSV content is treated like normal \LaTeX\ text, see
Subsection~\ref{macrocodexample} on page~\pageref{macrocodexample}.
+For example, \%~can be used to start an in-line comment.
But, \TeX\ special characters of the CSV content may also be interpreted
as normal characters (|\catcode| 12, other), if one or more of the following options are used.
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
index 6138c507e32..25285b6379f 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
index ae40e8563dc..2161afddb29 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
index 8d148b5a6fd..a5cb3da2e54 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
index 73d34f4c34c..f3a5d66953c 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
+%% The LaTeX package csvsimple - version 2.7.0 (2024/09/27)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
index cc05bf618ab..212a2da0c9e 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
index 6c09fb0f57b..abfa9021a9c 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-en.tex
@@ -34,8 +34,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.2.0}
-\def\TPdate{26/08/2024}
+\def\TPversion{0.2.3}
+\def\TPdate{09/14/2024}
\usepackage{tcolorbox}
\sethlcolor{lightgray!25}
\NewDocumentCommand\MontreCode{ m }{%
@@ -59,7 +59,7 @@
{\Huge \texttt{customenvs [en]}}\\
\\
{\Large Some custom environments,} \\
- {\Large with spacing enhancements.} \\
+ {\Large or small patches.} \\
\end{tabular}
\renewcommand\arraystretch{1}
@@ -111,7 +111,13 @@
\section{History}
-\verb|v0.1.9|~:~~~~Skills with stars (\textsf{fontawesome5} or \TikZ)
+\verb|v0.2.3|~:~~~Highway signs + sold banners (see \textsf{[fr]} doc)
+
+\verb|v0.2.2|~:~~~Flared arrow, with \TikZ
+
+\verb|v0.2.1|~:~~~Enhancements for \textit{stars skills} + AutoGrid for \TikZ\ (see \textsf{[fr]} doc)
+
+\verb|v0.2.0|~:~~~~Skills with stars (\textsf{fontawesome5} or \TikZ)
\verb|v0.1.9|~:~~~~Title banner
@@ -665,4 +671,47 @@ It's possible to redefine \MontreCode{\textbackslash part} (for example).
\tkzLevelStars[colframe=red,colback=yellow,maxlevel=5]{3}
\end{demohigh}
+\subsection{Flared arrow}
+
+\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+\tkzFlaredArrow[%
+ color=..., %color of arrow
+ arrowsize=..., %size (auto or H/W )
+ bend=..., %empty for straigth or left/... or right/...
+ thickness=..., %size for the beginning
+ factor=..., %factor for calculing size for ending
+ arrowstyle=..., %style (arrows.meta)
+ move=... %boolean for moving instead coordinates
+ ]%
+ {begin}{end or move}
+\end{codehigh}
+
+\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+%arrow 0.5mm -> 1.25mm
+\begin{tikzpicture}
+\tkzFlaredArrow%
+ [thickness=0.5mm,factor=2.5,bend=left/30,color=red,arrowstyle=Triangle]%
+ {0,0}{5,1.5}
+\end{tikzpicture}
+\end{demohigh}
+
+\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
+\begin{tikzpicture}
+ \draw[thin,lightgray] (-3,-1) grid (5,5) ;
+ \coordinate (A) at (0,0) ; \coordinate (B) at (4,1) ;
+ \coordinate (C) at (1,1) ; \coordinate (D) at (5,4) ;
+ \coordinate (E) at (0,1) ; \coordinate (F) at (0,5) ;
+ \coordinate (G) at (-2,0) ;
+ \tkzFlaredArrow[color=green,arrowstyle=Triangle]{A}{B}
+ \tkzFlaredArrow[color=blue,bend=right/10]{D}{C}
+ \tkzFlaredArrow%
+ [color=red,bend=left/45,arrowstyle=Stealth,thickness=0.1mm,factor=10]%
+ {-2,1}{0,4}
+ \tkzFlaredArrow%
+ [color=red,bend=right/45,thickness=0.1mm,factor=10,arrowstyle=Stealth]%
+ {-2,1}{0,4}
+ \tkzFlaredArrow[color=teal,move,bend=left/10]{-3,-1}{5,1}
+ \end{tikzpicture}
+\end{demohigh}
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
index 4059d5dfa20..4c5cd3cd2f2 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
index 13058113c22..5f319afb89e 100644
--- a/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/customenvs/customenvs-doc-fr.tex
@@ -39,10 +39,11 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.2.0}
-\def\TPdate{26 août 2024}
+\def\TPversion{0.2.3}
+\def\TPdate{14 septembre 2024}
\usepackage{tcolorbox}
\tcbuselibrary{listingsutf8}
+%\usepackage{eurosym}
\newtcblisting{DemoCode}[1]{%
enhanced,width=0.95\linewidth,center,%
bicolor,size=title,%
@@ -50,6 +51,8 @@
colbacklower=cyan!1!white,%
colframe=cyan!75!black,%
listing options={%
+ inputencoding=utf8,
+ %literate={`E}{{€}}{1},
breaklines=true,%
breakatwhitespace=true,%
style=tcblatex,basicstyle=\small\ttfamily,%
@@ -62,14 +65,14 @@
keywordstyle={\color{blue}},%
classoffset=1,%
alsoletter={-},%
- morekeywords={center,justify,\LstDeuxNiv,\LstTroisNiv,\LstQuatreNiv,\NoticeDeuxNiv,\NoticeTroisNiv,\NoticeQuatreNiv,\DeuxNivBatterie,\TroisNivBatterie,\QuatreNivBatterie,\DeuxNivSmiley,\TroisNivSmiley,\QuatreNivSmiley,\vcenterfa,\faIcon,part,RenewDocumentCommand,IfBooleanTF},%
+ morekeywords={center,justify,\LstDeuxNiv,\LstTroisNiv,\LstQuatreNiv,\NoticeDeuxNiv,\NoticeTroisNiv,\NoticeQuatreNiv,\DeuxNivBatterie,\TroisNivBatterie,\QuatreNivBatterie,\DeuxNivSmiley,\TroisNivSmiley,\QuatreNivSmiley,\vcenterfa,\faIcon,part,RenewDocumentCommand,IfBooleanTF,\VilleDist},%
keywordstyle={\color{violet}},%
classoffset=2,%
alsoletter={-},%
- morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt,\BandeauScore,\InsererImage,\tkzBannerTri,\NiveauDiffExos,\tkzEtoiles},%
+ morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt,\BandeauScore,\InsererImage,\tkzBannerTri,\NiveauDiffExos,\tkzEtoiles,\tkzGrilleAuto,\tkzAutoGridLocal,\tkzAutoGridActivate,\tkzFlecheEvasee,PanneauAutoroute,\AfficheSoldes},%
keywordstyle={\color{green!50!black}},%
classoffset=3,%
- morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width,Legende,CouleurFond,Hauteur,Ratio,AffLegende,Couleurs,EchelleSymboles,Symboles,vRemplir,vOffset,vCentrer,height,width,blockwidth,collight,colmedium,coldar,coltxt,fonttxt,swap,maincolor,logo,type,num,dispblock,customtype,Couleur,AlignV,Offset,NiveauMax},%
+ morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width,Legende,CouleurFond,Hauteur,Ratio,AffLegende,Couleurs,EchelleSymboles,Symboles,vRemplir,vOffset,vCentrer,height,width,blockwidth,collight,colmedium,coldar,coltxt,fonttxt,swap,maincolor,logo,type,num,dispblock,customtype,Couleur,AlignV,Offset,NiveauMax,pasX,pasY,grilleauto,TailleFleche,Direction,Coeff,TypeFleche,Deplacement,LineCap,Epaisseur,CouleurCartouche,Fleches,CouleurFond,CouleurTitre,PoliceCartouche,TypeFleche,EspacementV,OffsetFleches,Dernier,PoliceEntete,PolicePrix,PoliceReduc,OffsetReduc,AgrandirReduc},%
keywordstyle={\color{orange}}
},%
#1
@@ -149,6 +152,12 @@
\section{Historique}
+\verb|v0.2.3|~:~~~Panneaux autoroutiers + Affichettes de soldes
+
+\verb|v0.2.2|~:~~~Ajout d'une commande pour des flèches évasées, en \TikZ\
+
+\verb|v0.2.1|~:~~~Amélioration de la gestion des étoiles pour des niveaux de difficultés + Grille auto pour \TikZ\
+
\verb|v0.2.0|~:~~~Étoiles pour des niveaux de difficultés (compatible avec \texttt{EnvtExo})
\verb|v0.1.9|~:~~~Bannière de titre + Insertion d'images en remplissage vertical
@@ -216,7 +225,10 @@ Les packages chargés sont :
\item \MontreCode{tabularray} ;
\item \MontreCode{xcolor} ;
\item \MontreCode{fontawesome5} ;
- \item \MontreCode{tikz} avec les librairies \MontreCode{decorations.pathmorphing,positioning,shapes.misc,calc}.
+ \item \MontreCode{tikz} avec les librairies :
+ \begin{itemize}
+ \item \MontreCode{decorations.pathmorphing,positioning,shapes.misc,calc,arrows,arrows.meta}.
+ \end{itemize}
\end{itemize}
À noter que, pour des raisons de compatibilité (ou d'incompatibilité), les packages \MontreCode{enumitem}/\MontreCode{multicol}/\MontreCode{tabularray}/\MontreCode{xcolor}/\MontreCode{fontawesome5} peuvent ne pas être chargés par \MontreCode{customenvs} (auxquels cas l'utilisateur devra les avoir chargés pour faire fonctionner certains environnements) via les options :
@@ -1413,6 +1425,117 @@ Il est de ce fait \textit{normalement} possible (à vérifier quand même\ldots)
\pagebreak
+\subsection{Panneaux autoroutiers}
+
+L'idée est de proposer des panneaux type \textit{autoroutes}, réalisés via \MontreCode{tcolorbox}.
+
+Le style global est fixé, mais des éléments de personnalisations sont possibles..
+
+\begin{DemoCode}{listing only}
+\begin{PanneauAutoroute}[clés]{titre}
+%contenu
+\end{PanneauAutoroute}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\begin{PanneauAutoroute}{A4}
+REIMS\hfill~145\\
+PARIS\hfill~250
+\end{PanneauAutoroute}
+\end{DemoCode}
+
+Les clés, optionnelles et entre \MontreCode{[...]} sont :
+
+\begin{itemize}
+ \item \MontreCode{Fleches} : nombre de flèches à afficher (\MontreCode{0} par défaut)
+ \item \MontreCode{CouleurFond} : couleur de fond (\MontreCode{blue} par défaut)
+ \item \MontreCode{CouleurTitre} : couleur de la boîte \textit{titre} (\MontreCode{red} par défaut)
+ \item \MontreCode{Largeur} : largeur du panneau (\MontreCode{10cm} par défaut)
+ \item \MontreCode{Police} : police du panneau
+ \item \MontreCode{PoliceCartouche} : police du titre
+ \item \MontreCode{TypeFleche} : flèche(s) à afficher
+ \item \MontreCode{EspacementV} : interligne (\MontreCode{2.5mm} par défaut)
+ \item \MontreCode{Dernier} : booléen pour préciser que la boîte sera la dernière de la série (pour l'espace après).
+\end{itemize}
+
+\begin{DemoCode}{}
+\begin{PanneauAutoroute}[Largeur=\linewidth,Dernier=false]{TD01}
+ \VilleDist{COMPETENCE 1}{\faCheck} %macro interne pour afficher une ligne
+ \VilleDist*{COMPETENCE 2}{\faCheck} %macro pour afficher la dernière ligne
+\end{PanneauAutoroute}
+
+\begin{PanneauAutoroute}%
+ [CouleurFond=olive,Fleches=2,Police=\bfseries\huge\fontfamily{phv}\selectfont]{}
+ LILLE\hfill~301\\
+ AMIENS\hfill~213
+\end{PanneauAutoroute}
+\end{DemoCode}
+
+\pagebreak
+
+\subsection{Affichettes de soldes}
+
+L'idée est de proposer des petites affichettes pour des réductions, réalisées via \MontreCode{tcolorbox} (sur une idée de \textit{Sébastien Lozano}).
+
+Le style global est fixé, mais des éléments de personnalisations sont possibles..
+
+\begin{DemoCode}{listing only}
+\AfficheSoldes[clés]{prix avant}{prix après}{réduction}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\AfficheSoldes{99\texteuro}{79\texteuro}{-20\%}
+\end{DemoCode}
+
+Les clés, optionnelles et entre \MontreCode{[...]} sont :
+
+\begin{itemize}
+ \item \MontreCode{Couleur} : couleur principale (\MontreCode{gray} par défaut)
+ \item \MontreCode{Largeur} : largeur (\MontreCode{auto} ou par défaut) à définir
+ \item \MontreCode{PoliceEntete} : police du titre
+ \item \MontreCode{PolicePrix} : police des prix
+ \item \MontreCode{PoliceReduc} : police de la réduction
+ \item \MontreCode{Titre} : titre de l'affiche (\MontreCode{GRANDE DÉMARQUE} par défaut)
+ \item \MontreCode{OffsetReduc} : \textit{pente} pour le bandeau de réduction (\MontreCode{1.25cm} par défaut)
+ \item \MontreCode{AgrandirReduc} : augmenter la hauteur de la partie réduction
+\end{itemize}
+
+Donc la hauteur est fixée par \textit{calculs}, et également la largeur si \MontreCode{Largeur=auto}.
+
+La largeur \MontreCode{auto} permet de faire \textit{marcher} des prix jusque \MontreCode{99\,999\,€}.
+
+\begin{DemoCode}{}
+\AfficheSoldes{99\texteuro}{79\texteuro}{-20\,\%}~%
+\AfficheSoldes[Couleur=red]{99\texteuro}{79\texteuro}{-20\,\%}~%
+\AfficheSoldes[Couleur=blue]{\ldots\texteuro}{79\texteuro}{-20\,\%}~%
+\AfficheSoldes[Couleur=teal]{\ldots}{\ldots}{\ldots}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\AfficheSoldes[%
+ Couleur=magenta,%
+ Largeur=6cm,%
+ PoliceEntete=\huge\sffamily\bfseries,%
+ PolicePrix=\ttfamily,%
+ PoliceReduc=\bfseries\Huge\sffamily,%
+ AgrandirReduc=8mm
+ ]%
+ {1\,500\texteuro}{1\,299\texteuro}{-\ldots\,\%}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\AfficheSoldes[%
+ Couleur=cyan,%
+ PoliceEntete=\bfseries\huge\fontfamily{qhv}\selectfont,%
+ PolicePrix=\fontfamily{qhv}\selectfont,%
+ PoliceReduc=\bfseries\Huge\fontfamily{qhv}\selectfont,%
+ AgrandirReduc=1cm
+ ]%
+ {\makebox[1cm]{\dotfill}\texteuro}{1\,299\texteuro}{-30\,\%}
+\end{DemoCode}
+
+\pagebreak
+
\section{Patchs divers}
\subsection{Gérer l'espacement vertical du mode hors-ligne}
@@ -1520,4 +1643,158 @@ La clé \MontreCode{vCentrer} (parmi \MontreCode{m/h/b/n} permet de spécifier u
\InsererImage<vRemplir,vOffset=5mm,vCentrer=m>{example-image}
+\subsection{Grille automatique pour les environnements tikzpicture}
+
+L'idée est de proposer de quoi afficher, en \textit{surimpression}, une grille automatique sur une figure \MontreCode{tikzpicture}.
+
+Cela peut-être utile dans la construction de graphes ou de figures géométriques pour placer plus facilement des objets.
+
+\smallskip
+
+Il est possible de :
+
+\begin{itemize}
+ \item demander ponctuellement l'affichage avec une macro à placer en fin d'environnement ;
+ \item automatiser l'affichage pour une figure avec une \MontreCode{clé} et une macro locale ;
+ \item automatiser l'affichage pour toutes les figures avec une macro globale et une \MontreCode{clé}.
+\end{itemize}
+
+\textbf{\large Version manuelle}
+
+\begin{DemoCode}{listing only}
+%macro locale, utilisation ponctuelle
+\begin{tikzpicture}
+ %codes
+ \tkzGrilleAuto(*){pasX§pasY}
+\end{tikzpicture}
+\end{DemoCode}
+
+La version étoilée marque également l'origine $(0;0)$.
+
+L'argument obligatoire permet de spécifier les pas (\texttt{H§V}) pour la grille.
+
+\begin{DemoCode}{}
+\begin{tikzpicture}
+ %population
+ \draw[very thick,purple] (0,0) circle[x radius=3cm,y radius=2cm] ;
+ \draw[purple] (0.5,1.25) node[font=\small] {Population E} ;
+ %ss population
+ \draw[very thick,teal] (-0.75,-0.25) circle[x radius=1.75cm,y radius=1cm] ;
+ \draw[teal] (-0.75,-0.25) node[font=\small] {Sous-population A} ;
+ %grille auto manuelle, avec origine
+ \tkzGrilleAuto*{0.5§0.5}
+\end{tikzpicture}
+\end{DemoCode}
+
+\textbf{\large Version automatique locale, avec clé}
+
+\begin{DemoCode}{listing only}
+%clé locale, utilisation ponctuelle
+\begin{tikzpicture}[grilleauto=pasX§pasY]
+ \tkzAutoGridLocal(*)
+ %codes
+\end{tikzpicture}
+\end{DemoCode}
+
+La version étoilée marque également l'origine $(0;0)$.
+
+\begin{DemoCode}{}
+\begin{tikzpicture}[x=0.5cm,y=0.5cm,grilleauto=0.25§0.25]
+ %grille (qui sera affichée en dernier)
+ \tkzAutoGridLocal*
+ %triangle
+ \draw[very thick,red] (-4,-2)--(0,7)--(6,1)--cycle ;
+ %cercle
+ \draw[very thick,blue] (0,0) circle[radius=5] ;
+ %segment
+ \draw[very thick,orange] (-1.75,1.25)--(1,-7);
+\end{tikzpicture}
+\end{DemoCode}
+
+\textbf{\large Version automatique globale, avec clé}
+
+\begin{DemoCode}{listing only}
+%préambule, la commande sera active pour tous les environnements tikz
+\tkzAutoGridActivate(*)
+
+%document
+\begin{tikzpicture}[grilleauto=pasX§pasY]
+ %codes
+\end{tikzpicture}
+\end{DemoCode}
+
+La version étoilée marquera également l'origine $(0;0)$.
+
+\pagebreak
+
+\subsection{Flèche évasée, en \TikZ}
+
+L'idée est de proposer une commande, en \TikZ, pour représenter une flèche évasée, avec des paramètres optionnels.
+
+\begin{DemoCode}{listing only}
+\tkzFlecheEvasee[clés]{départ}{arrivée ou déplacement}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\begin{tikzpicture}
+ \tkzFlecheEvasee{0,0}{5,1.5}
+\end{tikzpicture}
+\end{DemoCode}
+
+Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont :
+
+\begin{itemize}
+ \item \MontreCode{Couleur=...} : couleur de la flèche ;
+ \item \MontreCode{Epaisseur=...} : taille initiale du trait (\MontreCode{0.5mm} par défaut) ;
+ \item \MontreCode{Direction=...} : direction de la flèche, avec angle éventuel ;
+ \item \MontreCode{Coeff=...} : coefficient pour la taille finale du trait (\MontreCode{4} par défaut) ;
+ \item \MontreCode{TypeFleche=...} : type de la flèche, issue de \MontreCode{arrows.meta} ;
+ \item \MontreCode{TailleFleche=...} : booléen pour la taille de la partie flèche (\MontreCode{auto} par défaut), en langage \MontreCode{arrows.meta} ;
+ \item \MontreCode{Deplacement} : booléen pour spécifier qu'on travaille avec un déplacement pour l'arrivée.
+\end{itemize}
+
+Le premier argument obligatoire, permet de spécifier le nœud de départ ou les coordonnées du point de départ.
+
+Le second argument obligatoire, permet de spécifier le nœud d'arrivée ou les coordonnées du point d'arrivée, mais également le déplacement dans le cas ou \MontreCode{Deplacement=true}.
+
+\medskip
+
+Par défaut, et en mode \MontreCode{auto} :
+
+\begin{itemize}
+ \item le début du trait mesure \MontreCode{Epaisseur=0.5mm} ;
+ \item la fin du trait mesure \MontreCode{4*Epaisseur=2mm} ;
+ \item les dimensions de la flèche sont \MontreCode{H=2*4*Epaisseur=4mm} et \MontreCode{L=2.1*4*Epaisseur=4.2mm}.
+\end{itemize}
+
+À noter que pour les flèches type \MontreCode{Stealth}, un ajustement est sans doute à prévoir pour compenser le \textit{creux}.
+
+\begin{DemoCode}{}
+%flèche 0.5mm -> 1.25mm
+\begin{tikzpicture}
+ \tkzFlecheEvasee%
+ [Epaisseur=0.5mm,Coeff=2.5,Direction=left/30,Couleur=red,TypeFleche=Triangle]%
+ {0,0}{5,1.5}
+\end{tikzpicture}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\begin{tikzpicture}
+ \draw[thin,lightgray] (-3,-1) grid (5,5) ;
+ \coordinate (A) at (0,0) ; \coordinate (B) at (4,1) ;
+ \coordinate (C) at (1,1) ; \coordinate (D) at (5,4) ;
+ \coordinate (E) at (0,1) ; \coordinate (F) at (0,5) ;
+ \coordinate (G) at (-2,0) ;
+ \tkzFlecheEvasee[Couleur=green,TypeFleche=Triangle]{A}{B}
+ \tkzFlecheEvasee[Couleur=blue,Direction=right/10]{D}{C}
+ \tkzFlecheEvasee%
+ [Couleur=red,Direction=left/45,TypeFleche=Stealth,Epaisseur=0.1mm,Coeff=10]%
+ {-2,1}{0,4}
+ \tkzFlecheEvasee%
+ [Couleur=red,Direction=right/45,Epaisseur=0.1mm,Coeff=10,TypeFleche=Stealth]%
+ {-2,1}{0,4}
+ \tkzFlecheEvasee[Couleur=teal,Deplacement,Direction=left/10]{-3,-1}{5,1}
+\end{tikzpicture}
+\end{DemoCode}
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.pdf b/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.pdf
index 16a8d7d3e6b..aed4fe853c8 100644
--- a/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.pdf
+++ b/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.tex b/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.tex
index a91733525b5..d32d06230a2 100644
--- a/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.tex
+++ b/Master/texmf-dist/doc/latex/customenvs/envtexo_exemples.tex
@@ -15,7 +15,7 @@
\setlength{\parindent}{0pt}
\begin{document}
-
+
\pagestyle{empty}
\begin{EnvtExo}%exo1
@@ -42,7 +42,7 @@
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\begin{EnvtExo}[Decoration=Image/goku_ssj4]%exo7
+\begin{EnvtExo}[Etoiles=2,Decoration=Image/goku_ssj4]%exo7
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
@@ -50,36 +50,36 @@
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\begin{EnvtExo}[Decoration=tkzEtoiles/3.5§5]%exo8
+\begin{EnvtExo}[Decoration=tkzEtoiles/3.5§5]%exo9
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\begin{EnvtExo}[Decoration=Points/7]%exo9
+\begin{EnvtExo}[Decoration=Points/7]%exo10
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\begin{EnvtExo}[Type=Perso/{Titre perso }]%exo10
+\begin{EnvtExo}[Type=Perso/{Titre perso },Etoiles={2.5§5}]%exo11
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\StyleEnvtExo[Couleur=red,,CouleurDeco=teal,Police=\bfseries\ttfamily,EpTrait=2pt,Libelle={Exercice n°}]
+\StyleEnvtExo[Couleur=red,CouleurDeco=teal,Police=\bfseries\ttfamily,EpTrait=2pt,Libelle={Exercice n°}]
-\begin{EnvtExo}[Decoration=Icone/\faAddressBook]%exo11
+\begin{EnvtExo}[Decoration=Icone/\faAddressBook]%exo12
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles]%exo12
+\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles,Etoiles=0.5]%exo13
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
\StyleEnvtExoDefaut
\begin{EnvtExo}%
- [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo13
+ [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo14
\ipsum<Lang=FR,Type=sent>
\end{EnvtExo}
-\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo14
+\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo15
\ipsum<Lang=FR,Type=sent>
diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md
index a04be06f54d..2d2798797e0 100644
--- a/Master/texmf-dist/doc/latex/easybook/README.md
+++ b/Master/texmf-dist/doc/latex/easybook/README.md
@@ -1,5 +1,5 @@
# The `easybook` document class
-Easily typesetting Chinese theses or books (v2024dj)
+Easily typesetting Chinese theses or books (v2024ee)
## Abstract
`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 54a5f7024cf..b89d5741e42 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 02adc43f5f6..dfd80ec600d 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024dj,
- date = 2024/08/14,
+ version = v2024ee,
+ date = 2024/10/03,
authors = 瞿毅,
info = 简便地排版中文学ä½è®ºæ–‡æˆ–书ç±,
email = toquyi@163.com,
@@ -282,8 +282,8 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
载入用户é…置的文件å列表,文件列表以花括å·åŒ…裹并以英文逗å·åˆ†éš”。文件å应包å«å¦‚ \code{tex}ã€\code{def} 或 \code{cfg} 等扩展å。若é…置文件ä¸åœ¨å½“å‰æ–‡ä»¶å¤¹åˆ™æ–‡ä»¶å需è¦åŒ…å«è·¯å¾„ï¼Œå³ \code{path/file.cfg}。
\keychoice{floatpage}{true,\fbox{false}}
å¼€å¯è¿™ä¸ªé€‰é¡¹åŽæµ®åŠ¨çŽ¯å¢ƒ \env{table} å’Œ \env{figure} 的比例å‚数会使用默认值。关闭它则尽å¯èƒ½é¿å…出现浮动页,使图表环境与正文段è½æ›´åŠ ç´§å‡‘,å‡å°‘多余的空白版é¢ã€‚
- \keychoice{theorem}{\fbox{true},false}
- 是å¦æ供定ç†åŠŸèƒ½æ”¯æŒã€‚选项开å¯æ—¶å®šç†æ¨¡å—生效,此时会载入 \pkg*{amsthm} å’Œ \pkg*{thmtools} å®åŒ…。
+ \keychoice{theorem}{\fbox{thmtools},keytheorems,false}\newtagv[Changed]{2024ea}%
+ 是å¦æ供定ç†åŠŸèƒ½æ”¯æŒï¼Œå®šç†æ¨¡å—的介ç»å¯è§\ref{subsec:theorem}。选项 \code{thmtools} 会载入 \pkg*{amsthm} å’Œ \pkg*{thmtools} å®åŒ…,选项 \code{keytheorems} 会载入 \pkg*{keytheorems} å®åŒ…,选项 \code{false} ä¸è½½å…¥å®šç†åŠŸèƒ½å®åŒ…。
\end{cnltxlist}
\subsection{é…置字体}
@@ -395,7 +395,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\keychoice{withpart}{true,\fbox{false}}
使章标题跟éšéƒ¨åˆ†è®¡æ•°å™¨ç¼–å·ï¼Œä»…在导言区有效。当开å¯æ–°çš„部分标题时章编å·ä»Ž1开始。
\keychoice{fntnumwith}{part,\fbox{chapter},page}
- 设置脚注跟éšç¼–å·çš„计数器,仅在导言区有效。默认跟éšç« è®¡æ•°å™¨ï¼Œå³å¼€å¯æ–°çš„章标题时脚注编å·ä»Ž1开始。
+ 设置脚注é‡ç½®ç¼–å·çš„æ–¹å¼ï¼Œä»…在导言区有效。默认跟éšç« è®¡æ•°å™¨ï¼Œå³å¼€å¯æ–°çš„章标题时脚注编å·ä»Ž1开始。选项 \code{page} 代表的是æ¢é¡µè€Œä¸æ˜¯é¡µè®¡æ•°å™¨ï¼Œè¿™æ˜¯ç”±äºŽåœ¨ä¸€äº›æŽ’版情况下æ¢é¡µåŽé¡µè®¡æ•°å™¨ä»ä¸ºä¸Šé¡µçš„值。
\keychoice{uppercase}{\fbox{all},first,none,none*}
使用 \cs{rightmark} å’Œ \cs{leftmark} 等标题标记命令获å–标题内容用于页眉页脚时其中英文的大å°å†™ç±»åž‹ã€‚\code{all} 为标题标记中的英文字æ¯å…¨éƒ¨å¤§å†™ã€‚\code{first} 为标记以英文起始时仅第一个字æ¯å¤§å†™ã€‚\code{none} ä¸æ”¹å˜æ ‡è®°ä¸­è‹±æ–‡å­—æ¯çš„大å°å†™å½¢å¼ï¼Œå˜ä½“ \code{none*} 则强制标记的字æ¯å‡ä¸ºå°å†™å½¢å¼ã€‚
\kvsplit{tagform}{左括å·,å³æ‹¬å·}\Default{\Marg{(,)}}
@@ -446,10 +446,6 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\begin{cnltxlist}
\keyval{linespread}{数值}\Default{1.354}
正文行è·å› å­ã€‚中文主题下行è·å› å­åˆå§‹å€¼ä¸º \code{1.354}(相当于 \textsf{Word} çš„1.25å€è¡Œè·ï¼‰ï¼Œå¦‚果设置了文类或 \pkg*{ctex} å®åŒ…的全局行è·é€‰é¡¹ \option{linespread} 则åˆå§‹å€¼è®¾ä¸ºå®ƒçš„值。
- \keyval{tabspread}{数值}\Default{1.354}
- 表格内容行è·å› å­ï¼Œå¯¹ä¼ ç»Ÿè¡¨æ ¼ \env{tabular} å’Œ \env{tabularx} 等环境生效。\pkg*{tabularray} å®åŒ…çš„ \env{tblr} 环境自带 \option*{stretch} å’Œ \option*{rowsep} 等行间è·é€‰é¡¹ï¼Œè¿™é‡Œä¸åšè°ƒæ•´ã€‚
- \keyval{mathspread}{数值}\Default{1.2}
- 数学环境的行è·å› å­ï¼ŒåŒ…å«äº† \pkg*{amsmath} å’Œ \pkg*{mathtools} å®åŒ…æ供的公å¼çŽ¯å¢ƒã€‚
\keyval{capfig-spread}{数值}\Default{1.2}
图片题注的行è·å› å­ã€‚
\keyval{captab-spread}{数值}\Default{1.2}
@@ -462,7 +458,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
脚注内容整体的行è·å› å­ã€‚å¯ä»¥ä½¿ç”¨ \module*{hdr} æ¨¡å— \option{fnpara-format} 选项的代ç å•ç‹¬è¦†ç›–æ¯ä¸ªè„šæ³¨çš„è¡Œè·ï¼Œä»Žè€Œä½¿è„šæ³¨é—´å’Œå†…容文本自身的行è·ä¸åŒã€‚
\begin{ctexexam}
\ebspaceset{fntspread = 1.3}
- \ebhdrset{fnpara-format = \linespread{1.2}\selectfont}
+ \ebhdrset{fnpara-format = \usestretch{1.2}}
\end{ctexexam}
\keyval{everyspread}{数值}
统一设置上述所有的行è·å› å­ã€‚
@@ -470,6 +466,21 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
行间公å¼ä¸Žä¸Šé¢æ­£æ–‡é—´çš„é¢å¤–è·ç¦»ã€‚
\keyval{belowdisplayskip}{弹性长度}\Default{0.5ex plus .1ex minus .1ex}
行间公å¼ä¸Žä¸‹é¢æ­£æ–‡é—´çš„é¢å¤–è·ç¦»ã€‚
+ \begin{cnltxlist}
+ \command{usestretch}[\marg{数值}]\newtagv{2024dt}%
+ 设置之åŽæ–‡æœ¬çš„è¡Œè·ã€‚å¯åœ¨ä»»æ„地方使用,作用范围为局部。
+ \environment{usespace}[\marg{数值}]\newtagv{2024dt}%
+ 设置环境内文本的行è·ã€‚å¯åŒ…å«è¡Œé—´å…¬å¼å’Œè¡¨æ ¼ç­‰çŽ¯å¢ƒã€‚
+ \begin{ctexexam}
+ \begin{usespace}{1.5}\nointerlineskip
+ \ebspaceset{belowdisplayskip = 6pt}
+ \begin{align}
+ \cos 2x &= \cos^2 x - \sin^2 x \\
+ &= 2\cos^2 x - 1
+ \end{align}
+ \end{usespace}
+ \end{ctexexam}
+ \end{cnltxlist}
\end{cnltxlist}
\subsection[部件字体]{部件字体\smodule{font}}
@@ -491,7 +502,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{ebaddtofont}[\marg{字体类型}\marg{字体命令}]
用于在上述å„ç§å­—体原有的格å¼ä¸Šé™„加代ç ã€‚其中 \meta{字体命令} 也å¯ä»¥åŒ…括行è·å‘½ä»¤ä¸”相对于 \module*{space} 模å—具有优先性,ä¸åŒé¢˜æ³¨çš„ \meta{字体类型} 则为相应选项的åŽç¼€å。
\begin{ctexexam}
- \ebaddtofont{every}{\linespread{1.5}\selectfont}
+ \ebaddtofont{every}{\usestretch{1.5}}
\ebaddtofont{footnote}{\sffamily}
\end{ctexexam}
\end{cnltxlist}
@@ -535,10 +546,10 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\subsection[定ç†]{定ç†\smodule{thmt}}
\label{subsec:theorem}
-定ç†æ¨¡å— \module*{thmt} ç”± \pkg*{thmtools} å®åŒ…æ供支æŒï¼Œä¸»è¦æ供了定ç†çŽ¯å¢ƒå’Œæ ·å¼å£°æ˜Žä¸¤ä¸ªå‘½ä»¤ã€‚定ç†çŽ¯å¢ƒå£°æ˜Žå‘½ä»¤ \cs{declaretheorem} 使用的定ç†æ ·å¼ç”±æ ·å¼å£°æ˜Žå‘½ä»¤ \cs{declaretheoremstyle} æ供。文档类未预声明任何定ç†çŽ¯å¢ƒï¼Œå¦‚果声明定ç†çŽ¯å¢ƒæ—¶ä¸æŒ‡å®šæ ·å¼ï¼Œåˆ™ä½¿ç”¨é»˜è®¤å®šç†æ ·å¼ \code{default},å¯ä»¥å¯¹å®ƒé‡æ–°å®šä¹‰ã€‚
+定ç†æ¨¡å— \module*{thmt} æ ¹æ®å…¨å±€é€‰é¡¹ \option{theorem} 的设置å¯ä»¥ç”± \pkg*{thmtools} 或 \pkg*{keytheorems} å®åŒ…æ供支æŒã€‚\pkg*{keytheorems} å®åŒ…使用 \hologo{LaTeX3} 编写,它的定ç†åŠŸèƒ½æ›´å®Œå–„并且æ供了 \pkg*{thmtools} å®åŒ…大部分的功能,但å‘布日期较新(2024å¹´9月)还未被广泛使用,下é¢ä¸»è¦ä»‹ç»ä¼ ç»Ÿçš„ \pkg*{thmtools} å®åŒ…的功能。\pkg*{thmtools} æ供了定ç†çŽ¯å¢ƒå’Œæ ·å¼å£°æ˜Žä¸¤ä¸ªå‘½ä»¤ï¼Œæ–‡æ¡£ç±»æœªé¢„声明任何定ç†çŽ¯å¢ƒï¼Œå¦‚果声明定ç†çŽ¯å¢ƒæ—¶ä¸æŒ‡å®šæ ·å¼ï¼Œåˆ™ä½¿ç”¨é»˜è®¤å®šç†æ ·å¼ \code{default},å¯ä»¥å¯¹å®ƒé‡æ–°å®šä¹‰ã€‚
\begin{cnltxlist}
- \command{declaretheorem}[\oarg{键值列表1}\marg{环境å}\oarg{键值列表2}]
- 定ç†çŽ¯å¢ƒå£°æ˜Žå‘½ä»¤ã€‚å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,其中常用的选项如下:
+ \command{declaretheorem}[\oarg{键值列表1}\marg{环境å列表}\oarg{键值列表2}]
+ \pkg*{thmtools} 的定ç†çŽ¯å¢ƒå£°æ˜Žå‘½ä»¤ã€‚\pkg*{thmtools} å®åŒ…中此命令实际相当于 \cs{newtheorem},无法强制创建定ç†çŽ¯å¢ƒï¼Œè¿™é‡Œä¿®å¤äº†è¿™ä¸ªé—®é¢˜ã€‚å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,常用的选项如下:
\keyval{name}{定ç†å}
定ç†çŽ¯å¢ƒçš„标题å称,默认为英文首字æ¯å¤§å†™çš„环境å。
\keychoice{numbered}{no,\fbox{yes},unless unique}
@@ -559,7 +570,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\tcolorboxenvironment{lemma}{tc-easyboxi}
\end{ctexexam}
\command{declaretheoremstyle}[\oarg{键值列表1}\marg{定ç†æ ·å¼}\oarg{键值列表2}]
- 定ç†æ ·å¼å£°æ˜Žå‘½ä»¤ï¼Œé”®å€¼åˆ—表支æŒè‡ªèº«ä»¥åŠå®šç†å£°æ˜Žå‘½ä»¤ \cs{declaretheorem} 的所有选项。å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,其中支æŒçš„选项如下:
+ \pkg*{thmtools} 的定ç†æ ·å¼å£°æ˜Žå‘½ä»¤ï¼Œé”®å€¼åˆ—表支æŒè‡ªèº«ä»¥åŠå®šç†å£°æ˜Žå‘½ä»¤ \cs{declaretheorem} 的所有选项。为命令增加了å¯é€‰å‚æ•° \meta{键值列表2},与 \meta{键值列表1} 等效,常用的选项如下:
\keyval{headfont}{字体命令}\Default{\cs*{sffamily}}
定ç†æ ‡é¢˜éƒ¨åˆ†ï¼ˆåŒ…括题注)的字体,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
\keyval{notefont}{字体命令}\Default{\cs*{sffamily}}
@@ -579,9 +590,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\kvsplit-{notebraces}{\marg{左括å·}\marg{å³æ‹¬å·}}\Default{\Marg{(}\Marg{)}}
设置定ç†é¢˜æ³¨ä¸¤è¾¹çš„括å·ï¼Œä¸¤ä¸ªå¿…选å‚数分别代表左括å·å’Œå³æ‹¬å·ã€‚
\keyval{headformat}{标题排列}
- 定ç†æ ‡é¢˜å„组æˆå…ƒç´ çš„ä½ç½®æŽ’列和格å¼ã€‚定ç†æ ‡é¢˜ç”±å®šç†åã€ç¼–å·å’Œé¢˜æ³¨ç»„æˆï¼Œ\meta{标题排列} 中命令 \cs*{NAME}ã€\cs*{NUMBER} å’Œ \cs*{NOTE} 分别代表定ç†åã€ç¼–å·å’Œé¢˜æ³¨ã€‚
- \command{theoremstyle}[\marg{定ç†æ ·å¼}]
- 设置其åŽç”± \cs{declaretheorem} 命令声明的定ç†çŽ¯å¢ƒçš„æ ·å¼ã€‚
+ 定ç†æ ‡é¢˜å„组æˆå…ƒç´ çš„ä½ç½®æŽ’列和格å¼ã€‚定ç†æ ‡é¢˜ç”±å®šç†åã€ç¼–å·å’Œé¢˜æ³¨ç»„æˆï¼Œ\meta{标题排列} 中命令 \cs*{NAME}ã€\cs*{NUMBER} å’Œ \cs*{NOTE} 分别代表定ç†åã€ç¼–å·å’Œé¢˜æ³¨ã€‚也å¯ä»¥è®¾ç½®å€¼ä¸º \code{margin} 或 \code{swapnumber},它们的编å·å‡åœ¨å®šç†åå‰æ–¹ï¼Œå…¶ä¸­ \code{margin} çš„ç¼–å·åœ¨å·¦é¡µè¾¹è·ä¸­ã€‚
下é¢å®šä¹‰ä¸€ä¸ªå为 \code{fancy} 的定ç†æ ·å¼ç”¨äºŽ \cs{declaretheorem} çš„ \option*{style} 选项:
\begin{ctexexam}[labelref = exam:new theorem sty]
@@ -597,9 +606,9 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{ctexexam}
\begin{cnltxlist}[itemsep = 0ex]
\command{listoftheorems}[\sarg\oarg{键值列表}]\default{}
- \item\key{listoftheorems}{定ç†ç›®å½•æ ‡é¢˜å}
+ \item\key{listtheoremname}{定ç†ç›®å½•æ ‡é¢˜å}
\command{settheoremtocline}[\sarg\marg{环境å}\marg{标题定义}]\newtagv{2024bb}%
- 对 \pkg*{thmtools} å®åŒ…的定ç†çŽ¯å¢ƒç›®å½•å‘½ä»¤ \cs{listoftheorems} 进行了适é…调整,\ref{subsec:directory command} å’Œ\ref{subsec:contents} 中的选项机制å‡å¯ç”¨ï¼Œä½†æ ‡é¢˜å®šä¹‰é€‰é¡¹ \option{tocline} 较为特殊,需用 \cs{settheoremtocline} 命令å•ç‹¬è®¾ç½®ã€‚在 \meta{标题定义} 中有三个命令 \cs{thmtname}ã€\cs{thmtenvname} å’Œ \cs{thmtnote} 分别代表定ç†åã€å®šç†çŽ¯å¢ƒå和题注用于排版目录æ¡ç›®ã€‚
+ 对 \pkg*{thmtools} å®åŒ…的定ç†çŽ¯å¢ƒç›®å½•å‘½ä»¤ \cs{listoftheorems} 进行了适é…调整\footnote{也对 \pkg*{keytheorems} å®åŒ…作为兼容æ供的这个命令进行了适é…。},\ref{subsec:directory command} å’Œ\ref{subsec:contents} 中的选项机制å‡å¯ç”¨ï¼Œä½†æ ‡é¢˜å®šä¹‰é€‰é¡¹ \option{tocline} 较为特殊,需用 \cs{settheoremtocline} 命令å•ç‹¬è®¾ç½®ã€‚在 \meta{标题定义} 中有三个命令 \cs{thmtname}ã€\cs{thmtenvname} å’Œ \cs{thmtnote} 分别代表定ç†åã€å®šç†çŽ¯å¢ƒå和题注用于排版目录æ¡ç›®ã€‚
\end{cnltxlist}
\optpath{thmt/}\key{loeskip}{弹性长度}\Default{10pt}
定ç†ç›®å½•ä¸­æ¯ç« ç¬¬ä¸€ä¸ªæ¡ç›®ä¸Šæ–¹å¢žåŠ çš„åž‚ç›´è·ç¦»ã€‚与 \CTeX 的表格和图片目录中æ¯ç« é—´çš„æ¡ç›®è·ç¦»é€‰é¡¹ \option*{lotskip} å’Œ \option*{lofskip} 类似,在 \cls*{article} 模å¼ä¸­æ­¤é€‰é¡¹å¤±æ•ˆã€‚
@@ -617,11 +626,21 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\thmtname\thmtifnote{[\thmtnote]}{}
}
\end{ctexexam}
+
+ 如果使用 \pkg*{keytheorems} å®åŒ…创建定ç†çŽ¯å¢ƒï¼Œå®ƒçš„目录样å¼åŒæ ·å¯ä»¥ç”¨ \module*{toc} 模å—的命令注册åŽå®šåˆ¶ï¼Œå…¶ä¸­ \option{tocline} å¯ç”¨ç›®å½•å‘½ä»¤è‡ªå¸¦çš„ \option{format-code} 选项设置:
+ \begin{ctexexam}
+ \newkeytheorem{corollary}[name = 推论]
+ \contentsuse{corollary}{thlist}
+ \RegisterTocName{corollary}
+ \begin{document}
+ \keytheoremlistset{format-code = \numberline{#2}#1#3}
+ \listofkeytheorems % 在正文中输出定ç†ç›®å½•
+ \end{ctexexam}
\end{cnltxlist}
\subsection[页é¢å°ºå¯¸]{页é¢å°ºå¯¸\smodule{geo}}
\label{subsec:page margins}
-页é¢å°ºå¯¸æ¨¡å— \module*{geo} 用于设置纸张大å°å’Œå„ç§é¡µé¢è¾¹è·ï¼Œå®ƒå°†é€‰é¡¹äº¤ç»™é¡µé¢å°ºå¯¸å®åŒ… \pkg*{geometry} 处ç†ï¼Œå¹¶ä¸”支æŒå®ƒçš„键值列表,预置的页é¢å°ºå¯¸ä¸Ž \textsf{Word} 的默认值接近。下é¢åˆ—ä¸¾å‡ ç§ \pkg*{geometry} 的代表性选项,å‰é¢æœ‰\hface 符å·çš„选项为é¢å¤–附加,其它选项å¯æŸ¥é˜…å®åŒ…帮助文档。当用此模å—设置纸张规格时,会覆盖全局选项 \option{paper} 的设置。
+页é¢å°ºå¯¸æ¨¡å— \module*{geo} 用于设置纸张大å°å’Œå„ç§é¡µé¢è¾¹è·ï¼Œå®ƒå°†é€‰é¡¹äº¤ç»™é¡µé¢å°ºå¯¸å®åŒ… \pkg*{geometry} 处ç†ï¼Œæ”¯æŒé€šç”¨æŽ¥å£ \cs{geometry} 的键值列表,预置的页é¢å°ºå¯¸ä¸Ž \textsf{Word} 的默认值接近。下é¢åˆ—ä¸¾å‡ ç§ \pkg*{geometry} ä¸åŒé”®å€¼è¾“入方å¼çš„选项,å‰é¢æœ‰\hface 符å·çš„选项为é¢å¤–附加,其它选项å¯æŸ¥é˜…å®åŒ…帮助文档。当用此模å—设置纸张规格时,会覆盖全局选项 \option{paper} çš„è®¾ç½®ã€‚æ¨¡å— \module*{geo} 的通用接å£å‘½ä»¤åªèƒ½åœ¨å¯¼è¨€åŒºä¸­ä½¿ç”¨ã€‚
\begin{cnltxlist}[itemsep = 0ex]
\keyval{headruleskip}{页眉线间è·}\dtag\Default*{0pt}
\keyval{footruleskip}{页脚线间è·}\dtag\Default*{3.5pt}
@@ -638,6 +657,31 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
vcentering
}
\end{ctexexam}
+
+ \pkg*{geometry} å®åŒ…支æŒåœ¨æ–‡æ¡£ä¸­éƒ¨æ”¹å˜é¡µé¢å°ºå¯¸ï¼Œæ供了新建和ä¿å­˜é¡µé¢å¸ƒå±€çš„命令。需è¦æ³¨æ„的是,\pkg*{fancyhdr} å®åŒ…é…置页é¢æ ‡è®°æ˜¯ä»¥æ–‡æ¡£å¼€å§‹çš„页é¢å°ºå¯¸ä¸ºå‚考,若中途更改页é¢å¸ƒå±€åŽéœ€ç”¨æ ‡è®°å移命令 \cs{fancyhfoffset} é‡ç½®å‚考的尺寸,以确ä¿æ ‡è®°ä½ç½®æ­£ç¡®ã€‚
+ \begin{cnltxlist}
+ \command{newgeometry}[\marg{键值列表}]
+ 在正文中更改页é¢å¸ƒå±€ï¼Œ\meta{键值列表} 为 \pkg*{geometry} å®åŒ…通用接å£çš„å„ç§é¡µé¢å°ºå¯¸é€‰é¡¹ã€‚
+ \command{restoregeometry}
+ æ¢å¤æ­£æ–‡å¼€å§‹æ—¶çš„页é¢å¸ƒå±€ã€‚
+ \command{savegeometry}[\marg{布局å}]
+ ä¿å­˜å½“å‰é¡µé¢å¸ƒå±€å为 \meta{布局å}。
+ \command{loadgeometry}[\marg{布局å}]
+ 载入ä¿å­˜çš„å为 \meta{布局å} 的页é¢å¸ƒå±€ã€‚
+ \begin{ctexexam}
+ L1
+ \newgeometry{left = 3cm,right = 1cm,bottom = 0.1cm}
+ \savegeometry{L2}
+ L2 (new, saved)
+ \restoregeometry
+ L1 (restored)
+ \newgeometry{margin = 1cm,includefoot}
+ L3 (new)
+ \loadgeometry{L2}
+ \fancyhfoffset{0pt}
+ L2 (loaded)
+ \end{ctexexam}
+ \end{cnltxlist}
\end{cnltxlist}
\subsection[图表题注]{图表题注\smodule{cap}}
@@ -699,7 +743,6 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
页眉横线默认的粗细,使用 \option{headrule} 选项绘制横线åŽå¤±æ•ˆã€‚
\keyval{footnoterulewd}{刚性长度}\Default{0.5pt}
脚注横线默认的粗细,使用 \option{footnoterule} 选项绘制横线åŽå¤±æ•ˆã€‚
- \begin{cnltxlist}[itemsep = 0ex]
\command{fancypagestyle}[\marg{风格å}\oarg{基础风格}\marg{风格定义}]
定义å为 \meta{风格å} 的页é¢é£Žæ ¼ã€‚\meta{风格定义} 中å¯åŒ…å«è®¾ç½®é¡µçœ‰é¡µè„šä¸åŒä½ç½®æ ¼å¼çš„命令,如果为空则等于 \code{fancy} 风格。如果存在 \meta{基础风格},则在它的基础上进行定义。
\begin{ctexexam}
@@ -710,6 +753,9 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\ebhdrset{headrule = {}}
}
\end{ctexexam}
+ \command{pagestyle}[\marg{风格å}]\Default{fancy}
+ 设置 \meta{风格å} 为当å‰åŠä¹‹åŽé¡µçš„页é¢é£Žæ ¼ã€‚
+ \begin{cnltxlist}[itemsep = 0ex]
\command{fancyhead}[\oarg{ä½ç½®}\marg{内容}]\default{}
\command{fancyfoot}[\oarg{ä½ç½®}\marg{内容}]
为了确ä¿é¡µé¢æ˜¾ç¤ºæ­£ç¡®ï¼Œä½¿ç”¨ \cs{fancyhead} å’Œ \cs{fancyfoot} 等命令设置页眉页脚时需è¦åœ¨é¡µè¾¹è·çš„命令之åŽã€‚默认设置的是一个å为 \code{fancy} 的页é¢é£Žæ ¼ã€‚\pkg*{fancyhdr} 将页眉页脚分æˆäº†å·¦ä¸­å³å’Œå¥‡æ•°é¡µï¼ˆodd)ã€å¶æ•°é¡µï¼ˆeven)共12个部分,å¯é€‰å‚数中 \code{E} å’Œ \code{O} 代表å¶æ•°å’Œå¥‡æ•°ï¼Œ\code{L}ã€\code{C} å’Œ \code{R} 代表左ã€ä¸­å’Œå³éƒ¨åˆ†ã€‚å•é¢æ‰“å°æ—¶ï¼Œå«æœ‰å¶æ•°ä½ç½®çš„命令无效。
@@ -860,11 +906,13 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\newcommand{\seqentry}[2]{#2-#1} % #2为标题内容
\ctexset{chapter/toclabel = \seqentry{#1}}
\end{ctexexam}
+ \command{hytoclink}[\marg{目录æ¡ç›®å…ƒç´ }]\newtagv{2024eb}%
+ 给目录æ¡ç›®å…ƒç´ å¢žåŠ è¶…链接,主è¦ç”¨äºŽ \option{toclabel} 选项中的标签。使用 \pkg*{titletoc} å®åŒ…æ—¶æ¡ç›®æ ‡é¢˜çš„标签超链接会缺失,这个命令å¯ä¿®å¤æ­¤é—®é¢˜ã€‚
\keyval{tocafter}{è·ç¦»å‘½ä»¤}\dtag\Default{\cs*{hspace}\Marg{1em}}
目录æ¡ç›®æ ‡ç­¾ä¸Žæ ‡é¢˜é—´çš„代ç ï¼Œé»˜è®¤ä¸ºæ’å…¥ \code{1em} 横å‘è·ç¦»ã€‚
\keyval{tocbelow}{è·ç¦»å‘½ä»¤}\dtag
在目录æ¡ç›®ä¸‹æ–¹æ‰§è¡Œçš„代ç ï¼Œå¯ä»¥æ’入垂直è·ç¦»ç­‰å‘½ä»¤ã€‚
- \keyval{tocline}{标题定义}\dtag[\textcolor{red}{\sface}]
+ \keyval{tocline}{标题定义}\dtag[\sface]
这个选项在章节标题基础上扩展了浮动环境的题注标题在目录文件中的定义。章节和题注标题选项中å‚æ•° \code{\#1} ä»£è¡¨æ ‡é¢˜ç¼–å· \cs*{the}\meta{计数器} 对应的计数器å称,å‚æ•° \code{\#2} 则代表相应标题内容。
\begin{ctexexam}
\ctexset
@@ -876,7 +924,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
tocrule = \tocrule[0.6pc](1.1){.}[\zihao{5}],
tocline = \CTEXnumberline{#1}#2
},
- section/toclabel = \contentspush{#1\hspace{0.5em}},
+ section/toclabel = \contentspush{\hytoclink{#1}\hspace{0.5em}},
section/tocrule = \tocrule-{}\makebox[1cm]{\rlap{\thecontentspage}},
toc/pagenumwd = 0pt
}
@@ -892,7 +940,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{contentsuse}[\oarg{目录层次}\marg{æ¡ç›®å}\marg{扩展å}]\newtagv[Changed]{2024ce}%
激活æ¡ç›®ç±»åž‹ä¸º \meta{æ¡ç›®å} 的目录定制功能,目录文件åŽç¼€ä¸º \meta{扩展å},若 \meta{扩展å} 为 \code{toc} 则æ¡ç›®ä¼šè‡ªåŠ¨æ¿€æ´»ã€‚å¯é€‰å‚æ•° \meta{目录层次} 为æ¡ç›®åœ¨ç›®å½•ä¸­çš„层次深度,默认值为 \code{-1000},当它大于目录深度计数器 \code{tocdepth} æ—¶ä¸æ˜¾ç¤ºã€‚图表等标题的目录æ¡ç›®æ— æ·±åº¦å› æ­¤ä¸ºé»˜è®¤å€¼ï¼Œç« èŠ‚标题 \module*{part}$\longrightarrow$\module*{subparagraph} 的深度则从 \code{-1} 到 \code{5} ä¾æ¬¡é€’增。需è¦åœ¨æ¿€æ´»æ¡ç›®åŽå†ä½¿ç”¨å‘½ä»¤ \cs{RegisterTocName} 注册选项。
\command{DeclareFloatList}[\marg{æ¡ç›®å}\marg{扩展å}]
- 声明一ç§æ¡ç›®ç±»åž‹çš„目录命令 \cs*{listof}\meta{æ¡ç›®å}\code{\textcolor{cs}{s}},并且支æŒ\ref{subsec:directory command} 中图表目录命令的机制。使用这个命令è¦ç¡®ä¿å°†æ¡ç›®åŠ å…¥ç›®å½•çš„机制已ç»å­˜åœ¨ï¼Œä¾‹å¦‚æ­é… \pkg*{newfloat} å®åŒ…创建新的浮动环境。选项å‰æœ‰å®žå¿ƒç¬¦å· \textcolor{red}{\sface}(ä»åŒ…å«ç©ºå¿ƒç¬¦å·\hface 选项的性质)表示在声明åŽå¯ç”¨ã€‚下é¢ä¸¾ä¸€ä¸ªå£°æ˜Žç®—法环境和对应题注目录的例å­ï¼š
+ 声明一ç§æ¡ç›®ç±»åž‹çš„目录命令 \cs*{listof}\meta{æ¡ç›®å}\code{\textcolor{cs}{s}},并且支æŒ\ref{subsec:directory command} 中图表目录命令的机制。使用这个命令è¦ç¡®ä¿å°†æ¡ç›®åŠ å…¥ç›®å½•çš„机制已ç»å­˜åœ¨ï¼Œä¾‹å¦‚æ­é… \pkg*{newfloat} å®åŒ…创建新的浮动环境。选项å‰æœ‰å®žå¿ƒç¬¦å·\sface(ä»åŒ…å«ç©ºå¿ƒç¬¦å·\hface 选项的性质)表示在声明åŽå¯ç”¨ã€‚下é¢ä¸¾ä¸€ä¸ªå£°æ˜Žç®—法环境和对应题注目录的例å­ï¼š
\begin{ctexexam}
\usepackage{newfloat}
\DeclareFloatingEnvironment[
@@ -901,6 +949,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
name = 算法
]{algorithm}
\DeclareFloatList{algorithm}{loa}
+ \begin{document}
\listofalgorithms[multoc] % 在正文中输出åŒæ ç®—法目录
\end{ctexexam}
\command{AssignCaptionExt}[\marg{æ¡ç›®å}\marg{扩展å}]
@@ -941,7 +990,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
悬挂缩进选项 \option{hang} 使目录æ¡ç›®ä¸ºæ‚¬æŒ‚缩进形å¼ã€‚缩进è·ç¦»ä¸ºæ¡ç›®æ ‡ç­¾åŠå…¶ä¸Žæ ‡é¢˜å†…容间è·çš„长度和。通常情况下会统一设置æ¡ç›®æ ‡é¢˜æ˜¯å¦æ‚¬æŒ‚缩进,因此这个选项被设计为对所有类型æ¡ç›®ç”Ÿæ•ˆã€‚
\keyval{lolskip}{弹性长度}\Default{10pt}
代ç ç›®å½•ä¸­æ¯ç« ç¬¬ä¸€ä¸ªæ¡ç›®ä¸Šæ–¹å¢žåŠ çš„åž‚ç›´è·ç¦»ã€‚与 \CTeX 的表格和图片目录中æ¯ç« é—´çš„æ¡ç›®è·ç¦»é€‰é¡¹ \option*{lotskip} å’Œ \option*{lofskip} 类似,在 \cls*{article} 模å¼ä¸­æ­¤é€‰é¡¹å¤±æ•ˆã€‚
- \keyval{between}{æ ¼å¼ä»£ç }\dtag[\textcolor{red}{\sface}]
+ \keyval{between}{æ ¼å¼ä»£ç }\dtag[\sface]
目录标题与æ¡ç›®å†…容间的局部钩å­ï¼ˆä½œç”¨äºŽæ ‡é¢˜ä¸‹æ–¹é—´è·ä¹‹åŽï¼‰ï¼Œå¦‚果是 \cls*{book} 模å¼åˆ™é»˜è®¤æ’å…¥ \code{-10pt} åž‚ç›´è·ç¦»æŠµæ¶ˆé¦–行目录的é¢å¤–åž‚ç›´é—´è·ï¼Œè¿™æ˜¯ç”±äºŽå›¾è¡¨å’Œ ç”± \pkg*{newfloat} å®åŒ…所创建环境的目录默认æ¯ä½¿ç”¨ä¸€æ¬¡ç« æ ‡é¢˜åœ¨é¢˜æ³¨ç›®å½•ä¸­æ’å…¥ \code{10pt} è·ç¦»ã€‚除了æ¡ç›®å的键路径外,此选项也å¯ç”¨äºŽ \module*{toc} 路径中,表示章节标题目录标题代ç é’©å­ï¼Œå¦‚果是 \cls*{book} 模å¼åˆ™é»˜è®¤æ’å…¥ \code{-1pc} åž‚ç›´è·ç¦»ã€‚
\keyval{bibetween}{æ ¼å¼ä»£ç }
与选项 \option{between} 类似,是英文章节标题目录(如果å¯ç”¨ï¼‰æ ‡é¢˜ä»£ç é’©å­ã€‚
@@ -949,8 +998,6 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
将目录页ç è£…进一个å³å¯¹é½çš„水平盒å­é‡Œã€‚这样å¯ä»¥ä½¿ç›®å½•å¼•å¯¼çº¿å³ç«¯å¯¹é½å¹¶ä¸Žé¡µç ä¿æŒä¸€å®šé—´è·ï¼Œå¦åˆ™ä¼šä¸Žé¡µç ç›¸è¿žã€‚
\keyval{pagenumwd}{刚性长度}\Default{1.55em}
è®¾ç½®å¼€å¯ \option{dotalign} 选项时页ç æ°´å¹³ç›’å­çš„宽度。
- \keychoice{fileopen}{\fbox{once},odd}
- 编译文档时打开目录文件进行写入æ“作的方å¼ï¼Œè¿™ä¸ªé€‰é¡¹å½±å“é‡å¤ä½¿ç”¨ç›®å½•å‘½ä»¤æ—¶çš„输出行为。默认åªåœ¨ç¬¬ä¸€æ¬¡ç¼–译时打开文件,选择 \code{odd} 将仅在奇数次编译时打开文件。
\keyval{tocafter-every}{è·ç¦»å‘½ä»¤}\Default{\cs*{hspace}\Marg{1em}}
统一设置所有类型æ¡ç›®ç¼–å·ä¸Žæ ‡é¢˜é—´çš„代ç ã€‚
\keyval{tocindent-every}{刚性长度}
@@ -976,7 +1023,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{DeclareInstance}[\Marg{easybook}\marg{ä½ç½®}\Marg{cover}\marg{键值列表}]
å°é¢æ¨¡æ¿å¯ç”¨ \pkg*{xtemplate} æ供的实例声明命令进行自由定制,\ref{exam:cover instance} 举例说明了定制页é¢ä¸­éƒ¨çš„内容。模æ¿ç”±é¡µé¢ä¸Šã€ä¸­å’Œä¸‹ä¸‰ä¸ªä½ç½®çš„实例组æˆï¼Œå®ƒä»¬çš„ \meta{ä½ç½®} å字分别为 \code{top}ã€\code{middle} å’Œ \code{bottom}。æ¯ä¸ªå®žä¾‹çš„属性å¯ç”¨ \meta{键值列表} 修改,包å«çš„选项如下:
\keyval{content}{实例内容}
- 设置实例内容,å¯ä»¥åŒ…å«ä»»ä½•è®°å·åˆ—表。通常为格å¼å’ŒæŽ’版内容的命令,在局部生效。
+ 设置实例内容,å¯ä»¥åŒ…å«ä»»ä½•è®°å·åˆ—表。通常为格å¼å’ŒæŽ’版内容的命令,作用范围为局部。
\keyval{beforecode}{实例å‰ä»£ç }
设置实例内容å‰çš„代ç ï¼Œå¯ä»¥åŒ…å«ä»»ä½•è®°å·åˆ—表。通常为æ¢é¡µå’Œåž‚ç›´è·ç¦»çš„命令。
\keyval{aftercode}{实例åŽä»£ç }
@@ -1033,7 +1080,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{listoflstlistings}[\sarg\oarg{键值列表}]
输出代ç ç›®å½•å‘½ä»¤ã€‚带有星å·å‚数的命令ä¸è¾“出目录标题。
- 如果需è¦éƒ¨åˆ†è€Œä¸æ˜¯å…¨æ–‡çš„目录或其它类型的目录,å¯ä»¥æŸ¥çœ‹ \pkg*{titletoc} å®åŒ…的相关示例。如果需è¦åŒè¯­å›¾è¡¨ç›®å½•ï¼Œå¯ä»¥æŸ¥çœ‹ \pkg*{bicaption} å®åŒ…的相关示例。上é¢ç›®å½•å‘½ä»¤çš„å¯é€‰å‚数改进了原本å•ä¸€çš„功能,也æ供了é…置命令 \cs{SetTocOuter} 在目录命令外设置选项默认值。
+ 如果需è¦å±€éƒ¨è€Œä¸æ˜¯å…¨æ–‡èŒƒå›´çš„目录或其它类型的目录,å¯ä»¥æŸ¥çœ‹\ref{subsec:contents} å’Œ \pkg*{titletoc} å®åŒ…的相关示例。如果需è¦åŒè¯­å›¾è¡¨ç›®å½•ï¼Œå¯ä»¥æŸ¥çœ‹ \pkg*{bicaption} å®åŒ…的相关示例。上é¢ç›®å½•å‘½ä»¤çš„å¯é€‰å‚数改进了原本å•ä¸€çš„功能,也æ供了é…置命令 \cs{SetTocOuter} 在目录命令外设置选项默认值。
\command{SetTocOuter}[\marg{键值列表}]
统一设置上述所有目录å¯é€‰å‚数的默认值\footnote{由于目录命令通常åªåœ¨æ–‡ä¸­ä½¿ç”¨ä¸€æ¬¡ï¼Œå› æ­¤ä¸è®¾è®¡ä¸ºå¯ä»¥åˆ†åˆ«æŒ‡å®šä¸åŒç›®å½•çš„å‚数。},其中 \meta{键值列表} 的选项如下:
\keyval{level}{标题命令}
@@ -1086,7 +1133,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection{åŒè¯­ç« èŠ‚标题和新建标题}
-åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ç›®å‰è®¾ç½®äº†å¸¸ç”¨çš„三个级别,它们将中文标题正常输出,并使中英文标题加入åŒè¯­ç›®å½•ã€‚类似于标准文档类,这三个标题命令分别具有独立的计数器\footnote{默认情况下与普通标题命令共享使用计数器。},并对应 \cs*{the}\meta{计数器} 的值,å¯ä»¥ç”¨äºŽ \option{number} 选项更改英文目录中标题的编å·æ ¼å¼ã€‚这个功能是为国内一些高校的学ä½è®ºæ–‡æ¨¡æ¿çš„è¦æ±‚设计,在一般情况和英文模å¼ä¸‹\textbf{ä¸éœ€è¦ä½¿ç”¨}。
+åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤å°†ä¸­æ–‡æ ‡é¢˜æ­£å¸¸è¾“出,并使中英文标题加入åŒè¯­ç›®å½•ã€‚ç›®å‰è®¾ç½®äº†å¸¸ç”¨çš„三个级别,这个功能是为国内一些高校的学ä½è®ºæ–‡æ¨¡æ¿çš„è¦æ±‚设计。类似于标准文档类,这三个标题命令分别具有独立的计数器\footnote{默认情况下与普通标题命令共享使用计数器。},并对应 \cs*{the}\meta{计数器} 的值,å¯ä»¥ç”¨äºŽ \option{number} 选项更改英文目录中标题的编å·æ ¼å¼ã€‚
\begin{cnltxlist}
\command{bichapter}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}]
\code{chapter} 章级别的åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ï¼Œå…·æœ‰ç‹¬ç«‹çš„ \code{bichapter} 计数器。
@@ -1095,7 +1142,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{bisubsection}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}]
\code{subsection} å°èŠ‚级别的åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ï¼Œå…·æœ‰ç‹¬ç«‹çš„ \code{bisubsection} 计数器。
- 它们的星å·å˜ä½“命令使文中标题ä¸ç¼–å·ï¼Œä½†æ˜¯ä»ç„¶åŠ å…¥åŒè¯­ç›®å½•ï¼Œè‹¥è‹±æ–‡æ ‡é¢˜å‚数空置那么仅加入中文目录而ä¸åŠ å…¥è‹±æ–‡ç›®å½•ï¼Œè¿™ä¸€ç‰¹ç‚¹ä¸Ž \cs*{chapter}\sarg{} 等命令的行为ä¸å¤ªä¸€æ ·ï¼Œåœ¨ä¸€äº›æƒ…况下会用到。å¯é€‰å‚数是目录中的中文æ¡ç›®ï¼Œé»˜è®¤ä¸Žä¸­æ–‡æ ‡é¢˜ä¸€è‡´ï¼Œæ­£æ–‡æ ‡é¢˜è¿‡é•¿æ—¶å¯ç”¨å®ƒè®¾ç½®åœ¨ç›®å½•ä¸­æ˜¾ç¤ºçš„标题。默认情况下åŒè¯­ç›®å½•æ¡ç›®çš„æ ¼å¼æ˜¯ä¸€è‡´çš„,共享使用 \module*{toc} 模å—的设置。æ供了两个选项 \option{biname} å’Œ \option{binumber} 修改英文目录章标题æ¡ç›®çš„åå­—åŠç¼–å·ï¼š
+ 命令的星å·å‚数使正文中的标题ä¸ç¼–å·ï¼Œä½†æ˜¯ä»ç„¶åŠ å…¥åŒè¯­ç›®å½•ï¼Œè‹¥è‹±æ–‡æ ‡é¢˜ä¸ºç©ºé‚£ä¹ˆä»…加入中文目录,这一特点与 \cs*{chapter}\sarg{} 等命令的行为ä¸å¤ªä¸€æ ·ï¼Œåœ¨ä¸€äº›æƒ…况下会用到。å¯é€‰å‚数是目录中的中文æ¡ç›®ï¼Œé»˜è®¤ä¸Žä¸­æ–‡æ ‡é¢˜ä¸€è‡´ï¼Œæ­£æ–‡æ ‡é¢˜è¿‡é•¿æ—¶å¯ç”¨å®ƒè®¾ç½®åœ¨ç›®å½•ä¸­æ˜¾ç¤ºçš„标题。默认情况下åŒè¯­ç›®å½•æ¡ç›®çš„æ ¼å¼æ˜¯ä¸€è‡´çš„,共享使用 \module*{toc} 模å—的设置。æ供了两个选项 \option{biname} å’Œ \option{binumber} 修改英文目录章标题æ¡ç›®çš„åå­—åŠç¼–å·ï¼š
\optpath{chapter/}\kvsplit+{biname}{英文目录å‰åå­—,英文目录åŽåå­—}\Default{Chapter\cs*{space}}
更改英文目录 \code{chapter} 级别的标题æ¡ç›®ç¼–å·å‰åŽå字,类似于 \CTeX çš„ \option*{name} 选项。
\optpath{chapter/}\key{binumber}{英文目录编å·è¾“出命令}\Default{\cs*{arabic}\Marg{chapter}}
@@ -1203,9 +1250,10 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection{列表}
+列表å®åŒ… \pkg*{enumitem} 为系统预置的三个列表环境æ供了çµæ´»çš„标签以åŠé—´è·æŽ§åˆ¶ã€‚
\begin{cnltxlist}
\command{setlist}[\sarg\splitoarg{列表类型,级别}\marg{键值列表}]
- 列表å®åŒ… \pkg*{enumitem} 为系统预置的三个列表环境æ供了çµæ´»çš„标签以åŠé—´è·æŽ§åˆ¶ï¼Œè¿™æ˜¯è®¾ç½®åˆ—表环境的通用接å£å‘½ä»¤ã€‚带有星å·å‚数的命令在原有格å¼ä¸Šè¡¥å……。\meta{列表类型} 是排åºåˆ—表 \code{enumerate}ã€å¸¸è§„列表 \code{itemize} 和主题列表 \code{description} 三个基本类型,也å¯ä»¥æ˜¯ \cs{newlist} 新建的定ç†çŽ¯å¢ƒï¼Œè‹¥ä¸æŒ‡å®šåˆ™è®¾ç½®æ‰€æœ‰åˆ—表类型的格å¼ã€‚è‹¥ä¸æŒ‡å®š \meta{级别} 则设置所有列表级别的格å¼ã€‚
+ 设置列表环境的通用接å£å‘½ä»¤ã€‚带有星å·å‚数的命令在原有格å¼ä¸Šè¡¥å……。\meta{列表类型} 是排åºåˆ—表 \code{enumerate}ã€å¸¸è§„列表 \code{itemize} 和主题列表 \code{description} 三个基本类型,也å¯ä»¥æ˜¯ \cs{newlist} 新建的定ç†çŽ¯å¢ƒï¼Œè‹¥ä¸æŒ‡å®šåˆ™è®¾ç½®æ‰€æœ‰åˆ—表类型的格å¼ã€‚è‹¥ä¸æŒ‡å®š \meta{级别} 则设置所有列表级别的格å¼ã€‚
\command{newlist}[\marg{列表å}\marg{列表类型}\marg{最大级别}]
克隆基本的 \meta{列表类型} 在其基础上新建一个å为 \meta{列表å} 的列表环境。ä¸è¦å°† \meta{最大级别} 设置过大以é¿å…创建过多的计数器和相关å®ã€‚
\begin{ctexexam}
@@ -1247,9 +1295,10 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection{代ç }
+代ç æŠ„录å®åŒ… \pkg*{listings} æ供了完善的代ç æŽ’版功能,并且ä¸éœ€è¦å‰ç«¯å¤„ç†å™¨ã€‚
\begin{cnltxlist}
\command{lstdefinestyle}[\marg{代ç é£Žæ ¼}\marg{键值列表}]
- 代ç æŠ„录å®åŒ… \pkg*{listings} æ供了完善的排版功能,ä¸éœ€è¦å‰ç«¯å¤„ç†å™¨ã€‚这是它的代ç é£Žæ ¼å®šä¹‰å‘½ä»¤ï¼Œæ供大é‡é€‰é¡¹å¯¹ä»£ç æ ·å¼è¿›è¡Œé«˜åº¦å®šåˆ¶ã€‚å¯ä»¥æ ¹æ®éœ€è¦çš„代ç è¯­è¨€å®šä¹‰å¤šç§é£Žæ ¼ï¼Œé»˜è®¤ä½¿ç”¨çš„ \meta{代ç é£Žæ ¼} 为适用于\TeX 语言的 \code{lst-latex}。
+ 代ç é£Žæ ¼å®šä¹‰å‘½ä»¤ï¼Œæ供大é‡é€‰é¡¹å¯¹ä»£ç æ ·å¼è¿›è¡Œé«˜åº¦å®šåˆ¶ã€‚å¯ä»¥æ ¹æ®éœ€è¦çš„代ç è¯­è¨€å®šä¹‰å¤šç§é£Žæ ¼ï¼Œé»˜è®¤ä½¿ç”¨çš„ \meta{代ç é£Žæ ¼} 为适用于\TeX 语言的 \code{lst-latex}。
\command{lstinline}[\oarg{键值列表}\marg{行内代ç }]
行内代ç æŠ„录命令。较原生的 \cs*{verb} 命令有较大改进,具有代ç è¯­è¨€å’Œæ ·å¼æ”¯æŒã€‚
\environment{lstlisting}[\oarg{键值列表}]
@@ -1349,11 +1398,15 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection{计数器}
-\begin{cnltxlist}[itemsep = 0ex]
- \command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
- \command{setcounter}[\marg{计数器}\marg{整数}]\default{}
+\begin{cnltxlist}
+ \command{newcounter}[\marg{计数器}\oarg{父计数器}]
+ 创建一个åˆå§‹å€¼ä¸º0的计数器。若 \meta{计数器} å·²ç»å­˜åœ¨åˆ™æŠ¥é”™ï¼Œè‹¥æŒ‡å®š \meta{父计数器} 则将它加入 \meta{父计数器} 的递增归零清å•ã€‚
+ \command{declarecounter}[\marg{计数器}\oarg{父计数器}]\newtagv{2024ed}%
+ 创建一个åˆå§‹å€¼ä¸º0的计数器,与 \cs{newcounter} 的区别是若 \meta{计数器} å·²ç»å­˜åœ¨ä»ä¼šå¼ºåˆ¶åˆ›å»ºã€‚
+ \command{setcounter}[\marg{计数器}\marg{整数}]
+ 将计数器的值设定为指定值。
\command{stepcounter}[\marg{计数器}]
- 常用的计数器设置命令。命令 \cs{newcounter} 创建一个åˆå§‹å€¼ä¸º0的新计数器。命令 \cs{setcounter} 将计数器的值设定为指定值。命令 \cs{stepcounter} 使计数器的值递增1。
+ 使计数器的值递增1,åŒæ—¶å®ƒçš„递增归零清å•ä¸­çš„å­è®¡æ•°å™¨å€¼å½’零。
\command{counterwithin}[\sarg\oarg{æ ¼å¼}\marg{计数器}\oarg{连字符}\marg{父计数器}]
对计数器进行绑定的命令。将 \meta{计数器} 绑定于 \meta{父计数器}ï¼Œå³ \meta{父计数器} 的值递增时 \meta{计数器} çš„å€¼ä¼šå½’é›¶ã€‚è¾“å‡ºæ ¼å¼ \cs*{the}\meta{计数器} 被定义为 \cs*{the}\meta{父计数器}\meta{连字符}\meta{æ ¼å¼}\marg{计数器}。\meta{æ ¼å¼} 一般为更改计数器编å·å½¢å¼çš„命令,默认为 \cs*{arabic}。带有星å·å‚数的命令仅进行绑定ä¸æ›´æ”¹è¾“出格å¼ã€‚
\command{counterwithout}[\sarg\oarg{æ ¼å¼}\marg{计数器}\marg{父计数器}]
@@ -1378,9 +1431,10 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection{索引}
+\pkg*{imakeidx} å®åŒ…增强了索引的功能,å¯ä½¿ç”¨æˆ·åœ¨åˆ¶ä½œå’ŒæŽ’版文档的åŒæ—¶åˆ¶ä½œä¸€ä¸ªæˆ–多个索引。
\begin{cnltxlist}
\command{indexsetup}[\marg{键值列表}]
- \pkg*{imakeidx} å®åŒ…增强了索引的功能,å¯ä½¿ç”¨æˆ·åœ¨åˆ¶ä½œå’ŒæŽ’版文档的åŒæ—¶åˆ¶ä½œä¸€ä¸ªæˆ–多个索引。这是 \pkg*{imakeidx} å®åŒ…的接å£å‘½ä»¤ï¼Œç”¨äºŽè®¾ç½®ç´¢å¼•è¡¨çš„整体格å¼ï¼Œå®ƒçš„ \option{level} å’Œ \option{headers} 选项失效。
+ 设置索引表整体格å¼çš„通用接å£å‘½ä»¤ï¼Œå®ƒçš„ \option{level} å’Œ \option{headers} 选项失效。
\command{index}[\oarg{索引å}\marg{标签}]
索引标签命令的å¯é€‰å‚æ•°å¯ä»¥ç”¨ä¸åŒçš„ \meta{索引å} 给多个索引表设置标签。
\command{makeindex}[\oarg{键值列表}]
@@ -1522,6 +1576,9 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\item 使用 \pkg*{xtemplate} å®åŒ…å°†å°é¢æ ‡é¢˜å‘½ä»¤ \cs{maketitle} 抽象为由实例组æˆçš„模æ¿ã€‚
\item æ–°å¢žå›¾è¡¨é¢˜æ³¨æ¨¡å— \module*{cap}。
\end{version}
+ \shortversion{v = 2024dq,date = 2024/09/16,changes = ä¿®å¤è„šæ³¨é‡ç½®ç¼–å·çš„æ–¹å¼ä¸º \code{page} 时在一些æ¢é¡µæƒ…况下失败的问题。}
+ \shortversion{v = 2024dt,date = 2024/09/22,changes = 新增用于设置行è·çš„命令 \cs{usestretch} 和环境 \env{usespace}。}
+ \shortversion{v = 2024ea,date = 2024/09/28,changes = 定ç†æ¨¡å— \module*{thmt} 支æŒä½¿ç”¨ \pkg*{keytheorems} å®åŒ…。}
\end{changelog}
\nocite{*}
% \AddToHook{cmd/printindex/before}{\clearpage}
diff --git a/Master/texmf-dist/doc/latex/edmac/COPYRIGHT b/Master/texmf-dist/doc/latex/edmac/COPYRIGHT
deleted file mode 100644
index 65ef9beaa49..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/COPYRIGHT
+++ /dev/null
@@ -1,16 +0,0 @@
- Copyright (C) 1990-1996 John Lavagnino and Dominik Wujastyk.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program (file "COPYING"); if not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
diff --git a/Master/texmf-dist/doc/latex/edmac/braonain.tex b/Master/texmf-dist/doc/latex/edmac/braonain.tex
deleted file mode 100644
index b9f82d94ac8..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/braonain.tex
+++ /dev/null
@@ -1,149 +0,0 @@
-\input edmac
-\firstlinenum=4
-\linenumincrement=4
-\vsize 40pc
-\hsize 24pc
-\bigskipamount=12pt plus 6pt minus 6pt
-\expandafter\let\expandafter\numlabfont\the\scriptfont0
-
-\footparagraph{A}
-\footparagraph{B}
-\footparagraph{C}
-
-
-\font\nfont = cmr7
-\let\notenumfont\nfont
-\def\notetextfont{\eightpoint\rm}
-\let\Afootnoterule=\relax
-\count\Afootins=800
-\count\Bfootins=800
-\count\Cfootins=800
-\makeatletter
-\def\xparafootfmt#1#2#3{%
- \normal@pars
- \parindent=\z@ \parfillskip=\z@ plus1fil
- {\notenumfont\printlines#1|}\enspace
-% {\select@lemmafont#1|#2}\rbracket\enskip
- \notetextfont #3\penalty-10 }
-\def\yparafootfmt#1#2#3{%
- \normal@pars
- \parindent=\z@ \parfillskip=\z@ plus1fil
-% {\notenumfont\printlines#1|}\enspace
-% {\select@lemmafont#1|#2}\rbracket\enskip
- \notetextfont #3\penalty-10 }
-\let\Afootfmt=\xparafootfmt
-\let\Bfootfmt=\xparafootfmt
-\let\Cfootfmt=\xparafootfmt
-\skip\Cfootins=\bigskipamount
-\makeatother
-\input edstanza.doc
-\stanzaindentbase=20pt % This is the default, but we include it
- % to illustrate the way it should be set.
-\setstanzavalues{sza}{4,1,2,1,2,3,3,1,2} % indent multiples; first=hangindent.
- % The above must be nonnegative whole numbers.
-\setstanzavalues{szp}{1,5000,10500,5000,10500,5000,5000,5000,0}% line penalties
- % The above must be nonnegative whole numbers.
- % If the first entry is 0, no penalties are passed on to TeX.
-\let\endstanzaextra=\bigbreak % ==> \bigskip \penalty -200
-
-\mathchardef\IMM=9999
-\def\lbreak{\hfil\penalty-\IMM} % (almost) force line break in foot paragraph
-
-
-\beginnumbering
-
-\pstart \centerline{\bf 22} \pend
-
-\bigskip
-\firstlinenum=1000 % do not print line number beside heading
-
-\let\cfootfmt=\yparafootfmt % poem heading use diffferent format
-\pstart
-\centerline{[Se\'an \'O Braon\'ain cct] chuim Tom\'ais U\'{\i}
-\text{Dh\'unlaing}\Cfootnote{{\bf 22} {\it Teideal\/}: Dhuinnluinng T,
-Se\'aghan Mac Domhnaill cct B\lbreak}/}
-\pend
-
-\pstart
-\centerline{[Fonn: M\'airse\'ail U\'{'i} Sh\'uilleabh\'ain (P\'ainseach
- na nUbh]}
-\pend
-
-\let\cfootfmt=\xparafootfmt % standard format
-
-\bigskip
-
-
-\setline{0} % reset line number
-\firstlinenum=4
-
-
-% each verse starts with \stanza . Lines end with & ; the last line with \& .
-\stanza
-A \text{dhuine}\Cfootnote{dhuinne T}/ gan ch\'eill do
-\text{mhaisligh}\Cfootnote{mhaslaidh T, mhaslaig B}/ an chl\'eir&
-is tharcaisnigh naomhscruipt na bhf\'aige,&
-na haitheanta \text{r\'eab}\Cfootnote{raob T}/ 's an t-aifreann thr\'eig&
-\text{re}\Cfootnote{le B}/ taithneamh do chlaonchreideamh Mh\'artain,&
-c\'a rachair \text{'od}\Cfootnote{dod B}/ dh\'{\i}on ar \'Iosa Nasardha&
-nuair \text{chaithfimid}\Cfootnote{chaithfam\'{\i}d T}/ cruinn
-bheith ar \text{mhaoileann}\Cfootnote{maoilinn B}/ Josepha?&
-N\'{\i} caraid Mac Crae chuim t'anama ' \text{phl\'e}\Cfootnote{phleidh T}/&
-n\'a Calvin \text{bhiais}\Cfootnote{bh\'{\i}os B}/ taobh
-\text{ris}\Cfootnote{leis B}/ an l\'a sin.\&
-\stanza
-N\'ach damanta an sc\'eal don chreachaire \text{chlaon}\Cfootnote{claon B}/&
-ghlac baiste na cl\'eire 'na ph\'aiste&
-'s do \text{glanadh}\Cfootnote{glannuig T}/ mar ghr\'ein \'on bpeaca r\'o-dhaor&
-tr\'{\i} \text{ainibhfios}\Cfootnote{ainnibhfios T, ainnbhfios B}/
-\text{\'Eva}\Cfootnote{\'Eabha B}/ rinn \'Adam,&
-tuitim ar\'{\i}s f\'e chuing na haicme sin&
-tug atharrach br\'{\i} don scr\'{\i}bhinn bheannaithe,&
-d'aistrigh b\'easa \text{agus}\Cfootnote{is B}/ reachta na cl\'eire&
-'s n\'ach \text{tugann}\Cfootnote{tuigionn T}/ aon gh\'eilleadh don Ph\'apa?\&
-
-
-\stanza
-Gach \text{scolaire}\Cfootnote{sgollaire T}/ baoth, n\'{\i}
-\text{mholaim}\Cfootnote{mholluim T}/ a cheird&
-\text{'t\'a ag obair}\Cfootnote{'t\'ag ccobar T}/ \text{le}\Cfootnote{re B}/
-g\'eilleadh d\'a th\'aille&
-don \text{doirbhchoin chlaon}\Cfootnote{dorbhchon daor B}/
-d\'a ngorthar Mac Crae,&
-deisceabal \text{straeigh}\Cfootnote{straodhaig T}/ as an gcoll\'aiste.&
-T\'a \text{\text{adaithe}\Cfootnote{fadaighthe B}/
-th\'{\i}os}\Cfootnote{fhadoghthe ts\'{\i}os T}/ in \'{\i}ochtar ifrinn,&
-gan \text{solas}\Cfootnote{sollus T}/ gan soilse i dt\'{\i}orthaibh dorcha,&
-tuigsint an l\'einn, gach \text{cuirpeacht}\Cfootnote{cuirripeacht T}/ d\'ein&
-is \text{Lucifer}\Cfootnote{Luicifer T, L\'ucifer B}/ aosta
-'na \text{mh\'aistir}\Cfootnote{mhaighistir T}/.\&
-
-\stanza
-'S \'e \text{Lucifer}\Cfootnote{Luicifir T}/ f\'ein go follas don
-\text{tsaol}\Cfootnote{ts\'aoghuill T}/&
-ar \text{aingealaibh}\Cfootnote{aingeallaibh T}/ D\'e do thug \'arghoin&
-is J\'udas 'na \text{dh\'eidh}\Cfootnote{dh\'eig T}/ do reic go soil\'eir&
-Leanbh r\'o-naomhtha na P\'aise;&
-\text{L\'uitir}\Cfootnote{L\'uter B}/ ar\'{\i}s an tr\'{\i}mhadh pearsa aco&
-fuair eochair \text{na r\'{\i}ochta bh\'{\i} l\'{\i}onta
-d'ainibhfios}\Cfootnote{na .~.~.\ d'ainibhfios] an .~.~.\ l\'{\i}onta
-mhallaightheacht B}/;&
-a ndeisceabal Crae is gach \text{nduine}\Cfootnote{nduinne T}/
-\text{d\'a chl\'eir}\Cfootnote{dh\'a cheird B}/&
-ar an obair go l\'eir do chuir pl\'ana.\&
-
-\stanza
-Mo theagasc don t\'e 't\'a ag imtheacht ar \text{strae}\Cfootnote{straodh T}/&
-a' taisteal an tsaoghail \text{re}\Cfootnote{le B}/ d\'asacht,&
-a' dalladh gach n-aon re dlithe Mhic \text{Crae}\Cfootnote{Craodh T}/&
-agus \text{B\'{\i}obla\'{\i}}\Cfootnote{b\'{\i}oblaimhe T}/
-br\'eige \text{'na}\Cfootnote{iona B}/ \text{mh\'ala}\Cfootnote{mh\'aladh T}/.&
-F\'ogair don \text{diabhal}\Cfootnote{diabhuil T}/ a gcliar 's a gcaradas&
-is f\'oirfidh ort Dia \text{'t\'a dian a' tathaint}\Cfootnote{at\'a dian
-atathant B}/ ort;&
-maithfidh Mac D\'e dhuit ar imp\'{\i} na cl\'eire&
-agus \text{ciontaigh tu \text{f\'einig}\Cfootnote{feinaidh T}/ 'na
-l\'athair}\Cfootnote{umhlaig tu fein iona l\'athair B}/.\&
-\endnumbering
-
-\bye
diff --git a/Master/texmf-dist/doc/latex/edmac/copying b/Master/texmf-dist/doc/latex/edmac/copying
deleted file mode 100644
index dffc06cacd5..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/copying
+++ /dev/null
@@ -1,281 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
diff --git a/Master/texmf-dist/doc/latex/edmac/ed-nfss.txt b/Master/texmf-dist/doc/latex/edmac/ed-nfss.txt
deleted file mode 100644
index a93835098c3..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/ed-nfss.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-File: ed-nfss.txt 19/7/94. This is a plain ascii file.
-
- Please note that the following method of using EDMAC within
- LaTeX2e is still experimental. Initial trials with real-life
- book preparation, however, seem to work well.
-
-The New Font Selection Scheme (NFSS) is the normal font-handling scheme
-used by LaTeX from version 2e (June 1994). It is described in the book
-"The LaTeX Companion" by Goossens, Mittelbach and Samarin
-(Addison-Wesley, 1993), chapter 7.
-
-To use this font scheme with EDMAC, you first need to install LaTeX2e.
-After doing this, you should have a new format file called something
-like "latex.fmt", which contains a dump of the LaTeX macros. To use
-this LaTeX2e format you might type a command like "tex &latex
-<filename>" where <filename> is the name of the TeX input file you wish
-to run through LaTeX2e.
-
-To use EDMAC and NFSS together, you will do exactly the same as running
-a normal LaTeX2e job, with the addition that you use the macro package
-"edmacfss" (i.e., edmacfss.sty) and apart from the first couple of lines
-of your EDMAC file, you treat your document as a standard EDMAC file.
-That is to say, only EDMAC and Plain TeX commands will work, and not
-LaTeX2e macros (except those required for NFSS).
-
-[In fact, this is a white lie: you may have some limited luck using a
-few other LaTeX2e commands, but this is rather hit-and-miss. In
-particular, EDMAC uses its own output routine, not LaTeX2e's, so lots
-and lots of stuff specific to the LaTeX output routine (like float
-placement) won't get executed.]
-
-Here is a sample of what an EDMAC/NFSS input file might look like:
-
---------------------------------------
-\documentclass[12pt]{article} % this starts LaTeX2e up properly, with big fonts.
-\usepackage{adobegar} % sets up LaTeX to use the Adobe Garamond font family.
-\usepackage{edmacfss} % this calls edmacfss.sty, which in turn calls edmac.doc
-
-\begin{document} % normal start of a LaTeX document
-
-\firstlinenum=1 % EDMAC macros from here on...
-\linenumincrement=1
-
-\beginnumbering
-\pstart
-First \text{paragraph}\Afootnote{This is a test.}/. End of first
-paragraph.
-\pend
-
-\pstart
-\text{Second paragraph}\Bfootnote{So is this.}/. End of second
-paragraph.
-\pend
-\endnumbering
-
-\end{document} % equally, you can say just \bye.
-
---------------------------------------
-
-Many thanks to Wayne Sullivan for suggesting this approach to accessing
-NFSS, and for providing the initial version of edmac.sty.
-
-Dominik Wujastyk
-19 July 1994.
diff --git a/Master/texmf-dist/doc/latex/edmac/edmac.doc b/Master/texmf-dist/doc/latex/edmac/edmac.doc
deleted file mode 100644
index 6327dbac6fc..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/edmac.doc
+++ /dev/null
@@ -1,7655 +0,0 @@
-% \iffalse This is a METACOMMENT
-%
-% Macro file `EDMAC' for use with Plain TeX.
-%
-% Copyright (C) 1990-1996 John Lavagnino and Dominik Wujastyk.
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%
-% John Lavagnino and Dominik Wujastyk may be contacted at the email
-% and paper mail addresses given later in this file, after the
-% string "\author".
-% \fi
-%
-% \CheckSum{3106}
-{\catcode`\$=9
-\gdef\fileversion{ $Revision: 3.17 $ }
-\gdef\filedate{ $Date: 12 Jun 1996 17:15:00 $ }}
-\def\docdate{12 June 1996}
-% \hyphenation{man-u-script man-u-scripts}
-%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
-%
-% \title{Critical Edition Typesetting\\ The {\tt EDMAC} format for
-% P{\small LAIN}\,\TeX\thanks{This file is\fileversion\unskip,
-% \filedate\unskip.}}
-%
-% \author{John Lavagnino\thanks{%
-% Women Writers Project,
-% Brown University,
-% Box 1841,
-% Providence, RI 02912, USA.
-% Internet: {\tt John\_Lavagnino@brown.edu}.}
-% \and Dominik Wujastyk\thanks{%
-% Wellcome Institute for the History of Medicine,
-% 183 Euston Road,
-% London NW1 2BE, UK.
-% Internet: {\tt D.Wujastyk@ucl.ac.uk}.}}
-% \date{}
-% \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
-% \DoNotIndex{\@flushglue,\@input}
-% \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
-% \DoNotIndex{\@namedef,\@ne,\@spaces,\@tempa}
-% \DoNotIndex{\@tempb,\@tempswafalse,\@tempswatrue}
-% \DoNotIndex{\@thanks,\@thefnmark,\@topnum}
-% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa,\@totalleftmargin}
-% \DoNotIndex{\",\/,\@ifundefined,\@nil,\@verbatim,\@vobeyspaces}
-% \DoNotIndex{\|,\~,\ ,\active,\advance,\aftergroup,\begingroup,\bgroup}
-% \DoNotIndex{\mathcal,\csname,\def,\documentstyle,\dospecials,\edef}
-% \DoNotIndex{\egroup}
-% \DoNotIndex{\else,\endcsname,\endgroup,\endinput,\endtrivlist}
-% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef,\global}
-% \DoNotIndex{\hbox,\hss,\if,\if@inlabel,\if@tempswa,\if@twocolumn}
-% \DoNotIndex{\ifcase}
-% \DoNotIndex{\ifcat,\iffalse,\ifx,\ignorespaces,\index,\input,\item}
-% \DoNotIndex{\jobname,\kern,\leavevmode,\leftskip,\let,\llap,\lower}
-% \DoNotIndex{\m@ne,\next,\newpage,\nobreak,\noexpand,\nonfrenchspacing}
-% \DoNotIndex{\obeylines,\or,\protect,\raggedleft,\rightskip,\rm,\sc}
-% \DoNotIndex{\setbox,\setcounter,\small,\space,\string,\strut}
-% \DoNotIndex{\strutbox}
-% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin,\trivlist,\tt}
-% \DoNotIndex{\twocolumn,\typeout,\vss,\vtop,\xdef,\z@}
-% \DoNotIndex{\,,\@bsphack,\@esphack,\@noligs,\@vobeyspaces,\@xverbatim}
-% \DoNotIndex{\`,\catcode,\end,\escapechar,\frenchspacing,\glossary}
-% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht,\it,\langle}
-% \DoNotIndex{\leaders,\long,\makelabel,\marginpar,\markboth,\mathcode}
-% \DoNotIndex{\mathsurround,\mbox,\newcount,\newdimen,\newskip}
-% \DoNotIndex{\nopagebreak}
-% \DoNotIndex{\parfillskip,\parindent,\parskip,\penalty,\raise,\rangle}
-% \DoNotIndex{\section,\setlength,\TeX,\topsep,\underline,\unskip,\verb}
-% \DoNotIndex{\vskip,\vspace,\widetilde,\\,\%,\@date,\@defpar}
-% \DoNotIndex{\[,\{,\},\]}
-% \DoNotIndex{\count@,\ifnum,\loop,\today,\uppercase,\uccode}
-% \DoNotIndex{\baselineskip,\begin,\tw@}
-% \DoNotIndex{\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k,\l,\m,\n,\o,\p,\q}
-% \DoNotIndex{\r,\s,\t,\u,\v,\w,\x,\y,\z,\A,\B,\C,\D,\E,\F,\G,\H}
-% \DoNotIndex{\I,\J,\K,\L,\M,\N,\O,\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z}
-% \DoNotIndex{\1,\2,\3,\4,\5,\6,\7,\8,\9,\0}
-% \DoNotIndex{\!,\#,\$,\&,\',\(,\),\+,\.,\:,\;,\<,\=,\>,\?,\_}
-% \DoNotIndex{\discretionary,\immediate,\makeatletter,\makeatother}
-% \DoNotIndex{\meaning,\newenvironment,\par,\relax,\renewenvironment}
-% \DoNotIndex{\repeat,\scriptsize,\selectfont,\the,\undefined}
-% \DoNotIndex{\arabic,\do,\makeindex,\null,\number,\show,\write,\@ehc}
-% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title,\everypar}
-% \DoNotIndex{\if@minipage,\if@restonecol,\ifeof,\ifmmode}
-% \DoNotIndex{\lccode,\newtoks,\onecolumn,\openin,\p@,\SelfDocumenting}
-% \DoNotIndex{\settowidth,\@resetonecoltrue,\@resetonecolfalse,\bf}
-% \DoNotIndex{\clearpage,\closein,\lowercase,\@inlabelfalse}
-% \DoNotIndex{\selectfont,\mathcode,\newmathalphabet,\rmdefault}
-% \DoNotIndex{\bfdefault}
-%
-% \iffalse This is a METACOMMENT
-% Everything up to the next `\ fi' (without a blank) will
-% be ignored. This is necessary because `%' may no longer
-% be a comment mark when this file is read in.
-%
-% HISTORY:
-%
-% $Log: D:/EDMAC/VCS/EDMAC.DOV $
-%
-% Rev 3.17 12 Jun 1996 17:15:00
-% o changed JL's and TUG's addresses;
-% o updated publication details of works produced with EDMAC;
-% o tidied up a bad cross-reference, etc.
-% o added several ftp and http references
-% o added the GNU license; moved (C) statement to top of file;
-% made the banner displayed when EDMAC is run conform to the GPL.
-% o added reference to CET.
-%
-% Rev 3.16 19 Jul 1994 11:17:04
-% o corrected space bug in \getref@num (thanks to Bernt Karasch);
-% changed documentation of how to use NFSS to point to an external
-% description ed-nfss.tex.
-%
-% Rev 3.15 13 May 1994 18:03:44
-% o added more comment to \morenoexpands;
-% o added example of \printlines after Sanskrit example;
-% o added more info on editions being done with EDMAC;
-% o minor tidying.
-%
-% Rev 3.14 11 May 1994 15:03:04
-% o removed a spurious space from \@lab; corrected a typo in docs.
-%
-% Rev 3.13 11 May 1994 14:01:28
-% o defined \list@clear and \list@create separately;
-% o swapped the subsections on fonts back, so NFSS is described first;
-% o rephrased all sentences with the word "default" to avoid its use.
-%
-% Rev 3.12 11 May 1994 12:03:10
-% o capitalized the footnote and endnote series letters: a-e > A-E.
-%
-% Rev 3.11 10 May 1994 15:19:54
-% o removed the optional braces from the second argument of \text
-% in the examples, and altered the documentation to match.
-%
-% Rev 3.10 10 May 1994 14:31:30
-% o changes to documentation;
-% o made \list@create same as \list@clear;
-% o added \f@encoding and \fontencoding;
-% o corrected \getref@num and \label@parse;
-% o brought the appendix examples more up to date and checked them;
-% o added more cross-references;
-% o added \selectfont to the end of NFSS-\select@@lemmafont.
-%
-% Rev 3.9 03 May 1994 11:42:36
-% o Full incorporation of edmacfss.doc. Appropriate changes in
-% documentation. New \morenoexpands macro. New \list@create
-% and \list@clear in anticipation of faster list handling.
-% Numerous running changes.
-%
-% Rev 3.8 14 Apr 1994 12:02:22
-% o revised the cross-referencing macros, which weren't working.
-%
-% Rev 3.7 31 Aug 1993 15:57:20
-% o Further changes in response to reviewer's observations. Correct
-% explanation of recursion problem with (some) aliases for \text.
-% Changed several more {\tt ...} strings to "..."; added some
-% \mbox{}s for italic in mathmode (wanted by NFSS2).
-%
-% Rev 3.6 27 Aug 1993 16:50:42
-% o made changes as recommended in the TUG publication reviewer's report.
-% Mostly changes to docs; added \edmac@warning.
-% o Added a paragraph to Known Bugs highlighting problem of line breaking
-% in paragraphed footnotes.
-%
-% Rev 3.5 23 Mar 1993 15:03:34
-% o added the corrections spotted by Gyula Mayer: some word duplications
-% and important changes to slhh.tex to make it compatible with the
-% current level of edmac.
-%
-% Rev 3.4 12 Mar 1993 13:47:32
-% o added appendix material: inclusion of EDMACFSS.DOC and
-% example page of Arabic from Klaus Lagally.
-% o cosmetic changes to some \index entries, and removal of
-% some unnecessary \Make/DeleteShortVerb statements.
-%
-% Rev 3.3 11 Mar 1993 12:56:34
-% o John's formatting revisions:
-% Fold long code lines so they don't overrun the measure.
-% Subsubsections changed to paragraphs.
-%
-% Rev 3.2 26 Feb 1993 17:55:12
-% o correction to def'n of \@adv: spotted by Klaus Lagally.
-%
-% Rev 3.1 25 Feb 1993 15:15:00
-% o small changes to documentation.
-%
-% Rev 3.1 25 Feb 1993 12:17:12
-% o small changes to documentation.
-%
-% Rev 3.0 25 Jun 1992 12:38:00
-% No change.
-%
-% Rev 2.25 25 Jun 1992 12:29:20
-% o cosmetic changes to examples and \ipn@skip use.
-%
-% Rev 2.24 22 Jun 1992 13:33:12
-% o cosmetic corrections.
-%
-% Rev 2.23 22 Jun 1992 11:22:52
-% o changed \interparanoteglue to calculate its value once and
-% stick it into a skip register, instead of evaluating afresh
-% in each footnote.
-%
-% Rev 2.22 19 Jun 1992 23:25:42
-% o added refreshed versions of arden.sty and features.tex; upgraded
-% the fonts section to a \subsection.
-%
-% Rev 2.21 19 Jun 1992 21:07:46
-% o numerous small changes by JL; \ifnumbering@ now becomes
-% \ifnumbering since users may want access to it.
-%
-% Rev 2.20 29 May 1992 13:04:26
-% o correction to ballast.
-% o brought "New to TeX?" section back into the document by default.
-%
-% Rev 2.19 26 May 1992 16:14:34
-% o tidied up the \rightskip and \leftskip code in the footstart
-% and vfootnote macros for the different kinds of notes, and
-% documented it (these skips are now zeroed in the vfootnote
-% code, not in footfmt); small corrections to docs.
-%
-% Rev 2.18 22 May 1992 17:35:02
-% o further revisions to the paragraph footnote code and documentation;
-% inserted the \ballast macros.
-%
-% Rev 2.17 18 May 1992 13:32:04
-% o more changes to the para-footnote code. Added @ to para@footgroup
-% and para@vfootnote, since I would not expect these to be easily
-% modified; managed to get para@footgroup back to pre-2.16 code,
-% i.e., as in TeXbook, with just an added \unpenalty; changed
-% \parafootfmt's parfillskip to put proper \interparanoteglue glue
-% between notes; used Michael Downes's \unvxh in para@vfootnote.
-%
-% Rev 2.16 08 May 1992 21:12:12
-% o applied several suggestions based on Wayne Sullivan's change
-% file of 27 April 1992. These included changing \normal@pars
-% to include resetting leftskip and rightskip to zero, and
-% setting \parfillskip to normal; changed \paravfootnote
-% to put the paragraphed footnotes into a \vbox rather
-% than an \hbox (reasons explained in the documentation);
-% changed \parafootgroup quite substantially in order to get
-% the para notes properly unboxed; cosmetic changes to
-% \@add and \everypar; added the macro \edfont@info to make
-% things simpler in edmacfss.doc;
-% o began to write in the \ballast macros.
-%
-% Rev 2.15 16 Apr 1992 17:16:52
-% o corrected minor spelling errors
-%
-% Rev 2.14 09 Dec 1991 16:56:46
-% o revision of \splitoff to get column vspacing right.
-% o more tidying of documentation and examples.
-%
-% Rev 2.13 05 Dec 1991 15:24:48
-% o changed \off@autopar to \normal@pars; changed \verb"xxx" to
-% just "xxx" globally, and put \MakeShortVerb{"} into the
-% driver file, edmacdoc.tex (this change requires the newdoc.sty
-% file, which supplements the doc.sty file); stripped out the
-% examples in the appendix, and put in new ones, tailored to fit
-% the changes in edmac.doc (removal of verbose definitions of
-% \eightpoint, etc.); changed \two- and \threecolfootgroup to
-% reduce the amount of boxing and reboxing of the footnote insertions
-% done in the output routine (not wholly sure about this); added
-% the periph4.tex file in the appendix (don't know how it got left
-% out in previous versions); small changes to columnar footnote
-% macros, and generally to the documentation.
-%
-% Rev 2.12 04 Dec 1991 17:13:22
-% o added Wayne Sullivan's new cross referencing macros.
-%
-% Rev 2.11 03 Dec 1991 10:17:48
-% o have added \eightpoint, and \notefontsetup; more work on
-% documentation of fonts, mentioned edmacfss.doc; put calls to
-% \notefontsetup into footnote macros, so default is now to
-% small notes; took out the separate \twocol@foottopskip etc.
-% macros, and put \notefontsetup in the right place to govern
-% \ht\footstrut.
-%
-% Rev 2.9 15 Nov 1991 17:46:06
-% o more macro name revisions; the bigee was \m@j -> \@l. All
-% list macros are now called ...@list. Modified \beginnumbering
-% to zero counters before reading the file, and took the zeroing
-% out of \readlinelist. Then added \pausenumbering and
-% \resumenumbering. More documentation. Added \endashchar,
-% \fullstop, \rbracket, and put \rbracket after the lemma in all
-% footnote commands (a better default, I think).
-%
-% Rev 2.8 12 Nov 1991 16:06:56
-% o major overhaul of macro names (w@rdw@rd -> word@word, etc.);
-% changed references to \count0 and \count255 (\count@) to
-% \@tempcntb and \@tempcnta; Changed the bitwise stuff in
-% \printlines to be done with new scratch counters.
-%
-% Rev 2.7 26 Aug 1991 18:06:10
-% o addition of line-number locking features.
-% o \global added to a few instances of \noteschanged@true.
-% o \@lnmoutstatus replaced by \first@lnmout@true and associated
-% macros.
-%
-% Rev 2.6 25 Jul 1991 11:27:52
-% o inserted new arden.sty and arden.tex (1 May 1991)
-% o altered the \rigidbalance definition to do away with spaces
-% in the arguments.
-% o added the \twocol@splittopskip and \threecol@splittopskip
-% dimensions to correct the vertical alignment in columnar
-% footnotes (reported by Paul Wackers).
-%
-% Rev 2.5 22 Apr 1991 9:11:40
-% o correction by W. Sullivan to addpenalties, avoiding use of \count0.
-%
-% Rev 2.4 08 Feb 1991 16:43:16
-% o added a fix to \addpenalti@s provided by Wayne Sullivan
-%
-% Rev 2.3 10 Jan 1991 20:47:34
-% o reduced the spacing around itemized lists.
-%
-% Rev 2.2 11 Dec 1990 23:02:16
-% o added the "general features" and "Periphyseon" examples.
-%
-% Rev 2.1 16 Oct 1990 15:35:42
-% o JL minor revisions to documentation, and editing of
-% the example files iocasta, gg, and arden.
-%
-% Rev 2.0 03 Oct 1990 14:19:38
-% No change.
-%
-% Rev 1.26 03 Oct 1990 12:49:20
-% o Did away with \inputverbatim, and wrote the example files
-% into edmac.doc itself. Added small amount of text to the Appendix.
-%
-% Rev 1.24 25 Sep 1990 15:45:06
-% o made a new \parafootstart, moving the \rightskip etc. from
-% \parafootfmt.
-%
-% Rev 1.23 25 Sep 1990 12:39:32
-% o Merged DW and JL changes; moved examples to \appendix; other
-% small changes to documentation.
-%
-% Rev 1.21 19 Sep 1990 22:23:02
-% o DW changes to documentation; changed "n@" to "@num" when it
-% meant "number"; likewise rationalized and slightly shortened
-% other macros; added parallel examples and picture of page.
-%
-% Rev 1.20 14 Sep 1990 12:39:58
-% o JL near final revision of documentation.
-%
-% Rev 1.18 22 Aug 1990 15:52:48
-% o revised crop mark code; small changes to documentation.
-%
-% Rev 1.18 20 Aug 1990 16:39:38
-% o Revised crop mark code
-%
-% Rev 1.17 20 Aug 1990 13:06:06
-% o Extensive changes in documentation.
-% o solved the \clubpenalty and \widowpenalty glitch
-%
-% Rev 1.16 13 Aug 1990
-% o \ignorespaces in \text and associated macros, to skip over any
-% stray spaces within #2.
-% o Crop marks, \autopar.
-% o More sensible error messages.
-%
-% Rev 1.15 03 Aug 1990 14:41:06
-% o Added two- and three- column footnotes.
-% o Corrected minor bugs in \parafootsetup and \parafootfmt.
-%
-% Rev 1.14 01 Aug 1990 17:58:08
-% o Added \label, \pageref, \lineref and \sublineref cross-referencing
-% commands and documentation. Small changes to documentation.
-%
-% Rev 1.13 27 Jul 1990 10:46:30
-% o Major revision by JL. (for earlier history log, see rev. 1.12)
-%
-% \fi
-%
-% \maketitle
-%
-% \iffalse % We're dropping the abstract for the book version.
-% \begin{abstract}
-% {\tt EDMAC} is a set of \PlainTeX\ macros providing the
-% ability to format critical editions of texts in the traditional
-% way, i.e., similar to the Oxford Classical Texts, Teubner, Arden
-% Shakespeare and other series. The principal functions that are
-% added are marginal line numbering and multiple series of
-% footnotes and endnotes keyed to line numbers. While {\tt EDMAC}'s
-% inner workings are necessarily esoteric, it seeks to provide
-% relatively simple macros to enable you to control the exact
-% format of the edition, taking into account the need to vary the
-% format for different sorts of texts.
-% \end{abstract}
-% \fi
-%
-% ^^A \addtocontents{toc}{\protect\begin{multicols}{2}}
-%
-% {\parskip 0pt ^^A We have to reset \parskip
-% ^^A (bug in \LaTeX)
-% \tableofcontents
-% }
-%
-%
-% \section{Introduction}
-% \subsection{Overview}
-%
-% The "EDMAC" macros, together with \TeX, provide several
-% important facilities for formatting critical editions of texts in
-% a traditional manner. Major features include:
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item automatic stepped line numbering, by page or by chapter;
-% \item sub-lineation within the main series of line numbers;
-% \item variant readings automatically keyed to line numbers;
-% \item multiple series of footnotes and endnotes;
-% \item block or columnar formatting of footnotes.
-% \end{itemize}
-%
-% "EDMAC" allows the scholar engaged in preparing a critical
-% edition to focus attention wholly on the task of creating the
-% critical text and evaluating the variant readings, text-critical
-% notes and testimonia. \TeX{} and "EDMAC" will take care of
-% the formatting and visual correlation of all the disparate types
-% of information.
-%
-% "EDMAC" works together with the \PlainTeX{} format, and with
-% the exception of footnote-related commands, virtually all plain
-% \TeX{} commands are available for use in the normal way. Other
-% languages and fonts (Sanskrit, Greek, Russian,
-% etc.),\footnote{See, e.g., {\em TUGboat\/} {\bf 9} (1988),
-% pp.\,131--151.} can be incorporated.
-%
-% While "EDMAC" can be used ``out of the box'', with little or
-% no customization, you may also go to the other extreme and view
-% it as a collection of tools. Critical editions are amongst the
-% most idiosyncratic of books (like their authors), so we have made
-% "EDMAC" deliberately bland in some ways, while also trying to
-% document it reasonably well so that you can find out how to make
-% it do what you want.
-%
-% This documentation assumes the ``manual'' use of "EDMAC". But
-% "EDMAC" has also successfully been used (with \TeX, of
-% course) as the formatting engine or ``back end'' for the output
-% of an automatic manuscript collation program. "COLLATE" runs
-% on the Apple Macintosh, can collate simultaneously up to a
-% hundred manuscripts of any length, and provides facilities for
-% the scholar to tailor the collation
-% interactively.\footnote{"COLLATE" was created by Peter
-% Robinson\protect\index{Robinson, Peter} at The Computers and
-% Variant Texts Project, Oxford University Computing Service, 13 Banbury
-% Road, Oxford OX2 6NN, England. Email: "peterr@vax.oxford.ac.uk".
-% See "<URL http://www.shef.ac.uk/uni/projects/ctp/Main/collate.html>".}
-%
-% Another package which mediates between you as editor and the raw "EDMAC"
-% codes is Bernt Karasch's ``Critical Edition Typesetter'' (CET).
-% CET\label{CET}\index{Karasch, Bernt}
-% provides a menu-driven front end for "EDMAC" and the other programs
-% connected with \TeX. CET does not do any collation: you still have to
-% type the edition and the apparatus yourself.\footnote{For more details,
-% see "<URL http://s.top.ruhr-uni-bochum.de/cet.htm>".}
-%
-% This book contains a general description of how to use "EDMAC"
-% (in section~\ref{howto}); the complete source code for the package,
-% with extensive documentation (in sections~\ref{overview}
-% through \ref{end}); a series of examples (in
-% Appendix~\ref{examples}); and an Index to the
-% source code (in Appendix~B). We do not suggest that you need to
-% read the source code for this package in order to use it; we
-% provide this code primarily for reference, and many of our
-% comments on it repeat material that is also found in
-% section~\ref{howto}. But no documentation, however
-% thorough, can cover every question that comes up, and many can be
-% answered quickly by consultation of the code. On a first reading,
-% then, you should skip from the general documentation of
-% section~\ref{howto} to the examples in Appendix~\ref{examples},
-% unless you are particularly interested in the innards of "EDMAC".
-%
-% \subsubsection{Availability}
-%
-% The "EDMAC" macros are available from CTAN, the Comprehensive \TeX\
-% Archive Network.\footnote{See "<URL http://jasper.ora.com/ctan.html/>".}
-% And "EDMAC" has it's own home page on the world wide web: see
-% "<URL http://www.ucl.ac.uk/~ucgadkw/edmac.html>".
-%
-% \subsection{History}
-%
-% The original version of "EDMAC" was "TEXTED.TEX", written
-% by John Lavagnino in late 1987 and early 1988 for formatting
-% critical editions of English plays.
-%
-% John passed these macros on to Dominik Wujastyk who, in
-% September--October 1988, added the footnote paragraphing mechanism,
-% margin swapping and other changes to suit his own purposes, making the
-% style more like that traditionally used for classical texts in Latin and
-% Greek (e.g., the Oxford Classical Texts series). He also wrote some
-% extra documentation and sent the files out to several people. This
-% version of the macros was the first to be called "EDMAC".
-%
-% The present version was developed in the summer of 1990, with the
-% intent of adding necessary features, streamlining and documenting
-% the code, and further generalizing it to make it easily adaptable
-% to the needs of editors in different disciplines. John did most
-% of the general reworking and documentation, with the financial
-% assistance of the Division of the Humanities and Social Sciences,
-% California Institute of Technology. Dominik adapted the code to
-% the conventions of Frank Mittelbach's\index{Mittelbach, Frank}
-% "doc" option, and added some documentation, multiple-column
-% footnotes, cross-references, and crop marks.\footnote{This version of
-% the macros was used to format the Sanskrit text in volume I of {\em
-% Metarules of P\=a\d ninian Grammar\/} by Dominik Wujastyk (Groningen:
-% Forsten, 1993).} A description by John and Dominik of this version of
-% "EDMAC" was published as ``An overview of "EDMAC": a \PlainTeX\
-% format for critical editions'', {\em TUGboat\/} {\bf 11} (1990),
-% pp.\,623--643.
-%
-% From 1991 through 1994, the macros continued
-% to evolve, and were tested at a
-% number of sites. We are very grateful to all the members of the
-% (now defunct)
-% "edmac@mailbase.ac.uk" discussion group who helped us with
-% smoothing out bugs and infelicities in the macros.
-% Ron Whitney\index{Whitney, Ron} and our anonymous reviewer at
-% the TUG were both of great help in ironing out last-minute
-% wrinkles, while Ron made some important suggestions which may help
-% to make future versions of "EDMAC" even more efficient.
-% Wayne
-% Sullivan,\index{Sullivan, Wayne} in particular, provided several
-% important fixes and contributions, including adapting the
-% Mittelbach\slash
-% Sch\"opf\index{Sch\"opf, Rainer}\index{Mittelbach, Frank} ``New
-% Font Selection Scheme'' for use with \PlainTeX\ and "EDMAC" (see
-% p.\,\pageref{edmacnfss} below). Another project Wayne has worked
-% on is a "DVI" post-processor which works with an "EDMAC"
-% that has been slightly modified to output "\special"s. This
-% combination enables you to recover to some extent the text of
-% each line, as {\sc ascii} code, facilitating the creation of
-% concordances, an {\em index verborum}, etc.
-%
-% At the time of writing, we are pleased to be able to say that "EDMAC"
-% is used for real-life book production. Several interesting
-% editions have appeared in print or are underway, such as
-% the Latin texts of Euclid's {\sl
-% Elements},\footnote{Gerhard Brey\index{Brey, Gerhard} used "EDMAC" in
-% the production of Hubert L. L. Busard\index{Busard, Hubert L. L.} and
-% Menso Folkerts,\index{Folkerts, Menso} {\em Robert of Chester's
-% (?)\index{Chester, Robert of} Redaction of Euclid's\index{Euclid} {\em
-% Elements}, the so-called Adelard II\index{Adelard II} Version}, 2 vols.,
-% (Basel, Boston, Berlin: Birkh\"auser, 1992).} an edition of the letters
-% of Nicolaus Copernicus,\footnote{Being prepared at the German Copernicus
-% Research Institute, Munich, under the general editorship of Heribert
-% M. Nobis\index{Nobis, Heribert M.} and Menso Folkerts\index{Folkerts,
-% Menso}; volume 1 has appeared as {\em Documenta Copernicana: Briefe
-% (Texte und \"{U}bersetzungen)}, edited by Andreas
-% K\"{u}hne\index{Kuehne, Andreas}, et al. (Berlin: Akademie Verlag,
-% 1994).}\index{Copernicus, Nicolaus} Simon
-% Bredon's\index{Bredon, Simon} {\em Arithmetica},\footnote{Being prepared
-% by Menso Folkerts {\em et al.}, at the Institut f\"ur Geschichte der
-% Naturwissenschaften in Munich.} a Latin translation by Plato of
-% Tivoli\index{Plato of Tivoli} of an Arabic astrolabe
-% text,\footnote{Richard Lorch,\index{Lorch, Richard} Gerhard
-% Brey\index{Brey, Gerhard}, Stefan Kirschner\index{Kirschner, Stefan},
-% and Christoph Sch\"{o}ner\index{Schoener, Christoph},
-% `Ibn-a\d{s}-\d{S}aff\={a}rs Traktat \"{u}ber das Astrolab in der
-% \"{U}bersetzung von Plato von Tivoli,' in {\em Cosmographica et
-% Geographica}, ed.\ Bernhard Fritscher\index{Fritscher, Bernhard} and
-% Gerhard Brey\index{Brey, Gerhard}, (M\"{u}nchen: Instit\"{u}t f\"ur
-% Geschichte der Naturwissenschaften, 1994), vol.\,1, pp.\,125--180.} a
-% Latin
-% translation of part II of the Arabic {\em Algebra\/} by Ab\=u K\=amil
-% Shuj\=a' b. Aslam,\index{Abu Kamil Shuja' b. Aslam}\footnote{Richard
-% Lorch, `Ab\=u K\=amil on the Pentagon and Decagon' in {\em Vestigia
-% Mathematica}, ed.\ M. Folkerts\index{Folkerts, Menso} and J. P.
-% Hogendijk\index{Hogendijk, J. P.} (Amsterdam, Atlanta:
-% Rodopi, 1993).} the Latin {\em Rithmachia\/} of Werinher von
-% Tegernsee,\footnote{Menso Folkerts, `Die {\em Rithmachia\/} des Werinher
-% von Tegernsee', ibid.} a middle-Dutch romance epic on the
-% Crusades,\footnote{Geert H. M. Claassens,\index{Claassens, Geert H. M.}
-% {\em De Middelnederlandse Kruisvaartromans}, (Amsterdam: Schiphower en
-% Brinkman, 1993).}
-% Johann Widmann's German arithmetic of 1489,\footnote{{\em Behend vnd
-% h\"upsch Rechnung vff allen Kauffmanschafften}, being prepared at the
-% University of Heidelberg by Barbara G\"artner\index{Gaertner, Barbara}.}
-% a seventeenth-century Hungarian politico-philosophical
-% tract,\footnote{Emil Hargittay, {\em Cs\'aky Istv\'an: Politica
-% philosophiai Okoskod\'as-szerint val\'o rendes \'eletnek p\'eld\'aja
-% (1664--1674)\/} (Budapest: Argumentum Kiad\'o, 1992).} an anonymous
-% Latin compilation of Christian sermons from Hungary\footnote{{\em
-% Sermones Compilati in Studio Gererali Quinqeecclesiensi in Regno
-% Ungarie}, ed.\ Eduardo Petrovich\index{Petrovich, Eduardo} and Paulus
-% Ladislaus Timkovics\index{Timkovics, Paulus Ladislaus} (Budapest:
-% Akad\'emiai Kiad\'o, 1993), typeset, as was the previous book, by Gyula
-% Mayer\index{Mayer, Gyula}.} the collected letters and papers of
-% Leibniz,\index{Leibniz}\footnote{Leibniz, {\em S\"amtliche Schriften und
-% Briefe}, series {\sc I, III, VII,} being edited by Dr.\ H.
-% Breger\index{Breger, Herbert} and Dr. N. G\"adeke\index{G\"adeke, Nora}
-% at the Leibniz-Archiv, Nieders\"achsische Landesbibliothek, Hannover.}
-% Theodosius's\index{Theodosius} {\em Spherics}, the German {\em
-% Algorismus} of Sacrobosco,\index{Sacrobosco} the Sanskrit text of the
-% {\em Skandapur\=a\d{na}},\footnote{Being prepared at the University of
-% Groningen by Hans Bakker,\index{Bakker, Hans} Roelf
-% Adriaensen,\index{Adriaensen, Roelf} and
-% Harunaga Isaacson.\index{Isaacson, Harunaga}} and the English texts of
-% Thomas Middleton's\index{Middleton, Thomas} collected
-% works\footnote{{\em The Collected Works of Thomas Middleton}, Gary
-% Taylor, general editor, and John Lavagnino, electronics editor (Oxford:
-% Oxford University Press, forthcoming).}, as well as the editions by
-% Wayne Sullivan\index{Sullivan, Wayne}, Mac Pigman\index{Pigman,
-% III$^{rd}$, G. W.}, and Dominik Wujastyk\index{Wujastyk, Dominik} which
-% are illustrated in Appendix~\ref{examples}.
-%
-% \subsection{New to \TeX?}
-%
-% If you are coming to "EDMAC" primarily as the editor of a
-% text, but have not thought about using \TeX\ before, you should
-% find someone to help you get started with the program. It is not
-% really hard, but there are some points where a bit of good advice
-% might save you some time. \TeX{} is available in versions that
-% run on most computers, and many implementations of \TeX\ are
-% available free, or at a very low cost. The output of \TeX\ can
-% be printed without change on most printers and phototypesetting
-% machines. \TeX\ produces very high quality typesetting, and is
-% particularly strong in the areas of typesetting complex
-% mathematical formulae and multilingual texts.
-%
-% The \TeX{} Users Group (TUG) can advise you on all matters
-% related to \TeX. If you are not already a member of the group, it
-% is well worth joining. One of the most useful things TUG will do
-% for you initially is give you a membership list, so you can find
-% out who your local \TeX\ guru is. The address is:
-% \begin{quote}
-% \TeX{} Users Group,\\* 1850 Union Street, Suite 1637,\\*
-% San Francisco, CA 94123\\* USA.\\* Email: "tug@tug.org"\\*
-% Home page: "<URL http://www.tug.org/>".
-% \end{quote}
-%
-% This document does not include a \TeX{} tutorial.
-% Recent years have seen the publication of numerous excellent books on
-% how to learn and use \TeX, and the main implementations of \TeX, such as
-% em\TeX\ by Eberhard Mattes\index{Mattes, Eberhard}, come with first
-% class documentation. In brief, when
-% you use "EDMAC" the main text to be edited is typed into a
-% computer file as a plain text, with blank lines marking paragraph
-% breaks, and with all formatting, accented characters, and other
-% special requirements indicated by \TeX{} macros. {\em The \TeX
-% book\/}\footnote{Reading, MA: Addison-Wesley, 1984.} by
-% Donald E.~Knuth gives guidelines on various formatting commands
-% for headings, page size, etc., and is a necessary
-% reference for users of "EDMAC".
-%
-%
-% \section{How to use {\tt EDMAC}}\label{howto}
-% \subsection{Introduction}
-%
-% A document that uses "EDMAC" will use many standard \TeX{}
-% commands, along with special "EDMAC" commands. This chapter
-% describes the usage of all the "EDMAC" commands; the name of
-% each will be printed in the margin as it is introduced. We assume
-% a basic familiarity with \TeX{} conventions; if you are not
-% conversant with \TeX{}, you should be able to form an idea of
-% the specific capabilities of "EDMAC" from this account, but
-% (we repeat) you will not be able to use "EDMAC" without first
-% learning some \TeX{}.
-%
-% All you need to do to invoke "EDMAC" is to include the line
-% "\input EDMAC.DOC" at the top of your document, and to have the
-% file "EDMAC.DOC" somewhere on your disk that is ``visible''
-% to \TeX{} for input. It takes only a few
-% seconds for \TeX\ to read "EDMAC.DOC", but if you
-% are going to use it frequently, as will certainly be the case if
-% you are doing a real edition, you will find it convenient to
-% compile it into a \TeX\ format file, loading it after
-% "PLAIN.TEX" and any other private macros.
-%
-% "EDMAC" {\em is a three-pass system}, like
-% \LaTeX.\footnote{Oh yes it is, if you have a table of contents,
-% lists of figures, etc.} Although your textual apparatus and line
-% numbers will be printed even on the first run, it takes two more
-% passes through \TeX\ to be sure that everything gets to its right
-% place. Any changes you make to the input file may similarly
-% require three passes to get everything to the right place, if the
-% changes alter the number of lines or notes. "EDMAC" will tell
-% you that you need to make more runs, when it notices, but it does
-% not expend the labor to check this thoroughly. If you have
-% problems with a line or two misnumbered at the top of a page, try
-% running \TeX{} once or twice more.
-%
-% A file may mix {\em numbered\/} and {\em unnumbered\/} text.
-% Numbered text is printed with marginal line numbers and can include
-% footnotes and endnotes that are referenced to those line numbers:
-% this is how you'll want to print the text that you're editing.
-% Unnumbered text is not printed with line numbers, and you can't
-% use "EDMAC"'s note commands with it: this is appropriate for
-% introductions and other material added by the editor around the
-% edited text.
-%
-% \paragraph{The choice of editing program}
-% The careful choice of a good text editing program can make the
-% preparation of texts for "EDMAC" much easier. In common with
-% most \TeX\ documents, a file formatted with "EDMAC" macros
-% will have many sets of braces, often nested, and often enclosing
-% material that will end up at the bottom of the page as notes.
-% Some word processors or editors have the ability to ``fold'' text
-% out of sight. This means that on the computer screen a particular
-% string or passage can be hidden, perhaps behind a symbol. Most
-% modern word-processors handle footnotes in this way. When you want
-% to type a note, a window opens up; you type the note, and the
-% window closes, leaving a highlighted number to remind you that
-% a note is there. There are several folding editors available
-% commercially and in the public domain, which would allow you to
-% see only the main text of your work on the computer screen, while
-% the notes and variants, etc., would be hidden from view.\footnote{One
-% cross-platform public domain folding editor is ``Andys Editor'' which is
-% available from the well-known Hobbes Internet site,
-% "<URL http://hobbes.nmsu.edu/os2/editors/>" as the file "ae.zip".}
-% GNU "Emacs" has an "outline" mode which could probably be
-% modified to work like this. (It is important, of course, that
-% the editor doesn't pepper your text with unwanted control codes,
-% or that if it does, they can easily be removed.)
-%
-% Another helpful feature to look for in your editing program is
-% syntax-highlighting. This means that the editor displays \TeX\ codes in
-% a different colour from the textual matter. This is enormously helpful
-% in keeping clear what is what: you eye easily sees opening and closing
-% braces, text and note commands, etc. One editor which combines this and
-% other valuable features, as well as being available for most operating
-% systems, is "JED", by John E. Davis.\footnote{JED's home page on the
-% web is "<URL http://space.mit.edu/~davis/jed.html>".}
-% The CET system mentioned above (p.\,\pageref{CET} uses a simplified set
-% of tags for marking up the text, and includes a pre-processor which
-% turns these into actual "EDMAC" markup.
-%
-% An editor or system like this can be extremely helpful in keeping your
-% text in good order, and allowing you to concentrate on the edition.
-%
-% \subsection{General markup}
-%
-% \DescribeMacro{\beginnumbering}
-% \DescribeMacro{\endnumbering}
-% Each section of numbered text must be preceded by
-% "\beginnumbering" and followed by "\endnumbering":
-% \begin{samepage}
-% \smallskip
-%
-% "\beginnumbering"
-%
-% $\langle${\em text\/}$\rangle$
-%
-% "\endnumbering"
-% \end{samepage}
-%
-% The "\beginnumbering" macro resets the line number to zero,
-% reads an auxiliary file called \meta{filename}"."\meta{nn} (where
-% {\it filename\/} is the name of the main input file for this job,
-% and {\it nn\/} is "1" for the first numbered section, "2" for
-% the second section, and so on), and then creates a new version of
-% this auxiliary file to collect information during this run. The
-% first instance of "\beginnumbering" also opens a file called
-% \meta{filename}".end" to receive the text of the endnotes.
-% "\endnumbering" closes the \meta{filename}"."\meta{nn} file.
-%
-% If the line numbering of a text is to be continuous from start to end,
-% then the whole text will be typed between one pair of
-% "\beginnumbering" and "\endnumbering" commands. But your text
-% will most often contain chapter or other divisions marking sections
-% that should be independently numbered, and these will be appropriate
-% places to begin new numbered sections. "EDMAC" has to read and store
-% in memory
-% a certain amount of information about the entire section when it
-% encounters a "\beginnumbering" command, so it speeds up the
-% processing and reduces memory use when a text is divided into a larger
-% number of sections (at the expense of multiplying the number of
-% external files that are generated).
-%
-% \DescribeMacro{\pstart}
-% \DescribeMacro{\pend}
-% Within a numbered section, each paragraph of numbered text must
-% be marked using the "\pstart" and "\pend" commands:
-% \begin{samepage}
-% \smallskip
-%
-% "\pstart"
-%
-% $\langle${\em paragraph of text\/}$\rangle$
-%
-% "\pend"
-%
-% \end{samepage}
-%
-% Text that appears within a numbered section but isn't marked with
-% "\pstart" and "\pend" will not be numbered.
-%
-% The following example shows the proper section and paragraph
-% markup, and the kind of output that would typically be generated:
-% \egstart
-% \begin{verbatim}
-% \beginnumbering
-% \pstart
-% This is a sample paragraph, with
-% lines numbered automatically.
-% \pend
-%
-% \pstart
-% This paragraph too has its
-% lines automatically numbered.
-% \pend
-%
-% The lines of this paragraph are
-% not numbered.
-%
-% \pstart
-% And here the numbering begins
-% again.
-% \pend
-% \endnumbering
-% \end{verbatim}
-% \egmid
-% {\parskip0pt \count255=0
-% \everypar={\advance \count255 by 1 \hbox to 1.5em{\the\count255\hfil}}
-% This is a sample paragraph\par
-% with lines numbered\par
-% automatically.\smallskip
-%
-% This paragraph too\par
-% has its lines automatically\par
-% numbered.\smallskip
-%
-% \everypar={\hbox to 1.5em{\hfil}}
-% The lines of this paragraph\par
-% are not numbered.\smallskip
-%
-% \everypar={\advance \count255 by 1 \hbox to 1.5em{\the\count255\hfil}}
-% And here the numbering\par
-% begins again.\par}
-% \egend
-%
-% \DescribeMacro{\autopar}
-% You can use "\autopar" to avoid the nuisance of this paragraph markup
-% and still have every paragraph automatically numbered. The scope of the
-% "\autopar" command needs to be limited by keeping it within a group, as
-% follows:
-% \egstart
-% \begin{verbatim}
-% \begingroup
-% \beginnumbering
-% \autopar
-%
-% A paragraph of numbered text.
-%
-% Another paragraph of numbered
-% text.
-%
-% \endnumbering
-% \endgroup
-% \end{verbatim}
-% \egmid
-% {\parskip0pt \count255=0
-% \everypar={\advance \count255 by 1 \hbox to 1.5em{\the\count255\hfil}}
-% A paragraph of numbered\par
-% text.\smallskip
-%
-% Another paragraph of\par
-% numbered text.\par}
-% \egend
-% "\autopar" fails, however, on paragraphs that start with a
-% "{" or with any other command that starts a new group before it
-% generates any text. Such paragraphs need to be started explicitly,
-% before the new group is opened,
-% using "\indent", "\noindent", or "\leavevmode", or using
-% "\pstart" itself.\footnote{For a detailed study of the
-% reasons for this restriction, see Barbara Beeton, ``Initiation
-% rites'', {\em TUGboat\/} {\bf 12} (1991),
-% pp.\,257--258.\protect\index{Beeton, Barbara Ann Neuhaus Friend}}
-%
-% \DescribeMacro{\pausenumbering}
-% \DescribeMacro{\resumenumbering}
-% \label{pause}\relax
-% "EDMAC" stores a lot of information about line numbers and
-% footnotes in memory as it goes through a numbered section. But
-% at the end of such a section, it empties its memory out, so to
-% speak. If your text has a very long numbered section it is
-% possible that your \TeX\ may reach its memory limit. There are
-% two solutions to this. The first is to get a new \TeX\ with
-% increased memory. There are several Big\TeX\ implementations
-% easily available today, both commercial and public-domain,
-% depending on your operating system. The second solution is to
-% split your long section into several smaller ones. The trouble
-% with this is that your line numbering will start again at zero
-% with each new section. To avoid this problem, we provide
-% "\pausenumbering" and "\resumenumbering" which are just
-% like "\endnumbering" and "\beginnumbering", except that
-% they arrange for your line numbering to continue across the break.
-% Use "\pausenumbering" only between numbered paragraphs:
-% \egstart
-% \begin{verbatim}
-% \beginnumbering
-% \pstart
-% Paragraph of text.
-% \pend
-% \pausenumbering
-%
-% \resumenumbering
-% \pstart
-% Another paragraph.
-% \pend
-% \endnumbering
-% \bye
-% \end{verbatim}
-% \egmid
-% {\parskip0pt \count255=0
-% \everypar={\advance \count255 by 1 \hbox to 1.5em{\the\count255\hfil}}
-% Paragraph of\par
-% text.\medskip
-%
-% Another paragraph.\par}
-%
-% \egend
-%
-% We have
-% defined these commands as two macros, in case you find it necessary
-% to insert text between numbered sections without disturbing the
-% line numbering. But if you are really just using these macros to
-% save memory, you might as well say
-% \begin{verbatim}
-% \def\memorybreak{\pausenumbering\resumenumbering}
-% \end{verbatim}
-% and say "\memorybreak" between the relevant "\pend" and
-% "\pstart".
-%
-%
-%
-% \subsection{The apparatus}
-%
-% \DescribeMacro{\text}
-% Within numbered paragraphs, all footnotes and endnotes are generated
-% by forms of the "\text" macro:
-% \begin{verse}
-% "\text{"\meta{lemma}"}"\meta{commands}"/"
-% \end{verse}
-%
-% The \meta{lemma} argument is the lemma in the main text: "\text"
-% both prints this as part of the text, and makes it available to the
-% \meta{commands} you specify to generate notes. The "/" at the
-% end terminates the command; it is part of the macro's definition so
-% that spaces after the macro will be treated as significant.
-%
-% For example:
-% \egstart
-% \begin{verbatim}
-% I saw my friend \text{Smith}
-% \Afootnote{Jones C, D.}/
-% on Tuesday.
-% \end{verbatim}
-% \egmid
-% 1\enspace I saw my friend\\
-% 2\enspace Smith on Tuesday.\smallskip
-% \hrule width 1.5cm
-% \strut {\bf 2} Smith] Jones C, D.
-% \egend
-%
-% The lemma "Smith" is printed as part of this sentence in
-% the text, and is also made available to the footnote
-% that specifies a variant, "Jones C, D". The footnote macro
-% is supplied with the line number at which the lemma appears
-% in the main text.
-%
-% The \meta{lemma} may contain further "\text" commands; this is the
-% other reason why "\text"'s arguments are terminated by "/". Nesting makes
-% it possible to print an explanatory note on a long passage together with
-% notes on variants for individual words within the passage. For
-% example:
-% \egstart
-% \begin{verbatim}
-% \text{I saw my friend
-% \text{Smith}\Afootnote{Jones
-% C, D.}/ on Tuesday.}
-% \Bfootnote{The date was
-% July 16, 1954.}
-% /
-% \end{verbatim}
-% \egmid
-% 1\enspace I saw my friend\\
-% 2\enspace Smith on Tuesday.\smallskip
-% \hrule width 1.5cm
-% \strut {\bf 2} Smith] Jones C, D.\smallskip
-% \hrule width 1.5cm
-% \strut {\bf 1--2} I saw my friend \\
-% Smith on Tuesday.] The\\ date was
-% July 16, 1954.
-% \egend
-%
-% However, "\text" cannot handle overlapping but unnested
-% notes---for example, one note covering lines 10--15, and another
-% covering 12--18; a "\text" that starts in the \meta{lemma}
-% argument of another "\text" must end there, too. (The
-% "\lemma" and "\linenum" commands may be used to
-% generate overlapping notes if necessary.)
-%
-% \paragraph{Commands used in {\tt\protect\bslash text}'s second argument}
-%
-% The second argument of the "\text" macro, \meta{commands},
-% may contain a series of subsidiary commands that generate
-% various kinds of notes.
-%
-% \DescribeMacro{\Afootnote}
-% \DescribeMacro{\Bfootnote}
-% \DescribeMacro{\Cfootnote}
-% \DescribeMacro{\Dfootnote}
-% \DescribeMacro{\Efootnote}
-% Five separate series of footnotes are maintained; when all five
-% are used, the "A" notes appear in a layer just below the main
-% text, followed by the rest in turn, down to the "E" notes at
-% the bottom. These are the main macros that you will use to construct
-% the critical apparatus of your text. "EDMAC" provides five
-% layers of notes in the belief that this will be adequate for
-% the most demanding editions. But it is not hard to add further
-% layers of notes to "EDMAC" should they be required.
-%
-% \DescribeMacro{\Aendnote}
-% \DescribeMacro{\Bendnote}
-% \DescribeMacro{\Cendnote}
-% \DescribeMacro{\Dendnote}
-% \DescribeMacro{\Eendnote}
-% "EDMAC" also maintains five separate series of endnotes.
-% Normally, none of them is printed: you must use the
-% "\doendnotes" macro described below
-% (p.\,\pageref{doendnotes}) to call for their
-% output at the appropriate point in your document.
-%
-% \DescribeMacro{\lemma}
-% Sometimes you want to change the lemma that gets passed to the notes.
-% You can do this by using "\lemma" within the second argument to
-% "\text", before the note commands.
-% \begin{verse}
-% "\lemma{"\meta{alternative lemma}"}"
-% \end{verse}
-% The most common use of this command is to abbreviate the lemma that's
-% printed in the notes. For example:
-% \egstart
-% \begin{verbatim}
-% \text{I saw my friend
-% \text{Smith}\Afootnote{Jones
-% C, D.}/ on Tuesday.}
-% \lemma{I \dots\ Tuesday.}
-% \Bfootnote{The date was
-% July 16, 1954.}
-% /
-% \end{verbatim}
-% \egmid
-% 1\enspace I saw my friend\\
-% 2\enspace Smith on Tuesday.\smallskip
-% \hrule width 1.5cm
-% \strut {\bf 2} Smith] Jones C, D.\smallskip
-% \hrule width 1.5cm
-% \strut {\bf 1--2} I \dots\ Tuesday.] \\
-% The date was July 16, 1954.
-% \egend
-%
-% \DescribeMacro{\linenum}
-% \label{linenum}\relax
-% You can use "\linenum" to change the line numbers passed to
-% the notes. The notes are actually given seven parameters: the page,
-% line, and sub-line number for the start of the lemma; the same
-% three numbers for the end of the lemma; and the font specifier
-% for the lemma. As argument to "\linenum", you specify
-% those seven parameters in that order, separated by vertical bars
-% (the "|" character). However, you can retain the value
-% computed by "EDMAC" for any number by simply omitting it; and
-% you can omit a sequence of vertical bars at the end of the
-% argument. For example, "\linenum{|||23}" changes one number,
-% the ending page number of the current lemma.
-%
-% This command doesn't change the marginal line numbers in any way;
-% it just changes the numbers passed to the footnotes. Its use comes in
-% situations that "\text" has trouble dealing with for
-% whatever reason. If you need notes for overlapping passages that
-% aren't nested, for instance, you can use "\lemma" and
-% "\linenum" to generate such notes despite the limitations of
-% "\text". If the \meta{lemma} argument to "\text" is
-% extremely long, you may run out of memory; here again you can
-% specify a note with an abbreviated lemma using "\lemma" and
-% "\linenum". The numbers used in "\linenum" need not be
-% entered manually; you can use the ``"x-"'' symbolic cross-referencing
-% commands below (p.\,\pageref{crossref}) to compute them
-% automatically.
-%
-% Similarly, being able to manually change the lemma's font specifier
-% in the notes might be important if you were using multiple scripts or
-% languages. The form of the font specifier depends on the font
-% selection scheme you are using (see section~\ref{fonts} below).
-% If you're using Plain, it is the
-% ``font family'' number; if you're using NFSS, it is actually three
-% separate codes separated by "/" characters, giving the family,
-% series, and shape codes as defined within NFSS.
-%
-% \paragraph{Changing the names of these commands}
-%
-% The commands for generating the apparatus have been given
-% rather bland names, because editors in different fields have
-% widely divergent notions of what sort of notes are required, where
-% they should be printed, and what they should be called. But this
-% doesn't mean you have to type "\Afootnote" when you'd rather
-% say something you find more meaningful, like "\variant". We
-% recommend that you create a series of such aliases and use them
-% instead of the names chosen here; all you have to do is put commands
-% of this form at the start of your file:
-% \begin{verbatim}
-% \let\variant=\Afootnote
-% \let\explanatory=\Bfootnote
-% \let\trivial=\Aendnote
-% \let\testimonia=\Cfootnote
-% \end{verbatim}
-%
-% It is also possible to define aliases for "\text", which
-% can be easier to type. You can make a single character substitute
-% for "\text" by saying this:
-% \begin{verbatim}
-% \catcode`\<=\active
-% \let<=\text
-% \end{verbatim}
-%
-% Then you might say "<{Smith}\variant{Jones}/". This of course
-% destroys the ability to use "<" in any new macro definitions, so
-% long as it remains in effect; hence it should be used with care.
-%
-% Changing the character at the end of the command requires more work:
-% \begin{verbatim}
-% \catcode`\<=\active
-% \def\xtext#1#2>{\text{#1}{#2}/}
-% \let<=\xtext
-% \end{verbatim}
-% This allows you to say "<{Smith}\Afootnote{Jones}>".
-%
-% Aliases for "\text"
-% of the first kind shown here also can't be nested---that is,
-% you can't use the alias in the text that forms the first argument
-% to "\text". (See section~\ref{text} to find out why.) Aliases of
-% the second kind may be nested without any problem.
-%
-% \subsection{Lineation commands}
-%
-% \DescribeMacro{\lineation}
-% "EDMAC" can number lines either by page or by section; you specify
-% this using the "\lineation{"\meta{arg}"}"
-% macro, where \meta{arg} is either
-% "page" or "section". You may only use this command at places
-% where numbering is not in effect; you can't change the lineation system
-% within a section. You can change it between sections: they don't all
-% have to use the same lineation system. The line-of-section system is
-% "EDMAC"'s standard setting.
-%
-% \DescribeMacro{\linenummargin}
-% The marginal line numbers will be printed in the "left",
-% "right", "inner", or "outer" margin, depending on which you
-% specify as argument to the "\linenummargin"
-% command: for example, "\linenummargin{inner}".
-% Normally, line numbers appear
-% in the left margin. You can change this whenever you're not in the
-% middle of making a paragraph.
-%
-% \DescribeMacro{\firstlinenum}
-% \DescribeMacro{\linenumincrement}
-% \DescribeMacro{\firstsublinenum}
-% \DescribeMacro{\sublinenumincrement}
-% In most cases, you will not want a number printed for every
-% single line of the text. Four \TeX{} "count" registers control
-% the printing of marginal numbers.
-% "\firstlinenum" specifies the number of the first line in a
-% section to number, and "\linenumincrement" is the increment
-% between numbered lines. "\firstsublinenum" and
-% "\sublinenumincrement" do the same for
-% sub-lines. Initially, all these counters are set equal to $5$.
-%
-% \DescribeMacro{\leftlinenum}
-% \DescribeMacro{\rightlinenum}
-% \DescribeMacro{\linenumsep}
-% When a marginal line number is to be printed, there are a
-% lot of ways to display it.
-% You can redefine "\leftlinenum" and "\rightlinenum" to
-% change the way marginal line numbers are printed in the
-% left and right margins respectively; the initial
-% versions print the number in font "\numlabfont" (described
-% below) at a distance "\linenumsep" (initially set to one pica)
-% from the text.
-%
-% \subsection{Changing the line numbers}
-%
-% Normally the line numbering starts at 1 for the first line of
-% a section and steps up by one for each line thereafter. There
-% are various common modifications of this system, however; the
-% commands described here allow you to put such modifications
-% into effect.
-%
-% \DescribeMacro{\startsub}
-% \DescribeMacro{\endsub}
-% You insert the "\startsub" and "\endsub" commands in your text
-% to turn sub-lineation on and off. In plays, for
-% example, stage directions are often numbered with sub-line
-% numbers: as line $10.1$, $10.2$,
-% $10.3$, rather than as $11$, $12$, and $13$.
-% Titles and headings are sometimes numbered with sub-line numbers
-% as well.
-%
-% When sub-lineation is in effect, the line number counter is
-% frozen and the sub-line counter advances instead. If one of these
-% commands appears in the middle of a line, it doesn't take effect
-% until the next line; in other words, a line is counted as a line
-% or sub-line depending on what it started out as, even if that
-% changes in the middle.
-%
-% \DescribeMacro{\startlock}
-% \DescribeMacro{\endlock}
-% The "\startlock" command, used in running text, locks the
-% line number at its current value, until you say "\endlock".
-% It can tell for itself whether you are in a patch of line or
-% sub-line numbering. One use for line-number locking is in printing
-% poetry: there the line numbers should be those of verse lines
-% rather than of printed lines, even when a verse line requires several
-% printed lines.
-%
-% \DescribeMacro{\lockdisp}
-% When line-number locking is used,
-% several printed lines may have the same line number, and you have to
-% specify whether you want the number attached to the first printed
-% line or the last, or whether you just want the number printed by
-% them all. (This assumes that, on the basis of the settings of
-% the previous parameters, it is necessary to display a line number for
-% this line.) You specify your preference using "\lockdisp"; its
-% argument is a word, either "first", "last", or "all".
-% "EDMAC" initially sets this to "first".
-%
-% \DescribeMacro{\setline}
-% \DescribeMacro{\advanceline}
-% In some cases you may want to modify the line numbers that are
-% automatically calculated: if you are printing only fragments
-% of a work but want to print line numbers appropriate to a complete
-% version, for example. The "\setline" and "\advanceline" commands
-% may be used to change the current line's number (or the sub-line
-% number, if sub-lineation is currently on). They change both the
-% marginal line numbers and the line numbers passed to the notes.
-% "\setline" takes one argument, the value to which you want
-% the line number set; it must be $0$ or greater. "\advanceline"
-% takes one argument, an amount that should be added to the current
-% line number; it may be positive or negative.
-%
-% \subsection{Alternate footnote formatting}
-% If you just launch into "EDMAC" using the commands outlined
-% above, you will get a standard layout for your text and notes. You
-% may be happy to accept this at the very beginning, while you
-% get the hang of things, but the standard layout is not particularly
-% pretty, and you will certainly want to modify it in due course.
-% "EDMAC" provides ways of changing the fonts and layout of
-% your text, but these are not aimed at being totally comprehensive.
-% They are enough to deal with simple variations from the norm, and
-% to exemplify how you might go on to make more swingeing changes.
-%
-% \DescribeMacro{\footparagraph}
-% \DescribeMacro{\foottwocol}
-% \DescribeMacro{\footthreecol}
-% All footnotes will normally be formatted as a series of separate
-% paragraphs in one column. But there are three other formats
-% available for notes, and using these macros you can select a
-% different format for a series of notes. "\footparagraph" formats
-% all the footnotes of a series as a single paragraph (see
-% figs.~\ref{iocasta-out}, \ref{periphyseon-out} and \pageref{vyadi},
-% pp.\,\pageref{iocasta-out}, \pageref{periphyseon-out}, and
-% \pageref{vyadi}); "\foottwocol" formats them as separate paragraphs,
-% but in two columns (see bottom notes in fig.~\ref{arden-out},
-% p.\,\pageref{arden-out});
-% "\footthreecol", in three columns (see second layer of notes in
-% fig.\ref{features-out}, p.\,\pageref{features-out}). Each of these
-% macros
-% takes one argument: a letter (between "A" and "E") for
-% the series of notes you want changed.
-% So a text with three layers of notes might begin thus:
-% \begin{verbatim}
-% \footnormal{A}
-% \footthreecol{B}
-% \footparagraph{C}
-% \end{verbatim}
-% This would make the A-notes ordinary, B-notes would be in three
-% columns, and the bottom layer of notes would be formed into
-% a paragraph on each page.
-%
-% \DescribeMacro{\interparanoteglue}
-% If you use paragraphed footnotes, the macro "\interparanoteglue"
-% defines the glue appearing in between footnotes in the paragraph.
-% It is a macro whose argument is the glue you want, and its
-% initial setting is (see p.\,\pageref{interparanoteglue}):
-% \begin{verbatim}
-% \interparanoteglue{1em plus .4em minus .4em}
-% \end{verbatim}
-%
-% You should set "\hsize" for the text, and the "\baselineskip" of
-% the footnotes (this is done for you if you use the standard
-% "\notefontsetup"), before you call any
-% of these macros, because their action depends on those values;
-% too much or too little space will be allotted for the notes on
-% the page if these macros use the wrong
-% values.\footnote{\label{nobreaks}There
-% is one tiny proviso about using paragraphed notes: you shouldn't
-% force any explicit line-breaks inside such notes: do not use
-% {\tt \bslash par},
-% {\tt \bslash break}, or {\tt \bslash penalty=-10000}. If
-% you must have a line-break for some obscure reason, just suggest
-% the break very strongly: {\tt \bslash penalty=-9999} will do
-% the trick. Page \pageref{nobreak} explains why this restriction
-% is necessary.}
-%
-% \subsection{Fonts}\label{fonts}
-% One of the most important features of the appearance of the notes,
-% and indeed of your whole document, will be the fonts used. Because
-% the demands of critical editions tax the font-handling system of
-% \PlainTeX, we provide both that system and an alternative, the
-% New Font Selection System (NFSS) developed for \LaTeX. We will
-% first describe the commands that give you control over the
-% use of fonts in the different structural elements of the document,
-% especially within the notes, and then in
-% subsequent sections specify how these commands are used with each
-% of the font-handling systems.
-%
-% (For those who are setting up "EDMAC" for a large job, here is
-% a list of the complete set of "EDMAC" macros relating to fonts that
-% are intended for manipulation by the user: "\endashchar", "\fullstop",
-% "\headlinefont", "\notefontsetup", "\notenumfont",
-% "\numlabfont", and "\rbracket". "EDMAC" also assumes that "\rm" has
-% been defined so as to select a roman font in the current size,
-% and that some reasonable standard font has been selected before
-% the package is loaded.)
-%
-% \DescribeMacro{\notefontsetup}
-% \label{notefonts}\relax
-% The "\notefontsetup" macro defines the standard set of
-% fonts for all your footnotes. This command redefines such commands as
-% "\it" so that they refer to an appropriate family of fonts, typically
-% different from that used for the main text;
-% normally, "EDMAC" chooses eight-point
-% fonts for your footnotes, as against ten-point fonts for the main
-% text.
-%
-% \DescribeMacro{\notenumfont}
-% The "\notenumfont" macro specifies the font used for the line
-% numbers printed in notes. This will typically be a command like
-% "\bf" ("EDMAC"'s initial value is "\sevenrm") that selects a
-% distinctive style for the
-% note numbers, but leaves the choice of a size up to
-% "\notefontsetup".
-%
-% \DescribeMacro{\numlabfont}
-% Line numbers for the main text
-% are usually printed in a smaller font in the margin.
-% The "\numlabfont" macro is provided as a standard name for
-% that font: it is initially set to be a seven-point roman font.
-% You might wish to use a different font if, for example,
-% you preferred to have these line numbers printed using
-% old-style numerals.
-%
-% \DescribeMacro{\select@lemmafont}
-% We will briefly discuss "\select@lemmafont"
-% here because it is important to know about
-% it now, although it is not one of the macros you would expect to
-% change in the course of a simple job. Hence it is ``protected''
-% by having the @-sign in its name.
-%
-% When you use the "\text" macro to mark a word in your text
-% as a lemma, that word will normally be printed again in your
-% apparatus. If the word in the text happens to be in a font such
-% as italic or bold you would probably expect it to appear in the
-% apparatus in the same font. This becomes an absolute necessity
-% if the font is actually a different script, such as Arabic or
-% Cyrillic. "\select@lemmafont" does the work of
-% decoding "EDMAC"'s data about the fonts used to print the lemma in
-% the main text and calling up those fonts for printing the lemma in
-% the note.
-%
-% "\select@lemmafont" is a macro that takes one long
-% argument---the cluster of line numbers passed to the note
-% commands. This cluster ends with a code indicating what
-% fonts were in use at the start of the lemma.
-% "\select@lemmafont" selects the appropriate font for the
-% note using that font specifier.
-%
-% "EDMAC" uses "\select@lemmafont" in a standard footnote
-% format macro called "\normalfootfmt". The footnote formats
-% for each of the layers "A" to "E" are "\let" equal
-% to "\normalfootfmt". So all the layers of footnotes are
-% formatted in the same way.
-%
-% But it is also likely that you might want to have different fonts
-% for just, say, the note numbers in layers "A" and "B" of
-% your apparatus. To do this, make two copies of the
-% "\normalfootfmt" macro (see p.\,\pageref{normalfootfmt})---or
-% "\twocolfootfmt", or the other appropriate macro ending in
-% "-footfmt", depending on what footnote format you have
-% selected---and give these macros the names "\Afootfmt" and
-% "\Bfootfmt". Then, in these new macros, change the font
-% specifications (and spacing, or whatever) to your liking.
-%
-% \DescribeMacro{\endashchar}
-% \DescribeMacro{\fullstop}
-% \DescribeMacro{\rbracket}
-% \font\teni=cmmi10
-% A relatively trivial matter relates to punctuation. In your
-% footnotes, there will sometimes be spans of line numbers like
-% this: 12--34, or lines with sub-line numbers like this: 55.6. The
-% en-dash and the full stop are taken from the same font as the
-% numbers, and it all works nicely. But what if you wanted to use
-% old-style numbers, like {\teni12} and {\teni34}? These look nice
-% in an edition, but when you use the fonts provided by \PlainTeX\
-% they are taken from a math font which does not
-% have the en-dash or full stop in the same places as a text font.
-% If you (or your macros) just typed "$\oldstyle 12--34$" or
-% "$\oldstyle 55.6$" you would get ``{\teni12--34}''and
-% ``{\teni55.6}''. So we define "\endashchar" and
-% "\fullstop", which produce an en-dash and a full stop
-% respectively from the "\rm" font, whatever font you are using
-% for the numbers. These two macros are used in the
-% macros which format the line numbers in the margins and
-% footnotes, instead of explicit punctuation.
-% We also define an "\rbracket" macro for the
-% right square bracket printed at the end of the lemma in many
-% styles of textual notes (including "EDMAC"'s standard style).
-%
-% \subsubsection{The New Font Selection Scheme}
-% \label{edmacnfss}\relax
-%
-% While the handling the fonts in \PlainTeX\ works for simple cases, it
-% quickly gets inadequate if you want \TeX\ to load many different
-% fonts, or if you frequently change font sizes, languages, etc. We
-% recommend that for all but the simplest editions you consider using the
-% New Font Selection Scheme.
-%
-% The New Font Selection Scheme (NFSS) is a major piece of programming by
-% Frank Mittelbach\index{Mittelbach, Frank} and Rainer
-% Sch\"opf\index{Sch\"opf, Rainer} which completely rewrites the way \TeX\
-% macros handle fonts. It was first published in {\em TUGboat} in
-% 1989.\footnote{{\em TUGboat\/} {\bf 10} (1989), pp.\,222--238.}
-% Initially, the NFSS was aimed at replacing the \LaTeX\ system of font
-% handling, as contained in "lfonts.tex".\footnote{See {\em TUGboat} {\bf
-% 11} (1990), pp.\,297--305.} Later it became part of a major revision of
-% the whole of \LaTeX, and is now documented in {\em The \LaTeX\
-% Companion}\footnote{By Michel Goossens, Frank Mittelbach and Alexander
-% Samarin (Reading, etc.: Addison Wesley, 1994). See especially
-% chapter~7.} and in the files distributed with \LaTeX\
-% itself.\footnote{Of the files in the \LaTeXe\ distribution, you should
-% especially read "features.tex" and "fontcmds.dtx".} Another reason why
-% you might wish to use the NFSS is that you may already be accustomed to
-% using it if you are using \LaTeX\ for other parts of your book, or for
-% other publications.
-%
-% Wayne Sullivan\index{Sullivan, Wayne} adapted an early release of the
-% NFSS for separate use with \PlainTeX\ and "EDMAC".\footnote{See the file
-% "plainfss.zip" available from internet archive sites of \TeX-related
-% material.} Since then, the NFSS has become more closely integrated
-% into \LaTeX. So today, if you wish to use the NFSS, you should start by
-% installing the latest version of \LaTeX. This does not mean that
-% "EDMAC" is compatible with \LaTeX\ in general: it isn't. But the
-% accompanying file "ed-nfss.tex" contains instructions about a simple way
-% in which "EDMAC" can use just those parts of \LaTeX\ that define the
-% NFSS.\label{ed-nfss} We have kept these instructions separate because
-% \LaTeX\ is in a period of evolution, and things may work differently in
-% future. But "EDMAC" itself does contain the `hooks' required to access
-% the NFSS if it has been defined.
-%
-% What will you gain by using the NFSS with "EDMAC"? {\em The \LaTeX\
-% Companion}, referred to above, makes the general case for NFSS in clear
-% terms at the beginning of chapter~7. More specifically, if you
-% read the documentation below, you will come across several places
-% where we highlight how hamstrung we felt, being limited to the
-% font macros available in \PlainTeX. See the discussion of
-% "\select@lemmafont" in particular
-% (p.\,\pageref{selectlemmafont}). If you are happy with the CM
-% fonts used by \PlainTeX, plus just a very few others, then you could
-% stay with "EDMAC" as it is. But if you want to use
-% completely different families of fonts, such as PostScript fonts,
-% or if you plan to use several different languages or alphabets
-% such as Armenian or Greek, then your work will be made much easier
-% by the NFSS.
-%
-% Here are some examples of how you might define some of the font
-% macros when you use NFSS.
-% \begin{verbatim}
-% \def\notefontsetup{\fontsize{7}{8}\selectfont}
-% \let\notenumfont=\rm
-% \end{verbatim}
-% These commands select seven-point fonts on eight-point baselines
-% for the notes, and choose a roman font for the line numbers
-% within notes.
-%
-% \subsubsection{The Plain font selection scheme}
-%
-% If you run ordinary \TeX\ with "edmac.doc", the
-% main font commands of \PlainTeX\ will be available in the normal way
-% (see the {\em \TeX book}, chapter 4).
-%
-% "EDMAC" also defines a set of macros (modelled on some of the "manmac"
-% macros from appendix E of {\em The \TeX book}) to
-% invoke eight-point fonts, and an "\eightpoint" macro to select
-% a whole set of fonts at that size; when the Plain font selection
-% scheme is used, this is the initial value of "\notefontsetup". If you
-% want to use some other font size for the notes, you will need to
-% load the appropriate fonts in your file, and then
-% define your own macro on the model of "\eightpoint" that will
-% properly assign the baseline spacing, set the various font
-% families, and redefine the commands "\rm", "\it", etc.
-%
-% If your document requires font shapes other than those found
-% in \PlainTeX, you will need to go further and modify the
-% "\select@lemmafont" macro to handle these shapes:
-% see its use on
-% p.\,\pageref{selectlemmafont} for more details. As you will see
-% from that description, if you are using some new, outlandish font
-% such as Devan\=agar\=\i, you should assign it a new font family,
-% in order for "\select@lemmafont" to be able to handle it
-% this way. But once you get to this level of complexity, it
-% might be better to switch over to the New Font Selection Scheme
-% anyway. Note that our use of the Plain font selection scheme makes
-% a use of the ``font family'' specifier that is not what was
-% intended; and because \TeX's maximum font-family number is $15$,
-% it is possible to run out of font families if your text has many
-% different kinds of font or uses other macro packages that also
-% define new font families. When "EDMAC" uses NFSS, it does not
-% meddle with font-family numbers in this way.
-%
-% Because "\notefontsetup" sets up the whole set of fonts used
-% within notes that are likely to change font shapes, it needs
-% to be equated to a complex macro like "\eightpoint". But the
-% other "EDMAC" font macros---"\notenumfont" and
-% "\numlabfont"---are used for text which should not contain any
-% font changes, and it is usually good enough to equate one of
-% these to a command that selects a specific font at a specific
-% size. For example, saying "\let\numlabfont=\seveni" selects
-% a seven-point math italic font for marginal line numbers, so
-% that the numbers will be printed using old-style figures.
-%
-% \subsection{Crop marks}
-%
-% Publishers usually like crop marks on the camera-ready copy for
-% works of this kind, so a facility for generating them has been
-% incorporated into "EDMAC".
-%
-% Publishers specify crop marks (or trim lines, etc.) in terms of
-% two dimensions, height and width, and they also usually specify
-% back and head margins.
-%
-% The ``head margin'' is the distance between the top of the printed
-% text and the top crop marks; it is normally measured
-% from the top of the running head, \PlainTeX's
-% "\headline". The ``back margins'' (or ``gutter margins'') are
-% the right margins of even-numbered pages, and the left margins of
-% odd-numbered pages. If you hold a book open in front of you, they
-% are the margins in the middle of the opening.
-% \begin{figure}
-% \unitlength=0.80mm
-% \linethickness{0.4pt}
-% \begin{picture}(138.00,90.00)
-% \put(64.00,80.00){\line(-1,0){5.00}}
-% \put(14.01,80.00){\line(1,0){5.00}}
-% \put(14.00,15.00){\line(1,0){5.00}}
-% \put(59.00,15.00){\line(1,0){5.00}}
-% \put(20.01,81.00){\line(0,1){5.00}}
-% \put(58.00,86.00){\line(0,-1){5.00}}
-% \put(20.00,9.00){\line(0,1){5.00}}
-% \put(58.00,14.00){\line(0,-1){5.00}}
-% \put(25.00,20.00){\dashbox{2.00}(29.00,45.00)[cc]{}}
-% \put(25.00,70.00){\dashbox{2.00}(29.00,2.00)[cc]{{\tiny headline}}}
-% \put(10.00,5.00){\framebox(60.00,85.00)[cc]{\shortstack{\strut even\\
-% \strut page\\ \strut text}}}
-% \put(133.00,80.00){\line(-1,0){5.00}}
-% \put(83.00,80.00){\line(1,0){5.00}}
-% \put(83.00,15.00){\line(1,0){5.00}}
-% \put(128.00,15.00){\line(1,0){5.00}}
-% \put(89.00,81.00){\line(0,1){5.00}}
-% \put(127.00,86.00){\line(0,-1){5.00}}
-% \put(89.00,9.00){\line(0,1){5.00}}
-% \put(127.00,14.00){\line(0,-1){5.00}}
-% \put(93.00,20.00){\dashbox{2.00}(29.00,45.00)[cc]{}}
-% \put(93.00,70.00){\dashbox{2.00}(29.00,2.00)[cc]{{\tiny headline}}}
-% \put(78.00,5.00){\framebox(60.00,85.00)[cc]{\shortstack{\strut odd\\
-% \strut page\\ \strut text}}}
-% \put(25.00,77.00){\vector(0,-1){5.00}}
-% \put(25.00,77.00){\vector(0,1){3.00}}
-% \put(54.03,41.97){\makebox(0,0)[lb]{{\tiny back margin}}}
-% \put(91.00,45.00){\vector(-1,0){2.00}}
-% \put(91.00,45.00){\vector(1,0){2.00}}
-% \put(78.10,42.99){\makebox(0,0)[lb]{{\tiny back margin}}}
-% \put(16.00,45.00){\vector(0,1){35.00}}
-% \put(16.00,45.00){\vector(0,-1){30.00}}
-% \put(-0.03,44.00){\makebox(0,0)[lb]{{\tiny cropsetup \#1}}}
-% \put(31.01,8.00){\makebox(0,0)[lb]{{\tiny cropsetup \#2}}}
-% \put(54.03,39.97){\makebox(0,0)[lb]{{\tiny (cropsetup \#4)}}}
-% \put(26.00,75.00){\makebox(0,0)[lb]{{\tiny (cropsetup \#3)}}}
-% \put(26.00,77.00){\makebox(0,0)[lb]{{\tiny head margin}}}
-% \put(56.00,45.00){\vector(-1,0){2.00}}
-% \put(56.00,45.00){\vector(1,0){2.00}}
-% \put(38.03,11.01){\vector(-1,0){17.96}}
-% \put(38.03,11.01){\vector(1,0){20.00}}
-% \put(105.01,18.01){\vector(1,0){17.04}}
-% \put(105.01,18.01){\vector(-1,0){11.96}}
-% \put(103.04,16.04){\makebox(0,0)[lb]{{\tiny hsize}}}
-% \put(123.97,41.99){\vector(0,-1){21.94}}
-% \put(124.00,41.98){\vector(0,1){24.96}}
-% \put(124.94,43.05){\makebox(0,0)[lb]{{\tiny vsize}}}
-% \put(126.99,66.01){\makebox(0,0)[lc]{{\tiny topskip}}}
-% \put(125.99,70.01){\vector(0,-1){3.02}}
-% \put(125.99,62.00){\vector(0,1){2.99}}
-% \put(124.99,64.99){\line(1,0){2.03}}
-% \put(124.99,66.99){\line(1,0){2.03}}
-% \end{picture}
-% \caption{Crop marks, back and head margins.}
-% \label{pages}
-% \end{figure}
-% ^^A Ouch! I'd hate to do that without
-% ^^A Georg Horn's TeXcad program!
-%
-% \DescribeMacro{\cropsetup}
-% \label{cropsetup}\relax
-% If you want to have crop marks, and to control the back and
-% head margins, you issue the "\cropsetup" macro. It takes
-% four parameters (see Figure \ref{pages}):
-% \begin{enumerate}\addtolength{\itemsep}{-1ex}
-% \item the vertical distance between crop marks,
-% \item the horizontal distance between crop marks,
-% \item the head margin, and
-% \item the back margin.
-% \end{enumerate}
-%
-% In addition to these arguments, "EDMAC"
-% uses the "\hsize" of the page, as well as information about the
-% height at which the "\headline" floats above the main text (which
-% is set in \PlainTeX's "\makeheadline" macro). "EDMAC"
-% performs these calculations when you issue the "\cropsetup"
-% command. Therefore, it is important that you set the "\hsize"
-% and make any changes to "\makeheadline" {\sl before\/} you issue
-% the "\cropsetup" command. If you do change these values, issue
-% the "\cropsetup" command again.
-%
-% \DescribeMacro{\headlinefont}
-% \DescribeMacro{\magicvskip}
-% In particular, if the "\headline" is going to be set at a
-% different height from the top of the text, or in a different
-% font, you can change the appropriate values easily by using
-% "\headlinefont" and "\magicvskip". The former is what
-% you would expect; just "\let" it to be whatever font you
-% are using (the font macro should include a definition of an
-% appropriate "\strutbox" for that font). Note that this specification
-% does {\em not\/} change what font is actually used by \TeX, unless
-% you modify \TeX's "\headline" macro; it serves only to inform
-% "\cropsetup" of the size of your headline font.
-%
-% The "\magicvskip" gives you direct
-% access to what Donald Knuth calls
-% a ``magic constant'' on p.\,255 of {\em The \TeX book}. For
-% \PlainTeX, "\magicvskip" is $-22.5$\,pt, but you can change
-% this if you want the "\headline" higher or lower than the
-% built-in value. See p.\,\pageref{magic} below for more details.
-%
-% Apart from this stricture that the "\cropsetup" command
-% should follow any changes in "\hsize" and the "\headline",
-% there is no relation (other than visual) between the crop marks
-% and the "\hsize" and "\vsize". You can vary any of
-% these dimensions independently, without affecting any other. Your
-% publisher will almost always want the "\hsize" and
-% "\vsize" to be a few picas smaller than the horizontal and
-% vertical distances between crop marks. And if you want to shift
-% the whole of your printed page about on the paper, use
-% "\hoffset" and "\voffset" as described in {\em The \TeX
-% book}, p.\,251, or use the facilities of your "DVI" translator.
-%
-% \DescribeMacro{\cropwidth}
-% \DescribeMacro{\cropgap}
-% "\cropwidth" and "\cropgap" define the thickness of
-% the rules used for drawing crop marks and the gap by which crop marks
-% don't cross; as before, if you change either, do so before using
-% the "\cropsetup" macro.
-%
-% If, for example, you want your text to have a back margin,
-% for two-sided printing, but
-% you don't want crop marks, just set "\cropwidth=0pt".
-%
-% \subsection{Endnotes}
-%
-% \DescribeMacro{\doendnotes}
-% \DescribeMacro{\endprint}
-% \label{doendnotes}\relax
-% "\doendnotes" closes the ".end" file that contains
-% the text of the endnotes, if it's open, and
-% prints one series of endnotes, as specifed by a series-letter
-% argument, e.g., "\doendnotes{A}". "\endprint" is the
-% macro that's called to print each note. It uses
-% "\notenumfont", "\select@lemmafont", and
-% "\notefontsetup" to select fonts, just as the footnote
-% macros do (see p.\,\pageref{notefonts} above).
-%
-% \DescribeMacro{\noendnotes}
-% If you aren't going to have any endnotes, you can say "\noendnotes"
-% in your file, before the first "\beginnumbering", to suppress the
-% generation of an unneeded ".end" file.
-%
-% \subsection{Cross referencing}
-% \label{crossref}\relax
-% "EDMAC" provides a simple cross-referencing facility that allows
-% you to mark places in the text with labels, and generate page and
-% line number references to those places elsewhere in the text using
-% those labels.
-%
-% \DescribeMacro{\label}
-% First you place a label in the text using the command
-% "\label{foo}". ``"foo"'' can be almost anything you like, including
-% letters, numbers, punctuation, or a combination---anything but spaces;
-% you might say "\label{toves-3}", for example.\footnote{More precisely,
-% you should stick to characters in the \TeX\ categories of ``letter''
-% and ``other''.}
-%
-% \DescribeMacro{\pageref}
-% \DescribeMacro{\lineref}
-% \DescribeMacro{\sublineref}
-% Elsewhere in the text, either before or after the "\label",
-% you can refer to its location by saying "\pageref{foo}", or
-% "\lineref{foo}", or "\sublineref{foo}". These commands
-% will produce, respectively, the page, line and sub-line on which
-% the "\label{foo}" command occurred.
-%
-% A "\label" command may appear in the main text, or in the
-% first argument of "\text", but not in the apparatus itself. But
-% "\pageref", "\lineref" and "\sublineref" commands can also be used in
-% the apparatus to refer to "\label"s in the text.
-%
-% The "\label" command works by writing macros to an ".aux"
-% file (which will only be created if you are actually using
-% some of these commands). Clearly, then, you will need to process
-% your document through \TeX\ twice in order for the references to
-% be resolved.
-%
-% You will be warned if you say "\label{foo}" and "foo"
-% has been used as a label before. The "ref" commands will
-% return references to the last place in the file marked with this
-% label. You will also be warned if a reference is made to an
-% undefined label. (This will also happen the first time you
-% process a document after adding a new "\label" command: the
-% auxiliary file will not have been updated yet.)
-%
-% If you want to refer to a word inside a
-% \verb"\text{...}/" command, the "\label" should be defined inside
-% the first argument, e.g.,
-% \begin{verbatim}
-% The \text{creature\label{elephant} was quite
-% unafraid}\Afootnote{Of the mouse, that is.}/
-% \end{verbatim}
-%
-% \DescribeMacro{\xpageref}
-% \DescribeMacro{\xlineref}
-% \DescribeMacro{\xsublineref}
-% However, there are situations in which you'll want "EDMAC" to
-% return a number without displaying any
-% warning messages about undefined labels or the like: if you want to
-% use the reference in a context where \TeX\ is looking for a
-% number, such a warning will lead to a complaint that the number
-% is missing. This is the case for references used within the
-% argument to "\linenum", for example. For this situation,
-% three variants of the reference commands, with the "x"
-% prefix, are supplied: "\xpageref", "\xlineref", and "\xsublineref".
-% The only operations they perform are ones
-% that \TeX\ can do in its ``mouth''. They have these limitations:
-% they will not tell you if the label is undefined, and they must
-% be preceded in the file by at least one of the four other
-% cross-reference commands---e.g., a "\label{foo}" command,
-% even if you never refer to that label---since those commands can all
-% do the necessary processing of the ".aux" file, and these
-% cannot.
-%
-% \DescribeMacro{\xxref}
-% The macros "\xxref" and "\makelabel" let you manipulate numbers
-% and labels in ways which you may find helpful in tricky
-% situations.
-%
-% The "\xxref" command generates a reference to a sequence of
-% lines, for use in the second argument of "\text".
-% It takes two arguments, both of which are
-% labels: e.g., "\xxref{mouse}{elephant}". It calls "\linenum"
-% (q.v., p.\,\pageref{linenum} above) and sets the beginning page,
-% line, and sub-line numbers to those of the place where
-% "\label{mouse}" was placed, and the ending numbers to those where
-% "\label{elephant}" occurs.
-%
-% \DescribeMacro{\makelabel}
-% Sometimes the "\label" command cannot be used to specify exactly
-% the page and line desired---for example, if you want to refer to a
-% page and line number in another volume of your edition. In such
-% cases, you can use the "\makelabel" macro so that you can ``roll
-% your own'' label. For example, if you say
-% ``"\makelabel{elephant}{10|25|0}"'' you will have created a new
-% label, and a later call to "\pageref{elephant}" would print
-% ``10'' and "\lineref{elephant}" would print ``25''. The sub-line
-% number here is zero. It is usually best to collect your
-% "\makelabel" statements near the top of your document, so that
-% you can see them at a glance.
-%
-% \subsection{Miscellaneous}
-%
-% Generally, you should set the "\vsize" and "\hsize" of you
-% document at the top, before any "EDMAC" commands are issued,
-% since "EDMAC" uses these values to work out some things, like
-% crop marks and footnote spacing. As {\em The \TeX book\/} says
-% (p.\,251), ``It's best not to monkey with "\hsize" and "\vsize"
-% except at the very beginning of a job\ldots''.
-%
-% Any changes you make to "\leftskip" or "\rightskip" will apply to
-% the main body text, but not to the footnotes. This is how you
-% can get a narrow-set text on a wider base of notes, a common
-% style for critical editions. Footnote material is always set
-% "\hsize" wide.
-%
-% \DescribeMacro{\extensionchars}
-% When "EDMAC" assembles the name of the auxiliary file for a
-% section, it prefixes "\extensionchars" to the section number.
-% This is initially defined to be empty, but you can add some characters to
-% help distinguish these files if you like; what you use is likely
-% to be system-dependent. If, for example, you said
-% "\def\extensionchars{!}", then you would get temporary
-% files called "jobname.!1", "jobname.!2", etc.
-%
-% \subsection{Known bugs}
-%
-% The \PlainTeX{} "\footnote" command will work only within
-% unnumbered text; within numbered text it will wreak havoc.
-% In general, "EDMAC"'s system for adding marginal line numbers
-% breaks anything that makes direct use of the \TeX{} insert system.
-%
-% "\parshape" cannot be used within numbered text, except in a
-% very restricted way (see p.\,\pageref{parshape}).
-%
-% \DescribeMacro{\ballast}
-% \label{ballastdesc}\relax
-% "EDMAC" is a three-pass system, but even after a document has
-% been processed three times, there are some tricky situations in
-% which the page breaks decided by \TeX\ never settle down. At
-% each successive run of \TeX, "EDMAC" oscillates between two
-% different sets of page decisions. To stop this happening, should
-% it arise, Wayne Sullivan\index{Sullivan, Wayne} suggested the
-% inclusion of the quantity "\ballast". The amount of "\ballast"
-% will be subtracted from the penalties which apply to the page
-% breaks calculated on the {\em previous\/} run through \TeX, thus
-% reinforcing these breaks. So if you find your page breaks
-% oscillating, say "\ballast=100" or some such figure, and with any
-% luck the page breaks will settle down. Luckily, this problem
-% doesn't crop up at all often.
-%
-% The restriction on explicit line-breaking in paragraphed footnotes,
-% mentioned in footnote \ref{nobreaks}, p.\,\pageref{nobreaks}, and
-% described in more detail on p.\,\pageref{nobreaks-detail}, really is a
-% nuisance if that's something you need to do. There are some possible
-% solutions, described by Michael Downes\index{Downes, Michael},
-% but this area remains unsatisfactory.
-%
-% Help, suggestions and corrections will be gratefully received.
-%
-%
-% \StopEventually{%
-% \addcontentsline{toc}{section}{\protect\numberline{B}Index}
-% \PrintIndex
-% ^^A \addtocontents{toc}{\protect\end{multicols}}
-% }
-%
-% \section{Implementation overview}\label{overview}
-%
-% We present the "EDMAC" code in roughly the order in which it's used
-% during a run of \TeX. The order is {\em exactly\/} that in which
-% it's read when you load the "EDMAC" package, because the same file
-% is used to generate this book and to generate the \TeX{} input
-% file. Most of what follows consists of macro definitions, but there
-% are some \TeX{} commands that are executed immediately---especially
-% at the start of the code. The documentation generally describes the
-% code from the point of view of what happens when the macros are
-% executed, though. As each macro is introduced, its name is printed
-% in the margin.
-%
-% We begin with the commands you use to start and
-% stop line numbering in a section of text (Section~\ref{preliminaries}).
-% Next comes the machinery for writing and reading the auxiliary file for
-% each section that helps us count lines, and for creating list macros
-% encoding the information from that file (Section~\ref{lineation}); this
-% auxiliary file will be read at the start of each section, to create
-% those list macros, and a new version of the file will be started to
-% collect information from the body of the section.
-%
-% Next are commands for marking sections of
-% the text for footnotes (Section~\ref{text}), followed by the macros
-% that take each paragraph apart, attach the line numbers and insertions,
-% and send the result to the vertical list (Section~\ref{paragraph}). The
-% footnote commands (Section~\ref{footnotes}) and output routine
-% (Section~\ref{output}) finish the main part of the processing;
-% cross-referencing (Section~\ref{xref}) and endnotes
-% (Section~\ref{endnotes}) complete the story.
-%
-% In what follows, macros with an @ in their name are more internal
-% to the workings of "EDMAC" than those made up just of
-% ordinary letters, just as in \PlainTeX\ (see {\em The \TeX
-% book}, p.\,344). You are meant to be able to make free with
-% ordinary macros, but the ``@'' ones should be treated with more
-% respect, and changed only if you are pretty sure of what you are
-% doing.
-%
-%
-% \section{Preliminaries}
-% \label{preliminaries}\relax
-%
-% When this file is loaded by \TeX, it makes a check, before
-% anything else is done, for whether this set of macros has
-% already been loaded before. If it has, this file exits without
-% being read further; if it hasn't, some informative messages
-% are printed.
-%
-% \begin{macrocode}
-\ifx\edmacloaded\relax\endinput\else\let\edmacloaded=\relax\fi
-{\newlinechar=`\^^J
-\message{^^J
- ********************************************************************^^J
- EDMAC Critical edition macros.^^J
- Copyright (C) 1990--1996 John Lavagnino and Dominik Wujastyk.^^J
- This is free software, and you are welcome to redistribute it under^^J
- certain conditions; see the accompanying file COPYING for details.^^J
- ^^J%
-\fileversion\space\space\space <\filedate>.^^J
- ********************************************************************^^J^^J }}
-% \end{macrocode}
-%
-% \begin{macro}{\makeatletter}
-% \begin{macro}{\makeatother}
-% You can't normally use @ signs within \TeX{} macro names. We
-% define macros that allow you to turn this capability on and off;
-% and then we turn it on for the time being, since this file
-% will use and define many macros with @ signs in their names.
-% \begin{macrocode}
-\def\makeatletter{\catcode`\@=11 }
-\def\makeatother{\catcode`\@=12 }
-\makeatletter
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@tempcnta}
-% \begin{macro}{\@tempcntb}
-% In imitation of \LaTeX, we create a couple of scratch counters,
-% "\@tempcnta" and "\@tempcntb", that we can
-% use like "\count255" (see {\em The \TeX book}, p.\,122).
-% \begin{macrocode}
-\newcount\@tempcnta \newcount\@tempcntb
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\edmac@warning}
-% "EDMAC" will sometimes want to warn you about what's going
-% on by writing to your terminal and log file; that operation
-% is handled by the "\edmac@warning" macro.
-% \begin{macrocode}
-\def\edmac@warning#1{\immediate\write\sixt@@n{EDMAC warning: #1}}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Sectioning commands}
-%
-% \begin{macro}{\section@num}
-% You use "\beginnumbering" and "\endnumbering" to begin
-% and end a line-numbered section of the text; the pair of commands may
-% be used as many times as you like within one document to start
-% and end multiple, separately line-numbered sections. \TeX\ will
-% maintain and display a ``section number'' as a counter named
-% "\section@num" that counts how many
-% "\beginnumbering" and "\resumenumbering"
-% commands have appeared; it needn't be
-% related to the logical divisions of your text.
-%
-% \begin{macro}{\extensionchars}
-% Each section will read and write an associated ``line-list
-% file'', containing information used to do the numbering; the file
-% will be called \meta{jobname}"."\meta{nn}, where {\it nn\/} is the
-% section number. However, you may direct that
-% an extra string be added before the
-% {\it nn\/} in that filename, in order to distinguish these
-% temporary files from others: that string is called
-% "\extensionchars". Initially it's empty, since different
-% operating systems have greatly varying ideas about what
-% characters are permitted in file names. So
-% "\def\extensionchars{-}" gives temporary files called
-% "jobname.-1", "jobname.-2", etc.
-% \begin{macrocode}
-\newcount\section@num
-\section@num=0
-\let\extensionchars=\empty
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\ifnumbering}
-% \begin{macro}{\numberingtrue}
-% \begin{macro}{\numberingfalse}
-% The "\ifnumbering" flag is
-% set to "true" if we're within a numbered section (that is, between
-% "\beginnumbering" and "\endnumbering"). You can use "\ifnumbering"
-% in your own code to check whether you're in a numbered section, but
-% don't change the flag's value.
-% \begin{macrocode}
-\newif\ifnumbering
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\beginnumbering}
-% "\beginnumbering" begins a section of numbered text.
-% When it's executed we increment the section number,
-% initialize our counters, send a message to your terminal, and
-% call macros to start the lineation machinery and endnote files.
-%
-% The initializations here are trickier than they look.
-% "\line@list@stuff" will use all of the counters
-% that are zeroed here when it assembles
-% the line-list and other lists of information about the lineation.
-% But it will do all of this locally and
-% within a group, and when it's done the
-% lists will remain but the counters will return to zero. Those same
-% counters will then be used as we process the text of this section,
-% but the assignments will be made globally. These initializations
-% actually apply to both uses, though in all other respects there
-% should be no direct interaction between the use of these counters
-% and variables in the two processing steps.
-% \begin{macrocode}
-\def\beginnumbering{%
- \ifnumbering
- \errmessage{Numbering has already been started}%
- \endnumbering
- \fi
- \global\numberingtrue
- \global\advance\section@num by 1
- \global\absline@num=0
- \global\line@num=0
- \global\subline@num=0
- \global\@lock=0
- \global\sub@lock=0
- \global\sublines@false
- \global\let\next@page@num=\relax
- \global\let\sub@change=\relax
- \message{Section \the\section@num }%
- \line@list@stuff{\jobname.\extensionchars\the\section@num}%
- \end@stuff}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\endnumbering}
-% "\endnumbering" must follow the last text for a numbered section.
-% It takes care of notifying you when changes have been noted in the
-% input that require running the file through again to move everything
-% to the right place.
-% \begin{macrocode}
-\def\endnumbering{%
- \ifnumbering
- \global\numberingfalse
- \normal@pars
- \ifx\insertlines@list\empty\else
- \global\noteschanged@true
- \fi
- \ifx\line@list\empty\else
- \global\noteschanged@true
- \fi
- \ifnoteschanged@
- \immediate\write\sixt@@n{EDMAC reminder: }%
- \immediate\write\sixt@@n{ The number of footnotes in this section
- has changed since the last run.}%
- \immediate\write\sixt@@n{ You will need to run TeX two more times
- before the footnote placement}%
- \immediate\write\sixt@@n{ and line numbering in this section are
- correct.}%
- \fi
- \else
- \errmessage{Numbering was not started}%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pausenumbering}
-% \begin{macro}{\resumenumbering}
-% The "\pausenumbering" macro is just the same as
-% "\endnumbering", but with the "\ifnumbering" flag set to "true", to
-% show that numbering continues across the gap.\footnote{Our thanks
-% to Wayne Sullivan,\index{Sullivan, Wayne} who suggested the idea
-% behind these macros.}
-% \begin{macrocode}
-\def\pausenumbering{\endnumbering\global\numberingtrue}
-% \end{macrocode}
-% The "\resumenumbering" macro is a bit more involved, but not much.
-% It does most of the same things as "\beginnumbering", but
-% without resetting the various counters. Note that no check is made
-% by "\resumenumbering" to ensure that "\pausenumbering" was actually
-% invoked.
-% \begin{macrocode}
-\def\resumenumbering{%
- \ifnumbering
- \global\advance\section@num by 1
- \message{Section \the\section@num\space
- (continuing the previous section)}%
- \line@list@stuff{\jobname.\extensionchars\the\section@num}%
- \end@stuff
- \else
- \errmessage{Numbering should already have been started.}%
- \endnumbering
- \beginnumbering
- \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-%
-% \section{Line counting}
-% \label{lineation}\relax
-%
-% \subsection{Choosing the system of lineation}
-%
-% Sometimes you want line numbers that start at $1$ at the top of each
-% page; other times you want line numbers that start at $1$ at the start
-% of each section and increase regardless of page breaks.
-% "EDMAC" can do it either way, and you can switch from one to the
-% other within one work.
-% But you have to choose one or the other for all line numbers and
-% line references within each section. Here we will define
-% internal codes for these systems and the macros you use to select them.
-%
-% \begin{macro}{\ifbypage@}
-% \begin{macro}{\bypage@true}
-% \begin{macro}{\bypage@false}
-% The "\ifbypage@" flag specifies the current lineation
-% system: "true" for line-of-section, "false" for line-of-page.
-% "EDMAC" will use the line-of-section system unless instructed otherwise.
-% \begin{macrocode}
-\newif\ifbypage@
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\lineation}
-% "\lineation" is the macro you use to select the lineation system.
-% Its argument is a string: either "page" or "section".
-% \begin{macrocode}
-\def\lineation#1{{%
- \ifnumbering
- \errmessage{You can't use \string\lineation\space
- within a numbered section}%
- \else
- \def\@tempa{#1}\def\@tempb{page}%
- \ifx\@tempa\@tempb
- \global\bypage@true
- \else
- \def\@tempb{section}%
- \ifx\@tempa\@tempb
- \global\bypage@false
- \else
- \edmac@warning{Bad \string\lineation\space argument.}%
- \fi
- \fi
- \fi}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\linenummargin}
-% \begin{macro}{\line@margin}
-% You call "\linenummargin" to specify which margin you want your
-% line numbers in; it takes one argument, a string.
-% You can put the line numbers in the same margin on every page using
-% "left" or "right"; or you can use "inner" or
-% "outer" to get them in the inner or outer margins. (These last
-% two options assume that even-numbered pages will be on the
-% left-hand side of every opening in your book.)
-% You can change this within a numbered section, but the
-% change may not take effect just when you'd like; if it's done between
-% paragraphs nothing surprising should happen.
-%
-% The selection is recorded in "\line@margin":
-% $0$ for left, $1$ for right, $2$ for outer, and $3$ for inner.
-% \begin{macrocode}
-\newcount\line@margin
-\def\linenummargin#1{{%
- \def\@tempa{#1}\def\@tempb{left}%
- \ifx\@tempa\@tempb
- \global\line@margin=0
- \else
- \def\@tempb{right}%
- \ifx\@tempa\@tempb
- \global\line@margin=1
- \else
- \def\@tempb{outer}%
- \ifx\@tempa\@tempb
- \global\line@margin=2
- \else
- \def\@tempb{inner}%
- \ifx\@tempa\@tempb
- \global\line@margin=3
- \else
- \edmac@warning{Bad \string\linenummargin\space argument.}%
- \fi
- \fi
- \fi
- \fi}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\firstlinenum}
-% \begin{macro}{\linenumincrement}
-% The following parameters tell "EDMAC" which lines should be
-% printed with line numbers. "\firstlinenum" is the number of the
-% first line in each section that gets a number;
-% "\linenumincrement"
-% is the difference between successive numbered lines. The initial
-% values of these counters produce labels on lines $5$, $10$, $15$, etc.
-% "\linenumincrement" must be at least $1$.
-% \begin{macrocode}
-\newcount\firstlinenum
-\newcount\linenumincrement
-\firstlinenum=5
-\linenumincrement=5
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\firstsublinenum}
-% \begin{macro}{\sublinenumincrement}
-% The following parameters are just like "\firstlinenum" and
-% "\linenumincrement", but for sub-line numbers.
-% "\sublinenumincrement" must be at least $1$.
-% \begin{macrocode}
-\newcount\firstsublinenum
-\newcount\sublinenumincrement
-\firstsublinenum=5
-\sublinenumincrement=5
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\lockdisp}
-% \begin{macro}{\lock@disp}
-% When line locking is being used, the "\lockdisp" macro
-% specifies whether a line number---if one is due to
-% appear---should be printed on the first printed line or on the
-% last, or by all of them. Its argument is a word, either
-% "first", "last", or "all". Initially, it is set to "first".
-%
-% "\lock@disp" encodes the selection: $0$ for first, $1$ for last,
-% $2$ for all.
-% \begin{macrocode}
-\newcount\lock@disp
-\def\lockdisp#1{{%
- \def\@tempa{#1}\def\@tempb{first}%
- \ifx\@tempa\@tempb
- \global\lock@disp=0
- \else
- \def\@tempb{last}%
- \ifx\@tempa\@tempb
- \global\lock@disp=1
- \else
- \def\@tempb{all}%
- \ifx\@tempa\@tempb
- \global\lock@disp=2
- \else
- \edmac@warning{Bad \string\lockdisp\space argument.}%
- \fi
- \fi
- \fi}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\sublockdisp}
-% \begin{macro}{\sublock@disp}
-% The same questions about where to print the line number apply to
-% sub-lines, and these are the analogous macros for dealing with
-% the problem.
-% \begin{macrocode}
-\newcount\sublock@disp
-\def\sublockdisp#1{{%
- \def\@tempa{#1}\def\@tempb{first}%
- \ifx\@tempa\@tempb
- \global\sublock@disp=0
- \else
- \def\@tempb{last}%
- \ifx\@tempa\@tempb
- \global\sublock@disp=1
- \else
- \def\@tempb{all}%
- \ifx\@tempa\@tempb
- \global\sublock@disp=2
- \else
- \edmac@warning{Bad \string\sublockdisp\space argument.}%
- \fi
- \fi
- \fi}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\leftlinenum}
-% \begin{macro}{\rightlinenum}
-% \begin{macro}{\linenumsep}
-% \begin{macro}{\numlabfont}
-% "\leftlinenum" and "\rightlinenum" are the macros that are
-% called to print marginal line numbers on
-% a page, for left- and right-hand margins respectively.
-% They're made easy to access and change, since you may
-% often want to change the styling in some way. These standard versions
-% illustrate the general sort of thing that will be needed; they're
-% based on the "\leftheadline" macro in {\em The \TeX book}, p.\,416.
-%
-% Whatever these macros output gets printed in a box that will be
-% put into the appropriate margin without any space between it and the
-% line of text. You'll generally want a kern between a line number and
-% the text, and "\linenumsep" is provided as a standard way of
-% storing its size. Line numbers are usually printed in a smaller
-% font, and "\numlabfont" is provided as a standard name for that
-% font. When called, these macros
-% will be executed within a group, so font changes and the like will
-% remain local.
-% \begin{macrocode}
-\newdimen\linenumsep
-\linenumsep=1pc
-\ifx\selectfont\undefined
- \let\numlabfont=\sevenrm
-\else
- \def\numlabfont{\fontsize{7}{8pt}\rm}
-\fi
-\def\leftlinenum{\numlabfont\the\line@num
- \ifsublines@
- \ifnum\subline@num>0
- \unskip\fullstop\the\subline@num
- \fi
- \fi
- \kern\linenumsep}
-\def\rightlinenum{\kern\linenumsep \numlabfont\the\line@num
- \ifsublines@
- \ifnum\subline@num>0
- \unskip\fullstop\the\subline@num
- \fi
- \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{List macros}
-%
-% We will make heavy use of lists of information, which will be built
-% up and taken apart by the following macros; they are
-% adapted from {\em The \TeX book}, pp.\,378--379, which discusses
-% their use in more detail.
-%
-% These macros consume a large amount of the run-time of this code.
-% We intend to replace them in a future version, and in anticipation
-% of doing so have defined their interface in such a way that it is
-% not sensitive to details of the underlying code.
-%
-% \begin{macro}{\list@create}
-% The "\list@create" macro creates a new list. In this version of
-% "EDMAC" this macro doesn't do anything beyond initializing an empty
-% list macro, but in future versions it will do more.
-% \begin{macrocode}
-\def\list@create#1{\global\let#1=\empty}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\list@clear}
-% The "\list@clear" macro just initializes a list to the empty list;
-% in this version of "EDMAC" it is no different from
-% "\list@create".
-% \begin{macrocode}
-\def\list@clear#1{\global\let#1=\empty}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\xright@appenditem}
-% \begin{macro}{\@toksa}
-% \begin{macro}{\@toksb}
-% "\xright@appenditem" expands an item and appends it to the right
-% end of a list macro. We want the expansion because we'll often
-% be using this to store the current value of a counter.
-% It creates global control sequences, like "\xdef", and uses two
-% temporary token-list registers, "\@toksa" and "\@toksb".
-% \begin{macrocode}
-\newtoks\@toksa \newtoks\@toksb
-\global\@toksa={\\}
-\long\def\xright@appenditem#1\to#2{%
- \global\@toksb=\expandafter{#2}%
- \xdef#2{\the\@toksb\the\@toksa\expandafter{#1}}%
- \global\@toksb={}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\xleft@appenditem}
-% "\xleft@appenditem" expands an item and appends it to the left
-% end of a list macro; it is otherwise identical to
-% "\xright@appenditem".
-% \begin{macrocode}
-\long\def\xleft@appenditem#1\to#2{%
- \global\@toksb=\expandafter{#2}%
- \xdef#2{\the\@toksa\expandafter{#1}\the\@toksb}%
- \global\@toksb={}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\gl@p}
-% The "\gl@p" macro removes the leftmost
-% item from a list and places it in a
-% control sequence. You say "\gl@p\l\to\z"
-% (where "\l" is the list macro, and
-% "\z" receives the left item). "\l" is assumed nonempty: say
-% "\ifx\l\empty" to test for an empty "\l". The control
-% sequences created by "\gl@p" are all global.
-% \begin{macrocode}
-\def\gl@p#1\to#2{\expandafter\gl@poff#1\gl@poff#1#2}
-\long\def\gl@poff\\#1#2\gl@poff#3#4{\gdef#4{#1}\gdef#3{#2}}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Line-number counters and lists}
-%
-% Footnote references using line numbers rather than symbols can't be
-% generated in one pass, because we don't know the line numbers till we
-% ship out the pages. It would be possible if footnotes were never keyed
-% to more than one line; but some footnotes gloss passages that may run
-% for several lines, and they must be tied to the first line of the
-% passage glossed. And even one-line passages require two passes if we
-% want line-per-page numbering rather than line-per-section numbering.
-%
-% So we run \TeX\ over the text several times, and each time save
-% information about page and line numbers in a ``line-list file'' to
-% be used during the next pass. At the start of each section---whenever
-% "\beginnumbering" is executed---the line-list file
-% for that section
-% is read, and the information from it is encoded into a few list
-% macros.
-%
-% We need first to define the different line numbers that are involved
-% in these macros, and the associated counters.
-%
-% \begin{macro}{\line@num}
-% The "\line@num" counter stores the line number that's used in
-% marginal line numbering and in notes: counting either from the start of
-% the page or from the start of the section, depending on your
-% choice for this section. This may be qualified by "\subline@num".
-% \begin{macrocode}
-\newcount\line@num
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\subline@num}
-% The "\subline@num" counter stores
-% a sub-line number that qualifies "\line@num". For example,
-% line $10$ might have sub-line numbers $1$, $2$ and $3$, which might be
-% printed as lines $10.1$, $10.2$, $10.3$.
-% \begin{macrocode}
-\newcount\subline@num
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\ifsublines@}
-% \begin{macro}{\sublines@true}
-% \begin{macro}{\sublines@false}
-% We maintain an associated flag, "\ifsublines@",
-% to tell us whether we're within
-% a sub-line range or not.
-%
-% You may wonder why we don't just use the value of "\subline@num"
-% to determine this---treating anything greater than $0$ as an
-% indication that sub-lineation is on. We need a separate flag because
-% sub-lineation can be used together with line-number locking in odd
-% ways: several pieces of a logical line might be interrupted by
-% pieces of sub-lineated text, and those sub-line numbers should not
-% return to zero until the next change in the major line number. This
-% is common in the typesetting of English Renaissance verse
-% drama\index{Middleton, Thomas}, in which stage directions are
-% given sub-line numbers: a single line of verse may be
-% interrupted by several stage directions.
-% \begin{macrocode}
-\newif\ifsublines@
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\absline@num}
-% The "\absline@num" counter stores the
-% absolute number of lines since the start
-% of the section: that is, the number we've actually printed, no matter
-% what numbers we attached to them.
-% This value is never printed on an output page, though
-% "\line@num" will often be equal to it. It is used internally to
-% keep track of where notes are to appear and where new
-% pages start: using this value rather than "\line@num" is a lot
-% simpler, because it doesn't depend on the lineation system in use.
-% \begin{macrocode}
-\newcount\absline@num
-% \end{macrocode}
-% \end{macro}
-%
-% We'll be calling "\absline@num" numbers ``absolute'' numbers, and
-% "\line@num" and "\subline@num" numbers ``visible'' numbers.
-%
-% \begin{macro}{\@lock}
-% \begin{macro}{\sub@lock}
-% The "\@lock" and "\sub@lock" counters
-% tell us the state of line-number
-% and sub-line-number locking. $0$ means we're not within a locked set of
-% lines; $1$ means we're at the first line in the set; $2$, at some
-% intermediate line; and $3$, at the last line.
-% \begin{macrocode}
-\newcount\@lock
-\newcount\sub@lock
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\line@list}
-% \begin{macro}{\insertlines@list}
-% \begin{macro}{\actionlines@list}
-% \begin{macro}{\actions@list}
-% Now we can define the list macros that will be created from the
-% line-list file. We will maintain the following lists:
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item "\line@list": the page and line numbers for every
-% lemma marked by "\text".
-% There are seven pieces of information, separated by vertical bars:
-% \label{linenumbers}
-% \begin{enumerate}\addtolength{\itemsep}{-1ex}
-% \item the starting page,
-% \item line, and
-% \item sub-line numbers, followed by the
-% \item ending page,
-% \item line, and
-% \item sub-line numbers, and then the
-% \item font specifier for the lemma.
-% \end{enumerate}
-% These line numbers are all visible numbers. Thus a lemma that
-% started on page $23$, line $35$ and
-% went on until page $24$, line $3$
-% (with no sub-line numbering), and was typeset in a font from
-% "\fam0" would have a line list entry like this:
-% "23|35|0|24|3|0|0". That assumes the use of the Plain font selection
-% scheme, which uses the family number as its font specifier. When
-% NFSS is used, the font specifier is a set of four codes for
-% font encoding,
-% family, series, and shape, separated by "/" characters; in that
-% case, the line-list entry would be
-% "23|35|0|24|3|0|OT1/cmr/m/n".
-%
-% There is one item in this list for every lemma marked by
-% "\text", even if there are several notes to that lemma, or no
-% notes at all. "\text" reads the data in this list, making it
-% available for use in the text of notes.
-%
-% \item "\insertlines@list": the line numbers of lines that have
-% footnotes or other insertions.
-% These are the absolute numbers where the corresponding
-% lemmas begin. This list contains one entry for every footnote in the
-% section; one lemma may contribute no footnotes or many footnotes.
-% This list is used by "\add@inserts" within "\do@line", to tell
-% it where to insert notes.
-%
-% \item "\actionlines@list": a list of absolute line numbers at
-% which we are to perform special
-% actions; these actions are specified by the "\actions@list" list
-% defined below.
-%
-% \item "\actions@list": action codes corresponding to the line
-% numbers in "\actionlines@list". These codes tell "EDMAC" what action
-% it's supposed to take at each of these lines. One action, the
-% page-start action, is generated behind the scenes by "EDMAC" itself;
-% the others, for specifying sub-lineation, line-number locking, and
-% line-number alteration, are generated only by explicit commands in
-% your input file. The page-start and line-number-alteration actions
-% require arguments, to specify the new values for the page or line
-% numbers; instead of storing those arguments in another list, we have
-% chosen the action-code values so that they can encode both the action
-% and the argument in these cases. Action codes greater than $-1000$
-% are page-start actions, and the code value is the page number; action
-% codes less than $-5000$ specify line numbers, and the code value is
-% a transformed version of the line number; action codes between these
-% two values specify other actions which require no argument.
-%
-% Here is the full list of action codes and their meanings:
-%
-% Any number greater than $-1000$ is a page-start action: the line number
-% associated with it is the first line on a page, and the action number is
-% the page number. (The cutoff of $-1000$ is chosen because negative
-% page-number values are used by some macro packages; we assume that
-% page-number values less than $-1000$ are not common.)
-% Page-start action codes are added to the list by
-% the "\page@action" macro, which is (indirectly) triggered by the
-% workings of the "\page@start" macro; that macro should always be
-% called in the output routine, just before the page contents are
-% assembled. "EDMAC" calls it in "\pagecontents".
-%
-% The action code $-1001$ specifies the start of sub-lineation: meaning
-% that, starting with the next line, we should be advancing
-% "\subline@num" at each start-of-line command, rather than
-% "\line@num".
-%
-% The action code $-1002$ specifies the end of sub-lineation. At the
-% next start-of-line, we should clear the sub-line counter and start
-% advancing the line number. The action codes for starting and ending
-% sub-lineation are added to the list by the "\sub@action" macro, as
-% called to implement the "\startsub" and "\endsub" macros.
-%
-% The action code $-1003$ specifies the start of line number locking.
-% After the number for the current line is computed, it will remain
-% at that value through the next line that has an action code to end
-% locking.
-%
-% The action code $-1004$ specifies the end of line number locking.
-%
-% The action code $-1005$ specifies the start of sub-line number locking.
-% After the number for the current sub-line is computed, it will remain
-% at that value through the next sub-line that has an action code to end
-% locking.
-%
-% The action code $-1006$ specifies the end of sub-line number locking.
-%
-% The four action codes for line and sub-line number locking are added
-% to the list by the "\do@lockon" and "\do@lockoff" macros, as called
-% to implement the "\startlock" and "\endlock" macros.
-%
-% An action code of $-5000$ or less sets the current visible line
-% number (either the line number or the sub-line number, whichever is
-% currently being advanced) to a specific positive value. The value of
-% the code is $-(5000+n)$, where $n$ is the value (always $\ge 0$)
-% assigned to the current line number. Action codes of this type are
-% added to the list by the "\set@line@action" macro, as called to
-% implement the "\advanceline" and "\setline" macros: this action only
-% occurs when the user has specified some change to the line numbers
-% using those macros. Normally "EDMAC" computes the visible line numbers
-% from the absolute line numbers with reference to the other
-% action codes and the settings they invoke; it doesn't require an
-% entry in the action-code list for every line.
-%
-% Here are the commands to create these lists:
-%
-% \begin{macrocode}
-\list@create{\line@list}
-\list@create{\insertlines@list}
-\list@create{\actionlines@list}
-\list@create{\actions@list}
-% \end{macrocode}
-%
-% \end{itemize}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\page@num}
-% \begin{macro}{\endpage@num}
-% \begin{macro}{\endline@num}
-% \begin{macro}{\endsubline@num}
-% We'll need some counters while we read the line-list,
-% for the page number and the ending page, line, and sub-line numbers.
-% Some of these will be used again later on, when we are acting on the
-% data in our list macros.
-% \begin{macrocode}
-\newcount\page@num
-\newcount\endpage@num
-\newcount\endline@num
-\newcount\endsubline@num
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\ifnoteschanged@}
-% \begin{macro}{\noteschanged@true}
-% \begin{macro}{\noteschanged@false}
-% If the number of footnotes in a section is different from what it was
-% during the last run, or if this is the very first time you've run
-% \TeX\
-% on this file, the information from the line-list used to place the
-% notes will be wrong, and some notes will probably be misplaced.
-% When this happens, we prefer
-% to give a single error message for the whole section rather than
-% messages at every point where we notice the problem, because
-% we don't really know where in the section notes were added or removed,
-% and the solution in any case is simply to run \TeX\ two more times;
-% there's no fix needed to the document. The
-% "\ifnoteschanged@" flag is set if such
-% a change in the number of notes is discovered at any point.
-% \begin{macrocode}
-\newif\ifnoteschanged@
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Reading the line-list file}
-%
-% \begin{macro}{\read@linelist}
-% \begin{macro}{\@inputcheck}
-% "\read@linelist" is the control sequence
-% that's called by "\beginnumbering"
-% (via "\line@list@stuff") to open and process a
-% line-list file; its argument is the name of the file, which will
-% be opened on stream "\@inputcheck" to check for its existence.
-% The first thing we do is initialize all the lists we just
-% described.\label{readlinelist}
-% \begin{macrocode}
-\newread\@inputcheck
-\def\read@linelist#1{%
- \list@clear{\line@list}%
- \list@clear{\insertlines@list}%
- \list@clear{\actionlines@list}%
- \list@clear{\actions@list}%
-% \end{macrocode}
-%
-% Try to open the line-list file, as a check on whether it exists.
-% \begin{macrocode}
- \openin\@inputcheck=#1
- \ifeof\@inputcheck
- \edmac@warning{Can't find line-list file #1}%
- \global\noteschanged@true
- \else
- \global\noteschanged@false
- \closein\@inputcheck
-% \end{macrocode}
-%
-% The file's there. We start a new group and make some special
-% definitions we'll need to process it: it's a sequence of \TeX\
-% commands, but they require a few special settings. We make [ and
-% ] become grouping characters: they're used that way in the
-% line-list file, because we need to write them out one at a time
-% rather than in balanced pairs, and it's easier to just use
-% something other than real braces. @ must become a letter, since
-% this is run in the ordinary \TeX\ context. We ignore carriage
-% returns, since if we're in horizontal mode they can get
-% interpreted as spaces to be printed.
-%
-% \begin{macrocode}
- \begingroup
- \catcode`\[=1 \catcode`\]=2
- \makeatletter \catcode`\^^M=9
-% \end{macrocode}
-%
-% Our line, page, and line-locking counters were already zeroed
-% by "\line@list@stuff" if this is being called from within
-% "\beginnumbering"; sub-lineation will be turned off as well
-% in that case. On the other hand,
-% if this is being called from "\resumenumbering", those things
-% should still have the values they had when "\pausenumbering"
-% was executed.
-%
-% Now, after these preliminaries, we start interpreting the file.
-%
-% \begin{macrocode}
- \input #1
- \endgroup
- \fi
-% \end{macrocode}
-%
-% When the "\input" is done, we're all through with the
-% line-list file. All the information we needed
-% from it will now be encoded in our list macros.
-%
-% Finally, we
-% initialize the "\next@actionline" and "\next@action" macros,
-% which specify where and what the next action to be taken is.
-% \begin{macrocode}
- \global\page@num=-1
- \ifx\actionlines@list\empty
- \gdef\next@actionline{1000000}%
- \else
- \gl@p\actionlines@list\to\next@actionline
- \gl@p\actions@list\to\next@action
- \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% This version of "\read@linelist" creates list macros
-% containing data for the entire section, so they could get rather
-% large. It would be no more difficult to read the line-list file
-% incrementally rather than all at once: we could read, at the
-% start of each paragraph, only the commands relating to that
-% paragraph, using "\read". But this would require that we
-% have two line-lists open at once, one for reading, one for
-% writing, and on systems without version numbers we'd have to do
-% some file renaming outside of \TeX{} for that to work. We've
-% retained this slower approach to avoid that sort of hacking
-% about, but have provided the "\pausenumbering" and
-% "\resumenumbering" macros to help you if you run into
-% macro memory limitations (see p.\,\pageref{pause} above).
-%
-% \subsection{Commands within the line-list file}
-%
-% This section defines the commands that can appear within a
-% line-list file. They all have very short names because we are
-% likely to be writing very large numbers of them out. One macro,
-% "\@l", is especially short, since it will be written to the
-% line-list file once for every line of text in a numbered section.
-% (Another of these commands, "\@lab", will be introduced in a
-% later section, among the cross-referencing commands it is
-% associated with.)
-%
-% When these commands modify the various page and line counters,
-% they deliberately do not say "\global". This is because we
-% want them to affect only the counter values within the current
-% group when nested calls of "\@ref" occur. (The code assumes
-% throughout that the value of "\globaldefs" is zero.)
-%
-% The macros with "action" in their names contain all the code
-% that modifies the action-code list: again, this is so that they
-% can be turned off easily for nested calls of "\@ref".
-%
-% \begin{macro}{\@l}
-% "\@l" does everything related to the start of a
-% new line of numbered text.
-%
-% First increment the absolute line-number, and perform
-% deferred actions relating to page starts and sub-lines.
-% \begin{macrocode}
-\def\@l{\advance\absline@num by 1
- \ifx\next@page@num\relax \else
- \page@action
- \let\next@page@num=\relax
- \fi
- \ifx\sub@change\relax \else
- \ifnum\sub@change>0
- \sublines@true
- \else
- \sublines@false
- \fi
- \sub@action
- \let\sub@change=\relax
- \fi
-% \end{macrocode}
-%
-% Fix the lock counters, if necessary. A value of $1$ is advanced to
-% $2$; $3$ advances to $0$; other values are unchanged.
-% \begin{macrocode}
- \ifcase\@lock
- \or
- \@lock=2
- \or \or
- \@lock=0
- \fi
- \ifcase\sub@lock
- \or
- \sub@lock=2
- \or \or
- \sub@lock=0
- \fi
-% \end{macrocode}
-%
-% Now advance the visible line number, unless it's been locked.
-% \begin{macrocode}
- \ifsublines@
- \ifnum\sub@lock<2
- \advance\subline@num by 1
- \fi
- \else
- \ifnum\@lock<2
- \advance\line@num by 1 \subline@num=0
- \fi
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@page}
-% "\@page" marks the start of a new output page; its argument is
-% the number of that page.
-%
-% First we reset the visible line numbers, if we're numbering by page,
-% and store the page number itself in a counter.
-% \begin{macrocode}
-\def\@page#1{\ifbypage@
- \line@num=0 \subline@num=0
- \fi
- \page@num=#1
-% \end{macrocode}
-%
-% And we set a flag that tells "\@l" that a new page number is
-% to be set, because other associated actions shouldn't occur until the
-% next line-start occurs.
-% \begin{macrocode}
- \def\next@page@num{#1}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\sub@on}
-% \begin{macro}{\sub@off}
-% The "\sub@on" and "\sub@off" macros
-% turn sub-lineation on and off\/: but not directly, since such changes
-% don't really take effect until the next line of text. Instead
-% they set a flag that notifies "\@l" of the necessary action.
-% \begin{macrocode}
-\def\sub@on{\ifsublines@
- \let\sub@change=\relax
- \else
- \def\sub@change{1}%
- \fi}
-\def\sub@off{\ifsublines@
- \def\sub@change{-1}%
- \else
- \let\sub@change=\relax
- \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@adv}
-% The "\@adv" macro advances
-% the current visible line number by the amount specified as
-% its argument. This is used to implement "\advanceline".
-% \begin{macrocode}
-\def\@adv#1{\ifsublines@
- \advance\subline@num by #1
- \ifnum\subline@num<0
- \edmac@warning{\string\advanceline\space produced
- a sub-line number less than zero.}%
- \subline@num=0
- \fi
- \else
- \advance\line@num by #1
- \ifnum\line@num<0
- \edmac@warning{\string\advanceline\space produced
- a line number less than zero.}%
- \line@num=0
- \fi
- \fi
- \set@line@action}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@set}
-% The "\@set" macro sets
-% the current visible line number to the value specified as
-% its argument. This is used to implement "\setline".
-% \begin{macrocode}
-\def\@set#1{\ifsublines@
- \subline@num=#1
- \else
- \line@num=#1
- \fi
- \set@line@action}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\page@action}
-% "\page@action"
-% adds an entry to the action-code list to change the page number.
-% \begin{macrocode}
-\def\page@action{%
- \xright@appenditem{\the\absline@num}\to\actionlines@list
- \xright@appenditem{\next@page@num}\to\actions@list}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\set@line@action}
-% "\set@line@action" adds an entry to the action-code
-% list to change the visible line number.
-% \begin{macrocode}
-\def\set@line@action{%
- \xright@appenditem{\the\absline@num}\to\actionlines@list
- \ifsublines@
- \@tempcnta=-\subline@num
- \else
- \@tempcnta=-\line@num
- \fi
- \advance\@tempcnta by -5000
- \xright@appenditem{\the\@tempcnta}\to\actions@list}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\sub@action}
-% "\sub@action"
-% adds an entry to the action-code list to turn sub-lineation on or
-% off, according to the current value of the "\ifsublines@" flag.
-% \begin{macrocode}
-\def\sub@action{%
- \xright@appenditem{\the\absline@num}\to\actionlines@list
- \ifsublines@
- \xright@appenditem{-1001}\to\actions@list
- \else
- \xright@appenditem{-1002}\to\actions@list
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\lock@on}
-% \begin{macro}{\do@lockon}
-% "\lock@on"
-% adds an entry to the action-code list to turn line number
-% locking on. The current setting of the sub-lineation flag tells us
-% whether this applies to line numbers or sub-line numbers.
-%
-% Adding commands to the action list is slow, and it's very often the
-% case that a lock-on command is immediately followed by a lock-off
-% command in the line-list file, and therefore really does nothing.
-% We use a look-ahead scheme here to detect such pairs, and add nothing
-% to the line-list in those cases.
-% \begin{macrocode}
-\def\lock@on{\futurelet\next\do@lockon}
-\def\do@lockon{%
- \ifx\next\lock@off
- \global\let\lock@off=\skip@lockoff
- \else
- \xright@appenditem{\the\absline@num}\to\actionlines@list
- \ifsublines@
- \xright@appenditem{-1005}\to\actions@list
- \ifcase\sub@lock
- \sub@lock=1
- \else
- \sub@lock=0
- \fi
- \else
- \xright@appenditem{-1003}\to\actions@list
- \ifcase\@lock
- \@lock=1
- \else
- \@lock=0
- \fi
- \fi
- \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\lock@off}
-% \begin{macro}{\do@lockoff}
-% \begin{macro}{\skip@lockoff}
-% "\lock@off" adds an entry to the action-code list
-% to turn line number locking off.
-% \begin{macrocode}
-\def\do@lockoff{%
- \xright@appenditem{\the\absline@num}\to\actionlines@list
- \ifsublines@
- \xright@appenditem{-1006}\to\actions@list
- \ifnum\sub@lock=2
- \sub@lock=3
- \else
- \sub@lock=0
- \fi
- \else
- \xright@appenditem{-1004}\to\actions@list
- \ifnum\@lock=2
- \@lock=3
- \else
- \@lock=0
- \fi
- \fi}
-\def\skip@lockoff{\global\let\lock@off=\do@lockoff}
-\global\let\lock@off=\do@lockoff
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@ref}
-% \begin{macro}{\insert@count}
-% "\@ref"
-% marks the start of a passage, for creation of a footnote reference.
-% It takes two arguments:
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item "#1", the number of entries to add to "\insertlines@list"
-% for this reference. \SpecialMainIndex{\insert@count}
-% This value, here and within "\text",
-% which computes it and writes it to the line-list file,
-% will be stored in the "\insert@count" counter.
-% \begin{macrocode}
-\newcount\insert@count
-% \end{macrocode}
-%
-% \item "#2", a sequence of other line-list-file commands, executed to
-% determine the ending line-number. (This may also include other
-% "\@ref" commands, corresponding to uses of "\text"
-% within the first argument of another instance of "\text".)
-% \end{itemize}
-%
-% \begin{macro}{\dummy@ref}
-% When nesting of "\@ref" commands does occur, it's necessary to
-% temporarily redefine "\@ref" within "\@ref", so that we're only
-% doing one of these at a time.
-% \begin{macrocode}
-\def\dummy@ref#1#2{#2}
-% \end{macrocode}
-% \end{macro}
-%
-% The first thing "\@ref" itself does is to add the specified number
-% of items to the "\insertlines@list" list.
-% \begin{macrocode}
-\def\@ref#1#2{%
- \global\insert@count=#1
- \loop\ifnum\insert@count>0
- \xright@appenditem{\the\absline@num}\to\insertlines@list
- \global\advance\insert@count by -1
- \repeat
-% \end{macrocode}
-%
-% Next, process the second argument to determine the page
-% and line numbers for the end of this lemma.
-% We temporarily equate "\@ref" to a different macro that just executes
-% its argument, so that nested "\@ref" commands are just skipped
-% this time. Some other macros need to be temporarily redefined to
-% suppress their action.
-% \begin{macrocode}
- \begingroup
- \let\@ref=\dummy@ref
- \let\page@action=\relax
- \let\sub@action=\relax
- \let\set@line@action=\relax
- \let\@lab=\relax
- #2
- \global\endpage@num=\page@num
- \global\endline@num=\line@num
- \global\endsubline@num=\subline@num
- \endgroup
-% \end{macrocode}
-%
-% Now store all the information about the location of the lemma's
-% start and end in "\line@list".
-% \begin{macrocode}
- \xright@appenditem%
- {\the\page@num|\the\line@num|%
- \ifsublines@ \the\subline@num \else 0\fi|%
- \the\endpage@num|\the\endline@num|%
- \ifsublines@ \the\endsubline@num \else 0\fi}\to\line@list
-% \end{macrocode}
-%
-% Finally, execute the second argument of "\@ref" again,
-% to perform for real all the commands within it.
-% \begin{macrocode}
- #2}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Writing to the line-list file}
-%
-% We've now defined all the counters, lists, and commands involved in
-% reading the line-list file at the start of a section. Now we'll
-% cover the commands that "EDMAC" uses within the text of a
-% section to write commands out to the line-list.
-%
-% \begin{macro}{\linenum@out}
-% The file will be opened on output stream "\linenum@out".
-% \begin{macrocode}
-\newwrite\linenum@out
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\iffirst@linenum@out@}
-% \begin{macro}{\first@linenum@out@true}
-% \begin{macro}{\first@linenum@out@false}
-% Once any file is opened on this stream, we keep it open forever, or
-% else switch to another file that we keep open. The reason is that
-% we want the output routine to write the page number for every page
-% to this file; otherwise we'd have to write it at the start of
-% every line.
-% But it's not very easy for the output routine to tell whether an
-% output stream is open or not. There's no way to test the status of
-% a particular output stream directly, and
-% the asynchronous nature of output routines makes the
-% status hard to determine by other means.
-%
-% We can manage pretty well by means of the "\iffirst@linenum@out@"
-% flag; its inelegant name suggests the nature of the problem that
-% made its creation necessary. It's set
-% to be "true" before any "\linenum@out" file is opened. When such a file
-% is opened for the first time, it's done using "\immediate", so that
-% it will at once be safe for the output routine to write to it; we then
-% set this flag to "false".
-% \begin{macrocode}
-\newif\iffirst@linenum@out@
-\first@linenum@out@true
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\line@list@stuff}
-% The "\line@list@stuff" macro, which
-% is called by "\beginnumbering", performs
-% all the line-list operations needed at the start of a section.
-% Its argument is the name of the line-list file.
-% \begin{macrocode}
-\def\line@list@stuff#1{%
-% \end{macrocode}
-%
-% First, use the commands of the previous section to interpret the
-% line-list file from the last run.
-% \begin{macrocode}
- \read@linelist{#1}%
-% \end{macrocode}
-%
-% Now close the current output line-list file, if any, and open a new one.
-% The first time we open a line-list file for output, we do it using
-% "\immediate", and clear the "\iffirst@linenum@out@" flag.
-% \begin{macrocode}
- \iffirst@linenum@out@
- \immediate\closeout\linenum@out
- \global\first@linenum@out@false
- \immediate\openout\linenum@out=#1
- \else
-% \end{macrocode}
-% If we get here, then this is
-% not the first line-list we've seen, so we
-% don't open or close the files immediately. We also need to insert
-% a "\@page" command, since this might begin in the middle of
-% a page.
-% \begin{macrocode}
- \closeout\linenum@out
- \openout\linenum@out=#1
- \page@start
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\new@line}
-% The "\new@line" macro sends the "\@l" command to the line-list
-% file, to mark the start of a new text line.
-% \begin{macrocode}
-\def\new@line{\write\linenum@out{\string\@l}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\flag@start}
-% \begin{macro}{\flag@end}
-% We enclose a lemma marked by "\text" in
-% "\flag@start" and "\flag@end": these send the "\@ref"
-% command to the line-list file. "\text" is responsible for
-% setting the value of "\insert@count" appropriately; it
-% actually gets done by the various footnote macros.
-% \begin{macrocode}
-\def\flag@start{%
- \edef\next{\write\linenum@out{%
- \string\@ref[\the\insert@count][}}%
- \next}
-\def\flag@end{\write\linenum@out{]}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\page@start}
-% "\page@start" writes a command to the line-list
-% file noting the current page number.
-% When used within an output routine, this should be called so as to place
-% its "\write" within the box that gets shipped out, and as close to
-% the top of that box as possible.
-% \begin{macrocode}
-\def\page@start{%
- \iffirst@linenum@out@ \else
- \write\linenum@out{\string\@page[\the\pageno]}%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\startsub}
-% \begin{macro}{\endsub}
-% "\startsub" and "\endsub"
-% turn sub-lineation on and off, by writing
-% appropriate instructions to the line-list file. When
-% sub-lineation is in effect, the line number counter is frozen and
-% the sub-line counter advances instead. If one of these commands
-% appears in the middle of a line, it doesn't take effect until the
-% next line; in other words, a line is counted as a line or
-% sub-line depending on what it started out as, even if that
-% changes in the middle.
-%
-% We tinker with "\lastskip" because a command of either sort
-% really needs to be attached to the last word preceding the change, not
-% the first word that follows the change. This is because sub-lineation
-% will often turn on and off in mid-line---stage directions, for example,
-% often are mixed with dialogue in that way---and when a line is mixed
-% we want to label it using the system that was in effect at its start.
-% But when sub-lineation begins at the very start of a line we have a
-% problem, if we don't put in this code.
-% \begin{macrocode}
-\def\startsub{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \write\linenum@out{\string\sub@on}%
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
-\def\endsub{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \write\linenum@out{\string\sub@off}%
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\advanceline}
-% You can use "\advanceline"
-% in running text to advance the current visible
-% line-number by a specified value, positive or negative.
-% \begin{macrocode}
-\def\advanceline#1{\write\linenum@out{\string\@adv[#1]}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\setline}
-% You can use "\setline"
-% in running text to set the current visible
-% line-number to a specified positive value.
-% \begin{macrocode}
-\def\setline#1{%
- \ifnum#1<0
- \edmac@warning{Bad setline argument.}%
- \else
- \write\linenum@out{\string\@set[#1]}%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\startlock}
-% \begin{macro}{\endlock}
-% You can use "\startlock" or "\endlock"
-% in running text to start or end line number locking at
-% the current line. They decide whether line numbers or sub-line numbers
-% are affected, depending on the current state of the sub-lineation flags.
-% \begin{macrocode}
-\def\startlock{\write\linenum@out{\string\lock@on}}
-\def\endlock{\write\linenum@out{\string\lock@off}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \section{Marking text for notes}
-% \label{text}\relax
-%
-% The "\text" macro is used to create all footnotes and endnotes,
-% as well as to print the portion of the main text to which a given note
-% or notes is keyed. The idea is to have that lemma appear only once in
-% the ".tex" file: all instances of it in the main text and in the
-% notes are copied from that one appearance.
-%
-% "\text" requires two arguments. At any point within numbered
-% text, you use it by saying:
-% \begin{verbatim}
-% \text{#1}{#2}/
-% \end{verbatim}
-% where
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item "#1" is the piece of the main text being glossed;
-% it gets added to the
-% main text, and is also used as a lemma for notes to it.
-%
-% \item "#2" is a series of subsidiary macros that generate
-% various kinds of notes. The "/" after "#2" {\em must\/} appear:
-% it marks the end of the macro. ({\em The \TeX{}book},
-% p.\,204, points out that when
-% additional text to be matched follows the arguments like this, spaces
-% following the macro are not skipped, which is very desirable since
-% this macro will never be used except within text. Having an
-% explicit terminator also helps keep things straight when nested
-% calls to "\text" are used.) Braces around
-% "#2" are optional.
-% \end{itemize}
-%
-% The "\text" macro may be used (somewhat) recursively; that
-% is, "\text" may be used within its own first argument. The
-% code would be much simpler without this feature, but nested notes
-% will commonly be necessary: it's quite likely that we'll have an
-% explanatory note for a long passage and notes on variants for
-% individual words within that passage. The situation we can't
-% handle is overlapping notes that aren't nested: for example, one
-% note covering lines 10--15, and another covering 12--18. You can
-% handle such cases by using the "\lemma" and "\linenum"
-% macros within "#2": they alter the copy of the lemma and the
-% line numbers that are passed to the notes, and hence allow you to
-% overcome any limitations of this system, albeit with extra
-% effort.
-%
-% The recursive operation of "\text" will fail if you try to use a copy
-% that is called something other than "\text". In order to handle
-% recursion, "\text" needs to redefine its own definition temporarily
-% at one point, and that doesn't work if the macro you are calling is
-% not actually named "\text". There's no problem as long as "\text"
-% is not invoked in the first argument. If you want to call "\text"
-% something else, it is best to create instead a macro that expands
-% to an invocation of "\text", rather than copying "\text" and giving
-% it a new name; otherwise you will need to add an appropriate
-% definition for your new macro to "\morenoexpands".
-%
-% Side effects of our line-numbering code make it impossible to use
-% the usual footnote macros directly within a paragraph whose lines are
-% numbered (see comments to
-% "\do@line", p.\,\pageref{doline}).
-% Instead, the appropriate note-generating command
-% is appended to the list macro "\inserts@list", and when "\pend"
-% completes the paragraph it inserts all the notes at the proper places.
-%
-% Note that we don't provide previous-note information, although it's
-% often wanted; your own macros must handle that. We can't do it
-% correctly without keeping track of what kind of notes have gone past:
-% it's not just a matter of remembering the line numbers associated with
-% the previous invocation of "\text", because that might have been for
-% a different kind of note. It is preferable for your footnote macros
-% to store and recall this kind of information if they need it.
-%
-% \label{parallel}An example where some ``memory'' of line numbers
-% might be required is where there are several variant readings
-% per line of text, and you do not wish the line number to be repeated
-% for each lemma in the notes. After the first occurrence of the line
-% number, you might want the symbol ``$\parallel$'' instead of further
-% occurrences, for instance. This can easily be done by a macro like
-% "\printlines", if it saves the last value of "\@nums" that {\em it\/}
-% saw, and then performs a simple conditional test to see whether to print
-% a number or a~``$\parallel$'' (see p.\,\pageref{multinotes} for an
-% example of how to do this).
-%
-% \subsection{{\tt \protect\bslash text} itself}
-%
-% \begin{macro}{\end@lemmas}
-% The various note-generating macros might want to request that
-% commands be executed not at once, but in close connection with the
-% start or end of the lemma. For example, footnote numbers in the text
-% should be connected to the end of the lemma; or, instead of a single
-% macro to create a note listing variants, you might want to use
-% several macros in series to create individual variants, which would
-% each add information to a private macro or token register, which in
-% turn would be formatted and output when all of "#2" for the lemma
-% has been read.
-%
-% To accomodate this, we provide a list macro
-% to which macros may add commands that should subsequently
-% be executed at the end of the lemma when that lemma is added
-% to the text of the paragraph. A macro should add its contribution to
-% "\end@lemmas" by using "\xleft@appenditem".
-% (Anything that needs to be done at
-% the {\em start\/} of the lemma may be handled using "\aftergroup", since
-% the commands specified within "\text"'s second argument are
-% executed within a group that ends just before the lemma is added to
-% the main text.)
-%
-% "\end@lemmas" is intended for the few things that need to be
-% associated with the end of the lemma, like footnote numbers. Such
-% numbers are not implemented in the current version, and indeed
-% no use is currently made of "\end@lemmas" or of the "\aftergroup"
-% trick. The general
-% approach would be to define a macro to be used within the second
-% argument of "\text" that would add the appropriate command to
-% "\end@lemmas".
-%
-% Commands that are added to this list should always take care
-% not to do anything that adds possible line-breaks to the output;
-% otherwise line numbering could be thrown off.
-% \begin{macrocode}
-\list@create{\end@lemmas}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\dummy@text}
-% We now need to define a number of macros that allow us to weed out
-% nested instances of "\text", and other problematic macros, from
-% our lemma. This is similar to what we did in reading the line-list
-% file using "\dummy@ref" and various redefinitions---and that's
-% because nested "\text" macros create nested "\@ref" entries
-% in the line-list file.
-%
-% Here's a macro that takes the same arguments as
-% "\text" but merely returns the first argument and ignores
-% the second.
-% \begin{macrocode}
-\long\def\dummy@text#1#2/{#1}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@gobble}
-% We're going to need another macro that takes one argument and ignores
-% it entirely. This one is identical to the \LaTeX{} macro of the same
-% name.
-% \begin{macrocode}
-\def\@gobble#1{}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\no@expands}
-% \begin{macro}{\morenoexpands}
-% We need to turn off macro expansion for certain sorts of macros we're
-% likely to see within the lemma and within the notes.
-%
-% The first class is font-changing macros. We suppress expansion for
-% them by letting them become equal to zero.\footnote{Since ``control
-% sequences equivalent to characters are not expandable''---{\em The
-% \TeX book\/}, answer to Exercise 20.14.} This is done because we want to
-% pass into our notes the generic commands to change to roman or
-% whatever, and not their expansions that will ask for a particular style at
-% a specified size. The notes may well be in a smaller font, so the
-% command should be expanded later, when the note's environment is in
-% effect.
-%
-% A second sort to turn off includes a few of the accent macros.
-% Most are not a problem: an accent that's expanded to an "\accent"
-% command may be harder to read but it works just the same. The
-% ones that cause problems are: those that use alignments---\TeX\
-% seems to get confused about the difference between alignment
-% parameters and macro parameters; those that use temporary control
-% sequences; and those that look carefully at what the current font
-% is.
-%
-% (The "\copyright" macro defined in \PlainTeX\ has this sort of
-% problem as well, but isn't used enough to bother with. That macro,
-% and any other that causes trouble, will get by all right if you put
-% a "\noexpand" in front of it in your file---or a "\protect" if
-% you're using NFSS.)
-%
-% We also need to eliminate all "EDMAC" macros like "\label" and
-% "\setline" that write things to auxiliary files: that writing
-% should be done only once. And we make
-% "\text" itself, if it appears within its own
-% argument, do nothing but copy its first argument.
-%
-% Finally, we execute "\morenoexpands". The version of
-% "\morenoexpands" defined here does nothing; but you may define
-% a version of your own when you need to add more expansion
-% suppressions as needed with your macros. That makes it possible
-% to make such additions without needing to copy or modify the
-% standard "EDMAC" code. If you define your own
-% "\morenoexpands", you must be very careful about spaces: if the
-% macro adds any spaces to the text when it runs, extra space
-% will appear in the main text when "\text" is used.
-%
-% (A related problem, not addressed by these two macros,
-% is that of characters whose category code is changed by any
-% the macros used in the arguments to "\text". Since the
-% category codes are set when the arguments are scanned, macros
-% that depend on changing them will not work. We have most often
-% encountered this with characters that are made ``active'' within
-% text in some, but not all, of the languages used within the document.
-% One way around the problem, if it takes this form,
-% is to ensure that those characters are {\em always\/} active; within
-% languages that make no special use of them, their associated
-% control sequences should simply return the proper character.)
-% \begin{macrocode}
-\def\no@expands{\let\rm=0\let\it=0\let\sl=0\let\bf=0\let\tt=0%
- \let\b=0\let\c=0\let\d=0\let\t=0%
- \let\select@@lemmafont=0%
- \def\protect{\noexpand\protect\noexpand}%
- \let\startsub=\relax \let\endsub=\relax
- \let\startlock=\relax \let\endlock=\relax
- \let\label=\@gobble \let\pageref=\@gobble
- \let\lineref=\@gobble \let\sublineref=\@gobble
- \let\setline=\@gobble \let\advanceline=\@gobble
- \let\text=\dummy@text
- \morenoexpands}
-\let\morenoexpands=\relax
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\text}
-% Now we begin "\text" itself. The definition requires a "/" after
-% the arguments: this eliminates the possibility of problems about
-% knowing where "#2" ends. This also changes the handling of spaces
-% following an invocation of the macro: normally such spaces are
-% skipped, but in this case they're significant because "#2" is
-% a ``delimited parameter''. Since "\text" is always used in running
-% text, it seems more appropriate to pay attention to spaces than to
-% skip them.
-%
-% When executed, "\text" first ensures that we're in
-% horizontal mode.
-% \begin{macrocode}
-\long\def\text#1#2/{\leavevmode
-% \end{macrocode}
-%
-% \begin{macro}{\@tag}
-% Our normal lemma is just argument "#1"; but that argument could have
-% further invocations of "\text" within it. We get a copy of the
-% lemma without any "\text" macros within it by temporarily redefining
-% "\text" to just copy its first argument and ignore the other,
-% and then expand "#1" into "\@tag", our lemma.
-%
-% This is done within a group that starts here, in order to get the
-% original "\text" restored; within this group we've also turned
-% off the expansion of those control sequences commonly found within text
-% that can cause trouble for us.
-% \begin{macrocode}
- \begingroup
- \no@expands
- \xdef\@tag{#1}%
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@nums}
-% \label{nums}
-% Prepare more data for the benefit of note-generating macros: the line
-% references and font specifier for this lemma go to "\@nums".
-% \begin{macrocode}
- \set@line
-% \end{macrocode}
-% \end{macro}
-%
-% "\insert@count" will be altered by the note-generating macros:
-% it counts the number of deferred footnotes or other insertions
-% generated by this instance of "\text".
-% \begin{macrocode}
- \global\insert@count=0
-% \end{macrocode}
-%
-% Now process the note-generating macros in argument "#2"
-% (i.e., "\Afootnote", "\lemma", etc.). "\ignorespaces" is here to
-% skip over any spaces that might appear at the start of "#2";
-% otherwise they wind up in the main text. Footnote and other
-% macros that are used within "#2" should all end with
-% "\ignorespaces" as well, to skip any spaces between macros when
-% several are used in series.
-% \begin{macrocode}
- \ignorespaces #2\relax
-% \end{macrocode}
-%
-% Finally, we're ready to admit the first argument into the current
-% paragraph.
-%
-% It's important that we generate and output all the notes for this
-% chunk of text {\em before} putting the text into the paragraph: notes
-% that are referenced by line number should generally be tied to the
-% start of the passage they gloss, not the end. That should all be done
-% within the expansion of "#2" above, or in "\aftergroup"
-% commands within that expansion.
-% \begin{macrocode}
- \flag@start
- \endgroup
- #1%
-% \end{macrocode}
-%
-% Finally, we add any insertions that are
-% associated with the {\em end\/} of
-% the lemma. Footnotes that are identified by symbols rather than by
-% where the lemma begins in the main text need to be done here, and
-% not above.
-%
-% \begin{macrocode}
- \ifx\end@lemmas\empty \else
- \gl@p\end@lemmas\to\x@lemma
- \x@lemma
- \global\let\x@lemma=\relax
- \fi
- \flag@end}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\set@line}
-% The "\set@line" macro
-% is called by "\text" to put the line-reference field and
-% font specifier for the current block of text into "\@nums".
-%
-% One instance of "\text" may generate several notes, or it
-% may generate none---it's legitimate for argument "#2" to "\text" to
-% be empty. But "\flag@start" and "\flag@end" induce the generation of
-% a single entry in "\line@list" during the next run, and it's vital
-% to also remove one and only one "\line@list" entry here.
-% \begin{macrocode}
-\def\set@line{%
-% \end{macrocode}
-%
-% If no more lines are listed in "\line@list", something's
-% wrong---probably just some change in the input. We set all the numbers
-% to zeros, following an old publishing convention for numerical
-% references that haven't yet been resolved.
-% \begin{macrocode}
- \ifx\line@list\empty
- \global\noteschanged@true
- \xdef\@nums{000|000|000|000|000|000|\edfont@info}%
-% \end{macrocode}
-%
-% All's well; our reference is there.
-% \begin{macrocode}
- \else
- \gl@p\line@list\to\@tempb
- \xdef\@nums{\@tempb|\edfont@info}%
- \global\let\@tempb=\undefined
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\edfont@info}
-% The macro "\edfont@info" returns coded information about the
-% current font; the coding depends on the font selection scheme
-% in use. See section~\ref{fontcode} for more on font selection
-% schemes.
-%
-% \begin{macrocode}
-\ifx\selectfont\undefined % we're using Plain fonts
- \def\edfont@info{\the\fam}
-\else % we're using NFSS
- \def\edfont@info{\f@encoding/\f@family/\f@series/\f@shape}
-\fi
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Substitute lemma}
-%
-% \begin{macro}{\lemma}
-% The "\lemma" macro allows you to change the lemma
-% that's passed on to the notes.
-% \begin{macrocode}
-\def\lemma#1{\xdef\@tag{#1}\ignorespaces}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Substitute line numbers}
-%
-% \begin{macro}{\linenum}
-% \label{linenumdef}\relax
-% The "\linenum" macro can change any or all of
-% the page and line numbers that are
-% passed on to the notes.
-%
-% As argument "\linenum" takes a set of seven parameters
-% separated by vertical bars, in the format used internally for
-% "\@nums" (see p.\,\pageref{linenumbers}): the starting page,
-% line, and sub-line numbers, followed by the ending page, line, and
-% sub-line numbers, and then the font specifier for the lemma.
-% However, you can omit any parameters you don't want to change, and
-% you can omit a string of vertical bars at the end of the
-% argument. Hence "\linenum{18|4|0|18|7|1|0}" is an invocation
-% that changes all the parameters, but "\linenum{|3}" only
-% changes the starting line number, and leaves the rest unaltered.
-%
-% We use "\\" as an internal separator for the macro parameters.
-% \begin{macrocode}
-\def\linenum#1{%
- \xdef\@tempa{#1|||||||\noexpand\\\@nums}%
- \global\let\@nums=\empty
- \expandafter\line@set\@tempa|\\\ignorespaces}
-% \end{macrocode}
-%
-% \begin{macro}{\line@set}
-% "\linenum" calls "\line@set" to do the actual work; it
-% looks at the first number in the argument to "\linenum",
-% sets the corresponding value in "\@nums", and then calls
-% itself to process the next number in the "\linenum"
-% argument, if there are more numbers in "\@nums" to process.
-% \begin{macrocode}
-\def\line@set#1|#2\\#3|#4\\{%
- \gdef\@tempb{#1}%
- \ifx\@tempb\empty
- \@add{#3}%
- \else
- \@add{#1}%
- \fi
- \gdef\@tempb{#4}%
- \ifx\@tempb\empty\else
- \@add{|}\line@set#2\\#4\\%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@add}
-% "\line@set" uses "\@add" to tack numbers or vertical bars
-% onto the right hand end of "\@nums".
-% \begin{macrocode}
-\def\@add#1{\xdef\@nums{\@nums#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \section{Paragraph decomposition and reassembly}
-% \label{paragraph}\relax
-%
-% In order to be able to count the lines of text and affix line
-% numbers, we add an extra stage of processing for each paragraph.
-% We send the paragraph into a box
-% register, rather than straight onto the vertical list, and when
-% the paragraph ends we
-% slice the paragraph into its component lines; to each line we
-% add any notes or line numbers, add a command to write to the
-% line-list, and then at last send the line to the vertical list.
-% This section contains all the code for this processing.
-%
-% \subsection{Boxes, counters, {\tt\protect\bslash pstart}
-% and {\tt\protect\bslash pend}}
-%
-% \begin{macro}{\raw@text}
-% \begin{macro}{\ifnumberedpar@}
-% \begin{macro}{\numberedpar@true}
-% \begin{macro}{\numberedpar@false}
-% \begin{macro}{\num@lines}
-% \begin{macro}{\one@line}
-% \begin{macro}{\par@line}
-% Here are numbers and flags that are used internally in the course
-% of the paragraph decomposition.
-%
-% When we first form the paragraph, it goes into a box register,
-% "\raw@text", instead of onto the current vertical list.
-% The "\ifnumberedpar@" flag will be "true" while a paragraph is
-% being processed in that way.
-% "\num@lines" will store the number of lines in the paragraph
-% when it's complete. When we chop it up into lines, each line
-% in turn goes into the
-% "\one@line" register, and "\par@line" will be the number
-% of that line within the paragraph.
-% \begin{macrocode}
-\newbox\raw@text
-\newif\ifnumberedpar@
-\newcount\num@lines
-\newbox\one@line
-\newcount\par@line
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\pstart}
-% "\pstart" starts the paragraph by
-% clearing the "\inserts@list" list and other
-% relevant variables, and then arranges for the
-% subsequent text to go into the
-% "\raw@text" box. "\pstart" needs to appear at the start of
-% every paragraph that's to be numbered; the "\autopar" command below
-% may be used to insert these commands automatically.
-%
-% Beware: everything that occurs between "\pstart" and "\pend"
-% is happening within a group; definitions must be global if you want
-% them to survive past the end of the paragraph.
-% \begin{macrocode}
-\def\pstart{\ifnumbering \else
- \errmessage{\string\pstart\space must be used
- within a numbered section}%
- \beginnumbering
- \fi
- \ifnumberedpar@
- \errmessage{\string\pstart\space encountered while another
- \string\pstart\space was in effect}%
- \pend
- \fi
- \list@clear{\inserts@list}%
- \global\let\next@insert=\empty
- \begingroup\normal@pars
- \global\setbox\raw@text=\vbox\bgroup
- \numberedpar@true}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pend}
-% "\pend" must be used to end a numbered paragraph.
-%
-% \begin{macrocode}
-\def\pend{\ifnumbering \else
- \errmessage{\string\pend\space must be used
- within a numbered section}%
- \fi
- \ifnumberedpar@ \else
- \errmessage{\string\pend\space must follow a \string\pstart}%
- \fi
-% \end{macrocode}
-% We set all the usual interline penalties to zero and then immediately
-% call "\endgraf" to end the paragraph; this ensures that there'll
-% be no large interline penalties to prevent us from slicing the
-% paragraph into pieces. These penalties revert to the values
-% that you set when the group for the "\vbox" ends. Then we call
-% "\do@line" to slice a line off the top of the
-% paragraph, add a line number and footnotes, and restore it to the page;
-% we keep doing this until there aren't any more lines left.
-% \begin{macrocode}
- \brokenpenalty=0 \clubpenalty=0
- \displaywidowpenalty=0 \interlinepenalty=0 \predisplaypenalty=0
- \postdisplaypenalty=0 \widowpenalty=0
- \endgraf\global\num@lines=\prevgraf\egroup
- \global\par@line=0
- \loop\ifvbox\raw@text
- \do@line
- \repeat
-% \end{macrocode}
-% Deal with any leftover notes, and then end the group that was begun
-% in the "\pstart".
-% \begin{macrocode}
- \flush@notes
- \endgroup
- \ignorespaces}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\autopar}
-% In most cases it's only an annoyance to have to label the paragraphs
-% to be numbered with "\pstart" and "\pend". "\autopar" will
-% do that automatically, allowing you to start a paragraph with its
-% first word and no other preliminaries, and to end it with a blank line
-% or a "\par" command. The command should be issued within a
-% group, after "\beginnumbering" has been used to start the
-% numbering; all paragraphs within the group will be affected.
-%
-% A few situations can cause problems. One is a paragraph that begins with
-% a begin-group character or command: "\pstart" will not get invoked
-% until after such a group beginning is processed; as a result the
-% character that ends the group will be mistaken for the end of the
-% "\vbox" that "\pstart" creates, and the rest of the paragraph
-% will not be numbered. Such paragraphs need to be started explicitly
-% using "\indent", "\noindent", or "\leavevmode"---or "\pstart", since
-% you can still include your own "\pstart" and "\pend"
-% commands even with "\autopar" on.
-%
-% Prematurely ending the group within which "\autopar" is in
-% effect will cause a similar problem. You must either leave a
-% blank line or use "\par" to end the last paragraph before
-% you end the group.
-%
-% The functioning of this macro is more tricky than the usual
-% "\everypar": we don't want anything to go onto the vertical
-% list at all, so we have to end the paragraph, erase any evidence
-% that it ever existed, and start it again using "\pstart".
-% We remove the paragraph-indentation box using "\lastbox" and
-% save the width, and then skip backwards over the "\parskip"
-% that's been added for this paragraph. Then we start again with
-% "\pstart", restoring the indentation that we saved, and
-% locally change "\par" so that it'll do our "\pend" for us.
-% \begin{macrocode}
-\def\autopar{\ifnumbering \else
- \errmessage{\string\autopar\space must be used
- within a numbered section}%
- \beginnumbering
- \fi
- \everypar={\setbox0=\lastbox
- \endgraf \vskip-\parskip
- \pstart \noindent \kern\wd0
- \let\par=\pend}%
- \ignorespaces}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\normal@pars}
-% We also define a macro which we can rely on to turn off the
-% "\autopar" definitions at various important places, if they
-% are in force. We'll want to do this within footnotes, for
-% example.
-% \begin{macrocode}
-\def\normal@pars{\everypar={}\let\par\endgraf}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Processing one line}
-%
-% \begin{macro}{\do@line}
-% The "\do@line" macro is called by "\pend" to
-% do all the processing for a single line of text.
-% \begin{macrocode}
-\def\do@line{%
-% \end{macrocode}
-%
-% First, pull
-% one line off the top of "\raw@text", which contains the remaining
-% unprocessed lines of the paragraph. "\vbadness" must be cranked up to
-% suppress "Underfull vbox" errors from
-% "\vsplit"; "\splittopskip" will be inserted at the top of
-% "\one@line", so we zero it. (This skip will appear in the final
-% vertical list, just before every "\baselineskip".)
-% \begin{macrocode}
- {\vbadness=10000 \splittopskip=0pt
- \global\setbox\one@line=\vsplit\raw@text to\baselineskip}%
-% \end{macrocode}
-%
-% "\one@line" comes out of "\vsplit" as a "vbox";
-% we now convert it to an "hbox".
-%
-% This operation breaks if there's an insert connected to the
-% \label{doline} line. In that case, the content of the "vbox"
-% "\one@line" before this operation is not just an "hbox": it's
-% an "hbox" followed by an insert. After the "\unvbox", the
-% last thing on the vertical list is not the "hbox" but the
-% insert. The result is that our line heads prematurely onto the
-% vertical list---with incorrect interline spacing, because there's
-% still a level of boxing that should be undone---and "\one@line"
-% is the void box, because the last thing on the vertical list
-% wasn't a box. The subsequent code consequently prints a blank
-% line.
-%
-% All this is why insertions need to be kept out of the paragraph
-% until this point; our footnote macros add all insertions to list
-% macros, and the "\add@inserts" macro below puts them onto the
-% vertical list at the proper time.
-% \begin{macrocode}
- \unvbox\one@line \global\setbox\one@line=\lastbox
-% \end{macrocode}
-%
-% Calculate the line and page number for this line.
-% \begin{macrocode}
- \getline@num
-% \end{macrocode}
-%
-% Now we'll add the line to the vertical list, with a line
-% number attached if necessary.
-%
-% The "\hfil\hbox to \wd\one@line" is necessary to position a
-% hangindented line correctly: without it, "\one@line" gets
-% stretched out to "\hsize" in width and the indentation
-% disappears. This is because hanging indentation is done by
-% setting a nonzero ``shift'' value for the "hbox" that
-% contains the line within the "vbox", and that shift vanishes, like
-% the penalties, when we slice up the paragraph; one can examine
-% the "\ht" or "\wd" of a box within \TeX{}, but it provides no
-% way of examining the "\shift", though it would be a trivial
-% modification of the \TeX{} program to add that function.
-% ("\parshape"\label{parshape}
-% also works by setting a nonzero shift, but this fix isn't good
-% enough there, because the total width of the lines is also varied
-% in that case; our algorithm will push all the lines of text over
-% to the right margin.)
-%
-% We put the "\new@line" start-of-line marker in the output list at
-% this point too: putting it within the "\hbox" here ensures that
-% it comes before any of the text of the line in the vertical list,
-% but cannot be broken away from it at a page break.
-% \begin{macrocode}
-\hbox to \hsize{\affixline@num{%
- \hfil\hbox to \wd\one@line{\new@line\unhbox\one@line}}}%
-% \end{macrocode}
-%
-% Now we pull the footnotes and insertions for this line out of the
-% "\inserts@list" list macro and attach them.
-% \begin{macrocode}
- \add@inserts
-% \end{macrocode}
-%
-% Penalties get stripped off by this slicing process; the following
-% macro puts them back in as the last step.
-% \begin{macrocode}
- \add@penalties}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Line and page number computation}
-%
-% \begin{macro}{\getline@num}
-% The "\getline@num" macro
-% determines the page and line numbers for the line we're about to
-% send to the vertical list.
-% \begin{macrocode}
-\def\getline@num{%
- \global\advance\absline@num by 1
- \do@actions
- \do@ballast
- \ifsublines@
- \ifnum\sub@lock<2
- \global\advance\subline@num by 1
- \fi
- \else
- \ifnum\@lock<2
- \global\advance\line@num by 1
- \global\subline@num=0
- \fi
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\do@ballast}
-% \label{do@ballast}\relax
-% The real work in the macro above is done in "\do@actions", but
-% before we plunge into that, let's get "\do@ballast" out of the
-% way. This macro looks to see if there is an action to be
-% performed on the {\em next\/} line, and if it is going to be a
-% page break action, "\do@ballast" decreases the "\ballast@count"
-% counter
-% by the amount of "\ballast". This means, in practice, that when
-% "\add@penalties" assigns penalties at this point, \TeX\ will be
-% given extra encouragement to break the page here (see
-% p.\,\pageref{add@penalties}).
-%
-% \begin{macro}{\ballast}
-% \begin{macro}{\ballast@count}
-% First we set up the required counters; they are initially
-% set to zero, and will remain so unless you say
-% "\ballast="\meta{some figure} in your document.
-% \begin{macrocode}
-\newcount\ballast@count
-\newcount\ballast
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% And here is "\do@ballast" itself. It advances "\absline@num"
-% within the protection of a group to make its check for what
-% happens on the next line.
-% \begin{macrocode}
-\def\do@ballast{\global\ballast@count=0
- \begingroup
- \advance\absline@num by 1
- \ifnum\next@actionline=\absline@num
- \ifnum\next@action>-1001
- \global\advance\ballast@count by -\ballast
- \fi
- \fi
- \endgroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\do@actions}
-% \begin{macro}{\do@actions@next}
-%
-% The "\do@actions" macro
-% looks at the list of actions to take at particular absolute line
-% numbers, and does everything that's specified for the current line.
-%
-% It may call itself recursively, and to do this efficiently (using
-% \TeX's optimization for tail recursion), we define a control-sequence
-% called "\do@actions@next" that is always the last thing that
-% "\do@actions" does. If there could be more actions to process for
-% this line, "\do@actions@next" is set equal to "\do@actions";
-% otherwise it's just "\relax".
-%
-% \begin{macrocode}
-\def\do@actions{%
- \global\let\do@actions@next=\relax
- \ifnum\absline@num<\next@actionline\else
-% \end{macrocode}
-%
-% First, page number changes, which will generally be the most common
-% actions. If we're restarting lineation on each page, this is where it
-% happens.
-% \begin{macrocode}
- \ifnum\next@action>-1001
- \global\page@num=\next@action
- \ifbypage@
- \global\line@num=0 \global\subline@num=0
- \fi
-% \end{macrocode}
-%
-% Next, we handle
-% commands that change the line-number values. (We subtract $5001$ rather
-% than $5000$ here because the line number is going to be incremented
-% automatically in "\getline@num".)
-% \begin{macrocode}
- \else
- \ifnum\next@action<-4999
- \@tempcnta=-\next@action
- \advance\@tempcnta by -5001
- \ifsublines@
- \global\subline@num=\@tempcnta
- \else
- \global\line@num=\@tempcnta
- \fi
-% \end{macrocode}
-%
-% It's one of the fixed codes. We rescale the value in
-% "\@tempcnta" so that we can use a case statement.
-% \begin{macrocode}
- \else
- \@tempcnta=-\next@action
- \advance\@tempcnta by -1000
- \ifcase\@tempcnta
-% \end{macrocode}
-%
-% Commands that turn sub-lineation on and off.
-% \begin{macrocode}
- \or
- \global\sublines@true
- \or
- \global\sublines@false
-% \end{macrocode}
-%
-% Line locking. We ignore these indications when they don't appear
-% at the right times: a start-lock should appear only when locking
-% is entirely off, and an end-lock should only appear when locking is
-% in the ``middle''.
-% \begin{macrocode}
- \or
- \ifcase\@lock
- \global\@lock=1
- \else
- \global\@lock=0
- \fi
- \or
- \ifnum\@lock=2
- \global\@lock=3
- \else
- \global\@lock=0
- \fi
-% \end{macrocode}
-%
-% Sub-line locking. Same comments as for line locking.
-% \begin{macrocode}
- \or
- \ifcase\sub@lock
- \global\sub@lock=1
- \else
- \global\sub@lock=0
- \fi
- \or
- \ifnum\sub@lock=2
- \global\sub@lock=3
- \else
- \global\sub@lock=0
- \fi
-% \end{macrocode}
-%
-% If we get here, some unknown action code has been encountered.
-% \begin{macrocode}
- \else
- \edmac@warning{Bad action code,
- value \next@action.}%
- \fi
- \fi
- \fi
-% \end{macrocode}
-%
-% Now we get information about the next action off the list,
-% and then set "\add@inserts@next" so that we'll
-% call ourself recursively: the next action might also be for this
-% line.
-%
-% There's no warning if we find "\actionlines@list" empty,
-% since that will always happen near the end of the section.
-%
-% \begin{macrocode}
- \ifx\actionlines@list\empty
- \gdef\next@actionline{1000000}%
- \else
- \gl@p\actionlines@list\to\next@actionline
- \gl@p\actions@list\to\next@action
- \global\let\do@actions@next=\do@actions
- \fi
- \fi
-% \end{macrocode}
-%
-% Make the recursive call, if necessary.
-%
-% \begin{macrocode}
-\do@actions@next}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Line number printing}
-%
-% \begin{macro}{\affixline@num}
-% "\affixline@num" takes a single argument, a series of
-% commands for printing the line just split off by "\do@line"; it
-% puts that line back on the vertical list, and adds a line number if
-% necessary.
-%
-% To determine whether we need to affix a line number to this line,
-% we compute the following:
-% \begin{tabbing}
-% \quad $m$ \= \kill
-% $n$ \> $= \mbox{\it int\/} ( ( \mbox{\it linenum\/} -
-% \mbox{\it firstlinenum\/} ) /
-% \mbox{\it linenumincrement\/} )$ \\
-% $m$ \> $= \mbox{\it firstlinenum\/} +
-% ( n \times \mbox{\it linenumincrement\/})$
-% \end{tabbing}
-% (where {\it int\/} truncates a real number to an integer).
-% $m$ will be equal to {\it linenum\/} only
-% if we're to paste a number on here.
-% However, the formula breaks down for the first line to number (and any
-% before that), so we check that case separately: if "\line@num" $\le$
-% "\firstlinenum", we compare the two directly instead of making these
-% calculations.
-%
-% We compute, in the scratch counter "\@tempcnta", the number
-% of the next line that should be printed with a number ($m$ in the
-% above discussion), and move the current line number into the
-% counter "\@tempcntb" for comparison.
-%
-% First, the case when we're within a sub-line range.
-% \begin{macrocode}
-\def\affixline@num#1{%
- \ifsublines@
- \@tempcntb=\subline@num
- \ifnum\subline@num>\firstsublinenum
- \@tempcnta=\subline@num
- \advance\@tempcnta by-\firstsublinenum
- \divide\@tempcnta by\sublinenumincrement
- \multiply\@tempcnta by\sublinenumincrement
- \advance\@tempcnta by\firstsublinenum
- \else
- \@tempcnta=\firstsublinenum
- \fi
-% \end{macrocode}
-%
-% That takes care of computing the values for comparison, but if line
-% number locking is in effect we have to make a further check. If this
-% check fails, then we disable the line-number display by setting the
-% counters to arbitrary but unequal values.
-% \begin{macrocode}
- \ifcase\sub@lock
- \or
- \ifnum\sublock@disp=1
- \@tempcntb=0 \@tempcnta=1
- \fi
- \or
- \ifnum\sublock@disp=2 \else
- \@tempcntb=0 \@tempcnta=1
- \fi
- \or
- \ifnum\sublock@disp=0
- \@tempcntb=0 \@tempcnta=1
- \fi
- \fi
-% \end{macrocode}
-%
-% Now the line number case, which works the same way.
-% \begin{macrocode}
- \else
- \@tempcntb=\line@num
- \ifnum\line@num>\firstlinenum
- \@tempcnta=\line@num
- \advance\@tempcnta by-\firstlinenum
- \divide\@tempcnta by\linenumincrement
- \multiply\@tempcnta by\linenumincrement
- \advance\@tempcnta by\firstlinenum
- \else
- \@tempcnta=\firstlinenum
- \fi
-% \end{macrocode}
-%
-% A locking check for sub-lines, just like the version for line
-% numbers above.
-% \begin{macrocode}
- \ifcase\@lock
- \or
- \ifnum\lock@disp=1
- \@tempcntb=0 \@tempcnta=1
- \fi
- \or
- \ifnum\lock@disp=2 \else
- \@tempcntb=0 \@tempcnta=1
- \fi
- \or
- \ifnum\lock@disp=0
- \@tempcntb=0 \@tempcnta=1
- \fi
- \fi
- \fi
-% \end{macrocode}
-%
-% The following test is true if we need to print a line number.
-% \begin{macrocode}
- \ifnum\@tempcnta=\@tempcntb
-% \end{macrocode}
-%
-% If we got here,
-% we're going to print a line number; so now we need to
-% calculate a number that will tell us which side of the page will get
-% the line number. We start from "\line@margin", which asks for
-% one side always if it's less than $2$; and then if the side does
-% depend on the page number, we simply add the page number to this
-% side code---because the values of "\line@margin" have been devised so
-% that this produces a number that's even for left-margin numbers and
-% odd for right-margin numbers.
-% \begin{macrocode}
- \@tempcntb=\line@margin
- \ifnum\@tempcntb>1
- \advance\@tempcntb by\page@num
- \fi
-% \end{macrocode}
-%
-% Now print the line ("#1") with its page number.
-% \begin{macrocode}
- \ifodd\@tempcntb
- #1\rlap{{\rightlinenum}}%
- \else
- \llap{{\leftlinenum}}#1%
- \fi
- \else
-% \end{macrocode}
-%
-% If no line number is to be appended, we just print the line as is.
-% \begin{macrocode}
- #1%
- \fi
-% \end{macrocode}
-%
-% Now fix the lock counters, if necessary. A value of $1$ is advanced to
-% $2$; $3$ advances to $0$; other values are unchanged.
-% \begin{macrocode}
- \ifcase\@lock
- \or
- \global\@lock=2
- \or \or
- \global\@lock=0
- \fi
- \ifcase\sub@lock
- \or
- \global\sub@lock=2
- \or \or
- \global\sub@lock=0
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Add insertions to the vertical list}
-%
-% \begin{macro}{\inserts@list}
-% "\inserts@list" is the list macro that contains the inserts that
-% we save up for one paragraph.
-%
-% \begin{macrocode}
-\list@create{\inserts@list}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\add@inserts}
-% \begin{macro}{\add@inserts@next}
-% "\add@inserts"
-% is the penultimate macro used by "\do@line"; it takes
-% insertions saved in a list macro and sends them onto the vertical list.
-%
-% It may call itself recursively, and to do this efficiently (using
-% \TeX's optimization for tail recursion), we define a control-sequence
-% called "\add@inserts@next" that is always the last thing that
-% "\add@inserts" does. If there could be more inserts to process for
-% this line, "\add@inserts@next" is set equal to "\add@inserts";
-% otherwise it's just "\relax".
-%
-% \begin{macrocode}
-\def\add@inserts{%
- \global\let\add@inserts@next=\relax
-% \end{macrocode}
-%
-% If "\inserts@list" is empty, there aren't any more notes or insertions
-% for this paragraph, and we needn't waste our time.
-% \begin{macrocode}
- \ifx\inserts@list\empty \else
-% \end{macrocode}
-%
-% The "\next@insert" macro records the number of the line that
-% receives the next footnote or other insert; it's empty when we start
-% out, and just after we've affixed a note or insert.
-% \begin{macrocode}
- \ifx\next@insert\empty
- \ifx\insertlines@list\empty
- \global\noteschanged@true
- \gdef\next@insert{100000}%
- \else
- \gl@p\insertlines@list\to\next@insert
- \fi
- \fi
-% \end{macrocode}
-%
-% If the next insert's for this line, tack it on (and then erase the
-% contents of the insert macro, as it could be quite large).
-% In that case, we also set "\add@inserts@next" so that we'll
-% call ourself recursively: there might be another insert for this same
-% line.
-%
-% \begin{macrocode}
- \ifnum\next@insert=\absline@num
- \gl@p\inserts@list\to\@insert
- \@insert
- \global\let\@insert=\undefined
- \global\let\next@insert=\empty
- \global\let\add@inserts@next=\add@inserts
- \fi
-\fi
-% \end{macrocode}
-%
-% Make the recursive call, if necessary.
-%
-% \begin{macrocode}
-\add@inserts@next}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Penalties}
-%
-% \begin{macro}{\add@penalties}
-% "\add@penalties" is
-% the last macro used by "\do@line". It adds up the club,
-% widow, and interline penalties, and puts a single penalty
-% of the appropriate size
-% back into the paragraph; these penalties get
-% removed by the "\vsplit" operation. "\displaywidowpenalty" and
-% "\brokenpenalty" are not restored, since we have no easy way to
-% find out where we should insert them.
-%
-% \label{add@penalties}
-% In this code, "\num@lines" is the number of lines in the whole
-% paragraph, and "\par@line" is the line we're working on at the
-% moment. The counter "\@tempcnta" is used to calculate and
-% accumulate the penalty; it is initially set to the value of
-% "\ballast@count", which has been worked out in "\do@ballast"
-% above (p.\,\pageref{do@ballast}). Finally, the penalty is
-% checked to see that it doesn't go below $-10000$.
-% \begin{macrocode}
-\def\add@penalties{\@tempcnta=\ballast@count
- \ifnum\num@lines>1
- \global\advance\par@line by 1
- \ifnum\par@line=1
- \advance\@tempcnta by \clubpenalty
- \fi
- \@tempcntb=\par@line \advance\@tempcntb by 1
- \ifnum\@tempcntb=\num@lines
- \advance\@tempcnta by \widowpenalty
- \fi
- \ifnum\par@line<\num@lines
- \advance\@tempcnta by \interlinepenalty
- \fi
- \fi
- \ifnum\@tempcnta=0
- \relax
- \else
- \ifnum\@tempcnta>-10000
- \penalty\@tempcnta
- \else
- \penalty -10000
- \fi
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Printing leftover notes}
-%
-% \begin{macro}{\flush@notes}
-% The "\flush@notes"
-% macro is called after the entire paragraph has been sliced up
-% and sent on to the vertical list.
-% If the number of notes to this paragraph has increased since the last
-% run of \TeX, then there can be leftover notes that haven't yet been
-% printed. An appropriate error message will be printed elsewhere; but
-% it's best to go ahead and
-% print these notes somewhere, even if it's not in quite the
-% right place. What we do is dump them all out here, so that they should
-% be printed on the same page as the last line
-% of the paragraph. We can hope that's not
-% too far from the proper location, to which they'll move on the next
-% run.
-% \begin{macrocode}
-\def\flush@notes{%
- \@xloop
- \ifx\inserts@list\empty \else
- \gl@p\inserts@list\to\@insert
- \@insert
- \global\let\@insert=\undefined
- \repeat}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@xloop}
-% "\@xloop" is
-% a variant of the \PlainTeX\ "\loop" macro, useful when it's
-% hard to construct a positive test using the \TeX\ "\if" commands---as
-% in "\flush@notes" above. One says "\@xloop" "..." "\if" "..." "\else"
-% "..." "\repeat", and the action following "\else" is repeated as long
-% as the "\if" test fails. (This macro will work wherever the \PlainTeX\
-% "\loop" is used, too, so we could just call it "\loop";
-% but it seems preferable not to change the definitions of any of
-% the standard macros.)
-%
-% This variant of "\loop" was introduced by
-% Alois Kabelschacht\index{Kabelschacht, Alois} in
-% {\em TUGboat\/} {\bf 8} (1987), pp.\,184--5.
-%
-% \begin{macrocode}
-\def\@xloop#1\repeat{%
- \def\body{#1\expandafter\body\fi}%
- \body}
-% \end{macrocode}
-% \end{macro}
-%
-% \section{Footnotes}
-% \label{footnotes}\relax
-%
-% The footnote macros are adapted from those in \PlainTeX, but they
-% differ in these respects: the outer-level commands must add other
-% commands to a list macro rather than doing insertions immediately;
-% there are five separate levels of footnotes, not just one; and there
-% are options to reformat footnotes into paragraphs or into multiple
-% columns.
-%
-% \subsection{Fonts (using the Plain font selection scheme)}
-% \label{fontcode}\relax
-% Before getting into the details of formatting the notes, we set
-% up some font macros. It is the notes that present the greatest
-% challenge for our font-handling mechanism, because we need to be
-% able to take fragments of our main text and print them in
-% different forms: it is common to reduce the size,
-% for example, without otherwise changing the fonts used.
-%
-% "EDMAC" supports two different systems for
-% font handling: the ``Plain font selection scheme'', that is,
-% the original \PlainTeX\ system, with some minor
-% extensions needed for our purposes here; and the New Font Selection
-% Scheme (NFSS) of Frank Mittelbach\index{Mittelbach, Frank} and Rainer
-% Sch\"opf\index{Sch\"opf, Rainer}, as adapted for use with \PlainTeX\
-% by Wayne Sullivan\index{Sullivan, Wayne}. The NFSS is strongly
-% recommended, but the Plain font selection scheme will suffice for
-% simple applications.
-%
-% "EDMAC" will define different versions of the following
-% macros, depending on which scheme is used: "\edfont@info",
-% "\notefontsetup", "\notenumfont", "\numlabfont", and
-% "\select@lemmafont". If the Plain font selection
-% scheme is chosen, "EDMAC" will also define an "\eightpoint"
-% macro and load additional Computer Modern fonts for use with it.
-%
-% The choice of a font selection scheme is made implicitly. If NFSS
-% has been loaded, it is assumed that you want to use it; otherwise
-% "EDMAC" uses the Plain font selection scheme. If you're using NFSS,
-% load it and make any choices of customizations and standard settings
-% before you load "EDMAC".
-%
-% We know that NFSS has been loaded if the "\selectfont" macro is
-% present.
-%
-% \begin{macrocode}
-\ifx\selectfont\undefined
-% \end{macrocode}
-%
-% The rest of this section defines macros for use with the Plain
-% font selection scheme; see the next section for definitions used
-% with NFSS.
-%
-% What we want to provide with these macros is something a little bit
-% more general than \PlainTeX, without going the whole way to
-% implementing a full, planned font scheme.
-%
-% \begin{macro}{\notefontsetup}
-% The font setup defined in "\notefontsetup" defines the
-% fonts which will normally be used
-% for the text of the footnotes. Parts of the footnote, such
-% as the line number references and the lemma, are enclosed in
-% groups, with their own font macros, so a note in plain roman can
-% still have line numbers in bold, say, and the lemma in the same
-% family of font as in the main text.
-%
-% Since it is common to have notes in a font smaller than
-% the main text, we set up an "\eightpoint" macro which contains
-% definitions for smaller versions of "\rm", "\it",
-% "\bf", "\tt", and "\sl". It also contains
-% definitions of the appropriate "\fam" for each of these
-% styles, as well as a smaller "\strutbox" and a setting of
-% the "\baselineskip".
-%
-% If you want to change the size or style of the standard footnote
-% font, it is important that your macro define at least these
-% items:
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item fonts
-% \item "\fam"(s)
-% \item "\strutbox"
-% \item "\baselineskip"
-% \end{itemize}
-% For example, like \PlainTeX\ itself, "EDMAC" uses the height of a
-% "\strutbox" in a few crucial places, such as the crop marks,
-% the alignment of the top line of footnotes, etc. (Page
-% \pageref{magic} explains the reasons why this is important in one
-% instance.) If you change the size of your fonts, but don't
-% change the size of the "\strutbox" too, then there will be
-% various discrepancies in the spacing. The same holds for the
-% "\baselineskip", and the other macros mentioned here.
-%
-% The size of a "\strutbox" for the standard ten-point fonts
-% is already set by \PlainTeX, as are the other quantities. This
-% takes care of the "\headlinefont", since this is initially set to ten-point
-% "\rm". But once again, if you change the font of
-% the headline, be sure to add appropriate definitions of
-% "\baselineskip" and "\strutbox" too.
-%
-% The first thing, then, is to load some font metric information
-% for the small fonts that \PlainTeX\ doesn't load (cf.\ {\em The
-% \TeX book}, pp.\,413--415). (We load eight-point fonts where we
-% should load six-point ones, because the normal \TeX\ distributions
-% don't have "cmtt6" etc. If you have them, you may want to create
-% your own "\eightpoint" with proper definitions.)
-% \begin{macrocode}
- \font\eightrm=cmr8 \font\eighti=cmmi8 \skewchar\eighti='177
- \font\eightsy=cmsy8 \skewchar\eightsy='60 \font\eightbf=cmbx8
- \font\eighttt=cmtt8 \hyphenchar\eighttt=-1 % inhibit hyphenation
- \font\eightsl=cmsl8 \font\eightit=cmti8
- \font\sixrm=cmr8 \font\sixi=cmmi8 \skewchar\sixi='177
- \font\sixsy=cmsy8 \skewchar\sixsy='60 \font\sixbf=cmbx8
- \font\sixtt=cmtt8 \hyphenchar\sixtt=-1 % inhibit hyphenation
- \font\sixsl=cmsl8 \font\sixit=cmti8
-% \end{macrocode}
-%
-% \begin{macro}{\eightpoint}
-% \label{eightpoint}\relax
-% With that out of the way, we can now define an "\eightpoint"
-% macro that is taken almost directly from p.\,415 of {\em The \TeX
-% book\/} (can you spot the differences?).
-% \begin{macrocode}
- \def\eightpoint{\def\rm{\fam0\eightrm}%
- \textfont0=\eightrm \scriptfont0=\sixrm
- \scriptscriptfont0=\fiverm
- \textfont1=\eighti \scriptfont1=\sixi
- \scriptscriptfont1=\fivei
- \textfont2=\eightsy \scriptfont2=\sixsy
- \scriptscriptfont2=\fivesy
- \textfont3=\tenex \scriptfont3=\tenex
- \scriptscriptfont3=\tenex
- \def\it{\fam\itfam\eightit}\textfont\itfam=\eightit
- \def\sl{\fam\slfam\eightsl}\textfont\slfam=\eightsl
- \def\bf{\fam\bffam\eightbf}\textfont\bffam=\eightbf
- \scriptfont\bffam=\sixbf \scriptscriptfont\bffam=\fivebf
- \def\tt{\fam\ttfam\eighttt}\textfont\ttfam=\eighttt
- \normalbaselineskip=9pt
- \setbox\strutbox=\hbox{\vrule height7pt depth2pt width0pt}%
- \normalbaselines\rm}
-% \end{macrocode}
-% And finally, we set "\notefontsetup" to be the new font setup
-% macro:
-% \begin{macrocode}
- \let\notefontsetup=\eightpoint
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% With the above macros, remember to use "\eightpoint" (alias
-% "\notefontsetup") inside a group. If you want to use it
-% outside a group, you will need to define a "\tenpoint" macro
-% to set all these definitions back to the standard ten-point settings of
-% \PlainTeX.
-%
-% \begin{macro}{\notenumfont}
-% The macro controlling the font for line numbers
-% within notes, "\notenumfont", is
-% more simple. It really is just a font call.
-% \begin{macrocode}
- \let\notenumfont=\sevenrm
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\select@lemmafont}
-% \label{selectlemmafont}\relax
-% "\select@lemmafont" is provided to set the right font for
-% the lemma in a note. This macro extracts the font-family number
-% from the line and page number cluster, and issues the associated
-% font-changing command, so that the lemma is printed in its
-% original font.
-% \begin{macrocode}
- \def\select@lemmafont#1|#2|#3|#4|#5|#6|#7|{%
- \ifcase#7
- \rm \or \rm \or \rm \or \rm % families 0--3
- \or \it \or \sl \or \bf \or \tt % families 4--7
- \else \rm
- \fi}
-% \end{macrocode}
-% \end{macro}
-% Note that this is a departure from the normal behavior of
-% \PlainTeX\ regarding font selection.
-% As Donald Knuth remarks ({\em The
-% \TeX book}, p.\,154), the "\fam" value is usually irrelevant
-% when \TeX\ is typesetting text in horizontal mode; "\fam"
-% only matters in math mode. But here we are using the
-% "\fam" value as a convenient way to select a font group. If
-% you are editing a text in some other font, say Cyrillic, be sure
-% to assign it a font "\fam", and add that to the list here in
-% "\select@lemmafont" (see the example given on p.\,\pageref{fam-fiddle}
-% below for using a Sanskrit font with "EDMAC").
-% The ideal in this situation would be to be
-% able to test for such parameters such as font series, style, and
-% size. Exactly those
-% capabilities are provided in the New Font Selection Scheme
-% written by Frank Mittelbach\index{Mittelbach, Frank} and Rainer
-% Sch\"opf,\index{Sch\"opf, Rainer}
-% and this is one place in "EDMAC" where
-% such a system can be used to good effect (see the discussion
-% above, page \pageref{edmacnfss}, and the following section).
-%
-% \subsection{Fonts: using the New Font Selection Scheme}
-%
-% These are the font macros used with NFSS. They will be activated if
-% the NFSS macros have been loaded as described above
-% (p.\,\pageref{ed-nfss}).
-% \begin{macrocode}
-\else
-% \end{macrocode}
-%
-% \begin{macro}{\notefontsetup}
-% The font setup defined in "\notefontsetup" defines the standard
-% fonts for the text of the footnotes. Parts of the footnote, such
-% as the line number references and the lemma, are enclosed in
-% groups, with their own font macros, so a note in plain roman can
-% still have line numbers in bold, say, and the lemma in the same
-% font encoding, family, series, and shape
-% of font as in the main text. Typically this definition should
-% specify only a size. It should always end with "\selectfont" or
-% with a command like "\rm" that does a "\selectfont".
-%
-% \begin{macrocode}
- \def\notefontsetup{\fontsize{8}{9pt}\selectfont}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\notenumfont}
-% The line numbers will be printed using the font selected by
-% executing "\notenumfont".
-% \begin{macrocode}
- \def\notenumfont{\fontsize{7}{8pt}\rm}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\select@lemmafont}
-% \begin{macro}{\select@@lemmafont}
-% "\select@lemmafont" is provided to set the right font for
-% the lemma in a note. This macro extracts the font specifier
-% from the line and page number cluster, and issues the associated
-% font-changing command, so that the lemma is printed in its
-% original font.
-% \begin{macrocode}
- \def\select@lemmafont#1|#2|#3|#4|#5|#6|#7|{\select@@lemmafont#7|}
- \def\select@@lemmafont#1/#2/#3/#4|%
- {\fontencoding{#1}\fontfamily{#2}\fontseries{#3}\fontshape{#4}%
- \selectfont}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% This is the end of the conditional section for font macro definition.
-% \begin{macrocode}
-\fi
-% \end{macrocode}
-%
-% \subsection{Outer-level footnote commands}
-% \begin{macro}{\Afootnote}
-% The outer-level footnote commands will look familiar: they're
-% just called "\Afootnote", "\Bfootnote", etc., instead of
-% plain "\footnote". What they do, however, is quite different,
-% since they have to operate in conjunction with "\text" when
-% numbering is in effect.
-%
-% If we're within a line-numbered paragraph, then, we tack this note onto
-% the "\inserts@list" list, and increment the deferred-page-bottom-note
-% counter.
-% \begin{macrocode}
-\def\Afootnote#1{%
- \ifnumberedpar@
- \xright@appenditem{\noexpand\vAfootnote{A}%
- {{\@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count by 1
-% \end{macrocode}
-%
-% Within free text, there's no need to put off making the insertion
-% for this note. No line numbers are available, so this isn't generally
-% that useful; but you might want to use it to get around some
-% limitation of "EDMAC".
-% \begin{macrocode}
- \else
- \vAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Bfootnote}
-% \begin{macro}{\Cfootnote}
-% \begin{macro}{\Dfootnote}
-% \begin{macro}{\Efootnote}
-% We need similar commands for the other footnote series.
-% \begin{macrocode}
-\def\Bfootnote#1{%
- \ifnumberedpar@
- \xright@appenditem{\noexpand\vBfootnote{B}%
- {{\@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count by 1
- \else
- \vBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Cfootnote#1{%
- \ifnumberedpar@
- \xright@appenditem{\noexpand\vCfootnote{C}%
- {{\@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count by 1
- \else
- \vCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Dfootnote#1{%
- \ifnumberedpar@
- \xright@appenditem{\noexpand\vDfootnote{D}%
- {{\@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count by 1
- \else
- \vDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Efootnote#1{%
- \ifnumberedpar@
- \xright@appenditem{\noexpand\vEfootnote{E}%
- {{\@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count by 1
- \else
- \vEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Normal footnote formatting}
-%
-% The processing of each note is done
-% by four principal macros: the "vfootnote" macro takes the text
-% of the footnote and does the "\insert"; it calls on the
-% "footfmt" macro to select the right fonts, print the line
-% number and lemma, and do any other formatting needed for that individual
-% note. Within the output routine, the two other macros, "footstart"
-% and "footgroup", are called; the first prints extra vertical
-% space and a footnote rule, if desired; the second does any reformatting
-% of the whole set of footnotes in this series for this page---such
-% as paragraphing or division into columns---and then sends them to the
-% page.
-%
-% These four macros, and the other macros and parameters shown
-% here, are distinguished by the ``series letter''
-% that indicates which set of footnotes
-% we're dealing with---"A", "B", "C", "D", or "E".
-% The series letter always precedes the string "foot" in macro
-% and parameter names. Hence, for the "A" series, the four macros
-% are called "\vAfootnote", "\Afootfmt", "\Afootstart",
-% and "\Afootgroup".
-%
-% \begin{macro}{\normalvfootnote}
-% We now begin a series of commands that do ``normal'' footnote
-% formatting: a format much like that implemented
-% in \PlainTeX{}, in which each footnote
-% is a separate paragraph.
-%
-% "\normalvfootnote" takes the series letter as "#1",
-% and the entire text of the footnote is "#2". It does the
-% "\insert" for this note, calling on the "footfmt" macro for
-% this note series to format the text of the note.
-% \begin{macrocode}
-\def\normalvfootnote#1#2{\insert\csname #1footins\endcsname\bgroup
- \notefontsetup
- \interlinepenalty\csname inter#1footnotelinepenalty\endcsname
- \splittopskip\ht\strutbox
- \splitmaxdepth\dp\strutbox \floatingpenalty\@MM
- \leftskip\z@skip \rightskip\z@skip
- \spaceskip\z@skip \xspaceskip\z@skip
- \csname #1footfmt\endcsname #2\egroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\normalfootfmt}
-% \label{normalfootfmt}\relax
-% "\normalfootfmt" is a ``normal'' macro
-% to take the footnote line and page
-% number information (see p.\,\pageref{linenumbers}), and the
-% desired text, and output what's to be printed.
-% Argument "#1" contains the line and page number information
-% and lemma font specifier;
-% "#2" is the lemma;
-% "#3" is the note's text. This version is very
-% rudimentary---it uses "\printlines"
-% to print just the range of line numbers,
-% followed by a square bracket, the lemma, and the note text;
-% it's intended to be copied and modified as necessary.
-%
-% "\par" should always be redefined to "\endgraf" within
-% the format macro (this is what "\normal@pars" does),
-% to override any tricky stuff which might be done in the main text
-% to get the lines numbered automatically (as set up by
-% "\autopar", for example).
-% \begin{macrocode}
-\def\normalfootfmt#1#2#3{%
- \normal@pars
- \parindent=0pt \parfillskip=0pt plus 1fil
- {\notenumfont\printlines#1|}\strut\enspace
- {\select@lemmafont#1|#2}\rbracket\enskip#3\strut\par}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\endashchar}
-% \begin{macro}{\fullstop}
-% \begin{macro}{\rbracket}
-% The fonts that are used for printing notes might not have the
-% character mapping we expect: for example, the Computer Modern font
-% that contains old-style numerals does not contain an en-dash or
-% square brackets, and its period and comma are in odd locations.
-% To allow use of the standard footnote macros with such fonts, we use
-% the following macros for certain characters.
-%
-% The "\endashchar" macro is simply an en-dash from a
-% "\rm" font that is immune to changes in the surrounding
-% font. The same goes for the full stop. These two are used in
-% "\printlines". The right bracket macro is the same again;
-% it crops up in "\normalfootfmt" and the other footnote
-% macros for controlling the format of footnotes.
-% \begin{macrocode}
-\def\endashchar{{\rm--}}
-\def\fullstop{{\rm.}}
-\def\rbracket{{\rm\thinspace]}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\printlines}
-% The "\printlines" macro prints the line
-% numbers for a note---which, in the
-% general case, is a rather complicated task.
-% The seven parameters of the
-% argument are the line numbers as stored in "\@nums", in the
-% form described on page \pageref{linenumbers}: the starting
-% page, line, and sub-line numbers, followed by the ending page,
-% line, and sub-line numbers, and then the font specifier for
-% the lemma.
-%
-% \begin{macro}{\@pnum}
-% \begin{macro}{\@ssub}
-% \begin{macro}{\@elin}
-% \begin{macro}{\@esl}
-% \begin{macro}{\@dash}
-% To simplify the logic, we use a lot of counters to tell us which
-% numbers need to get printed (using $1$ for yes, $0$ for no, so
-% that "\ifodd" tests for ``yes''). The counter assignments are:
-% \begin{itemize}\addtolength{\itemsep}{-1ex}
-% \item "\@pnum" for page numbers;
-% \item "\@ssub" for starting sub-line;
-% \item "\@elin" for ending line;
-% \item "\@esl" for ending sub-line; and
-% \item "\@dash" for the dash between the starting and ending groups.
-% \end{itemize}
-% There's no counter for the line number because it's always printed.
-% \begin{macrocode}
-\newcount\@pnum \newcount\@ssub \newcount\@elin
-\newcount\@esl \newcount\@dash
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% First of all, we print the page numbers only if\/: 1)~we're doing
-% the lineation by page, and 2)~the ending page number is different
-% from the starting page number.\label{printlines}
-% \begin{macrocode}
-\def\printlines#1|#2|#3|#4|#5|#6|#7|{\begingroup
- \@pnum=0 \@dash=0
- \ifbypage@
- \ifnum#4=#1 \else
- \@pnum=1
- \@dash=1
- \fi
- \fi
-% \end{macrocode}
-%
-% We print the ending line number if\/: 1)~we're printing the ending
-% page number, or 2)~it's different from the starting line number.
-% \begin{macrocode}
- \@elin=\@pnum
- \ifnum#2=#5 \else
- \@elin=1
- \@dash=1
- \fi
-% \end{macrocode}
-%
-% We print the starting sub-line if it's nonzero.
-% \begin{macrocode}
- \@ssub=0
- \ifnum#3=0 \else
- \@ssub=1
- \fi
-% \end{macrocode}
-%
-% We print the ending sub-line if it's nonzero and: 1)~it's different
-% from the starting sub-line number, or 2)~the ending line number is
-% being printed.
-% \begin{macrocode}
- \@esl=0
- \ifnum#6=0 \else
- \ifnum#6=#3
- \@esl=\@elin
- \else
- \@esl=1
- \@dash=1
- \fi
- \fi
-% \end{macrocode}
-%
-% Now we're ready to print it all, based on our counter values. The
-% only subtlety left here is when to print a period between
-% numbers. But the only instance in which this is tricky is for the
-% ending sub-line number: it could be coming after the starting
-% sub-line number (in which case we want only the dash) or after an
-% ending line number (in which case we need to insert a period).
-% \begin{macrocode}
- \ifodd\@pnum #1\fullstop\fi
- #2%
- \ifodd\@ssub \fullstop #3\fi
- \ifodd\@dash \endashchar\fi
- \ifodd\@pnum #4\fullstop\fi
- \ifodd\@elin #5\fi
- \ifodd\@esl \ifodd\@elin\fullstop\fi #6\fi
-\endgroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\normalfootstart}
-% \label{normalvalues}\relax
-% "\normalfootstart"
-% is a standard footnote-starting macro, called in the output
-% routine whenever there are footnotes of this series to be
-% printed: it skips a bit and then draws a rule.
-%
-% Any "footstart" macro must put onto the page something that
-% takes up space exactly equal to the "\skip\footins" value for
-% the associated series of notes. \TeX\ makes page computations based
-% on that "\skip" value, and the output pages will suffer from
-% spacing problems if what you add takes up a different amount of
-% space.
-%
-% The "\leftskip" and "\rightskip" values
-% are both zeroed here.\label{footskips}
-% Similarly, these skips are cancelled in the "vfootnote" macros
-% for the various types of notes. Strictly speaking,
-% this is necessary only
-% if you are using paragraphed footnotes, but we have put it here
-% and in the other "vfootnote" macros too so that the behavior of
-% "EDMAC" in this respect is general across all footnote types
-% (you can change this). What this means is that any "\leftskip"
-% and "\rightskip" you specify applies to the main text, but not
-% the footnotes. The footnotes continue to be of width "\hsize".
-% \begin{macrocode}
-\def\normalfootstart#1{%
- \vskip\skip\csname #1footins\endcsname
- \leftskip0pt \rightskip0pt
- \csname #1footnoterule\endcsname}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\normalfootnoterule}
-% "\normalfootnoterule" is
-% a standard footnote-rule macro, for use by a "footstart"
-% macro: just the same as the \PlainTeX\ footnote rule.
-% \begin{macrocode}
-\let\normalfootnoterule=\footnoterule
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\normalfootgroup}
-% "\normalfootgroup" is
-% a standard footnote-grouping macro: it sends the
-% contents of the footnote-insert box to the output page without
-% alteration.
-% \begin{macrocode}
-\def\normalfootgroup#1{\unvbox\csname #1footins\endcsname}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Standard footnote definitions}
-%
-% \begin{macro}{\footnormal}
-% We can now define all the parameters for the five series of
-% footnotes; initially they use the ``normal'' footnote formatting,
-% which is set up by calling "\footnormal".
-% You can switch to another type of formatting by using
-% "\footparagraph", "\foottwocol", or "\footthreecol".
-%
-% Switching to a variation of ``normal''
-% formatting requires changing the
-% quantities defined in "\footnormal". The best way to
-% proceed would be to make a copy of this macro, with a different
-% name, make your desired changes in that copy, and then invoke it,
-% giving it the letter of the footnote series you wish to control.
-%
-% (We have not defined baseline skip values like
-% "\abaselineskip", since this is one of the quantities set in
-% "\notefontsetup".)
-%
-% What we want to do here is to say something like the following
-% for each footnote series. (This is an example, not part of the
-% actual "EDMAC" code.)
-% \begin{verbatim}
-% \newinsert\Afootins
-% \newcount\interAfootnotelinepenalty \interAfootnotelinepenalty=100
-% \skip\Afootins=12pt plus5pt minus5pt
-% \count\Afootins=1000
-% \dimen\Afootins=0.8\vsize
-% \let\vAfootnote=\normalvfootnote \let\Afootfmt=\normalfootfmt
-% \let\Afootstart=\normalfootstart \let\Afootgroup=\normalfootgroup
-% \let\Afootnoterule=\normalfootnoterule
-% \end{verbatim}
-% Instead of repeating ourselves, we define a "\footnormal"
-% macro that makes all these assignments for us, for any given
-% series letter. This also makes it easy to change from any
-% different system of formatting back to the "normal" setting.
-%
-% We begin by defining the five new insertion classes, and some
-% "count" registers; these are "\outer" operations that
-% can't be done inside "\footnormal".
-% \begin{macrocode}
-\newinsert\Afootins \newinsert\Bfootins
-\newinsert\Cfootins \newinsert\Dfootins
-\newinsert\Efootins
-% \end{macrocode}
-% \begin{macrocode}
-\newcount\interAfootnotelinepenalty
-\newcount\interBfootnotelinepenalty
-\newcount\interCfootnotelinepenalty
-\newcount\interDfootnotelinepenalty
-\newcount\interEfootnotelinepenalty
-% \end{macrocode}
-% Now we set up the "\footnormal" macro itself. It takes
-% one argument: the footnote series letter.
-% \begin{macrocode}
-\def\footnormal#1{%
- \csname inter#1footnotelinepenalty\endcsname=100
- \expandafter\let\csname #1footstart\endcsname=\normalfootstart
- \expandafter\let\csname v#1footnote\endcsname=\normalvfootnote
- \expandafter\let\csname #1footfmt\endcsname=\normalfootfmt
- \expandafter\let\csname #1footgroup\endcsname=\normalfootgroup
- \expandafter\let\csname #1footnoterule\endcsname=%
- \normalfootnoterule
- \count\csname #1footins\endcsname=1000
- \dimen\csname #1footins\endcsname=0.8\vsize
- \skip\csname #1footins\endcsname=12pt plus6pt minus6pt}
-% \end{macrocode}
-% \end{macro}
-% Some of these values deserve comment: the "\dimen"
-% setting allows 80\% of the page to be occupied by notes; the
-% "\skip" setting is deliberately flexible, since pages with
-% lots of notes attached to many of the lines can be a bit hard
-% for \TeX\ to make.
-%
-% And finally, we initialize the formatting for all the footnote series
-% to be normal.
-% \begin{macrocode}
-\footnormal{A}
-\footnormal{B}
-\footnormal{C}
-\footnormal{D}
-\footnormal{E}
-% \end{macrocode}
-%
-%
-% \subsection{Paragraphed footnotes}
-%
-% The paragraphed-footnote option
-% reformats all the footnotes of one series for a page into
-% a single paragraph; this is especially appropriate when the notes are
-% numerous and brief. The code is based
-% on {\em The \TeX book}, pp.\,398--400, with
-% alterations for our environment. This algorithm uses a considerable
-% amount of save-stack space: a \TeX\ of ordinary size may not be able
-% to handle more than about $100$ notes of this kind on a page.
-%
-% \begin{macro}{\footparagraph}
-% The "\footparagraph" macro
-% sets up everything for one series of footnotes so that
-% they'll be paragraphed; it takes the series letter as argument.
-% We include the setting of "\count\footins" to $1000$ for the
-% footnote series just in case you are switching to paragraphed
-% footnotes after having columnar ones, since they change this
-% value (see below).
-%
-% It is important to call "\footparagraph" only after
-% "\hsize" has been set for the pages that use
-% this series of notes; otherwise \TeX\ will try to put too
-% many or too few of these notes on each page. If you need to
-% change the "\hsize" within the document, call
-% "\footparagraph" again afterwards to take account of the new
-% value. The argument of "\footparagraph" is the letter
-% ("A"--"E") denoting the series of notes to be paragraphed.
-% \begin{macrocode}
-\def\footparagraph#1{%
- \expandafter\let\csname #1footstart\endcsname=\parafootstart
- \expandafter\let\csname v#1footnote\endcsname=\para@vfootnote
- \expandafter\let\csname #1footfmt\endcsname=\parafootfmt
- \expandafter\let\csname #1footgroup\endcsname=\para@footgroup
- \count\csname #1footins\endcsname=1000
- \para@footsetup{#1}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\para@footsetup}
-% "\footparagraph" calls the
-% "\para@footsetup" macro to calculate a special
-% fudge factor, which is the ratio of the "\baselineskip"
-% to the "\hsize". We assume that the proper value of
-% "\baselineskip" for the footnotes (normally 9\,pt) has been set
-% already, in "\notefontsetup". The argument of the macro is
-% again the note series letter.
-% \begin{macrocode}
-\def\para@footsetup#1{{\notefontsetup
- \dimen0=\baselineskip
- \multiply\dimen0 by 1024
- \divide \dimen0 by \hsize \multiply\dimen0 by 64
- \expandafter
- \xdef\csname #1footfudgefactor\endcsname{%
- \expandafter\en@number\the\dimen0 }}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\en@number}
-% The "\en@number" macro extracts the numerical part from a "dimen"
-% register and strips off the ``"pt"'' (see {\em The \TeX
-% book}, p.\,375). It turns "10pt" into "10" so that you can use
-% it in arithmetic.
-% \begin{macrocode}
-{\catcode`p=12 \catcode`t=12 \gdef\en@number#1pt{#1}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\parafootstart}
-% "\parafootstart" is the same as "\normalfootstart", but we give it
-% again to ensure that "\rightskip" and "\leftskip" are
-% zeroed (this needs to be done before "\para@footgroup" in the
-% output routine). You might have decided to change this for other
-% kinds of note, but here it should stay as it is. The size of
-% paragraphed notes is calculated using a fudge factor which in
-% turn is based on "\hsize". So the paragraph of notes needs to be
-% that wide.
-%
-% The argument of the macro is again the note series letter.
-% \begin{macrocode}
-\def\parafootstart#1{%
- \rightskip=0pt \leftskip=0pt \parindent=0pt
- \vskip\skip\csname #1footins\endcsname
- \csname #1footnoterule\endcsname}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\para@vfootnote}
-% "\para@vfootnote"
-% is a version of the "\vfootnote" command that's used for
-% paragraphed notes. It gets appended to the "\inserts@list" list
-% by an outer-level footnote command like "\Afootnote". The first
-% argument is the note series letter; the second is the full text
-% of the printed note itself, including line numbers, lemmata, and
-% footnote text.
-%
-% The initial model for this insertion is, of course, the
-% "\insert\footins" definition in {\em The \TeX book}, p.\,398.
-% There, the footnotes are first collected up in hboxes, and these
-% hboxes are later unpacked and stuck together into a paragraph.
-%
-% However, Michael Downes\index{Downes, Michael} has pointed out
-% that because text in hboxes gets typeset in restricted horizontal
-% mode, there are some undesirable side-effects if you later want
-% to break such text across lines. In restricted horizontal mode,
-% where \TeX\ does not expect to have to break lines, it does not
-% insert certain items like "\discretionary"s. If you later unbox
-% these hboxes and stick them together, as the {\em \TeX book\/}
-% macros do to make these footnotes, you lose the ability to
-% hyphenate after an explicit hyphen. This can lead to overfull
-% "\hbox"es when you would not expect to find them, and to the
-% uninitiated it might be very hard to see why the problem had
-% arisen.\footnote{Michael Downes, ``Line Breaking in {\tt \bslash
-% unhbox}ed Text'', {\em TUGboat\/} {\bf 11} (1990), pp.\,605--612.}
-%
-% Wayne Sullivan\index{Sullivan, Wayne} pointed out to us another
-% subtle problem that arises from the same cause: \TeX\ also leaves
-% the "\language" whatsit nodes out of the horizontal
-% list.\footnote{See {\em The \TeX book}, p.\,455 (editions after
-% January 1990).} So changes from one language to another will not
-% invoke the proper hyphenation rules in such footnotes. Since
-% critical editions often do deal with several languages,
-% especially in footnotes, we really ought to get this bit of code
-% right.
-%
-% To get around these problems, Wayne suggested emendations to the
-% {\em \TeX book\/} versions of these macros which are broadly the
-% same as those described by Michael: the central idea (also
-% suggested by Donald Knuth in a letter to Michael) is to avoid collecting
-% the text in an "\hbox" in the first place, but instead to collect
-% it in a "\vbox" whose width is (virtually)
-% infinite.\label{hboxproblem} The text is therefore typeset in
-% unrestricted horizontal mode, as a paragraph consisting of a
-% single long line. Later, there is an extra level of unboxing to
-% be done: we have to unpack the "\vbox", as well as the hboxes
-% inside it, but that's not too hard. For details, we refer you to
-% Michael's article, where the issues are clearly
-% explained.\footnote{Wayne supplied his own macros to do this, but
-% since they were almost identical to Michael's, we have used the
-% latter's {\tt \bslash unvxh} macro since it is publicly
-% documented.} Michael's unboxing macro is called "\unvxh": unvbox,
-% extract the last line, and unhbox it.
-%
-% Doing things this way has an important
-% consequence:\label{nobreaks-detail} as Michael
-% pointed out, you really can't put an explicit line-break into a
-% note built in a "\vbox" the way we are doing.\footnote{``Line
-% Breaking'', p.\,610.} In other words, be very careful not to say
-% "\break", or "\penalty-10000", or any equivalent inside your
-% para-footnote.\label{nobreak} If you do, most of the note will
-% probably disappear. You {\em are\/} allowed to make strong
-% suggestions; in fact "\penalty-9999" will be quite okay. Just
-% don't make the break mandatory. We haven't applied any of
-% Michael's solutions here, since we feel that the problem is
-% exiguous, and "EDMAC" is quite baroque enough already. If
-% you think you are having this problem, look up Michael's
-% solutions.
-%
-% One more thing; we set "\leftskip" and "\rightskip" to zero.
-% This has the effect of neutralizing any such skips which may
-% apply to the main text (cf.\ p.\,\pageref{footskips} above).
-% We need to do this, since "footfudgefactor" is calculated on
-% the assumption that the notes are "\hsize" wide.
-%
-% So, finally, here is the modified foot-paragraph code, which
-% sets the footnote in vertical mode so that language and
-% discretionary nodes are included.
-% \begin{macrocode}
-\def\para@vfootnote#1#2{\insert\csname #1footins\endcsname
- \bgroup
- \notefontsetup
- \interlinepenalty=\csname inter#1footnotelinepenalty\endcsname
- \splittopskip=\ht\strutbox
- \splitmaxdepth=\dp\strutbox \floatingpenalty=\@MM
- \leftskip0pt \rightskip0pt
- \setbox0=\vbox{\hsize=\maxdimen
- \noindent\csname #1footfmt\endcsname#2}%
- \setbox0=\hbox{\unvxh0}%
- \dp0=0pt
- \ht0=\csname #1footfudgefactor\endcsname\wd0
-% \end{macrocode}
-% Here we produce the contents of the footnote from box $0$, and
-% add a penalty of $0$ between boxes in this insert.
-% \begin{macrocode}
- \box0
- \penalty0
- \egroup}
-% \end{macrocode}
-% The final penalty of $0$
-% was added here at Wayne's\index{Sullivan, Wayne}
-% suggestion to avoid a weird page-breaking problem, which occurs on
-% those occasions when \TeX\ attempts to split foot paragraphs.
-% After trying out such a split (see {\em The \TeX book}, p.\,124),
-% \TeX\ inserts a penalty of $-10000$ here, which
-% nearly always forces the break at the end of the whole footnote
-% paragraph (since individual notes can't be split) even when this
-% leads to an overfull vbox. The change above results in a penalty
-% of $0$ instead which allows, but doesn't force, such breaks. This
-% penalty of $0$ is later removed, after page breaks have been
-% decided, by the "\unpenalty" macro in "\makehboxofhboxes". So it
-% does not affect how the footnote paragraphs are typeset (the
-% notes still have a penalty of $-10$ between them, which is added
-% by "\parafootfmt").
-% \end{macro}
-%
-% \begin{macro}{\unvxh}
-% Here is Michael's\index{Downes, Michael} definition of "\unvxh",
-% used above. Michael's macro also takes care to remove some
-% unwanted penalties and glue that \TeX\ automatically attaches to
-% the end of paragraphs. When \TeX\ finishes a paragraph, it
-% throws away any remaining glue, and then tacks on the following
-% items: a "\penalty" of $10000$, a "\parfillskip" and a
-% "\rightskip" ({\em The \TeX book}, pp.\,99--100). "\unvxh"
-% cancels these unwanted paragraph-final items using "\unskip" and
-% "\unpenalty".
-% \begin{macrocode}
-\def\unvxh#1{%
- \setbox0=\vbox{\unvbox#1%
- \global\setbox1=\lastbox}%
- \unhbox1
- \unskip % remove \rightskip,
- \unskip % remove \parfillskip,
- \unpenalty % remove \penalty of 10000,
- \hskip\ipn@skip} % but add the glue to go between the notes
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\interparanoteglue}
-% \begin{macro}{\ipn@skip}
-% \label{interparanoteglue}\relax
-% Close observers will notice that we snuck some glue called
-% "\ipn@skip" onto the end of the hbox produced by "\unvxh" in the
-% above macro.
-%
-% We want to be able to have some glue between our paragraphed
-% footnotes. But since we are initially setting our notes in
-% internal vertical mode, as little paragraphs, any paragraph-final
-% glue will get discarded. Since "\unvxh" is already busy fiddling
-% with glue and penalties at the end of these paragraphs, we take
-% advantage of the opportunity to provide our inter-note spacing.
-%
-% We collect the value of the inter-parafootnote glue value as the
-% parameter of a macro called---wait for it---"\interparanoteglue".
-% We put this value into the value of a glue register
-% "\ipn@skip" (inter-para-note-skip) making sure first to set the
-% current font to the value normally used in footnotes so that the value of an
-% "em" will be taken from the right font.
-% \begin{macrocode}
-\newskip\ipn@skip
-\def\interparanoteglue#1{%
- {\notefontsetup\global\ipn@skip=#1 \relax}}
-\interparanoteglue{1em plus.4em minus.4em}
-% \end{macrocode}
-% There is a point to be careful about regarding the
-% "\interparanoteglue". Remember that in "\para@vfootnote" we do
-% some measurements on the footnote box, and use the resulting size
-% to make an estimate of how much the note will contribute to the
-% height of our final footnote paragraph. This information is used
-% by the output routine to allocate the right amount of vertical
-% space on the page for the notes ({\em The \TeX book}, pp.\,398--399).
-%
-% The length of the footnote includes the natural size of the glue
-% specified by "\interparanoteglue", but not its stretch or shrink
-% components, since at this point the note has no need to stretch
-% or shrink. Later, when the paragraph is actually composed by
-% "\parafootgroup" in the output routine, \TeX\ will almost
-% certainly do some stretching and shrinking of this glue in order
-% to make the paragraph look nice. Probably the stretching and
-% shrinking over the whole paragraph will cancel each other out.
-% But if not, the actual vertical size of the paragraph may not
-% match the size the output routine had been told to expect, and
-% you may get an overfull/underfull "\vbox" message from the output
-% routine. To minimize the risk of this, you can do two things:
-% keep the "plus" and "minus" components of "\interparanoteglue"
-% small compared with its natural glue, and keep them the same as
-% each other. As a general precaution, keep the size and
-% flexibility of the "\skip\footins" glue on the high side too:
-% because the reckoning is approximate, footnote blocks may be up
-% to a line bigger or smaller than the output routine allows for,
-% so keep some flexible space between the text and the notes.
-% \end{macro}
-% \end{macro}
-%
-%
-% \begin{macro}{\parafootfmt}
-% "\parafootfmt" is
-% "\normalfootfmt" adapted to do the special stuff
-% needed for paragraphed notes---leaving out the "\endgraf" at the
-% end, sticking in special penalties and kern, and leaving out the
-% "\footstrut". The first argument is the line and page
-% number information, the second is the lemma, and the third is the
-% text of the footnote.
-% \begin{macrocode}
-\def\parafootfmt#1#2#3{%
- \normal@pars
- \parindent=0pt \parfillskip=0pt plus1fil
- {\notenumfont\printlines#1|}\enspace
- {\select@lemmafont#1|#2}\rbracket\enskip
- #3\penalty-10 }
-% \end{macrocode}
-% Note that in the above definition, the penalty of $-10$
-% encourages a line break between notes, so that notes have a
-% slight tendency to begin on new lines.
-% \end{macro}
-%
-% \begin{macro}{\para@footgroup}
-% This "footgroup" code is modelled on the macros in {\em The
-% \TeX book}, p.\,399. The only difference is the "\unpenalty"
-% in "\makehboxofhboxes", which is there to remove the penalty of
-% $0$ which was added to the end of each footnote by
-% "\para@vfootnote".
-%
-% The call to "\notefontsetup" is to ensure that the correct
-% "\baselineskip" for the footnotes is used. The argument is the
-% note series letter.
-% \begin{macrocode}
-\def\para@footgroup#1{%
- \unvbox\csname #1footins\endcsname \makehboxofhboxes
- \setbox0=\hbox{\unhbox0 \removehboxes}%
- \notefontsetup
- \noindent\unhbox0\par}
-\def\makehboxofhboxes{\setbox0=\hbox{}%
- \loop
- \unpenalty
- \setbox2=\lastbox
- \ifhbox2
- \setbox0=\hbox{\box2\unhbox0}
- \repeat}
-\def\removehboxes{\setbox0=\lastbox
- \ifhbox0{\removehboxes}\unhbox0 \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Columnar footnotes}
-%
-% \begin{macro}{\rigidbalance}
-% \begin{macro}{\dosplits}
-% \begin{macro}{\splitoff}
-% \begin{macro}{\@h}
-% \begin{macro}{\@k}
-% We will now define macros for three-column notes and two-column
-% notes. Both sets of macros will use "\rigidbalance", which splits a
-% box ("#1") into into a number ("#2") of columns, each
-% with a space ("#3") between the top baseline and the top of
-% the "\vbox". The "\rigidbalance" macro is taken from
-% {\em The \TeX book}, p.\,397, with a slight change to the syntax of
-% the arguments so that they don't depend on white space. Note also
-% the extra unboxing in "\splitoff", which allows the new "\vbox" to
-% have its natural height as it goes into the alignment.
-% \begin{macrocode}
-\newcount\@k \newdimen\@h
-\def\rigidbalance#1#2#3{\setbox0=\box#1 \@k=#2 \@h=#3
- \line{\splittopskip=\@h \vbadness=\@M \hfilneg
- \valign{##\vfil\cr\dosplits}}}
-\def\dosplits{\ifnum\@k>0 \noalign{\hfil}\splitoff
- \global\advance\@k-1\cr\dosplits\fi}
-\def\splitoff{\dimen0=\ht0
- \divide\dimen0 by\@k \advance\dimen0 by\@h
- \setbox2 \vsplit0 to \dimen0
- \unvbox2 }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \paragraph{Three columns}
-%
-% \begin{macro}{\footthreecol}
-% You say "\footthreecol{A}" to have the "A" series of footnotes
-% typeset in three columns. It is important to call this only after
-% "\hsize" has been set for the document.
-% \begin{macrocode}
-\def\footthreecol#1{%
- \expandafter\let\csname v#1footnote\endcsname=\threecolvfootnote
- \expandafter\let\csname #1footfmt\endcsname=\threecolfootfmt
- \expandafter\let\csname #1footgroup\endcsname=\threecolfootgroup
- \threecolfootsetup{#1}}
-% \end{macrocode}
-% The "\footstart" and "\footnoterule" macros for these notes assume
-% the normal values (p.\,\pageref{normalvalues} above).
-% \end{macro}
-%
-% \begin{macro}{\threecolfootsetup}
-% The "\threecolfootsetup" macro calculates and sets some numbers
-% for three-column footnotes.
-%
-% We set the "\count" of the foot insert to $333$.
-% Each footnote can be thought of as contributing only one third of
-% its height to the page, since the footnote insertion has been
-% made as a long narrow column, which then gets trisected by the
-% "\rigidbalance" routine (inside "\threecolfootgroup").
-% These new, shorter columns are saved in a box, and then that box
-% is {\em put back\/} into the footnote insert, replacing the
-% original collection of footnotes. This new box is, therefore,
-% only about a third of the height of the original one.
-%
-% The "\dimen" value for this note series has to change in the
-% inverse way: it needs to be three times
-% the actual limit on the amount of space these notes are allowed to
-% fill on the page, because when \TeX\ is
-% accumulating material for the page
-% and checking that limit, it doesn't apply the "\count" scaling.
-% \begin{macrocode}
-\def\threecolfootsetup#1{%
- \count\csname #1footins\endcsname 333
- \multiply\dimen\csname #1footins\endcsname by 3 }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\threecolvfootnote}
-% "\threecolvfootnote"
-% is the "\vfootnote" command for three-column notes. The
-% call to "\notefontsetup" ensures that the
-% "\splittopskip" and "\splitmaxdepth" take their values
-% from the right "\strutbox": the one used in footnotes.
-% Note especially the importance of temporarily reducing the
-% "\hsize" to $0.3$ of its normal value. This determines the
-% widths of the individual columns. So if the normal "\hsize"
-% is, say, 10\,cm, then each column will be $0.3\times10=3$\,cm
-% wide, leaving a gap of 1\,cm spread equally between columns
-% (i.e., .5\,cm between each).
-%
-% The arguments are 1)~the note series letter and 2)~the full text
-% of the note (including numbers, lemma and text).
-% \begin{macrocode}
-\def\threecolvfootnote#1#2{%
- \insert\csname #1footins\endcsname\bgroup
- \notefontsetup
- \interlinepenalty=\csname inter#1footnotelinepenalty\endcsname
- \floatingpenalty=20000
- \splittopskip=\ht\strutbox \splitmaxdepth=\dp\strutbox
- \rightskip=0pt \leftskip=0pt
- \csname #1footfmt\endcsname #2\egroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\threecolfootfmt}
-% "\threecolfootfmt"
-% is the command that formats one note.
-% It uses "\raggedright", which will usually be
-% preferable with such short lines. Setting the "\parindent"
-% to zero means that, within each individual note, the lines begin
-% flush left.
-%
-% The arguments are 1)~the line numbers, 2)~the lemma and 3)~the
-% text of the "-footnote" command.
-% \begin{macrocode}
-\def\threecolfootfmt#1#2#3{%
- \normal@pars
- \hsize .3\hsize
- \parindent=0pt
- \tolerance=5000
- \raggedright
- \leavevmode
- \strut{\notenumfont\printlines#1|}\enspace
- {\select@lemmafont#1|#2}\rbracket\enskip
- #3\strut\par\allowbreak}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\threecolfootgroup}
-% And here is the "footgroup" macro that's called within the
-% output routine to regroup the notes into three columns. Once
-% again, the call to "\notefontsetup" is there to ensure that
-% it is the right "\splittopskip"---the one used in
-% footnotes---which is used to provide the third argument for
-% "\rigidbalance". This third argument ("\@h") is the
-% "topskip" for the box containing the text of the
-% footnotes, and does the job of making sure the top lines of the
-% columns line up horizontally. In {\em The \TeX book}, p.\,398,
-% Donald Knuth suggests retrieving the ouput of "\rigidbalance",
-% putting it back into the insertion box, and then printing the
-% box. Here, we just print the "\line" which comes out of
-% "\rigidbalance" directly, without any re-boxing.
-% \begin{macrocode}
-\def\threecolfootgroup#1{{\notefontsetup
- \splittopskip=\ht\strutbox
- \expandafter
- \rigidbalance\csname #1footins\endcsname 3 \splittopskip }}
-% \end{macrocode}
-% \end{macro}
-%
-% \paragraph{Two columns}
-%
-% \begin{macro}{\foottwocol}
-% You say "\foottwocol{A}" to have the "A" series of footnotes
-% typeset in two columns. It is important to call this only after
-% "\hsize" has been set for the document.
-% \begin{macrocode}
-\def\foottwocol#1{%
- \expandafter\let\csname v#1footnote\endcsname=\twocolvfootnote
- \expandafter\let\csname #1footfmt\endcsname=\twocolfootfmt
- \expandafter\let\csname #1footgroup\endcsname=\twocolfootgroup
- \twocolfootsetup{#1}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\twocolfootsetup}
-% \begin{macro}{\twocolvfootnote}
-% \begin{macro}{\twocolfootfmt}
-% \begin{macro}{\twocolfootgroup}
-% Here is a series of macros which are very similar to their
-% three-column counterparts. In this case,
-% each note is assumed to contribute only a half a line of text.
-% And the notes are set in columns
-% "0.45\hsize" wide, giving a gap between them of one tenth
-% of the "\hsize".
-% \begin{macrocode}
-\def\twocolfootsetup#1{%
- \count\csname #1footins\endcsname 500
- \multiply\dimen\csname #1footins\endcsname by 2 }
-% \end{macrocode}
-% \begin{macrocode}
-\def\twocolvfootnote#1#2{\insert\csname #1footins\endcsname\bgroup
- \notefontsetup
- \interlinepenalty=\csname inter#1footnotelinepenalty\endcsname
- \floatingpenalty=20000
- \splittopskip=\ht\strutbox \splitmaxdepth=\dp\strutbox
- \rightskip=0pt \leftskip=0pt
- \csname #1footfmt\endcsname #2\egroup}
-% \end{macrocode}
-% \begin{macrocode}
-\def\twocolfootfmt#1#2#3{%
- \normal@pars
- \hsize .45\hsize
- \parindent=0pt
- \tolerance=5000
- \raggedright
- \leavevmode
- \strut{\notenumfont\printlines#1|}\enspace
- {\select@lemmafont#1|#2}\rbracket\enskip
- #3\strut\par\allowbreak}
-% \end{macrocode}
-% \begin{macrocode}
-\def\twocolfootgroup#1{{\notefontsetup
- \splittopskip=\ht\strutbox
- \expandafter
- \rigidbalance\csname #1footins\endcsname 2 \splittopskip}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \section{Output routine}
-% \label{output}\relax
-%
-% Now we begin the output routine and associated things.
-%
-% \subsection{Crop marks}
-%
-% The following are the parameters that specify the page dimensions
-% that relate to crop marks; they are set by the "\cropsetup"
-% macro.
-%
-% \begin{macro}{\crop@vsize}
-% "\crop@vsize" is the vertical distance between crop marks.
-% \begin{macrocode}
-\newdimen\crop@vsize \crop@vsize=0pt
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\crop@hsize}
-% "\crop@hsize" is the horizontal distance between crop marks.
-% \begin{macrocode}
-\newdimen\crop@hsize \crop@hsize=0pt
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\head@margin}
-% "\head@margin" is the head margin.
-% \begin{macrocode}
-\newdimen\head@margin \head@margin=0pt
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\back@margin}
-% "\back@margin" is the back margin.
-% \begin{macrocode}
-\newdimen\back@margin \back@margin=0pt
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\odd@back}
-% \begin{macro}{\even@back}
-% \begin{macro}{\@back}
-% To handle the odd/even difference in the back margin, we keep the
-% different margin sizes in two registers, "\odd@back" and
-% "\even@back", and use a token register, "\@back", to
-% hold the code that decides which to use.
-% \begin{macrocode}
-\newdimen\odd@back \odd@back=0pt
-\newdimen\even@back \even@back=0pt
-\newtoks\@back
-\@back={\ifodd\pageno \odd@back \else \even@back\fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\registration@marks}
-% We store up the registration marks in a box
-% called "\registration@marks" that's reused for every
-% page, instead of regenerating them all again at each page.
-% \begin{macrocode}
-\newbox\registration@marks
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\vertical@rules}
-% \begin{macro}{\horizontal@rules}
-% The following are macros that will be used in
-% the course of making "\registration@marks".
-% \begin{macrocode}
-\def\vertical@rules{%
- \hbox to\crop@hsize{%
- \vrule height1pc width\cropwidth depth0pt
- \hfil
- \vrule width\cropwidth depth0pt}}
-% \end{macrocode}
-% \begin{macrocode}
-\def\horizontal@rules{%
- \hbox to\crop@hsize{%
- \llap{\vrule width1pc height\cropwidth \kern\cropgap}%
- \hfil
- \rlap{\kern\cropgap \vrule width1pc height\cropwidth}}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\cropwidth}
-% \begin{macro}{\cropgap}
-% Set standard values for the thickness of the rules used for drawing crop
-% marks ("\cropwidth") and the gap by which crop marks don't cross
-% ("\cropgap").
-% \begin{macrocode}
-\newdimen\cropwidth \cropwidth=.4pt
-% \end{macrocode}
-% \begin{macrocode}
-\newdimen\cropgap \cropgap=5pt
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\magicvskip}
-% \begin{macro}{\headlinefont}
-% \label{magic}\relax
-% Publishers usually measure the head margin for the crop marks
-% from the top of the running head.\footnote{Cf.\ Hugh Williamson,
-% {\it Methods of Book Design\/} (New Haven: Yale University Press,
-% 1983), p.\,21.\protect\index{Williamson, Hugh}}
-%
-% \PlainTeX's starting reference point for a page is not the
-% running head, but a point "\topskip" above the baseline of
-% the first line of main text on the page. (Before doing anything
-% else, \TeX\ adds a small amount of skip to the top of a new page,
-% which is calculated to bring the baseline of the top line of text
-% down to "\topskip" from the top of the page, i.e., from the
-% point where the "\vsize" is measured from: {\em The \TeX
-% book}, pp.\,113--114.) So any vertical matter we add in the output
-% routine to the start of a page will sit with its base at a point
-% "\topskip" above the baseline of the first line of the main
-% text. And if "\ht\strutbox" is the height of the header box
-% we are adding, then the distance between its top and the
-% reference point will be
-% "\topskip"$-$"\ht\strutbox"$-s$, where $s$ is the space
-% we want to put between the baselines of the header and the first
-% text line.
-%
-% In \PlainTeX, this distance is $-22.5$\,pt, a ``magic constant''
-% explained in {\em The \TeX book}, p.\,255. Rather than using this
-% figure explicitly, "EDMAC" calculates it afresh, in case
-% you have changed any of the values that go to make up this magic
-% constant. The parameters involved are the "\topskip", the
-% font of the "\headline" text (which determines the height of
-% the "\strutbox"), and the "\baselineskip" (assuming that you
-% want the header to be exactly two lines above the first line of
-% the text). This calculation is done within "\cropsetup".
-% \begin{macrocode}
-\newdimen\magicvskip \magicvskip=\topskip
-% \end{macrocode}
-%
-% If the "\headline" is going to be set at a different height
-% from the top of the text, or in a different size of font,
-% be sure to make the appropriate changes to the
-% above parameters, or the crop marks will not be in the right
-% position. We now set the standard value for "\headlinefont".
-% \begin{macrocode}
-\let\headlinefont=\rm
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\cropsetup}
-% \begin{macro}{\ifcropmarks@}
-% Here at last is the "\cropsetup"
-% macro that takes the page and margin
-% dimensions you specify and calculates all the other parameters
-% from them. It should always be used after "\hsize",
-% "\makeheadline", and "\headlinefont" for the
-% document have been set, as explained above.
-% These macros use the same approach as those published by David
-% Salomon\index{Salomon, David} in {\em TUGboat\/} {\bf 11} (1990),
-% pp.\,77--78. Cf.\ also the "\setcornerrules" code in {\em The \TeX
-% book}, pp.\,416--417.
-%
-% The four arguments are as described above, on page
-% \pageref{cropsetup}.
-%
-% First, set up a conditional, "\ifcropmarks@",
-% for use in the output routine.
-% Initially, it's false. (It is set to true when you use the
-% "\cropsetup" macro.)
-% \begin{macrocode}
-\newif\ifcropmarks@
-% \end{macrocode}
-% Now the main macro to set up crop marks:
-% \begin{macrocode}
-\def\cropsetup#1#2#3#4{\cropmarks@true
- \global\crop@vsize=#1
- \global\crop@hsize=#2
- \global\head@margin=#3
- \global\back@margin=#4
-% \end{macrocode}
-% The back margin for odd pages is easy. For even pages, we take the
-% full width and subtract the text width and back margin size.
-% \begin{macrocode}
- \global\odd@back=\back@margin
- \global\even@back=\crop@hsize
- \global\advance\even@back by -\hsize
- \global\advance\even@back by -\back@margin
-% \end{macrocode}
-% \begin{macrocode}
- \setbox\registration@marks=
- \vbox to \crop@vsize{%
- \offinterlineskip
- \vbox to0pt{\vss
- \vertical@rules
- \kern\cropgap
- \horizontal@rules}%
- \vfil
- \vbox to0pt{%
- \horizontal@rules
- \kern\cropgap
- \vertical@rules\vss}}%
-% \end{macrocode}
-%
-% Set the box's size to zero.
-%
-% \begin{macrocode}
- \ht\registration@marks=0pt
- \wd\registration@marks=0pt
-% \end{macrocode}
-%
-% In the next lines, we set the font to "\headlinefont" so that
-% the height of the "\strutbox" will be the that of the
-% "\headlinefont" font. This makes the assumption that font
-% used for the "\headline" is invoked by "\headlinefont",
-% and that the "\headlinefont" macro defines a
-% "\strutbox" of an appropriate size for the font. (The
-% standard setting is to \PlainTeX's "\rm", and the height of a
-% "\strutbox" for this font is already set by \PlainTeX.)
-% \begin{macrocode}
- \global\magicvskip=\topskip
- {\headlinefont \global\advance\magicvskip by -\ht\strutbox}%
- \global\advance\magicvskip by -2\baselineskip}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Output routine}
-%
-% \begin{macro}{\output}
-% \begin{macro}{\edmac@output}
-% \begin{macro}{\pagecontents}
-% This is a new output routine, with changes to handle printing all our
-% footnotes. Those changes have not been added directly, but are in macros
-% that get called here: that should make it easier to see what would need
-% to be taken over to a different output routine. We continue to use the
-% "\pagebody", "\makeheadline", "\makefootline", and "\dosupereject"
-% macros of \PlainTeX; for those macros, and the original version of
-% "\output", see {\em The \TeX book}, p.\,364.
-% \begin{macrocode}
-\output{\edmac@output}
-\def\edmac@output{\shipout\vbox{\normal@pars
- \ifcropmarks@
- \do@cropmarks
- \else
- \vbox{\makeheadline\pagebody\makefootline}%
- \fi}%
- \advancepageno
- \ifnum\outputpenalty>-\@MM\else\dosupereject\fi}
-% \end{macrocode}
-% \begin{macrocode}
-\def\pagecontents{\page@start
- \ifvoid\topins\else\unvbox\topins\fi
- \dimen@=\dp\@cclv \unvbox\@cclv % open up \box255
- \do@feet
- \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\do@cropmarks}
-% When crop marks are to be printed,
-% "\edmac@output" uses this macro to print them, along with the
-% text of the page.
-% \begin{macrocode}
-\def\do@cropmarks{%
- \vbox{\offinterlineskip
- \kern\magicvskip
- \copy\registration@marks
- \kern-\magicvskip}%
- \nointerlineskip
- \kern\head@margin
- \moveright\the\@back\vbox{\makeheadline\pagebody\makefootline}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\do@feet}
-% "\do@feet" ships out all the footnotes. Standard "EDMAC" has only
-% five feet, but there is nothing in principal to prevent you
-% from creating an arachnoid or centipedal edition; straightforward
-% modifications of "EDMAC" are all that's required. However, the
-% myria\-pedal edition is ruled out by \TeX's limitations: the number
-% of insertion classes is limited to $255$.
-% \begin{macrocode}
-\def\do@feet{%
- \ifvoid\footins\else
- \vskip\skip\footins
- \footnoterule
- \unvbox\footins
- \fi
- \ifvoid\Afootins\else
- \Afootstart{A}\Afootgroup{A}%
- \fi
- \ifvoid\Bfootins\else
- \Bfootstart{B}\Bfootgroup{B}%
- \fi
- \ifvoid\Cfootins\else
- \Cfootstart{C}\Cfootgroup{C}%
- \fi
- \ifvoid\Dfootins\else
- \Dfootstart{D}\Dfootgroup{D}%
- \fi
- \ifvoid\Efootins\else
- \Efootstart{E}\Efootgroup{E}%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \section{Cross referencing}
-% \label{xref}\relax
-%
-% You can mark a place in the text using a command of the form
-% "\label{foo}", and later refer to it using the label
-% "foo" by saying "\pageref{foo}", or "\lineref{foo}" or
-% "\sublineref{foo}". These reference commands will produce,
-% respectively, the page, line and sub-line on which the
-% "\label{foo}" command occurred.
-%
-% The reference macros warn you if a reference is made to an
-% undefined label. If "foo" has been used as a label before,
-% the "\label{foo}" command will issue a complaint; subsequent
-% "\pageref" and "\lineref" commands will refer to the
-% latest occurrence of "\label{foo}". When any of these
-% commands are used, an additional auxiliary file, called
-% \meta{filename}".aux", is created.
-%
-% \begin{macro}{\labelref@list}
-% Set up a new list, "\labelref@list", to hold the page, line and
-% sub-line numbers for each label.
-% \begin{macrocode}
-\list@create{\labelref@list}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@aux}
-% "\@aux" is the output stream number for our auxiliary file
-% that contains labeling commands.
-% \begin{macrocode}
-\newwrite\@aux
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\do@labelsfile}
-% The "\do@labelsfile" macro
-% opens the auxiliary labels file and executes it; the file should
-% consist of a stream of "\make@labels" commands. Then it opens
-% a new auxiliary file, and redefines itself so that it isn't called
-% again. This will be called by the first "\label" or reference
-% command that appears in the text---and not at all if there are no
-% labels or references, so we won't bother at all with an ".aux"
-% file if there's no need for it.
-% \begin{macrocode}
-\def\do@labelsfile{%
- \openin\@inputcheck=\jobname.aux
- \ifeof\@inputcheck \else
- \closein\@inputcheck
- \begingroup
- \makeatletter \catcode`\^^M=9
- \input\jobname.aux
- \endgroup
- \fi
- \immediate\openout\@aux=\jobname.aux
- \global\let\do@labelsfile=\relax}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\label}
-% \begin{macro}{\zz@@@}
-% The "\label" command first writes a "\@lab" macro to
-% the "\linenum@out" file. It then checks to see that the
-% "\labelref@list" actually has something in it (if not, it
-% creates a dummy entry), and pops the next value for the current
-% label, storing it in "\label@refs". Finally it defines the
-% label to be "\empty" so that any future check will turn up
-% the fact that it has been used.\footnote{The remaining macros
-% in this section were kindly revised by Wayne
-% Sullivan,\index{Sullivan, Wayne} who
-% substantially improved their efficiency and flexibility.}
-% \begin{macrocode}
-\def\zz@@@{000|000|000} % set three counters to zero in one go
-% \end{macrocode}
-% \begin{macrocode}
-\def\label#1{\do@labelsfile
- \write\linenum@out{\string\@lab}%
- \ifx\labelref@list\empty
- \xdef\label@refs{\zz@@@}%
- \else
- \gl@p\labelref@list\to\label@refs
- \fi
- \edef\next{\write\@aux{\string\make@labels\label@refs|{#1}}}%
- \next}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\make@labels}
-% The "\make@labels" macro gets executed when the labels file is
-% read. For each label it defines a macro, whose name is made up
-% partly from the label you supplied, that contains the page, line
-% and sub-line numbers. But first it checks to see whether the
-% label has already been used (and complains if it has).
-% \begin{macrocode}
-\def\make@labels#1|#2|#3|#4{%
- \expandafter\ifx\csname the@label#4\endcsname \relax\else
- \edmac@warning{Duplicate definition of label `#4'
- on page \number\pageno.}%
- \fi
- \expandafter\gdef\csname the@label#4\endcsname{#1|#2|#3}%
- \ignorespaces}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@lab}
-% The "\@lab" command, which appears in the "\linenum@out" file,
-% appends the current values of page, line and sub-line to the
-% "\labelref@list". These values are defined by the earlier
-% "\@page", "\@l", and the "\sub@on" and "\sub@off" commands
-% appearing in the "\linenum@out" file.
-% \begin{macrocode}
-\def\@lab{\xright@appenditem
- {\the\page@num|\the\line@num|%
- \ifsublines@ \the\subline@num \else 0\fi}\to\labelref@list}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pageref}
-% \begin{macro}{\xpageref}
-% If the specified label exists, "\pageref" gives its page number.
-% For this reference command, as for the other two, a special
-% version with prefix "x" is provided for use in places where the
-% command is to be scanned as a number, as in "\linenum". These
-% special versions have two limitations: they don't print error
-% messages if the reference is unknown, and they can't appear as
-% the first label or reference command in the file; you must ensure
-% that a "\label" or a normal reference command appears first, or
-% these x-commands will always return zeros.
-% \begin{macrocode}
-\def\pageref#1{\ref@undefined{#1}\getref@num{1}{#1}}
-\def\xpageref#1{\getref@num{1}{#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\lineref}
-% \begin{macro}{\xlineref}
-% If the specified label exists, "\lineref" gives its line number.
-% \begin{macrocode}
-\def\lineref#1{\ref@undefined{#1}\getref@num{2}{#1}}
-\def\xlineref#1{\getref@num{2}{#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\sublineref}
-% \begin{macro}{\xsublineref}
-% If the specified label exists, "\sublineref" gives its sub-line number.
-% \begin{macrocode}
-\def\sublineref#1{\ref@undefined{#1}\getref@num{3}{#1}}
-\def\xsublineref#1{\getref@num{3}{#1}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\ref@undefined}
-% The next three macros are used by the referencing commands above,
-% and do the job of extracting the right numbers from the label
-% macro that contains the page, line, and sub-line number. The
-% "\ref@undefined" macro is called when you refer to a label with
-% the normal referencing macros. Its argument is a label, and it
-% just checks that the labels file has indeed been opened and read (if
-% not, it does so), and that the label is defined (if not, it
-% squeals). (It is these checks which the "x-" forms of the
-% reference macros leave out.)
-% \begin{macrocode}
-\def\ref@undefined#1{\do@labelsfile
- \expandafter\ifx\csname the@label#1\endcsname\relax
- \edmac@warning{Reference `#1'
- on page \the\pageno\space undefined. Using `000'.}%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\getref@num}
-% Next, "\getref@num" fetches the number we want. It has two
-% arguments: the first is simply a digit, specifying whether to
-% fetch a page ("1"), line ("2") or sub-line ("3") number. (This
-% switching is done by calling "\label@parse".) The second argument
-% is the label-macro, which because of the "\@lab" macro above is
-% defined to be a string of the type "123|456|789".
-% \begin{macrocode}
-\def\getref@num#1#2{%
- \expandafter
- \ifx\csname the@label#2\endcsname \relax
- 000%
- \else
- \expandafter\expandafter\expandafter
- \label@parse\csname the@label#2\endcsname|#1%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\label@parse}
-% Notice that we slipped another "|" delimiter into the
-% penultimate line of "\getref@num", to
-% keep the ``switch-number'' separate from the reference numbers. This
-% "|" is used as another parameter delimiter by "\label@parse",
-% which extracts the appropriate number from its first arguments.
-% The "|"-delimited arguments consist of the expanded label-macro
-% (three reference numbers), followed by the switch-number ( "1",
-% "2", or "3") which defines which of the earlier three numbers to
-% pick out. (It was earlier given as the first argument of
-% "\getref@num".)
-% \begin{macrocode}
-\def\label@parse#1|#2|#3|#4{%
- \ifcase #4\relax
- \or #1%
- \or #2%
- \or #3%
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\xxref}
-% The "\xxref" command takes two arguments, both of which are
-% labels, e.g., "\xxref{mouse}{elephant}". It first does some
-% checking to make sure that the labels do exist (if one doesn't,
-% those numbers are set to zero). Then it calls "\linenum" and sets
-% the beginning page, line, and sub-line numbers to those of the
-% place where "\label{mouse}" was placed, and the ending
-% numbers to those at "\label{elephant}". The point of this is
-% to be able to manufacture footnote line references to passages
-% which can't be specified in the normal way as the first argument
-% to "\text" for one reason or another. Using "\xxref" in the
-% second argument of "\text" lets you set things up at least
-% semi-automatically.
-% \begin{macrocode}
-\def\xxref#1#2{%
- {\expandafter\ifx\csname the@label#1\endcsname
- \relax \expandafter\let\csname the@label#1\endcsname\zz@@@\fi
- \expandafter\ifx\csname the@label#2\endcsname \relax
- \expandafter\let\csname the@label#2\endcsname\zz@@@\fi
- \linenum{\csname the@label#1\endcsname|%
- \csname the@label#2\endcsname}}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\makelabel}
-% Sometimes the "\label" command cannot be used to specify
-% exactly the page and line desired; you can use the "\makelabel" macro
-% make your own label. For example, if you say
-% ``"\makelabel{elephant}{10|25|0}"'' you will have created a
-% new label, and a later call to "\pageref{elephant}" would
-% print ``10'' and "\lineref{elephant}" would print ``25''.
-% The sub-line number here is zero.
-% "\makelabel" takes a label, followed by a page and a line number(s)
-% as arguments.
-% \begin{macrocode}
-\def\makelabel#1#2{\expandafter\xdef\csname the@label#1\endcsname{#2}}
-% \end{macrocode}
-% (If you are only going to refer to such a label using
-% "\xxref", then you can omit entries in the same way as with
-% "\linenum" (see pp.\,\pageref{linenumdef} and
-% \pageref{linenumbers}), since "\xxref" makes a call to
-% "\linenum" in order to do its work.)
-% \end{macro}
-%
-%
-% \section{Endnotes}
-% \label{endnotes}\relax
-%
-% \begin{macro}{\@end}
-% \begin{macro}{\ifend@}
-% \begin{macro}{\end@true}
-% \begin{macro}{\end@false}
-% Endnotes of all varieties are saved up in a file, typically named
-% \meta{filename}".end".
-% "\@end" is the output stream number for
-% this file, and "\ifend@" is a flag that's "true" when the file is open.
-% \begin{macrocode}
-\newwrite\@end
-\newif\ifend@
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\end@open}
-% \begin{macro}{\end@close}
-% "\end@open" and "\end@close" are the
-% macros that are used to open and close the endnote file. Note that
-% all our writing to this file is "\immediate": all page and
-% line numbers for the endnotes are generated by the same mechanism
-% we use for the footnotes, so that there's no need to defer any
-% writing to catch information from the output routine.
-% \begin{macrocode}
-\def\end@open#1{\end@true\immediate\openout\@end=#1\relax}
-\def\end@close{\end@false\immediate\closeout\@end}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\end@stuff}
-% "\end@stuff" is used by "\beginnumbering" to
-% do everything that's necessary for the endnotes at the
-% start of each section: it opens the "\@end" file, if necessary,
-% and writes the section number to the endnote file.
-% \begin{macrocode}
-\def\end@stuff{%
- \ifend@\relax\else
- \end@open{\jobname.end}%
- \fi
- \immediate\write\@end{\string\@section{\the\section@num}}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Aendnote}
-% \begin{macro}{\Bendnote}
-% \begin{macro}{\Cendnote}
-% \begin{macro}{\Dendnote}
-% \begin{macro}{\Eendnote}
-% The following five macros each function to
-% write one endnote to the ".end" file. Like the footnotes, these
-% endnotes come in five series, "A" through "E". We change
-% "\newlinechar" so that in the file every space becomes the
-% start of a new line; this generally ensures that a long note doesn't
-% exceed restrictions on the length of lines in files.
-% \begin{macrocode}
-\def\Aendnote#1{{\newlinechar='40
- \immediate\write\@end{\string\Aend%
- {\ifnumberedpar@\@nums\fi}%
- {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Bendnote#1{{\newlinechar='40
- \immediate\write\@end{\string\Bend%
- {\ifnumberedpar@\@nums\fi}%
- {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Cendnote#1{{\newlinechar='40
- \immediate\write\@end{\string\Cend%
- {\ifnumberedpar@\@nums\fi}%
- {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Dendnote#1{{\newlinechar='40
- \immediate\write\@end{\string\Dend%
- {\ifnumberedpar@\@nums\fi}%
- {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces}
-% \end{macrocode}
-% \begin{macrocode}
-\def\Eendnote#1{{\newlinechar='40
- \immediate\write\@end{\string\Eend%
- {\ifnumberedpar@\@nums\fi}%
- {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\Aend}
-% \begin{macro}{\Bend}
-% \begin{macro}{\Cend}
-% \begin{macro}{\Dend}
-% \begin{macro}{\Eend}
-% \begin{macro}{\endprint}
-% \begin{macro}{\@gobblethree}
-% \begin{macro}{\@section}
-% "\Aendnote" and the like write commands called "\Aend" and
-% so on to the endnote file; these are analogous to the various
-% "footfmt" commands above, and they take the same arguments.
-% When we process this file, we'll want to pick out the notes of one
-% series and ignore all the rest. To do that, we equate the "end"
-% command for the series we want to "\endprint", and leave the
-% rest equated to "\@gobblethree", which just skips over its three
-% arguments. The "\endprint" here is nearly identical in its
-% functioning to "\normalfootfmt".
-%
-% The endnote file also contains "\@section" commands, which
-% supply the section numbers from the main text; standard "EDMAC" does
-% nothing with this information, but it's there if you want to write
-% custom macros to do something with it.
-% \begin{macrocode}
-\def\endprint#1#2#3{{\notefontsetup{\notenumfont\printlines#1|}%
- \enspace{\select@lemmafont#1|#2}\enskip#3\par}}
-\def\@gobblethree#1#2#3{}
-\let\Aend=\@gobblethree
-\let\Bend=\@gobblethree
-\let\Cend=\@gobblethree
-\let\Dend=\@gobblethree
-\let\Eend=\@gobblethree
-\let\@section=\@gobble
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\doendnotes}
-% "\doendnotes" is
-% the command you use to print one series of endnotes; it
-% takes one argument, the series letter of the note series you want
-% to print.
-% \begin{macrocode}
-\def\doendnotes#1{\end@close
- \begingroup
- \makeatletter
- \expandafter\let\csname #1end\endcsname=\endprint
- \input\jobname.end
- \endgroup}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\noendnotes}
-% You can say "\noendnotes" before the first
-% "\beginnumbering" in your file if you aren't going to be using
-% any of the endnote commands: this will suppress the creation of
-% an ".end" file. If you do have some lingering endnote
-% commands in your file,
-% the notes will be written to your terminal and to the \TeX\ log file.
-% \begin{macrocode}
-\def\noendnotes{\global\let\end@stuff=\relax
- \global\chardef\@end=16 }
-% \end{macrocode}
-% \end{macro}
-%
-% \section{The End}\label{end}
-%
-% At signs are no longer letters.
-% \begin{macrocode}
-\makeatother
-% \end{macrocode}
-%
-% \newpage
-% \appendix
-%
-% \section{Examples}\label{examples}
-%
-% In the following examples, the command "\input edmac.doc" has
-% been included for completeness. This is always safe, since
-% "EDMAC" checks to see if has been loaded before. But, as mentioned
-% above, it is usually more convenient to include the "EDMAC" macros
-% in a pre-digested \TeX\ format file, to be invoked with a command such
-% as "tex &edmac" \meta{filename}.
-%
-% \subsection{General example of features}
-% This made-up example, "features.tex", is included purely to illustrate
-% some of "EDMAC"'s main features. It is hard to find real-world
-% examples that actually use as many layers of notes as this, so we made
-% one up. The example is a bit tricky to read, but close study and
-% comparison with the output (Figure~\ref{features-out}) will be
-% illuminating.
-% \begin{figure}[p]
-% \includegraphics{features}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Output from {\tt features.tex}.}
-% \label{features-out}
-% \end{figure}
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \input edmac.doc
-% \hsize 28pc
-% \vsize 35pc
-% \cropsetup{45pc}{35pc}{4pc}{4pc}
-% \headline{Headline \hfil \folio}
-% \footline{Footline \hfil --\folio--\hfil footline}
-%
-% \makeatletter
-% % I'd like a spaced out colon after the lemma:
-% \def\spacedcolon{{\rm\thinspace:\thinspace}}
-% \def\normalfootfmt#1#2#3{%
-% \normal@pars
-% \parindent=0pt \parfillskip=0pt plus 1fil
-% {\notenumfont\printlines#1|}\strut\enspace
-% {\select@lemmafont#1|#2}\spacedcolon\enskip#3\strut\par}
-%
-% % And I'd like the 3-col notes printed with a hanging indent:
-% \def\threecolfootfmt#1#2#3{%
-% \normal@pars
-% \hsize .3\hsize
-% \parindent=0pt
-% \tolerance=5000 % high, but not infinite
-% \raggedright
-% \hangindent1.5em \hangafter1
-% \leavevmode
-% \strut\hbox to 1.5em{\notenumfont\printlines#1|\hfil}\ignorespaces
-% {\select@lemmafont#1|#2}\rbracket\enskip
-% #3\strut\par\allowbreak}
-%
-% % And I'd like the 2-col notes printed with a double colon:
-% \def\doublecolon{{\rm\thinspace::\thinspace}}
-% \def\twocolfootfmt#1#2#3{%
-% \normal@pars
-% \hsize .45\hsize
-% \parindent=0pt
-% \tolerance=5000
-% \raggedright
-% \leavevmode
-% \strut{\notenumfont\printlines#1|}\enspace
-% {\select@lemmafont#1|#2}\doublecolon\enskip
-% #3\strut\par\allowbreak}
-%
-% % And in the paragraphed footnotes, I'd like a colon too:
-% \def\parafootfmt#1#2#3{%
-% \normal@pars
-% \parindent=0pt \parfillskip=0pt plus 1fil
-% {\notenumfont\printlines#1|}\enspace
-% {\select@lemmafont#1|#2}\spacedcolon\enskip
-% #3\penalty-10 }
-% \makeatother
-%
-% % I'd like the line numbers picked out in bold.
-% \let\notenumfont=\eightbf
-% \lineation{page}
-% \linenummargin{inner}
-% \firstlinenum=3 % just because I can
-% \linenumincrement=1
-% \foottwocol{A}
-% \footthreecol{B}
-% \footparagraph{E}
-% % I've changed \normalfootfmt, so invoke it again for C and D notes.
-% \footnormal{C}
-% \footnormal{D}
-%
-% \beginnumbering
-%
-% \pstart
-% This is an \text{example}
-% \Afootnote{eximemple C, D.}/
-% of some text with \text{variant}
-% \Afootnote{alternative, A, B.}/
-% readings recorded as `A' footnotes. From here on, \text{though}
-% \Afootnote{however $\alpha$, $\beta$}/,
-% we shall have \text{`C'}
-% \Bfootnote{B, {\it pace\/} the text}/.
-% \text{For spice, let us mark a longer passage, but give a different
-% lemma for it, so that we don't get a \text{huge}
-% \Dfootnote{vast E, F; note that this is
-% a `D' note to section of text within a longer lemma}/
-% amount of text in a note}\lemma{For spice \dots\ note}
-% \Cfootnote{The note here is type `C'}/.
-% \text{Finally}
-% \Efootnote{in the end X, Y}/,
-% \text{we}
-% \Efootnote{us K}/
-% \text{shouldn't}
-% \Efootnote{ought not to L, M}/
-% \text{forget the}
-% \Efootnote{omit to mention the \S, \P}/
-% \text{paragraphed}
-% \Efootnote{blocked M, N}/
-% \text{notes}
-% \Efootnote{variants HH, KK}/,
-% which are so \text{useful}
-% \Efootnote{truly useful L, P}/
-% when there are \text{a great number of}
-% \Efootnote{many, many (preferably)}/
-% short notes to be \text{recorded}
-% \Efootnote{noted: repetition}/.
-% \pend
-%
-% \pstart
-% This is a second paragraph, giving more {\it \text{examples}
-% \Afootnote{eximples L, M.}/}
-% of text with \text{variant}
-% \Afootnote{alternative, A, B.}/
-% readings recorded as `A' footnotes. From here on, \text{though}
-% \Bfootnote{however $\alpha$, $\beta$}/,
-% we shall have \text{`B'}
-% \Bfootnote{B, as correctly stated in the text}/ notes in the text.
-% \text{For spice, let us mark a longer passage, but give a different
-% lemma for it, so that we don't get a {\it \text{huge}
-% \Dfootnote{vast E, F; note that this is
-% a `D' note to text within a longer lemma.}/}
-% amount of text in a note}\lemma{For spice, \dots\ note}
-% \Cfootnote{This is a rogue note of type `C'.}/.
-% \text{Finally}
-% \Bfootnote{In the end X, Y}/,
-% \text{we}
-% \Bfootnote{we here K}/
-% \text{shouldn't}
-% \Bfootnote{ought not to L, M}/
-% \text{forget the}
-% \Bfootnote{omit to mention the \S, \P}/
-% \text{column}
-% \Bfootnote{blocked M, N}/
-% \text{notes}
-% \Bfootnote{variants H}/,
-% which are so \text{useful}
-% \Bfootnote{very, very useful L, P}/
-% when there are \text{many}
-% \Bfootnote{lots of Z}/
-% short notes to be \text{recorded}
-% \Bfootnote{recorded and put down: M (repetition)}/.
-% \pend
-%
-% \endnumbering
-% \bye
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-% \medskip
-%
-% \subsection{Gascoigne}
-% The first real-life example is taken from an edition of George
-% Gascoigne's\index{Gascoigne, George}
-% {\em A Hundreth Sundrie Flowres\/} that is being
-% prepared by G.~W.~Pigman III,\index{Pigman, III$^{rd}$, G. W.} at
-% the California Institute of Technology. Figure \ref{iocasta-out}
-% shows the result of setting the text with "EDMAC".
-% \begin{figure}[p]
-% \includegraphics{iocasta}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Output from {\tt iocasta.tex}.}
-% \label{iocasta-out}
-% \end{figure}
-%
-% The main input file first calls for a file of initial
-% definitions, called "gg.tex". This file, shown below,
-% demonstrates how "EDMAC" macros may be customized to give
-% detailed control over the final format.
-% \medskip
-%
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% % parameters for edition of Gascoigne's
-% % {\it A Hundreth Sundrie Flowres}.
-% \ifx\ggloaded\relax\endinput\else\let\ggloaded=\relax\fi
-% \noendnotes
-% \makeatletter
-% %
-% \font\poemnumfont=cmmi12 \font\titlefont=cmr12 \font\ninerm=cmr9
-% \font\nineit=cmti9 \font\eightrm=cmr8
-% \let\headfont=\eightrm
-% \font\eightit=cmti8 \let\headit=\eightit \font\sixrm=cmr6
-% \font\foliofont=cmmi8 \let\os=\foliofont
-% \let\numlabfont=\foliofont
-% %
-% \firstsublinenum=1000
-% \hoffset=1.25in \voffset=1.25in \hsize=24pc \vsize=488pt
-% %
-% \frenchspacing \parskip=0pt \hyphenpenalty=1000
-% %
-% \def\makeheadline{\vbox to 0pt{\vskip-16.5pt
-% \line{\vbox to8.5pt{}\the\headline}\vss}\nointerlineskip}
-% \nopagenumbers
-% %
-% % Say \nolinenums if you want no line numbers in the notes.
-% \newif\ifnolinenums
-% \def\nolinenums{\global\nolinenumstrue}
-% \def\linenums{\global\nolinenumsfalse}
-% % Say \nopoemnum to suppress poem number in the notes.
-% \newif\ifpoemnum
-% \def\nopoemnum{\global\poemnumfalse}
-% % Say \nodbpoemnum to suppress poem number in the notes for
-% % poems with two numbers, e.g., 64 (v).
-% \newif\ifdbpoemnum
-% \def\nodbpoemnum{\global\dbpoemnumfalse}
-% % Say \noactnum to suppress act/scene numbers in the notes.
-% \newif\ifactnum
-% \def\noactnum{\global\actnumfalse}
-% %
-% \newcount\poemnumber
-% \def\poem#1{\poemnumber=#1\poemnumtrue\parindent=0pt
-% \centerline{{\poemnumfont#1}}\vskip12pt}
-% %
-% \newcount\dbpoemnumone \newcount\dbpoemnumtwo
-% \def\dbpoem#1#2{\dbpoemnumtrue\dbpoemnumone=#1\dbpoemnumtwo=#2
-% \parindent=0pt\par
-% \centerline{{\poemnumfont#1} {\titlefont
-% (\romannumeral#2)}}\nointerlineskip \vskip12pt}
-% %
-% \newcount\actnumber \newcount\scenenumber
-% \def\act #1 #2 #3{\actnumtrue\actnumber=#1\scenenumber=#2
-% \parindent=0pt\vskip24pt plus12pt minus3pt\hrule height0pt\relax
-% \pstart\startsub\centerline{\rm#3}\pend\endsub
-% \mark{{\os#1\fullstop #2}}\nobreak \vskip 12pt plus3pt minus3pt}
-% %
-% \def\rightlinenum{\ifbypage@\ifnum\line@num<10\kern.5em\fi\else
-% \ifnum\line@num<10\kern1em\else\ifnum\line@num<100
-% \kern.5em\fi\fi\fi\kern.5em\numlabfont\the\line@num
-% \ifnum\subline@num>0:\the\subline@num\fi}
-% \def\leftlinenum{\numlabfont\the\line@num
-% \ifnum\subline@num>0:\the\subline@num\fi \kern.5em}
-% \linenummargin{outer}
-% \lineation{page}
-% \def\ggfootfmt#1#2#3{%
-% \notefontsetup
-% \let\par=\endgraf
-% \rightskip=0pt \leftskip=0pt
-% \parindent=0pt \parfillskip=0pt plus 1fil
-% \ifnolinenums\relax\else
-% \begingroup \os \panums \printlines#1|\endgroup
-% \enskip
-% \fi
-% {\rm #2\def\@tempa{#2}\ifx\@tempa\empty
-% \else]\enskip\fi#3\penalty-10 }}
-% %
-% % \panums adds the poem number or act/scene number to a
-% % line number display when necessary.
-% %
-% \def\panums{%
-% \ifpoemnum % a poem
-% \the\poemnumber:%
-% \global\poemnumfalse
-% \fi
-% \ifdbpoemnum % a poem with two numbers
-% \the\dbpoemnumone\space
-% {\rm(\romannumeral\the\dbpoemnumtwo).}%
-% \global\dbpoemnumfalse
-% \fi
-% \ifactnum % a play (act/scene)
-% \the\actnumber:\the\scenenumber:%
-% \global\actnumfalse
-% \fi}
-% %
-% % Now reset the \Afootnote parameters and macros:
-% \footparagraph{A}
-% \let\Afootfmt=\ggfootfmt
-% \dimen\Afootins=\vsize
-% \skip\Afootins=3pt plus9pt
-% \def\ggfootstart#1{\vskip\skip\Afootins}
-% \let\Afootstart=\ggfootstart
-% \def\title{\pstart\startsub\let\par=\endtitle}
-% \def\endtitle{\pend\endsub}
-% \def\verseskip{\vskip6pt plus6pt}
-% \def\speaker#1{\pstart\parindent=1em\let\par=\pend
-% {\tenit{#1}}\hbox to 1ex{}\ignorespaces}
-% \def\sen{\leavevmode\lower1ex\hbox{\tenrm''}}
-% \def\senspeak#1{\pstart\obeylines\setbox0=\hbox{\tenrm''}%
-% \leavevmode
-% \lower1ex\copy0\kern-\wd0\hskip1em{\tenit{#1}}%
-% \hbox to1ex{}\ignorespaces}
-% \def\speak#1{\pstart\obeylines\hskip1em{\tenit{#1}}%
-% \hbox to1ex{}\ignorespaces}
-% \def\nospeaker{\parindent=0em\pstart\let\par=\pend}
-% \def\nospeak{\pstart\obeylines}
-% \def\stage#1{\pstart\startsub\parindent=0pt
-% \hangindent=3em\hangafter=0
-% {\tenit#1}\let\par=\endstage}
-% \let\endstage=\endtitle
-% \def\motto#1{\pstart\startsub\centerline{{\tenit#1}}\pend\endsub}
-% \def\finis#1{\pstart\startsub\smallskip\centerline{{\tenit#1}}
-% \let\par=\endfinis}
-% \let\endfinis=\endtitle
-% \def\initials#1{\pstart\line{\hfil{\it #1}\quad}\let\par=\pend}
-% \makeatother
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-% \medskip
-%
-% With these definitions, the actual input file,
-% "iocasta.tex", is relatively simple:
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \input edmac.doc
-% \input gg
-% \parindent=0pt
-% \pageno=73
-% \mark{{\os2:1}}
-% \headline={\ifnum\pageno>61\ifodd\pageno
-% \rlap{\foliofont\botmark}\hfil\headfont
-% IOCASTA\hfil\llap{\foliofont\folio}%
-% \else
-% \rlap{\foliofont\folio}\hfil\headfont
-% IOCASTA\hfil\llap{\foliofont\botmark}\fi
-% \else\hfil\fi}
-%
-% \beginnumbering
-%
-% \stage{Oedipus \text{entreth}\Afootnote{{\it intrat} MS}/.}
-%
-% \nospeak
-% Or that with wrong the right and doubtlesse heire,
-% Shoulde banisht be out of his princely seate.
-% Yet thou O queene, so fyle thy sugred toung,
-% And with suche counsell decke thy mothers tale,
-% That peace may bothe the brothers heartes inflame,
-% And rancour yelde, that erst possest the same.
-% \pend
-%
-% \speak{Eteocl.} Mother, beholde, youre hestes for to obey,
-% In person nowe am I resorted hither:
-% In haste therefore, fayne woulde I knowe what cause
-% With hastie speede, so moued hath your mynde
-% To call me nowe so causelesse out of tyme,
-% When common wealth moste craues my onely ayde:
-% Fayne woulde I knowe, what queynt commoditie
-% Persuades you thus to take a truce for tyme,
-% And yelde the gates wide open to my foe,
-% The gates that myght our stately state defende,
-% And nowe are made the path of our decay.
-% \pend
-%
-% \senspeak{Ioca.}Represse deare son, those raging stormes of wrath,
-% \sen That so bedimme the eyes of thine intente,
-% \text{\sen As when \text{the}\Afootnote{thie MS}/ tongue %
-% (a redy Instrument)
-% \sen Would \text{fayne pronounce}\Afootnote{faynest tell MS}/ %
-% the meaning of \text{the minde}\Afootnote{thy minde MS}/,
-% \sen \text{It}\lemma{It \dots\ worde.}\Afootnote{Thie %
-% swelling hart puft vp with wicked ire / Can scarce pronounce %
-% one inward louing thought. MS}/ cannot speake one honest %
-% seemely worde.}\lemma{As \dots\ worde.}\Afootnote{{\it not %
-% in\/} \os73}/
-% \sen But when disdayne is shrunke, or sette asyde,
-% \sen And mynde of man with leysure can discourse
-% \sen What seemely woordes his tale may best beseeme,
-% \sen And that the toung vnfoldes without affectes
-% \sen Then may proceede an answere sage and graue,
-% \sen And euery sentence sawst with sobernesse:
-% Wherefore vnbende thyne angrie browes deare chylde,
-% And caste thy rolling eyes none other waye,
-% That here doost not \text{{\it Medusaes\/}}%
-% \Afootnote{One of the furies. {\os75}m}/ face beholde,
-% But him, euen him, thy blood and brother deare.
-% And thou beholde, my {\it Polinices\/} eke,
-% Thy brothers face, wherin when thou mayst see
-% Thine owne image, remember therwithall,
-% That what offence thou woldst to him were done,
-% \pend
-% \endnumbering
-% \bye
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-%
-% \subsection{Shakespeare}
-% The following text illustrates another input file of moderate
-% complexity, with two layers of annotation in use. The example is
-% taken from the Arden {\em Merchant of Venice}.\index{Shakespeare, William}
-% First, the file "arden.sty" contains a set of font
-% definitions and format specifications:
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \makeatletter
-%
-% % Macros for the edition:
-% \def\stage#1{\rlap{\hbox to \the\linenumsep{%
-% \hfil\llap{[{\it#1\/}]}}}}
-% \def\speaker#1{\pstart\hangindent2em\hangafter1
-% \leavevmode{\it#1}\enspace\ignorespaces}
-% \def\\{\hfil\break}
-% \def\exit#1{\hfill\stage{#1}}
-%
-% % EDMAC customizations:
-% \noendnotes \vsize 40pc \hsize 23pc \parindent 0pt
-% \linenumsep=.4in \rightskip\linenumsep
-% \def\interparanoteglue{1em plus.5em minus.1em}
-%
-% \catcode`\<=\active
-% \def\xtext#1#2>{\text{#1}{#2}/}
-% \let<=\xtext
-%
-% \let\numlabfont=\eighti
-% \let\sc=\fiverm
-% \let\Afootnoterule=\relax \let\Bfootnoterule=\relax
-% \footline={\hfil}
-% \def\rightlinenum{\numlabfont\llap{\the\line@num}}
-% \pageno=46
-% \headline={\eightpoint{\teni\folio}\hfil
-% THE MERCHANT OF VENICE\hfil [ACT II}
-% \cropsetup{8in}{5in}{3.5pc}{3pc}
-% \hoffset=.75in \voffset=.9375in
-% \frenchspacing
-%
-% % Footnote formats:
-% % \nonumparafootfmt is a footnote format without line numbers.
-% \def\nonumparafootfmt#1#2#3{%
-% \normal@pars
-% \rightskip=0pt
-% \parindent=0pt \parfillskip=0pt plus 1fil
-% \select@lemmafont#1|#2\rbracket\enskip
-% \it#3\penalty-10 }
-% \def\newparafootfmt#1#2#3{%
-% \normal@pars
-% \parindent=0pt \parfillskip=0pt plus 1fil
-% {\notenumfont\printlines#1|}\fullstop\enspace
-% {\select@lemmafont#1|#2}\rbracket\enskip
-% \it#3\penalty-10 }
-% \def\newtwocolfootfmt#1#2#3{%
-% \normal@pars
-% \hsize .48\hsize
-% \tolerance=5000
-% \rightskip=0pt \leftskip=0pt \parindent=5pt
-% \strut\notenumfont\printlines#1|\fullstop\enspace
-% \it#2\/\rbracket\penalty100\hskip .5em plus .5em
-% \rm#3\strut\goodbreak}
-%
-% % Footnote style selections etc. (done last):
-% \footparagraph{A}
-% \foottwocol{B}
-% \let\Afootfmt=\newparafootfmt
-% \let\Bfootfmt=\newtwocolfootfmt
-% \let\collation=\Afootnote
-% \let\note=\Bfootnote
-% \lineation{section}
-% \linenummargin{right}
-% \makeatother
-% \end{verbatim}
-% \end{small}
-% \begin{figure}[p]
-% \includegraphics{arden}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Output of the Arden text.}
-% \label{arden-out}
-% \end{figure}
-% \medskip
-% \hrule
-% \medskip
-%
-% The Arden text, using the above definitions, is input as follows
-% (the output is shown in Figure \ref{arden-out}):
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \input edmac.doc
-% \input arden.sty
-%
-% % Initially, we don't want line numbers.
-% \let\Afootfmt=\nonumparafootfmt
-%
-% \beginnumbering
-% \pstart
-% \centerline{[<{SCENE III}
-% \lemma{Scene III}
-% \collation{Capell; om. Q, F; {\rm Scene IV} Pope.}>.---%
-% <{\it Venice}
-% \collation{om. Q, F; Shylock's house Theobald; The same.
-% A Room in Shylock's House Capell.}>.]}
-% \pend
-% \bigskip
-%
-% \pstart
-% \centerline{\it Enter\/ {\rm JESSICA} and\/
-% {\rm [<{LAUNCELOT}
-% \lemma{Launcelot}
-% \collation{Rowe; om. Q, F.}>]} the clown.} \pend \bigskip
-%
-% \let\Afootfmt=\newparafootfmt % we do want line numbers from now
-%
-% \setline{0}%
-%
-% \speaker{Jes.}<{I am}
-% \collation{Q, F; {\rm I'm} Pope.}>
-% sorry thou wilt leave my father so,\\
-% Our house is hell, and thou (a merry devil)\\
-% Didst rob it of some taste of tediousness,---\\
-% But fare thee well, there is a ducat for thee,\\
-% And Launcelot, <{soon}
-% \note{early.}>
-% at supper shalt thou see\\
-% Lorenzo, who is thy new master's guest,\\
-% Give him this letter,---do it secretly,---\\
-% And so farewell: I would not have my father\\
-% See me <{in}
-% \collation{Q; om. F.}>
-% talk with thee.
-% \pend
-%
-% \speaker{Laun.}
-% <{}\lemma{\it Laun.}\collation{Q2; Clowne. Q, F.}>%
-% <{Adieu!}
-% \collation{{\rm Adiew}, Q, F.}>
-% tears <{exhibit}
-% \note{Eccles paraphrased ``My tears serve to express what my
-% tongue should, if sorrow would permit it,'' but probably it is
-% Launce\-lot's blunder for prohibit (Halliwell) or inhibit
-% (Clarendon).}>
-% my tongue, most beautiful <{pagan}
-% \note{This may have a scurrilous undertone: cf. {\it 2 H 4,}
-% \sc II. \rm ii. 168.}>%
-% , most sweet <{Jew!}
-% \collation{{\rm Iewe}, Q, F. \quad {\rm do]} Q, F;
-% {\rm did} F2.}>%
-% ---if a Christian <{do}
-% \note{Malone upheld the reading of Qq and F by comparing \sc
-% II. \rm vi. 23: ``When you shall please to play the thieves for
-% wives''; Launcelot seems fond of hinting at what is going to
-% happen (cf. \sc II. \rm v. 22--3). If F2's ``did'' is accepted,
-% {\it get\/} is used for beget, as in \sc III. \rm v. 9.}>
-% not play the knave and get thee, I am much deceived; but <{adieu!}
-% \collation{{\rm adiew}, Q, F.}>
-% these <{foolish drops do \text{something}
-% \collation{Q; {\rm somewhat} F.}/
-% drown my manly spirit}
-% \lemma{foolish{\rm\dots}spirit}
-% \note{``tears do not become a man'' (\it AYL., \sc III. \rm
-% iv. 3); cf. also \it H 5, \sc IV. \rm vi. 28--32.}>%
-% : <{adieu!}
-% \collation{{\rm adiew}. Q, F. \quad {\rm S. D.]} Q2, F; om. Q;
-% after l. 15 Capell.}>
-% \exit{Exit.}
-% \pend
-%
-% \speaker{Jes.}
-% Farewell good Launcelot.\\
-% Alack, what heinous sin is it in me\\
-% To be ashamed to be my father's <{child!}
-% \collation{{\rm child}, Q, F; {\rm Child?} Rowe.}>
-% \pend
-% \endnumbering
-% \bye
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-%
-% \subsection{Classical text edition}
-% The next example, which was extracted from a longer file kindly
-% supplied by Wayne Sullivan,\index{Sullivan, Wayne} University
-% College, Dublin, Ireland, illustrates the use of "EDMAC" to
-% produce a Latin text edition, the {\em Periphyseon}, with Greek
-% passages.\footnote{The bibliographic details of the forthcoming book
-% are: Iohannis Scotti Erivgenae, {\it Periphyseon} ({\it De
-% Diuisione Naturae\/}) Liber Qvartvs [Scriptores Latini Hiberniae
-% vol.\,xii], (Dublin: School of Celtic Studies, Dublin Institute
-% for Advanced Studies, forthcoming 1992).} The Greek font used is
-% that prepared by Silvio Levy\index{Levy, Silvio} and described in {\em
-% TUGboat}.\footnote{{\em TUGboat\/} {\bf 9} (1988), pp.\,20--24.} The
-% output of this file is shown in Figure~\ref{periphyseon-out}.
-% Note the use of two layers of footnotes to record testimonia and
-% manuscript readings respectively.
-%
-% \begin{figure}[p]
-% \includegraphics{periph4}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Output of the {\em Periphyseon, Liber IV}.}
-% \label{periphyseon-out}
-% \end{figure}
-%
-% The following "EDMAC" customizations are loaded initially, as
-% file "slhh.tex":
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \overfullrule0 pt
-% \hsize=25pc
-% \vsize=44pc
-% \lefthyphenmin=3
-% %\overfullrule=0pt
-% \input greekmac
-% \greekdelims
-% \input edmac.doc
-% \makeatletter
-% \newbox\lp@rbox
-% % We need an addition to \no@expands since the \active $ in greekmac
-% % causes problems:
-% \def\morenoexpands{\let$=0}
-%
-% \def\ffootnote#1{%
-% \ifnumberedpar@
-% \xright@appenditem{\noexpand\vffootnote{f}{{\@nums}{\@tag}{#1}}}%
-% \to\inserts@list
-% \global\advance\insert@count by 1
-% % \else %% may be used only in numbered text
-% % \vffootnote{f}{{0|0|0|0|0|0|0}{}{#1}}%
-% \fi\ignorespaces}
-% \def\gfootnote#1{%
-% \ifnumberedpar@
-% \xright@appenditem{\noexpand\vgfootnote{g}{#1}}%
-% \to\inserts@list
-% \global\advance\insert@count by 1
-% % \else %% may be used only in numbered text
-% % \vgfootnote{g}{#1}%
-% \fi\ignorespaces}
-% \def\raggedleft{\leftskip\z@% This is a hack; doubtless there are better ways.
-% plus5em\spaceskip.3333em\xspaceskip.5em\parfillskip\z@\relax}
-% \def\setlp@rbox#1#2#3{%
-% {\parindent\z@\hsize=2.5cm\raggedleft\eightpoint
-% \baselineskip 9pt%
-% \global\setbox\lp@rbox=\vbox to\z@{\vss#3}}}
-% \def\vffootnote#1#2{\setlp@rbox#2}
-% \def\vgfootnote#1#2{\def\rd@ta{#2}}
-% \def\do@line{%
-% {\vbadness=10000 \splittopskip=0pt
-% \gdef\rd@ta{}% for right margin paragraph->always a few characters
-% \global\setbox\one@line=\vsplit\raw@text to\baselineskip}%
-% \unvbox\one@line \global\setbox\one@line=\lastbox
-% \getline@num
-% \hbox to\hsize{\affixline@num\add@inserts\hbox to\z@% inserts added here so
-% {\hss\box\lp@rbox\kern\linenumsep}% that margin pars are
-% \hfil\hbox to\wd\one@line{\new@line\unhbox\one@line% included.
-% \hbox to\z@{\kern\linenumsep\notenumfont\rd@ta\hss}}}%
-% \add@penalties} % margin pars also included in line format
-% \def\affixline@num{%
-% \ifsublines@
-% \@tempcntb=\subline@num
-% \ifnum\subline@num>\firstsublinenum
-% \@tempcnta=\subline@num
-% \advance\@tempcnta by-\firstsublinenum
-% \divide\@tempcnta by\sublinenumincrement
-% \multiply\@tempcnta by\sublinenumincrement
-% \advance\@tempcnta by\firstsublinenum
-% \else
-% \@tempcnta=\firstsublinenum
-% \fi
-% %
-% \ifcase\sub@lock
-% \or
-% \ifnum\sublock@disp=1
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \or
-% \ifnum\sublock@disp=2 \else
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \or
-% \ifnum\sublock@disp=0
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \fi
-% \else
-% \@tempcntb=\line@num
-% \ifnum\line@num>\firstlinenum
-% \@tempcnta=\line@num
-% \advance\@tempcnta by-\firstlinenum
-% \divide\@tempcnta by\linenumincrement
-% \multiply\@tempcnta by\linenumincrement
-% \advance\@tempcnta by\firstlinenum
-% \else
-% \@tempcnta=\firstlinenum
-% \fi
-% \ifcase\@lock
-% \or
-% \ifnum\lock@disp=1
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \or
-% \ifnum\lock@disp=2 \else
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \or
-% \ifnum\lock@disp=0
-% \@tempcntb=0 \@tempcnta=1
-% \fi
-% \fi
-% \fi
-% %
-% \ifnum\@tempcnta=\@tempcntb
-% \@tempcntb=\line@margin
-% \ifnum\@tempcntb>1
-% \advance\@tempcntb by\page@num
-% \fi
-% \ifodd\@tempcntb
-% % #1\rlap{{\rightlinenum}}%
-% \xdef\rd@ta{\the\line@num}%
-% \else
-% \llap{{\leftlinenum}}%#1%
-% \fi
-% \else
-% %#1%
-% \fi
-% \ifcase\@lock
-% \or
-% \global\@lock=2
-% \or \or
-% \global\@lock=0
-% \fi
-% \ifcase\sub@lock
-% \or
-% \global\sub@lock=2
-% \or \or
-% \global\sub@lock=0
-% \fi}
-% %
-% % We want to include a small Greek font in the definition
-% % of \eightpoint:
-% \let\oldeightpoint=\eightpoint
-% \font\eightgr=grreg8
-% \def\eightpoint{\oldeightpoint\let\tengr=\eightgr}
-% \output{\advancepageno\edmac@output} % even page numbers
-% \lineation{page}
-% \linenummargin{right}
-% \footparagraph{A}
-% \footparagraph{B}
-% \let\notenumfont=\eightrm
-% \let\notetextfont=\eightpoint
-% \let\Afootnoterule=\relax
-% \count\Afootins=825
-% \count\Bfootins=825
-% \def\Aparafootfmt#1#2#3{%
-% \normal@pars\eightpoint
-% \parindent=0pt \parfillskip=0pt plus1fil
-% \notenumfont\printlines#1|\enspace
-% % \lemmafont#1|#2\enskip
-% \notetextfont
-% #3\penalty-10\hskip 1em plus 4em minus.4em\relax}
-% \def\Bparafootfmt#1#2#3{%
-% \normal@pars\eightpoint
-% \parindent=0pt \parfillskip=0pt plus1fil
-% \notenumfont\printlines#1|\enspace
-% \select@lemmafont#1|#2\rbracket\enskip
-% \notetextfont
-% #3\penalty-10\hskip 1em plus 4em minus.4em\relax }
-% \makeatother
-% \let\Afootfmt=\Aparafootfmt
-% \let\Bfootfmt=\Bparafootfmt
-% \def\lemmafont#1|#2|#3|#4|#5|#6|#7|{\eightpoint}
-% \headline={\hfil\tenit Periphyseon, Liber IV\hfil}
-% \voffset=1in
-% \hoffset=1in
-% \parindent=1em
-% \def\lmarpar#1{\text{}\ffootnote{#1}/}
-% \def\rmarpar#1{\text{}\gfootnote{#1}/}
-% \emergencystretch40pt
-% \cropsetup{24.5cm}{15.5cm}{1.5cm}{2.1cm}
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-% \medskip
-%
-% The file "periph4.tex" then inputs the above definitions, and
-% proceeds with the main text:
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% \input slhh
-%
-% \beginnumbering
-% \pstart
-% \rmarpar{741C}
-% \noindent \text{Incipit Quartus $PERIFUSEWN$}%
-% \lemma{incipit\ .~.~.\ $PERIFUSEWN$}\Bfootnote{{\it om.\ R},
-% incipit quartus {\it M}}/
-% \pend
-% \medskip
-%
-% \pstart
-% \noindent \text{NVTRITOR}\lemma{$ANAKEFALIOSIS$}\Bfootnote{{\it
-% FJP, lege\/} $<anakefala'iwsis$}/.\lmarpar{$ANAKEFALIOSIS$
-% NATVRARVM} Prima nostrae
-% \text{Physiologiae}\lemma{physiologiae}\Bfootnote{phisiologiae
-% {\it P}, physeologiae {\it R}}/ intentio praecipuaque mat\-e\-ria
-% erat \text{quod}\Bfootnote{{\it p}.\ natura {\it transp.\ MR}}/
-% \text{$UPEROUSIADES$}\Bfootnote{{\it codd.\ Vtrum\/}
-% $<uperousi'wdhs$ (hoc est superessentialis) natura {\it cum Gale
-% (p.160) an\/} $<uperousi'oths$ (hoc est superessentialis natura)
-% {\it cum Floss (PL 122,741C) intelligendum sit, ambigitur}}/ (hoc
-% est superessentialis) natura sit causa creatrix existentium et
-% non existentium omnium, a nullo creata, unum principium, una
-% origo, unus et uniuersalis uniuersorum fons, a nullo manans, dum
-% ab eo manant omnia, trinitas coessentialis in tribus substantiis,
-% $ANARQOS$ (hoc est sine principio), principium et finis, una
-% bonitas, deus unus, \text{$OMOUSIOS$}\Bfootnote{{\it codd.,
-% lege\/} $<omoo'usios$}/ \text{et}\lemma{{\bf et}}\Bfootnote{{\it
-% R}\math^{\rm 1}\math, {\it om.\ R}\math^{\rm 0}\math}/
-% $UPEROUSIOS$ (id est coessentialis et superessentialis). Et, ut
-% ait sanctus Epifanius, episcopus Constantiae Cypri, in
-% \text{$AGKURATW$}\Bfootnote{anchurato {\it MR}}/ sermone \text{de
-% fide}\Bfootnote{Glo\math\langle\math ssa\math\rangle\math: Ita
-% enim uocatur sermo eius de fide $AGKURATOS$, id est procuratus
-% {\it mg.\ add.\ FJP}}/: {\it Tria sancta, tria consancta, tria
-% \text{agentia}\Bfootnote{actiua {\it MR}}/, tria coagentia, tria
-% \text{formantia}\Bfootnote{formatiua {\it MR}}/, tria
-% conformantia, tria \text{operantia}\Bfootnote{operatiua {\it
-% MR}}/, tria cooperantia, tria subsistentia, tria}\rmarpar{742C}
-% {\it consubsistentia sibi inuicem coexistentia. Trinitas haec
-% sancta uocatur: tria existentia, una consonantia, una deitas
-% \text{eiusdem}\Bfootnote{eiusdemque {\it M}}/ essentiae,
-% \text{eiusdem uirtutis, eiusdem
-% \text{subsistentiae}{\Bfootnote{substantiae {\it R}}}/}%
-% \Bfootnote{{\it om.\ M}}/, similia \text{similiter}\Bfootnote{ex
-% simili {\it MR}}/ aequalitatem gratiae operantur patris et filii
-% et sancti spiritus. Quomodo autem \text{sunt}\Bfootnote{{\it om.\
-% M}}/, ipsis relinquitur docere: \text{`Nemo enim nouit patrem
-% nisi filius, neque filium nisi pater, et cuicumque filius
-% reuelauerit'}\Afootnote{Matth.\ 11, 27}/; reuelatur autem per
-% spiritum sanctum. Non ergo haec tria existentia aut ex ipso aut
-% per ipsum aut ad ipsum in unoquoque digne intelliguntur,
-% \math\mid\! R, 264^{\rm r}\!\mid\math\ sicut ipsa reuelant:\/}
-% $FWS, PUR, PNEUMA$ \text{(hoc est lux, ignis,
-% spiritus)}\Afootnote{EPIPHANIVS, {\it Ancoratus\/} 67; PG~43,
-% 137C--140A; GCS 25, p.~82, 2--12}/.
-% \pend
-%
-% \pstart
-% Haec, ut dixi, ab Epifanio tradita, ut quisquis interrogatus quae
-% tria et quid unum in sancta trinitate debeat credere, sana fide
-% \math\!\mid J, 1^{\rm v}\!\mid\math\ respondere ualeat, aut ad
-% fidem accedens\rmarpar{743A} sic erudiatur. Et mihi uidetur
-% spiritum pro calore posuisse, quasi dixisset in similitudine:
-% lux, ignis, calor. Haec enim tria unius essentiae sunt. Sed cur
-% lucem primo dixit, non est mirum. Nam et pater lux est et ignis
-% et calor; et filius est lux, ignis, calor; et \text{spiritus
-% sanctus}\Bfootnote{sanctus spiritus {\it R}}/ lux, ignis, calor.
-% Illuminat enim pater, illuminat filius, illuminat spiritus
-% sanctus: ex ipsis enim omnis scientia et sapientia donatur.
-% \pend
-% \endnumbering
-% \bye
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-%
-% \subsection{Arabic text edition}
-% Recent developments in Klaus Lagally's\index{Lagally, Klaus} Arab\TeX\
-% package have meant that
-% now Arab\TeX\ and "EDMAC" can work smoothly together.\footnote{These
-% changes are available in versions of Arab\TeX\ from 2.08,
-% March/April 1993\@. The Arab\TeX\ system is available from its author's
-% institution (by anonymous "ftp" from
-% "<URL ftp://ifi.informatik.uni-stuttgart.de/pub/arabtex/>"
-% and from many other network sites.} This will
-% be welcome news indeed to all frustrated editors of Arabic texts!
-%
-% As a taster, Klaus has kindly supplied Figure \ref{arabtex}, a test page
-% which shows off the joint capabilities of Arab\TeX\ and "EDMAC".
-%
-% \begin{figure}[p]
-% \includegraphics{arabic}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Arabic edition of some instructions for using a post office.}
-% \label{arabtex}
-% \end{figure}
-%
-% \subsection{Sanskrit text edition}
-% Finally, Figure \ref{vyadi} shows an example from an edition of a
-% Sanskrit text on P\=a\d ninian grammar that uses Frans
-% Velthuis's\index{Velthuis, Frans} excellent Devan\=agar\=\i\
-% font.\footnote{Now published as Dominik Wujastyk, {\em Metarules
-% of P\=a\d{n}inian Grammar: The {\em
-% Vy\=a\d{d}\=\i ya\-paribh\=a\d{s}\=a\-v\d{r}tti\/}
-% critically edited with translation and commentary\/} 2 vols.\
-% (Groningen: Forsten, 1993).}
-%
-% I have not shown the input file for this because I almost
-% never looked at it myself. The edition records a large number of
-% variants, and there are frequent font and script changes.
-% Preparing this purely manually would have been very error-prone.
-% In fact, the text was prepared using a word processor (XyWrite
-% III+) which had the ability to fold footnotes out of sight. I
-% designed custom Indic fonts for my computer screen, so that I
-% could see all the diacritical marks on accented characters as I
-% typed.
-%
-% \begin{figure}[p]
-% \includegraphics{sanskrit}
-% \vspace*{\textheight} ^^A supply artwork
-% \vspace*{-3\baselineskip}
-% \caption{Sanskrit edition of a grammatical text.}
-% \label{vyadi}
-% \end{figure}
-%
-% Font changes were invoked visually using the standard
-% facilities of the word processor, so the perennial ``missing
-% closing brace'' hardly ever arose. A short text filter
-% program changed the word processor file into correctly tagged
-% "EDMAC" input, and another filter program (provided by
-% Velthuis) did some special processing on the Devan\=agar\=\i\
-% strings. This combination of tools proved very workable and no
-% major problems were encountered.
-%
-% The following "EDMAC" customizations are typical of the sort
-% of changes needed to use Sanskrit with the Devan\=agar\=\i\ font:
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \label{fam-fiddle}
-% \begin{verbatim}
-% @dolmode3 % for the Devanagari pre-processor
-% \input dnmacs.tex % special macros for Devanagari font
-% \input edmac.doc
-% %
-% \makeatletter
-% %
-% \def\notefontsetup{\eightpoint\dnsmall\dn}
-% \footparagraph{A}
-% \firstlinenum=1
-% \def\variant#1#2{\text{#1}\Afootnote{#2}/}
-% %
-% % Now we set up \select@lemmafont to recognize Sanskrit:
-% %
-% \newfam\skt % \fam 8 (plain.tex defines 0--7; TeXbook p.351.)
-% \def\san{\fam\skt \dn}
-% \def\select@lemmafont#1|#2|#3|#4|#5|#6|#7|{%
-% \ifcase#7
-% \rm \or \rm \or \rm \or \rm % fams 0--3
-% \or \it \or \sl \or \bf \or \tt % fams 4--7
-% \or \san % Devanagari for \fam 8
-% \else \rm
-% \fi}
-% %
-% \makeatother
-% %
-% % And then the text:
-% $ % for the Devanagari pre-processor
-% \beginnumbering
-% \san
-% \autopar
-%
-% aasiidraajaa \variant{nalo}{ki.mcidanyat ka, kha} naama
-% viirasenasuto balii|
-%
-% \endnumbering
-% $ % for the Devanagari pre-processor
-% \bye
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-% \medskip
-%
-% \label{multinotes}
-% You may have noticed that in the apparatus of the Sanskrit edition shown
-% in figure~\ref{vyadi}, the line numbers are printed only once, even if
-% there are several variants on a line. Multiple notes to the same line
-% are separated by a $\parallel$ sign. We mentioned on
-% p.\,\pageref{parallel} above how, in principle, this could be done. Here
-% is the modified version of "\printlines" that actually does it (the
-% original is on p.\,\pageref{printlines} above).
-%
-% \medskip
-% \hrule
-% \medskip
-% \begin{small}
-% \begin{verbatim}
-% % First, define the symbol that will print instead of a repeated line
-% % number:
-% %
-% \def\notenumsep{$\parallel$}
-% %
-% % Now the macro which prints the line numbers for a note.
-% % It is modified here so that notes to the same line do not repeat
-% % the line number, but print a "||" instead.
-% %
-% % Just a reminder that the seven parameters of the
-% % argument are the line numbers as stored in "\@nums":
-% % #1 the starting page,
-% % #2 line, and
-% % #3 subline numbers, followed by the
-% % #4 ending page,
-% % #5 line, and
-% % #6 subline numbers, and then the
-% % #7 font-family number for the lemma.
-% %
-% % Although there's no counter for the line number, because it's always
-% % printed, we define a counter that keeps track of the previously printed
-% % line number, so that we can stop line numbers being repeated in the
-% % notes if they are all the same.
-% %
-% \newcount\previous@note@number
-% %
-% % The beginning of the \printlines macro is just the same as the original
-% % defined by EDMAC (q.v. for commentary):
-% %
-% \def\printlines#1|#2|#3|#4|#5|#6|#7|{\begingroup
-% \@pnum=0 \@dash=0
-% \ifbypage@
-% \ifnum#4=#1 \else
-% \@pnum=1
-% \@dash=1
-% \fi
-% \fi
-% \@elin=\@pnum
-% \ifnum#2=#5 \else
-% \@elin=1
-% \@dash=1
-% \fi
-% \@ssub=0
-% \ifnum#3=0 \else
-% \@ssub=1
-% \fi
-% \@esl=0
-% \ifnum#6=0 \else
-% \ifnum#6=#3
-% \@esl=\@elin
-% \else
-% \@esl=1
-% \@dash=1
-% \fi
-% \fi
-% %
-% % Here come our modifications. We're ready to print the various numbers,
-% % based on our counter values, but the first thing we do is to compare the
-% % current line number (parameter #2) with the last line number to have
-% % been printed. If they are the same, we print the \notenumsep siglum; if
-% % not, we go ahead and print the actual line number. (Note that this does
-% % not cope with cases of multiple sub-line numbered notes to the same
-% % line; more checks would be needed if that situation were likely to
-% % arise.)
-%
-% \ifnum\previous@note@number = #2
-% \ifodd\@elin % there is a different ending line number
-% #2%
-% \else
-% \notenumsep
-% \fi
-% \else
-% \ifodd\@pnum #1\fullstop\fi
-% #2% The (starting) line number
-% \fi
-% \ifodd\@ssub \fullstop #3\fi
-% \ifodd\@dash \endashchar\fi
-% \ifodd\@pnum #4\fullstop\fi
-% \ifodd\@elin #5\fi
-% \ifodd\@esl \ifodd\@elin\fullstop\fi #6\fi
-% %
-% % Now we record the number that has been printed, for comparison
-% % next time \printlines is called:
-% %
-% \global\previous@note@number=#2
-% %
-% \endgroup}
-% \end{verbatim}
-% \end{small}
-% \medskip
-% \hrule
-% \medskip
-% \Finale
-% \endinput
-\endinput
-
diff --git a/Master/texmf-dist/doc/latex/edmac/edstanza.doc b/Master/texmf-dist/doc/latex/edmac/edstanza.doc
deleted file mode 100644
index 0e743caacad..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/edstanza.doc
+++ /dev/null
@@ -1,242 +0,0 @@
-
-\def\fileversion{0.01}
-\def\filedate{92/6/25}
-\def\docdate {92/6/25}
-
-%% \CheckSum{191}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
-%
-%
-%\iffalse % This is a META comment
-%
-% File `edstanza.doc'.
-% Copyright (C) 1992 Wayne G. Sullivan, all rights reserved.
-%
-% Copying of this file is authorized only if either
-% (1) you make absolutely no changes to your copy, or
-% (2) you use a different name for your modified file.
-%
-%
-% Error reports (unmodified files only):
-% Department of Mathematics
-% University College
-% Dublin 4, Ireland
-% Bitnet: <WSULIVAN@IRLEARN>
-%
-%
-%\fi
-%
-%
-% \title{The file {\tt edstanza.doc}\thanks{This file has version
-% number \fileversion, dated \filedate. The documentation was
-% last updated on \docdate.}.}
-%
-% \author{Wayne G. Sullivan}
-%
-% \maketitle
-%
-% \StopEventually{}
-% \section{Stanzas using EDMAC}
-% The {\sc edmac} macro package of John Lavagnino and Dominik Wujastyk
-% provides a framework for preparing critical editions using \TeX\null.
-% This document contains some additional macros specifically for
-% handling poetry stanzas which use indentation to indicate rhyme or
-% metre. The macros are designed to handle the case in which a line of
-% verse requires more than one print line.
-% The macros are an adjunct to {\sc edmac}, so
-% we check to see if it is loaded.
-% \begin{macrocode}
- \ifx\edmacloaded\relax\else
- \errmessage{EDSTANZA requires EDMAC.}\endinput\fi
-% \end{macrocode}
-%
-% \begin{macro}{\stanza@count}
-% \begin{macro}{\stanzaindentbase}
-% Before we can define the main macros we need to save and reset
-% some category codes. To save the current values we use
-% \verb+\next+ and \verb+\body+ from the \verb+\loop+ macro.
-% \begin{macrocode}
- \chardef\body=\catcode`\@
- \catcode`\@=11
- \chardef\next=\catcode`\&
- \catcode`\&=\active
-% \end{macrocode}
-% A count register is allocated for counting lines in a stanza; also allocated
-% is a dimension register which is used to specify the base value for
-% line indentation; all stanza indentations are multiples of this
-% value. The default value of \verb+\stanzaindentbase+ is 20pt.
-% \begin{macrocode}
- \newcount\stanza@count
- \newdimen\stanzaindentbase
- \stanzaindentbase=20pt
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\strip@szacnt}
-% \begin{macro}{\setstanzavalues}
-% The indentations of stanza lines are non-negative integer multiples of the
-% unit called
-% \verb+\stanzaindentbase+. To make it easier for the user to specify these
-% numbers, some list macros are defined. These take numerical values
-% in a list separated by commas and assign the values to special control
-% sequences using \verb+\mathchardef+. Though this does limit the range
-% from 0 to 32767, it should suffice for most applications,
-% including {\em penalties}, which will be discussed below.
-% \begin{macrocode}
-\def\strip@szacnt#1,#2|{\def\@tempb{#1}\def\@tempa{#2|}}
-\def\setstanzavalues#1#2{\def\@tempa{#2,,|}%
- \stanza@count\z@
- \def\next{\expandafter\strip@szacnt\@tempa
- \ifx\@tempb\empty\let\next\relax\else
- \expandafter\mathchardef\csname #1@\number\stanza@count
- @\endcsname\@tempb\relax
- \advance\stanza@count\@ne\fi\next}%
- \next}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\stanza@line}
-% \begin{macro}{\stanza@hang}
-% \begin{macro}{\sza@penalty}
-% Now we arrive at the main works. \verb+\stanza@line+ sets the
-% indentation for the line and starts a numbered paragraph---each
-% line is treated as a paragraph. \verb+\stanza@hang+ sets the
-% hanging indentation to be used if the stanza line requires
-% more than one print line. If it is known that each stanza line
-% will fit on one print line, it is advisable to set the
-% hanging indentation to zero. \verb+\sza@penalty+ places the
-% specified penalty following each stanza line. By default, this
-% facility is turned off so that no penalty is included. However,
-% the user may initiate these penalties to indicate good and bad
-% places in the stanza for page breaking.
-% \begin{macrocode}
-\def\stanza@line{\parindent=\csname sza@\number\stanza@count
- @\endcsname\stanzaindentbase
- \pstart\stanza@hang\ignorespaces}
-\xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock
- \hangindent\expandafter
- \noexpand\csname sza@0@\endcsname\stanzaindentbase
- \hangafter\@ne}
-\def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname
- \ifnum\count@>\@M\advance\count@-\@M\penalty-\else
- \penalty\fi\count@}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\stanza}
-% \begin{macro}{\endstanzaextra}
-% Now we have the components of the \verb+\stanza+ macro,
-% which appears at the start of a group of lines. This macro
-% initializes the count and checks to see if hanging indentation
-% and penalties are to be included. Hanging indentation suspends
-% the line count, so that the enumeration is by verse line
-% rather than by print line. If the print line count is desired,
-% invoke \verb+\let\startlock=\relax+ and do the same for
-% \verb+\endlock+. Here and above we have used \verb+\xdef+ to
-% make the stored macros take up a bit less space, but it also
-% makes them more obscure to the reader. Lines of the stanza are
-% delimited by ampersands \&. The last line of the stanza must
-% end with \verb+\&+. For convenience the macro
-% \verb+\endstanzaextra+ is incuded. The user may use this to add
-% vertical space or penalties between stanzas.
-% \begin{macrocode}
-\let\endstanzaextra\relax
-\xdef\stanza{\begingroup\catcode`\&\active\global\stanza@count\@ne
- \noexpand\ifnum\expandafter\noexpand
- \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax
- \let\noexpand\endlock\relax\noexpand\else\interlinepenalty
- \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum
- \expandafter\noexpand\csname szp@0@\endcsname=\z@
- \let\noexpand\sza@penalty\relax\noexpand\fi \def\noexpand&{%
- \noexpand\endlock\noexpand\pend\noexpand\sza@penalty\global
- \advance\stanza@count\@ne\noexpand\stanza@line}\def\noexpand
- \&{\noexpand\endlock\noexpand\pend\endgroup\endstanzaextra}%
- \noexpand\stanza@line}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\ampersand}
-% The ampersand \& is used to mark the end of each stanza line, except the
-% last, which is marked with \verb+\&+. This means that \verb+\halign+ may
-% not be used directly within a stanza line. This does not affect macros
-% involving alignments defined outside \verb+\stanza \&+. Since these
-% macros usurp the control sequence \verb+\&+, the replacement
-% \verb+\ampersand+ is defined to be used if this symbol is needed in a
-% stanza. Also we reset the modified category codes and initialize the
-% penalty default.
-% \begin{macrocode}
- \catcode`\&=\next
- \catcode`\@=\body
- \let\ampersand=\&
- \setstanzavalues{szp}{0}
- \endinput
-% \end{macrocode}
-% \end{macro}
-% \section{Indentations in Stanzas}
-% In order to use the stanza macros, one must set the indentation values.
-% First the value of \verb+\stanzaindentbase+ should be set,
-% unless the default value 20pt is desired.
-% Every stanza line indentation is a multiple of this. To specify these
-% multiples one invokes, {\it e.g.,} \verb+\setstanzavalues{sza}{3,1,2,1,2}+.
-% The numerical entries must be whole numbers, 0 or greater, separated by
-% commas without embedded spaces. There
-% must be one more entry than there are lines in the stanza. The first entry
-% gives the hanging indentation to be used if the stanza line requires more
-% than one print line. If it is known that each stanza line will fit on
-% a single print line, then this first entry should be 0; \TeX\ does less
-% work in this case, but no harm ensues if the hanging indentation is not
-% 0 but is never used. Enumeration is by stanza lines, not by print lines.
-% In the above example the lines are indented one unit, two units, one unit,
-% two units, with 3 units of hanging indentation in case a stanza line is too
-% long to fit on one print line. Make sure you have at least one more numerical
-% entry in \verb+\setstanzavalues+ than the number of lines in the stanza.
-% The macros make no restriction on the number of lines in a stanza.
-% Stanza indentation values (and penalty values) obey \TeX's grouping
-% conventions, so if one stanza among several has a different structure,
-% its indentations (penalties) may be set within a group; the prior values
-% will be restored when the group ends.
-%
-% \section{Penalties in Stanzas}
-% When the stanzas run over several pages, often it is
-% desirable that page breaks should arise between certain lines in the
-% stanza, so a facility for including penalties after stanza lines is
-% provided. If you are satisfied with the page breaks, you need not set the
-% penalty values. The command
-% \verb+\setstanzavalues{szp}{1,5000,10100,5000,0}+ results in a penalty of
-% 5000 being placed after the first and third lines of the stanza, and a
-% penalty of ${-100}$ after the second. The first entry ``1'' is a control
-% value. If it is zero, then no penalties are passed on to \TeX\null,
-% which is the default. Values between 0 and 10000 are penalty
-% values; values between 10001 and 20000 have 10000 subtracted and the result
-% is given as a negative penalty. The mechanism used for indentations and
-% penalties requires unsigned values less than 32768. No penalty is placed
-% after the last line, so the final \verb+,0+ in then example above could
-% be omitted. The control sequence \verb+\endstanzaextra+ can be defined to
-% include a penalty. A penalty of 10000 will prevent a page break; such a
-% penalty is included automatically where there is stanza hanging indentation.
-% A penalty of ${-10000}$ (corresponding to the entry value 20000 in this
-% context) forces a page break. Values in between act as suggestions as to the
-% desirability of a page break at a given line. There is a subtle interaction
-% between penalties and {\it glue}, so it may take some adjustment of skips
-% and penalties to achieve the best results.
-%
-% \Finale
-\endinput
-
-
diff --git a/Master/texmf-dist/doc/latex/edmac/edszadoc.tex b/Master/texmf-dist/doc/latex/edmac/edszadoc.tex
deleted file mode 100644
index 686b466518c..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/edszadoc.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\documentclass{article}
-\usepackage{doc}
-\begin{document}
- \DocInput{edstanza.doc}
-\end{document}
-
diff --git a/Master/texmf-dist/doc/latex/edmac/features.tex b/Master/texmf-dist/doc/latex/edmac/features.tex
deleted file mode 100644
index 50de7f257f6..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/features.tex
+++ /dev/null
@@ -1,138 +0,0 @@
-\input edmac.doc
-\hsize 28pc
-\vsize 35pc
-\cropsetup{45pc}{35pc}{4pc}{4pc}
-\headline{Headline \hfil \folio}
-\footline{Footline \hfil --\folio--\hfil footline}
-
-\makeatletter
-% I'd like a spaced out colon after the lemma:
-\def\spacedcolon{{\rm\thinspace:\thinspace}}
-\def\normalfootfmt#1#2#3{%
- \normal@pars
- \parindent=0pt \parfillskip=0pt plus 1fil
- {\notenumfont\printlines#1|}\strut\enspace
- {\select@lemmafont#1|#2}\spacedcolon\enskip#3\strut\par}
-
-% And I'd like the 3-col notes printed with a hanging indent:
-\def\threecolfootfmt#1#2#3{%
- \normal@pars
- \hsize .3\hsize
- \parindent=0pt
- \tolerance=5000 % high, but not infinite
- \raggedright
- \hangindent1.5em \hangafter1
- \leavevmode
- \strut\hbox to 1.5em{\notenumfont\printlines#1|\hfil}\ignorespaces
- {\select@lemmafont#1|#2}\rbracket\enskip
- #3\strut\par\allowbreak}
-
-% And I'd like the 2-col notes printed with a double colon:
-\def\doublecolon{{\rm\thinspace::\thinspace}}
-\def\twocolfootfmt#1#2#3{%
- \normal@pars
- \hsize .45\hsize
- \parindent=0pt
- \tolerance=5000
- \raggedright
- \leavevmode
- \strut{\notenumfont\printlines#1|}\enspace
- {\select@lemmafont#1|#2}\doublecolon\enskip
- #3\strut\par\allowbreak}
-
-% And in the paragraphed footnotes, I'd like a colon too:
-\def\parafootfmt#1#2#3{%
- \normal@pars
- \parindent=0pt \parfillskip=0pt plus 1fil
- {\notenumfont\printlines#1|}\enspace
- {\select@lemmafont#1|#2}\spacedcolon\enskip
- #3\penalty-10 }
-\makeatother
-
-% I'd like the line numbers picked out in bold.
-\let\notenumfont=\eightbf
-\lineation{page}
-\linenummargin{inner}
-\firstlinenum=3 % just because I can
-\linenumincrement=1
-\foottwocol{A}
-\footthreecol{B}
-\footparagraph{E}
-% I've changed \normalfootfmt, so invoke it again for C and D notes.
-\footnormal{C}
-\footnormal{D}
-
-\beginnumbering
-
-\pstart
-This is an \text{example}
- \Afootnote{eximemple C, D.}/
-of some text with \text{variant}
- \Afootnote{alternative, A, B.}/
-readings recorded as `A' footnotes. From here on, \text{though}
- \Afootnote{however $\alpha$, $\beta$}/,
-we shall have \text{`C'}
- \Bfootnote{B, {\it pace\/} the text}/.
-\text{For spice, let us mark a longer passage, but give a different
- lemma for it, so that we don't get a \text{huge}
- \Dfootnote{vast E, F; note that this is
- a `D' note to section of text within a longer lemma}/
- amount of text in a note}\lemma{For spice \dots\ note}
- \Cfootnote{The note here is type `C'}/.
-\text{Finally}
- \Efootnote{in the end X, Y}/,
-\text{we}
- \Efootnote{us K}/
-\text{shouldn't}
- \Efootnote{ought not to L, M}/
-\text{forget the}
- \Efootnote{omit to mention the \S, \P}/
-\text{paragraphed}
- \Efootnote{blocked M, N}/
-\text{notes}
- \Efootnote{variants HH, KK}/,
-which are so \text{useful}
- \Efootnote{truly useful L, P}/
-when there are \text{a great number of}
- \Efootnote{many, many (preferably)}/
-short notes to be \text{recorded}
- \Efootnote{noted: repetition}/.
-\pend
-
-\pstart
-This is a second paragraph, giving more {\it \text{examples}
- \Afootnote{eximples L, M.}/}
-of text with \text{variant}
- \Afootnote{alternative, A, B.}/
-readings recorded as `A' footnotes. From here on, \text{though}
- \Bfootnote{however $\alpha$, $\beta$}/,
-we shall have \text{`B'}
- \Bfootnote{B, as correctly stated in the text}/ notes in the text.
-\text{For spice, let us mark a longer passage, but give a different
- lemma for it, so that we don't get a {\it \text{huge}
- \Dfootnote{vast E, F; note that this is
- a `D' note to text within a longer lemma.}/}
- amount of text in a note}\lemma{For spice, \dots\ note}
- \Cfootnote{This is a rogue note of type `C'.}/.
-\text{Finally}
- \Bfootnote{In the end X, Y}/,
-\text{we}
- \Bfootnote{we here K}/
-\text{shouldn't}
- \Bfootnote{ought not to L, M}/
-\text{forget the}
- \Bfootnote{omit to mention the \S, \P}/
-\text{column}
- \Bfootnote{blocked M, N}/
-\text{notes}
- \Bfootnote{variants H}/,
-which are so \text{useful}
- \Bfootnote{very, very useful L, P}/
-when there are \text{many}
- \Bfootnote{lots of Z}/
-short notes to be \text{recorded}
- \Bfootnote{recorded and put down: M (repetition)}/.
-\pend
-
-\endnumbering
-\bye
diff --git a/Master/texmf-dist/doc/latex/edmac/readme b/Master/texmf-dist/doc/latex/edmac/readme
deleted file mode 100644
index ada3a68d705..00000000000
--- a/Master/texmf-dist/doc/latex/edmac/readme
+++ /dev/null
@@ -1,40 +0,0 @@
-
-The driver file for producing the documentation for EDMAC 3.17 has been
-omitted from this zip file in a feeble attempt to encourage you to buy
-the published documentation as a ready-made book from the TeX Users Group.
-
-The published version of EDMAC has several advantages:
- o It has pictures!
- o It is properly formatted and indexed for you.
- o It has an extra introduction prelims.
- o Most important of all, buying it supports the TeX Users Group.
-
-The cost is very low (ten UK pounds, I believe), and you will easily
-save that much in your time, effort, and printing costs.
-
-The EDMAC manual is published by both the
-
- UK TeX Users Group
- Peter Abbott,
- 1 Eymore Close,
- Selly Oak,
- Birmingham B29 4LB,
- UK.
- FAX/phone: +44 121 476 2159
- email: uktug-enquiries@tex.ac.uk
-
-and by
-
- The TeX Users Group,
- 1850 Union Street, # 1637,
- San Francisco,
- CA 94123,
- USA.
- Phone: +1 415 982-8449
- FAX: +1 415 982-8559
- email: tug@tug.org
-
---
-
-Dominik Wujastyk
-11 November 1996
diff --git a/Master/texmf-dist/doc/latex/euromoney/README.md b/Master/texmf-dist/doc/latex/euromoney/README.md
new file mode 100644
index 00000000000..601e822cc78
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/euromoney/README.md
@@ -0,0 +1,6 @@
+euromoney is a package with euro coins and banknotes.
+-----------------------------------------------------
+Author..: Cédric Pierquet
+email...: cpierquet@outlook.fr
+Licence.: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+........: pdf converted from domain public svg (user frankes in openclipart), see https://openclipart.org/artist/frankes \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.pdf b/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.pdf
new file mode 100644
index 00000000000..93668899bfa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.tex b/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.tex
new file mode 100644
index 00000000000..f502604a0b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/euromoney/euromoney-doc.tex
@@ -0,0 +1,461 @@
+% !TeX TXS-program:compile = txs:///arara
+% arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode}
+% arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
+
+\documentclass[11pt,a4paper]{ltxdoc}
+%\usepackage{crimson}
+\usepackage{bera}
+\usepackage{inconsolata}
+%\renewcommand*\ttdefault{cmvtt}
+\usepackage[T1]{fontenc}
+\usepackage[scale=0.875]{cabin}
+\usepackage{euromoney}
+\usepackage{fancyvrb}
+\usepackage{fancyhdr}
+\usepackage{tabularray}
+\usepackage{fontawesome5}
+\fancyhf{}
+\renewcommand{\headrulewidth}{0pt}
+\lfoot{\sffamily\small [euromoney]}
+\cfoot{\sffamily\small - \thepage{} -}
+\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
+\usepackage{hologo}
+\providecommand\tikzlogo{Ti\textit{k}Z}
+\providecommand\TeXLive{\TeX{}Live\xspace}
+\let\TikZ\tikzlogo
+
+\usepackage{hyperref}
+\urlstyle{same}
+\hypersetup{pdfborder=0 0 0}
+\usepackage[margin=2cm]{geometry}
+\setlength{\parindent}{0pt}
+\def\TPversion{0.1.1}
+\def\TPdate{07/09/2024}
+\usepackage{tcolorbox}
+\tcbuselibrary{skins,hooks,listingsutf8}
+%\usepackage{soul}
+%\sethlcolor{lightgray!25}
+
+\lstset{
+ language=[LaTeX]TeX,%
+ basicstyle=\ttfamily,%
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={usepackage,\includegraphics,xstring,listofitems,tikz,calc,simplekv,graphicx},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={euromoney},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\BilletsEuro,\PiecesEuro,\EuroBanknotes,\EuroCoins},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={RefHeight,Style,AutoHeight,OffsetH,OffsetV,Stack,Angle,HauteurRef,HauteurAuto,DecalH,DecalV,Empilage},%
+ keywordstyle={\color{orange}}
+}
+
+\newtcblisting{DemoCode}[1]{%
+ enhanced,width=\linewidth,%
+ bicolor,size=title,%
+ colback=cyan!10!white,%
+ colbacklower=cyan!5!white,%
+ colframe=cyan!75!black,%
+ listing options={%
+ breaklines=true,%
+ breakatwhitespace=true,%
+ style=tcblatex,basicstyle=\small\ttfamily,%
+ tabsize=4,%
+ commentstyle={\itshape\color{gray}},
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={usepackage,\includegraphics,xstring,listofitems,tikz,calc,simplekv,graphicx},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={euromoney},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\BilletsEuro,\PiecesEuro,\EuroBanknotes,\EuroCoins},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={RefHeight,Style,AutoHeight,OffsetH,OffsetV,Stack,Angle,HauteurRef,HauteurAuto,DecalH,DecalV,Empilage,height},%
+ keywordstyle={\color{orange}}
+ },%
+ #1
+}
+\NewDocumentCommand\MontreCode{ m }{%
+ \lstinline{#1}%
+}
+
+\begin{document}
+
+\thispagestyle{empty}
+
+\begin{center}
+ \begin{minipage}{0.88\linewidth}
+ \begin{tcolorbox}[colframe=yellow,colback=yellow!15]
+ \begin{center}
+ \begin{tabular}{c}
+ {\Huge \texttt{euromoney}}\\
+ \\
+ {\LARGE Insert 'vectorial' coins or} \\
+ {\LARGE banknotes in euro.} \\
+ \\
+ {\small \texttt{Version \TPversion{} -- \TPdate}}
+ \end{tabular}
+ \end{center}
+ \end{tcolorbox}
+ \end{minipage}
+\end{center}
+
+\begin{center}
+ \begin{tabular}{c}
+ \texttt{Cédric Pierquet}\\
+ {\ttfamily c pierquet -- at -- outlook . fr}\\
+ \texttt{\url{https://github.com/cpierquet/euromoney}} \\
+ \end{tabular}
+\end{center}
+
+\hrule
+
+\vfill
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+ \begin{center}
+ \PiecesEuro[HauteurRef=1cm,Style=full,HauteurAuto]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+
+ \vspace*{2.5mm}
+
+ \PiecesEuro[Empilage=V,HauteurRef=3cm,HauteurAuto]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+
+ \vspace*{2.5mm}
+
+ \BilletsEuro[Style=nb,HauteurRef=1.75cm,DecalV=0.5cm,HauteurAuto]{4*100+2*50+20+4*10+3*5}
+
+ \vspace*{2.5mm}
+
+ \BilletsEuro[Style=full,HauteurAuto]{100+50+20+5}
+ \end{center}
+\end{tcolorbox}
+
+\vfill~
+
+\hrule
+
+\medskip
+
+\emph{%
+ The pdf files were obtained by converting vector \texttt{svg} (public domain) files from the \href{https://openclipart.org/artist/frankes?p=3}{\texttt{openclipart}} database, and in particular from files supplied by \href{https://openclipart.org/artist/frankes?p=3}{\texttt{frankes}}.
+}
+
+\medskip
+
+\hrule
+
+\vspace*{5mm}
+
+\pagebreak
+
+\phantomsection
+
+\hypertarget{matoc}{}
+
+\tableofcontents
+
+\vspace*{5mm}
+
+%\hrule
+
+\pagebreak
+
+\section{Introduction}
+
+\subsection{Description, loading}
+
+The idea is to propose macros to insert coins and banknotes in euro.
+
+\begin{DemoCode}{listing only}
+\usepackage{euromoney}
+\end{DemoCode}
+
+The \MontreCode{euromoney} package loads :
+
+\begin{itemize}
+ \item \lstinline{xstring} ;
+ \item \lstinline{simplekv} ;
+ \item \lstinline{graphicx} ;
+ \item \lstinline{tikz} with \MontreCode{calc} library ;
+ \item \lstinline{listofitems}.
+\end{itemize}
+
+\subsection{Features}
+
+It's possible to present multiple coins or multiples banknotes :
+
+\begin{itemize}
+ \item with global height ;
+ \item with height automatically adjusted (compared to 2€ coin and 500€ banknote) ;
+ \item with stacking.
+\end{itemize}
+
+\section{Global names, samples}
+
+\subsection{Global names}
+
+Each coin or bill is a vectorial pdf, name \texttt{euromoney-<amount><suffix>} and there's three styles :
+
+\begin{itemize}
+ \item \MontreCode{full} colored version ;
+ \item \MontreCode{simple} colored version with \MontreCode{simple} suffix ;
+ \item \MontreCode{bw} version with \MontreCode{simplebw} suffix .
+\end{itemize}
+
+Available basenames are :
+
+\begin{itemize}
+ \item \texttt{500euro} ; \texttt{200euro} ; \texttt{100euro} ; \texttt{50euro} ; \texttt{20euro} ; \texttt{10euro} and \texttt{5euro} ;
+ \item \texttt{2euro} ; \texttt{1euro} ; \texttt{50cent} ; \texttt{20cent} ; \texttt{10cent} ; \texttt{5cent} ; \texttt{2cent} and \texttt{1cent}.
+\end{itemize}
+
+\begin{DemoCode}{}
+%manual insertion
+\includegraphics[height=25.75mm]{euromoney-2euro}% w/o suffix
+\includegraphics[height=25.75mm]{euromoney-2eurosimple}% with simple suffix
+\includegraphics[height=25.75mm]{euromoney-2eurosimplebw}% with simplebw suffix
+\end{DemoCode}
+
+\subsection{Size of graphics}
+
+Banknotes of \MontreCode{Style=full} are bigger than other styles, so the output doc can be bigger size.
+
+For example, 100€ banknote's size is 933~Ko.
+
+\section{Macro for coins}
+
+\subsection{Usage}
+
+The coins macro is :
+
+\begin{DemoCode}{listing only}
+\EuroCoins[keys]{list of coins}
+\end{DemoCode}
+
+Available keys are :
+
+\begin{itemize}
+ \item \MontreCode{RefHeight} := height (default \MontreCode{2cm}) for the coins (relative to 2€ if \MontreCode{AutoHeight=true}) ;
+ \item \MontreCode{Style} := style for coins (default \MontreCode{simple}), within \MontreCode{full/simple/bw} ;
+ \item \MontreCode{AutoHeight} := boolean (default \MontreCode{false}) for adjusting heights of coins ;
+ \item \MontreCode{OffsetH} := horizontal offset (default \MontreCode{0pt}) for multiple coins (side by side if \MontreCode{0pt}) ;
+ \item \MontreCode{OffsetV} := vertical offset (default \MontreCode{5mm}) for multiple coins vertically stacked ;
+ \item \MontreCode{Stack} := sens of stacking (default \MontreCode{H}) for mutiple coins.
+\end{itemize}
+
+List of coins can be given within \MontreCode{3*2+4*1+2*0.2+4*0.1} for example.
+
+\subsection{Examples}
+
+\begin{DemoCode}{}
+%sample with one coin
+\EuroCoins{2}\EuroCoins{1}\EuroCoins{0.5}\EuroCoins{0.2}%
+\EuroCoins{0.1}\EuroCoins{0.05}\EuroCoins{0.02}\EuroCoins{0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%multiple coins, side by side, global height, simple style
+\EuroCoins{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%multiple coins, side by side, global height, full style
+\EuroCoins[Style=full]{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%multiple coins, side by side, global height, simplebw style
+\EuroCoins[Style=bw]{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%stacked coins (b&w), horizontally with correct scaling
+\EuroCoins[RefHeight=3cm,AutoHeight,OffsetH=7.5mm,Style=bw]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%stacked coins (full resolution), vertically with correct scaling
+\EuroCoins[Stack=V,RefHeight=3cm,AutoHeight,Style=full]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+\end{DemoCode}
+
+\section{Macro for banknotes}
+
+\subsection{Usage}
+
+The banknotes macro is :
+
+\begin{DemoCode}{listing only}
+\EuroBanknotes[keys]{list of banknotes}
+\end{DemoCode}
+
+Stacking is globally set, and available keys are :
+
+\begin{itemize}
+ \item \MontreCode{RefHeight} := height (default \MontreCode{2cm}) for the banknotes (relative to 500€ if \MontreCode{AutoHeight=true}) ;
+ \item \MontreCode{Style} := style for banknotes (default \MontreCode{simple}), within \MontreCode{full/simple/bw} ;
+ \item \MontreCode{AutoHeight} := boolean (default \MontreCode{false}) for adjusting heights of banknotes ;
+ \item \MontreCode{OffsetH} := horizontal offset (default \MontreCode{0pt}) for multiple banknotes (side by side if \MontreCode{0pt}) ;
+ \item \MontreCode{OffsetV} := vertical offset (default \MontreCode{5mm}) for multiple banknotes vertically stacked ;
+ \item \MontreCode{Stack} := type of stacking (default \MontreCode{H}) within \MontreCode{H/fan} ;
+ \item \MontreCode{Angle} := rotation (default \MontreCode{10}) for \texttt{fan} stacking.
+\end{itemize}
+
+List of banknotes, for \texttt{H} stacking, can be given within \MontreCode{2*100+3*50+10+5} for example.
+
+List of banknotes, for \texttt{fan} stacking, can be given within \MontreCode{5+5+10+10+20+50+100+200+200} for example.
+
+\subsection{Examples}
+
+\begin{DemoCode}{}
+%sample with one banknote
+\EuroBanknotes{500}\EuroBanknotes{200}\EuroBanknotes{100}\EuroBanknotes{50}\\
+\EuroBanknotes{20}\EuroBanknotes{10}\EuroBanknotes{5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%multiple banknotes, side by side, global height
+\EuroBanknotes{50+20+5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%multiple banknotes, side by side, with correct scaling
+\EuroBanknotes[RefHeight=3cm,Style=full,AutoHeight]{100+10+5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%stacked banknotes (b&w), with correct scaling
+\EuroBanknotes[OffsetH=7.5mm,Style=bw,AutoHeight]{4*100+2*50+20+4*10+3*5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%syde by side banknotes, with correct scaling
+\EuroBanknotes[RefHeight=1.75cm,AutoHeight]{4*100+2*50+20+4*10+3*5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%fan stacking, with adjusted offsets
+\EuroBanknotes%
+ [Stack=fan,RefHeight=2.05cm,AutoHeight,Angle=17.5,%
+ OffsetH=0.1mm,OffsetV=0mm]%
+ {5+5+10+10+20+50+100+200+200}
+\end{DemoCode}
+
+\pagebreak
+
+\section{French version}
+
+Il est possible d'utiliser les commandes en version francisée :
+
+\begin{DemoCode}{listing only}
+\PiecesEuro[clés]{liste de pièces}
+\BilletsEuro[clés]{liste de billets}
+\end{DemoCode}
+
+Les clés disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{HauteurRef} := hauteur (défaut \MontreCode{2cm}) pour les pièces/billets (relativement à celle de 2€ et celui de 500€ si \MontreCode{HauteurAuto=true}) ;
+ \item \MontreCode{Style} := style pour les pièces/billets (défaut \MontreCode{simple}), parmi \MontreCode{full/simple/nb} ;
+ \item \MontreCode{HauteurAuto} := booléen (défaut \MontreCode{false}) pour adapter les hauteurs ;
+ \item \MontreCode{DecalH} := décalage horizontal (défaut \MontreCode{0pt}) pour des empilages (côte à côte si \MontreCode{0pt}) ;
+ \item \MontreCode{DecalV} := décalage vertical (défaut \MontreCode{5mm}) pour les empilages verticaux ;
+ \item \MontreCode{Empilage} := sens de l'empilage (défaut \MontreCode{H}) éventuel, parmi \MontreCode{H/eventail} suivant le type d'objets.
+\end{itemize}
+
+La liste peut être donnée sous la forme \MontreCode{3*2+4*1+2*0.2+4*0.1} pour des affichages \textit{classiques} par exemple.
+
+Pour le cas de billets en éventail, la liste pourra être donnée sous la forme \MontreCode{5+5+10+10+20+50+100+200+200} par exemple.
+
+\begin{DemoCode}{}
+%exemple avec une pièce
+\PiecesEuro{2}\PiecesEuro{1}\PiecesEuro{0.5}\PiecesEuro{0.2}%
+\PiecesEuro{0.1}\PiecesEuro{0.05}\PiecesEuro{0.02}\PiecesEuro{0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%pièces multiples, côte à côte, taille uniforme, style simple
+\PiecesEuro{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%pièces multiples, côte à côte, taille uniforme, style full
+\PiecesEuro[Style=full]{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%pièces multiples, côte à côte, taille uniforme, style simplenb
+\PiecesEuro[Style=nb]{2+1+0.5+0.2+0.1+0.05+0.02+0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%pièces empilées (n&b) horizontalement et tailles ajustées
+\PiecesEuro%
+ [HauteurRef=3cm,HauteurAuto,DecalH=7.5mm,Style=nb]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%pièces empilées (full résolution) verticalement et tailles ajustées
+\PiecesEuro%
+ [Empilage=V,HauteurRef=3cm,HauteurAuto,Style=full]{4*2+3*1+4*0.2+1*0.1+2*0.01}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%exemple avec un billet
+\BilletsEuro{500}\BilletsEuro{200}\BilletsEuro{100}\BilletsEuro{50}\\
+\BilletsEuro{20}\BilletsEuro{10}\BilletsEuro{5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%plusieurs billets, côte à côte, taille uniforme
+\BilletsEuro{50+20+5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%plusieurs billets (full résolution), côte à côte, tailles adaptées
+\BilletsEuro[HauteurRef=3cm,Style=full,HauteurAuto]{100+10+5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%billets empilés (n&b), tailles adaptées
+\BilletsEuro[DecalH=7.5mm,Style=nb]{4*100+2*50+20+4*10+3*5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%billets côte à côte, tailles adaptées
+\BilletsEuro[HauteurRef=1.75cm,HauteurAuto]{4*100+2*50+20+4*10+3*5}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%billets en éventail, hauteur et décalages ajustés
+\BilletsEuro%
+ [Empilage=eventail,HauteurRef=2.05cm,HauteurAuto,Angle=17.5,%
+ DecalH=0.1mm,DecalV=0mm]%
+ {5+5+10+10+20+50+100+200+200}
+\end{DemoCode}
+
+\pagebreak
+
+
+\section{History}
+
+\begin{quote}
+\begin{verbatim}
+0.1.1 : New filenames, according to TL rules
+0.1.0 : Initial version
+\end{verbatim}
+\end{quote}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/ezedits/README.md b/Master/texmf-dist/doc/latex/ezedits/README.md
new file mode 100644
index 00000000000..49624cd5939
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ezedits/README.md
@@ -0,0 +1,47 @@
+# Package `ezedits` by Joey Smiga
+
+Version 2024-09-12 v1.0
+
+Maintained by Joseph "Joey" A. Smiga \<joseph.smiga@rochester.edu\>
+
+`ezedits` is a package built for collaboratively editing LaTeX documents and tracking changes. Through highly customizable commands, the user can choose how their and their collaborators modifications appear in the document. Additional tools are provided to help keep track of where the edits are made within the pdf.
+
+Originally developed ca. 2018, this has been refined over the years.
+
+## Copyright (C)
+&copy;2024 Joseph A. Smiga
+
+## Usage tips
+
+All edits will raise a warning, making it easier to find where changes occured and clean up the document.
+
+### Package options
+
+- `arrows` add arrows $\Longleftarrow$ pointing to edits in margins (in captions, a pair of arrows are added, instead; $\Longrightarrow$ Like this $\Longleftarrow$). These arrows are styled based on the edit.
+- `accept` accept all edits (arrows still appear if `arrows` option is used).
+- `pdfcomment` write edits as pdf annotations (arrows still appear if `arrows` option is used).
+- `nosout` do not strikeout delete text (by default). If this option is set, the `ulem` package is not used.
+
+### Commands
+
+General comments can be added with `\draftnote{...}`. These comments will appear in-text as `[...]` with some default styling. When also using the `xcolor` package, the notes will be colored red. The command `\setnotestyle{<style>}` can be used to customize the note style.
+
+`\defineEdit{ABC}{<styleA>}{<styleB>}` will generate a set of commands with the prefix `ABC` for editing where `<styleA>` is used for omitted text and `<styleB>` is used for added text. The following commands are generated:
+- `\ABCEdit{del}{ins}` Used to replace `del` with `ins`.
+- `\ABCIns{ins}` Used to insert `ins`.
+- `\ABCDel{del}` Used to delete `del`.
+
+Running the above command for each collaborator (especially with different style arguments) can make it easy to keep track of who made what comment.
+
+`\makeeditreport` generates a `tabular` environment that summarizes where/how many edits were made.
+
+## Possible issues
+
+- Exact page numbers for `\makeeditreport` may be slightly off due to how LaTeX updates `\thepage`.
+- Problems can arise when editing across several paragraphs. It is recommended to use new commands between paragraphs.
+- `pdfcomment` option can be a bit rough at times, though it generally works.
+
+
+## License
+LaTeX Project Public License, version 1.3c or later.
+
diff --git a/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.pdf b/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.pdf
new file mode 100644
index 00000000000..d4e759bfd7a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.tex b/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.tex
new file mode 100644
index 00000000000..f7852ab8803
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ezedits/ezedits_docs.tex
@@ -0,0 +1,171 @@
+\documentclass{article}
+
+\usepackage[arrows]{ezedits}
+
+\usepackage{xcolor}
+\usepackage{hyperref}
+
+\newcommand{\macroexample}[1]{\begin{center}
+ \fcolorbox{black}{black!6}{\parbox{.9\linewidth}{\ttfamily #1}}
+\end{center}}
+
+
+\title{\texttt{ezedits.sty} documentation}
+\author{Joseph A. Smiga $\langle$\href{mailto:joseph.smiga@rochester.edu?subject=[ezedits]\%20}{joseph.smiga@rochester.edu}$\rangle$}
+\date{Package: September 12, 2024 (v1.0)\\
+Documentation: September 12, 2024
+}
+
+\defineEdit{ABC}{\color{red}}{\color{blue}}
+\defineEdit{XYZ}{\color{gray}\textit}{\textbf}
+
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\section{Introduction}
+
+The \texttt{ezedits} package is designed to make it easier to edit \LaTeX{} documents with multiple people, while keeping track of what changed.
+
+Changes signified with this package with raise warnings. This makes it easier to keep track of changes and keep the document clean.
+
+Note that, in this document, the package is included as:
+\macroexample{\textbackslash{}usepackage[arrows]\{ezedits\}}
+with the \texttt{xcolor} package included.
+
+\section{Dependencies}
+The following packages may be required:
+\begin{itemize}
+ \item \href{https://ctan.org/pkg/ulem}{\texttt{ulem}}: used for strikethrough (\texttt{\textbackslash{sout}}). This is required by default, unless the \hyperlink{opt_nosout}{\texttt{nosout}} option is used.
+
+ \item \href{https://ctan.org/pkg/xcolor}{\texttt{xcolor}}: used for coloring text. If included (i.e., \texttt{\textbackslash{textcolor}} is defined), \hyperlink{cmd_draftnote}{\texttt{\textbackslash{draftnote}}} is colored red by default.
+
+ \item \href{https://ctan.org/pkg/pdfcomment}{\texttt{pdfcomment}}: needed when \hyperlink{opt_pdfcomment}{\texttt{pdfcomment}} option is used.
+\end{itemize}
+
+
+\section{Package options}
+The following options can be used with \verb+\usepackage[...]{ezedits}+:
+\begin{itemize}
+ \item \hypertarget{opt_arrows}{\texttt{arrows}} add arrows ``$\Longleftarrow$'' pointing to edits in margins (in captions, a pair of arrows are added, instead; $\Longrightarrow$Like this$\Longleftarrow$). These arrows are styled based on the edit.
+
+ \item \hypertarget{opt_accept}{\texttt{accept}} accept all edits (arrows still appear if \texttt{arrows} option is used).
+
+ \item \hypertarget{opt_pdfcomment}{\texttt{pdfcomment}} write edits as pdf annotations (arrows still appear if \texttt{arrows} option is used).
+
+ \item \hypertarget{opt_nosout}{\texttt{nosout}} do not strikeout delete text (by default). If this option is set, the \texttt{ulem} package is not required.
+\end{itemize}
+
+
+\section{Commands}
+
+\noindent\hypertarget{cmd_draftnote}{\texttt{\textbackslash{draftnote}\{...\}}}
+
+This will generate a note in the text. Text is placed in square brackets and stylized to make it distinct from the rest of the text.
+
+\draftnote{Here is an example note}
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+\noindent\hypertarget{cmd_defineEdit}{\texttt{\textbackslash{defineEdit}\{ABC\}\{$\langle$styleA$\rangle$\}\{$\langle$styleB$\rangle$\}}}
+
+This will generate a set of commands with the prefix \texttt{ABC} for editing where \texttt{$\langle$styleA$\rangle$} is used for omitted text and \texttt{$\langle$styleB$\rangle$} is used for added text.
+
+The following commands are generated:
+\begin{itemize}
+ \item \verb+\ABCEdit{del}{ins}+ Used to replace \verb+del+ with \verb+ins+.
+
+ For example: \ABCEdit{old}{new}.
+
+ \item \verb+\ABCIns{ins}+ Used to insert \verb+ins+.
+
+ For example: \ABCIns{new}.
+
+ \item \verb+\ABCDel{del}+ Used to delete \verb+del+.
+
+ For example: \ABCDel{old}.
+\end{itemize}
+
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+\noindent\hypertarget{cmd_setnotestyle}{\texttt{\textbackslash{setnotestyle}}\{$\langle$style$\rangle$\}}
+
+Redefine how \hyperlink{cmd_draftnote}{\texttt{\textbackslash{draftnote}}} appears. Here, $\langle$style$\rangle$ is a macro that takes one argument and returns a styled version of that text.
+
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+\noindent\hypertarget{cmd_makeeditreport}{\texttt{\textbackslash{makeeditreport}}}
+
+Creates a summary of which page edits appear on (at the point that the command is called). The output is a \texttt{tabular} environment.
+
+
+\section{Examples}
+Here, we use the following command to define the edit commands:
+
+\macroexample{\textbackslash{}defineEdit\{ABC\}\{\textbackslash{}color\{red\}\}\{\textbackslash{}color\{blue\}\}}
+
+Here, the first argument \verb+{ABC}+ is the prefix for the edit commands. The second argument \verb+{\color{red}}+ describes how to style deleted text (the text is always crossed-out). Finally, the third argument \verb+{\color{blue}}+ describes what to do with added text. Note that, if the \hyperlink{opt_arrows}{\texttt{arrows}} option is used, it will be styled according to the latter argument.
+
+A simple example of editing a sentence:
+\macroexample{This \textbackslash{}ABCIns\{sentence\} contains some \textbackslash{}ABCDel\{major\} errors, but that is \textbackslash{}ABCEdit\{ok\}\{not a big deal\}. \textbackslash{}drafNote\{Remember to clean up the document\}}
+
+\begin{center}
+ \fbox{\parbox{.9\linewidth}{This \ABCIns{sentence} contains some \ABCDel{major} errors, but that is \ABCEdit{ok}{not a big deal}. \draftnote{Remember to clean up the document}}}
+\end{center}
+
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+The styling options are fairly flexible. For example, one can define their own macro \verb+\style{...}+ that takes one argument and stylizes it.
+For example, an alternative styling:
+\macroexample{\textbackslash{}defineEdit\{XYZ\}\{\textbackslash{}color\{gray\}\textbackslash{}textit\}\}\{\textbackslash{}textbf\}}
+So deleted text \XYZDel{will look like this} while added text \XYZIns{will look like this}.
+
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+One can also include edits in (floating) figures. However, if \hyperlink{opt_arrows}{\texttt{arrows}} package option is used, the arrows will appear around the edit, instead of in the margin.
+\begin{figure}[h]
+ \centering
+ {\rule{1cm}{1cm}}
+ \caption{This is just a \ABCIns{black} box.}
+ \label{fig:blackbox}
+\end{figure}
+
+
+\vspace{5mm}\hrule\vspace{2mm}
+
+After making edits, one can generate a summary of edits using \verb+\makeeditreport+ (only includes edits/notes from before this command is called):
+
+\macroexample{
+\textbackslash{}begin\{table\}[h]\par
+~~~~\textbackslash{}centering\par
+~~~~\textbackslash{}makeeditreport\par
+\textbackslash{}end\{table\}
+}
+
+\begin{table}[h]
+ \centering
+ \makeeditreport
+\end{table}
+
+Note that warnings will also be raised for each edit/note at their location.
+
+\section{Possible issues}
+There are times where the page number used in \hyperlink{cmd_makeeditreport}{\texttt{\textbackslash{makeeditreport}}} may not be exactly correct. This has to do with how \LaTeX{} updates \verb+\thepage+. Namely, it tends to wait until new paragraphs. Also, floating environments can be pushed to a different page.
+
+There are certain cases in which the ``strikeout'' styling does not play nicely. For example, there may be issues when crossing-out citations (c.f., \href{https://tex.stackexchange.com/q/98222}{this Stack Exchange}). To resolve this, \texttt{ezedits} modifies the \verb+\sout+ command to put \verb+\cite{...}+ within an \verb+\mbox+. This results in the minor inconvenience of not letting citations cross multiple lines.
+
+Also, issues can arise when command covers many paragraphs --- the simple resolution to this would be to repeat the command per paragraph.
+
+
+\section{Acknowledgements}
+JAS would like to thank Abhay Hegde for suggesting the \hyperlink{cmd_makeeditreport}{\texttt{\textbackslash{makeeditreport}}} macro.
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fancyqr/README.md b/Master/texmf-dist/doc/latex/fancyqr/README.md
index 63432f93e05..ed09e369ce6 100644
--- a/Master/texmf-dist/doc/latex/fancyqr/README.md
+++ b/Master/texmf-dist/doc/latex/fancyqr/README.md
@@ -5,7 +5,7 @@
[<img src="https://github.com/EagleoutIce/fancyqr/blob/gh-pages/preview-1.png?raw=true" width="600"/>](qr-example.tex)
A simple package to create fancy qr-codes with the help of the [`qrcode`][qrcode]-package.
-You may use `\fancyqr` just like the normal `\qrcode` (`\fancyqr[<qr-options>]{<url>}`). See the [documentation](https://media.githubusercontent.com/media/EagleoutIce/fancyqr/gh-pages/build/fancyqr-doc.pdf).
+You may use `\fancyqr` just like the normal `\qrcode` (`\fancyqr[<qr-options>]{<url>}`). See the [documentation](https://media.githubusercontent.com/media/EagleoutIce/fancyqr/gh-pages/build/fancyqr-doc.pdf). If you just want to create a simple qr-code, please refer to the [minimal example](qr-minimal.tex).
*fancyqr* is actively developed by *Florian Sihler* (contact me at: <florian.sihler@uni-ulm.de>) under the [GPLv3 License](LICENSE). I am very happy about every contribution (see [CONTRIBUTING.md](CONTRIBUTING.md)). You can find it on CTAN (<https://www.ctan.org/pkg/fancyqr>).
@@ -13,22 +13,28 @@ If you do want to hide a center square (e.g., because you want to embed an image
At the moment, there are six other styles (`flat`, `frame`, `blobs`, `glitch`, and `dots`) that you can load (locally) by using `\FancyQrLoad{<name>}`. The default style is named `default` and can be 'reset' by `\FancyQrLoad{default}` or `\FancyQrLoadDefault`.
There are the following extra qr-options (you can set all of them with `\fancyqrset{<keys>}`):
-| Option | Type | Default | Explanation |
-| ----------------- | ------- | :------: | ---------------------------------------------------------- |
-| `image` | LaTeX | | Automatically center an image.[^1] |
-| `image padding` | number | | Additionally hide blocks (x & y) around the image. |
-| `image x padding` | number | `0` | Additionally hide blocks (x) around the image. |
-| `image y padding` | number | `0` | Additionally hide blocks (y) around the image. |
-| `gradient` | boolean | true | Toggle the color gradient |
-| `color` | color | | Disables the `gradient` and sets the qr color accordingly. |
-| `l color` | color | `purple` | Set the top left gradient color. |
-| `left color` | color | | Alias for `l color`. |
-| `r color` | color | `teal` | Set the bottom right gradient color. |
-| `right color` | color | | Alias for `r color`. |
-| `gradient angle` | angle | `135` | Change the gradient angle. |
-| `random color` | colors | | Allow to set a random color pool to pick from. |
-| `width` | length | | Alias for [`qrcode`'s][qrcode] `height` option. |
-| `size` | length | | Alias for [`qrcode`'s][qrcode] `height` option. |
+
+| Option | Type | Default | Explanation |
+| ----------------- | ----------- | :------: | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `classic` | boolean | `false` | Use the classic qr-code style (black with flat rectangles, this loads the `flat` style). |
+| `color` | color | | Disables the `gradient` and sets the qr color accordingly. |
+| `gradient angle` | angle | `135` | Change the gradient angle. |
+| `gradient` | boolean | true | Toggle the color gradient |
+| `image` | LaTeX | | Automatically center an image (you have to care for the size and maybe adjust the `version` and `level` to keep the qr-code readable).[^1] |
+| `image padding` | number | | Additionally hide blocks (x & y) around the image. |
+| `image x padding` | number | `0` | Additionally hide blocks (x) around the image. |
+| `image y padding` | number | `0` | Additionally hide blocks (y) around the image. |
+| `l color` | color | `purple` | Set the top left gradient color. |
+| `left color` | color | | Alias for `l color`. |
+| `level` | L/M/Q/H | `M` | [`qrcode`][qrcode] option affecting error correction (low, medium, quartile, high). |
+| `padding` | flag | | [`qrcode`][qrcode] option adding sufficient additional space around the qr-code. |
+| `r color` | color | `teal` | Set the bottom right gradient color. |
+| `random color` | colors | | Allow to set a random color pool to pick from. |
+| `right color` | color | | Alias for `r color`. |
+| `size` | length | | Alias for [`qrcode`'s][qrcode] `height` option. |
+| `tight` | flag | | [`qrcode`][qrcode] option adding no additional space around the qr-code. |
+| `version` | [0..40] ∈ ℕ | `0` | [`qrcode`][qrcode] option affecting the size (tries to be as small as possible). |
+| `width` | length | | Alias for [`qrcode`'s][qrcode] `height` option. |
The defaults are set like this:
diff --git a/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.pdf b/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.pdf
index c96c62abbcd..cccceaca244 100644
--- a/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.pdf
+++ b/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.tex b/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.tex
index 1f3b00ba2db..52338832c59 100644
--- a/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.tex
+++ b/Master/texmf-dist/doc/latex/fancyqr/fancyqr-doc.tex
@@ -18,6 +18,7 @@
\usepackage{fancyqr}
\usepackage{xcolor}
\usepackage[tex]{listings}
+\usepackage{amssymb}
\lstdefinelanguage{ltx}{
language={[LaTeX]TeX},
@@ -34,14 +35,13 @@
\texorpdfstring{Florian Sihler\medskip\\*
\fancyqr{https://github.com/EagleoutIce/fancyqr}
}{Florian Sihler}}
-\date{Version v2.0 \textendash{} 2024/04/13}
-
+\date{Version v2.1 \textendash{} 2024/10/05}
\begin{document}
\maketitle
- \texttt{fancyqr} is a simple package to create fancy qr codes with the help of the \textit{\href{https://www.ctan.org/pkg/qrcode}{qrcode}}-package.
+ \texttt{fancyqr} is a simple package to create fancy qr-codes with the help of the \textit{\href{https://www.ctan.org/pkg/qrcode}{qrcode}}-package.
You can use the |\fancyqr|-macro just like the normal |\qrcode|.\footnote{\ltx{\\fancyqr[<qr-options>]\{<url>\}}}
If you do want to hide a center square (e.g, because you want to embed an image) you can use |\FancyQrDoNotPrintSquare{<x>}{<y>}| to hide a rectangle with radius x and y set from the center. If you choose this option, the default |\FancyQrRoundCut| that rounds cut corners can be changed with |\FancyQrHardCut|.
@@ -66,20 +66,25 @@
\toprule
\multicolumn{1}{l}{Option} & Type & \multicolumn{1}{c}{Default} & Explanation \\
\midrule
- image & \LaTeX & & Automatically center an image.\footnote{The package will automatically calculate the required \ltx{\\FancyQrDoNotPrintSquare} (you have to make sure that the qr code still has enough information to be readable). Therefore, the image will not scale with the qr code.} \\
+ classic & boolean & false & Use the classic qr-code style (black with flat rectangles, this loads the |flat| style). \\
+ color & color & & Disables the |gradient| and sets the color accordingly. \\
+ gradient & boolean & true & Toggle the color gradient \\
+ gradient angle & angle & 135 & Change the gradient angle. \\
+ image & \LaTeX & & Automatically center an image (you have to care for the size and maybe adjust the |version| and |level| to keep the qr-code readable).\footnote{The package will automatically calculate the required \ltx{\\FancyQrDoNotPrintSquare} (you have to make sure that the qr-code still has enough information to be readable). Therefore, the image will not scale with the qr-code.} \\
image padding & number & & Additionally hide blocks (x \& y) around the image. \\
image x padding & number & 0 & Additionally hide blocks (x) around the image. \\
image y padding & number & 0 & Additionally hide blocks (y) around the image. \\
- gradient & boolean & true & Toggle the color gradient \\
- color & color & & Disables the |gradient| and sets the color accordingly. \\
l color & color & purple & Set the top left gradient color. \\
left color & color & & Alias for |l color|. \\
+ level & L/M/Q/H & M & |qrcode| option affecting error correction (low, medium, quartile, high). \\
+ padding & flag & & |qrcode| option adding sufficient additional space around the qr-code. \\
r color & color & teal & Set the bottom right gradient color. \\
- right color & color & & Alias for |r color|. \\
- gradient angle & angle & 135 & Change the gradient angle. \\
random color & colors & & Allow to set a random color pool to pick from. \\
- width & length & & Alias for |qrcode|'s |height| option. \\
+ right color & color & & Alias for |r color|. \\
size & length & & Alias for |qrcode|'s |height| option. \\
+ tight & flag & & |qrcode| option adding no additional space around the qr-code. \\
+ version & \([0..40] \in \mathbb{N}\) & 0 & |qrcode| option affecting the size (tries to be as small as possible). \\
+ width & length & & Alias for |qrcode|'s |height| option. \\
\bottomrule
\end{tabular}
\caption{Overview of special qr-options.}
diff --git a/Master/texmf-dist/doc/latex/fancyqr/qr-example.tex b/Master/texmf-dist/doc/latex/fancyqr/qr-example.tex
index e0518297ebb..fe32ae73c94 100644
--- a/Master/texmf-dist/doc/latex/fancyqr/qr-example.tex
+++ b/Master/texmf-dist/doc/latex/fancyqr/qr-example.tex
@@ -3,6 +3,7 @@
% https://opensource.org/licenses/gpl-3.0.html
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{fontawesome}
\usepackage{fancyqr}
@@ -13,13 +14,18 @@
% to showcase scalebox
\usepackage{graphicx}
+% for the coding font
+\usepackage{FiraMono}
+
\usepackage[active,tightpage]{preview} % for presentation
\setlength\PreviewBorder{15pt}
-\fancyqrset{size=3.25cm,level=H,padding}
+\fancyqrset{size=3.25cm, level=H, padding}
+\errorcontextlines=9999
\begin{document}
\preview
+\begin{center}
% \FancyQrDoNotPrintSquare{8}{9}
% \FancyQrHardCut
\mbox{\FancyQrLoad{blobs}%
@@ -28,6 +34,8 @@
\fancyqr{https://github.com/EagleoutIce/fancyqr}%
\FancyQrLoad{dots}%
\fancyqr[image={\textsf{\textbf{\textcolor{gray}{fancy}qr}}}, random color={@Red}{@Pink}{@Purple}{@DeepPurple}{@Indigo}{@Blue}{@Cyan}{@Teal}{@Green}{@Amber}{@Orange}{@DeepOrange}{@Brown}]{https://github.com/EagleoutIce/fancyqr}%
-}%
+}\\[4mm]
+\texttt{\textbackslash \textbf{fancyqr}\{\textcolor{@Grey}{https://github.com/EagleoutIce/fancyqr}\}}
+\end{center}
\endpreview
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fancyqr/qr-minimal.tex b/Master/texmf-dist/doc/latex/fancyqr/qr-minimal.tex
new file mode 100644
index 00000000000..b9127098085
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fancyqr/qr-minimal.tex
@@ -0,0 +1,12 @@
+\documentclass{article}
+
+\usepackage{fancyqr}
+
+\usepackage[active,tightpage]{preview}
+\setlength\PreviewBorder{0pt}
+
+\begin{document}
+\preview
+\fancyqr[classic,padding]{https://github.com/EagleoutIce/fancyqr}
+\endpreview
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/fmtcount/CHANGES b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
index ce54ab42c83..298337ad9aa 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/CHANGES
+++ b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
@@ -1,5 +1,13 @@
fmtcount package versions:
+Version 3.08
+
+* Add Dutch language support
+
+* Update special characters for German and Spanish
+
+* Fix test suite
+
Version 3.07:
* Make french definition robust against cleveref 0.21.4 dirty handling
diff --git a/Master/texmf-dist/doc/latex/fmtcount/README b/Master/texmf-dist/doc/latex/fmtcount/README
index 8a4fa7e918b..b752ab23bd4 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/README
+++ b/Master/texmf-dist/doc/latex/fmtcount/README
@@ -1,11 +1,6 @@
-LaTeX Package : fmtcount v3.07
+LaTeX Package : fmtcount v3.08
-
-(c) Copyright 2000-2013 Nicola LC Talbot
-(c) Copyright 2013-2020 Nicola LC Talbot and Vincent Bela\"iche
-
-
-Last Modified : 2020-02-24
+Last Modified : 2024-08-31
Author : Nicola Talbot and Vincent Belaïche
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
index 98673a2b817..2db224c27c1 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
+++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md b/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
index cb259caa493..cc467e7c199 100644
--- a/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
@@ -7,6 +7,19 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v2.4.0] - 2024-09-10
+
+### Changed
+- `\fontscalesetup` no longer issues a warning if the lengths of the font
+ baselineskips are not ordered from `\tiny` to `\Huge`.
+- Code improvements.
+
+## [v2.3.0] - 2024-09-06
+
+### Changed
+- The package commands no longer check if the font baselineskip is less than
+ the font size.
+
## [v2.2.0] - 2024-08-29
### Changed
diff --git a/Master/texmf-dist/doc/latex/fontscale/beery.cls b/Master/texmf-dist/doc/latex/fontscale/beery.cls
index 306ac435886..d65738d9e9f 100644
--- a/Master/texmf-dist/doc/latex/fontscale/beery.cls
+++ b/Master/texmf-dist/doc/latex/fontscale/beery.cls
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplClass
{beery}
- {2024-08-29}
+ {2024-09-10}
{}
{}
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
index 5f3c7274594..903e7e3be70 100644
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
@@ -1,6 +1,6 @@
\ProvidesFile
{fontscale-table-classic.tex}
- [2024-08-29]
+ [2024-09-10]
\begin{table}
\centering
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
index 520a681587b..50d5440c920 100644
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
@@ -1,6 +1,6 @@
\ProvidesFile
{fontscale-table-font-steps.tex}
- [2024-08-29]
+ [2024-09-10]
\begin{table}
\centering
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
index 67709ef9558..c2f88c13faf 100644
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
@@ -1,6 +1,6 @@
\ProvidesFile
{fontscale-table-musical.tex}
- [2024-08-29]
+ [2024-09-10]
\begin{table}
\centering
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf b/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
index 6e16d79ccf2..f859cb6a565 100644
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
index 84cd85c859b..8ccec27d8d8 100644
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
@@ -14,7 +14,7 @@ A flexible interface for setting font sizes
Oliver Beery
-Version 2.2.0\quad{}29 August 2024
+Version 2.4.0\quad{}10 September 2024
\section{Introduction}
@@ -101,7 +101,7 @@ This syntax has the same representation as the arguments to \cs{fpeval}, \cs{int
This section documents the keys provided by the \pkg{fontscale} package.
This package has no package options.
-Set the package keys using \cs{fontscalesetup}\marg{key-value list} (\S\ref{subsec:fontscalesetup}).
+Set the package keys using \cs{fontscalesetup}\marg{key\-/value list} (\S\ref{subsec:fontscalesetup}).
\subsection{The typographic scale}
\label{subsec:typographicscale}
@@ -131,8 +131,6 @@ Sets the font size of each font size command from \cs{tiny} to \cs{Huge} using a
These are common methods of choosing a set of document font sizes.
The keys \Key{classic\-/10pt}, \Key{classic\-/11pt}, \Key{classic\-/12pt}, and \Key{musical} set the key \Key{typographic\-/scale} to the corresponding value.
-\input{./fontscale-table-classic.tex}
-
The classic typographic scale consists of the traditional font sizes
\numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.%
\footnote{See \S3.1 of \textit{The Elements of Typographic Style} by Robert Bringhurst.}
@@ -142,6 +140,8 @@ The named point size\---\qtylist[list-final-separator={, or }]{10;11;12}{pt}\---
The font sizes of the other font size commands are the adjacent font sizes in the classic typographic scale.
Table~\ref{table:classic} displays the font size of each font size command when using a classic typographic scale.
+\input{./fontscale-table-classic.tex}
+
\Key{musical/base}[\meta{dimen expression}][10pt]%
\nopagebreak\newline
\Key{musical/ratio}[\meta{floating point expression}][2]%
@@ -181,17 +181,17 @@ The font baselineskips of the font size commands from \cs{tiny} to \cs{Huge} are
\KeepNextPar*
Sets the font baselineskip of each font size command from \cs{tiny} to \cs{Huge} equal to its font size \texttimes{} the result of computing the \meta{floating point expression}.
-Sets the font baselineskip set by \cs{SetFontStep}, \cs{SetFontScale}, and \cs{SetFontSize} (\S\ref{subsec:fontsize}) equal to the new font size \texttimes{} the result of computing the \meta{floating point expression}.
-The value of this key must be at least \num{1}.
+Sets the font baselineskip set by \cs{SetFontStep}, \cs{SetFontScale}, and \cs{SetFontSize} equal to the new font size \texttimes{} the result of computing the \meta{floating point expression} (\S\ref{subsec:fontsize}).
\subsection{Overwriting the previous keys}
\label{subsec:overwriting}
This subsection documents keys for directly setting the font scales, font sizes, and font baselineskips of the font size commands from \cs{tiny} to \cs{Huge}.
-When doing so, the user should take care to ensure that the lengths of the font sizes and font baselineskips remain correctly ordered from \cs{tiny} to \cs{Huge}.
+
+The user should take care to ensure that the lengths of the font sizes remain correctly ordered from \cs{tiny} to \cs{Huge}.
This is important for typographic and syntactic consistency.
-If the font size commands are in the wrong order, this package will issue a warning and some package features may not work correctly.
+If the font sizes are in the wrong order, \cs{fontscalesetup} will issue a warning and some package features may not work correctly.
\Key{\meta{font size command}/scale}[\meta{floating point expression}][\meta{not set}]
\KeepNextPar*
@@ -210,16 +210,18 @@ Overwrites the font size set by the keys \Key{typographic\-/scale} and \Key{\met
\KeepNextPar*
Sets the font baselineskip of \meta{font size command} to the value of \meta{skip expression}, appending a default unit of \unit{pt}.
-The font baselineskip must be greater than or equal to the font size.
Overwrites the font baselineskip set by the key \Key{baselineskip\-/size\-/ratio}.
\Key{\meta{font size command}}[\meta{dimen expression}]
\nopagebreak\newline
\Key{\meta{font size command}}[\meta{dimen expression}/\meta{skip expression}]
-Sets the keys \Key{\meta{font size command}\slash{}size}[\meta{dimen expression}] or \Key{\meta{font size command}\slash{}baselineskip}[\meta{skip expression}] in a condensed format.
-The latter format resembles traditional typographic notation where the size and leading of a text can be expressed as, for example, \num{10}/\num{12} or \num{11}/\num{13}.
-The number before\slash{}after the slash is the size\slash{}leading in units of \unit{pt}.
+Sets the keys \Key{\meta{font size command}\slash{}size}[\meta{dimen expression}] or \Key{\meta{font size command}\slash{}baselineskip}[\meta{skip expression}] in a condensed format.%
+\footnote
+ {%
+ The latter format resembles traditional typographic notation where the size and leading of a text can be expressed as, for example, \num{10}/\num{12} or \num{11}/\num{13}.
+ The number before\slash{}after the slash is the size\slash{}leading in units of \unit{pt}.%
+ }
\section{Commands}
@@ -273,7 +275,7 @@ Tests if the current font size and current font baselineskip equal the font size
If so, expands to the name of that font size command.
This omits the backslash character and leaves only letters with catcode \num{11}.
If not, expands to nothing.
-This package also provides a similar command \cs{PrintFontSizeCommand} (\S\ref{subsec:debug}), which is not expandable and includes the backslash character.
+This package also provides a similar command \cs{PrintFontSizeCommand}, which is not expandable and includes the backslash character (\S\ref{subsec:debug}).
\subsection{More font size commands}
\label{subsec:fontsize}
@@ -327,7 +329,6 @@ Does nothing, except issue a warning, if used in math mode.
Sets the font size to the value of \meta{dimen expression}, appending a default unit of \unit{pt}.
Sets the font baselineskip to the value of \meta{skip expression}, appending a default unit of \unit{pt}.
-The font baselineskip must be greater than or equal to the font size.
Does nothing, except issue a warning, if used in math mode.
Can be used as an alternative to \cs{fontsize} + \cs{selectfont} as discussed in \S\ref{subsec:expandable}.
@@ -339,7 +340,6 @@ Can be used as an alternative to \cs{fontsize} + \cs{selectfont} as discussed in
Sets the font baselineskip to the value of \meta{skip expression}, appending a default unit of \unit{pt}.
Adding the optional star instead increases the current font baselineskip by the result of \meta{skip expression}, appending a default unit of \unit{pt}.
-The font baselineskip must be greater than or equal to the font size.
Does not change the font size.
Does nothing, except issue a warning, if used in math mode.
@@ -366,7 +366,7 @@ Prints the font step, font scale, font size, and font baselineskip of each font
Prints \meta{text} in each font size ordered from \cs{tiny} to \cs{Huge} each followed by a paragraph break.
\meta{text} can contain \cs{par} tokens.
Adding the optional star reverses the order of the font sizes.
-One useful way of printing example text is \cs{PrintSampleText}\allowbreak\texttt{\{\cs{PrintFontSizeCommand}:\allowbreak\textvisiblespace\allowbreak\cs{PrintFontSizeParameters}\}}.
+One useful way of printing sample text is \cs{PrintSampleText}\allowbreak\texttt{\{\cs{PrintFontSizeCommand}:\allowbreak\textvisiblespace\allowbreak\cs{PrintFontSizeParameters}\}}.
\cs{PrintFontSizeCommand}
\KeepNextPar*
@@ -374,7 +374,7 @@ One useful way of printing example text is \cs{PrintSampleText}\allowbreak\textt
Tests if the current font size and current font baselineskip equal the font size and font baselineskip, respectively, of any font size command from \cs{tiny} to \cs{Huge}.
If so, prints the name of that font size command, including the backslash character.
If not, prints \enquote{\string\undefined}.
-This package also provides a similar command \cs{CurrentFontSizeCommand} (\S\ref{subsec:expandable}), which is expandable and omits the backslash character.
+This package also provides a similar command \cs{CurrentFontSizeCommand}, which is expandable and omits the backslash character (\S\ref{subsec:expandable}).
\section{Programming}
diff --git a/Master/texmf-dist/doc/latex/fontsetup/README b/Master/texmf-dist/doc/latex/fontsetup/README
index 3c2ec51ef05..c39d73a4c44 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/README
+++ b/Master/texmf-dist/doc/latex/fontsetup/README
@@ -1,5 +1,5 @@
The fontsetup package
- (Version 2.1.1, GPL3)
+ (Version 2.2.1, GPL3)
This simple package makes it trivial to switch quickly between
different quality fonts supporting Mathematics.
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
index 68d519c607d..4fc24f90f59 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
index d8ec1bd3378..133138d4212 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fontsetup-doc.tex
@@ -1,8 +1,6 @@
\documentclass{book}
\synctex=1
\usepackage[default]{fontsetup}
-%\usepackage[fira]{fontsetup}
-%\usepackage{fontsetup}
\newfontfamily\newcmgreekguillemots[CharacterVariant=4]{NewCM10-Book.otf}
\newfontfamily\devfont[Script=Devanagari,Language=Marathi]{NewCM10Devanagari-Book.otf}
\newcommand\leftgrquotes{\char"201C}
@@ -17,11 +15,11 @@
\textit{by}\\[1ex]
{\large Antonis Tsolomitis}\\
University of the Aegean\\ Department of Mathematics\\[1ex]
- \textsc{24} February \textsc{2024}\\[1ex]
- Version 2.1.1, \textsc{gpl3}
+ \textsc{9} September \textsc{2024}\\[1ex]
+ Version 2.2.1, \textsc{gpl3}
\end{center}
- This package is a simple wrapper-type package that makes the setup of fonts easy and
+This package is a simple wrapper-type package that makes the setup of fonts easy and
quick for XeLaTeX and LuaLaTeX. You just load the package using one of the supported
fonts as an option.
@@ -74,7 +72,11 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
\item commands to access the Ancient Greek Numbers (Unicode u10140--u1018E)
documented in the Appendix
\item commands to access the negation of uniform convergence symbols \verb|\nrightrightarrows|
- for $\nrightrightarrows$ and \verb|\nleftleftarrows| for $\nleftleftarrows$.
+ for $\nrightrightarrows$ and \verb|\nleftleftarrows| for $\nleftleftarrows$, and
+ 1-1 and onto functions: \verb|\twoheadhookrightarrow| for $\twoheadhookrightarrow$ and
+ \verb|\twoheadhookleftarrow| for $\twoheadhookleftarrow$.
+ \item command \verb|\convolution| to access the new convolution operator $\convolution$
+ (check the documentation of NewCM fonts).
\item commands to access the IPA symbols. These are \verb|\ipatext| and
\verb|\textipa{...}| to select the fonts
for IPA symbols locally. Compare \textipa{ðŋβθχ}
@@ -112,7 +114,8 @@ NewComputerModern font family.
fontsetup-nonfree is installed.
\item[concrete] Loads the Concrete fonts from the \texttt{cmu} package with Concrete-Math
font for mathematics.
- \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math.
+ \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math and complements them with
+ Ysabeau for Sans.
\item[erewhon] Loads the Erewhon fonts with Erewhon-Math.
\item[euler] Loads the Concrete fonts with the Euler-Math for Mathematics. This option replaces
the older option \texttt{neoeuler} which was using the neoeuler font. This font has continued
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
index 8423318316b..69a5fbd0c89 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-cmr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
index 577d069a552..a412389f090 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-concrete.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
index 6084e0e3bf3..7cc1c3faa0a 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-ebgaramond.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
index 479fecca543..e9e5538d93b 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-fira.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
index 5161451c9f5..e94e972ce57 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-kerkis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
index 736690886c2..11d7c8fceee 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-newdefault.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
index 384b5ee71e0..c3fc62698c5 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-talos.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf
new file mode 100644
index 00000000000..505a53ae76f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex
new file mode 100644
index 00000000000..5eea2f65d51
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-withsans.tex
@@ -0,0 +1,120 @@
+%% after xelatex run
+%% pdfcrop fspsample.pdf output.pdf
+%% to crop it
+\documentclass{article}
+\pagestyle{empty}
+\usepackage{graphicx,wrapfig,xcolor}
+\pagestyle{empty}
+%\usepackage[greek]{babel}
+%\usepackage[utf8x]{inputenc}
+%\usepackage{amsfonts}
+
+\usepackage{polyglossia}
+\setdefaultlanguage{english}
+\setotherlanguage{greek}
+
+\usepackage[default]{fontsetup}%upint, newcmbb
+%\usepackage[gfsartemisia]{fontsetup}
+%\usepackage[gfsdidot]{fontsetup}
+%\usepackage[gfsdidotclassic]{fontsetup}
+%\usepackage[gfsneohellenic]{fontsetup}
+%\usepackage[cambria]{fontsetup}
+%\usepackage[lucida]{fontsetup}
+%\usepackage[kerkis]{fontsetup}
+%\usepackage[fira]{fontsetup}
+%\usepackage[times]{fontsetup}
+%\usepackage[palatino]{fontsetup}
+%\usepackage[stixtwo]{fontsetup}
+%\usepackage[neokadmus]{fontsetup}
+%\usepackage[msgaramond]{fontsetup}
+%\usepackage[ebgaramond]{fontsetup}
+%\usepackage[minion]{fontsetup}
+%\usepackage[euler]{fontsetup}
+%\usepackage[neoeuler]{fontsetup}
+%\usepackage[libertinus]{fontsetup}
+%\usepackage[olddefault]{fontsetup}%upint, newcmbb
+%\usepackage[concrete]{fontsetup}
+%\usepackage[talos]{fontsetup}
+%\usepackage[oldstandard]{fontsetup}
+%\usepackage[xcharter]{fontsetup}% upint
+%\usepackage[erewhon]{fontsetup}
+
+\newtheorem{theorem}{Theorem}
+\newtheorem{theoremg}[theorem]{ΘεώÏημα}
+
+\makeatletter
+\long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{\sffamily #1: #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ {\sffamily #1: #2}\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \vskip\belowcaptionskip}
+\makeatother
+
+
+
+
+\begin{document}
+
+\begin{theorem}[Dominated convergence of Lebesgue]
+%Let $g$ be an
+Assume that $g$ is an
+in\-te\-grable func\-tion defined on the measurable set $E$ and that
+ $(\,f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able functions so that
+ $|\,f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere
+ then $$\lim_{n\to\infty}\int f_n=\int f.$$
+\end{theorem}
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+ {\Huge\textsf{\color{lightgray}ABC}}
+\end{center}
+\caption{Caption in Sans fonts}
+\end{wrapfigure}
+\textit{Proof}: The function $g-f_n$ is \textit{non-negative} and thus from Fatou lemma
+we have that $\int(g-f\,)\leq\liminf\int(g-f_n)$. Since $|\,f\,|\leq g$ and
+$|\,f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have
+$$\int g-\int f\,\leq \int g-\limsup\int f_n,$$ so
+$$\int f\,\geq \limsup \int f_n.$$
+\par
+
+\selectlanguage{greek}
+
+
+\begin{theoremg}[ΚυÏιαÏχημένης σÏγκλισης του Lebesgue]
+ Έστω ότι
+η $g$ είναι μια ολοκληÏώσιμη συνάÏτηση οÏισμένη στο μετÏήσιμο σÏνολο
+$E$ και η $(\,f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετÏήσιμων συναÏτήσεων ώστε
+$|\,f_n| ≤ g$. Υποθέτουμε ότι υπάÏχει μια συνάÏτηση $f$
+ώστε η $(f_n)_{n\in\mathbb N}$ να
+τείνει στην $f$ σχεδόν παντοÏ. Τότε
+$$\lim \int f_n =\int f.$$
+\end{theoremg}
+
+%% Comment for xcharter %%%
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+ {\Huge\textsf{\color{lightgray}ΓΨΩ}}
+\end{center}
+\caption{Λεζάντα σε γÏαμματοσειÏά Sans}
+\end{wrapfigure}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\textit{Απόδειξη}: Η συνάÏτηση $g − f_n$ είναι \textit{μη αÏνητική} και άÏα από
+το Λήμμα του Fatou ισχÏει
+$\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή
+$|\,f\,| ≤ g$ και $|\,f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληÏώσιμες, έχουμε
+$$\int g −\int f\, ≤ \int g − \limsup\int f_n,$$
+άÏα
+$$\int f\,\geq \limsup \int f_n.$$
+
+
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
index 97b9e2c9f5d..954c4004d60 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample-xcharter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf b/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
index 89bee7ffc6b..c297af6b90d 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
index ac293097252..c012dad2990 100644
--- a/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
+++ b/Master/texmf-dist/doc/latex/fontsetup/fspsample.tex
@@ -3,14 +3,18 @@
%% to crop it
\documentclass{article}
\pagestyle{empty}
-\usepackage{xgreek,graphicx}
+\usepackage{graphicx,wrapfig,xcolor}
\pagestyle{empty}
%\usepackage[greek]{babel}
%\usepackage[utf8x]{inputenc}
%\usepackage{amsfonts}
+\usepackage{polyglossia}
+\setdefaultlanguage{english}
+\setotherlanguage{greek}
+
%\usepackage[default]{fontsetup}%upint, newcmbb
-%\usepackage[gfsartemisia]{fontsetup}
+\usepackage[gfsartemisia]{fontsetup}
%\usepackage[gfsdidot]{fontsetup}
%\usepackage[gfsdidotclassic]{fontsetup}
%\usepackage[gfsneohellenic]{fontsetup}
@@ -25,7 +29,7 @@
%\usepackage[msgaramond]{fontsetup}
%\usepackage[ebgaramond]{fontsetup}
%\usepackage[minion]{fontsetup}
-\usepackage[euler]{fontsetup}
+%\usepackage[euler]{fontsetup}
%\usepackage[neoeuler]{fontsetup}
%\usepackage[libertinus]{fontsetup}
%\usepackage[olddefault]{fontsetup}%upint, newcmbb
@@ -38,6 +42,21 @@
\newtheorem{theorem}{Theorem}
\newtheorem{theoremg}[theorem]{ΘεώÏημα}
+\makeatletter
+\long\def\@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{\sffamily #1: #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ {\sffamily #1: #2}\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \vskip\belowcaptionskip}
+\makeatother
+
+
+
\begin{document}
@@ -49,12 +68,23 @@ in\-te\-grable func\-tion defined on the measurable set $E$ and that
$|\,f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere
then $$\lim_{n\to\infty}\int f_n=\int f.$$
\end{theorem}
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+ {\Huge\textsf{\color{lightgray}ABC}}
+\end{center}
+\caption{Caption in Sans fonts}
+\end{wrapfigure}
\textit{Proof}: The function $g-f_n$ is \textit{non-negative} and thus from Fatou lemma
we have that $\int(g-f\,)\leq\liminf\int(g-f_n)$. Since $|\,f\,|\leq g$ and
$|\,f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have
$$\int g-\int f\,\leq \int g-\limsup\int f_n,$$ so
$$\int f\,\geq \limsup \int f_n.$$
\par
+
+\selectlanguage{greek}
+
+
\begin{theoremg}[ΚυÏιαÏχημένης σÏγκλισης του Lebesgue]
Έστω ότι
η $g$ είναι μια ολοκληÏώσιμη συνάÏτηση οÏισμένη στο μετÏήσιμο σÏνολο
@@ -64,6 +94,15 @@ $|\,f_n| ≤ g$. Υποθέτουμε ότι υπάÏχει μια συνάÏÏ„Î
τείνει στην $f$ σχεδόν παντοÏ. Τότε
$$\lim \int f_n =\int f.$$
\end{theoremg}
+
+
+\begin{wrapfigure}[4]{o}{0.22\textwidth}\vspace*{-1.8\baselineskip}
+\begin{center}
+ {\Huge\textsf{\color{lightgray}ΓΨΩ}}
+\end{center}
+\caption{Λεζάντα σε γÏαμματοσειÏά Sans}
+\end{wrapfigure}
+
\textit{Απόδειξη}: Η συνάÏτηση $g − f_n$ είναι \textit{μη αÏνητική} και άÏα από
το Λήμμα του Fatou ισχÏει
$\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή
diff --git a/Master/texmf-dist/doc/latex/framedsyntax/FramedSyntax.pdf b/Master/texmf-dist/doc/latex/framedsyntax/FramedSyntax.pdf
new file mode 100644
index 00000000000..ac6862130bf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/framedsyntax/FramedSyntax.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/framedsyntax/README.txt b/Master/texmf-dist/doc/latex/framedsyntax/README.txt
new file mode 100644
index 00000000000..29ed1935690
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/framedsyntax/README.txt
@@ -0,0 +1,12 @@
+ README.txt file for FramedSyntax.sty 2024-09-04 v.0.2.8
+
+
+ Distributable under the LaTeX Project Public License,
+ version 1.3c or higher (your choice). The latest version of
+ this license is at: http://www.latex-project.org/lppl.txt
+
+ This work is "maintained"
+
+ This work consists of this file FramedSyntax.dtx, a README.txt
+ file and the derived files: FramedSyntax.sty, FramedSyntax.pdf.
+
diff --git a/Master/texmf-dist/doc/latex/fvextra/CHANGELOG.md b/Master/texmf-dist/doc/latex/fvextra/CHANGELOG.md
index 7556c74a2d1..1ed8da03908 100644
--- a/Master/texmf-dist/doc/latex/fvextra/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/fvextra/CHANGELOG.md
@@ -1,6 +1,50 @@
# Changelog
+## v1.8.0 (2024/09/14)
+
+* Added new option `backgroundcolor` (alias `bgcolor`). This provides a
+ basic, `\colorbox`-based implementation of background colors for commands
+ and environments. Added new option `backgroundcolorvphantom` (alias
+ `bgcolorvphantom`) for customizing background height. Added new option
+ `backgroundcolorpadding` (alias `bgcolorpadding`) for customizing padding
+ between text and the edge of the region with background color.
+
+* Added option `insertenvname`. This customizes the verbatim environment
+ used by `\VerbatimInsertBuffer`.
+
+* When `numberblanklines=false`, `highlightlines` no longer highlights blank
+ lines at the end of a highlighted range (#25, gpoore/minted#226).
+
+* An unnecessary line break is no longer inserted before the last "word" of a
+ line when it is preceded by a long "word" that is broken internally as a
+ result of `breakbefore`, `breakafter`, or `breakanywhere` (#26).
+
+* Added option `breakpreferspaces` (default `true`). This determines whether
+ line breaks are preferentially inserted at normal spaces rather than at
+ other locations allowed by `breakbefore`, `breakafter`, or `breakanywhere`
+ (#26).
+
+* Added option `breakanywhereinlinestretch` (gpoore/minted#387).
+
+* `\FVExtraReadVArg` now takes a multi-line (but not multi-paragraph)
+ verbatim argument. The new `\FVExtraReadVArgSingleLine` provides the old
+ functionality of taking an argument restricted to a single line
+ (gpoore/minted#376).
+
+* By default, `\Verb` and `\SaveVerb` now take multi-line (but not
+ multi-paragraph) verbatim arguments. The old behavior of requiring
+ verbatim arguments to be on a single line can be restored by setting the
+ new option `vargsingleline` to `true`.
+
+* Added documentation for undocumented `fancyvrb` option `listparameters`
+ (gpoore/minted#256).
+
+* Expanded `breaklines` documentation with discussion of limitations and
+ alternatives (gpoore/minted#400).
+
+
+
## v1.7.0 (2024/05/16)
* Added new command `\VerbatimClearBuffer`.
@@ -209,7 +253,7 @@
* Added `highlightlines` option that takes a line number or range of line
numbers and highlights the corresponding lines. Added `highlightcolor`
- option that controls hightlighting color.
+ option that controls highlighting color.
* `obeytabs` no longer causes lines to vanish when tabs are inside macro
arguments. Tabs and spaces inside a macro argument but otherwise at the
diff --git a/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf b/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf
index b38e213561e..4d1e204c525 100644
--- a/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf
+++ b/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf b/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
index 79892c24d2c..297edc77644 100644
--- a/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
+++ b/Master/texmf-dist/doc/latex/heria/heria-proposal.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/heria/heria.pdf b/Master/texmf-dist/doc/latex/heria/heria.pdf
index 3295f000a9b..8a70466fe0f 100644
--- a/Master/texmf-dist/doc/latex/heria/heria.pdf
+++ b/Master/texmf-dist/doc/latex/heria/heria.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/homework/README.md b/Master/texmf-dist/doc/latex/homework/README.md
index 4014e4ef498..ba58bb840f8 100644
--- a/Master/texmf-dist/doc/latex/homework/README.md
+++ b/Master/texmf-dist/doc/latex/homework/README.md
@@ -13,6 +13,8 @@ The current document class is for writing homework or assignment. It has the fol
- Every statement and solution has its own Q.E.D. symbol, in hollow or solid shape, respectively.
- You may mark unfinished parts with `\DNF` or `\DNF<⟨remark⟩>` (meaning "did not finish") for reminding — this will give you a clickable report on the unfinished parts at the end of your document.
+> Package dependencies: [*`einfart`*](https://ctan.org/pkg/minimalist), [`lastpage`](https://ctan.org/pkg/lastpage), [`minimalist`](https://ctan.org/pkg/minimalist), [`projlib`](https://ctan.org/pkg/projlib), [`verbatim`](https://ctan.org/pkg/verbatim).
+
## Installation and preparation
### How to install this package
@@ -39,22 +41,24 @@ Also, without these fonts installed, the compilation speed might be much slower
> It is recommended that you start by looking at one of the [demo documents](https://github.com/Jinwen-XU/homework/tree/main/demo) that suits your need and edit the code there to get your own template.
-> If you don't find what you were expecting, or if you would like some elements to be changed or improved, feel free to post a feature request via [the GitHub issue](https://github.com/Jinwen-XU/homework/issues).
+> If you cannot find what you are expecting, or if you would like some elements to be changed or improved, feel free to post a feature request via [the GitHub issue](https://github.com/Jinwen-XU/homework/issues).
A typical homework document looks like this:
```latex
\documentclass[a4paper, 11pt,
- % twoside, % Use this option if you wish to use double-sided printing
+ % twoside, % Use this option if you wish to use double-sided printing.
logo = {image-of-university-logo}, % Remove this line if you don't want logo presented.
% logo height = 1cm, % In case you are not satisfied with the default logo size.
title in boldface,
title in sffamily,
- theorem in new line,
- % remove qed, % Remove the Q.E.D. symbol for problems/questions/lemmas/...
- colored solution, % Show solution/answer with color, default is blue
- % You may specify this as "colored solution = ⟨color⟩"
- % hide solution, % Use this option to hide the solutions/answers
+ theorem in new line, % Print the theorem title in a separate line.
+ % remove qed, % Remove the Q.E.D. symbols,
+ % or only remove part of the Q.E.D. symbols,
+ % via "remove problem qed" or "remove solution qed".
+ colored solution, % Show solution/answer with color, default is blue.
+ % You may specify this as "colored solution = ⟨color⟩".
+ % hide solution, % Use this option to hide the solutions/answers.
]{homework}
\UseLanguage{...} % If you wish to write your homework in languages other than English.
@@ -62,7 +66,7 @@ A typical homework document looks like this:
\title{The Subject, Week 1}
\author{Author NAME}
-\date{\TheDate{2023-12-25}, Location} % or: \date{\today[only-year-month], Location}
+\date{\TheDate{2024-01-01}, Location} % or: \date{\today[only-year-month], Location}
\begin{document}
@@ -173,7 +177,7 @@ Alternatively, if you are making an exercise sheet and prefer a more formal titl
\\
Course ID \& Course Name
\hfill
- Year 2023--24
+ Year 2024--25
}
\title{%
@@ -181,7 +185,7 @@ Alternatively, if you are making an exercise sheet and prefer a more formal titl
}
\author{}
\date{%
- % \TheDate{2023-12-25}
+ % \TheDate{2024-01-01}
}
@@ -197,7 +201,9 @@ Regarding some of the class options:
1) The logo image can be included via the class option `logo = {⟨image file name⟩}`, and if you are not satisfied with its default size, then you may manually specify the size via the option `logo height = {⟨height⟩}` or `logo width = {⟨width⟩}`. If you do not want to show any logo in the title bar, you may simply remove the option `logo = {⟨image file name⟩}`.
1) The options `title in boldface`, `title in sffamily` or even `title in scshape` are for configuring the text effect of the title line, the sectional titles and theorem names.
1) The option `theorem in new line` is for showing the problem / theorem name, numbering and description in a separate line, for the sake of clarity.
-1) The option `remove qed` is for removing the Q.E.D. symbol for theorem-type environment.
+1) The option `remove qed` is for removing all the Q.E.D. symbol.
+ - If you only wish to remove the Q.E.D. symbol for problems/questions/lemmas/..., use `remove problem qed` or `remove question qed` (they are the same).
+ - If you only wish to remove the Q.E.D. symbol for solutions/answers, use `remove solution qed` or `remove answer qed` (they are the same).
1) The option `formal title` is for enabling the formal title style. There would be no logo and no separation lines, and the title would be centered.
1) The option `colored solution` or `colored solution = ⟨color⟩` is for setting the text color of the solution/answer.
1) The option `hide solution` (or `hide answer`) is for hiding the `solution` and `answer` environments.
@@ -249,6 +255,8 @@ and then write this in your preamble:
The author would like to thank David García-Zelada for his valuable help with the Spanish language. He kindly demonstrated to me the difference between the "Tutoyer" and "Vouvoyer" version, patiently corrected many inaccuracies in the demo documents, and also pointed out a few improper translations in some of my other packages.
+The author would also like to thank his friend Junzhuo Zhao for his valuable help with the German language. Danke schön!
+
## License
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index ac9450c444d..a44bbdc7871 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,7 @@
hvfloat.sty:
+2.51 2024-10-02 - added option nonFloatTopSkip, preset to 2pt like \interlineskip
+ only valid for nonFloats and caption not on top
+2.50 2024-04-06 - first try for a check on page beginning
2.49 2024-03-17 - bugfix for checkoddpage and FULLPAGE option
2.48 2024-03-03 - added option fboxLines to get patial lines of \fbox
(package fbox)
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index eb14a418f5c..df6892daae9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
index 169270c2d46..846f363bc1f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 878 2024-03-16 20:49:50Z herbert $
+%% $Id: hvfloat.tex 1014 2024-10-03 08:22:14Z herbert $
%\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry,index=totoc]{scrartcl}
@@ -401,6 +401,7 @@ There are the following keywords:
\Lkeyword{nonFloat} & false & \rowvsp The object isn't put in a floating
environment, but printed as standard text with an additional caption.
\rownl The float counter is increased as usual and can be referenced.\\
+\Lkeyword{nonFloatTopSkip} & 2pt & Skip between text and object with caption below for nonFloat objects.\\
\Lkeyword{wide} & false & \rowvsp The float can use
\Ldim{textwidth}$\,+\,$\Ldim{marginparwidth} as horizontal width.\\
\Lkeyword{inMargin} & false & \rowvsp Put object and frame into the margin.\\
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/README b/Master/texmf-dist/doc/latex/iaria-lite/README
index 018e09ba461..62decf0ef34 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/README
+++ b/Master/texmf-dist/doc/latex/iaria-lite/README
@@ -1,17 +1,21 @@
-----------------------------
- Version 0.2 of the iaria-lite class
+ Version 0.4 of the iaria-lite class
Christoph P. Neumann
-----------------------------
-This LaTeX provides a simple environment for
-technical reports as scholary publication.
+This package contains templates for the creation of documents for
+IARIA publications (International Academy, Research, and Industry Association)
+and implements the specifications for the IARIA citation style.
-NEU = Neumann
-TR = Technical Report
+This class does not contain evil low-level TeX magic
+but instead uses many other fancy LaTeX packages
+that we hope you have already installed.
-As this class is created mainly for ourselves it does not
-contain evil low-level TeX magic but instead uses many other
-fancy LaTeX packages that we hope you have already installed.
+It does not implement the specifications for the IARIA citation style,
+for which you have to use the iaria class.
+
+DISCLAIMER: If your are using pdflatex/biblatex/biber,
+it is recommended to use CTAN package iaria.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/iaria-lite.pdf b/Master/texmf-dist/doc/latex/iaria-lite/iaria-lite.pdf
index a004deb1be6..a015125dbc4 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/iaria-lite.pdf
+++ b/Master/texmf-dist/doc/latex/iaria-lite/iaria-lite.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_all_all.bib b/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_all_all.bib
index cc7abaec4a1..ba79c018327 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_all_all.bib
+++ b/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_all_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{neumann2004sa,
author = {Neumann, Christoph P.},
title = {{Conceptional Design and Realization of a `Component Test Stand' for Measurements on Enterprise JavaBeans}},
@@ -7,6 +8,7 @@
type = {Studienarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Studienarbeit_ChristophPeterNeumann_revised/}
}
+
@Thesis{neumann2005da,
author = {Neumann, Christoph P.},
title = {{Design of an Open Framework for Optimizing the Distribution of Hardware and Software Components in Control Networks for Vehicles}},
@@ -16,6 +18,7 @@
type = {Diplomarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Diplomarbeit_ChristophPeterNeumann_original/}
}
+
@INPROCEEDINGS{MeNe04testejb,
author = {Marcus Meyerh{\"o}fer and Christoph Neumann},
title = {{TestEJB} -- A Measurement Framework for {EJBs}},
@@ -35,21 +38,20 @@
@INPROCEEDINGS{NHSL09oxdbs,
author = {Christoph P. Neumann and Stefan Hanisch and Bernhard Schiemann and
- Richard Lenz},
+ Richard Lenz},
title = {{OXDBS -- Erweiterung einer nativen XML\-/Datenbank um die Validierung
- und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
+ und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
booktitle = {Tagungsband der 54.\,GMDS\-/Jahrestagung},
year = {2009},
_pages = {271:1--271:2},
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS271},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds271.shtml},
}
-
@INPROCEEDINGS{NeWL09xdsrig,
author = {Christoph P. Neumann and Florian Wagner and Richard Lenz},
title = {{XdsRig -- Eine Open\-/Source IHE XDS Testumgebung}},
@@ -59,15 +61,14 @@
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS276},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds276.shtml},
}
-
@INPROCEEDINGS{NRDL09deus,
- author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
- title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
+ author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
+ title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd ACM Int'l Conf on Distributed Event\-/Based Systems (DEBS 2009)},
year = {2009},
_chapter = {14},
@@ -85,8 +86,8 @@
author = {Christoph P. Neumann and Richard Lenz},
title = {{alpha\-/Flow: A Document\-/based Approach to Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {569--580},
address = {Ulm, DE},
@@ -100,10 +101,10 @@
@INPROCEEDINGS{NeLe09dmps,
author = {Christoph P. Neumann and Richard Lenz},
title = {{A Light\-/Weight System Extension Supporting Document\-/based Processes
- in Healthcare}},
+ in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {557--568},
address = {Ulm, DE},
@@ -140,12 +141,13 @@
doi = {10.1145/1866480.1866502},
_isbn = {978\-/1\-/60558\-/900\-/8},
}
+
@INPROCEEDINGS{NSWL11alphaadaptive,
author = {Christoph P. Neumann and Peter K. Schwab and Andreas M. Wahl and Richard Lenz},
title = {{alpha\-/Adaptive: Evolutionary Workflow Metadata in Distributed Document\-/Oriented Process Management}},
booktitle = {Proc of the 4th Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
- on Business Process Management (BPM'11)},
+ in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
+ on Business Process Management (BPM'11)},
year = {2011},
pages = {225--236},
address = {Clermont\-/Ferrand, FR},
@@ -209,26 +211,26 @@
}
@MastersThesis{Neumann2012dissPreprint_OldBibTeX,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- type = {Dissertation},
- _type = {`Dissertation' (PhD thesis)},
- _type = {PhD thesis (`Dissertation' in Germany)},
- month = nov,
- year = 2012,
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ type = {Dissertation},
+ _type = {`Dissertation' (PhD thesis)},
+ _type = {PhD thesis (`Dissertation' in Germany)},
+ month = nov,
+ year = 2012,
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@phdthesis{Neumann2012dissPreprint,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- month = nov,
- year = 2012,
- address = {Erlangen},
- doi = {10.13140/RG.2.2.14719.79521},
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ month = nov,
+ year = 2012,
+ address = {Erlangen},
+ doi = {10.13140/RG.2.2.14719.79521},
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@INPROCEEDINGS{NeLe13adhocCoop,
@@ -244,7 +246,9 @@
_isbn = {978\-/3\-/642\-/36437\-/2},
doi = {10.1007/978-3-642-36438-9_8},
_url = {https://doi.org/10.1007/978-3-642-36438-9_8},
-}@incollection{Neumann2012lni,
+}
+
+@incollection{Neumann2012lni,
author={Christoph P. Neumann},
editor={Abraham Bernstein and Wolfgang Effelsberg and Steffen H{\"o}lldobler and Hans{-}Peter Lenhof and Klaus{-}Peter L{\"o}hr and Paul Molitor and Gustaf Neumann and R{\"u}diger Reischuk and Nicole Schweikardt and Myra Spiliopoulou and Harald St{\"o}rrle and Sabine S{\"u}sstrunk},
title={Verteiltes Dokumenten\-/orientiertes Prozessmanagement im Gesundheitswesen},
@@ -256,18 +260,19 @@
year={2012},
url={https://dl.gi.de/20.500.12116/33740}
}
+
@BOOK{Neumann2013dissBook,
- author = {Christoph P. Neumann},
- title = {{Distributed Case Handling}},
- year = 2013,
- publisher = {Verlag Dr.~Hut},
- address = {M{\"u}nchen},
- isbn = {9783843909198},
- _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
- _url = {https://d-nb.info/1033041637},
- _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
- _note = {\url{https://d-nb.info/1033041637}(DNB)},
- _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Case Handling}},
+ year = 2013,
+ publisher = {Verlag Dr.~Hut},
+ address = {M{\"u}nchen},
+ isbn = {9783843909198},
+ _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
+ _url = {https://d-nb.info/1033041637},
+ _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
+ _note = {\url{https://d-nb.info/1033041637}(DNB)},
+ _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
}
@INPROCEEDINGS{IND+09lzatav,
@@ -363,11 +368,10 @@
month=apr,
year={2024},
doi = {10.48550/arXiv.2404.02637},
- _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_X_YY_ZZZZZ},
- _url = {https://doi.org/10.48550/arXiv.2404.02637},
+ _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_2_10_28007},
+ _url2 = {https://doi.org/10.48550/arXiv.2404.02637},
_issn = {2308\-/4294},
- _pages = {AA--OO},
- note = {accepted for publication}
+ pages = {19--24}
}
@INPROCEEDINGS{ToNe11alphaprops,
@@ -425,6 +429,28 @@
_url2 = {https://www.oth-aw.de/files/oth-aw/Aktuelles/Veroeffentlichungen/Forschungsbericht/OTH_Forschungsbericht_2024.pdf},
_url3 = {https://www.researchgate.net/profile/Christoph-Neumann-8/publication/379109359_Analyse_von_Methoden_zur_Sicherung_der_Vertraulichkeit_in_Neuronalen_Netzen/links/65faff43a4857c7962654c5c/Analyse-von-Methoden-zur-Sicherung-der-Vertraulichkeit-in-Neuronalen-Netzen.pdf}
}
+
+@MISC{StNe24kosmosis,
+ title={The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention},
+ author={Philipp Stangl and Christoph P. Neumann},
+ year={2024},
+ eprint={2405.19762},
+ archivePrefix={arXiv},
+ primaryClass={cs.CR}
+}
+
+@TECHREPORT{StNe24kosmosis-TR,
+ author = {Philipp Stangl and Christoph P. Neumann},
+ title = {{The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab at the Department of Electrical Engineering, Media and Computer Science},
+ series = {Technischer Bericht},
+ number = {CL-2024-01},
+ year = 2024,
+ month = 2,
+ doi = {10.48550/arXiv.2405.19762},
+ _url = {https://doi.org/10.48550/arXiv.2405.19762},
+}
+
@TECHREPORT{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard,
author = {Tobias Bauer and Albert Hahn and Lukas Kleinlein and Nicolas Proske and Leonard W{\"o}llmer and Andrei Trukhin and Christoph P. Neumann},
title = {{Covidash: Eine MEAN\-/Variation-basierte Webanwendung für Inzidenz\-/Zahlen und Impffortschritt in Deutschland}},
@@ -543,7 +569,6 @@
_url = {https://dx.doi.org/10.13140/RG.2.2.33933.31209},
}
-
@TECHREPORT{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline,
author = {André Kestler and Antonio Vidos and Marcus Haberl and Tobias Dobmeier and Tobias Lettner and Tobias Weiß and Christoph P. Neumann},
title = {{Computer Vision Pipeline: Eine React- und Flask\-/basierte Webanwendung zur No\-/Code\-/Bildverarbeitung mit Cloud\-/Deployment}},
@@ -622,4 +647,107 @@
doi = {10.13140/RG.2.2.22177.79209},
_url = {https://dx.doi.org/10.13140/RG.2.2.22177.79209},
}
+@TECHREPORT{ModA-TR-2024SS-CCT-TeamGruen-CloudDice,
+ author = {Lukas Rupp and Franziska Rubenbauer and Christoph P. Neumann},
+ title = {{CloudDice: Ein React\-/basiertes Kniffel-Würfelspiel}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ series = {Technische Berichte},
+ number = {CL-2024-14},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.11229.83686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.11229.83686},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue,
+ author = {Fabian Heindl and Paul Brand and Daniel Reichert and Christoph P. Neumann},
+ title = {{SkillIssue: A MERN\-/based Low\-/Latency Multi\-/User Game for Displaying True Skill With Your Friends}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-12},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.32201.35686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.32201.35686},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru,
+ author = {Bernhard Gailer and Timo Gräf and Maria Lyoteva and Tsvetan Stanchev and Apporva Bhoir and Christoph P. Neumann},
+ title = {{GoalGuru: A React- and FastAPI\-/based Cloud Application for Predicting Soccer Games Outcome}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-11},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.18779.58407},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.18779.58407},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect,
+ author = {Sebastian Weidner and Jonas Hermann and Nils Bayerl and Dominik Schwagerl and \ Timon Spichtinger and Christoph P. Neumann},
+ title = {{InfluenzaConnect: Eine React- und Flask\-/basierte Webanwendung für Influencer\-/Marketing}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-10},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.25490.47041},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.25490.47041},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGruen-NanoVend,
+ author = {Lukas Hirsch and Johannes Küffner and Denis Tomazi and Christoph P. Neumann},
+ title = {{NanoVend: Ein Cloud\-/native E-Commerce\-/Backend als Baukasten für mittelständische Unternehmen}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-08},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.12068.69761},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.12068.69761},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamRot-StockSentinel,
+ author = {Andreas Hecht and Linus Heise and Oliver Kneidl and Eva-Maria Maurer and Christoph P. Neumann},
+ title = {{StockSentinel: AI\-/Powered Web Tool for Analyzing the Markets Perception of Stocks}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-07},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.20457.30564},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.20457.30564},
+}
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan,
+ author = {Amos Asmerom and Daniel Reichert and Fabian Heindl and Christoph P. Neumann},
+ title = {{Connect4IfYouCan: A MERN\-/based Web Game for Competitive Two Player Matches}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-06},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.27168.19200},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.27168.19200},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens,
+ author = {Viktor Hense and Johannes Lindner and Lukas Mrosek and Christoph P. Neumann},
+ title = {{Geodingens: A Web Application for Intuitive and User\-/friendly Work with Geopandas}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-04},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.13746.41929},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.13746.41929},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch,
+ author = {Juliana Kühn and Nikolett Rácz and Raffael Friedl and Maximilian Lippmann and Christoph P. Neumann},
+ title = {{MunchMunch: Eine MERN\-/basierte kulinarische Web-Anwendung für verbessertes User Engagement beim Entdecken neuer Gerichte und Rezepte}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-02},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.23812.74883},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.23812.74883},
+}
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_supervised_all.bib b/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_supervised_all.bib
index d4341f790cd..910906ac9a0 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_supervised_all.bib
+++ b/Master/texmf-dist/doc/latex/iaria-lite/template/cpn_supervised_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{kampf2012bt,
author = {Kampf, Marvin},
title = {{alpha\-/CDM: Konzeption und Implementierung eines Modells zur Inhaltsabh{\"a}ngigkeit als Baustein einer Prozessunterst{\"u}tzung auf Basis von aktiven Dokumenten}},
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.pdf b/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.pdf
index a7d0a9b52fc..1fe382035d3 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.pdf
+++ b/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.tex b/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.tex
index e4a4a45462b..df31d68a92e 100644
--- a/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.tex
+++ b/Master/texmf-dist/doc/latex/iaria-lite/template/iaria-lite-example-neumann.tex
@@ -25,7 +25,15 @@
% Diferring from IEEE, IARIA requires
% in bibliography: 6+ authors as first author et al.
% in \citeauthor: any case of et al. with just first author et al.
-\usepackage[style=ieee, backend=biber, url=false, hyperref, maxnames=5, minnames=1, maxcitenames=2, mincitenames=1]{biblatex}
+\usepackage[defernumbers=true,style=ieee, backend=biber, url=false, hyperref, maxnames=5, minnames=1, maxcitenames=2, mincitenames=1]{biblatex}
+
+% Due to applied option defernumbers=true:
+% Prevent citations in the references are being numbered as '0' in ArXiv
+% https://tex.stackexchange.com/questions/463556/all-the-citations-in-the-references-are-being-numbered-as-0-in-arxiv-while-upl
+\makeatletter
+\let\blx@rerun@biber\relax
+\makeatother
+
% Diferring fro IEEE, IARIA requires the bibliography in 9 point font
% (Command \bibfont depends on biblatex)
\renewcommand*{\bibfont}{\small}
@@ -68,7 +76,7 @@
% https://stackoverflow.com/questions/2193307/how-do-i-get-latex-to-hyphenate-a-word-that-contains-a-dash
\usepackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
-\usepackage{paralist}
+\usepackage[alwaysadjust]{paralist}
\usepackage[caption=false,font=footnotesize]{subfig}
\addbibresource{embedded.bib}
@@ -132,7 +140,8 @@
\hyphenation{block-chain block-chains Ethe-re-um}
% Capitalization: https://capitalizemytitle.com/style/Chicago/
-\title{The Unofficial \textsmaller{IARIA}-lite \LaTeX{} Class Paper Example (v2024-03)}
+%\title{The Unofficial \textsmaller{IARIA}-lite \LaTeX{} Class Paper Example (v2024-09)}
+\title{The \textsmaller{IARIA}-lite \LaTeX{} Class: Compatible With All \LaTeX{} Distributions,\\but without \textsmaller{IARIA} specifications for citation style (v2024-09)}
\author{
\IEEEauthorblockN{Christoph P.\ Neumann\,\orcidlink{0000-0002-5936-631X}}
@@ -152,7 +161,7 @@
\maketitle
\begin{abstract}
- \lipsum[1][3-12]
+ \lipsum[11]
\end{abstract}
% A list of IEEE Computer Society appoved keywords can be obtained at
@@ -169,65 +178,67 @@ The \textsmaller{IARIA} formatting rules \cite{iaria2014formattingrules} are ado
In addition, be aware of the supplementary \textsmaller{IARIA} editorial rules \cite{iaria2009editorialrules} \faWarning{} that provide a beginner-friendly set of further advices.
It is recommended to use a grammar tool, e.\,g., the LanguageTool \cite{languagetool} browser plugin in combination with Overleaf \cite{overleaf}.
-\lipsum[2]
+\lipsum[12]
\{\faWarning{} \textsmaller{IARIA} editorial rules: Introduction must end with a paragraph describing the structure of the paper!\}
The remainder of the paper is organized as follows: In Section~II, …
\section{Related work \textbar{} Methods}
-\lipsum[3]
+\lipsum[13]
\section{Results}
-\lipsum[4]
+\lipsum[14]
\section{Discussion \textbar{} Evalution}
-\lipsum[5]
+\lipsum[15]
\section{Conclusion and Future Work}
\{\faWarning{} \textsmaller{IARIA} editorial rules: Last section must be \textquote{Conclusion and Future Work}!\}
-\lipsum[6]
-
-
-
-%%% Advisor
-\nocite{StNe23foodfresh}
+\lipsum[16]
-%%% First-Author
+%%% CPN Peer-Rev'd
+\nocite{LeNe24vocattllm} % Co
+\nocite{PANP23seccloudfogai} % Co
+\nocite{StNe23foodfresh} % Advisor
\nocite{NeLe13adhocCoop}
\nocite{Neumann2012lni}
\nocite{NeLe12alphaFlow}
\nocite{NeHL12hydra}
\nocite{NeWL12offsync}
+\nocite{WaNe12alphaoffsync} % Co
\nocite{NSWL11alphaadaptive}
+\nocite{ToNe11alphaprops} % Co
+\nocite{JBN+10fcmdb} % Co
+\nocite{FDI+10esmmog} % Co
\nocite{NeFL10oxdbs}
\nocite{NeLe10alphaUC}
+\nocite{ILN+09semrttx} % Co
+\nocite{NHSL09oxdbs} % DE
\nocite{NeLe09alphaflow}
\nocite{NeLe09dmps}
-\nocite{NHSL09oxdbs} % DE
\nocite{NeWL09xdsrig} % DE
\nocite{NRDL09deus}
+\nocite{IND+09lzatav} % Co (DE)
+\nocite{MeNe04testejb} % Pseudo-Co
-%%% Co-Authorship
-\nocite{LeNe24vocattllm}
-\nocite{PANP23seccloudfogai}
-\nocite{WaNe12alphaoffsync}
-\nocite{ToNe11alphaprops}
-\nocite{FDI+10esmmog}
-\nocite{JBN+10fcmdb}
-\nocite{ILN+09semrttx}
-\nocite{IND+09lzatav} % DE
-\nocite{MeNe04testejb}
-
-%%% Monographic Work
+%%% CPN Monographic Work
\nocite{Neumann2013dissBook}
\nocite{Neumann2012dissPreprint}
\nocite{neumann2005da}
\nocite{neumann2004sa}
%%% TechRep / Non-Peer-Reviewed
-
+\nocite{ModA-TR-2024SS-CCT-TeamGruen-CloudDice}
+\nocite{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue}
+\nocite{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru}
+\nocite{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect}
+\nocite{ModA-TR-2024SS-BCN-TeamGruen-NanoVend}
+\nocite{ModA-TR-2024SS-BCN-TeamRot-StockSentinel}
+\nocite{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan}
+\nocite{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens}
+\nocite{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch}
\nocite{SaNe24othfb}
-
+\nocite{StNe24kosmosis-TR}
\nocite{ModA-TR-2023SS-WAE-TeamWeiss-Neunerln}
\nocite{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline}
\nocite{ModA-TR-2023SS-BDCC-TeamBlau-NauticalNonsense}
@@ -245,7 +256,6 @@ The remainder of the paper is organized as follows: In Section~II, …
\nocite{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard}
\nocite{ModA-TR-2021SS-WAE-TeamRot-FireForceDefense}
\nocite{ModA-TR-2021SS-WAE-TeamGruen-MedPlanner}
-
\nocite{NeRL12deus}
\nocite{LNR+11egr}
diff --git a/Master/texmf-dist/doc/latex/iaria/README b/Master/texmf-dist/doc/latex/iaria/README
index 73edb8b5028..45ade57c519 100644
--- a/Master/texmf-dist/doc/latex/iaria/README
+++ b/Master/texmf-dist/doc/latex/iaria/README
@@ -1,17 +1,19 @@
-----------------------------
- Version 0.2 of the iaria class
+ Version 0.4 of the iaria class
Christoph P. Neumann
-----------------------------
-This LaTeX provides a simple environment for
-technical reports as scholary publication.
+This package contains templates for the creation of documents for
+IARIA publications (International Academy, Research, and Industry Association)
+and implements the specifications for the IARIA citation style.
-NEU = Neumann
-TR = Technical Report
+This class does not contain evil low-level TeX magic
+but instead uses many other fancy LaTeX packages
+that we hope you have already installed.
-As this class is created mainly for ourselves it does not
-contain evil low-level TeX magic but instead uses many other
-fancy LaTeX packages that we hope you have already installed.
+DISCLAIMER: This class is neither for XeLaTeX or LuaTeX
+nor for legacy bibtex or natbib. For these have a look
+at CTAN package iaria-lite.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/doc/latex/iaria/iaria.pdf b/Master/texmf-dist/doc/latex/iaria/iaria.pdf
index f7665d3d4bf..7a3e0ddad76 100644
--- a/Master/texmf-dist/doc/latex/iaria/iaria.pdf
+++ b/Master/texmf-dist/doc/latex/iaria/iaria.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iaria/template/cpn_all_all.bib b/Master/texmf-dist/doc/latex/iaria/template/cpn_all_all.bib
index cc7abaec4a1..ba79c018327 100644
--- a/Master/texmf-dist/doc/latex/iaria/template/cpn_all_all.bib
+++ b/Master/texmf-dist/doc/latex/iaria/template/cpn_all_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{neumann2004sa,
author = {Neumann, Christoph P.},
title = {{Conceptional Design and Realization of a `Component Test Stand' for Measurements on Enterprise JavaBeans}},
@@ -7,6 +8,7 @@
type = {Studienarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Studienarbeit_ChristophPeterNeumann_revised/}
}
+
@Thesis{neumann2005da,
author = {Neumann, Christoph P.},
title = {{Design of an Open Framework for Optimizing the Distribution of Hardware and Software Components in Control Networks for Vehicles}},
@@ -16,6 +18,7 @@
type = {Diplomarbeit},
_url = {https://www.cyberlytics.eu/theses/all/Diplomarbeit_ChristophPeterNeumann_original/}
}
+
@INPROCEEDINGS{MeNe04testejb,
author = {Marcus Meyerh{\"o}fer and Christoph Neumann},
title = {{TestEJB} -- A Measurement Framework for {EJBs}},
@@ -35,21 +38,20 @@
@INPROCEEDINGS{NHSL09oxdbs,
author = {Christoph P. Neumann and Stefan Hanisch and Bernhard Schiemann and
- Richard Lenz},
+ Richard Lenz},
title = {{OXDBS -- Erweiterung einer nativen XML\-/Datenbank um die Validierung
- und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
+ und Konsistenzpr{\"u}fung gegen eine OWL\-/Ontologie}},
booktitle = {Tagungsband der 54.\,GMDS\-/Jahrestagung},
year = {2009},
_pages = {271:1--271:2},
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS271},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds271.shtml},
}
-
@INPROCEEDINGS{NeWL09xdsrig,
author = {Christoph P. Neumann and Florian Wagner and Richard Lenz},
title = {{XdsRig -- Eine Open\-/Source IHE XDS Testumgebung}},
@@ -59,15 +61,14 @@
address = {Essen, DE},
month = sep,
organization = {{Deutsche Gesellschaft f{\"u}r Medizinische Informatik, Biometrie
- und Epidemiologie} (GMDS)},
+ und Epidemiologie} (GMDS)},
doi = {10.3205/09GMDS276},
_url = {http://www.egms.de/en/meetings/gmds2009/09gmds276.shtml},
}
-
@INPROCEEDINGS{NRDL09deus,
- author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
- title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
+ author = {Christoph P. Neumann and Florian Rampp and Michael Daum and Richard Lenz},
+ title = {{A Mediated Publish\-/Subscribe System for Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd ACM Int'l Conf on Distributed Event\-/Based Systems (DEBS 2009)},
year = {2009},
_chapter = {14},
@@ -85,8 +86,8 @@
author = {Christoph P. Neumann and Richard Lenz},
title = {{alpha\-/Flow: A Document\-/based Approach to Inter\-/Institutional Process Support in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {569--580},
address = {Ulm, DE},
@@ -100,10 +101,10 @@
@INPROCEEDINGS{NeLe09dmps,
author = {Christoph P. Neumann and Richard Lenz},
title = {{A Light\-/Weight System Extension Supporting Document\-/based Processes
- in Healthcare}},
+ in Healthcare}},
booktitle = {Proc of the 3rd Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
- on Business Process Management (BPM'09)},
+ in Healthcare (ProHealth'09) in conjunction with the 7th Int'l Conf
+ on Business Process Management (BPM'09)},
year = {2009},
pages = {557--568},
address = {Ulm, DE},
@@ -140,12 +141,13 @@
doi = {10.1145/1866480.1866502},
_isbn = {978\-/1\-/60558\-/900\-/8},
}
+
@INPROCEEDINGS{NSWL11alphaadaptive,
author = {Christoph P. Neumann and Peter K. Schwab and Andreas M. Wahl and Richard Lenz},
title = {{alpha\-/Adaptive: Evolutionary Workflow Metadata in Distributed Document\-/Oriented Process Management}},
booktitle = {Proc of the 4th Int'l Workshop on Process\-/oriented Information Systems
- in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
- on Business Process Management (BPM'11)},
+ in Healthcare (ProHealth'11) in conjunction with the 9th Int'l Conf
+ on Business Process Management (BPM'11)},
year = {2011},
pages = {225--236},
address = {Clermont\-/Ferrand, FR},
@@ -209,26 +211,26 @@
}
@MastersThesis{Neumann2012dissPreprint_OldBibTeX,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- type = {Dissertation},
- _type = {`Dissertation' (PhD thesis)},
- _type = {PhD thesis (`Dissertation' in Germany)},
- month = nov,
- year = 2012,
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ type = {Dissertation},
+ _type = {`Dissertation' (PhD thesis)},
+ _type = {PhD thesis (`Dissertation' in Germany)},
+ month = nov,
+ year = 2012,
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@phdthesis{Neumann2012dissPreprint,
- author = {Christoph P. Neumann},
- title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
- school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
- month = nov,
- year = 2012,
- address = {Erlangen},
- doi = {10.13140/RG.2.2.14719.79521},
- url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Document\-/Oriented Process Management in Healthcare}},
+ school = {Friedrich\-/Alexander\-/Universit{\"a}t Erlangen\-/N{\"u}rnberg},
+ month = nov,
+ year = 2012,
+ address = {Erlangen},
+ doi = {10.13140/RG.2.2.14719.79521},
+ url = {https://nbn-resolving.org/urn:nbn:de:bvb:29-opus-39070}
}
@INPROCEEDINGS{NeLe13adhocCoop,
@@ -244,7 +246,9 @@
_isbn = {978\-/3\-/642\-/36437\-/2},
doi = {10.1007/978-3-642-36438-9_8},
_url = {https://doi.org/10.1007/978-3-642-36438-9_8},
-}@incollection{Neumann2012lni,
+}
+
+@incollection{Neumann2012lni,
author={Christoph P. Neumann},
editor={Abraham Bernstein and Wolfgang Effelsberg and Steffen H{\"o}lldobler and Hans{-}Peter Lenhof and Klaus{-}Peter L{\"o}hr and Paul Molitor and Gustaf Neumann and R{\"u}diger Reischuk and Nicole Schweikardt and Myra Spiliopoulou and Harald St{\"o}rrle and Sabine S{\"u}sstrunk},
title={Verteiltes Dokumenten\-/orientiertes Prozessmanagement im Gesundheitswesen},
@@ -256,18 +260,19 @@
year={2012},
url={https://dl.gi.de/20.500.12116/33740}
}
+
@BOOK{Neumann2013dissBook,
- author = {Christoph P. Neumann},
- title = {{Distributed Case Handling}},
- year = 2013,
- publisher = {Verlag Dr.~Hut},
- address = {M{\"u}nchen},
- isbn = {9783843909198},
- _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
- _url = {https://d-nb.info/1033041637},
- _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
- _note = {\url{https://d-nb.info/1033041637}(DNB)},
- _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
+ author = {Christoph P. Neumann},
+ title = {{Distributed Case Handling}},
+ year = 2013,
+ publisher = {Verlag Dr.~Hut},
+ address = {M{\"u}nchen},
+ isbn = {9783843909198},
+ _urn = {urn:nbn:de:bvb:29\-/opus\-/39070},
+ _url = {https://d-nb.info/1033041637},
+ _note = {\url{http://www.opus.ub.uni-erlangen.de/opus/volltexte/2012/3907/}(preprint version)},
+ _note = {\url{https://d-nb.info/1033041637}(DNB)},
+ _note = {\url{https://www.dr.hut-verlag.de/978-3-8439-0919-8.html}(URL)}
}
@INPROCEEDINGS{IND+09lzatav,
@@ -363,11 +368,10 @@
month=apr,
year={2024},
doi = {10.48550/arXiv.2404.02637},
- _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_X_YY_ZZZZZ},
- _url = {https://doi.org/10.48550/arXiv.2404.02637},
+ _url = {https://www.thinkmind.org/index.php?view=article&articleid=cloud_computing_2024_2_10_28007},
+ _url2 = {https://doi.org/10.48550/arXiv.2404.02637},
_issn = {2308\-/4294},
- _pages = {AA--OO},
- note = {accepted for publication}
+ pages = {19--24}
}
@INPROCEEDINGS{ToNe11alphaprops,
@@ -425,6 +429,28 @@
_url2 = {https://www.oth-aw.de/files/oth-aw/Aktuelles/Veroeffentlichungen/Forschungsbericht/OTH_Forschungsbericht_2024.pdf},
_url3 = {https://www.researchgate.net/profile/Christoph-Neumann-8/publication/379109359_Analyse_von_Methoden_zur_Sicherung_der_Vertraulichkeit_in_Neuronalen_Netzen/links/65faff43a4857c7962654c5c/Analyse-von-Methoden-zur-Sicherung-der-Vertraulichkeit-in-Neuronalen-Netzen.pdf}
}
+
+@MISC{StNe24kosmosis,
+ title={The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention},
+ author={Philipp Stangl and Christoph P. Neumann},
+ year={2024},
+ eprint={2405.19762},
+ archivePrefix={arXiv},
+ primaryClass={cs.CR}
+}
+
+@TECHREPORT{StNe24kosmosis-TR,
+ author = {Philipp Stangl and Christoph P. Neumann},
+ title = {{The Kosmosis Use-Case of Crypto Rug Pull Detection and Prevention}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab at the Department of Electrical Engineering, Media and Computer Science},
+ series = {Technischer Bericht},
+ number = {CL-2024-01},
+ year = 2024,
+ month = 2,
+ doi = {10.48550/arXiv.2405.19762},
+ _url = {https://doi.org/10.48550/arXiv.2405.19762},
+}
+
@TECHREPORT{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard,
author = {Tobias Bauer and Albert Hahn and Lukas Kleinlein and Nicolas Proske and Leonard W{\"o}llmer and Andrei Trukhin and Christoph P. Neumann},
title = {{Covidash: Eine MEAN\-/Variation-basierte Webanwendung für Inzidenz\-/Zahlen und Impffortschritt in Deutschland}},
@@ -543,7 +569,6 @@
_url = {https://dx.doi.org/10.13140/RG.2.2.33933.31209},
}
-
@TECHREPORT{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline,
author = {André Kestler and Antonio Vidos and Marcus Haberl and Tobias Dobmeier and Tobias Lettner and Tobias Weiß and Christoph P. Neumann},
title = {{Computer Vision Pipeline: Eine React- und Flask\-/basierte Webanwendung zur No\-/Code\-/Bildverarbeitung mit Cloud\-/Deployment}},
@@ -622,4 +647,107 @@
doi = {10.13140/RG.2.2.22177.79209},
_url = {https://dx.doi.org/10.13140/RG.2.2.22177.79209},
}
+@TECHREPORT{ModA-TR-2024SS-CCT-TeamGruen-CloudDice,
+ author = {Lukas Rupp and Franziska Rubenbauer and Christoph P. Neumann},
+ title = {{CloudDice: Ein React\-/basiertes Kniffel-Würfelspiel}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ series = {Technische Berichte},
+ number = {CL-2024-14},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.11229.83686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.11229.83686},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue,
+ author = {Fabian Heindl and Paul Brand and Daniel Reichert and Christoph P. Neumann},
+ title = {{SkillIssue: A MERN\-/based Low\-/Latency Multi\-/User Game for Displaying True Skill With Your Friends}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-12},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.32201.35686},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.32201.35686},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru,
+ author = {Bernhard Gailer and Timo Gräf and Maria Lyoteva and Tsvetan Stanchev and Apporva Bhoir and Christoph P. Neumann},
+ title = {{GoalGuru: A React- and FastAPI\-/based Cloud Application for Predicting Soccer Games Outcome}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-11},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.18779.58407},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.18779.58407},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect,
+ author = {Sebastian Weidner and Jonas Hermann and Nils Bayerl and Dominik Schwagerl and \ Timon Spichtinger and Christoph P. Neumann},
+ title = {{InfluenzaConnect: Eine React- und Flask\-/basierte Webanwendung für Influencer\-/Marketing}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-10},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.25490.47041},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.25490.47041},
+}
+
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamGruen-NanoVend,
+ author = {Lukas Hirsch and Johannes Küffner and Denis Tomazi and Christoph P. Neumann},
+ title = {{NanoVend: Ein Cloud\-/native E-Commerce\-/Backend als Baukasten für mittelständische Unternehmen}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-08},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.12068.69761},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.12068.69761},
+}
+@TECHREPORT{ModA-TR-2024SS-BCN-TeamRot-StockSentinel,
+ author = {Andreas Hecht and Linus Heise and Oliver Kneidl and Eva-Maria Maurer and Christoph P. Neumann},
+ title = {{StockSentinel: AI\-/Powered Web Tool for Analyzing the Markets Perception of Stocks}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-07},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.20457.30564},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.20457.30564},
+}
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan,
+ author = {Amos Asmerom and Daniel Reichert and Fabian Heindl and Christoph P. Neumann},
+ title = {{Connect4IfYouCan: A MERN\-/based Web Game for Competitive Two Player Matches}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-06},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.27168.19200},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.27168.19200},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens,
+ author = {Viktor Hense and Johannes Lindner and Lukas Mrosek and Christoph P. Neumann},
+ title = {{Geodingens: A Web Application for Intuitive and User\-/friendly Work with Geopandas}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technical Reports},
+ number = {CL-2024-04},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.13746.41929},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.13746.41929},
+}
+
+@TECHREPORT{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch,
+ author = {Juliana Kühn and Nikolett Rácz and Raffael Friedl and Maximilian Lippmann and Christoph P. Neumann},
+ title = {{MunchMunch: Eine MERN\-/basierte kulinarische Web-Anwendung für verbessertes User Engagement beim Entdecken neuer Gerichte und Rezepte}},
+ institution = {Ostbayerische Technische Hochschule Amberg\-/Weiden, CyberLytics\-/Lab an der Fakult{\"a}t Elektrotechnik, Medien und Informatik},
+ type = {Technische Berichte},
+ number = {CL-2024-02},
+ year = 2024,
+ month = 7,
+ doi = {10.13140/RG.2.2.23812.74883},
+ _url = {https://dx.doi.org/10.13140/RG.2.2.23812.74883},
+}
diff --git a/Master/texmf-dist/doc/latex/iaria/template/cpn_supervised_all.bib b/Master/texmf-dist/doc/latex/iaria/template/cpn_supervised_all.bib
index d4341f790cd..910906ac9a0 100644
--- a/Master/texmf-dist/doc/latex/iaria/template/cpn_supervised_all.bib
+++ b/Master/texmf-dist/doc/latex/iaria/template/cpn_supervised_all.bib
@@ -1,3 +1,4 @@
+
@Thesis{kampf2012bt,
author = {Kampf, Marvin},
title = {{alpha\-/CDM: Konzeption und Implementierung eines Modells zur Inhaltsabh{\"a}ngigkeit als Baustein einer Prozessunterst{\"u}tzung auf Basis von aktiven Dokumenten}},
diff --git a/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.pdf b/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.pdf
index 7c5d1903983..a0d1d5b5e45 100644
--- a/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.pdf
+++ b/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.tex b/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.tex
index eda28b0f0ca..387d8e2cc4e 100644
--- a/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.tex
+++ b/Master/texmf-dist/doc/latex/iaria/template/iaria-example-neumann.tex
@@ -17,7 +17,7 @@
% https://stackoverflow.com/questions/2193307/how-do-i-get-latex-to-hyphenate-a-word-that-contains-a-dash
\usepackage[shortcuts]{extdash} % Use \-/ for a breakable dash that does not prevent the remainer of the word to be hyphenated
-\usepackage{paralist}
+\usepackage[alwaysadjust]{paralist}
\usepackage[caption=false,font=footnotesize]{subfig}
% Class iaria.cls loads biblatex / biber with predefined options
@@ -83,7 +83,7 @@ final % Always enable microtype, even if in draft mode. This helps finding bad b
\hyphenation{block-chain block-chains Ethe-re-um}
% Capitalization: https://capitalizemytitle.com/style/Chicago/
-\title{The Unofficial \textsmaller{IARIA} \LaTeX{} Class Paper Example (v2024-03)}
+\title{The \textsmaller{IARIA} \LaTeX{} Class Paper Example (v2024-09)}
\author{
\IEEEauthorblockN{Christoph P.\ Neumann\,\orcidlink{0000-0002-5936-631X}}
@@ -103,7 +103,7 @@ final % Always enable microtype, even if in draft mode. This helps finding bad b
\maketitle
\begin{abstract}
- \lipsum[1][3-12]
+ \lipsum[21]%[3-12]
\end{abstract}
% A list of IEEE Computer Society appoved keywords can be obtained at
@@ -121,65 +121,67 @@ The \textsmaller{IARIA} formatting rules \cite{iaria2014formattingrules} are ado
In addition, be aware of the supplementary \textsmaller{IARIA} editorial rules \cite{iaria2009editorialrules} \faWarning{} that provide a beginner-friendly set of further advices.
It is recommended to use a grammar tool, e.\,g., the LanguageTool \cite{languagetool} browser plugin in combination with Overleaf \cite{overleaf}.
-\lipsum[2]
+\lipsum[22]
\{\faWarning{} \textsmaller{IARIA} editorial rules: Introduction must end with a paragraph describing the structure of the paper!\}
The remainder of the paper is organized as follows: In Section~II, …
\section{Related work \textbar{} Methods}
-\lipsum[3]
+\lipsum[23]
\section{Results}
-\lipsum[4]
+\lipsum[24]
\section{Discussion \textbar{} Evalution}
-\lipsum[5]
+\lipsum[25]
\section{Conclusion and Future Work}
\{\faWarning{} \textsmaller{IARIA} editorial rules: Last section must be \textquote{Conclusion and Future Work}!\}
-\lipsum[6]
+\lipsum[26]
-
-
-%%% Advisor
-\nocite{StNe23foodfresh}
-
-%%% First-Author
+%%% CPN Peer-Rev'd
+\nocite{LeNe24vocattllm} % Co
+\nocite{PANP23seccloudfogai} % Co
+\nocite{StNe23foodfresh} % Advisor
\nocite{NeLe13adhocCoop}
\nocite{Neumann2012lni}
\nocite{NeLe12alphaFlow}
\nocite{NeHL12hydra}
\nocite{NeWL12offsync}
+\nocite{WaNe12alphaoffsync} % Co
\nocite{NSWL11alphaadaptive}
+\nocite{ToNe11alphaprops} % Co
+\nocite{JBN+10fcmdb} % Co
+\nocite{FDI+10esmmog} % Co
\nocite{NeFL10oxdbs}
\nocite{NeLe10alphaUC}
+\nocite{ILN+09semrttx} % Co
+\nocite{NHSL09oxdbs} % DE
\nocite{NeLe09alphaflow}
\nocite{NeLe09dmps}
-\nocite{NHSL09oxdbs} % DE
\nocite{NeWL09xdsrig} % DE
\nocite{NRDL09deus}
+\nocite{IND+09lzatav} % Co (DE)
+\nocite{MeNe04testejb} % Pseudo-Co
-%%% Co-Authorship
-\nocite{LeNe24vocattllm}
-\nocite{PANP23seccloudfogai}
-\nocite{WaNe12alphaoffsync}
-\nocite{ToNe11alphaprops}
-\nocite{FDI+10esmmog}
-\nocite{JBN+10fcmdb}
-\nocite{ILN+09semrttx}
-\nocite{IND+09lzatav} % DE
-\nocite{MeNe04testejb}
-
-%%% Monographic Work
+%%% CPN Monographic Work
\nocite{Neumann2013dissBook}
\nocite{Neumann2012dissPreprint}
\nocite{neumann2005da}
\nocite{neumann2004sa}
%%% TechRep / Non-Peer-Reviewed
-
+\nocite{ModA-TR-2024SS-CCT-TeamGruen-CloudDice}
+\nocite{ModA-TR-2024SS-BCN-TeamCyan-SkillIssue}
+\nocite{ModA-TR-2024SS-BCN-TeamGelb-GoalGuru}
+\nocite{ModA-TR-2024SS-BCN-TeamWeiss-InfluenzaConnect}
+\nocite{ModA-TR-2024SS-BCN-TeamGruen-NanoVend}
+\nocite{ModA-TR-2024SS-BCN-TeamRot-StockSentinel}
+\nocite{ModA-TR-2024SS-WAE-TeamCyan-Connect4IfYouCan}
+\nocite{ModA-TR-2024SS-WAE-TeamWeiss-Geodingens}
+\nocite{ModA-TR-2024SS-WAE-TeamGruen-MunchMunch}
\nocite{SaNe24othfb}
-
+\nocite{StNe24kosmosis-TR}
\nocite{ModA-TR-2023SS-WAE-TeamWeiss-Neunerln}
\nocite{ModA-TR-2023SS-BDCC-TeamRot-CompVisPipeline}
\nocite{ModA-TR-2023SS-BDCC-TeamBlau-NauticalNonsense}
@@ -197,7 +199,6 @@ The remainder of the paper is organized as follows: In Section~II, …
\nocite{ModA-TR-2021SS-WAE-TeamWeiss-CovidDashboard}
\nocite{ModA-TR-2021SS-WAE-TeamRot-FireForceDefense}
\nocite{ModA-TR-2021SS-WAE-TeamGruen-MedPlanner}
-
\nocite{NeRL12deus}
\nocite{LNR+11egr}
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/README.md b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/README.md
index 0aea05a14b2..9ef9ee18b40 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/README.md
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/README.md
@@ -3,7 +3,7 @@
This package will introduce the operations related to installing TeX Live (introducing MacTeX in macOS), upgrading packages, and compiling simple documents on Windows 11, Ubuntu 22.04, and macOS systems, and mainly introducing command line operations.
At the same time, it briefly introduces the use of several common editors under different operating systems, and additionally adds some related content using Online LaTeX editor, e.g. [Overleaf](www.overleaf.com).
-Users are advised to read [texlive-en](https://www.tug.org/texlive/doc/texlive-en/texlive-en.pdf) and [lshort-zh-cn](http://mirrors.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf) for a more comprehensive understanding of the basic content.
+Users are advised to read [texlive-zh-cn](https://www.tug.org/texlive/doc/texlive-zh-cn/texlive-zh-cn.pdf) and [lshort-zh-cn](http://mirrors.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf) for a more comprehensive understanding of the basic content.
The code involved in this article also asks users to do more, don't simply copy and paste.
@@ -25,7 +25,7 @@ This work is released under the LaTeX Project Public License, v1.3c or later.
æœ¬æ–‡å°†ä»‹ç» Windows 11ã€Ubuntu 22.04 å’Œ macOS 系统中安装 TeX Live (macOS ä¸­ä»‹ç» MacTeX)ã€å‡çº§å®åŒ…ã€ç¼–译简易文档的相关æ“作, 并多以介ç»å‘½ä»¤è¡Œæ“作为主.
åŒæ—¶ç®€è¦ä»‹ç»ä¸åŒæ“作系统下几款常è§ç¼–辑器的使用方法, 并é¢å¤–补充了一些使用在线 LaTeX 编辑器, 如 [Overleaf](www.overleaf.com), 的相关内容.
-建议用户阅读 [texlive-en](https://www.tug.org/texlive/doc/texlive-en/texlive-en.pdf) å’Œ [lshort-zh-cn](http://mirrors.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf) 以更全é¢åœ°äº†è§£åŸºç¡€å†…容.
+建议用户阅读 [texlive-zh-cn](https://www.tug.org/texlive/doc/texlive-zh-cn/texlive-zh-cn.pdf) å’Œ [lshort-zh-cn](http://mirrors.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf) 以更全é¢åœ°äº†è§£åŸºç¡€å†…容.
本文所涉åŠåˆ°çš„代ç è¿˜è¯·ç”¨æˆ·å¤šå¤šåŠ¨æ‰‹, ä¸è¦ç®€å•åœ°å¤åˆ¶ç²˜è´´.
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/appendix/updateinfo.tex b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/appendix/updateinfo.tex
index 2615af7b8e7..16fb23ec17c 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/appendix/updateinfo.tex
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/appendix/updateinfo.tex
@@ -2,11 +2,12 @@
\chapter{版本信æ¯}
-\section*{v2024.6.1}
+\section*{v2024.9.1}
\begin{itemize}
\item 添加镜åƒ
\item 修改对于ä¸å®‰è£…第三方安全软件的建议
+ \item Overleaf å‡çº§ä¸º 2024 版
\end{itemize}
\section*{v2024.4.1}
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/overleaf.tex b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/overleaf.tex
index b35e59fe74c..cad91ef833e 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/overleaf.tex
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/overleaf.tex
@@ -16,8 +16,8 @@ Overleaf 是全çƒèŒƒå›´å†…首屈一指的在线 \LaTeX{} 编辑平å°.
Overleaf æ供了包括%
\href{https://cn.overleaf.com}{中文}%
在内的多ç§è¯­è¨€ä¾›ç”¨æˆ·ä½¿ç”¨.
-2023年9月6日,
-\href{https://www.overleaf.com/blog/tex-live-2023-now-available}{它将åŽå°çš„ \TeX{} Live å‡çº§ä¸º 2023 版本},
+2024年6月27日,
+\href{https://www.overleaf.com/blog/tex-live-2024-is-now-available}{它将åŽå°çš„ \TeX{} Live å‡çº§ä¸º 2024 版本},
åŒæ—¶,
\href{https://www.overleaf.com/blog/new-feature-select-your-tex-live-compiler-version}{Overleaf 还å…许用户自主选择项目中的 \TeX{} Live 版本}.
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/preface.tex b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/preface.tex
index feef749555f..1370585c74f 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/preface.tex
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/preface.tex
@@ -29,7 +29,7 @@
本手册所涉åŠåˆ°çš„代ç éœ€ç»“åˆä¸Šä¸‹æ–‡è¯´æ˜Ž, ä¸èƒ½ç®€å•åœ°å¤åˆ¶ç²˜è´´. 红色文字都是å¯ç‚¹çš„超链接, å¯ç›´æŽ¥è·³è½¬.
\menu{èœå•} 表示软件èœå•. \keys{k} 表示键盘按键.
-建议用户阅读 \href{https://www.tug.org/texlive/doc/texlive-en/texlive-en.pdf}{texlive-en}
+建议用户阅读 \href{https://tug.org/texlive/doc/texlive-zh-cn/texlive-zh-cn.pdf}{texlive-zh-cn}
和 \href{http://mirrors.ctan.org/info/lshort/chinese/lshort-zh-cn.pdf}{lshort-zh-cn}
以更全é¢åœ°äº†è§£åŸºç¡€å†…容.
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/ubuntu.tex b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/ubuntu.tex
index 2de534b6953..e0e2bd8d90b 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/ubuntu.tex
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/chapter/ubuntu.tex
@@ -166,7 +166,7 @@
\end{lstlisting}
刷新字体缓存.
这样一æ¥, \TeX{} Live 中的字体æ‰èƒ½å¤Ÿè¢«æ­£ç¡®è°ƒç”¨.
-更多内容请å‚考 \href{https://www.tug.org/texlive/doc/texlive-en/texlive-en.pdf}{texlive-en}.
+更多内容请å‚考 \href{https://tug.org/texlive/doc/texlive-zh-cn/texlive-zh-cn.pdf}{texlive-zh-cn}.
如果用户更改了安装路径,
è¦æ³¨æ„å°†
@@ -195,7 +195,7 @@
export MANPATH=~/texlive/2024/texmf-dist/doc/man:$MANPATH
export INFOPATH=~/texlive/2024/texmf-dist/doc/info:$INFOPATH
\end{lstlisting}
-有关字体的处ç†å˜ä¸º\footnote{这里并未使用 \href{https://www.tug.org/texlive/doc/texlive-en/texlive-en.pdf}{texlive-en} 中建议的路径 \texttt{\~/.fonts.conf.d/},
+有关字体的处ç†å˜ä¸º\footnote{这里并未使用 \href{https://tug.org/texlive/doc/texlive-zh-cn/texlive-zh-cn.pdf}{texlive-zh-cn} 中建议的路径 \texttt{\~/.fonts.conf.d/},
å› ä¸ºæ ¹æ® \href{https://www.freedesktop.org/software/fontconfig/fontconfig-user.html}{freedesktop} 的说法,
该路径已废弃,
故此处采用新的路径,
diff --git a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
index 6bb0c3e4b9f..af6f27ae4f0 100644
--- a/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
+++ b/Master/texmf-dist/doc/latex/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/isosafety/README.md b/Master/texmf-dist/doc/latex/isosafety/README.md
index 179663b90d6..575df1f2103 100644
--- a/Master/texmf-dist/doc/latex/isosafety/README.md
+++ b/Master/texmf-dist/doc/latex/isosafety/README.md
@@ -4,8 +4,8 @@ isosafety is a LaTeX package that contains safety colors (ISO 3864) and safety s
Maintainer: BenSt099 (https://github.com/BenSt099/isosafety)
-Version 1.3
+Version 1.4
License: LPPL 1.3c
-Note: This is **not** an **official** package from ISO.
+Note: This is **not** an **official** package from ISO. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.pdf b/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.pdf
index fd9615ee836..0a5d219a95d 100644
--- a/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.pdf
+++ b/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.tex b/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.tex
index 0b80fc44be6..ea2599aa3dd 100644
--- a/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.tex
+++ b/Master/texmf-dist/doc/latex/isosafety/isosafety-docs.tex
@@ -22,15 +22,16 @@
top=3cm,
bottom=3cm
}
+\usepackage{tcolorbox}
\begin{document}
\begin{center}
{\Huge isosafety} \vspace{5mm}
- {\Large Version 1.3}\vspace{5mm}
+ {\Large Version 1.4}\vspace{5mm}
- {\Large August 28, 2024}\vspace{5mm}
+ {\Large August 31, 2024}\vspace{5mm}
\href{https://github.com/BenSt099/isosafety}{github.com/BenSt099/isosafety}
\end{center}\vspace{5mm}
@@ -53,9 +54,9 @@ This package has the following dependencies: \texttt{graphicx}, \texttt{xcolor},
Seven colors are defined which are also used to create the signs: \vspace{5mm}
\renewcommand{\arraystretch}{1.2}
- \begin{tabular}{ll}
+ \begin{tabular}{|l|l|}
\hline
- Name & Colors \\
+ \textbf{Name} & \textbf{Colors} \\
\hline
Caution & \cellcolor{Caution} \\
Warning & \cellcolor{Warning} \\
@@ -69,7 +70,7 @@ Seven colors are defined which are also used to create the signs: \vspace{5mm}
\noindent How to use: \vspace{3mm}
-\verbatimfontfamily{\slshape\ttfamily}
+\verbatimfontfamily{\ttfamily}
\begin{verbatim}
{\color{Mandatory} \textbf{Text with Mandatory color.}}
@@ -88,7 +89,7 @@ Seven colors are defined which are also used to create the signs: \vspace{5mm}
\hline
Category & Letter(s) & Numbers \\
\hline
- Safe condition & E & (001 - 070) \\
+ Safe condition & E & (001 - 004, 007 - 070) \\
Crescent variant & CV & (003, 004, 009, 010, 011, 012, 013, 027, 028, 029, 064, 067) \\
Fire Protection & F & (001 - 019) \\
Mandatory & M & (001 - 060) \\
@@ -97,42 +98,81 @@ Seven colors are defined which are also used to create the signs: \vspace{5mm}
\hline
\end{tabular}\vspace{5mm}
-\noindent The command to access a sign is: \begin{verbatim}
+\noindent The command to access a sign is:
+
+\begin{tcolorbox}
+ \vspace{3mm}
+ \begin{verbatim}
\Isosign{<Letter><Number>}
-\end{verbatim}\vspace{5mm}
+ \end{verbatim}
+\end{tcolorbox}
+\vspace{5mm}
-\noindent This command constructs a path to a sign in your \TeX Live / Mik\TeX / \ldots $\;$ installation. That means to actually display the sign, resize it, edit it, etc., follow the given example:
+\noindent This command constructs a path to a sign in your \TeX Live / Mik\TeX / \ldots $\;$ installation.
+To display a sign, use the following code:
-\begin{verbatim}
+\begin{tcolorbox}
+ \vspace{3mm}
+ \begin{verbatim}
%%% Example file
\documentclass{article}
-
- % example path
- \usepackage[ fullpath = /texlive/2024/texmf-dist/tex/latex/isosafety ]{isosafety}
+
+ \usepackage{isosafety}
- \usepackage{graphicx}
+ \usepackage{graphicx}
\begin{document}
- \includegraphics{\Isosign{F001}}
- \includegraphics[scale=2]{\Isosign{P074}}
+ \includegraphics{\Isosign{F001}}
+
+ \includegraphics[scale=2]{\Isosign{P074}}
\end{document}
-\end{verbatim}\vspace{5mm}
+ \end{verbatim}
+\end{tcolorbox}
-\noindent As you can notice, when we import the package, we provide it with an option. The option is named \textbf{fullpath} and is \textbf{necessary}!
-Since you may have a different version of \TeX Live or maybe even a different \TeX-installation, you have to provide a path that leads to the installation directory
-of isosafety. The path that is given in the example is the typical path on most systems. The year \textit{2024} refers to the version of \TeX Live installed on your system \vspace{5mm}
+\newpage
-\noindent\textbf{NOTE}: On Windows, the path should also be given with foreslashes (just like in the example). \\
+\section{Known Issue}
-\noindent\textbf{NOTE}: The last directory in the path \textit{does not} end with a foreslash (just like in the example). \\
+\noindent On some systems (mostly Windows), \TeX \hspace{1mm} is not able to find the pdfs properly. Since this is an issue that seems to exist only on certain systems and not all, please use the following
+workaround by providing the fullpath that leads to the installation directory
+of isosafety. This can be done by supplying it through the \textbf{fullpath}-option:
-\noindent\textbf{NOTE}: For a complete overview of the available signs, take a look at \href{https://en.wikipedia.org/wiki/ISO_7010}{Wikipedia}.
+\begin{tcolorbox}
+ \vspace{3mm}
+ \begin{verbatim}
+ %%% Example file
+ \documentclass{article}
+
+ % example path
+ \usepackage[ fullpath = /texlive/2024/texmf-dist/tex/latex/isosafety ]{isosafety}
+
+ \usepackage{graphicx}
+ \begin{document}
+
+ \includegraphics{\Isosign{F001}}
+
+ \includegraphics[scale=2]{\Isosign{P074}}
+
+ \end{document}
+ \end{verbatim}
+\end{tcolorbox}
+\vspace{5mm}
+\noindent If you are unsure about the path, simply execute
+\begin{verbatim}
+ kpsewhich isosafety.sty
+\end{verbatim}\vspace{3mm}
+\noindent in a terminal and a path will be returned. The path that is given in the example is the typical path on most systems.
+\vspace{5mm}
+\noindent\textbf{NOTE}: On Windows, the path should also be given with foreslashes (just like in the example). \\
+\noindent\textbf{NOTE}: The last directory in the path \textit{does not} end with a foreslash (just like in the example). \\
+
+\noindent\textbf{NOTE}: For a complete overview of the available signs, take a look at \href{https://en.wikipedia.org/wiki/ISO_7010}{Wikipedia}.
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md
index 3d4f146f11c..ed8935d845a 100644
--- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md
+++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md
@@ -596,6 +596,11 @@ JFMã®åå‰ã¯æ¬¡ã®é€šã‚Šã§ã™ï¼Ž`[]`ã§å›²ã¾ã‚Œã¦ã„る文字ã¯è¨­å®šã«ã
- 英語ドキュメントã«ä½¿ã„方を書ã„ãŸ
- `\DeclareKeys`ãªã©ã‚’使ã†ã‚ˆã†ã«ã—ãŸï¼Ž
- 行見出ã—ã®å†…部処ç†ã‚’ã¡ã‚‡ã£ã¨ã ã‘変更.
+* 2024-09-26
+ - Makefileã§ã®ãƒ‘ターンマッãƒãƒ³ã‚°ã®ä½¿ç”¨ã‚’ã‚„ã‚ãŸ
+* 2024-10-03
+ - Makefile内ã®vf一覧ã«tfmãŒç´›ã‚Œã¦ã„ãŸã®ã‚’修正.
+
--------------
Noriyuki Abe
diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md
index 3c7ec380ee5..fe18f2f9bd5 100644
--- a/Master/texmf-dist/doc/latex/jlreq/README.md
+++ b/Master/texmf-dist/doc/latex/jlreq/README.md
@@ -243,7 +243,10 @@ You can specify gyo-dori setting in one of the following ways.
You can set the gyo-dori settings for block headings that are placed consecutively with `\SetBlockHeadingSpaces`. `\SetBlockHeadingSpaces` is used as follows:
```latex
-\SetBlockHeadingSpaces { {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} [lines=5]{_section,23pt,_subsection,16pt} }
+\SetBlockHeadingSpaces {
+ {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}
+ [lines=5]{_section,23pt,_subsection,16pt}
+}
```
This means the following.
@@ -579,6 +582,11 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
- Added the usage of this class to English document.
- Use `\DeclareKeys` etc.
- Changed the internal processing of block headings a little.
+* 2024-09-26
+ - Removed pattern matchings from Makefile.
+* 2024-10-04
+ - Fixed: tfm files are mixed into the list of vf files in Makefile.
+
--------------
Noriyuki Abe
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
index 14cfa1efd3a..702a5efc3a1 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
@@ -88,20 +88,28 @@
<article class="markdown-body">
<h1 id="jlreq">jlreq</h1>
<h2 id="ã“ã‚Œã¯ä½•">ã“ã‚Œã¯ä½•ï¼Ÿ</h2>
-<p><a href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処ç†ã®è¦ä»¶</a>ã®å®Ÿè£…を試ã¿ã‚‹<a href="https://osdn.jp/projects/luatex-ja/wiki/FrontPage">LuaTeX-ja</a> / pLaTeX / upLaTeX用ã®ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ï¼Œãã‚Œã«å¿…è¦ãªJFMã®çµ„ã¿åˆã‚ã›ã§ã™ï¼Ž</p>
+<p><a
+href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処ç†ã®è¦ä»¶</a>ã®å®Ÿè£…を試ã¿ã‚‹<a
+href="https://osdn.jp/projects/luatex-ja/wiki/FrontPage">LuaTeX-ja</a> /
+pLaTeX /
+upLaTeX用ã®ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ï¼Œãã‚Œã«å¿…è¦ãªJFMã®çµ„ã¿åˆã‚ã›ã§ã™ï¼Ž</p>
<h2 id="æä¾›ã•ã‚Œã‚‹ã‚‚ã®">æä¾›ã•ã‚Œã‚‹ã‚‚ã®</h2>
-<p>クラスファイルjlreq.clsã¨ï¼Œæ¨ªæ›¸ãLuaTeX-ja用ã®JFMã§ã‚ã‚‹jfm-jlreq.luaãŒç”¨æ„ã•ã‚Œã¦ã„ã¾ã™ï¼Žã¾ãŸï¼Œç¸¦æ›¸ãã®JFMã‚„pLaTeX / upLaTeX用ã®JFMを生æˆã™ã‚‹ã„ãã¤ã‹ã®ã‚¹ã‚¯ãƒªãƒ—トãŒã‚ã‚Šã¾ã™ï¼Ž</p>
+<p>クラスファイルjlreq.clsã¨ï¼Œæ¨ªæ›¸ãLuaTeX-ja用ã®JFMã§ã‚ã‚‹jfm-jlreq.luaãŒç”¨æ„ã•ã‚Œã¦ã„ã¾ã™ï¼Žã¾ãŸï¼Œç¸¦æ›¸ãã®JFMã‚„pLaTeX
+/ upLaTeX用ã®JFMを生æˆã™ã‚‹ã„ãã¤ã‹ã®ã‚¹ã‚¯ãƒªãƒ—トãŒã‚ã‚Šã¾ã™ï¼Ž</p>
<h2 id="インストール">インストール</h2>
<p><code>make</code>ã§å¿…è¦ãªJFMを生æˆã—ã¦ãã ã•ã„.ãã®å¾Œï¼Œ</p>
<ul>
<li>*.tfm -&gt; $TEXMF/fonts/tfm/public/jlreq</li>
<li>*.vf -&gt; $TEXMF/fonts/vf/public/jlreq</li>
-<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -&gt; $TEXMF/tex/luatex/jlreq</li>
+<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua
+jfm-jlreqv-jidori.lua -&gt; $TEXMF/tex/luatex/jlreq</li>
<li>jlreq.cls, jlreq-helpers.sty -&gt; $TEXMF/tex/latex/jlreq</li>
</ul>
-<p>ã¨é…ç½®ã—ã¾ã™ï¼Ž<code>make install</code>ã¨ã™ã‚‹ã¨ï¼Œ$TEXMF=$TEXMFHOMEã¨ã—ã¦ã“ã®ã‚³ãƒ”ーを行ã„ã¾ã™ï¼Ž</p>
+<p>ã¨é…ç½®ã—ã¾ã™ï¼Ž<code>make install</code>ã¨ã™ã‚‹ã¨ï¼Œ<span
+class="math inline"><em>T</em><em>E</em><em>X</em><em>M</em><em>F</em>=</span>TEXMFHOMEã¨ã—ã¦ã“ã®ã‚³ãƒ”ーを行ã„ã¾ã™ï¼Ž</p>
<h2 id="動作環境">動作環境</h2>
-<p>pLaTeX / upLaTeX / LuaLaTeX上ã§å‹•ãã¾ã™ï¼Žä»¥ä¸‹ã®ãƒ‘ッケージを内部ã§èª­ã¿è¾¼ã¿ã¾ã™ï¼Ž</p>
+<p>pLaTeX / upLaTeX /
+LuaLaTeX上ã§å‹•ãã¾ã™ï¼Žä»¥ä¸‹ã®ãƒ‘ッケージを内部ã§èª­ã¿è¾¼ã¿ã¾ã™ï¼Ž</p>
<ul>
<li>(常時):lmodern</li>
<li>(LuaLaTeXéžåˆ©ç”¨æ™‚):everyhook</li>
@@ -110,12 +118,21 @@
<p>リリース時点ã§ã®æœ€æ–°ç‰ˆã§ã®å‹•ä½œã‚’確èªã—ã¦ã„ã¾ã™ï¼Ž</p>
<h2 id="使ã„æ–¹">使ã„æ–¹</h2>
<p>通常通り</p>
-<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb1"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>ã¨ã—ã¾ã™ï¼Žã“ã‚Œã§æ¨ªæ›¸ãã®article相当ã®æ–‡æ›¸ã‚¯ãƒ©ã‚¹ã¨ãªã‚Šã¾ã™ï¼Žã‚¨ãƒ³ã‚¸ãƒ³ã¯è‡ªå‹•åˆ¤å®šã•ã‚Œã¾ã™ãŒï¼ŒæŒ‡å®šã™ã‚‹å ´åˆã¯ã‚¯ãƒ©ã‚¹ã‚ªãƒ—ションã«<code>platex/uplatex/lualatex</code>ã®ã„ãšã‚Œã‹ã‚’渡ã—ã¦ãã ã•ã„.縦書ãã«ã™ã‚‹ã«ã¯<code>tate</code>オプションを渡ã—ã¾ã™ï¼Žã¾ãŸï¼Œreportã‚„book相当ã®æ–‡æ›¸ã‚¯ãƒ©ã‚¹ã¨ã™ã‚‹ã«ã¯ï¼Œãã‚Œãžã‚Œ<code>report</code>ã‚„<code>book</code>オプションを渡ã—ã¾ã™ï¼ŽãŸã¨ãˆã°ï¼Œç¸¦æ›¸ãã®æœ¬ã‚’作æˆã™ã‚‹ã«ã¯</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb2"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>ã¨ã—ã¾ã™ï¼Ž</p>
-<p>ãã®ä»–,<code>oneside</code> / <code>twoside</code> / <code>onecolumn</code> / <code>twocolumn</code> / <code>titlepage</code> / <code>notitlepage</code> / <code>draft</code> / <code>final</code> / <code>landscape</code> / <code>openright</code> / <code>openany</code> / <code>leqno</code> / <code>fleqn</code>ã¨ã„ã†ã‚ˆãã‚るオプションをå—ã‘付ã‘ã¾ã™ï¼Žã¾ãŸ<code>disablejfam</code>オプションを渡ã™ã¨ï¼Œå’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’æ•°å¼ç”¨ã«ç™»éŒ²ã—ã¾ã›ã‚“.</p>
-<p>標準的ãªæ–‡æ›¸ã‚¯ãƒ©ã‚¹ã¨åŒã˜ã‚ˆã†ã«ä¸­èº«ã‚’書ãã“ã¨ãŒã§ãã¾ã™ãŒï¼Œæ¬¡ã®ã‚ˆã†ãªå‘½ä»¤ãŒè¿½åŠ  / æ‹¡å¼µã•ã‚Œã¦ã„ã¾ã™ï¼ŽãªãŠï¼Œæœ¬ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã¯<a href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処ç†ã®è¦ä»¶</a>ã«ãŠã‘る用語を断りãªã使ã„ã¾ã™ï¼Ž</p>
+<p>ãã®ä»–,<code>oneside</code> / <code>twoside</code> /
+<code>onecolumn</code> / <code>twocolumn</code> / <code>titlepage</code>
+/ <code>notitlepage</code> / <code>draft</code> / <code>final</code> /
+<code>landscape</code> / <code>openright</code> / <code>openany</code> /
+<code>leqno</code> /
+<code>fleqn</code>ã¨ã„ã†ã‚ˆãã‚るオプションをå—ã‘付ã‘ã¾ã™ï¼Žã¾ãŸ<code>disablejfam</code>オプションを渡ã™ã¨ï¼Œå’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’æ•°å¼ç”¨ã«ç™»éŒ²ã—ã¾ã›ã‚“.</p>
+<p>標準的ãªæ–‡æ›¸ã‚¯ãƒ©ã‚¹ã¨åŒã˜ã‚ˆã†ã«ä¸­èº«ã‚’書ãã“ã¨ãŒã§ãã¾ã™ãŒï¼Œæ¬¡ã®ã‚ˆã†ãªå‘½ä»¤ãŒè¿½åŠ 
+/ æ‹¡å¼µã•ã‚Œã¦ã„ã¾ã™ï¼ŽãªãŠï¼Œæœ¬ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã¯<a
+href="https://www.w3.org/TR/jlreq/?lang=ja">日本語組版処ç†ã®è¦ä»¶</a>ã«ãŠã‘る用語を断りãªã使ã„ã¾ã™ï¼Ž</p>
<h3 id="jlreqsetup"><code>\jlreqsetup</code></h3>
<p>設定用命令ã§ã™ï¼Žãƒ—リアンブルã§ã—ã‹ä½¿ãˆã¾ã›ã‚“.文書ã«å¯¾ã™ã‚‹è¨­å®šã¯ï¼Œã‚¯ãƒ©ã‚¹ã‚ªãƒ—ションã¨ã—ã¦è¡Œã†ã‹<code>\jlreqsetup</code>を通ã˜ã¦è¡Œã†ã‹ã—ã¾ã™ï¼Žã©ã¡ã‚‰ã§è¨­å®šã™ã‚‹ã‹ã¯è¨­å®šé …ç›®ã«ã‚ˆã‚Šã¾ã™ï¼Ž</p>
<h3 id="section"><code>\section</code></h3>
@@ -125,7 +142,8 @@
<h3 id="sidenote"><code>\sidenote</code></h3>
<p>ã“ã®å‘½ä»¤ã¯å‚注ã®å¹…ãŒæ­£ã®æ™‚ã«ã®ã¿å®šç¾©ã•ã‚Œã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®åŸºæœ¬ç‰ˆé¢ã§ã¯ã“ã®å¹…ã¯0ã«è¨­å®šã•ã‚Œã¦ã„ã¾ã™ï¼Žå¾“ã£ã¦<code>\sidenote</code>ã¯å®šç¾©ã•ã‚Œã¾ã›ã‚“.後ã®åŸºæœ¬ç‰ˆé¢ã®è¨­å®šã‚’å‚考ã«ã—ã¦ãã ã•ã„.</p>
<p><code>\sidenote</code>ã¯å‚注(縦組ã¿ã®å ´åˆã¯è„šæ³¨ï¼‰ã‚’出力ã—ã¾ã™ï¼Žå†…部ã§ã¯<code>\marginpar</code>を使ã£ã¦ã„ã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯<code>\footnote</code>ã¨åŒæ§˜ã®æ›¸å¼ã¨ãªã‚Šã¾ã™ãŒï¼Œ<code>\jlreqsetup</code>ã§<code>sidenote_type=symbol</code>ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆï¼Œãã®æ›¸å¼ã¯<code>\sidenote{該当項目}{注}</code>ã¨ãªã‚Šã¾ã™ï¼ŽãŸã¨ãˆã°</p>
-<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a>刊行ã§ãã‚‹<span class="fu">\sidenote</span>{原稿}{å°åˆ·ãªã©ã®æ–¹æ³•ã«ã‚ˆã‚Šâ€¦â€¦}を入手ã™ã‚‹ä»•äº‹ã§ã‚る.</span></code></pre></div>
+<div class="sourceCode" id="cb3"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a>刊行ã§ãã‚‹<span class="fu">\sidenote</span>{原稿}{å°åˆ·ãªã©ã®æ–¹æ³•ã«ã‚ˆã‚Šâ€¦â€¦}を入手ã™ã‚‹ä»•äº‹ã§ã‚る.</span></code></pre></div>
<p>ã¨ã—ã¾ã™ï¼Žå¾Œã®èª¬æ˜Žã‚‚å‚ç…§ã—ã¦ãã ã•ã„.</p>
<h3 id="endnote"><code>\endnote</code></h3>
<p>後注を指定ã—ã¾ã™ï¼Ž<code>\footnote</code>ã¨åŒæ§˜ã®æ›¸å¼ã§ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ï¼Œæ³¨è‡ªèº«ã®å‡ºåŠ›ã¯è¦‹å‡ºã—ç›´å‰ã«è¡Œã‚ã‚Œã¾ã™ï¼Žã“ã®å‹•ä½œã¯<code>\jlreqsetup</code>ã«<code>endnote_position</code>を渡ã™ã“ã¨ã§åˆ¶å¾¡ã§ãã¾ã™ï¼Žè©³ã—ãã¯å¾Œã®æ³¨é–¢ä¿‚ã®èª¬æ˜Žã‚’ã”覧ãã ã•ã„.ã¾ãŸ<code>\theendnotes</code>を実行ã™ã‚‹ã¨ãã®å ´ã«å‡ºåŠ›ã‚’ã—ã¾ã™ï¼Ž</p>
@@ -145,14 +163,19 @@
<p>全角空白(U+3000)一文字ã‹ã‚‰ãªã‚‹ãƒžã‚¯ãƒ­ã§ã™ï¼Žå’Œå­—間隔を挿入ã—ã¾ã™ï¼ŽLuaLaTeXã§ã¯<code> </code>ã®ã¿ã§ã‚‚和字間隔を入力ã§ãã¾ã™ï¼Ž</p>
<h3 id="ãã®ä»–">ãã®ä»–</h3>
<ul>
-<li><p>ルビやåœç‚¹ã¯æä¾›ã•ã‚Œã¾ã›ã‚“.<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>ã¾ãŸã¯`luatexja-ruby`(LuaLaTeX,LuaTeX-jaパッケージã«ä»˜å±žï¼‰ã‚’使ã†ã¨è‰¯ã„ã‹ã¨æ€ã„ã¾ã™ï¼Ž</p></li>
-<li><p>pLaTeX / upLaTeX利用時ã¯ãã‚Œãžã‚Œ<code>zw</code>ãŠã‚ˆã³<code>zh</code>ã«å±•é–‹ã•ã‚Œã‚‹ãƒžã‚¯ãƒ­<code>\zw</code>ã¨<code>\zh</code>ãŒå®šç¾©ã•ã‚Œã¾ã™ï¼ŽLuaLaTeX利用時ã¯LuaTeX-ja内ã§åŒåã®ãƒžã‚¯ãƒ­ãŒå®šç¾©ã•ã‚Œã¾ã™ï¼Ž</p></li>
+<li><p>ルビやåœç‚¹ã¯æä¾›ã•ã‚Œã¾ã›ã‚“.<a
+href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>ã¾ãŸã¯<code>luatexja-ruby</code>(LuaLaTeX,LuaTeX-jaパッケージã«ä»˜å±žï¼‰ã‚’使ã†ã¨è‰¯ã„ã‹ã¨æ€ã„ã¾ã™ï¼Ž</p></li>
+<li><p>pLaTeX /
+upLaTeX利用時ã¯ãã‚Œãžã‚Œ<code>zw</code>ãŠã‚ˆã³<code>zh</code>ã«å±•é–‹ã•ã‚Œã‚‹ãƒžã‚¯ãƒ­<code>\zw</code>ã¨<code>\zh</code>ãŒå®šç¾©ã•ã‚Œã¾ã™ï¼ŽLuaLaTeX利用時ã¯LuaTeX-ja内ã§åŒåã®ãƒžã‚¯ãƒ­ãŒå®šç¾©ã•ã‚Œã¾ã™ï¼Ž</p></li>
<li><p>日本語組版処ç†ã®è¦ä»¶2.3.2.dã«ã‚ˆã‚Œã°ï¼Œæ¨ªçµ„ã¿ã«ãŠã‘る二段組ã®æœ€å¾Œã®ãƒšãƒ¼ã‚¸ã®å„段ã®è¡Œæ•°ã¯æƒãˆã‚‹ã“ã¨ãŒæœ›ã¾ã—ã„ã¨ã•ã‚Œã¦ã„ã¾ã™ãŒï¼Œã“ã®å‡¦ç†ã¯è¡Œã‚ã‚Œã¾ã›ã‚“.<code>nidanfloat</code>パッケージを使ã„,</p>
-<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
+<div class="sourceCode" id="cb5"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
<p>ã¨ã™ã‚‹ã¨ã“ã®å‡¦ç†ãŒè¡Œã‚ã‚Œã¾ã™ï¼ŽãŸã ã—,最終ページã§ã®<code>\newpage</code>ã‚„<code>\clearpage</code>ãŒæ­£ã—ã動作ã—ã¾ã›ã‚“.詳ã—ãã¯<code>nidanfloat</code>パッケージã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’ã”覧ãã ã•ã„.</p></li>
-<li><p>フォントを設定ã™ã‚‹æ©Ÿèƒ½ã¯æœ‰ã—ã¦ã„ã¾ã›ã‚“.和文フォントã¯ï¼ŒLuaLaTeX利用時ã¯<code>luatexja-fontspec</code>ã‚„<code>luatexja-preset</code>(ã„ãšã‚Œã‚‚LuaTeX-jaパッケージã«ä»˜å±žï¼‰ã«ã‚ˆã‚Šè¨­å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ždvipdfmxを使ã†å ´åˆã¯ï¼Œ<a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>ã§ã®è¨­å®šãŒå¯èƒ½ã§ã™ï¼Ž</p></li>
+<li><p>フォントを設定ã™ã‚‹æ©Ÿèƒ½ã¯æœ‰ã—ã¦ã„ã¾ã›ã‚“.和文フォントã¯ï¼ŒLuaLaTeX利用時ã¯<code>luatexja-fontspec</code>ã‚„<code>luatexja-preset</code>(ã„ãšã‚Œã‚‚LuaTeX-jaパッケージã«ä»˜å±žï¼‰ã«ã‚ˆã‚Šè¨­å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ždvipdfmxを使ã†å ´åˆã¯ï¼Œ<a
+href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>ã§ã®è¨­å®šãŒå¯èƒ½ã§ã™ï¼Ž</p></li>
<li><p>和文間ã®ç©ºç™½ï¼ˆ(u)pTeXã§ã¯<code>\kanjiskip</code>ã«ï¼ŒLuateX-jaã§ã¯<code>kanjiskip</code>パラメータã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ï¼‰ã¯ï¼Œãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯1/4文字分ã¾ã§ã®ç©ºãを許容ã—ãŸè¨­å®šã«ãªã£ã¦ã„ã¾ã™ï¼Žã“ã‚Œã¯æ—¥æœ¬èªžçµ„版処ç†ã®è¦ä»¶ã«å¾“ã£ãŸã‚‚ã®ã§ã™ãŒï¼ŒTeXã§ã®æ©Ÿèƒ½ã®åˆ¶é™ãªã©ã‚‚ã‚り,場åˆã«ã‚ˆã£ã¦ã¯ã‚ã¾ã‚Šé©åˆ‡ã§ã¯ãªã„çµæžœã‚’生ã˜ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ï¼Žã“ã®å€¤ã‚’変更ã™ã‚‹å ´åˆã¯ï¼Œ<code>\jlreqkanjiskip</code>ã‚’å†å®šç¾©ã—ã¦ãã ã•ã„.例ãˆã°ï¼Œ</p>
-<div class="sourceCode" id="cb6"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
+<div class="sourceCode" id="cb6"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
<span id="cb6-2"><a href="#cb6-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\renewcommand</span>{<span class="ex">\jlreqkanjiskip</span>}{0pt plus .1<span class="fu">\zw</span> minus .01<span class="fu">\zw</span>}</span>
<span id="cb6-3"><a href="#cb6-3" aria-hidden="true" tabindex="-1"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span>
<span id="cb6-4"><a href="#cb6-4" aria-hidden="true" tabindex="-1"></a>(本文)</span>
@@ -165,7 +188,9 @@
<p>以下ã§ã¯æ¬¡ã®ç”¨æ³•ã‚’使ã„ã¾ã™ï¼Ž</p>
<ul>
<li><code>[A/B]</code>:Aã¾ãŸã¯Bã§ã™ï¼Ž<code>[A/B/C]</code>等もåŒæ§˜ï¼Ž</li>
-<li><code>&lt;寸法&gt;</code>:TeXãŒèªè­˜ã™ã‚‹å¯¸æ³•ã§ã™ï¼Žç°¡å˜ãªå¼ï¼ˆ<code>10pt+10pt</code>ã®ã‚ˆã†ãªï¼‰ã‚’使ã†ã“ã¨ã‚‚ã§ãã¾ã™ï¼Žã¾ãŸï¼Œã‚¯ãƒ©ã‚¹ã‚ªãƒ—ションã§ã¯ï¼Œå ´åˆã«ã‚ˆã£ã¦ã¯æ¬¡ã®ã‚ˆã†ãªç‰¹æ®Šãªå€¤ã‚’使ã†ã“ã¨ã‚‚ã§ãã¾ã™ï¼Žï¼ˆã“れらã¯pLaTeX / upLaTeXã§ã¯ã‚‚ã¨ã‹ã‚‰åˆ©ç”¨å¯èƒ½ã§ã™ãŒï¼ŒLuaLaTeXã§ã‚‚利用å¯èƒ½ãªã‚ˆã†ã«å‡¦ç†ã•ã‚Œã¦ã„ã¾ã™ï¼Žï¼‰<code>\jlreqsetup</code>内ã®ã‚ˆã†ãªå ´æ‰€ã§ã¯ï¼Œå¸¸ã«<code>\zw</code>ã‚„<code>\zh</code>ã«ã‚ˆã‚Šå…¨è§’å¹…ãŒè¨˜è¿°ã§ãã¾ã™ï¼Žä»¥ä¸‹ï¼ŒãŸã¨ãˆã°<code>Q</code>,<code>H</code>ãŒåˆ©ç”¨å¯èƒ½ãªå ´åˆã¯<code>&lt;寸法;Q,H&gt;</code>ã®ã‚ˆã†ã«è¨˜è¿°ã—ã¾ã™ï¼Ž
+<li><code>&lt;寸法&gt;</code>:TeXãŒèªè­˜ã™ã‚‹å¯¸æ³•ã§ã™ï¼Žç°¡å˜ãªå¼ï¼ˆ<code>10pt+10pt</code>ã®ã‚ˆã†ãªï¼‰ã‚’使ã†ã“ã¨ã‚‚ã§ãã¾ã™ï¼Žã¾ãŸï¼Œã‚¯ãƒ©ã‚¹ã‚ªãƒ—ションã§ã¯ï¼Œå ´åˆã«ã‚ˆã£ã¦ã¯æ¬¡ã®ã‚ˆã†ãªç‰¹æ®Šãªå€¤ã‚’使ã†ã“ã¨ã‚‚ã§ãã¾ã™ï¼Žï¼ˆã“れらã¯pLaTeX
+/
+upLaTeXã§ã¯ã‚‚ã¨ã‹ã‚‰åˆ©ç”¨å¯èƒ½ã§ã™ãŒï¼ŒLuaLaTeXã§ã‚‚利用å¯èƒ½ãªã‚ˆã†ã«å‡¦ç†ã•ã‚Œã¦ã„ã¾ã™ï¼Žï¼‰<code>\jlreqsetup</code>内ã®ã‚ˆã†ãªå ´æ‰€ã§ã¯ï¼Œå¸¸ã«<code>\zw</code>ã‚„<code>\zh</code>ã«ã‚ˆã‚Šå…¨è§’å¹…ãŒè¨˜è¿°ã§ãã¾ã™ï¼Žä»¥ä¸‹ï¼ŒãŸã¨ãˆã°<code>Q</code>,<code>H</code>ãŒåˆ©ç”¨å¯èƒ½ãªå ´åˆã¯<code>&lt;寸法;Q,H&gt;</code>ã®ã‚ˆã†ã«è¨˜è¿°ã—ã¾ã™ï¼Ž
<ul>
<li><code>Q</code>,<code>H</code>:0.25mmã¨è§£é‡ˆã•ã‚Œã¾ã™ï¼Ž</li>
<li><code>zw</code>, <code>zh</code>:全角幅ã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ï¼Ž</li>
@@ -176,10 +201,14 @@
<h3 id="基本版é¢">基本版é¢</h3>
<p>クラスオプションã§ã™ï¼Ž</p>
<ul>
-<li><code>paper=[&lt;紙サイズå&gt;/{&lt;寸法&gt;,&lt;寸法&gt;}]</code>:紙サイズã§ã™ï¼Žç´™ã‚µã‚¤ã‚ºåã¯<code>a0paper</code>ã‹ã‚‰<code>a10paper</code>,<code>b0paper</code>ã‹ã‚‰<code>b10paper</code>,<code>c2paper</code>ã‹ã‚‰<code>c8paper</code>を指定ã§ãã¾ã™ï¼ŽB列ã¯ISO B列ã§ã™ï¼ŽJIS B列を指定ã™ã‚‹å ´åˆã¯ï¼Œ<code>b0j</code>ã‹ã‚‰<code>b10j</code>ã®å¯¾å¿œã™ã‚‹ã‚‚ã®ã‚’指定ã—ã¦ãã ã•ã„.ã¾ãŸï¼Œ<code>letterpaper</code>,<code>legalpaper</code>,<code>executivepaper</code>ãŒæŒ‡å®šã§ãã¾ã™ï¼Žã•ã‚‰ã«ï¼Œ<code>{&lt;横&gt;,&lt;縦&gt;}</code>ã¨ç›´æŽ¥å¯¸æ³•ã‚’指定ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ï¼Ž</li>
+<li><code>paper=[&lt;紙サイズå&gt;/{&lt;寸法&gt;,&lt;寸法&gt;}]</code>:紙サイズã§ã™ï¼Žç´™ã‚µã‚¤ã‚ºåã¯<code>a0paper</code>ã‹ã‚‰<code>a10paper</code>,<code>b0paper</code>ã‹ã‚‰<code>b10paper</code>,<code>c2paper</code>ã‹ã‚‰<code>c8paper</code>を指定ã§ãã¾ã™ï¼ŽB列ã¯ISO
+B列ã§ã™ï¼ŽJIS
+B列を指定ã™ã‚‹å ´åˆã¯ï¼Œ<code>b0j</code>ã‹ã‚‰<code>b10j</code>ã®å¯¾å¿œã™ã‚‹ã‚‚ã®ã‚’指定ã—ã¦ãã ã•ã„.ã¾ãŸï¼Œ<code>letterpaper</code>,<code>legalpaper</code>,<code>executivepaper</code>ãŒæŒ‡å®šã§ãã¾ã™ï¼Žã•ã‚‰ã«ï¼Œ<code>{&lt;横&gt;,&lt;縦&gt;}</code>ã¨ç›´æŽ¥å¯¸æ³•ã‚’指定ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ï¼Ž</li>
<li><code>fontsize=&lt;寸法;Q,H&gt;</code>:欧文フォントサイズ.デフォルトã¯10pt.</li>
<li><code>jafontsize=&lt;寸法;Q,H&gt;</code>:和文フォントサイズ.</li>
-<li><code>jafontscale=&lt;実数値&gt;</code>:欧文フォントã¨å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã®æ¯”(和文 / 欧文).<code>fontsize</code>ã¨<code>jafontsize</code>ãŒä¸¡æ–¹æŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯1.</li>
+<li><code>jafontscale=&lt;実数値&gt;</code>:欧文フォントã¨å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã®æ¯”(和文
+/
+欧文).<code>fontsize</code>ã¨<code>jafontsize</code>ãŒä¸¡æ–¹æŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯1.</li>
<li><code>line_length=&lt;寸法;zw,zh&gt;</code>:一行ã®é•·ã•ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯å­—é€ã‚Šæ–¹å‘ã®ç´™å¹…ã®0.75å€ï¼Žå®Ÿéš›ã®å€¤ã¯ä¸€æ–‡å­—ã®é•·ã•ã®æ•´æ•°å€ã«ãªã‚‹ã‚ˆã†ã«è£œæ­£ã•ã‚Œã¾ã™ï¼Ž</li>
<li><code>number_of_lines=&lt;自然数値&gt;</code>:一ページã®è¡Œæ•°ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯è¡Œé€ã‚Šæ–¹å‘ã®ç´™å¹…ã®0.75å€ã«ãªã‚‹ã‚ˆã†ãªå€¤ï¼Ž</li>
<li><code>gutter=&lt;寸法;zw,zh&gt;</code>:ã®ã©ã®ä½™ç™½ã®å¤§ãã•ï¼Ž
@@ -212,13 +241,16 @@
<p><code>\jlreqsetup</code>ã§æŒ‡å®šã—ã¾ã™ï¼Ž</p>
<ul>
<li><code>reference_mark=[inline/interlinear]</code>:åˆå°ã®é…置方法を指定ã—ã¾ã™ï¼Ž<code>inline</code>ã«ã™ã‚‹ã¨è©²å½“é …ç›®ã®å¾Œã‚ã®è¡Œä¸­ã«é…ç½®ã—ã¾ã™ï¼Ž<code>interlinear</code>を指定ã™ã‚‹ã¨è©²å½“é …ç›®ã®ä¸Šï¼ˆæ¨ªçµ„)ã¾ãŸã¯å³ï¼ˆç¸¦çµ„)ã«é…ç½®ã—ã¾ã™ï¼Ž</li>
-<li><code>footnote_second_indent=&lt;寸法&gt;</code>: 脚注(横書ã時)ã¾ãŸã¯å‚注(縦書ã時)ã®äºŒè¡Œç›®ä»¥é™ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Žä¸€è¡Œç›®ã‹ã‚‰ã®ç›¸å¯¾å­—下ã’é‡ã§ã™ï¼Ž</li>
+<li><code>footnote_second_indent=&lt;寸法&gt;</code>:
+脚注(横書ã時)ã¾ãŸã¯å‚注(縦書ã時)ã®äºŒè¡Œç›®ä»¥é™ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Žä¸€è¡Œç›®ã‹ã‚‰ã®ç›¸å¯¾å­—下ã’é‡ã§ã™ï¼Ž</li>
<li><code>sidenote_type=[number/symbol]</code>:å‚注ã¨æœ¬æ–‡ã¨ã®å¯¾å¿œã®æ–¹æ³•ã‚’指定ã—ã¾ã™ï¼Ž<code>number</code>ãŒè¦å®šã§ï¼Œæ³¨ã®ä½ç½®ã«é€šã—番å·ãŒå…¥ã‚Šï¼Œãã‚Œã«ã‚ˆã‚Šå¯¾å¿œãŒç¤ºã•ã‚Œã¾ã™ï¼Ž<code>symbol</code>ã¨ã™ã‚‹ã¨ï¼Œæ³¨ã®ä½ç½®ã«ç‰¹å®šã®è¨˜å·ãŒå…¥ã‚Šï¼Œã¾ãŸæ³¨ãŒã¤ã„ã¦ã„ã‚‹å˜èªžãŒå¼·èª¿ã•ã‚Œã¾ã™ï¼Ž</li>
<li><code>sidenote_symbol=&lt;コード&gt;</code>:<code>sidenote_symbol=symbol</code>ã®æ™‚ã«ï¼Œæ³¨ã®ä½ç½®ã«å…¥ã‚‹è¨˜å·ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆï¼Š</li>
<li><code>sidenote_keyword_font=&lt;フォント設定コード&gt;</code>:<code>sidenote_symbol=symbol</code>ã®æ™‚ã«ï¼Œæ³¨ã®ã¤ã„ã¦ã„ã‚‹å˜èªžã®ãƒ•ã‚©ãƒ³ãƒˆæŒ‡å®šï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ç„¡ã—(強調ã—ãªã„)</li>
-<li><code>endnote_second_indent=&lt;寸法&gt;</code>: 後柱ã®äºŒè¡Œç›®ä»¥é™ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Žä¸€è¡Œç›®ã‹ã‚‰ã®ç›¸å¯¾å­—下ã’é‡ã§ã™ï¼Ž</li>
+<li><code>endnote_second_indent=&lt;寸法&gt;</code>:
+後柱ã®äºŒè¡Œç›®ä»¥é™ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Žä¸€è¡Œç›®ã‹ã‚‰ã®ç›¸å¯¾å­—下ã’é‡ã§ã™ï¼Ž</li>
<li><code>endnote_position=[headings/paragraph/{_&lt;見出ã—å1&gt;,_&lt;見出ã—å2&gt;,...}]</code>:後注ã®å‡ºåŠ›å ´æ‰€ã‚’指定ã—ã¾ã™ï¼Ž<code>headings</code>ã¯å„見出ã—ã®ç›´å‰ï¼ˆãƒ‡ãƒ•ã‚©ãƒ«ãƒˆï¼‰ï¼Œ<code>paragraph</code>ã¯æ”¹æ®µè½ã®éš›ã«å‡ºåŠ›ã—ã¾ã™ï¼Žã¾ãŸï¼Œ<code>endnote_position={_chapter,_section}</code>ã¨ã™ã‚‹ã¨ï¼Œ<code>\chapter</code>ã¨<code>\section</code>ã®ç›´å‰ã«å‡ºåŠ›ã—ã¾ã™ï¼Ž<code>&lt;_見出ã—å&gt;</code>を指定ã™ã‚‹ãŸã‚ã«ã¯ï¼Œå¯¾è±¡ã®è¦‹å‡ºã—ãŒæœ¬ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®æ©Ÿèƒ½ã‚’使ã£ã¦ä½œã‚‰ã‚Œã¦ã„ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“.</li>
-<li><code>warichu_opening=&lt;コード&gt;</code>, <code>warichu_closing=&lt;コード&gt;</code>:ãã‚Œãžã‚Œï¼Œå‰²æ³¨ã®å‰ã¨å¾Œã‚ã«æŒ¿å…¥ã•ã‚Œã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯<code>(</code>ã¨<code>)</code>ã§ã™ï¼Ž</li>
+<li><code>warichu_opening=&lt;コード&gt;</code>,
+<code>warichu_closing=&lt;コード&gt;</code>:ãã‚Œãžã‚Œï¼Œå‰²æ³¨ã®å‰ã¨å¾Œã‚ã«æŒ¿å…¥ã•ã‚Œã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯<code>(</code>ã¨<code>)</code>ã§ã™ï¼Ž</li>
</ul>
<h3 id="キャプション">キャプション</h3>
<p>図表ã®ã‚­ãƒ£ãƒ—ションを<code>\jlreqsetup</code>ã§å¤‰æ›´ã§ãã¾ã™ï¼Žå…¨ã¦ã®è¨­å®šã§ï¼Œå„環境ã”ã¨ã®è¨­å®šã‚’ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Žä¾‹ãˆã°<code>caption_font=\normalsize,table=\Large</code>ã¨ã™ã‚‹ã¨ï¼Œtable環境内ã§ã¯<code>\Large</code>ãŒé©ç”¨ã•ã‚Œï¼Œãã®ã»ã‹ã®ç’°å¢ƒå†…ã§ã¯<code>\normalsize</code>ãŒé©ç”¨ã•ã‚Œã¾ã™ï¼Žä»–ã®è¨­å®šã‚‚åŒæ§˜ã§ã™ï¼Ž</p>
@@ -244,7 +276,9 @@
<li><code>itemization_itemsep=&lt;寸法&gt;</code>:項目åŒå£«ã®ç©ºãを指定ã—ã¾ã™ï¼Ž</li>
</ul>
<h3 id="å‰ä»˜ããªã©">å‰ä»˜ããªã©</h3>
-<p><code>\frontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code>ã§ã®å‡¦ç†ã‚’<code>\jlreqsetup</code>ã§æŒ‡å®šã§ãã¾ã™ï¼Ž</p>
+<p><code>\frontmatter</code> / <code>\mainmatter</code> /
+<code>\backmatter</code> /
+<code>\appendix</code>ã§ã®å‡¦ç†ã‚’<code>\jlreqsetup</code>ã§æŒ‡å®šã§ãã¾ã™ï¼Ž</p>
<ul>
<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage/]</code>:<code>\frontmatter</code>実行時ã®æ”¹ãƒšãƒ¼ã‚¸ã‚’実行ã™ã‚‹å‘½ä»¤åを指定ã—ã¾ã™ï¼Žç©ºã«ã™ã‚‹ã¨ä½•ã‚‚ã—ã¾ã›ã‚“.</li>
<li><code>frontmatter_counter={&lt;カウンタå&gt;={value=&lt;値&gt;, the=&lt;コード&gt;, restore=[true/false]},...}</code>:<code>\frontmatter</code>時ã§ã®ã‚«ã‚¦ãƒ³ã‚¿ã®æ“作を指定ã—ã¾ã™ï¼Žä¾‹ãˆã°<code>chapter={value=0,the={[\arabic{chapter]}}</code>ã¨ã™ã‚‹ã¨ï¼Œ<code>chapter</code>カウンタã®å€¤ãŒ<code>0</code>ã«ãªã‚Šï¼Œ<code>\thechapter</code>ãŒ<code>[\arabic{chapter}]</code>ã¨ãªã‚Šã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯<code>\mainmatter</code>時ã«å€¤ã¨<code>\the&lt;カウンタå&gt;</code>ã®å®šç¾©ã‚’戻ã—ã¾ã™ãŒï¼Œ<code>restore=false</code>ã¨ã™ã‚‹ã¨ã“ã®å‹•ããŒæŠ‘制ã•ã‚Œã¾ã™ï¼Ž</li>
@@ -314,7 +348,8 @@
<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>:見出ã—ç›´å‰ã®æ”¹ãƒšãƒ¼ã‚¸ã‚’指定ã—ã¾ã™ï¼Žãã‚Œãžã‚Œï¼Œæ”¹ãƒšãƒ¼ã‚¸ï¼Œ<code>\cleardoublepage</code>実行,改段,ãªã‚Šã‚†ã,奇数ページ開始,å¶æ•°ãƒšãƒ¼ã‚¸é–‹å§‹ï¼Œã§ã™ï¼Ž</li>
<li><code>pagestyle=&lt;ページスタイルå&gt;</code>:見出ã—箇所ã®ãƒšãƒ¼ã‚¸ã‚¹ã‚¿ã‚¤ãƒ«ã‚’指定ã—ã¾ã™ï¼Ž</li>
<li><code>afterindent=[true/false]</code>:見出ã—直後ã®æ®µè½ã®å­—下ã’ã‚’è¡Œã†ã‹ã‚’指定ã—ã¾ã™ï¼Ž</li>
-<li><code>column_spanning=[true/false]</code>: 段抜ãã®è¦‹å‡ºã—ã«ã—ã¾ã™ï¼Ž<code>pagebreak=nariyuki</code>ã¾ãŸã¯<code>pagebreak=clearcolumn</code>ã®æ™‚ã«ã¯ç„¡è¦–ã•ã‚Œã¾ã™ï¼Ž</li>
+<li><code>column_spanning=[true/false]</code>:
+段抜ãã®è¦‹å‡ºã—ã«ã—ã¾ã™ï¼Ž<code>pagebreak=nariyuki</code>ã¾ãŸã¯<code>pagebreak=clearcolumn</code>ã®æ™‚ã«ã¯ç„¡è¦–ã•ã‚Œã¾ã™ï¼Ž</li>
<li><code>number=[true/false]</code>:採番を行ã†ã‹ã‚’指定ã—ã¾ã™ï¼Ž<code>\NewTobiraHeading</code>ã¨åŒæ§˜ã®æ³¨æ„ãŒå¿…è¦ã§ã™ï¼Ž</li>
</ul>
<h4 id="è¡Œå–ã‚Š">è¡Œå–ã‚Š</h4>
@@ -326,7 +361,8 @@
</ul>
<h4 id="連続ã—ã¦æŽ²ã’る見出ã—ã®è¡Œå–ã‚Š">連続ã—ã¦æŽ²ã’る見出ã—ã®è¡Œå–ã‚Š</h4>
<p><code>\SetBlockHeadingSpaces</code>ã«ã‚ˆã‚Šï¼Œè¦‹å‡ºã—ãŒé€£ç¶šã—ã¦æŽ²ã’られãŸã¨ãã®è¡Œå–りを設定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž<code>\SetBlockHeadingSpaces</code>ã¯</p>
-<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span>
+<div class="sourceCode" id="cb8"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span>
<span id="cb8-2"><a href="#cb8-2" aria-hidden="true" tabindex="-1"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span>
<span id="cb8-3"><a href="#cb8-3" aria-hidden="true" tabindex="-1"></a> [lines=5]{_section,23pt,_subsection,16pt}</span>
<span id="cb8-4"><a href="#cb8-4" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
@@ -349,7 +385,8 @@
<p><code>\NewRuninHeading</code>ã§ä½œæˆã—ã¾ã™ï¼Žé€šå¸¸ã®æ–‡æ›¸ã‚¯ãƒ©ã‚¹ã«ãŠã‘ã‚‹<code>\section</code>ã¨åŒæ§˜ã®ï¼Œ<code>\&lt;命令å&gt;*[running head]{見出ã—文字列}</code>ã¨ã„ã†æ›¸å¼ã®å‘½ä»¤ãŒä½œæˆã•ã‚Œã¾ã™ï¼Žè¨­å®šã¯ä»¥ä¸‹ã®é€šã‚Šï¼Ž</p>
<ul>
<li><code>font=&lt;フォント設定コード&gt;</code>:見出ã—ã®ãƒ•ã‚©ãƒ³ãƒˆã‚’指定ã—ã¾ã™ï¼Ž</li>
-<li><code>indent=&lt;寸法&gt;</code> 見出ã—文字列全体ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Ž</li>
+<li><code>indent=&lt;寸法&gt;</code>
+見出ã—文字列全体ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Ž</li>
<li><code>after_label_space=&lt;寸法&gt;</code>:ラベル後,見出ã—文字列ã¾ã§ã®ç©ºãを指定ã—ã¾ã™ï¼Ž</li>
<li><code>label_format=&lt;コード&gt;</code>:ラベルã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ï¼Ž<code>label_format={\theparagraph}</code>ãªã©ã®ã‚ˆã†ã«ã—ã¾ã™ï¼Ž</li>
<li><code>after_space=&lt;寸法&gt;</code>:見出ã—ã¨æœ¬æ–‡ã¨ã®é–“ã®ç©ºãを指定ã—ã¾ã™ï¼Ž</li>
@@ -361,15 +398,18 @@
<li><code>font=&lt;フォント設定コード&gt;</code>:見出ã—ã®ãƒ•ã‚©ãƒ³ãƒˆã‚’指定ã—ã¾ã™ï¼Ž</li>
<li><code>indent=&lt;寸法&gt;</code>:見出ã—全体ã®å­—下ã’é‡ã‚’指定ã—ã¾ã™ï¼Ž</li>
<li><code>after_space=&lt;寸法&gt;</code>:見出ã—ã¨æœ¬æ–‡ã¨ã®é–“ã®ç©ºãを指定ã—ã¾ã™ï¼Ž</li>
-<li><code>onelinemax=&lt;寸法&gt;</code>, <code>twolinemax=&lt;寸法&gt;</code>:見出ã—文字列ã®é•·ã•ãŒ<code>onelinemax</code>以下ãªã‚‰ã°ä¸€è¡Œã§ï¼Œ<code>twolinemax</code>以下ãªã‚‰ã°äºŒè¡Œã§çª“見出ã—を出力ã—ã¾ã™ï¼Žãれ以上ã®å ´åˆã¯ä¸‰è¡Œã§ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ãã‚Œãžã‚Œ6文字,20文字ã®é•·ã•ï¼Ž</li>
+<li><code>onelinemax=&lt;寸法&gt;</code>,
+<code>twolinemax=&lt;寸法&gt;</code>:見出ã—文字列ã®é•·ã•ãŒ<code>onelinemax</code>以下ãªã‚‰ã°ä¸€è¡Œã§ï¼Œ<code>twolinemax</code>以下ãªã‚‰ã°äºŒè¡Œã§çª“見出ã—を出力ã—ã¾ã™ï¼Žãれ以上ã®å ´åˆã¯ä¸‰è¡Œã§ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯ãã‚Œãžã‚Œ6文字,20文字ã®é•·ã•ï¼Ž</li>
</ul>
<h3 id="modifyheading"><code>\ModifyHeading</code></h3>
<p>æ—¢ã«ï¼ˆä¸Šã®ã©ã‚Œã‹ã‚’使ã„)定義ã•ã‚ŒãŸè¦‹å‡ºã—命令ã®è¨­å®šã‚’変更ã—ã¾ã™ï¼ŽãŸã¨ãˆã°</p>
-<div class="sourceCode" id="cb9"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
+<div class="sourceCode" id="cb9"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
<p>ã¨ã™ã‚‹ã¨ï¼Œ<code>\section</code>ã®ãƒ•ã‚©ãƒ³ãƒˆãªã©ã®è¨­å®šã¯ãã®ã¾ã¾ã«ï¼Œè¡Œå–ã‚Šã®ã¿ãŒ10è¡Œã«å¤‰æ›´ã•ã‚Œã¾ã™ï¼Žè¦‹å‡ºã—ã®ç¨®é¡žã‚’変更ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“.</p>
<h3 id="saveheading"><code>\SaveHeading</code></h3>
<p>見出ã—命令ã®å®šç¾©ã‚’å¾…é¿ã—ã¾ã™ï¼Ž</p>
-<div class="sourceCode" id="cb10"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb10-1"><a href="#cb10-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionã®ä¸­èº«ã‚’\restoresectionã«å¾…é¿ï¼Ž</span></span>
+<div class="sourceCode" id="cb10"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb10-1"><a href="#cb10-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionã®ä¸­èº«ã‚’\restoresectionã«å¾…é¿ï¼Ž</span></span>
<span id="cb10-2"><a href="#cb10-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionã‚’æ–°ã—ã定義ã™ã‚‹ï¼Ž</span></span>
<span id="cb10-3"><a href="#cb10-3" aria-hidden="true" tabindex="-1"></a>……</span>
<span id="cb10-4"><a href="#cb10-4" aria-hidden="true" tabindex="-1"></a><span class="fu">\restoresection</span> <span class="co">% \sectionã®ä¸­èº«ã‚’å…ƒã«æˆ»ã™ï¼Ž</span></span></code></pre></div>
@@ -382,7 +422,8 @@
<li><code>tate</code>:縦書ãã§å°å£å´ã«å‡ºåŠ›ã—ã¾ã™ï¼Ž</li>
<li><code>running_head_font=&lt;フォント設定命令&gt;</code>:柱ã®ãƒ•ã‚©ãƒ³ãƒˆã‚’指定ã—ã¾ã™ï¼Ž</li>
<li><code>nombre_font=&lt;フォント設定命令&gt;</code>:ノンブルã®ãƒ•ã‚©ãƒ³ãƒˆã‚’指定ã—ã¾ã™ï¼Ž</li>
-<li><code>running_head_position</code>, <code>nombre_position</code>:柱ã¨ãƒŽãƒ³ãƒ–ルã®ä½ç½®ã‚’指定ã—ã¾ã™ï¼Ž<code>yoko</code>ã‹<code>tate</code>ã®ã©ã¡ã‚‰ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã‹ã§æŒ‡å®šæ–¹æ³•ãŒå¤‰ã‚ã‚Šã¾ã™ï¼Ž
+<li><code>running_head_position</code>,
+<code>nombre_position</code>:柱ã¨ãƒŽãƒ³ãƒ–ルã®ä½ç½®ã‚’指定ã—ã¾ã™ï¼Ž<code>yoko</code>ã‹<code>tate</code>ã®ã©ã¡ã‚‰ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã‹ã§æŒ‡å®šæ–¹æ³•ãŒå¤‰ã‚ã‚Šã¾ã™ï¼Ž
<ul>
<li><code>yoko</code>指定時:<code>top-left</code>ã®ã‚ˆã†ã«æŒ‡å®šã§ãã¾ã™ï¼Ž<code>top / bottom / center / left / right / gutter / fore-edge</code>ãŒä½¿ãˆã¾ã™ï¼Ž<code>gutter</code>ã¯ã®ã©ï¼Œ<code>fore-edge</code>ã¯å°å£ã§ã™ï¼Ž<code>left</code>,<code>right</code>ã®æŒ‡å®šã¯å¥‡æ•°ãƒšãƒ¼ã‚¸ã«å¯¾ã™ã‚‹ã‚‚ã®ã§ã™ï¼Ž<code>twoside</code>ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆï¼Œå¶æ•°ãƒšãƒ¼ã‚¸ã¯ãã®é€†ã«ãªã‚Šã¾ã™ï¼Ž</li>
<li><code>tate</code>指定時:<code>&lt;寸法&gt;</code>ãŒæŒ‡å®šã§ãã¾ã™ï¼Ž<code>running_head_position</code>ã¯æŸ±ã®å¤©ã‹ã‚‰ã®ä¸‹ã’é‡ã‚’,<code>nombre_position</code>ã¯ãƒŽãƒ³ãƒ–ルã®åœ°ã‹ã‚‰ã®ä¸Šã’é‡ã‚’指定ã—ã¾ã™ï¼Ž</li>
@@ -391,7 +432,10 @@
<li><code>odd_running_head=&lt;書å¼&gt;</code>,<code>even_running_head=&lt;書å¼&gt;</code>:ãã‚Œãžã‚Œå¥‡æ•°ãƒšãƒ¼ã‚¸ï¼Œå¶æ•°ãƒšãƒ¼ã‚¸ã®æŸ±ã‚’指定ã—ã¾ã™ï¼Ž<code>_section</code>ã®ã‚ˆã†ã«<code>_</code>ã‹ã‚‰å§‹ã¾ã‚‹åå‰ã‚’指定ã™ã‚‹ã¨ï¼Œå¯¾å¿œã™ã‚‹è¦‹å‡ºã—を出力ã—ã¾ã™ï¼Žï¼ˆ<code>_section</code>ã ã¨ç¾åœ¨ã®<code>\section</code>を出力ã™ã‚‹ï¼Žï¼‰</li>
<li><code>mark_format={[odd=&lt;書å¼&gt;/even=&lt;書å¼&gt;/_&lt;見出ã—命令å&gt;=&lt;書å¼&gt;],...}</code>:見出ã—を柱ã«å‡ºåŠ›ã™ã‚‹éš›ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ï¼Ž<code>mark_format={_section={節\thesection:#1},_chapter={第\thechapter ç« \quad #1}}</code>ã®ã‚ˆã†ã«æŒ‡å®šã—ã¾ã™ï¼Žè¦‹å‡ºã—命令åã®ä»£ã‚ã‚Šã«<code>odd</code>ã‚„<code>even</code>も指定ã§ã,ãã‚Œãžã‚Œå¥‡æ•°ãƒšãƒ¼ã‚¸/å¶æ•°ãƒšãƒ¼ã‚¸ã®æŸ±ã®æ›¸å¼ã«ãªã‚Šã¾ã™ï¼Ž<code>\pagestyle</code>実行時ã«<code>\sectionmark</code>等を定義ã™ã‚‹ã“ã¨ã§å®Ÿç¾ã—ã¦ã„ã¾ã™ï¼Ž</li>
<li><code>nombre_ii=&lt;書å¼&gt;</code>:二ã¤ç›®ã®ãƒŽãƒ³ãƒ–ルを指定ã—ã¾ã™ï¼Ž<code>nombre_ii_position</code>ã§å ´æ‰€æŒ‡å®šï¼Œ<code>nombre_ii_font</code>ã§ãƒ•ã‚©ãƒ³ãƒˆè¨­å®šã‚‚ã§ãã¾ã™ï¼ŽæŒ‡å®šæ–¹æ³•ã¯<code>nombre</code>ã‚„<code>nombre_position</code>ã¨åŒã˜ã§ã™ï¼Ž<code>odd_running_head_ii</code>,<code>even_running_head_ii</code>,<code>running_head_ii_position</code>,<code>running_head_ii_font</code>ã‚‚ã‚ã‚Šã¾ã™ï¼Ž<code>nombre_ii_position</code>ã‚„<code>running_head_ii_position</code>ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆï¼Œ<code>yoko</code>指定時ã«ã¯ãã‚Œãžã‚Œ<code>nombre_position</code>ãŠã‚ˆã³<code>running_head_position</code>ã¨åŒã˜ä½ç½®ã«è¨­å®šã•ã‚Œã¾ã™ï¼Ž<code>tate</code>指定時ã¯ä¸€ã¤ç›®ã®ãƒŽãƒ³ãƒ–ルや柱ã«ç¶šã場所ã«è¡¨ç¤ºã•ã‚Œã¾ã™ï¼Ž</li>
-<li><code>odd_head_format=&lt;書å¼&gt;</code>, <code>odd_foot_format=&lt;書å¼&gt;</code>, <code>even_head_format=&lt;書å¼&gt;</code>, <code>even_foot_format=&lt;書å¼&gt;</code>:ヘッダやフッタã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ï¼Ž<code>#1</code>ãŒãƒ˜ãƒƒãƒ€ã¾ãŸã¯ãƒ•ãƒƒã‚¿å…¨ä½“ã«æ›¸ãæ›ãˆã‚‰ã‚Œã¾ã™ï¼ŽãŸã ã—<code>#1</code>ã«ã¯ä½ç½®èª¿æ•´ç”¨ã®ã‚³ãƒ¼ãƒ‰ãŒå…¥ã£ã¦ã„ã‚‹å ´åˆã‚‚ã‚ã‚‹ã®ã§ï¼Œç‰¹ã«<code>\NewPageStyle</code>ã«<code>tate</code>を指定ã—ã¦ã„ã‚‹å ´åˆã«ã¯æ€ã†ã‚ˆã†ã«ãªã‚‰ãªã„ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ï¼Žä¾‹ãˆã°å¥‡æ•°ãƒšãƒ¼ã‚¸ã®ãƒ˜ãƒƒãƒ€ã«ç½«ç·šã‚’引ããŸã‚ã«ã¯<code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}</code>ã¨ã™ã‚‹ã¨ã‚ˆã„ã§ã—ょã†ï¼ŽãªãŠï¼Œã“ã“ã§ä½¿ã£ãŸ<code>\jlreqyokoheadlength</code>ã¯æœ¬ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«å†…ã§å®šç¾©ã•ã‚Œã¦ã„るマクロã§ï¼Œãƒ˜ãƒƒãƒ€ã®æ¨ªæ–¹å‘ã®é•·ã•ã‚’与ãˆã¾ã™ï¼Žï¼ˆãƒ•ãƒƒã‚¿ã®é•·ã•ã‚‚åŒã˜ã§ã™ï¼Žï¼‰ç¸¦æ–¹å‘ã®é•·ã•ï¼Œã™ãªã‚ã¡<code>\NewPageStyle</code>ã§<code>tate</code>ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã®é•·ã•ã¯<code>\jlreqtateheadlength</code>ã§å–å¾—ã§ãã¾ã™ï¼Ž</li>
+<li><code>odd_head_format=&lt;書å¼&gt;</code>,
+<code>odd_foot_format=&lt;書å¼&gt;</code>,
+<code>even_head_format=&lt;書å¼&gt;</code>,
+<code>even_foot_format=&lt;書å¼&gt;</code>:ヘッダやフッタã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ï¼Ž<code>#1</code>ãŒãƒ˜ãƒƒãƒ€ã¾ãŸã¯ãƒ•ãƒƒã‚¿å…¨ä½“ã«æ›¸ãæ›ãˆã‚‰ã‚Œã¾ã™ï¼ŽãŸã ã—<code>#1</code>ã«ã¯ä½ç½®èª¿æ•´ç”¨ã®ã‚³ãƒ¼ãƒ‰ãŒå…¥ã£ã¦ã„ã‚‹å ´åˆã‚‚ã‚ã‚‹ã®ã§ï¼Œç‰¹ã«<code>\NewPageStyle</code>ã«<code>tate</code>を指定ã—ã¦ã„ã‚‹å ´åˆã«ã¯æ€ã†ã‚ˆã†ã«ãªã‚‰ãªã„ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ï¼Žä¾‹ãˆã°å¥‡æ•°ãƒšãƒ¼ã‚¸ã®ãƒ˜ãƒƒãƒ€ã«ç½«ç·šã‚’引ããŸã‚ã«ã¯<code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}</code>ã¨ã™ã‚‹ã¨ã‚ˆã„ã§ã—ょã†ï¼ŽãªãŠï¼Œã“ã“ã§ä½¿ã£ãŸ<code>\jlreqyokoheadlength</code>ã¯æœ¬ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«å†…ã§å®šç¾©ã•ã‚Œã¦ã„るマクロã§ï¼Œãƒ˜ãƒƒãƒ€ã®æ¨ªæ–¹å‘ã®é•·ã•ã‚’与ãˆã¾ã™ï¼Žï¼ˆãƒ•ãƒƒã‚¿ã®é•·ã•ã‚‚åŒã˜ã§ã™ï¼Žï¼‰ç¸¦æ–¹å‘ã®é•·ã•ï¼Œã™ãªã‚ã¡<code>\NewPageStyle</code>ã§<code>tate</code>ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã®é•·ã•ã¯<code>\jlreqtateheadlength</code>ã§å–å¾—ã§ãã¾ã™ï¼Ž</li>
</ul>
<p><code>\RenewPageStyle</code>,<code>\ProvidePageStyle</code>,<code>\DeclarePageStyle</code>ã‚‚ã‚ã‚Šã¾ã™ï¼Ž<code>\ModifyPageStyle</code>ã«ã‚ˆã‚Šæ—¢å­˜ã®ãƒšãƒ¼ã‚¸ã‚¹ã‚¿ã‚¤ãƒ«ã‚’改変ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ï¼Ž</p>
<h2 id="jfm">JFM</h2>
@@ -402,8 +446,10 @@
<p>ãã‚Œãžã‚Œã®æ–‡å­—ã¯ä»¥ä¸‹ã®å ´åˆã«å…¥ã‚Šã¾ã™ï¼Ž</p>
<ul>
<li><code>u</code>: upLaTeX利用時</li>
-<li><code>b</code>: ã¶ã‚‰ä¸‹ã’組ã¿åˆ©ç”¨æ™‚.(クラスオプションã«<code>hanging_punctuation</code>ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚.)</li>
-<li><code>z</code>: 行頭ã«ãŠã‘ã‚‹é–‹ã括弧類ã®å‰ã®ç©ºããŒï¼Œæ®µè½é–‹å§‹æ™‚ãŒå…¨è§’二分,折り返ã—時ãŒäºŒåˆ†ã®æ™‚.(クラスオプションã«<code>open_bracket_pos=zenkakunibu_nibu</code>ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚.)</li>
+<li><code>b</code>:
+ã¶ã‚‰ä¸‹ã’組ã¿åˆ©ç”¨æ™‚.(クラスオプションã«<code>hanging_punctuation</code>ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚.)</li>
+<li><code>z</code>:
+行頭ã«ãŠã‘ã‚‹é–‹ã括弧類ã®å‰ã®ç©ºããŒï¼Œæ®µè½é–‹å§‹æ™‚ãŒå…¨è§’二分,折り返ã—時ãŒäºŒåˆ†ã®æ™‚.(クラスオプションã«<code>open_bracket_pos=zenkakunibu_nibu</code>ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚.)</li>
<li><code>g</code>: ゴシック用フォント.</li>
<li><code>-v</code>: 縦書ã用.</li>
</ul>
@@ -421,7 +467,8 @@
<h2 id="jlreq-complements">jlreq-complements</h2>
<p><code>jlreq-complements</code>パッケージã¯LaTeXã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚¯ãƒ©ã‚¹ã§æ¨™æº–çš„ã«æä¾›ã•ã‚Œã‚‹ç’°å¢ƒãªã©ã‚’カスタマイズå¯èƒ½ãªã‚‚ã®ã«å¤‰æ›´ã™ã‚‹ãƒ‘ッケージã§ã™ï¼Žä»¥ä¸‹ã®ã‚ˆã†ã«ä½¿ã„ã¾ã™ï¼Žæ¬¡ã®ã‚ªãƒ—ションをå—ã‘付ã‘ã¾ã™ï¼Ž</p>
<ul>
-<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>:エンジンã®æŒ‡å®šã§ã™ï¼Ž</li>
+<li><code>platex</code>, <code>uplatex</code>,
+<code>lulalatex</code>:エンジンã®æŒ‡å®šã§ã™ï¼Ž</li>
<li><code>setupname=&lt;åå‰&gt;</code>:カスタマイズã™ã‚‹ãŸã‚ã®å‘½ä»¤åを指定ã—ã¾ã™ï¼Žãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯<code>jlreqcomplementssetup</code>ã§ï¼Œ<code>jlreqcomplementssetup{&lt;設定項目&gt;}</code>ã¨ãƒ—リアンブルã«æ›¸ãã“ã¨ã§è¨­å®šã§ãã¾ã™ï¼Ž</li>
</ul>
<p><code>jlreq</code>内ã§ã¯<code>\usepackage[&lt;jlreq内ã§èªè­˜ã—ã¦ã„るエンジン&gt;,setupname=jlreqsetup]{jlreq-complements}</code>相当ã§èª­ã¿è¾¼ã¿ãŒã•ã‚Œã¦ã„ã¾ã™ã®ã§ï¼Œä»Šã¾ã§ã®<code>\jlreqsetup</code>ã§ç’°å¢ƒã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã‚’ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼ŽãªãŠï¼Œã“ã®ã‚ˆã†ã«æ—¢å­˜ã®åå‰ã‚’指定ã—ã¦ã†ã¾ãè¡ŒããŸã‚ã«ã¯ã‚‚ã¨ã‚‚ã¨ã®å‘½ä»¤ã¨æ•´åˆçš„ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Žé€šå¸¸ã¯é¿ã‘ãŸæ–¹ãŒã‚ˆã„ã§ã—ょã†ï¼Ž</p>
@@ -453,7 +500,8 @@
</ul>
<p><code>amsthm</code>パッケージãŒèª­ã¿è¾¼ã¾ã‚Œã‚‹ã¨ï¼Œæ–°ã—ã„定ç†ã‚¹ã‚¿ã‚¤ãƒ«<code>jlreq</code>ãŒå®šç¾©ã•ã‚Œï¼Œç¾åœ¨ã®ã‚¹ã‚¿ã‚¤ãƒ«ãŒ<code>jlreq</code>ã¸ã¨å¤‰æ›´ã•ã‚Œã¾ã™ï¼Žã“ã®ã¨ã,上記設定ã¯ã“ã®<code>jlreq</code>スタイルã¸ã®è¨­å®šã¨ã—ã¦æ©Ÿèƒ½ã—ã¾ã™ï¼Ž</p>
<h2 id="ライセンス">ライセンス</h2>
-<p>ã“ã®ãƒ‘ッケージã¯äºŒæ¡é …BSDライセンスã®å…ƒã§é…布ã•ã‚Œã¦ã„ã¾ã™ï¼Žè©³ã—ãã¯<a href="LICENSE">LICENSE</a>ã‚’ã”覧ãã ã•ã„.</p>
+<p>ã“ã®ãƒ‘ッケージã¯äºŒæ¡é …BSDライセンスã®å…ƒã§é…布ã•ã‚Œã¦ã„ã¾ã™ï¼Žè©³ã—ãã¯<a
+href="LICENSE">LICENSE</a>ã‚’ã”覧ãã ã•ã„.</p>
<h2 id="履歴">履歴</h2>
<ul>
<li>2017-02-08
@@ -516,7 +564,8 @@
<ul>
<li>ãƒã‚°ä¿®æ­£</li>
<li><code>\SetBlockHeadingSpaces</code>を追加.</li>
-<li><code>\contentsname</code> 㨠<code>\indexname</code>ã«å…¥ã£ã¦ã„ãŸã‚¹ãƒšãƒ¼ã‚¹ã‚’削除.</li>
+<li><code>\contentsname</code> ã¨
+<code>\indexname</code>ã«å…¥ã£ã¦ã„ãŸã‚¹ãƒšãƒ¼ã‚¹ã‚’削除.</li>
</ul></li>
<li>2017-12-02
<ul>
@@ -722,9 +771,26 @@
<ul>
<li>ãƒã‚°ä¿®æ­£</li>
</ul></li>
+<li>2024-08-23
+<ul>
+<li>ãƒã‚°ä¿®æ­£</li>
+<li>内部変数åã®å¤‰æ›´</li>
+<li>英語ドキュメントã«ä½¿ã„方を書ã„ãŸ</li>
+<li><code>\DeclareKeys</code>ãªã©ã‚’使ã†ã‚ˆã†ã«ã—ãŸï¼Ž</li>
+<li>行見出ã—ã®å†…部処ç†ã‚’ã¡ã‚‡ã£ã¨ã ã‘変更.</li>
+</ul></li>
+<li>2024-09-26
+<ul>
+<li>Makefileã§ã®ãƒ‘ターンマッãƒãƒ³ã‚°ã®ä½¿ç”¨ã‚’ã‚„ã‚ãŸ</li>
+</ul></li>
+<li>2024-10-03
+<ul>
+<li>Makefile内ã®vf一覧ã«tfmãŒç´›ã‚Œã¦ã„ãŸã®ã‚’修正.</li>
+</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a
+href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
index ed4fb07f5d0..03385d83ecc 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
index 2a37503edec..29c9a1bf242 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
@@ -274,6 +274,10 @@
<ul>
<li>ドキュメントã®é–“é•ã„を修正.</li>
</ul></li>
+<li>2024-08-23
+<ul>
+<li><code>\DeclareKeys</code>ãªã©ã‚’使ã†ã‚ˆã†ã«ã—ãŸï¼Ž</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
index a1d2f2b9302..d6c67393af9 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
@@ -263,10 +263,14 @@
<ul>
<li>Fixed a bug: an error occurred when the package is loaded with tate mode.</li>
</ul></li>
-<li>2023-02-13
+<li>2024-02-13
<ul>
<li>Fixed a bug in a document.</li>
</ul></li>
+<li>2024-08-23
+<ul>
+<li>Use <code>\DeclareKeys</code> etc.</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html
index 488787b9798..ce7f328105a 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html
@@ -88,355 +88,885 @@
<article class="markdown-body">
<h1 id="jlreq">jlreq</h1>
<h2 id="what-is-this">What is this?</h2>
-<p>This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement <a href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese Text Layout</a>.</p>
+<p>This package provides the class file and JFM (Japanese font metric)
+files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement <a
+href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese
+Text Layout</a>.</p>
<h2 id="installation">Installation</h2>
-<p>Run <code>make</code> to generate JFM files. Move the files as follows:</p>
+<p>Run <code>make</code> to generate JFM files. Move the files as
+follows:</p>
<ul>
<li>*.tfm -&gt; $TEXMF/fonts/tfm/public/jlreq</li>
<li>*.vf -&gt; $TEXMF/fonts/vf/public/jlreq</li>
-<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua jfm-jlreqv-jidori.lua -&gt; $TEXMF/tex/luatex/jlreq</li>
+<li>jfm-jlreq.lua, jfm-jlreqv.lua, jfm-jlreq-jidori.lua
+jfm-jlreqv-jidori.lua -&gt; $TEXMF/tex/luatex/jlreq</li>
<li>jlreq.cls, jlreq-helpers.sty -&gt; $TEXMF/tex/latex/jlreq</li>
</ul>
-<p>The other way to install is just to run <code>make install</code>. It will install all files in <code>$TEXMFHOME</code>.</p>
+<p>The other way to install is just to run <code>make install</code>. It
+will install all files in <code>$TEXMFHOME</code>.</p>
<h2 id="usage">Usage</h2>
<p>To use, simply write</p>
-<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
-<p>This will set up a document class equivalent to an article in horizontal writing. The engine is automatically determined, but if you want to specify it, pass one of <code>platex/uplatex/lualatex</code> as a class option. To switch to vertical writing, pass the <code>tate</code> option. Additionally, to make the document class equivalent to report or book, pass the <code>report</code> or <code>book</code> option respectively. For example, to create a vertical book, write <code>\documentclass[tate,book]{jlreq}</code>.</p>
-<p>Other common options accepted are <code>oneside/twoside/onecolumn/twocolumn/titlepage/notitlepage/draft/final/landscape/openright/openany/leqno/fleqn</code>. Also, passing the <code>disablejfam</code> option will not register Japanese fonts for use in mathematics.</p>
-<p>You can write the content as you would in a standard document class, but the following commands have been added or extended. Note that this document uses terms from <a href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese Text Layout</a> without explanation.</p>
+<div class="sourceCode" id="cb1"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
+<p>This will set up a document class equivalent to an article in
+horizontal writing. The engine is automatically determined, but if you
+want to specify it, pass one of <code>platex/uplatex/lualatex</code> as
+a class option. To switch to vertical writing, pass the
+<code>tate</code> option. Additionally, to make the document class
+equivalent to report or book, pass the <code>report</code> or
+<code>book</code> option respectively. For example, to create a vertical
+book, write <code>\documentclass[tate,book]{jlreq}</code>.</p>
+<p>Other common options accepted are
+<code>oneside/twoside/onecolumn/twocolumn/titlepage/notitlepage/draft/final/landscape/openright/openany/leqno/fleqn</code>.
+Also, passing the <code>disablejfam</code> option will not register
+Japanese fonts for use in mathematics.</p>
+<p>You can write the content as you would in a standard document class,
+but the following commands have been added or extended. Note that this
+document uses terms from <a
+href="https://www.w3.org/TR/jlreq/?lang=en">Requirements for Japanese
+Text Layout</a> without explanation.</p>
<h3 id="jlreqsetup"><code>\jlreqsetup</code></h3>
-<p>This is a command for settings. It can only be used in the preamble. Settings for the document are made either as class options or through <code>\jlreqsetup</code>, depending on the setting item.</p>
+<p>This is a command for settings. It can only be used in the preamble.
+Settings for the document are made either as class options or through
+<code>\jlreqsetup</code>, depending on the setting item.</p>
<h3 id="section"><code>\section</code></h3>
-<p>The <code>\section</code> command is extended to accept subtitles in addition to the usual format, as in <code>\section*[running head]{Heading}[Subtitle]</code>. Other commands such as <code>\part</code> (only in article), <code>\chapter</code> (only in book/report), <code>\subsection</code>, and <code>\subsubsection</code> also accept subtitles.</p>
+<p>The <code>\section</code> command is extended to accept subtitles in
+addition to the usual format, as in
+<code>\section*[running head]{Heading}[Subtitle]</code>. Other commands
+such as <code>\part</code> (only in article), <code>\chapter</code>
+(only in book/report), <code>\subsection</code>, and
+<code>\subsubsection</code> also accept subtitles.</p>
<h3 id="abstract-environment"><code>abstract</code> environment</h3>
-<p>You can place it in the preamble, and it will be output with <code>\maketitle</code>. In the case of two columns, it allows you to output the abstract without columnization. However, this method is now deprecated. By specifying <code>abstract_with_maketitle=true</code> in <code>\jlreqsetup</code> and writing it before <code>\maketitle</code>, you can achieve the same effect.</p>
+<p>You can place it in the preamble, and it will be output with
+<code>\maketitle</code>. In the case of two columns, it allows you to
+output the abstract without columnization. However, this method is now
+deprecated. By specifying <code>abstract_with_maketitle=true</code> in
+<code>\jlreqsetup</code> and writing it before <code>\maketitle</code>,
+you can achieve the same effect.</p>
<h3 id="sidenote"><code>\sidenote</code></h3>
-<p>This command is only defined when the width of the sidenote is positive. In the default basic layout, this width is set to 0. Therefore, <code>\sidenote</code> is not defined. Please refer to the later basic layout settings. <code>\sidenote</code> outputs a sidenote (or footnote in vertical writing). Internally, it uses <code>\marginpar</code>. By default, it has the same format as <code>\footnote</code>, but if <code>sidenote_type=symbol</code> is specified in <code>\jlreqsetup</code>, the format becomes <code>\sidenote{relevant item}{note}</code>. For example, you would write:</p>
-<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>capable of publishing <span class="fu">\sidenote</span>{manuscript}{by methods such as printing…}</span></code></pre></div>
+<p>This command is only defined when the width of the sidenote is
+positive. In the default basic layout, this width is set to 0.
+Therefore, <code>\sidenote</code> is not defined. Please refer to the
+later basic layout settings. <code>\sidenote</code> outputs a sidenote
+(or footnote in vertical writing). Internally, it uses
+<code>\marginpar</code>. By default, it has the same format as
+<code>\footnote</code>, but if <code>sidenote_type=symbol</code> is
+specified in <code>\jlreqsetup</code>, the format becomes
+<code>\sidenote{relevant item}{note}</code>. For example, you would
+write:</p>
+<div class="sourceCode" id="cb2"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>capable of publishing <span class="fu">\sidenote</span>{manuscript}{by methods such as printing…}</span></code></pre></div>
<p>Please refer to the later explanation as well.</p>
<h3 id="endnote"><code>\endnote</code></h3>
-<p>Specifies an endnote. It has the same format as <code>\footnote</code>. By default, the note itself is output just before the heading. This behavior can be controlled by passing <code>endnote_position</code> to <code>\jlreqsetup</code>. For more details, please see the later explanation of notes. Also, executing <code>\theendnotes</code> will output it on the spot.</p>
+<p>Specifies an endnote. It has the same format as
+<code>\footnote</code>. By default, the note itself is output just
+before the heading. This behavior can be controlled by passing
+<code>endnote_position</code> to <code>\jlreqsetup</code>. For more
+details, please see the later explanation of notes. Also, executing
+<code>\theendnotes</code> will output it on the spot.</p>
<h3 id="warichu"><code>\warichu</code></h3>
-<p>Outputs a warichu (split annotation). The line division positions are calculated automatically (multiple compilations are required). With <code>\warichu*</code>, you can manually specify these positions. The format is <code>\warichu*{(before first line) &amp; (after first line)\\ (before second line) &amp; (after second line)...}</code>. If <code>&amp;</code> is omitted, it will be adjusted automatically.</p>
+<p>Outputs a warichu (split annotation). The line division positions are
+calculated automatically (multiple compilations are required). With
+<code>\warichu*</code>, you can manually specify these positions. The
+format is
+<code>\warichu*{(before first line) &amp; (after first line)\\ (before second line) &amp; (after second line)...}</code>.
+If <code>&amp;</code> is omitted, it will be adjusted automatically.</p>
<h3 id="tatechuyoko"><code>\tatechuyoko</code></h3>
-<p>Outputs horizontal-in-vertical text. You use it as <code>\tatechuyoko{&lt;content&gt;}</code>. <code>\tatechuyoko</code> will result in an error if used in a non-vertical writing place, but <code>\tatechuyoko*</code> will be output as is in a non-vertical writing place.</p>
+<p>Outputs horizontal-in-vertical text. You use it as
+<code>\tatechuyoko{&lt;content&gt;}</code>. <code>\tatechuyoko</code>
+will result in an error if used in a non-vertical writing place, but
+<code>\tatechuyoko*</code> will be output as is in a non-vertical
+writing place.</p>
<h3 id="jidori"><code>\jidori</code></h3>
-<p>By using <code>\jidori{&lt;dimension&gt;}{&lt;content&gt;}</code>, you can output the content justified to the length of the dimension.</p>
+<p>By using <code>\jidori{&lt;dimension&gt;}{&lt;content&gt;}</code>,
+you can output the content justified to the length of the dimension.</p>
<h3 id="akigumi"><code>\akigumi</code></h3>
-<p>By using <code>\akigumi{&lt;dimension&gt;}{&lt;content&gt;}</code>, you can output the result of spacing the characters of the content by the length of the dimension. However, the correct output result is not obtained except when using LuaLaTeX.</p>
+<p>By using <code>\akigumi{&lt;dimension&gt;}{&lt;content&gt;}</code>,
+you can output the result of spacing the characters of the content by
+the length of the dimension. However, the correct output result is not
+obtained except when using LuaLaTeX.</p>
<h3 id="jafontsize"><code>\jafontsize</code></h3>
-<p>Specifies the Japanese font size, similar to <code>\fontsize</code>. If <code>jafontscale=0.9</code> is specified as a class option, specifying <code>\fontsize{9pt}{15pt}</code> will result in a Japanese font size of 8.1pt, but <code>\jafontsize{9pt}{15pt}</code> will result in 9pt (with the European font size being 10pt). The second argument is exactly the same as the second argument of <code>\fontsize</code>.</p>
+<p>Specifies the Japanese font size, similar to <code>\fontsize</code>.
+If <code>jafontscale=0.9</code> is specified as a class option,
+specifying <code>\fontsize{9pt}{15pt}</code> will result in a Japanese
+font size of 8.1pt, but <code>\jafontsize{9pt}{15pt}</code> will result
+in 9pt (with the European font size being 10pt). The second argument is
+exactly the same as the second argument of <code>\fontsize</code>.</p>
<h3 id="-"><code>\ </code></h3>
-<p>A macro consisting of a single full-width space (U+3000). It inserts a Japanese character space. In LuaLaTeX, you can also input a Japanese character space with <code> </code> alone.</p>
+<p>A macro consisting of a single full-width space (U+3000). It inserts
+a Japanese character space. In LuaLaTeX, you can also input a Japanese
+character space with <code> </code> alone.</p>
<h3 id="others">Others</h3>
<ul>
-<li><p>Ruby and encircled points are not provided. It is recommended to use <a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a> or <code>luatexja-ruby</code> (for LuaLaTeX, included in the LuaTeX-ja package).</p></li>
-<li><p>When using pLaTeX / upLaTeX, macros <code>\zw</code> and <code>\zh</code> that expand to <code>zw</code> and <code>zh</code>, respectively, are defined. In LuaLaTeX, macros of the same name are defined within LuaTeX-ja.</p></li>
-<li><p>Requirements for Japanese Text Layout 2.3.2.d state that it is desirable to align the number of lines in each column on the last page of horizontal two-column typesetting, but this process is not performed. You can perform this process by using the <code>nidanfloat</code> package and specifying</p>
-<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
-<p>However, <code>\newpage</code> and <code>\clearpage</code> on the last page will not work correctly. For more details, please see the manual of the <code>nidanfloat</code> package.</p></li>
-<li><p>The functionality to set fonts is not provided. Japanese fonts can be set using <code>luatexja-fontspec</code> or <code>luatexja-preset</code> (both included in the LuaTeX-ja package) when using LuaLaTeX. If using dvipdfmx, you can set it with <a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>.</p></li>
-<li><p>The space between Japanese characters (stored in <code>\kanjiskip</code> in (u)pTeX and in the <code>kanjiskip</code> parameter in LuateX-ja) by default allows for up to a quarter-character width of space, in accordance with the Requirements for Japanese Text Layout. However, due to limitations of TeX’s functionality, this may not always produce appropriate results. If you want to change this value, please redefine <code>\jlreqkanjiskip</code>. For example:</p>
-<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
+<li><p>Ruby and encircled points are not provided. It is recommended to
+use <a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a> or
+<code>luatexja-ruby</code> (for LuaLaTeX, included in the LuaTeX-ja
+package).</p></li>
+<li><p>When using pLaTeX / upLaTeX, macros <code>\zw</code> and
+<code>\zh</code> that expand to <code>zw</code> and <code>zh</code>,
+respectively, are defined. In LuaLaTeX, macros of the same name are
+defined within LuaTeX-ja.</p></li>
+<li><p>Requirements for Japanese Text Layout 2.3.2.d state that it is
+desirable to align the number of lines in each column on the last page
+of horizontal two-column typesetting, but this process is not performed.
+You can perform this process by using the <code>nidanfloat</code>
+package and specifying</p>
+<div class="sourceCode" id="cb3"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
+<p>However, <code>\newpage</code> and <code>\clearpage</code> on the
+last page will not work correctly. For more details, please see the
+manual of the <code>nidanfloat</code> package.</p></li>
+<li><p>The functionality to set fonts is not provided. Japanese fonts
+can be set using <code>luatexja-fontspec</code> or
+<code>luatexja-preset</code> (both included in the LuaTeX-ja package)
+when using LuaLaTeX. If using dvipdfmx, you can set it with <a
+href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>.</p></li>
+<li><p>The space between Japanese characters (stored in
+<code>\kanjiskip</code> in (u)pTeX and in the <code>kanjiskip</code>
+parameter in LuateX-ja) by default allows for up to a quarter-character
+width of space, in accordance with the Requirements for Japanese Text
+Layout. However, due to limitations of TeX’s functionality, this may not
+always produce appropriate results. If you want to change this value,
+please redefine <code>\jlreqkanjiskip</code>. For example:</p>
+<div class="sourceCode" id="cb4"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
<span id="cb4-2"><a href="#cb4-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\renewcommand</span>{<span class="ex">\jlreqkanjiskip</span>}{0pt plus .1<span class="fu">\zw</span> minus .01<span class="fu">\zw</span>}</span>
<span id="cb4-3"><a href="#cb4-3" aria-hidden="true" tabindex="-1"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span>
<span id="cb4-4"><a href="#cb4-4" aria-hidden="true" tabindex="-1"></a>(Main text)</span>
<span id="cb4-5"><a href="#cb4-5" aria-hidden="true" tabindex="-1"></a><span class="kw">\end</span>{<span class="ex">document</span>}</span></code></pre></div>
-<p>The space between Japanese and European characters (stored in <code>\xkanjiskip</code> in (u)pTeX and in the <code>xkanjiskip</code> parameter in LuateX-ja) can also be changed by redefining <code>\jlreqxkanjiskip</code>.</p></li>
-<li><p>When specifying <code>book</code>, even if you specify <code>openany</code> as a class option, a blank page may be inserted after <code>\mainmatter</code>. This is to match the behavior of the standard class file. By specifying <code>\jlreqsetup{mainmatter_pagebreak=clearpage}</code>, you can prevent the insertion of a blank page, but by default, <code>\mainmatter</code> resets the page number, so there may be inconsistencies in the parity of page numbers. Please consider changing to a continuous pagination by specifying something like <code>\jlreqsetup{frontmatter_pagination={arabic,continuous}}</code>. For more details, please refer to the following “Front Matter, etc.†section.</p></li>
+<p>The space between Japanese and European characters (stored in
+<code>\xkanjiskip</code> in (u)pTeX and in the <code>xkanjiskip</code>
+parameter in LuateX-ja) can also be changed by redefining
+<code>\jlreqxkanjiskip</code>.</p></li>
+<li><p>When specifying <code>book</code>, even if you specify
+<code>openany</code> as a class option, a blank page may be inserted
+after <code>\mainmatter</code>. This is to match the behavior of the
+standard class file. By specifying
+<code>\jlreqsetup{mainmatter_pagebreak=clearpage}</code>, you can
+prevent the insertion of a blank page, but by default,
+<code>\mainmatter</code> resets the page number, so there may be
+inconsistencies in the parity of page numbers. Please consider changing
+to a continuous pagination by specifying something like
+<code>\jlreqsetup{frontmatter_pagination={arabic,continuous}}</code>.
+For more details, please refer to the following “Front Matter, etc.â€
+section.</p></li>
</ul>
<h2 id="design-options">Design options</h2>
-<p>The design is specified in keyval format via class options or <code>\jlreqsetup</code>. However, due to LaTeX’s implementation, cases where input that should be possible is not accepted may occur with class options. In many cases, this can be resolved by removing spaces.</p>
+<p>The design is specified in keyval format via class options or
+<code>\jlreqsetup</code>. However, due to LaTeX’s implementation, cases
+where input that should be possible is not accepted may occur with class
+options. In many cases, this can be resolved by removing spaces.</p>
<p>In the following, the following usage will be used:</p>
<ul>
-<li><code>[A/B]</code>: Either A or B. <code>[A/B/C]</code>, etc., are the same.</li>
-<li><code>&lt;dimension&gt;</code>: A dimension recognized by TeX. You can also use simple expressions (like <code>10pt+10pt</code>). In class options, you may be able to use special values as follows (these are available in pLaTeX / upLaTeX by default, but are processed to be available in LuaLaTeX as well): In places like <code>\jlreqsetup</code>, you can always describe the full-width width with <code>\zw</code> or <code>\zh</code>. Below, for example, if <code>Q</code> and <code>H</code> are available, it will be described as <code>&lt;dimension;Q,H&gt;</code>.
+<li><code>[A/B]</code>: Either A or B. <code>[A/B/C]</code>, etc., are
+the same.</li>
+<li><code>&lt;dimension&gt;</code>: A dimension recognized by TeX. You
+can also use simple expressions (like <code>10pt+10pt</code>). In class
+options, you may be able to use special values as follows (these are
+available in pLaTeX / upLaTeX by default, but are processed to be
+available in LuaLaTeX as well): In places like <code>\jlreqsetup</code>,
+you can always describe the full-width width with <code>\zw</code> or
+<code>\zh</code>. Below, for example, if <code>Q</code> and
+<code>H</code> are available, it will be described as
+<code>&lt;dimension;Q,H&gt;</code>.
<ul>
<li><code>Q</code>, <code>H</code>: Interpreted as 0.25mm.</li>
-<li><code>zw</code>, <code>zh</code>: Interpreted as full-width width.</li>
+<li><code>zw</code>, <code>zh</code>: Interpreted as full-width
+width.</li>
</ul></li>
<li><code>&lt;code&gt;</code>: LaTeX code.</li>
-<li><code>&lt;font setting code&gt;</code>: Commands for font settings, such as <code>\Large</code> or <code>\bfseries</code>. Multiple specifications like <code>\Large\bfseries</code> are also possible.</li>
+<li><code>&lt;font setting code&gt;</code>: Commands for font settings,
+such as <code>\Large</code> or <code>\bfseries</code>. Multiple
+specifications like <code>\Large\bfseries</code> are also possible.</li>
</ul>
<h3 id="kihon-hanmen">Kihon-hanmen</h3>
<p>Class option.</p>
<ul>
-<li><code>paper=[&lt;paper size name&gt;/{&lt;dimension&gt;,&lt;dimension&gt;}]</code>: Specifies the paper size. You can specify from <code>a0paper</code> to <code>a10paper</code>, <code>b0paper</code> to <code>b10paper</code> (ISO B series), or <code>b0j</code> to <code>b10j</code> for JIS B series. Also available are <code>letterpaper</code>, <code>legalpaper</code>, and <code>executivepaper</code>. Alternatively, you can directly specify dimensions with <code>{&lt;width&gt;,&lt;height&gt;}</code>.</li>
-<li><code>fontsize=&lt;dimension;Q,H&gt;</code>: Specifies the font size for Latin script. The default is 10pt.</li>
-<li><code>jafontsize=&lt;dimension;Q,H&gt;</code>: Specifies the font size for Japanese script.</li>
-<li><code>jafontscale=&lt;real number&gt;</code>: The ratio of Japanese font size to Latin font size (Japanese / Latin). Ignored if both <code>fontsize</code> and <code>jafontsize</code> are specified. The default is 1.</li>
-<li><code>line_length=&lt;dimension;zw,zh&gt;</code>: The length of a line. By default, it's 0.75 times the paper width in the direction of character progression. The actual value is adjusted to be a multiple of the length of one character.</li>
-<li><code>number_of_lines=&lt;natural number&gt;</code>: The number of lines per page. By default, it's a value that makes it 0.75 times the paper height in the direction of line progression.</li>
-<li><code>gutter=&lt;dimension;zw,zh&gt;</code>: The size of the gutter margin.
-<ul>
-<li>Without <code>tate</code>option: It's the margin on the left for odd pages and on the right for even pages.</li>
+<li><code>paper=[&lt;paper size name&gt;/{&lt;dimension&gt;,&lt;dimension&gt;}]</code>:
+Specifies the paper size. You can specify from <code>a0paper</code> to
+<code>a10paper</code>, <code>b0paper</code> to <code>b10paper</code>
+(ISO B series), or <code>b0j</code> to <code>b10j</code> for JIS B
+series. Also available are <code>letterpaper</code>,
+<code>legalpaper</code>, and <code>executivepaper</code>. Alternatively,
+you can directly specify dimensions with
+<code>{&lt;width&gt;,&lt;height&gt;}</code>.</li>
+<li><code>fontsize=&lt;dimension;Q,H&gt;</code>: Specifies the font size
+for Latin script. The default is 10pt.</li>
+<li><code>jafontsize=&lt;dimension;Q,H&gt;</code>: Specifies the font
+size for Japanese script.</li>
+<li><code>jafontscale=&lt;real number&gt;</code>: The ratio of Japanese
+font size to Latin font size (Japanese / Latin). Ignored if both
+<code>fontsize</code> and <code>jafontsize</code> are specified. The
+default is 1.</li>
+<li><code>line_length=&lt;dimension;zw,zh&gt;</code>: The length of a
+line. By default, it's 0.75 times the paper width in the direction of
+character progression. The actual value is adjusted to be a multiple of
+the length of one character.</li>
+<li><code>number_of_lines=&lt;natural number&gt;</code>: The number of
+lines per page. By default, it's a value that makes it 0.75 times the
+paper height in the direction of line progression.</li>
+<li><code>gutter=&lt;dimension;zw,zh&gt;</code>: The size of the gutter
+margin.
+<ul>
+<li>Without <code>tate</code>option: It's the margin on the left for odd
+pages and on the right for even pages.</li>
</ul>
<ul>
<li>With <code>tate</code> option: It's the opposite.</li>
-<li>If <code>twoside</code> is not specified in the class options, the margin is always set as for odd pages.</li>
+<li>If <code>twoside</code> is not specified in the class options, the
+margin is always set as for odd pages.</li>
</ul></li>
-<li><code>fore-edge=&lt;dimension;zw,zh&gt;</code>: The size of the fore-edge margin (the side opposite the gutter). It's implemented for convenience, although it's not used when margins are specified according to "Requirements for Japanese Text Layout".</li>
-<li><code>head_space=&lt;dimension;zw,zh&gt;</code>: The amount of space at the top (head). The default value centers the text block vertically.</li>
-<li><code>foot_space=&lt;dimension;zw,zh&gt;</code>: The amount of space at the bottom (foot). The default value centers the text block vertically.</li>
-<li><code>baselineskip=&lt;dimension;Q,H,zw,zh&gt;</code>: The line feed. By default, it's 1.7 times the <code>jafontsize</code>.</li>
+<li><code>fore-edge=&lt;dimension;zw,zh&gt;</code>: The size of the
+fore-edge margin (the side opposite the gutter). It's implemented for
+convenience, although it's not used when margins are specified according
+to "Requirements for Japanese Text Layout".</li>
+<li><code>head_space=&lt;dimension;zw,zh&gt;</code>: The amount of space
+at the top (head). The default value centers the text block
+vertically.</li>
+<li><code>foot_space=&lt;dimension;zw,zh&gt;</code>: The amount of space
+at the bottom (foot). The default value centers the text block
+vertically.</li>
+<li><code>baselineskip=&lt;dimension;Q,H,zw,zh&gt;</code>: The line
+feed. By default, it's 1.7 times the <code>jafontsize</code>.</li>
<li><code>linegap=&lt;dimension;Q,H,zw,zh&gt;</code>: The line gap.</li>
-<li><code>headfoot_sidemargin=&lt;dimension;zw,zh&gt;</code>: The left and right margin for headers and footers.</li>
-<li><code>column_gap=&lt;dimension;zw,zh&gt;</code>: The gap between columns (only for <code>twocolumn</code>).</li>
-<li><code>sidenote_length=&lt;dimension;zw,zh&gt;</code>: Specifies the width of the sidenote.</li>
+<li><code>headfoot_sidemargin=&lt;dimension;zw,zh&gt;</code>: The left
+and right margin for headers and footers.</li>
+<li><code>column_gap=&lt;dimension;zw,zh&gt;</code>: The gap between
+columns (only for <code>twocolumn</code>).</li>
+<li><code>sidenote_length=&lt;dimension;zw,zh&gt;</code>: Specifies the
+width of the sidenote.</li>
</ul>
<h3></h3>
<p>class option</p>
<ul>
-<li><code>open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]</code>: Specifies the positioning of opening brackets at the start of a line. Options are:
+<li><code>open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]</code>:
+Specifies the positioning of opening brackets at the start of a line.
+Options are:
<ul>
-<li><code>zenkaku_tentsuki</code>: Full-width characters are indented at the start of a paragraph.</li>
-<li><code>zenkakunibu_nibu</code>: Full-width at the start of a paragraph, half-width at a line break.</li>
-<li><code>nibu_tentsuki</code>: Half-width indentation at the start of a line.</li>
+<li><code>zenkaku_tentsuki</code>: Full-width characters are indented at
+the start of a paragraph.</li>
+<li><code>zenkakunibu_nibu</code>: Full-width at the start of a
+paragraph, half-width at a line break.</li>
+<li><code>nibu_tentsuki</code>: Half-width indentation at the start of a
+line.</li>
</ul></li>
<li><code>hanging_punctuation</code>: Enables hanging punctuation.</li>
</ul>
<h3 id="reverse-pagination">Reverse pagination</h3>
<p>class option.</p>
<ul>
-<li><code>use_reverse_pagination</code>: Enables reverse pagination functionality. Defines a ‘read-only counter’ named <code>jlreqreversepage</code>. Commands like <code>\arabic</code> and <code>\value</code> can be applied to it, and <code>\thejlreqreversepage</code> is defined as <code>\arabic{jlreqreversepage}</code>.</li>
+<li><code>use_reverse_pagination</code>: Enables reverse pagination
+functionality. Defines a ‘read-only counter’ named
+<code>jlreqreversepage</code>. Commands like <code>\arabic</code> and
+<code>\value</code> can be applied to it, and
+<code>\thejlreqreversepage</code> is defined as
+<code>\arabic{jlreqreversepage}</code>.</li>
</ul>
<h3 id="note-related">Note related</h3>
<p>Specified by <code>\jlreqsetup</code>.</p>
<ul>
-<li><code>reference_mark=[inline/interlinear]</code>: Specifies the placement of reference marks. Options are <code>inline</code> (in the line after the relevant item) or <code>interlinear</code> (above the line for horizontal writing, or to the right for vertical writing).</li>
-<li><code>footnote_second_indent=&lt;dimension&gt;</code>: Sets the indent for the second and subsequent lines of footnotes (horizontal writing) or sidenotes (vertical writing).</li>
-<li><code>sidenote_type=[number/symbol]</code>: Determines the correspondence between the sidenote and the text. Options are <code>number</code> (default, with a serial number indicating the note) or <code>symbol</code> (with a specific symbol and the word with the note emphasized).</li>
-<li><code>sidenote_symbol=&lt;code&gt;</code>: When <code>sidenote_type=symbol</code> is specified, this sets the symbol to be used at the note's location. THe default is *</li>
-<li><code>sidenote_keyword_font=&lt;font setting code&gt;</code>: Specifies the font for the word with the sidenote when <code>sidenote_type=symbol</code> is used.</li>
-<li><code>endnote_second_indent=&lt;dimension&gt;</code>: Sets the indent for the second and subsequent lines of endnotes. <code> endnote_position=[headings/paragraph/{_&lt;heading name 1&gt;,_&lt;heading name 2&gt;,...}]</code>: The output location of the endnote can be specified. <code>headings</code> will output the note before each heading (default), <code>paragraph</code> will output it when a new paragraph starts, and specifying <code>endnote_position={_chapter,_section}</code> will output it before <code>\chapter</code> and <code>\section</code>. To specify <code>&lt;_heading name&gt;</code>, the target heading must be created using the functionality of this class file.</li>
-<li><code>warichu_opening=&lt;code&gt;</code>, <code>warichu_closing=&lt;code&gt;</code>: These are inserted before and after the warichu (split annotation). The default is parentheses ().</li>
+<li><code>reference_mark=[inline/interlinear]</code>: Specifies the
+placement of reference marks. Options are <code>inline</code> (in the
+line after the relevant item) or <code>interlinear</code> (above the
+line for horizontal writing, or to the right for vertical writing).</li>
+<li><code>footnote_second_indent=&lt;dimension&gt;</code>: Sets the
+indent for the second and subsequent lines of footnotes (horizontal
+writing) or sidenotes (vertical writing).</li>
+<li><code>sidenote_type=[number/symbol]</code>: Determines the
+correspondence between the sidenote and the text. Options are
+<code>number</code> (default, with a serial number indicating the note)
+or <code>symbol</code> (with a specific symbol and the word with the
+note emphasized).</li>
+<li><code>sidenote_symbol=&lt;code&gt;</code>: When
+<code>sidenote_type=symbol</code> is specified, this sets the symbol to
+be used at the note's location. THe default is *</li>
+<li><code>sidenote_keyword_font=&lt;font setting code&gt;</code>:
+Specifies the font for the word with the sidenote when
+<code>sidenote_type=symbol</code> is used.</li>
+<li><code>endnote_second_indent=&lt;dimension&gt;</code>: Sets the
+indent for the second and subsequent lines of endnotes.
+<code> endnote_position=[headings/paragraph/{_&lt;heading name 1&gt;,_&lt;heading name 2&gt;,...}]</code>:
+The output location of the endnote can be specified.
+<code>headings</code> will output the note before each heading
+(default), <code>paragraph</code> will output it when a new paragraph
+starts, and specifying <code>endnote_position={_chapter,_section}</code>
+will output it before <code>\chapter</code> and <code>\section</code>.
+To specify <code>&lt;_heading name&gt;</code>, the target heading must
+be created using the functionality of this class file.</li>
+<li><code>warichu_opening=&lt;code&gt;</code>,
+<code>warichu_closing=&lt;code&gt;</code>: These are inserted before and
+after the warichu (split annotation). The default is parentheses
+().</li>
</ul>
<h3 id="caption">Caption</h3>
-<p>You can change the captions for figures and tables using <code>\jlreqsetup</code>. All settings allow for environment-specific customization. For example, <code>caption_font=\normalsize,table=\Large</code> means that within the table environment, <code>\Large</code> will be applied, while <code>\normalsize</code> will be applied in other environments. Other settings follow the same pattern.</p>
-<ul>
-<li><code>caption_font=&lt;font setting code&gt;</code>: Specifies the font for the caption itself.</li>
-<li><code>caption_label_font=&lt;font setting code&gt;</code>: Specifies the font for the caption label.</li>
-<li><code>caption_after_label_space=&lt;dimension&gt;</code>: Specifies the space between the label and the caption text.</li>
-<li><code>caption_label_format=&lt;code&gt;</code>: Specifies the format of the label. For example, <code>caption_label_format={#1:}</code> where <code>#1</code> is replaced with something like “Figure 1â€.</li>
-<li><code>caption_align=[left/right/center/bottom/top]</code>: Specifies the position of the caption. For instance, <code>{center,*left}</code> means it’s usually centered, but aligned left when the caption is large.</li>
+<p>You can change the captions for figures and tables using
+<code>\jlreqsetup</code>. All settings allow for environment-specific
+customization. For example,
+<code>caption_font=\normalsize,table=\Large</code> means that within the
+table environment, <code>\Large</code> will be applied, while
+<code>\normalsize</code> will be applied in other environments. Other
+settings follow the same pattern.</p>
+<ul>
+<li><code>caption_font=&lt;font setting code&gt;</code>: Specifies the
+font for the caption itself.</li>
+<li><code>caption_label_font=&lt;font setting code&gt;</code>: Specifies
+the font for the caption label.</li>
+<li><code>caption_after_label_space=&lt;dimension&gt;</code>: Specifies
+the space between the label and the caption text.</li>
+<li><code>caption_label_format=&lt;code&gt;</code>: Specifies the format
+of the label. For example, <code>caption_label_format={#1:}</code> where
+<code>#1</code> is replaced with something like “Figure 1â€.</li>
+<li><code>caption_align=[left/right/center/bottom/top]</code>: Specifies
+the position of the caption. For instance, <code>{center,*left}</code>
+means it’s usually centered, but aligned left when the caption is
+large.</li>
</ul>
<h3 id="quotation">Quotation</h3>
<ul>
-<li><code>quote_indent=&lt;dimension&gt;</code>: Specifies the indentation for quotes. The default is <code>2\zw</code>. The length of a line is adjusted to be an integer multiple of the character size.</li>
-<li><code>quote_end_indent=&lt;dimension&gt;</code>: Specifies the indentation for the end of quotes. The default is <code>0\zw</code>.</li>
-<li><code>quote_beforeafter_space=&lt;dimension&gt;</code>: Specifies the space before and after quotes. Setting <code>quote_beforeafter_space=1\baselineskip</code> will result in a one-line space.</li>
-<li><code>quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]</code>: Specifies the font size for quotes.</li>
+<li><code>quote_indent=&lt;dimension&gt;</code>: Specifies the
+indentation for quotes. The default is <code>2\zw</code>. The length of
+a line is adjusted to be an integer multiple of the character size.</li>
+<li><code>quote_end_indent=&lt;dimension&gt;</code>: Specifies the
+indentation for the end of quotes. The default is
+<code>0\zw</code>.</li>
+<li><code>quote_beforeafter_space=&lt;dimension&gt;</code>: Specifies
+the space before and after quotes. Setting
+<code>quote_beforeafter_space=1\baselineskip</code> will result in a
+one-line space.</li>
+<li><code>quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]</code>:
+Specifies the font size for quotes.</li>
</ul>
<h3 id="itemization">Itemization</h3>
<ul>
-<li><code>itemization_beforeafter_space=&lt;dimension&gt;</code>: Specifies the space before and after the itemization. For example, <code>itemization_beforeafter_space={i=&lt;dimension&gt;}</code> sets the space for the top level only. <code>itemization_beforeafter_space={0pt,i=10pt,ii=5pt}</code> sets 10pt for level 1 itemization, 5pt for level 2, and 0pt for others. Levels are indicated by lowercase Roman numerals.</li>
-<li><code>itemization_itemsep=&lt;dimension&gt;</code>: Specifies the space between items.</li>
+<li><code>itemization_beforeafter_space=&lt;dimension&gt;</code>:
+Specifies the space before and after the itemization. For example,
+<code>itemization_beforeafter_space={i=&lt;dimension&gt;}</code> sets
+the space for the top level only.
+<code>itemization_beforeafter_space={0pt,i=10pt,ii=5pt}</code> sets 10pt
+for level 1 itemization, 5pt for level 2, and 0pt for others. Levels are
+indicated by lowercase Roman numerals.</li>
+<li><code>itemization_itemsep=&lt;dimension&gt;</code>: Specifies the
+space between items.</li>
</ul>
<h3 id="front-matter-etc">Front matter etc.</h3>
-<p>You can specify the behavior of <code>\frontmatter</code> / <code>\mainmatter</code> / <code>\backmatter</code> / <code>\appendix</code> with <code>\jlreqsetup</code>.</p>
-<ul>
-<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage]</code>: Specifies the command name to execute the page break at <code>\frontmatter</code>. If it is empty, nothing is done.</li>
-<li><code>frontmatter_counter={&lt;counter name&gt;={value=&lt;value&gt;, the=&lt;code&gt;, restore=[true/false]},…}</code>: Specifies the operation of the counter at <code>\frontmatter</code>. For example, <code>chapter={value=0,the={[\arabic{chapter]}}</code> sets the value of the chapter counter to 0 and <code>\thechapter</code> to <code>[\arabic{chapter}]</code>. By default, the value and <code>\the&lt;counter name&gt;</code> definition are restored at <code>\mainmatter</code>, but this behavior is suppressed by specifying Prestore=false`.</li>
-<li><code>frontmatter_heading={&lt;heading command name&gt;={&lt;setting&gt;},…}</code>: Changes the behavior of the heading command. In addition to the items that can be specified by <code>\Delare***Heading</code>, the following are accepted.
-<ul>
-<li><code>heading_type=[Tobira/Block/Runin/Cutin/Modify]</code>: The type of heading1. If Modify is specified, it will be changed by <code>\ModifyHeading</code>.</li>
-<li><code>heading_level=&lt;number&gt;</code>: Specifies the level of the heading command. If not specified, the value at <code>\frontmatter</code> is used. This is ignored when <code>heading_type=Modify</code>.</li>
-<li><code>restore=[true/false]</code>: If true is specified, the original definition is restored at <code>\mainmatter</code>. The default is true.</li>
+<p>You can specify the behavior of <code>\frontmatter</code> /
+<code>\mainmatter</code> / <code>\backmatter</code> /
+<code>\appendix</code> with <code>\jlreqsetup</code>.</p>
+<ul>
+<li><code>frontmatter_pagebreak=[cleardoublepage/clearpage]</code>:
+Specifies the command name to execute the page break at
+<code>\frontmatter</code>. If it is empty, nothing is done.</li>
+<li><code>frontmatter_counter={&lt;counter name&gt;={value=&lt;value&gt;, the=&lt;code&gt;, restore=[true/false]},…}</code>:
+Specifies the operation of the counter at <code>\frontmatter</code>. For
+example, <code>chapter={value=0,the={[\arabic{chapter]}}</code> sets the
+value of the chapter counter to 0 and <code>\thechapter</code> to
+<code>[\arabic{chapter}]</code>. By default, the value and
+<code>\the&lt;counter name&gt;</code> definition are restored at
+<code>\mainmatter</code>, but this behavior is suppressed by specifying
+Prestore=false`.</li>
+<li><code>frontmatter_heading={&lt;heading command name&gt;={&lt;setting&gt;},…}</code>:
+Changes the behavior of the heading command. In addition to the items
+that can be specified by <code>\Delare***Heading</code>, the following
+are accepted.
+<ul>
+<li><code>heading_type=[Tobira/Block/Runin/Cutin/Modify]</code>: The
+type of heading1. If Modify is specified, it will be changed by
+<code>\ModifyHeading</code>.</li>
+<li><code>heading_level=&lt;number&gt;</code>: Specifies the level of
+the heading command. If not specified, the value at
+<code>\frontmatter</code> is used. This is ignored when
+<code>heading_type=Modify</code>.</li>
+<li><code>restore=[true/false]</code>: If true is specified, the
+original definition is restored at <code>\mainmatter</code>. The default
+is true.</li>
</ul></li>
-<li><code>frontmatter_pagestyle={&lt;page style name&gt;[,restore=[true/false]]}</code>: Switches to the specified page style at <code>\frontmatter</code>. By default, it returns to the original page style at <code>\mainmatter</code>, but this can be prevented by specifying <code>restore=false</code>.</li>
-<li><code>frontmatter_pagination={&lt;page number specification&gt;[,continuous,independent]}</code>: Specifies the output format of the page number, such as <code>frontmatter_pagination=roman</code>, with the LaTeX command name. In addition, continuous makes it a continuous number, and independent makes it a separate number.</li>
-<li><code>frontmatter_precode=&lt;code&gt;</code>: The code that is executed first at <code>\frontmatter</code>.</li>
-<li><code>frontmatter_postcode=&lt;code&gt;</code>: The code that is executed last at <code>\frontmatter</code>.</li>
+<li><code>frontmatter_pagestyle={&lt;page style name&gt;[,restore=[true/false]]}</code>:
+Switches to the specified page style at <code>\frontmatter</code>. By
+default, it returns to the original page style at
+<code>\mainmatter</code>, but this can be prevented by specifying
+<code>restore=false</code>.</li>
+<li><code>frontmatter_pagination={&lt;page number specification&gt;[,continuous,independent]}</code>:
+Specifies the output format of the page number, such as
+<code>frontmatter_pagination=roman</code>, with the LaTeX command name.
+In addition, continuous makes it a continuous number, and independent
+makes it a separate number.</li>
+<li><code>frontmatter_precode=&lt;code&gt;</code>: The code that is
+executed first at <code>\frontmatter</code>.</li>
+<li><code>frontmatter_postcode=&lt;code&gt;</code>: The code that is
+executed last at <code>\frontmatter</code>.</li>
</ul>
-<p>There are also settings that change <code>frontmatter</code> to <code>mainmatter</code>, <code>backmatter</code>, or <code>appendix</code>. However, there are some differences as follows.</p>
+<p>There are also settings that change <code>frontmatter</code> to
+<code>mainmatter</code>, <code>backmatter</code>, or
+<code>appendix</code>. However, there are some differences as
+follows.</p>
<ul>
<li><code>restore=[true/false]</code> is an invalid setting.</li>
-<li>Pmainmatter_pagination` cannot specify continuous or independent.</li>
-<li><code>appendix_pagebreak</code>, <code>appendix_pagestyle</code>, <code>appendix_pagination</code> do not exist.</li>
+<li>Pmainmatter_pagination` cannot specify continuous or
+independent.</li>
+<li><code>appendix_pagebreak</code>, <code>appendix_pagestyle</code>,
+<code>appendix_pagination</code> do not exist.</li>
</ul>
<h4 id="abstract">Abstract</h4>
<ul>
-<li><code>abstract_with_maketitle=[true/false]</code>: If the abstract environment is written before <code>\maketitle</code>, it delays its content and outputs it with <code>\maketitle</code>. Even in the case of two columns, it is output in one column. The default is false. This option is available only when <code>article</code> and <code>report</code> are specified.</li>
+<li><code>abstract_with_maketitle=[true/false]</code>: If the abstract
+environment is written before <code>\maketitle</code>, it delays its
+content and outputs it with <code>\maketitle</code>. Even in the case of
+two columns, it is output in one column. The default is false. This
+option is available only when <code>article</code> and
+<code>report</code> are specified.</li>
</ul>
<h2 id="headings">Headings</h2>
-<p>You can create new headings with commands like <code>\New***Heading</code> ( is a string that corresponds to the type of heading). The format is always <code>\New***Heading{&lt;command name&gt;}{&lt;level&gt;}{&lt;settings&gt;}</code>. Also, <code>\Renew***Heading</code>, <code>\Provide***Heading</code>, and <code>\Declare***Heading</code> are available at the same time. They are respectively</p>
-<ul>
-<li><code>\Renew***Heading</code>: If the command with the specified name is not defined, it causes an error.</li>
-<li><code>\Provide***Heading</code>: If the command with the specified name is not defined, it defines a new heading command.</li>
-<li><code>\Declare***Heading</code>: It defines a new heading command regardless of whether the command with the specified name is defined or not.</li>
+<p>You can create new headings with commands like
+<code>\New***Heading</code> ( is a string that corresponds to the type
+of heading). The format is always
+<code>\New***Heading{&lt;command name&gt;}{&lt;level&gt;}{&lt;settings&gt;}</code>.
+Also, <code>\Renew***Heading</code>, <code>\Provide***Heading</code>,
+and <code>\Declare***Heading</code> are available at the same time. They
+are respectively</p>
+<ul>
+<li><code>\Renew***Heading</code>: If the command with the specified
+name is not defined, it causes an error.</li>
+<li><code>\Provide***Heading</code>: If the command with the specified
+name is not defined, it defines a new heading command.</li>
+<li><code>\Declare***Heading</code>: It defines a new heading command
+regardless of whether the command with the specified name is defined or
+not.</li>
</ul>
<h3 id="tobira-headings">Tobira headings</h3>
-<p>You can create it with \NewTobiraHeading. It creates a command with the same format as the usual class file’s \section and so on. The settings are as follows. .</p>
-<ul>
-<li><code>type=[han/naka]</code>: It creates a half-title heading if <code>han</code> is specified, and a middle-title heading if <code>naka</code> is specified.</li>
-<li><code>pagestyle=&lt;page style name&gt;</code>: It specifies the page style of the heading area.</li>
-<li><code>label_format=&lt;code&gt;</code>: It specifies the command to output the label. For example, specify it as <code>label_format={Chapter \thechapter}</code>.</li>
-<li><code>format=&lt;code&gt;</code>: It specifies the format to actually output. <code>#1</code> is replaced with the label, <code>#2</code> with the heading text. In this case, the commands <code>\jlreqHeadingLabel</code> and <code>\jlreqHeadingText</code> are available internally. They are commands that take one argument each, and output the given argument itself if the label and heading text are not empty, respectively, and output nothing otherwise. For example, if you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it outputs <code>[Label=&lt;label&gt;]</code> if the label is not empty, and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not with the label itself, but with the code that has the adjustment of the space and so on. Therefore, you may get an unexpected result. <code>#2</code> is the same.</li>
-<li><code>number=[true/false]</code>: It specifies whether to number or not. However, even if <code>number=false</code> is specified, the corresponding counter is defined. Also, the definition of <code>\the&lt;counter name&gt;</code> is not changed, so you need to redefine it if necessary.</li>
+<p>You can create it with \NewTobiraHeading. It creates a command with
+the same format as the usual class file’s \section and so on. The
+settings are as follows. .</p>
+<ul>
+<li><code>type=[han/naka]</code>: It creates a half-title heading if
+<code>han</code> is specified, and a middle-title heading if
+<code>naka</code> is specified.</li>
+<li><code>pagestyle=&lt;page style name&gt;</code>: It specifies the
+page style of the heading area.</li>
+<li><code>label_format=&lt;code&gt;</code>: It specifies the command to
+output the label. For example, specify it as
+<code>label_format={Chapter \thechapter}</code>.</li>
+<li><code>format=&lt;code&gt;</code>: It specifies the format to
+actually output. <code>#1</code> is replaced with the label,
+<code>#2</code> with the heading text. In this case, the commands
+<code>\jlreqHeadingLabel</code> and <code>\jlreqHeadingText</code> are
+available internally. They are commands that take one argument each, and
+output the given argument itself if the label and heading text are not
+empty, respectively, and output nothing otherwise. For example, if you
+specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it
+outputs <code>[Label=&lt;label&gt;]</code> if the label is not empty,
+and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not
+with the label itself, but with the code that has the adjustment of the
+space and so on. Therefore, you may get an unexpected result.
+<code>#2</code> is the same.</li>
+<li><code>number=[true/false]</code>: It specifies whether to number or
+not. However, even if <code>number=false</code> is specified, the
+corresponding counter is defined. Also, the definition of
+<code>\the&lt;counter name&gt;</code> is not changed, so you need to
+redefine it if necessary.</li>
</ul>
<h3 id="block-headings">Block headings</h3>
-<p>You can create it with <code>\NewBlockHeading</code>. It creates a command with the format <code>\&lt;command name&gt;*[running head]{heading text}[subtitle]</code>. The settings are as follows.</p>
+<p>You can create it with <code>\NewBlockHeading</code>. It creates a
+command with the format
+<code>\&lt;command name&gt;*[running head]{heading text}[subtitle]</code>.
+The settings are as follows.</p>
<h4 id="format-related">Format related</h4>
<ul>
-<li><code>font=&lt;font setting code&gt;</code>: It specifies the font of the heading.</li>
-<li><code>subtitle_font=&lt;font setting code&gt;</code>: It specifies the font of the subtitle.</li>
-<li><code>label_format=&lt;code&gt;</code>: It specifies the format of the label. Specify it as <code>label_format={Chapter \thechapter}</code>, for example.</li>
-<li><code>subtitle_format=&lt;code&gt;</code>: It specifies the format of the subtitle. Specify it as <code>subtitle_format={“#1â€}</code>, for example. <code>#1</code> is replaced with the subtitle itself.</li>
-<li><code>format=&lt;code&gt;</code>: It specifies the format of the entire heading. <code>#1</code> is replaced with the label, <code>#2</code> with the heading text, <code>#3</code> with the subtitle. Internally, the commands <code>\jlreqHeadingLabel</code>, <code>\jlreqHeadingText</code>, and <code>\jlreqHeadingSubtitle</code> are available. They are commands that take one argument each, and output the given argument itself if the label, heading text, and subtitle are not empty, respectively, and output nothing otherwise. For example, if you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>, it outputs <code>[Label=&lt;label&gt;]</code> if the label is not empty, and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not with the label itself, but with the code that has the adjustment of the space and so on. Therefore, you may get an unexpected result. <code>#2</code> and <code>#3</code> are the same.</li>
+<li><code>font=&lt;font setting code&gt;</code>: It specifies the font
+of the heading.</li>
+<li><code>subtitle_font=&lt;font setting code&gt;</code>: It specifies
+the font of the subtitle.</li>
+<li><code>label_format=&lt;code&gt;</code>: It specifies the format of
+the label. Specify it as
+<code>label_format={Chapter \thechapter}</code>, for example.</li>
+<li><code>subtitle_format=&lt;code&gt;</code>: It specifies the format
+of the subtitle. Specify it as <code>subtitle_format={“#1â€}</code>, for
+example. <code>#1</code> is replaced with the subtitle itself.</li>
+<li><code>format=&lt;code&gt;</code>: It specifies the format of the
+entire heading. <code>#1</code> is replaced with the label,
+<code>#2</code> with the heading text, <code>#3</code> with the
+subtitle. Internally, the commands <code>\jlreqHeadingLabel</code>,
+<code>\jlreqHeadingText</code>, and <code>\jlreqHeadingSubtitle</code>
+are available. They are commands that take one argument each, and output
+the given argument itself if the label, heading text, and subtitle are
+not empty, respectively, and output nothing otherwise. For example, if
+you specify it as <code>format={[\jlreqHeadingLabel{Label=#1}]}</code>,
+it outputs <code>[Label=&lt;label&gt;]</code> if the label is not empty,
+and <code>[]</code> otherwise. Note that <code>#1</code> is replaced not
+with the label itself, but with the code that has the adjustment of the
+space and so on. Therefore, you may get an unexpected result.
+<code>#2</code> and <code>#3</code> are the same.</li>
</ul>
<h4 id="indent-related">Indent related</h4>
<ul>
-<li><code>align=[left/center/right]</code>: It specifies the horizontal alignment of the heading position.</li>
-<li><code>indent=&lt;dimension&gt;</code>: It specifies the amount of indentation of the entire heading.</li>
-<li><code>end_indent=&lt;dimension&gt;</code>: It specifies the amount of back indentation of the entire heading.</li>
-<li><code>after_label_space=&lt;dimension&gt;</code>: It specifies the amount of space between the label and the heading text.</li>
-<li><code>second_heading_text_indent=[&lt;dimension&gt;/{&lt;dimension&gt;,&lt;dimension&gt;}]</code>: It specifies the indent of the second and subsequent lines of the heading text. It specifies from the beginning of the first line of the heading text, but if you put <code>*</code> at the beginning like <code>second_heading_text_indent=*1\zw</code>, it specifies from the beginning of the label. Also, if you specify it as <code>second_heading_text_indent={&lt;when there is a label&gt;,&lt;when there is no label&gt;}</code>, you can change the value depending on the presence or absence of the label. You can also use * in the specification of <code>&lt;when there is a label&gt;</code>.</li>
-<li><code>subtitle_indent=&lt;dimension&gt;</code>: It specifies the amount of indentation of the subtitle. It specifies from the beginning of the first line of the heading text. However, if you put <code>*</code> at the beginning like <code>subtitle_indent=*1\zw</code>, it specifies from the beginning of the label. It is valid only when <code>subtitle_break=true</code>.</li>
+<li><code>align=[left/center/right]</code>: It specifies the horizontal
+alignment of the heading position.</li>
+<li><code>indent=&lt;dimension&gt;</code>: It specifies the amount of
+indentation of the entire heading.</li>
+<li><code>end_indent=&lt;dimension&gt;</code>: It specifies the amount
+of back indentation of the entire heading.</li>
+<li><code>after_label_space=&lt;dimension&gt;</code>: It specifies the
+amount of space between the label and the heading text.</li>
+<li><code>second_heading_text_indent=[&lt;dimension&gt;/{&lt;dimension&gt;,&lt;dimension&gt;}]</code>:
+It specifies the indent of the second and subsequent lines of the
+heading text. It specifies from the beginning of the first line of the
+heading text, but if you put <code>*</code> at the beginning like
+<code>second_heading_text_indent=*1\zw</code>, it specifies from the
+beginning of the label. Also, if you specify it as
+<code>second_heading_text_indent={&lt;when there is a label&gt;,&lt;when there is no label&gt;}</code>,
+you can change the value depending on the presence or absence of the
+label. You can also use * in the specification of
+<code>&lt;when there is a label&gt;</code>.</li>
+<li><code>subtitle_indent=&lt;dimension&gt;</code>: It specifies the
+amount of indentation of the subtitle. It specifies from the beginning
+of the first line of the heading text. However, if you put
+<code>*</code> at the beginning like <code>subtitle_indent=*1\zw</code>,
+it specifies from the beginning of the label. It is valid only when
+<code>subtitle_break=true</code>.</li>
</ul>
<h4 id="others-1">Others</h4>
<ul>
-<li><code>subtitle_break=[true/false]</code>: It specifies whether to break the line between the heading text and the subtitle.</li>
-<li><code>allowbreak_if_evenpage=[true/false]</code>: It allows a page break immediately after the heading if it is on an even page.</li>
-<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>: It specifies the page break before the heading2. They are respectively, page break, <code>\cleardoublepage</code> execution, column break, as it is, start with odd page, start with even page.</li>
-<li><code>pagestyle=&lt;page style name&gt;</code>: It specifies the page style of the heading area.</li>
-<li><code>afterindent=[true/false]</code>: It specifies whether to indent the paragraph immediately after the heading.</li>
-<li><code>column_spanning=[true/false]</code>: It makes the heading span columns. It is ignored when <code>pagebreak=nariyuki</code> or <code>pagebreak=clearcolumn</code>.</li>
-<li><code>number=[true/false]</code>: It specifies whether to number or not. The same caution as <code>\NewTobiraHeading</code> is required.</li>
+<li><code>subtitle_break=[true/false]</code>: It specifies whether to
+break the line between the heading text and the subtitle.</li>
+<li><code>allowbreak_if_evenpage=[true/false]</code>: It allows a page
+break immediately after the heading if it is on an even page.</li>
+<li><code>pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]</code>:
+It specifies the page break before the heading2. They are respectively,
+page break, <code>\cleardoublepage</code> execution, column break, as it
+is, start with odd page, start with even page.</li>
+<li><code>pagestyle=&lt;page style name&gt;</code>: It specifies the
+page style of the heading area.</li>
+<li><code>afterindent=[true/false]</code>: It specifies whether to
+indent the paragraph immediately after the heading.</li>
+<li><code>column_spanning=[true/false]</code>: It makes the heading span
+columns. It is ignored when <code>pagebreak=nariyuki</code> or
+<code>pagebreak=clearcolumn</code>.</li>
+<li><code>number=[true/false]</code>: It specifies whether to number or
+not. The same caution as <code>\NewTobiraHeading</code> is
+required.</li>
</ul>
<h4 id="gyo-dori">Gyo-dori</h4>
<p>You can specify gyo-dori setting in one of the following ways.</p>
<ul>
-<li>Specify the number of lines and place it in the center. Specify the number of lines with <code>lines=&lt;natural number&gt;</code>. You can also specify the number of lines to add before and after with <code>before_lines=&lt;natural number&gt;</code> and <code>after_lines=&lt;natural number&gt;</code>. For example, if you specify <code>lines=3,after_lines=1</code>, it will be placed in four lines, and the space after will be one line larger than the space before. The space specified by <code>before_lines</code> does not enter at the top of the page, but if you put <code>*</code> at the beginning like <code>before_lines=*1</code>, it always enters.</li>
-<li>Specify the number of lines and either the space before or after. Specify the number of lines with <code>lines=&lt;natural number&gt;</code>, and the space before or after with either <code>before_space=&lt;dimension&gt;</code> or <code>after_space=&lt;dimension&gt;</code>.</li>
-<li>Specify the space before and after. Specify it with <code>before_space=&lt;dimension&gt;</code> and <code>after_space=&lt;dimension&gt;</code>.</li>
+<li>Specify the number of lines and place it in the center. Specify the
+number of lines with <code>lines=&lt;natural number&gt;</code>. You can
+also specify the number of lines to add before and after with
+<code>before_lines=&lt;natural number&gt;</code> and
+<code>after_lines=&lt;natural number&gt;</code>. For example, if you
+specify <code>lines=3,after_lines=1</code>, it will be placed in four
+lines, and the space after will be one line larger than the space
+before. The space specified by <code>before_lines</code> does not enter
+at the top of the page, but if you put <code>*</code> at the beginning
+like <code>before_lines=*1</code>, it always enters.</li>
+<li>Specify the number of lines and either the space before or after.
+Specify the number of lines with
+<code>lines=&lt;natural number&gt;</code>, and the space before or after
+with either <code>before_space=&lt;dimension&gt;</code> or
+<code>after_space=&lt;dimension&gt;</code>.</li>
+<li>Specify the space before and after. Specify it with
+<code>before_space=&lt;dimension&gt;</code> and
+<code>after_space=&lt;dimension&gt;</code>.</li>
</ul>
-<h3 id="gyo-dori-for-consecutive-headings">Gyo-dori for consecutive headings</h3>
-<p>You can set the gyo-dori settings for block headings that are placed consecutively with <code>\SetBlockHeadingSpaces</code>. <code>\SetBlockHeadingSpaces</code> is used as follows:</p>
-<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span> { {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} [lines=5]{_section,23pt,_subsection,16pt} }</span></code></pre></div>
+<h3 id="gyo-dori-for-consecutive-headings">Gyo-dori for consecutive
+headings</h3>
+<p>You can set the gyo-dori settings for block headings that are placed
+consecutively with <code>\SetBlockHeadingSpaces</code>.
+<code>\SetBlockHeadingSpaces</code> is used as follows:</p>
+<div class="sourceCode" id="cb5"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SetBlockHeadingSpaces</span> {</span>
+<span id="cb5-2"><a href="#cb5-2" aria-hidden="true" tabindex="-1"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span>
+<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a> [lines=5]{_section,23pt,_subsection,16pt}</span>
+<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
<p>This means the following.</p>
<ul>
-<li>If the headings are placed in the order of <code>\part</code>, <code>\section</code>, <code>\subsection</code>, and the front and back are not headings, then <code>\part</code> is three-line spacing + one line space before, and <code>\section</code> and <code>\subsection</code> are two-line spacing.</li>
-<li>If the headings are placed in the order of <code>\section</code>, <code>\subsection</code>, and the front and back are not headings, then the whole is five-line spacing, and there is <code>23pt</code> space between <code>\section</code> and <code>\subsection</code>, and <code>16pt</code> space after <code>\subsection</code>.</li>
+<li>If the headings are placed in the order of <code>\part</code>,
+<code>\section</code>, <code>\subsection</code>, and the front and back
+are not headings, then <code>\part</code> is three-line spacing + one
+line space before, and <code>\section</code> and
+<code>\subsection</code> are two-line spacing.</li>
+<li>If the headings are placed in the order of <code>\section</code>,
+<code>\subsection</code>, and the front and back are not headings, then
+the whole is five-line spacing, and there is <code>23pt</code> space
+between <code>\section</code> and <code>\subsection</code>, and
+<code>16pt</code> space after <code>\subsection</code>.</li>
</ul>
<p>The individual settings are as follows.</p>
<ul>
-<li>Each <code>{}</code> contains <code>_&lt;heading command name&gt;</code> or <code>&lt;dimension&gt;</code> separated by commas.</li>
-<li>You can add settings enclosed in <code>[]</code> at the beginning. This is a setting for the entire heading that is placed consecutively. <code>lines / before_lines / after_lines / before_space / after_space</code> are available. Each meaning is the same as the line spacing specification described above.</li>
+<li>Each <code>{}</code> contains
+<code>_&lt;heading command name&gt;</code> or
+<code>&lt;dimension&gt;</code> separated by commas.</li>
+<li>You can add settings enclosed in <code>[]</code> at the beginning.
+This is a setting for the entire heading that is placed consecutively.
+<code>lines / before_lines / after_lines / before_space / after_space</code>
+are available. Each meaning is the same as the line spacing
+specification described above.</li>
<li>The dimension is the amount of space as it is.</li>
-<li>You can add settings enclosed in <code>{}</code> after <code>_&lt;heading command name&gt;</code> to set the amount of space for that heading. If not set, there is no space before and after.</li>
-<li>In the settings enclosed in <code>{}</code> for the heading, <code>lines / before_lines / after_lines / before_space / after_space</code> are available. Each meaning is the same as the line spacing specification described above.</li>
-<li>If you make the part enclosed in <code>{}</code> only <code>*</code>, (for example, <code>_section{*}</code>), it uses the same setting as when it is placed alone.</li>
+<li>You can add settings enclosed in <code>{}</code> after
+<code>_&lt;heading command name&gt;</code> to set the amount of space
+for that heading. If not set, there is no space before and after.</li>
+<li>In the settings enclosed in <code>{}</code> for the heading,
+<code>lines / before_lines / after_lines / before_space / after_space</code>
+are available. Each meaning is the same as the line spacing
+specification described above.</li>
+<li>If you make the part enclosed in <code>{}</code> only
+<code>*</code>, (for example, <code>_section{*}</code>), it uses the
+same setting as when it is placed alone.</li>
</ul>
-<p>Note that whether the headings are consecutive or not is determined simply by whether the block heading commands are written in succession. Therefore, even if there are commands that are not related to the output between the heading commands, they are not considered to be consecutive headings. However, if only spaces, line breaks, or <code>\label[&lt;option&gt;]{&lt;argument&gt;}…{&lt;argument&gt;}</code> are inserted between the heading commands, they are considered to be consecutive headings.</p>
+<p>Note that whether the headings are consecutive or not is determined
+simply by whether the block heading commands are written in succession.
+Therefore, even if there are commands that are not related to the output
+between the heading commands, they are not considered to be consecutive
+headings. However, if only spaces, line breaks, or
+<code>\label[&lt;option&gt;]{&lt;argument&gt;}…{&lt;argument&gt;}</code>
+are inserted between the heading commands, they are considered to be
+consecutive headings.</p>
<h3 id="run-in-headings">Run-in headings</h3>
-<p>Run-in headings are created with <code>\NewRuninHeading</code>. The command creates a heading with the same format as the standard document class's <code>\section</code>, i.e. <code>\&lt;command name&gt;*[running head]{heading text}</code>. The settings are as follows:</p>
-<ul>
-<li><code>font=&lt;font setting command&gt;</code>: Specifies the font of the heading.</li>
-<li><code>indent=&lt;dimension&gt;</code>: Specifies the indentation of the entire heading text.</li>
-<li><code>after_label_space=&lt;dimension&gt;</code>: Specifies the space between the label and the heading text.</li>
-<li><code>label_format=&lt;code&gt;</code>: Specifies the format of the label. For example, <code>label_format={\theparagraph}</code>.</li>
-<li><code>after_space=&lt;dimension&gt;</code>: Specifies the space between the heading and the main text.</li>
-<li><code>number=[true/false]</code>: Specifies whether to number the heading or not. The same caution as <code>\NewTobiraHeading</code> applies.</li>
+<p>Run-in headings are created with <code>\NewRuninHeading</code>. The
+command creates a heading with the same format as the standard document
+class's <code>\section</code>, i.e.
+<code>\&lt;command name&gt;*[running head]{heading text}</code>. The
+settings are as follows:</p>
+<ul>
+<li><code>font=&lt;font setting command&gt;</code>: Specifies the font
+of the heading.</li>
+<li><code>indent=&lt;dimension&gt;</code>: Specifies the indentation of
+the entire heading text.</li>
+<li><code>after_label_space=&lt;dimension&gt;</code>: Specifies the
+space between the label and the heading text.</li>
+<li><code>label_format=&lt;code&gt;</code>: Specifies the format of the
+label. For example, <code>label_format={\theparagraph}</code>.</li>
+<li><code>after_space=&lt;dimension&gt;</code>: Specifies the space
+between the heading and the main text.</li>
+<li><code>number=[true/false]</code>: Specifies whether to number the
+heading or not. The same caution as <code>\NewTobiraHeading</code>
+applies.</li>
</ul>
<h3 id="cut-in-headings">Cut-in headings</h3>
-<p>You can create cut-in headings with <code>\NewCutinHeading</code>. The command has the format <code>\&lt;command name&gt;{heading text}</code>. The settings are as follows:</p>
-<ul>
-<li><code>font=&lt;font setting command&gt;</code>: Specifies the font of the heading.</li>
-<li><code>indent=&lt;dimension&gt;</code>: Specifies the indentation of the entire heading.</li>
-<li><code>after_space=&lt;dimension&gt;</code>: Specifies the space between the heading and the text.</li>
-<li><code>onelinemax=&lt;dimension&gt;</code>, <code>twolinemax=&lt;dimension&gt;</code>: If the length of the heading text is less than or equal to <code>onelinemax</code>, the window heading is output in one line. If it is less than or equal to <code>twolinemax</code>, it is output in two lines. Otherwise, it is output in three lines. The default values are 6 characters and 20 characters, respectively.</li>
+<p>You can create cut-in headings with <code>\NewCutinHeading</code>.
+The command has the format
+<code>\&lt;command name&gt;{heading text}</code>. The settings are as
+follows:</p>
+<ul>
+<li><code>font=&lt;font setting command&gt;</code>: Specifies the font
+of the heading.</li>
+<li><code>indent=&lt;dimension&gt;</code>: Specifies the indentation of
+the entire heading.</li>
+<li><code>after_space=&lt;dimension&gt;</code>: Specifies the space
+between the heading and the text.</li>
+<li><code>onelinemax=&lt;dimension&gt;</code>,
+<code>twolinemax=&lt;dimension&gt;</code>: If the length of the heading
+text is less than or equal to <code>onelinemax</code>, the window
+heading is output in one line. If it is less than or equal to
+<code>twolinemax</code>, it is output in two lines. Otherwise, it is
+output in three lines. The default values are 6 characters and 20
+characters, respectively.</li>
</ul>
<h3 id="modifyheading"><code>\ModifyHeading</code></h3>
-<p><code>\ModifyHeading</code> is a command that changes the settings of a heading command that has already been defined (using one of the above commands). For example,</p>
-<div class="sourceCode" id="cb6"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
-<p>changes only the line spacing of <code>\section</code> to 10 lines, while keeping the font and other settings the same. You cannot change the type of heading with this command.</p>
+<p><code>\ModifyHeading</code> is a command that changes the settings of
+a heading command that has already been defined (using one of the above
+commands). For example,</p>
+<div class="sourceCode" id="cb6"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
+<p>changes only the line spacing of <code>\section</code> to 10 lines,
+while keeping the font and other settings the same. You cannot change
+the type of heading with this command.</p>
<h3 id="saveheading"><code>\SaveHeading</code></h3>
-<p><code>\SaveHeading</code> saves the definition of a heading command. For example, you can use it like this:</p>
-<div class="sourceCode" id="cb7"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% Save the contents of \section to \restoresection.</span></span>
+<p><code>\SaveHeading</code> saves the definition of a heading command.
+For example, you can use it like this:</p>
+<div class="sourceCode" id="cb7"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% Save the contents of \section to \restoresection.</span></span>
<span id="cb7-2"><a href="#cb7-2" aria-hidden="true" tabindex="-1"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=…} <span class="co">% Redefine \section with a new font.</span></span>
<span id="cb7-3"><a href="#cb7-3" aria-hidden="true" tabindex="-1"></a>…</span>
<span id="cb7-4"><a href="#cb7-4" aria-hidden="true" tabindex="-1"></a><span class="fu">\restoresection</span> <span class="co">% Restore the contents of \section.</span></span></code></pre></div>
<h2 id="page-style">Page Style</h2>
<p>You can define a page style using</p>
-<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\NewPageStyle</span>{&lt;page style name&gt;}{&lt;settings&gt;}</span></code></pre></div>
-<p><code>&lt;settings&gt;</code> is in keyval format. You can apply the defined page style with <code>\pagestyle</code>. The settings are as follows:</p>
-<ul>
-<li><code>yoko</code>: Prints horizontally at the top and bottom. Default.</li>
+<div class="sourceCode" id="cb8"><pre
+class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\NewPageStyle</span>{&lt;page style name&gt;}{&lt;settings&gt;}</span></code></pre></div>
+<p><code>&lt;settings&gt;</code> is in keyval format. You can apply the
+defined page style with <code>\pagestyle</code>. The settings are as
+follows:</p>
+<ul>
+<li><code>yoko</code>: Prints horizontally at the top and bottom.
+Default.</li>
<li><code>tate</code>: Prints vertically on the fore-edge side.</li>
-<li><code>running_head_font=&lt;font setting command&gt;</code>: Specifies the font for the running head.</li>
-<li><code>nombre_font=&lt;font setting command&gt;</code>: Specifies the font for the page number.</li>
-<li><code>running_head_position</code>, <code>nombre_position</code>: Specifies the position of the running head and the page number. The specification method changes depending on whether <code>yoko</code> or <code>tate</code> is specified.
-<ul>
-<li><code>yoko</code> specified: You can specify it like top-left. You can use <code>top / bottom / center / left / right / gutter / fore-edge</code>. <code>left</code> and <code>right</code> are for odd pages. If <code>twoside</code> is specified, even pages are the opposite.</li>
-<li><code>tate</code> specified: You can specify <code>&lt;dimension&gt;</code>. <code>running_head_position</code> specifies the drop amount from the top of the running head, and <code>nombre_position</code> specifies the raise amount from the bottom of the page number.</li>
-</ul></li>
-<li><code>nombre=&lt;format&gt;</code>: Specifies the page number to output. The default is <code>\thepage</code>.</li>
-<li><code>odd_running_head=&lt;format&gt;</code>, <code>even_running_head=&lt;format&gt;</code>: Specifies the running head for odd and even pages, respectively. If you specify a name starting with _ like <code>_section</code>, it outputs the corresponding heading. (<code>_section</code> outputs the current <code>\section</code>.)</li>
-<li><code>mark_format={[odd=&lt;format&gt;/even=&lt;format&gt;/_&lt;heading command name&gt;=&lt;format&gt;],…}</code>: Specifies the format for outputting headings to the running head. Specify it like <code>mark_format={_section={Section \thesection: #1},_chapter={Chapter \thechapter \quad #1}}</code>. You can also specify odd or even instead of the heading command name, which will be the format for the running head on odd/even pages. It is implemented by defining <code>\sectionmark</code> etc. when executing <code>\pagestyle</code>.</li>
-<li><code>nombre_ii=&lt;format&gt;</code>: Specifies the second page number. You can also specify the location with <code>nombre_ii_position</code> and the font with <code>nombre_ii_font</code>. The specification method is the same as <code>nombre</code> and <code>nombre_position</code>.</li>
-<li><code>odd_running_head_ii</code>, <code>even_running_head_ii</code>, <code>running_head_ii_position</code>, <code>running_head_ii_font</code> are also available. If <code>nombre_ii_position</code> or <code>running_head_ii_position</code> is not specified, it will be set to the same position as <code>nombre_position</code> or <code>running_head_position</code> when <code>yoko</code> is specified. When <code>tate</code> is specified, it will be displayed in the place following the first page number or running head.</li>
-<li><code>odd_head_format=&lt;format&gt;</code>, <code>odd_foot_format=&lt;format&gt;</code>, <code>even_head_format=&lt;format&gt;</code>, <code>even_foot_format=&lt;format&gt;P: Specifies the format for the header and footer. </code>#1<code>will be replaced with the entire header or footer. However,</code>#1<code>may contain code for position adjustment, so it may not work as expected, especially when</code>tate<code>is specified in</code>\NewPageStyle<code>. For example, to draw a rule under the header on odd pages, you can do </code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}<code>. </code>\jlreqyokoheadlength<code>is a macro defined in this class file and gives the horizontal length of the header. (The footer length is the same.) The vertical length, i.e., the length when</code>tate<code>is specified in</code>\NewPageStyle<code>, can be obtained with </code>\jlreqtateheadlength`.</li>
-</ul>
-<p><code>\RenewPageStyle</code>, <code>\ProvidePageStyle</code>, <code>\DeclarePageStyle</code> are also available1.</p>
-<p>You can modify an existing page style with <code>\ModifyPageStyle</code>.</p>
+<li><code>running_head_font=&lt;font setting command&gt;</code>:
+Specifies the font for the running head.</li>
+<li><code>nombre_font=&lt;font setting command&gt;</code>: Specifies the
+font for the page number.</li>
+<li><code>running_head_position</code>, <code>nombre_position</code>:
+Specifies the position of the running head and the page number. The
+specification method changes depending on whether <code>yoko</code> or
+<code>tate</code> is specified.
+<ul>
+<li><code>yoko</code> specified: You can specify it like top-left. You
+can use
+<code>top / bottom / center / left / right / gutter / fore-edge</code>.
+<code>left</code> and <code>right</code> are for odd pages. If
+<code>twoside</code> is specified, even pages are the opposite.</li>
+<li><code>tate</code> specified: You can specify
+<code>&lt;dimension&gt;</code>. <code>running_head_position</code>
+specifies the drop amount from the top of the running head, and
+<code>nombre_position</code> specifies the raise amount from the bottom
+of the page number.</li>
+</ul></li>
+<li><code>nombre=&lt;format&gt;</code>: Specifies the page number to
+output. The default is <code>\thepage</code>.</li>
+<li><code>odd_running_head=&lt;format&gt;</code>,
+<code>even_running_head=&lt;format&gt;</code>: Specifies the running
+head for odd and even pages, respectively. If you specify a name
+starting with _ like <code>_section</code>, it outputs the corresponding
+heading. (<code>_section</code> outputs the current
+<code>\section</code>.)</li>
+<li><code>mark_format={[odd=&lt;format&gt;/even=&lt;format&gt;/_&lt;heading command name&gt;=&lt;format&gt;],…}</code>:
+Specifies the format for outputting headings to the running head.
+Specify it like
+<code>mark_format={_section={Section \thesection: #1},_chapter={Chapter \thechapter \quad #1}}</code>.
+You can also specify odd or even instead of the heading command name,
+which will be the format for the running head on odd/even pages. It is
+implemented by defining <code>\sectionmark</code> etc. when executing
+<code>\pagestyle</code>.</li>
+<li><code>nombre_ii=&lt;format&gt;</code>: Specifies the second page
+number. You can also specify the location with
+<code>nombre_ii_position</code> and the font with
+<code>nombre_ii_font</code>. The specification method is the same as
+<code>nombre</code> and <code>nombre_position</code>.</li>
+<li><code>odd_running_head_ii</code>, <code>even_running_head_ii</code>,
+<code>running_head_ii_position</code>, <code>running_head_ii_font</code>
+are also available. If <code>nombre_ii_position</code> or
+<code>running_head_ii_position</code> is not specified, it will be set
+to the same position as <code>nombre_position</code> or
+<code>running_head_position</code> when <code>yoko</code> is specified.
+When <code>tate</code> is specified, it will be displayed in the place
+following the first page number or running head.</li>
+<li><code>odd_head_format=&lt;format&gt;</code>,
+<code>odd_foot_format=&lt;format&gt;</code>,
+<code>even_head_format=&lt;format&gt;</code>,
+<code>even_foot_format=&lt;format&gt;P: Specifies the format for the header and footer. </code>#1<code>will be replaced with the entire header or footer. However,</code>#1<code>may contain code for position adjustment, so it may not work as expected, especially when</code>tate<code>is specified in</code>\NewPageStyle<code>. For example, to draw a rule under the header on odd pages, you can do </code>odd_head_format={\underline{\makebox[\jlreqyokoheadlength]{#1}}}<code>. </code>\jlreqyokoheadlength<code>is a macro defined in this class file and gives the horizontal length of the header. (The footer length is the same.) The vertical length, i.e., the length when</code>tate<code>is specified in</code>\NewPageStyle<code>, can be obtained with </code>\jlreqtateheadlength`.</li>
+</ul>
+<p><code>\RenewPageStyle</code>, <code>\ProvidePageStyle</code>,
+<code>\DeclarePageStyle</code> are also available1.</p>
+<p>You can modify an existing page style with
+<code>\ModifyPageStyle</code>.</p>
<h2 id="jfm">JFM</h2>
-<p>We use the following custom JFMs. Some packages may reset the settings to use their own JFMs or the standard JFMs. In that case, you need to set the appropriate package options to use the JFMs of this class file.</p>
+<p>We use the following custom JFMs. Some packages may reset the
+settings to use their own JFMs or the standard JFMs. In that case, you
+need to set the appropriate package options to use the JFMs of this
+class file.</p>
<h3 id="for-platexuplatex">For pLaTeX/upLaTeX</h3>
-<p>The names of the JFMs are as follows. The characters enclosed in <code>[]</code> may or may not be included depending on the settings.</p>
+<p>The names of the JFMs are as follows. The characters enclosed in
+<code>[]</code> may or may not be included depending on the
+settings.</p>
<pre><code>[u][b][z]jlreq[g][-v]</code></pre>
<p>Each character is included in the following cases.</p>
<ul>
<li><code>u</code>: When using upLaTeX</li>
-<li><code>b</code>: When using hanging punctuation. (When the class option hanging_punctuation is specified.)</li>
-<li><code>z</code>: When the space before the opening brackets at the beginning of a line is two-bun for the beginning of a paragraph and one-bun for the line break. (When the class option <code>open_bracket_pos=zenkakunibu_nibu</code> is specified.)</li>
+<li><code>b</code>: When using hanging punctuation. (When the class
+option hanging_punctuation is specified.)</li>
+<li><code>z</code>: When the space before the opening brackets at the
+beginning of a line is two-bun for the beginning of a paragraph and
+one-bun for the line break. (When the class option
+<code>open_bracket_pos=zenkakunibu_nibu</code> is specified.)</li>
<li><code>g</code>: For gothic fonts.</li>
<li><code>-v</code>: For vertical writing.</li>
</ul>
-<p>For example, if you process a source without using hanging punctuation and specifying <code>open_bracket_pos=zenkakunibu_nibu</code> as a class option with pLaTeX, the JFM named zjlreq will be used for horizontal writing mincho font.</p>
+<p>For example, if you process a source without using hanging
+punctuation and specifying
+<code>open_bracket_pos=zenkakunibu_nibu</code> as a class option with
+pLaTeX, the JFM named zjlreq will be used for horizontal writing mincho
+font.</p>
<p>For LuaLaTeX</p>
<ul>
<li>The JFM for horizontal writing is jlreq</li>
<li>The JFM for vertical writing is jlreqv</li>
</ul>
-<p>The same JFM is used for gothic fonts. This class file changes the JFM of LuaTeX-ja standard to these.</p>
+<p>The same JFM is used for gothic fonts. This class file changes the
+JFM of LuaTeX-ja standard to these.</p>
<h2 id="others-2">Others</h2>
-<p>If the class option <code>jlreq_notes</code> is passed, a notification will be given when a setting that contradicts the description of Japanese typesetting processing is made.</p>
+<p>If the class option <code>jlreq_notes</code> is passed, a
+notification will be given when a setting that contradicts the
+description of Japanese typesetting processing is made.</p>
<h2 id="jlreq-complements">jlreq-complements</h2>
-<p><code>jlreq-complements</code> is a package that customizes the environments that are typically provided by LaTeX document classes. You can use it as follows. It accepts the following options:</p>
-<ul>
-<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>: Specify the engine.</li>
-<li><code>setupname=&lt;name&gt;</code>: Specify the name of the command for customization. The default is <code>jlreqcomplementssetup</code>, and you can set it by writing <code>\jlreqcomplementssetup{&lt;settings&gt;}</code> in the preamble.</li>
+<p><code>jlreq-complements</code> is a package that customizes the
+environments that are typically provided by LaTeX document classes. You
+can use it as follows. It accepts the following options:</p>
+<ul>
+<li><code>platex</code>, <code>uplatex</code>, <code>lulalatex</code>:
+Specify the engine.</li>
+<li><code>setupname=&lt;name&gt;</code>: Specify the name of the command
+for customization. The default is <code>jlreqcomplementssetup</code>,
+and you can set it by writing
+<code>\jlreqcomplementssetup{&lt;settings&gt;}</code> in the
+preamble.</li>
</ul>
-<p>In <code>jlreq</code>, it is loaded as <code>\usepackage[&lt;engine recognized in jlreq&gt;,setupname=jlreqsetup]{jlreq-complements}</code>, so you can customize the environments with the usual <code>\jlreqsetup</code>. To make this work well with an existing name, the original command and the new one need to be compatible. It is usually better to avoid this.</p>
-<h3 id="thebibliography-environment"><code>thebibliography</code> environment</h3>
-<ul>
-<li><code>thebibliography_heading=&lt;code&gt;</code>: Specify the command to output the heading of the <code>thebibliography</code> environment. Use it like <code>thebibliography_heading={\section*{\refname}}</code>.</li>
-<li><code>thebibliography_after_label_space=&lt;dimension&gt;</code>: Specify the space after the label of each item in the <code>thebibliography</code> environment.</li>
-<li><code>thebibliography_indent=&lt;dimension&gt;</code>: Specify the indentation of the entire <code>thebibliography</code> environment.</li>
-<li><code>thebibliography_mark=&lt;code&gt;</code>: Specify the code to register the heading of the <code>thebibliography</code> environment in the column.</li>
-<li><code>thebibliography_precode=&lt;code&gt;</code>, <code>thebibliography_postcode=&lt;code&gt;</code>: Specify the code that is executed before and after the <code>thebibliography</code> environment, respectively.</li>
+<p>In <code>jlreq</code>, it is loaded as
+<code>\usepackage[&lt;engine recognized in jlreq&gt;,setupname=jlreqsetup]{jlreq-complements}</code>,
+so you can customize the environments with the usual
+<code>\jlreqsetup</code>. To make this work well with an existing name,
+the original command and the new one need to be compatible. It is
+usually better to avoid this.</p>
+<h3 id="thebibliography-environment"><code>thebibliography</code>
+environment</h3>
+<ul>
+<li><code>thebibliography_heading=&lt;code&gt;</code>: Specify the
+command to output the heading of the <code>thebibliography</code>
+environment. Use it like
+<code>thebibliography_heading={\section*{\refname}}</code>.</li>
+<li><code>thebibliography_after_label_space=&lt;dimension&gt;</code>:
+Specify the space after the label of each item in the
+<code>thebibliography</code> environment.</li>
+<li><code>thebibliography_indent=&lt;dimension&gt;</code>: Specify the
+indentation of the entire <code>thebibliography</code> environment.</li>
+<li><code>thebibliography_mark=&lt;code&gt;</code>: Specify the code to
+register the heading of the <code>thebibliography</code> environment in
+the column.</li>
+<li><code>thebibliography_precode=&lt;code&gt;</code>,
+<code>thebibliography_postcode=&lt;code&gt;</code>: Specify the code
+that is executed before and after the <code>thebibliography</code>
+environment, respectively.</li>
</ul>
<h3 id="theindex-environment"><code>theindex</code> environment</h3>
<ul>
-<li><code>theindex_heading=&lt;code&gt;</code>: Specify the command to output the heading of the <code>theindex</code> environment.</li>
-<li><code>theindex_mark=&lt;code&gt;</code>: Specify the code to register the heading of the <code>theindex</code> environment in the column.</li>
-<li><code>theindex_twocolumn=[true/false]</code>: Specify whether to output the <code>theindex</code> environment in two columns.</li>
-<li><code>theindex_column_gap=&lt;dimension&gt;</code>: Specify the column gap in the <code>theindex</code> environment when <code>theindex_twocolumn=true</code>.</li>
-<li><code>theindex_column_rule_width=&lt;dimension&gt;</code>: Specify the value of <code>\columnseprule</code> in the <code>theindex</code> environment when <code>theindex_twocolumn=true</code>.</li>
-<li><code>theindex_pagestyle=&lt;page style name&gt;</code>: Specify the page style for the <code>theindex</code> environment.</li>
-<li><code>theindex_postcode=&lt;code&gt;</code>, <code>theindex_precode=&lt;code&gt;</code>: Specify the code that is executed before and after the <code>theindex</code> environment, respectively.</li>
+<li><code>theindex_heading=&lt;code&gt;</code>: Specify the command to
+output the heading of the <code>theindex</code> environment.</li>
+<li><code>theindex_mark=&lt;code&gt;</code>: Specify the code to
+register the heading of the <code>theindex</code> environment in the
+column.</li>
+<li><code>theindex_twocolumn=[true/false]</code>: Specify whether to
+output the <code>theindex</code> environment in two columns.</li>
+<li><code>theindex_column_gap=&lt;dimension&gt;</code>: Specify the
+column gap in the <code>theindex</code> environment when
+<code>theindex_twocolumn=true</code>.</li>
+<li><code>theindex_column_rule_width=&lt;dimension&gt;</code>: Specify
+the value of <code>\columnseprule</code> in the <code>theindex</code>
+environment when <code>theindex_twocolumn=true</code>.</li>
+<li><code>theindex_pagestyle=&lt;page style name&gt;</code>: Specify the
+page style for the <code>theindex</code> environment.</li>
+<li><code>theindex_postcode=&lt;code&gt;</code>,
+<code>theindex_precode=&lt;code&gt;</code>: Specify the code that is
+executed before and after the <code>theindex</code> environment,
+respectively.</li>
</ul>
<h3 id="theorem-environment">Theorem environment</h3>
<ul>
-<li><code> theorem_beforeafter_space=&lt;dimension&gt;</code>: Specify the space before and after the theorem environment.</li>
-<li><code>theorem_label_font=&lt;font setting code&gt;</code>: Specify the font for the label part of the theorem environment.</li>
-<li><code>theorem_font=&lt;font setting code&gt;</code>: Specify the font for the body of the theorem environment.</li>
-<li><code>theorem_indent=&lt;dimension&gt;</code>: Specify the indentation of the body of the theorem environment.</li>
-<li><code>proof_label_font=&lt;font setting code&gt;</code>: This setting is only valid when the <code>amsthm</code> package is loaded. Specify the font for the label of the <code>proof</code> environment.</li>
+<li><code> theorem_beforeafter_space=&lt;dimension&gt;</code>: Specify
+the space before and after the theorem environment.</li>
+<li><code>theorem_label_font=&lt;font setting code&gt;</code>: Specify
+the font for the label part of the theorem environment.</li>
+<li><code>theorem_font=&lt;font setting code&gt;</code>: Specify the
+font for the body of the theorem environment.</li>
+<li><code>theorem_indent=&lt;dimension&gt;</code>: Specify the
+indentation of the body of the theorem environment.</li>
+<li><code>proof_label_font=&lt;font setting code&gt;</code>: This
+setting is only valid when the <code>amsthm</code> package is loaded.
+Specify the font for the label of the <code>proof</code>
+environment.</li>
</ul>
-<p>When the <code>amsthm</code> package is loaded, a new theorem style <code>jlreq</code> is defined and the current style is changed to <code>jlreq</code>. In this case, the above settings function as settings for this <code>jlreq</code> style.</p>
+<p>When the <code>amsthm</code> package is loaded, a new theorem style
+<code>jlreq</code> is defined and the current style is changed to
+<code>jlreq</code>. In this case, the above settings function as
+settings for this <code>jlreq</code> style.</p>
<h2 id="license">LICENSE</h2>
-<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE">LICENSE</a>.</p>
+<p>This package is distributed under the BSD 2-Clause License. See <a
+href="LICENSE">LICENSE</a>.</p>
<h2 id="changelog">CHANGELOG</h2>
<ul>
<li>2017-02-08
@@ -447,48 +977,59 @@
<ul>
<li>Fixed bugs.</li>
<li>Implement <code>abstract</code> environment.</li>
-<li>Changed/Added some keys to class option/<code>\jlreqsetup</code></li>
-<li>Stopped to load <code>pxrubirica</code>, <code>luatexja-ruby</code> and <code>nidanfloat</code>.</li>
+<li>Changed/Added some keys to class
+option/<code>\jlreqsetup</code></li>
+<li>Stopped to load <code>pxrubirica</code>, <code>luatexja-ruby</code>
+and <code>nidanfloat</code>.</li>
</ul></li>
<li>2017-03-14
<ul>
<li>Fixed bugs.</li>
-<li><code>\sffamily</code> etc. also change the Japanese font family.</li>
+<li><code>\sffamily</code> etc. also change the Japanese font
+family.</li>
<li>Added many options to <code>\DeclareBlockHeading</code>.</li>
<li>Some options related to <code>quote</code> environment etc.</li>
</ul></li>
<li>2017-03-20
<ul>
<li>Fixed bugs.</li>
-<li>Insert some spaces around <code>\footnote / \sidenote / \endnote</code>.</li>
+<li>Insert some spaces around
+<code>\footnote / \sidenote / \endnote</code>.</li>
</ul></li>
<li>2017-04-04
<ul>
<li>Fixed a bug.</li>
-<li>Added options <code>tate</code> and <code>font</code> to <code>\DeclarePageStyle</code>.</li>
+<li>Added options <code>tate</code> and <code>font</code> to
+<code>\DeclarePageStyle</code>.</li>
</ul></li>
<li>2017-04-29
<ul>
<li>Fixed bugs.</li>
-<li>Added <code>jafontsize</code> and <code>jafontscale</code> options and <code>\jafontsize</code>.</li>
+<li>Added <code>jafontsize</code> and <code>jafontscale</code> options
+and <code>\jafontsize</code>.</li>
<li>Added <code>\tatechuyoko</code>.</li>
-<li><code>jlreq_warnings</code> -&gt; <code>jlreq_notes</code> (class option).</li>
+<li><code>jlreq_warnings</code> -&gt; <code>jlreq_notes</code> (class
+option).</li>
<li>Moved some class options to <code>\jlreqsetup</code>.</li>
<li>Added some options to <code>\jlreqsetup</code>.</li>
-<li><code>paper={&lt;height&gt;,&lt;width&gt;}</code> -&gt; <code>paper={&lt;width&gt;,&lt;height&gt;}</code>.</li>
+<li><code>paper={&lt;height&gt;,&lt;width&gt;}</code> -&gt;
+<code>paper={&lt;width&gt;,&lt;height&gt;}</code>.</li>
</ul></li>
<li>2017-06-11
<ul>
<li>Stopped to load <code>plext</code> and <code>lltjext</code>.</li>
-<li>Added <code>align</code> to <code>\DeclareBlockHeading</code> and delete <code>indent=center</code>, <code>end_indent=center</code>.</li>
+<li>Added <code>align</code> to <code>\DeclareBlockHeading</code> and
+delete <code>indent=center</code>, <code>end_indent=center</code>.</li>
<li>Changed <code>\kcatcode</code> for some characters (upLaTeX).</li>
</ul></li>
<li>2017-08-13
<ul>
-<li>Added <code>column_spanning</code> to <code>\DeclareBlockHeading</code>.</li>
+<li>Added <code>column_spanning</code> to
+<code>\DeclareBlockHeading</code>.</li>
<li>Sidenotes are a part of the main text now.</li>
<li>Changed the default length of sidenotes to 0.</li>
-<li>jlreq does not define <code>\sidenote</code> if the length for sidenotes is zero.</li>
+<li>jlreq does not define <code>\sidenote</code> if the length for
+sidenotes is zero.</li>
<li>Added a command for the full-width ideographic space.</li>
</ul></li>
<li>2017-08-29
@@ -499,7 +1040,8 @@
<ul>
<li>Fixed bugs.</li>
<li>Added <code>\SetBlockHeadingSpaces</code>.</li>
-<li>Removed a space from <code>\contentsname</code> and <code>\indexname</code>.</li>
+<li>Removed a space from <code>\contentsname</code> and
+<code>\indexname</code>.</li>
</ul></li>
<li>2017-12-02
<ul>
@@ -508,8 +1050,10 @@
<li>2017-12-22
<ul>
<li>Improved JFM.</li>
-<li>Change the way to detect <code>\label</code> between block headings.</li>
-<li>Added chapter number to <code>\theequation</code>,<code>\thefigure</code>,<code>\thetable</code>.</li>
+<li>Change the way to detect <code>\label</code> between block
+headings.</li>
+<li>Added chapter number to
+<code>\theequation</code>,<code>\thefigure</code>,<code>\thetable</code>.</li>
</ul></li>
<li>2018-02-01
<ul>
@@ -521,11 +1065,15 @@
</ul></li>
<li>2018-04-11
<ul>
-<li>Sidenotes (<code>\footnote</code>) appears in the second column in <code>tate</code> mode.</li>
-<li>Added options <code>begin_widh_(odd|even)_page</code> to <code>\DeclareBlockHeading</code>.</li>
-<li>Changed <code>\labelenumi</code> as in <code>jarticle</code> etc.</li>
+<li>Sidenotes (<code>\footnote</code>) appears in the second column in
+<code>tate</code> mode.</li>
+<li>Added options <code>begin_widh_(odd|even)_page</code> to
+<code>\DeclareBlockHeading</code>.</li>
+<li>Changed <code>\labelenumi</code> as in <code>jarticle</code>
+etc.</li>
<li>Fix a bug on <code>column_gap</code> class option.</li>
-<li>Added <code>mark_format</code> to <code>\DeclarePageStyle</code>.</li>
+<li>Added <code>mark_format</code> to
+<code>\DeclarePageStyle</code>.</li>
</ul></li>
<li>2018-05-19
<ul>
@@ -540,9 +1088,11 @@
</ul></li>
<li>2018-08-08
<ul>
-<li>Added <code>nombre_ii</code> etc. to <code>\DeclarePageStyle</code>.</li>
+<li>Added <code>nombre_ii</code> etc. to
+<code>\DeclarePageStyle</code>.</li>
<li>Fixed bugs.</li>
-<li>Added <code>footnote_second_indent</code> and <code>endnote_second_indent</code> to <code>\jlreqsetup</code>.</li>
+<li>Added <code>footnote_second_indent</code> and
+<code>endnote_second_indent</code> to <code>\jlreqsetup</code>.</li>
</ul></li>
<li>2018-08-15
<ul>
@@ -555,16 +1105,23 @@
</ul></li>
<li>2018-12-10
<ul>
-<li>Added <code>number=[true/false]</code> to <code>\New***Heading</code>.</li>
-<li>Added options for <code>\frontmatter</code> etc in <code>\jlreqsetup</code>.</li>
-<li>Made <code>\jlreqHeadingLabel</code> etc available in <code>format</code> in <code>\NewTobiraHeading</code> and <code>\NewBlockHeading</code>.</li>
+<li>Added <code>number=[true/false]</code> to
+<code>\New***Heading</code>.</li>
+<li>Added options for <code>\frontmatter</code> etc in
+<code>\jlreqsetup</code>.</li>
+<li>Made <code>\jlreqHeadingLabel</code> etc available in
+<code>format</code> in <code>\NewTobiraHeading</code> and
+<code>\NewBlockHeading</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2019-01-15
<ul>
-<li>Added <code>nombre_font</code> etc to <code>\NewPageStyle</code>. <code>font</code> is deprecated.</li>
-<li><code>format</code> without <code>#1</code> is allowed in <code>\NewBlockHeading</code>.</li>
-<li>Extended <code>caption_label_format</code> etc. in <code>\jlreqsetup</code>.</li>
+<li>Added <code>nombre_font</code> etc to <code>\NewPageStyle</code>.
+<code>font</code> is deprecated.</li>
+<li><code>format</code> without <code>#1</code> is allowed in
+<code>\NewBlockHeading</code>.</li>
+<li>Extended <code>caption_label_format</code> etc. in
+<code>\jlreqsetup</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2019-04-01
@@ -576,26 +1133,32 @@
</ul></li>
<li>2019-05-07
<ul>
-<li>Added a small length to <code>\textwidth</code> and <code>\textheight</code>.</li>
-<li>Changed the implementation of <code>running_head_ii</code> etc. in <code>\DeclarePageStyle</code>.</li>
+<li>Added a small length to <code>\textwidth</code> and
+<code>\textheight</code>.</li>
+<li>Changed the implementation of <code>running_head_ii</code> etc. in
+<code>\DeclarePageStyle</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2019-09-24
<ul>
-<li>Deleted the (re-)definitions of <code>\@cite</code> and <code>\@biblabel</code>.</li>
+<li>Deleted the (re-)definitions of <code>\@cite</code> and
+<code>\@biblabel</code>.</li>
<li>Added <code>\allowbreak</code> before block headings.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2020-02-07
<ul>
-<li>Changed the default value of <code>itemization_label_length</code> to <code>\leftmargini</code> etc.</li>
-<li>Removed the redefinitions <code>\rmfamily</code> etc and added a code to <code>\@rmfamilyhook</code>.</li>
+<li>Changed the default value of <code>itemization_label_length</code>
+to <code>\leftmargini</code> etc.</li>
+<li>Removed the redefinitions <code>\rmfamily</code> etc and added a
+code to <code>\@rmfamilyhook</code>.</li>
<li>Changed <code>\parskip</code> to <code>0pt</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2020-05-01
<ul>
-<li>Added <code>theorem_label_font</code> and <code>theorem_font</code> to <code>\jlreqsetup</code>.</li>
+<li>Added <code>theorem_label_font</code> and <code>theorem_font</code>
+to <code>\jlreqsetup</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2020-09-27
@@ -611,28 +1174,33 @@
</ul></li>
<li>2021-03-17
<ul>
-<li>Use the pagestyle <code>plain</code> at <code>\maketitle</code> if the current one is not <code>empty</code></li>
+<li>Use the pagestyle <code>plain</code> at <code>\maketitle</code> if
+the current one is not <code>empty</code></li>
<li>Removed JFM glue after <code>\item</code>.</li>
<li>Removed JFM glue after block headings.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2021-05-28
<ul>
-<li>Extended <code>caption_align</code> in <code>\jlreqsetup</code>.</li>
+<li>Extended <code>caption_align</code> in
+<code>\jlreqsetup</code>.</li>
<li>Removed some <code>\ifthenelse</code>.</li>
</ul></li>
<li>2021-07-22
<ul>
<li>Stopped to use <code>\IfHookExistsTF</code>.</li>
<li>Added <code>\akigumi</code>.</li>
-<li>Stopped to load packages <code>xkeyval</code> and <code>ifthen</code>.</li>
+<li>Stopped to load packages <code>xkeyval</code> and
+<code>ifthen</code>.</li>
<li>It has more compatibility with expl3.</li>
-<li>Added <code>pagestyle</code> to <code>\DeclareBlockHeading</code>.</li>
+<li>Added <code>pagestyle</code> to
+<code>\DeclareBlockHeading</code>.</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2021-07-25
<ul>
-<li>Load <code>ifthen</code> again. (Only for Re:VIEW, will be removed in future.)</li>
+<li>Load <code>ifthen</code> again. (Only for Re:VIEW, will be removed
+in future.)</li>
<li>Fixed bugs.</li>
</ul></li>
<li>2021-08-12
@@ -647,19 +1215,23 @@
<li>2021-11-05
<ul>
<li><code>paper=b*</code> is regarded as a ISO series.</li>
-<li>Removed many codes relating with LaTeX hooks mechanism (because it seems not stable.)</li>
+<li>Removed many codes relating with LaTeX hooks mechanism (because it
+seems not stable.)</li>
<li>Removed <code>\RequirePackage{ifthen}</code>.</li>
<li>Removed <code>\kcatcode</code>settings with upLaTeX.</li>
</ul></li>
<li>2022-04-05
<ul>
-<li>Added <code>warichu_opening</code> and <code>warichu_closing</code> to <code>\jlreqsetup</code>.</li>
+<li>Added <code>warichu_opening</code> and <code>warichu_closing</code>
+to <code>\jlreqsetup</code>.</li>
<li>Change a little bit penalties around block heading.</li>
-<li>Fixed a bug: <code>\selectfont</code> after <code>\DeclareFontShape</code> raised an error.</li>
+<li>Fixed a bug: <code>\selectfont</code> after
+<code>\DeclareFontShape</code> raised an error.</li>
<li>Fixed a bug: <code>use_reverse_pagination</code> did not work.</li>
<li>Fixed a bug: A second running head disappeared sometimes.</li>
<li>Rewrote <code>\DeclarePageStyle</code>.</li>
-<li>Deleted <code>\@makefntext</code>, define <code>\@makefntext</code> directly.</li>
+<li>Deleted <code>\@makefntext</code>, define <code>\@makefntext</code>
+directly.</li>
<li>Fixed other bugs.</li>
</ul></li>
<li>2022-04-11
@@ -672,7 +1244,8 @@
</ul></li>
<li>2022-11-28
<ul>
-<li>Fixed a bug: did not register to running head when <code>\SetBlockHeadingSpaces</code> is used.</li>
+<li>Fixed a bug: did not register to running head when
+<code>\SetBlockHeadingSpaces</code> is used.</li>
<li>Fixed a bug: wrong papersize for ISO C4.</li>
<li>Added a package <code>jlreq-complements</code></li>
<li>Fixed some other bugs and adjust with some other packages.</li>
@@ -683,14 +1256,17 @@
</ul></li>
<li>2023-06-19
<ul>
-<li>Stopped to load `everyhook' package LuaLaTeX (it was not compatible with the document).</li>
-<li>Fixed a bug: a space before `enumerate' environment was not inserted sometimes.</li>
+<li>Stopped to load `everyhook' package LuaLaTeX (it was not compatible
+with the document).</li>
+<li>Fixed a bug: a space before `enumerate' environment was not inserted
+sometimes.</li>
<li>Fixed a bug on <code>use_reverse_pagination</code>.</li>
</ul></li>
<li>2024-02-13
<ul>
<li>Added some <code>\par</code> (for hook system in LaTeX kernel)</li>
-<li>Added <code>tableofcontents_twocolumn</code> and <code>abstract_with_maketitle</code> to <code>\jlreqsetup</code>.</li>
+<li>Added <code>tableofcontents_twocolumn</code> and
+<code>abstract_with_maketitle</code> to <code>\jlreqsetup</code>.</li>
<li>Deleted <code>\PushPostHook</code>.</li>
<li>Some modifications of jfm.</li>
<li>Fixed a bug: heading command may have an infinite loop.</li>
@@ -702,9 +1278,27 @@
<ul>
<li>Fixed a bug.</li>
</ul></li>
+<li>2024-08-23
+<ul>
+<li>Fixed bugs.</li>
+<li>Changed the name of some internal variables.</li>
+<li>Added the usage of this class to English document.</li>
+<li>Use <code>\DeclareKeys</code> etc.</li>
+<li>Changed the internal processing of block headings a little.</li>
+</ul></li>
+<li>2024-09-26
+<ul>
+<li>Removed pattern matchings from Makefile.</li>
+</ul></li>
+<li>2024-10-04
+<ul>
+<li>Fixed: tfm files are mixed into the list of vf files in
+Makefile.</li>
+</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a
+href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
index fe98bc8adc5..ba326ac25f5 100644
--- a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
+++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/joinbox/README.md b/Master/texmf-dist/doc/latex/joinbox/README.md
index 4b3b04cae90..e0bbb25ce0e 100644
--- a/Master/texmf-dist/doc/latex/joinbox/README.md
+++ b/Master/texmf-dist/doc/latex/joinbox/README.md
@@ -35,7 +35,7 @@ joinbox ç›’å­æ‹¼æŽ¥å®åŒ…
Copyright and Licence
---------------------
- Copyright (C) 2020-2023 by Nan Geng <nangeng@nwafu.edu.cn>
+ Copyright (C) 2020-2024 by Nan Geng <nangeng@nwafu.edu.cn>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/joinbox/joinbox.pdf b/Master/texmf-dist/doc/latex/joinbox/joinbox.pdf
index 0e1fd270066..cbdbcacb813 100644
--- a/Master/texmf-dist/doc/latex/joinbox/joinbox.pdf
+++ b/Master/texmf-dist/doc/latex/joinbox/joinbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/joinbox/joinbox.tex b/Master/texmf-dist/doc/latex/joinbox/joinbox.tex
index 3c021e196db..3f6b64d4bcc 100644
--- a/Master/texmf-dist/doc/latex/joinbox/joinbox.tex
+++ b/Master/texmf-dist/doc/latex/joinbox/joinbox.tex
@@ -119,7 +119,7 @@
{ \__codedoc_cmd:no {#1} { #2 } }
\ExplSyntaxOff
-\def\vers{\texttt{v1.0.2}
+\def\vers{\texttt{v1.0.3}
\thanks{\url{https://gitee.com/nwafu_nan/joinbox}}
}
diff --git a/Master/texmf-dist/doc/latex/jsonparse/README.md b/Master/texmf-dist/doc/latex/jsonparse/README.md
index b65f7c03c34..fe146d1b99a 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/README.md
+++ b/Master/texmf-dist/doc/latex/jsonparse/README.md
@@ -1,4 +1,4 @@
-![Version 0.9.0](https://img.shields.io/badge/version-0.9.0-blue)
+![Version 0.9.2](https://img.shields.io/badge/version-0.9.2-blue)
![Jason, the JSON parsing horse](https://github.com/jasperhabicht/jsonparse/assets/6378801/ddfddc70-bf5f-4121-ba45-4b9128875d85)
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
index 4efe6dd3009..91059d19115 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
+++ b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
index 801970d4194..1f2259eae0b 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
+++ b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
@@ -11,8 +11,8 @@
% This work has the LPPL maintenance status `maintained'.
%
\documentclass[a4paper]{article}
-\def\jsonparsefileversion{0.9.0}
-\def\jsonparsefiledate{27 August 2024}
+\def\jsonparsefileversion{0.9.2}
+\def\jsonparsefiledate{2 October 2024}
\usepackage[T1]{fontenc}
\usepackage{Alegreya}
@@ -201,6 +201,7 @@
\changes{v0.8.6}{2024/05/09}{Bug fix in nesting function.}
\changes{v0.8.7}{2024/08/08}{Corrections in documentation, error messages.}
\changes{v0.9.0}{2024/08/27}{Adaption to updated verbatim tokenization.}
+\changes{v0.9.1}{2024/09/21}{Added functions to test for valid JSON numbers.}
\begin{document}
\vspace*{-1cm}
@@ -461,7 +462,14 @@ replace/|horizontal tab|={<string>}
These keys can be used to set the replacement text for the JSON escape sequences \macro{\b} (backspace), \macro{\f} (formfeed), \macro{\n} (linefeed), \macro{\r} (carriage return) and \macro{\t} (horizontal tab). The default replacement string is a space. Only strings can be used as replacement. These replacements take place only during typesetting.
These keys can be set using \macro{\JSONParseSet}. They can also be set locally as option to the commands \macro{\JSONParseValue}, \macro{\JSONParseArrayValues} and \macro{\JSONParseArrayValuesMap}.
+\begin{macrodef}
+|check num|
+|check num|={<boolean>}
+\end{macrodef}
+If set to \macro{false}, the key \macro{check num} omits an internal check of numerical expressions against the JSON specification for numbers. Turning off this feature can increase the parsing speed.
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
+
\subsection{L3 commands}
\begin{macrodef}
@@ -479,6 +487,14 @@ The command \macro{\jsonparse_parse_to_prop:Nn} creates the token variable given
\end{macrodef}
The command \macro{\jsonparse_parse_to_prop:Nn} processes the token variable given as the first arguments as property list and filters it according to the key given as second argument. Filtering means that for every entry in the property list, the key of this entry is compared against the key given to the command. If the key in the property list starts with the given key, the matching part is removed from the key in the property list. If the keys do not match, the entry is completely removed from the property list.
+\begin{macrodef}
+|\jsonparse_if_num:nTF| {<string>} {<true code>} {<false code>}
+|\jsonparse_if_num:nT| {<string>} {<true code>}
+|\jsonparse_if_num:nF| {<string>} {<false code>}
+|\jsonparse_if_num_p:n| {<string>}
+\end{macrodef}
+The command \macro{\jsonparse_if_num:nTF} checks whether a string is a valid JSON number according the relevant specification. It executes the true code if the string is a valid JSON number and the false code if not. The variants \macro{\jsonparse_if_num:nT} and \macro{\jsonparse_if_num:nF} work accordingly. The command \macro{\jsonparse_if_num_p:n} returns a boolean true or false.
+
% =====
\printchanges
diff --git a/Master/texmf-dist/doc/latex/jupynotex/README.md b/Master/texmf-dist/doc/latex/jupynotex/README.md
index d19b75542c4..1a26ad22e4a 100644
--- a/Master/texmf-dist/doc/latex/jupynotex/README.md
+++ b/Master/texmf-dist/doc/latex/jupynotex/README.md
@@ -13,15 +13,15 @@ It will convert the Jupyter Notebook format to proper LaTeX so it gets included
All you need to do is include the `jupynotex.py` and `jupynotex.sty` files in your LaTeX project, and use the package from your any of your `.tex` files:
- \usepackage{jupynotex}
+ `\usepackage{jupynotex}`
After that, you can include a whole Jupyter Notebook in your file just specifying it's file name:
- \jupynotex{file_name_for_your_notebook.ipynb}
+ `\jupynotex{file_name_for_your_notebook.ipynb}`
If you do not want to include it completely, you can optionally specify which cells:
- \jupynotex[<which cells>]{sample.ipynb}
+ `\jupynotex[<which cells>]{sample.ipynb}`
The cells specification can be numbers separated by comma, or ranges using dashes (defaulting to first and last if any side is not included).
@@ -48,18 +48,69 @@ Examples:
`\jupynotex[3,12-]{somenote.ipynb}`
+## Configurations available
+
+The whole package can be configured when included in your project:
+
+ \usepackage[OPTIONS]{jupynotex}
+
+Global options available:
+
+- `output-text-limit=N` where N is a number; it will wrap all outputs that exceed that quantity of columns
+
+Also, each cell(s) can be configured when included in your .tex files:
+
+ `\jupynotex[3, OPTIONS]{yournotebook.ipynb}`
+
+Cell options available:
+
+- `output-image-size=SIZE` where SIZE is a valid .tex size (a number with an unit, e.g. `70mm`); it will set any image in the output of those cells to the indicated size
+
+
## Full Example
Check the `example` directory in this project.
-There you will find an example `notebook.ipynb`, an `example.tex` file that includes cells from that notebook in different ways, and a `build` script.
+There you will find different notebook examples and `.tex` files using them. Also there's a build script to easily run on any of the examples, like:
+
+ ./build cell_ranges.tex
Play with it. Enjoy.
+# Supported cell types
+
+Jupyter has several types of cells, `jupynotex` supports most of those. If you find one that is not supported, please open an issue with an example.
+
+In any case, only the "code" cells are included when processing a notebook (no markdown titles, for example, to make it easy for the developer to find the numbers of cells to include).
+
+Supported cell types in the output:
+
+- `execute_result`: this may have multiple types of information inside; if an image is present, it will be included, otherwise if a latex output is present it will included (directly, so the latex is really parsed later by the LaTeX system, else the plain text will be included (verbatim).
+
+- `stream`: the different text lines will be included (verbatim)
+ result.extend(_verbatimize(x.rstrip() for x in item["text"]))
+
+- `display_data`: the image will be included
+
+- `error`: in this case the Traceback will be parsed, sanitized and included in the output keeping its structure (verbatim)
+
+Two type of images are currently supported (for the case in `execute_result` or `display_data` cell type:
+
+- PNG: used directly
+
+- SVG: converted to PDF (need to have `inkscape` present in the system) and included that
+
+
# Dependencies
-You need Python 3 in your system, and the [tcolorbox](https://ctan.org/pkg/tcolorbox) module in your LaTeX toolbox.
+You need Python 3 in your system, and the following modules in your LaTeX toolbox:
+
+- [tcolorbox](https://ctan.org/pkg/tcolorbox)
+
+- [minted](https://www.ctan.org/pkg/minted)
+
+To support SVG images in the notebook, [inkscape](https://inkscape.org/) needs to be installed and in the system's PATH.
# Feedback & Development
diff --git a/Master/texmf-dist/doc/latex/jupynotex/example/build b/Master/texmf-dist/doc/latex/jupynotex/example/build
deleted file mode 100755
index 51598c0450f..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/example/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-ln -s ../jupynotex.py .
-ln -s ../jupynotex.sty .
-xelatex -shell-escape example.tex
diff --git a/Master/texmf-dist/doc/latex/jupynotex/example/example.tex b/Master/texmf-dist/doc/latex/jupynotex/example/example.tex
deleted file mode 100644
index 5251586b63d..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/example/example.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-\documentclass{article}
-
-\usepackage{jupynotex}
-
-\begin{document}
-
-One cell:
-
-\jupynotex[1]{notebook.ipynb}
-
-
-A range of cells:
-
-\jupynotex[4-6]{notebook.ipynb}
-
-
-Some specific cells:
-
-\jupynotex[12,17]{notebook.ipynb}
-
-
-The whole notebook:
-
-\jupynotex{notebook.ipynb}
-
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/jupynotex/example/notebook.ipynb b/Master/texmf-dist/doc/latex/jupynotex/example/notebook.ipynb
deleted file mode 100644
index a423e9a11fa..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/example/notebook.ipynb
+++ /dev/null
@@ -1,593 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "code",
- "execution_count": 1,
- "metadata": {
- "scrolled": true
- },
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Non alphanums {'>', '\\t', '[', '\\r', '\\x13', '\\x1d', '<', '^', '\\x04', '\\x08', '\\x17', '\\x1b', '\\\\', '\\x19', '`', '\\x1f', '$', '\\x0b', '\\x14', '\\x12', '\\x18', ')', '=', '?', ' ', \"'\", '\\x1c', '|', ';', '/', '\\x1e', '\\n', '\\x07', '\\x10', '\\x03', '\\x02', '#', '\\x0c', '@', '\\x16', '_', '}', '.', '-', '(', '!', '+', '\\x06', ']', '{', ':', '\\x01', '\\x11', '\\x0f', '\\x05', ',', '~', '\\x15', '\\x00', '\"', '%', '\\x0e', '*', '&', '\\x1a'}\n",
- "Separators b'([\\\\>\\\\\\t\\\\[\\\\\\r\\\\\\x13\\\\\\x1d\\\\<\\\\^\\\\\\x04\\\\\\x08\\\\\\x17\\\\\\x1b\\\\\\\\\\\\\\x19\\\\`\\\\\\x1f\\\\$\\\\\\x0b\\\\\\x14\\\\\\x12\\\\\\x18\\\\)\\\\=\\\\?\\\\ \\\\\\'\\\\\\x1c\\\\|\\\\;\\\\/\\\\\\x1e\\\\\\n\\\\\\x07\\\\\\x10\\\\\\x03\\\\\\x02\\\\#\\\\\\x0c\\\\@\\\\\\x16\\\\_\\\\}\\\\.\\\\-\\\\(\\\\!\\\\+\\\\\\x06\\\\]\\\\{\\\\:\\\\\\x01\\\\\\x11\\\\\\x0f\\\\\\x05\\\\,\\\\~\\\\\\x15\\\\\\x00\\\\\"\\\\%\\\\\\x0e\\\\*\\\\&\\\\\\x1a])'\n"
- ]
- }
- ],
- "source": [
- "import string\n",
- "\n",
- "non_alphanums = set(chr(x) for x in range(127)) - set(string.ascii_letters) - set(string.digits)\n",
- "print(\"Non alphanums\", non_alphanums)\n",
- "separators = '([' + ''.join('\\\\' + x for x in non_alphanums) + '])'\n",
- "separators = separators.encode('ascii')\n",
- "print(\"Separators\", separators)\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 2,
- "metadata": {},
- "outputs": [
- {
- "data": {
- "text/plain": [
- "[b'dlg',\n",
- " b'=',\n",
- " b'Resource',\n",
- " b'.',\n",
- " b'loadfromresfile',\n",
- " b'(',\n",
- " b'filename',\n",
- " b',',\n",
- " b'win',\n",
- " b',',\n",
- " b'QuoteDialog',\n",
- " b'.',\n",
- " b'MyQuoteDialog',\n",
- " b',',\n",
- " b\"'\",\n",
- " b'QuoteDialog',\n",
- " b\"'\",\n",
- " b',',\n",
- " b'win',\n",
- " b')']"
- ]
- },
- "execution_count": 2,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "import re\n",
- "program_line = b\"\"\"dlg = Resource.loadfromresfile(filename, win, QuoteDialog.MyQuoteDialog, 'QuoteDialog', win)\"\"\"\n",
- "tokens = [t for x in re.split(separators, program_line) if (t := x.strip())]\n",
- "tokens"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 3,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Checking base dir: HTML document\n",
- "Checking base dir: C source\n",
- "Checking base dir: C++ source\n",
- "Checking base dir: PHP script\n",
- "Checking base dir: ReStructuredText file\n",
- "Checking base dir: Python script\n",
- "Checking base dir: Ruby script\n",
- "Checking base dir: Java source\n",
- "Checking base dir: Objective-C source\n",
- "Checking base dir: Perl5 module source\n",
- "Checking base dir: XML 1.0 document\n"
- ]
- }
- ],
- "source": [
- "import os\n",
- "from collections import Counter\n",
- "\n",
- "DUMP_BASE = '/home/facundo/devel/ml/dump'\n",
- "\n",
- "# directories with 1000 files of each code type, excluding \"just text\" (ascii, utf8, etc)\n",
- "CODE_TYPES = [\n",
- " 'HTML document',\n",
- " 'C source',\n",
- " 'C++ source',\n",
- " 'PHP script',\n",
- " 'ReStructuredText file',\n",
- " 'Python script',\n",
- " 'Ruby script',\n",
- " 'Java source',\n",
- " 'Objective-C source',\n",
- " 'Perl5 module source',\n",
- " 'XML 1.0 document',\n",
- "]\n",
- "\n",
- "# let's collect ALL tokens present in all the program files\n",
- "tokens = Counter()\n",
- "for basedir in CODE_TYPES:\n",
- " print(\"Checking base dir:\", basedir)\n",
- " for dirpath, dirnames, filenames in os.walk(os.path.join(DUMP_BASE, basedir)):\n",
- " for fname in filenames:\n",
- " fpath = os.path.join(dirpath, fname)\n",
- " with open(fpath, 'rb') as fh:\n",
- " tokens.update(t for x in re.split(separators, fh.read()) if (t := x.strip()))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 4,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Total different tokens 213400\n",
- " 870525 b'.'\n",
- " 756849 b'_'\n",
- " 730609 b'('\n",
- " 717433 b'='\n",
- " 699725 b')'\n",
- " 688556 b'/'\n",
- " 661461 b'\"'\n",
- " 640989 b','\n",
- " 625121 b'-'\n",
- " 594091 b'>'\n"
- ]
- }
- ],
- "source": [
- "different_tokens = len(tokens)\n",
- "print(\"Total different tokens\", different_tokens)\n",
- "for name, quant in tokens.most_common(10):\n",
- " print(\"{:8d} {}\".format(quant, name))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 5,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Total tokens found: 20101050\n",
- "Total representative: 3324\n",
- "Last ten...\n",
- " 289 b'enables'\n",
- " 289 b'smaller'\n",
- " 289 b'Creates'\n",
- " 289 b'cross'\n",
- " 289 b'GLFW'\n",
- " 289 b'Os'\n",
- " 289 b'usb'\n",
- " 288 b'stylesheets'\n",
- " 288 b'ad'\n",
- " 288 b'WIDTH'\n"
- ]
- }
- ],
- "source": [
- "import numpy as np\n",
- "\n",
- "total_tokens = sum(tokens.values())\n",
- "print(\"Total tokens found:\", total_tokens)\n",
- "\n",
- "most = total_tokens * 0.9\n",
- "tot = 0\n",
- "representative_data = []\n",
- "for name, quant in tokens.most_common():\n",
- " representative_data.append((name, quant))\n",
- " tot += quant\n",
- " if tot > most:\n",
- " break\n",
- "\n",
- "print(\"Total representative:\", len(representative_data))\n",
- "print(\"Last ten...\")\n",
- "for name, quant in representative_data[-10:]:\n",
- " print(\"{:8d} {}\".format(quant, name))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 6,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Collecting data from base dir HTML document\n",
- "Collecting data from base dir C source\n",
- "Collecting data from base dir C++ source\n",
- "Collecting data from base dir PHP script\n",
- "Collecting data from base dir ReStructuredText file\n",
- "Collecting data from base dir Python script\n",
- "Collecting data from base dir Ruby script\n",
- "Collecting data from base dir Java source\n",
- "Collecting data from base dir Objective-C source\n",
- "Collecting data from base dir Perl5 module source\n",
- "Collecting data from base dir XML 1.0 document\n",
- "Src data samples: 11000\n"
- ]
- }
- ],
- "source": [
- "import random\n",
- "\n",
- "# real \"ML data\": a list of (code_type, features) (one pair for each file)\n",
- "# code_type: the *position* of the code type corresponding to the file (needs to be an int)\n",
- "# features: a list of values, each value corresponds to how many of the tokens of that position the file has\n",
- "\n",
- "representative_tokens = [name for name, _ in representative_data]\n",
- "\n",
- "all_src_data = []\n",
- "for idx, basedir in enumerate(CODE_TYPES):\n",
- " print(\"Collecting data from base dir\", basedir)\n",
- " for dirpath, dirnames, filenames in os.walk(os.path.join(DUMP_BASE, basedir)):\n",
- " for fname in filenames:\n",
- " fpath = os.path.join(dirpath, fname)\n",
- " with open(fpath, 'rb') as fh:\n",
- " fcontent = fh.read()\n",
- " \n",
- " file_tokens = Counter(t for x in re.split(separators, fcontent) if (t := x.strip()))\n",
- " token_quantities = [file_tokens.get(t, 0) for t in representative_tokens]\n",
- "\n",
- " all_src_data.append((idx, token_quantities))\n",
- "\n",
- "print(\"Src data samples:\", len(all_src_data))\n",
- "\n",
- "# shuffle, as currently is too much \"per directory\"\n",
- "random.shuffle(all_src_data)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 7,
- "metadata": {},
- "outputs": [],
- "source": [
- "import tensorflow as tf\n",
- "from tensorflow.keras import Model, layers\n",
- "import numpy as np\n",
- "\n",
- "# representation of our model\n",
- "num_classes = len(CODE_TYPES)\n",
- "num_features = len(representative_tokens)\n",
- "\n",
- "# 1st and 2nd layer number of neurons (these numbers are just chamuyo)\n",
- "n_hidden_1 = 128 \n",
- "n_hidden_2 = 256\n",
- "\n",
- "# training parameters (more chamuyo)\n",
- "learning_rate = 0.1\n",
- "\n",
- "batch_size = 256\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 8,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Example code types: (2, 0, 4, 4, 5)\n",
- "Example token quants: [246, 786, 246, 61, 246] [32, 32, 5, 22, 5]\n",
- "Token quants shape: (11000, 3324)\n",
- "Example normalized quants: [0.3129771 1. 0.3129771 0.07760815 0.3129771 ] [0.9411765 0.9411765 0.14705883 0.64705884 0.14705883]\n"
- ]
- }
- ],
- "source": [
- "# separate the source data and into two pairing lists\n",
- "code_types, token_quantities = zip(*all_src_data)\n",
- "print(\"Example code types:\", code_types[:5])\n",
- "print(\"Example token quants:\", token_quantities[0][:5], token_quantities[117][:5])\n",
- "\n",
- "# convert features to float\n",
- "float_quantities = np.array(token_quantities, np.float32)\n",
- "print(\"Token quants shape:\", float_quantities.shape)\n",
- "\n",
- "# normalize EACH ONE to [0, 1]\n",
- "for quants in float_quantities:\n",
- " quants /= max(quants)\n",
- "print(\"Example normalized quants:\", float_quantities[0][:5], float_quantities[117][:5])"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 9,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Real training set: 89.70%\n"
- ]
- }
- ],
- "source": [
- "# let's prepare the teching sets, input and output for training first (90% of cases) and\n",
- "# then testing what's learned (the remaining 10%); \n",
- "input_training = []\n",
- "output_training = []\n",
- "input_testing = []\n",
- "output_testing = []\n",
- "for token_distribution, code_type in zip(float_quantities, code_types):\n",
- " if random.random() < .1:\n",
- " input_testing.append(token_distribution)\n",
- " output_testing.append(code_type)\n",
- " else:\n",
- " input_training.append(token_distribution)\n",
- " output_training.append(code_type)\n",
- "print(\"Real training set: {:.2f}%\".format(100 * len(input_training) / len(float_quantities))) "
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 10,
- "metadata": {},
- "outputs": [],
- "source": [
- "import tensorflow as tf\n",
- "from tensorflow.keras import Model\n",
- "\n",
- "class NeuralNet(Model):\n",
- " \"\"\"Chamuyo al cuadrado.\"\"\"\n",
- " \n",
- " def __init__(self):\n",
- " super(NeuralNet, self).__init__()\n",
- " self.fc1 = layers.Dense(n_hidden_1, activation=tf.nn.sigmoid) # se puede cambiar a relu\n",
- " self.fc2 = layers.Dense(n_hidden_2, activation=tf.nn.sigmoid) # se puede cambiar a relu\n",
- " self.out = layers.Dense(num_classes)\n",
- "\n",
- " def call(self, x, is_training=False):\n",
- " x = self.fc1(x)\n",
- " x = self.fc2(x)\n",
- " x = self.out(x)\n",
- " if not is_training:\n",
- " # tf cross entropy expect logits without softmax, so only\n",
- " # apply softmax when not training.\n",
- " x = tf.nn.softmax(x)\n",
- " return x\n",
- "\n",
- "neural_net = NeuralNet()"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 11,
- "metadata": {},
- "outputs": [],
- "source": [
- "# Note that this will apply 'softmax' to the logits.\n",
- "def cross_entropy_loss(x, y):\n",
- " # Convert labels to int 64 for tf cross-entropy function.\n",
- " y = tf.cast(y, tf.int64)\n",
- " # Apply softmax to logits and compute cross-entropy.\n",
- " loss = tf.nn.sparse_softmax_cross_entropy_with_logits(labels=y, logits=x)\n",
- " # Average loss across the batch.\n",
- " return tf.reduce_mean(loss)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 12,
- "metadata": {},
- "outputs": [],
- "source": [
- "# Stochastic gradient descent optimizer.\n",
- "optimizer = tf.optimizers.SGD(learning_rate)\n",
- "\n",
- "# Optimización. \n",
- "def run_optimization(x, y):\n",
- " # Funciones para calcular el gradiente\n",
- " with tf.GradientTape() as g:\n",
- " # Algoritmo de forward\n",
- " pred = neural_net(x, is_training=True)\n",
- " # Computa la función de costo o pérdida utilizando entropía cruzada\n",
- " loss = cross_entropy_loss(pred, y)\n",
- " \n",
- " # Actualiza las variables de entrenamiento.\n",
- " trainable_variables = neural_net.trainable_variables\n",
- "\n",
- " # Computa los gradientes\n",
- " gradients = g.gradient(loss, trainable_variables)\n",
- " \n",
- " # Actualiza los nuevos parámetros W (pesos) y b (bias).\n",
- " optimizer.apply_gradients(zip(gradients, trainable_variables))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 13,
- "metadata": {},
- "outputs": [],
- "source": [
- "# Accuracy metric.\n",
- "def accuracy(y_pred, y_true):\n",
- " # Predicted class is the index of highest score in prediction vector (i.e. argmax).\n",
- " correct_prediction = tf.equal(tf.argmax(y_pred, 1), tf.cast(y_true, tf.int64))\n",
- " return tf.reduce_mean(tf.cast(correct_prediction, tf.float32), axis=-1)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 14,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Step 100: loss=2.379924, accuracy=0.125000\n",
- "Step 200: loss=2.372284, accuracy=0.128906\n",
- "Step 300: loss=2.366430, accuracy=0.140625\n",
- "Step 400: loss=2.360768, accuracy=0.121094\n",
- "Step 500: loss=2.347394, accuracy=0.109375\n",
- "Step 600: loss=2.349795, accuracy=0.199219\n",
- "Step 700: loss=2.312950, accuracy=0.218750\n",
- "Step 800: loss=2.284508, accuracy=0.289062\n",
- "Step 900: loss=2.173395, accuracy=0.335938\n",
- "Step 1000: loss=2.115966, accuracy=0.300781\n",
- "Step 1100: loss=1.977837, accuracy=0.441406\n",
- "Step 1200: loss=1.860783, accuracy=0.425781\n",
- "Step 1300: loss=1.866206, accuracy=0.425781\n",
- "Step 1400: loss=1.773057, accuracy=0.402344\n",
- "Step 1500: loss=1.736271, accuracy=0.546875\n",
- "Step 1600: loss=1.626320, accuracy=0.578125\n",
- "Step 1700: loss=1.537970, accuracy=0.539062\n",
- "Step 1800: loss=1.369012, accuracy=0.609375\n",
- "Step 1900: loss=1.286771, accuracy=0.625000\n",
- "Step 2000: loss=1.270916, accuracy=0.640625\n"
- ]
- }
- ],
- "source": [
- "train_data = tf.data.Dataset.from_tensor_slices((input_training, output_training))\n",
- "\n",
- "# NOTE: this doesn't only selectes, it completely transform the structures\n",
- "# from <TensorSliceDataset shapes: ((3324,), ()), types: (tf.float32, tf.int32)>\n",
- "# to <PrefetchDataset shapes: ((None, 3324), (None,)), types: (tf.float32, tf.int32)>\n",
- "train_data = train_data.repeat().shuffle(5000).batch(batch_size).prefetch(1)\n",
- "\n",
- "display_step = 100\n",
- "training_steps = 2000\n",
- "\n",
- "# Run training for the given number of steps.\n",
- "for step, (input_batch, output_batch) in enumerate(train_data.take(training_steps), 1):\n",
- " # Run the optimization to update W and b values.\n",
- " run_optimization(input_batch, output_batch)\n",
- " \n",
- " if step % display_step == 0:\n",
- " pred = neural_net(input_batch, is_training=True)\n",
- " loss = cross_entropy_loss(pred, output_batch)\n",
- " acc = accuracy(pred, output_batch)\n",
- " print(\"Step {}: loss={:f}, accuracy={:f}\".format(step, loss, acc))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 15,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Test Accuracy: 0.578994\n"
- ]
- }
- ],
- "source": [
- "# Test model on validation set\n",
- "input_testing = np.array(input_testing)\n",
- "pred = neural_net(input_testing, is_training=False)\n",
- "print(\"Test Accuracy: {:f}\".format(accuracy(pred, output_testing)))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 18,
- "metadata": {},
- "outputs": [],
- "source": [
- "# If we consider the \"more probable\" prediction on each item, how well it goes?\n",
- "all_guesses = neural_net(input_testing, is_training=False)\n",
- "guesses_ok = [0] * len(CODE_TYPES)\n",
- "guesses_bad = [0] * len(CODE_TYPES)\n",
- "\n",
- "for guess, real in zip(all_guesses, output_testing):\n",
- " # guess is an array of len(CODE_TYPES) with a float in each position showing\n",
- " # which one is the most probable to be real, so we need to get position \n",
- " # for the max one and check if it matches with the real real :)\n",
- " position_for_max = np.where(guess == np.amax(guess))[0][0]\n",
- " if position_for_max == real:\n",
- " guesses_ok[real] += 1\n",
- " else:\n",
- " guesses_bad[real] += 1"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 19,
- "metadata": {},
- "outputs": [
- {
- "data": {
- "image/png": "iVBORw0KGgoAAAANSUhEUgAAAYUAAAFmCAYAAACC84ZkAAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjMuMSwgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy/d3fzzAAAACXBIWXMAAAsTAAALEwEAmpwYAABBB0lEQVR4nO3debyc4/3/8dc7mwSJWPJNEZHUEiUbkqC2iLWqltb6pYKiliLftrZuWt+26LdVxY9GLaGUoLbqYkkT+5KECEFsDUIQscUSJD6/P65r5txnMnPOnGSue87yeT4e8zhz3/fM/bnuOTNzzbXLzHDOOecAOtU7Ac4551oPzxScc84VeabgnHOuyDMF55xzRZ4pOOecK/JMwTnnXJFnCq4RSQdLurPe6XCBpG0lzc4p1hxJOyU6dw9JD0jarYnHjJY0N7M9S9LoFOlxlXmm0M5JmiLpXUkrVPN4M7vGzHZZjngTJP1yWZ/f0UkySesXts3sPjMbVM801ch44Hdm9q9qn2Bmm5jZlHRJcuV4ptCOSRoAbAsYsGcO8TqnjtFeSOpS7zTkycwONbOb6p0O1zzPFNq3Q4GHgQnA2OwBSetIuknSfEkLJF0Y9x8m6f7M4zaSdJekdyTNlrR/5tgESRdL+oekj4DvAAcDp0j6UNLf4uO+Ekss78UqgT0z59hd0tOSFkp6TdIPy12IpE6SfiLpZUlvSbpK0ioVHjta0lxJP4iPnSfp8MzxVeLz58fz/URSVZ+FeB1nSXpU0geSbpW0Wub4nvEa34uP/Urm2BxJp0qaCXxUmjFIujfefSK+fgeUqVKZI+n0+Jq9K+kKSd0zx4+S9EL8f90maa0mruXb8foXSPpxybFOkk6T9GI8fn32Osucay9JM+Jr8mKhmkjSWjEd78R0HZV5To/4HnpX0tPAyJJzFquz4mOvjI99RtIpJa9LxfeYayEz81s7vQEvAMcBmwOfA33j/s7AE8DvgZWA7sA28dhhwP3x/krAq8DhQBdgU+BtYON4fALwPrA14QdG97jvl5k0dI3p+BHQDRgDLAQGxePzgG3j/VWBzSpcyxHxPF8GVgZuAv5c4bGjgcXAmTH+7sDHwKrx+FXArUBPYADwHPCdKl/TKcBrwOD4+vwVuDoe2xD4CNg5xj0lprlbPD4HmAGsA/SocH4D1i+5lrmZ7TnAU/EcqwEPFF7v+Nq+DWwGrABcANxbIc7GwIfAdvGx58bXbKd4/CTCD4p+8fh44NoK5xoV3wc7x/fB2sBG8di9wEXxvTEcmA+MicfOBu6L17FOvK7Sa90p89h74nukHzCz8FiaeY/5rYXfG/VOgN8S/WNhG0JGsEbcfhb4n3h/q/jh7FLmeYfRkCkcANxXcnw8cEa8PwG4quT4BBpnCtsCbwCdMvuuBX4e778CfBfo1cz1TAKOy2wPitdX7hpGA59kjwFvAVsSMsTPiBlbPPZdYEqVr+sU4OzM9sbxfJ2BnwLXZ451ImQgo+P2HOCIZs5fTaZwTGZ7d+DFeP8y4DeZYyvH12hAmTg/A67LbK8Ur6PwJfwMsGPm+JpNvN7jgd+X2b8OsATomdl3FjAh3n8J2C1z7Ogy17pT5rG7Zo4dSUOm0OR7zG8tu3n1Ufs1FrjTzN6O23+hoQppHeBlM1vczDnWBbaIRfL3JL1HqB76UuYxrzZzjrWAV83si8y+lwm/JgG+Rfhie1nSPZK2auI8L5ecowvQt8LjF5Rc38eEL8k1CL8sS8+1NtXLXvPL8XxrlKYxXvOrJedu7vValviFKqLS+B8CCyh/bWtlz2NmH8XHFqwL3Jz5vz9D+IIv93qvA7xYIcY7ZrawJL1rZ46XXkslpY99tfRYE+8x1wIdqrGro5DUA9gf6Czpjbh7BaC3pGGED1R/SV2ayRheBe4xs52beEzpNLul268D60jqlPnQ9idU2WBmU4G9JHUFvgdcT/iSKfU64YuqoD+huuPNJtJWztuEX7zrAk9nzvVaC86RTV//eL63YxqHFA5IUnxs9ty1mJa4NP7r8X6j10jSSsDqlL+2eUC2vWPF+NiCVwmlmgeqSM+rwHpl9r8OrCapZyZjyL7W8+K1zMocq2Qeodqo8D/LvgZNvsdcy3hJoX3am/CrbmNCPe5wwhfAfYTG50cJH7KzJa0kqbukrcuc53Zgw9gg2TXeRmYbT8t4k1DvX/AI4Vf6KfH5o4FvANdJ6qYwLmIVM/sc+AD4ovSE0bXA/0gaKGll4NfAxCpKO42Y2RJCxvMrST0lrQt8H7gaQo8thW6hA5o4zSGSNo5fpGcCN2bO+3VJO8ZM7gfAp8CDLUhi6etXzvGS+sWG3x8DE+P+a4HDJQ1X6IL8a+ARM5tT5hw3AntI2kZSt3gd2e+DPxJeo3UBJPWRtFeF9FwW4+4YG6jXlrSRmb1KuPaz4ntsKKEzwtXxedcDp0taVVI/4IQmrjn72LUJPyAKKr7Hmjifq6Te9Vd+q/0N+BehT3jp/v0Jda9dCL+kbiFUGbwNnB8fcxixTSFuDwL+TmiDWAD8Gxgej00g034Q921AaEx9D7gl7tuE0Ej4PuGX3j5xf7eY1ncJGcJUYoN3mbR3ItSDvxrTcjWx4bjMY0eTqZuO++bQUD+9anz+/Hi+nxHrown103OArhXOPYVQL/5oTPPfiO028fg+8Rrfj9e8Sbk0NPG/O4aQYb8X/1+NriWe4/QY4z3gSmDFkue/CLxDyNT7NRFrLKFNZwEhc8m+Rp0ImeVsQqPti8CvmzjXPoTG34WERt9d4/5+MR3vxHNk20NWJDT6vxev5+Qy11pIz0rAn+NjnwF+QmxLaeo95reW3xRfUOccIOknwHwzG1/h+BRCb6NLc01YQ/w5wJFmdnc94rcWko4FDjSz7eudlvbG2xScyzAzH43dCklak1Ct9hChNPoD4MK6Jqqd8kzBOdcWdCN0fR1IqEK6jjD+wdWYVx8555wr8t5Hzjnnitp89dEaa6xhAwYMqHcynHOuTZk+ffrbZtandH+bzxQGDBjAtGnT6p0M55xrUySVHUHu1UfOOeeKPFNwzjlX5JmCc865ojbfpuA6ls8//5y5c+eyaNGieiel3ejevTv9+vWja9eu9U6KawU8U3Btyty5c+nZsycDBgwgTELqloeZsWDBAubOncvAgQPrnRzXCnj1kWtTFi1axOqrr+4ZQo1IYvXVV/eSlytKmilIulxhjdynMvv+T9KzkmZKullS78yx0+M6rrMl7Zoyba7t8gyhtvz1dFmpSwoTgN1K9t0FDDazoYRFME4HkLQxcCBhCtzdgIskdU6cPueccxlJ2xTM7N7SxUrM7M7M5sPAvvH+XoQ1Yz8F/iPpBcKC4A+lTKNr2wac9veanm/O2V+v6nFvvPEG48aNY+rUqfTu3Zu+ffty3nnnseGGG9Y0PeVMmDCBXXbZhbXWWqv5BzvXQvVuaD6ChlWj1iZkEgVzqbDGqqSjCYt8079/Uyv4OVd7ZsY+++zD2LFjue66sLjXE088wZtvvtlsprB48WK6dOlScbsaEyZMYPDgwe0jU/j5KgnP/X66c7djdWtolvRjwhq717T0uWZ2iZmNMLMRffosNXWHc0lNnjyZrl27cswxxxT3DRs2jG222YaTTz6ZwYMHM2TIECZODL93pkyZwrbbbsuee+7JxhtvvNT2kiVLOPnkkxk5ciRDhw5l/PiG9X3OOecchgwZwrBhwzjttNO48cYbmTZtGgcffDDDhw/nk08+YdKkSWy66aYMGTKEI444gk8//TT318S1H3UpKUg6DNgD2NEa5u5+jcaLcfejZYupO5eLp556is0333yp/TfddBMzZszgiSee4O2332bkyJFst912ADz22GM89dRTDBw4kClTpjTavuSSS1hllVWYOnUqn376KVtvvTW77LILzz77LLfeeiuPPPIIK664Iu+88w6rrbYaF154Ib/97W8ZMWIEixYt4rDDDmPSpElsuOGGHHrooVx88cWMGzcu51fFtRe5lxQk7QacAuxpZh9nDt0GHChpBUkDCasrPZp3+pxbVvfffz8HHXQQnTt3pm/fvmy//fZMnToVgFGjRjUaB5DdvvPOO7nqqqsYPnw4W2yxBQsWLOD555/n7rvv5vDDD2fFFVcEYLXVVlsq5uzZsxk4cGCx2mrs2LHce++9qS/VtWNJSwqSriUsPL6GpLnAGYTeRisAd8WucA+b2TFmNkvS9YRFtxcDx5vZkpTpc25ZbLLJJtx4440tes5KK61UcdvMuOCCC9h118a9sO+4445lT6RzyyhpScHMDjKzNc2sq5n1M7PLzGx9M1vHzIbH2zGZx//KzNYzs0Fm9s+UaXNuWY0ZM4ZPP/2USy65pLhv5syZ9O7dm4kTJ7JkyRLmz5/Pvffey6hRo5o936677srFF1/M559/DsBzzz3HRx99xM4778wVV1zBxx+HAvU777wDQM+ePVm4cCEAgwYNYs6cObzwwgsA/PnPf2b77X0te7fs6t37yLnlUm0X0lqSxM0338y4ceM455xz6N69OwMGDOC8887jww8/ZNiwYUjiN7/5DV/60pd49tlnmzzfkUceyZw5c9hss80wM/r06cMtt9zCbrvtxowZMxgxYgTdunVj991359e//jWHHXYYxxxzDD169OChhx7iiiuuYL/99mPx4sWMHDmyUQO4cy3V5tdoHjFihPkiOx3HM888w1e+8pV6J6Pdqdvr6l1S60bSdDMbUbq/Y5cUUr0h/c3onGujfEI855xzRZ4pOOecK/JMwTnnXJFnCs4554o8U3DOOVfUsXsfubav1j3Iqug5tvLKK/Phhx/WNm4NnXfeeRx99NHF6TGcawkvKTjXiixevLjJ7Wqcd955xVHQzrWUZwrOLaMpU6YwevRo9t13XzbaaCMOPvhgCoNBp06dyle/+lWGDRvGqFGjWLhwIYsWLeLwww9nyJAhbLrppkyePBkI6yPsueeejBkzhh133HGp7Y8++ogjjjiCUaNGsemmm3LrrbcCsGTJEn74wx8yePBghg4dygUXXMD555/P66+/zg477MAOO+wAwLXXXsuQIUMYPHgwp556an1eLNdmePWRc8vh8ccfZ9asWay11lpsvfXWPPDAA4waNYoDDjiAiRMnMnLkSD744AN69OjBH/7wByTx5JNP8uyzz7LLLrvw3HPPAWFq7ZkzZ7LaaqsxYcKERts/+tGPGDNmDJdffjnvvfceo0aNYqedduKqq65izpw5zJgxgy5duhSn1j733HOZPHkya6yxBq+//jqnnnoq06dPZ9VVV2WXXXbhlltuYe+9967vC+daLS8pOLccRo0aRb9+/ejUqRPDhw9nzpw5zJ49mzXXXJORI0cC0KtXL7p06cL999/PIYccAsBGG23EuuuuW8wUdt5550ZTY2e377zzTs4++2yGDx/O6NGjWbRoEa+88gp333033/3ud4srt5WbWnvq1KmMHj2aPn360KVLFw4++GCfWts1yUsKzi2HFVZYoXi/c+fOy9QGAM1Prf3Xv/6VQYMGLVsinWsBLyk4V2ODBg1i3rx5xQV2Fi5cyOLFi9l222255pqw+uxzzz3HK6+8UtUX/a677soFF1xQbK94/PHHgVCaGD9+fDEjKje19qhRo7jnnnt4++23WbJkCddee61Pre2a5CUF17a1wskHu3XrxsSJEznhhBP45JNP6NGjB3fffTfHHXccxx57LEOGDKFLly5MmDChUUmjkp/+9KeMGzeOoUOH8sUXXzBw4EBuv/12jjzySJ577jmGDh1K165dOeqoo/je977H0UcfzW677cZaa63F5MmTOfvss9lhhx0wM77+9a+z11575fAquLaqY0+d7bOktjk+dXYaPnV2x1Np6myvPnLOOVfk1UeudvxXn3NtnpcUXJvT1qs8Wxt/PV2WZwquTenevTsLFizwL7IaMTMWLFhA9+7d650U10p49ZFrU/r168fcuXOZP39+vZPSbnTv3p1+/frVOxntVxvr0OKZgmtTunbtysCBA+udDOfaLa8+cs45V+SZgnPOuaKk1UeSLgf2AN4ys8Fx32rARGAAMAfY38zelSTgD8DuwMfAYWb2WMr05c67bLrWzt+jHV7qksIEYLeSfacBk8xsA2BS3Ab4GrBBvB0NXJw4bc4550okzRTM7F7gnZLdewFXxvtXAntn9l9lwcNAb0lrpkyfc865xurR+6ivmc2L998A+sb7awOvZh43N+6bRwlJRxNKE/Tv3z9dSl3r18a6+znX2tW1odnCCKQWj0Iys0vMbISZjejTp0+ClDnnXMdUj5LCm5LWNLN5sXrorbj/NWCdzOP6xX3OdVze8Ft7XrpsUj1KCrcBY+P9scCtmf2HKtgSeD9TzeSccy4HqbukXguMBtaQNBc4AzgbuF7Sd4CXgf3jw/9B6I76AqFL6uEp0+acc25pSTMFMzuowqEdyzzWgONTpsc551zTfESzc865Is8UnHPOFXmm4Jxzrsinzm7PvDujc66FvKTgnHOuyDMF55xzRZ4pOOecK/JMwTnnXJE3NDvnXEIDFv0lyXnnJDmrlxScc85leEnBuZbwGTZdO+clBeecc0WeKTjnnCvy6iNXM6ka1CBdo5pzrjEvKTjnnCvykoJzrshLe85LCs4554o8U3DOOVfkmYJzzrkizxScc84VeabgnHOuyDMF55xzRZ4pOOecK6p6nIKkbsCGcXO2mX2eJknOOefqpapMQdJo4ErC+BMB60gaa2b3JkuZc8653FVbUvgdsIuZzQaQtCFwLbB5qoQ555zLX7VtCl0LGQKAmT0HdF2ewJL+R9IsSU9JulZSd0kDJT0i6QVJE2OVlXPOuZxUmylMk3SppNHx9idg2rIGlbQ2cCIwwswGA52BA4FzgN+b2frAu8B3ljWGc865lqs2UzgWeJrwRX5ivH/scsbuAvSQ1AVYEZgHjAFujMevBPZezhjOOedaoKo2BTP7FDg33pabmb0m6bfAK8AnwJ3AdOA9M1scHzYXWLvc8yUdDRwN0L9//1okyTnXQaSaCXZOkrPmr9reR08CVrL7fUIV0i/NbEFLgkpaFdgLGAi8B9wA7Fbt883sEuASgBEjRpSmyznn3DKqtvfRP4ElQCGLPZBQ5fMGMAH4Rgvj7gT8x8zmA0i6Cdga6C2pSywt9ANea+F5nXPOLYdqM4WdzGyzzPaTkh4zs80kHbIMcV8BtpS0IqH6aEdCqWMysC9wHTAWuHUZzu2cc24ZVdvQ3FnSqMKGpJGEHkMAi8s/pTIze4TQoPwY8GRMxyXAqcD3Jb0ArA5c1tJzO+ecW3bVlhSOBC6XtDJhRPMHwJGSVgLOWpbAZnYGcEbJ7peAUWUe7pxzLgfV9j6aCgyRtErcfj9z+PoUCXPOOZe/JjMFSYeY2dWSvl+yHwAzq0kXVeecc61DcyWFleLfnqkT4pxzrv6azBTMbHz8+4t8kuOcc66emqs+Or+p42Z2Ym2T41zr5qNhXXvXXJfU6fHWHdgMeD7ehgM+g6lzzrUzzVUfXQkg6Vhgm8K8RJL+CNyXPnnOOefyVO3gtVWBXpntleM+55xz7Ui1g9fOBh6XNJkweG074OepEuWcc64+qh28doWkfwJbEGZLPdXM3kiaMuecc7mrtqQAYfqJbeN9A/5W++Q455yrp4qZgqTtgIfM7HNJZwMjgWvi4RMlbWVmP8ojkc5V4l1EnautphqaFwF/jPd3B3Y2s8vN7HLCgjh7pE6cc865fFUsKZjZo5I+yuzqDbwT76+SMlHOOefqo7lxCrPi3bNYuvfRaYnT5pxzLmfV9j66VtIUQrsCeO8j55xrl6oavCZpH+BjM7vNzG4DFknaO2nKnHPO5a7aEc1nZBfWMbP3WHrVNOecc21cteMUymUeLRnj4JxzS0nVpRi8W/GyqrakME3SuZLWi7dzCbOnOueca0eqzRROAD4DJgLXEcYwHJ8qUc455+qj2t5HH+FdUJ1zrt2rtqTgnHOuA/BMwTnnXJFnCs4554qqHby2oaRJkp6K20Ml/WR5AkvqLelGSc9KekbSVpJWk3SXpOfjX1/dzTnnclRtSeFPwOnA5wBmNhM4cDlj/wH4l5ltBAwDniE0Zk8ysw2ASXjjtnPO5araTGFFM3u0ZN/iZQ0qaRXCpHqXAZjZZ3GU9F7AlfFhVwJ7L2sM55xzLVdtpvC2pPUIK64haV9g3nLEHQjMB66Q9LikSyWtBPQ1s8J53wD6lnuypKMlTZM0bf78+cuRDOecc1nVZgrHA+OBjSS9BowDjl2OuF2AzYCLzWxTYKlxEGZmxEyolJldYmYjzGxEnz59liMZzjnnsqodvPYSsFP8Nd/JzBYuZ9y5wFwzeyRu30jIFN6UtKaZzZO0JvDWcsZxzjnXAk1mCpK+X2E/AGZ27rIENbM3JL0qaZCZzQZ2BJ6Ot7HA2fHvrctyfuecc8umuZJCz/h3EGGBndvi9jeA0obnljoBuEZSN+Al4HBCddb1kr4DvAzsv5wxnHPOtUBzy3H+AkDSvcBmhWojST8H/r48gc1sBjCizKEdl+e8zjnnll21Dc19CbOkFnxGhZ5Bzjnn2q5qF8q5CnhU0s1xe29gQooEOeca+CI0Lm/V9j76laR/AtvGXYeb2ePpkuWcc64eql5S08weAx5LmBbnnHN15rOkOuecK/JMwTnnXFHV1UeS+hLGKgA8amY+2tg559qZatdT2J8wWG0/woCyR+KkeM4559qRaksKPwZGFkoHkvoAdxPmLHLOOddOVNum0KmkumhBC57rnHOujai2pPAvSXcA18btA4B/pEmSc865eql28NrJkr4JbBN3XWJmNzf1HOecc21P1b2PgAeBJcAXwNQ0yXHOOVdP1fY+OpLQ+2gfYF/gYUlHpEyYc865/FVbUjgZ2NTMFgBIWp1Qcrg8VcKcc87lr9oeRAuA7BKcC+M+55xz7Ui1JYUXCAPWbgUM2AuYWViuc1mX5XTOOde6VJspvBhvBYW1k3uWeaxzzrk2qtouqb9InRDnnHP112SmIOlCM/uepL8Rqo0aMbM9k6XMOedc7porKRwKfA/4bQ5pcc45V2fNZQovApjZPTmkxTnnXJ01lyn0KfQwKsd7HTnnXPvSXKbQGVgZUA5pcc45V2fNZQrzzOzMXFLinHOu7pob0ewlBOec60CayxR2TBlcUmdJj0u6PW4PlPSIpBckTZTULWV855xzjTWZKZjZO4njnwQ8k9k+B/i9ma0PvAt8J3F855xzGXVbUlNSP+DrwKVxW8AYGtZ9vhLYuy6Jc865Dqqe6yyfB5xCWLQHYHXgPTNbHLfnAmuXe6KkoyVNkzRt/vz5yRPqnHMdRV0yBUl7AG+Z2fRleb6ZXWJmI8xsRJ8+fWqcOuec67hashxnLW0N7Clpd6A70Av4A9BbUpdYWugHvFan9DnnXIdUl5KCmZ1uZv3MbABwIPBvMzsYmExY7hNgLA1TdDvnnMtBPdsUyjkV+L6kFwhtDJfVOT3OOdeh1Kv6qMjMpgBT4v2XgFH1TI9zznVkra2k4Jxzro48U3DOOVfkmYJzzrkizxScc84VeabgnHOuyDMF55xzRZ4pOOecK/JMwTnnXJFnCs4554o8U3DOOVfkmYJzzrkizxScc84VeabgnHOuyDMF55xzRZ4pOOecK/JMwTnnXJFnCs4554o8U3DOOVfkmYJzzrkizxScc84Vdal3AjqSAYv+kuzcc5Kd2TnXkXhJwTnnXJFnCs4554o8U3DOOVfkmYJzzrmiumQKktaRNFnS05JmSTop7l9N0l2Sno9/V61H+pxzrqOqV0lhMfADM9sY2BI4XtLGwGnAJDPbAJgUt51zzuWkLpmCmc0zs8fi/YXAM8DawF7AlfFhVwJ71yN9zjnXUdW9TUHSAGBT4BGgr5nNi4feAPpWeM7RkqZJmjZ//vx8Euqccx1AXTMFSSsDfwXGmdkH2WNmZoCVe56ZXWJmI8xsRJ8+fXJIqXPOdQx1yxQkdSVkCNeY2U1x95uS1ozH1wTeqlf6nHOuI6pX7yMBlwHPmNm5mUO3AWPj/bHArXmnzTnnOrJ6zX20NfBt4ElJM+K+HwFnA9dL+g7wMrB/fZLnnHMdU10yBTO7H1CFwzvmmRbnnHMN6t77yDnnXOvRoafOTjWV9ZwkZ3XOufS8pOCcc67IMwXnnHNFnik455wr8kzBOedckWcKzjnnijxTcM45V+SZgnPOuSLPFJxzzhV5puCcc67IMwXnnHNFnik455wr8kzBOedckWcKzjnnijxTcM45V+SZgnPOuSLPFJxzzhV5puCcc67IMwXnnHNFnik455wr8kzBOedckWcKzjnnijxTcM45V+SZgnPOuSLPFJxzzhW1ukxB0m6SZkt6QdJp9U6Pc851JK0qU5DUGfh/wNeAjYGDJG1c31Q551zH0aoyBWAU8IKZvWRmnwHXAXvVOU3OOddhyMzqnYYiSfsCu5nZkXH728AWZva9kscdDRwdNwcBs3NI3hrA2znEqVe8esT0eB6vtcdsz/HWNbM+pTu75BS8pszsEuCSPGNKmmZmI9prvHrE9Hger7XHbO/xymlt1UevAetktvvFfc4553LQ2jKFqcAGkgZK6gYcCNxW5zQ551yH0aqqj8xssaTvAXcAnYHLzWxWnZNVkGt1VR3i1SOmx/N4rT1me4+3lFbV0Oycc66+Wlv1kXPOuTryTME551yRZwouN5K2rmZfW9Xer8/VnqSB1ezLk2cKFUj6czX7ahhPkg6R9LO43V/SqFTxMnHXlbRTvN9DUs+E4S6ocl/NtOfrk3RONftqGG9FST+V9Ke4vYGkPVLFy8TdRtLh8X6f1F+aOb9n/lpm340J4zWrVfU+amU2yW7EeZk2TxjvIuALYAxwJrCQ8IYZmSqgpKMII8NXA9YjjAv5I7BjjeNsBXwV6CPp+5lDvQi9zJJo79cH7AycWrLva2X21coVwHRgq7j9GnADcHuieEg6AxhBmLngCqArcDWQpASW43tmI8J3zCqSvpk51AvoXstYLeWZQglJpwM/AnpI+qCwG/iMtN3FtjCzzSQ9DmBm78axGikdT5hv6pEY83lJ/5UgTjdgZcL7Lfur6wNg3wTxCtrl9Uk6FjgO+LKkmZlDPYEHah0vYz0zO0DSQQBm9rEkJYwHsA+wKfBYjPl64l/ueb1nBgF7AL2Bb2T2LwSOShCvap4plDCzs4CzJJ1lZqfnGPrzWBoxCMVkQskhpU/N7LPC51pSl0L8WjKze4B7JE0ws5cl9Qq7bWGtY5Vor9f3F+CfwFlAdnr5hWb2TqKYAJ9J6kHDe3Q94NOE8QA+MzOTVIi5UuJ4eb1nbgVulbSVmT1U6/MvD88UKjCz0yWtDaxL5nUys3sThTwfuBn4L0m/IvzC/EmiWAX3SCqUinYm/Pr8W8J4fSTdTvw1Lel94Agzm54oXru8PjN7H3ifMLX8ZsA2hC+uB4CUmcIZwL+AdSRdQ6jCOSxhPIDrJY0HeseqnSOAPyWMl/d75oUYbwCNv2eOSBizST54rQJJZxOm2XgaWBJ3m5ntmTDmRoS6SwGTzOyZVLFivE7Ad4BdYsw7gEst0ZsiVnUcb2b3xe1tgIvMbGiieO39+n4K7A/cFHftDdxgZr9MES/GXB3YkvB6PmxmyWf0jF/Oxf+hmd2VMFbe75kHgfsIbTWF7xnMrFwDdC48U6hA0mxgqJmlLh4X4m0JzCpUOcQqiK+Y2SMJY64ELDKzJXG7M7CCmX2cKN7jZrZpyb7HzGyzFPHylvf1xffoMDNbFLd7ADPMbFCiePsA/44lFST1Bkab2S0p4sUYA4F5JdfY18zmJIqX92dihpkNT3HuZeVdUit7idDTIS8XAx9mtj+M+1KaBPTIbPcA7k4Y7x5J4yWNlrS9pIuAKZI2i9UgNSHpSUkzK91qFaeMXK4v43Ua91RZgbSzCp9RyBAAzOw9QpVSSjfQuG1tSdyXSt6fidsl7Z7w/C3mbQqVfQzMkDSJTGOamZ2YKJ6yRVQz+yI2cqXU3cyKGZGZfShpxYTxhsW/pV8kmxLqxMfUKE7yvvMV5HV9Be8DsyTdFc+/M/CopPMhyXu13I/I1O/RLnEVRgBiI3DKXnl5fyZOAn4k6TNCD0eFsNYrYcwmeaZQ2W3kO233S5JOpKF0cByhtJLSR5I2M7PHACRtDnySKpiZ7ZDq3CVxXs4jTpm4uVxfxs3xVjAlcbxpks4lrKMOoftmqk4CBfMl7WlmtwFI2ou0K5Pl/ZlI2b12mXibQhNi/WV/M0u+3GfsC30+4dekEYqx48zsrYQxRwATCdUQAr4EHFDr3jKSDjGzq9V4YFeRmZ1b43j3m9k2khbSuDthkl9heV9fvcT69p8COxFe17uAX5nZRwljrgdcA6wVd80Fvm1mLyaKl8tnIhNPwMHAQDP7X0nrAGua2aMp4lXDSwoVSPoG8FvCwKSBkoYDZ6bofRQbs35vZgfW+tzNxNwW2IgwkAZgtpl9niBcoW95Xr+KDoVcf4Xlen2Srjez/SU9SZk+9Cl6O8X3y+15loZizGPNbEtJK0OozkkcL6/PREF2JoP/JbQl/j8SzmTQHC8pVCBpOuEfNaXQo0TSU2Y2OFG8+4Ex2frT1CQ9ambJ51eKsToDJ5rZ73OINd3MNpc0ycxqOj1BEzHzvL41zWyepHXLHU9VfRbb176ZbWxOTdLDZrZljvFy+0zEeI9ZnMkg8z3zhJkNa+65qXhJobLPzex9NR7Fn3KE8UvAA5JuA4rF8cRVDw9IupBQXM7GfKzWgcxsicL0CMm/NIFOcUDQhuWqdFK8pnleX8wQOgMTcm7H+BB4MjZsZ98vqTpfADwePxM3lMS8qfJTlktun4moHjMZNMkzhcpmSfpvoLOkDYATgQcTxnsx3jqRXzXL8Pj3zMy+FL1kCvL6wB1IGMhVOhdRanlnsl9IWiXHX+430TBQLi/dgQU0fk9awnQMj3/z+kzUYyaDJnn1UQWxG9qPaTyy8X8Lg2hcy0maXGa3mVmSD5ykr5nZP1Ocu0K8vK/vVkJ31zx/ubsaU84zGTSbHs8UWof4hVKu0TDVLxQU124oE/PMcvtd6yJpbLn9ZnZlonj/ofx79Msp4sWYV1SImWRuoHp8JiStCqxD47mPUlVXNcurjyqIXdPKTVSVZB4b4IeZ+92BbwGLE8UqyHYl7E4Y9JXsV4qkXwO/iSNhCx+GH5hZXYvLtVKH67uRMlMyJIoFYV2Dgu7AfoR1B1LKrtXQnTCV9usJ4+X9mfhfwqSCL9KQ+aWsrmo+TV5SKE9hXpmTgSfJNPzkOTCqDj0hViBMODY60fnznhtoBSuZu6rcvhrGy/v6HgZ2KnTTjN027zSzr6aIVyEN080s5eJTpfE6AffndY05fCZmA0Py7HXYHC8pVDa/MIoyD5Kyv7g6EVZ5WyWv+NGKhJWmUumc/VKOgwNT/rJ9CCj9Qi63r1byvr5cp2Qomb+pE6HkkPd3yAZAikVvKkn9mXiKsNBOskGqLeWZQmVnSLqUMLI4O/dRql4P0wnFRhGqjf5DmMI3mZLBT52BPjTudVFr1wCTYj0xwOFAzeu/JX0JWJswJ/6mhNcUwlKHKeexyeX6MnKdkgH4Xeb+YmAOYeruZDKj0hX/vkG65Ubr8Zk4i9Dt9ikaf88km6K/OV59VIGkqwkjG2fRUH1kqRq46qFk8NNi4E0zS9qOIWk3wjQJAHeZ2R0JYowl1NOOAKbSkCl8AFyZMGPP5foysUYC15HTlAwdQd6fCUmzgPEsXU19T6qYzabJM4XyJM22RPPSV4jXFTgW2C7umgKMTzzEHknDCEP7Ae41s2RTS8e5cz6xMAPsIMJUAv9MdY2SvmU5LlaS9/XFmF3JaUoGSasQZoAtvEfvIUz9knSchKQ9MzGnmNntTT2+BvHy/ExMNbO6TWlRjq+nUNmDkjbOMd7FhHaEi+JtcxKvpyDpJEKVx3/F2zWSTkgY8l6gu8Iyp/8Cvg1MSBhv7/hFBoRfgXGqhlRyvT5J+xHaFZ4iDNabqDTrNhRcTlhYfv94+wC4oslnLCeFFRBPIqyA+DRwUuzllSpe3p+J+ySdJWkrxXU3Ev8Pm2dmfitzI3RD+wyYDcwkFO9mJoz3RDX7ahxzJrBSZnulxNf4WPx7AnBKvD8jYbzvAs8CuwNHAc8B32hH1zcz/t0GmAx8HXgkYbylriXl9RWuEeiU2e6c+D2a92dicpnbv1O+ps3dvKG5st1yjrdE0noWpwSW9GUya7YmopIYS2iof08ST9JWhKmCC43onVMFM7Pxsc52MmEO/k3N7I1U8cj5+mj4330d+JOZ/V1SsvWZgU8kbWNm9wNI2pq0DdsFvYF34v3UPfJy/UxY/mtwNMszhcrybmw5GZgs6SXCm3BdQu+VlK4AHpF0c4y5F3BZwngnAacDN5vZrJjxlZsaoiYkfZsw//+hwFDgH5ION7MnEoXM9fqA1ySNJ6y4dk7sU5+ySvhY4MpYJSfCF/VhCeNBQ++cyTHmdsBpCePl+plojbMKeENzBZmuaSKMbBxIaMjbJGHMFWjcaJhkkFVJzM0I1Q8A95nZ46lj5kXSLcDRFhcqkjQKuMRa2ULpyyqOSdgNeNLMnpe0JmEg1J2J4/YCMLMPUsbJxFuThvUFHk1c2sv1MyHpB5nN4ghqq2MvR88UqhTfKMeZ2ZGJzr8f8C8zWyjpJ4QBVr+0hHOgKKxqNdfMPpW0AzAEuMriNA3thaQVzezjeL+btaLRo21JbIS9gtDY/CfCe/S0lJlQrKKaYWYfSTokxvyDpVszoq6fidQjqKvhvY+qFL+ct0gY4qcxQ9iGMGPiZSTufQT8ldCWsT7wR8KkXH9JHDM3sUfH04TG5kJXw/Pqmqi27YhYOtgFWJ3Qu+rsxDEvBj6O/7vvE+YIuiphvHp/JlKPoG6WtylUoMaLs3Qi/EJJORFX3o2GAF+Y2WJJ3wQuNLMLJKUsKq9hZikXXS91HrArcBuAmT0habsmn+GaUmhw3Z3w63mWpJQdEwAWm5lJ2gv4f2Z2maSUI/3z/kzkPYK6WZ4pVJZdnGUx8HfCr4hU8m40hLDq00GEhthvxH1dax1EYb3ry4HFkpYA+5tZygWLiszs1ZLvrWQ9uhRWzTqKpWfWTTXN8wnA1Wb2borzlzFd0p2E9rXTJfUk/SphCyWdDhwCbKcwIV7N36MZuXwmMvbI3M9lVoHmeKZQgZn9IueQ+xMaDX9rZu/FxrWTE8c8HDgG+JWZ/UfSQODPCeL8CtjWzJ6VtAXwG2D7BHEAkLSlmT0MvCrpq4DFkb8nkXAaZOBW4D7gbtJ3JwboC0yV9Bgh073D0jYSfoewMtlLZvaxpNVJ30PuAOC/ge+Y2RuS+gP/lzBeXp+JgjWBWWa2EEBST0kbm9kjCWM2yRuaK1BYh3Y/azw3/nVmtmtdE9YGqWT66NLtVPEkrQH8gTAXkYA7gZPMbEGiuDPy7tkUq292IXyZjQCuBy4rjHdxrVusmtqskJnHktC0lJ+P5nhJobI+2R4HZvaupDyn7G1P/qukjabRtpmdmyJobL84OMW5K7hd0u5m9o+8Asb69jcIs4cuBlYFbpR0l5mdklc63DJTtnRnYd6sun4ve6ZQ2RJJ/c3sFSjOnujFqmXzJxq30ZRu19qXJVVcC8PSTUt8EvAjSZ8BhYnpzMx6pQgWu4geShitfSlwspl9Hn9tPg94ptD6vSTpRBp6Gh4HvFTH9Him0IQfA/dLuodQ9bAtcHStg8Sub33N7IGS/VsDb7SHaoA6tM/Mp/Hc/7kws5QZXTmrAd8s7bMff23uUeE5yy2WmLtn4r2SIEYfQmn96ZL9GxMWwJpf65glcYpjWxI7BjgfKCzZejcJvmdawtsUmhDrpLeMmw+n6E4p6XbgdDN7smT/EODXZvaN8s+saRpON7OzEp7//KaOm9mJNY73uJUsi5kX5T/Nc2H0rQEPJB7suCchs12LsFLYuoTRtzUf5S/pOuAiM7u3ZP+2wLFm9t+1jhnP/1VCqWtlM+sfx0d818yOSxGvNfLBa037KjA63rZs8pHLrm9phgAQ9w1IFLPUfonPPz1z27NkO8WCMP9JcM5mqfw0zykz258SVnZbHVgDuCKOhk/lfwmfg+fMbCBhkOXDiWKtX5ohAJjZfYR5rFL5PWFsy4IY7wkaMvmak9RP0s2S3oq3v0qq6+A1LylUED/gIwlzqwMcBEw1sx/VOM7zZrZBhWMvmNn6tYxXIU7S3kAlsZL/ipf0LZpo/7FEK69JmgkMN7Mv4nZn4HEzS/IlprDo+zAzWxS3exCmhEiyOJSkaWY2QtIThBlnv5D0hJkNSxCr4iJXTR2rQdxHzGyL7Ps01TXGc99FGDFd6PZ6CHCwme2cIl41vE2hst1p/AG/EngcqGmmAEyTdJSZ/Sm7U9KRpPkVXTj/f2iY8G9NNczOamb25VRxyaexvlCf/l+E0t6/4/YOwINAsuU4yXea59cJdfuL4vYKwGsJ470naWXCYkLXSHoL+ChRrBfK9eSS9DXSNsTmPbalj5llFyqaIGlcwnjN8kyhab1J/wEfB9ws6WAaMoERQDdgn0QxicV/oL518CmY2eEAcfTtxmY2L26vSdqV3nKZ5lnSBYTM9X1gVvy1aYTR8I/WOl7GXoT1E/6H0NV3FdJNyTAO+Luk/Wn8udiKxqOAa+0YwtiWtQkZ7J3A8QnjLVCY6O/auH0QseqqXrz6qII41P1swnz4xQ+4mU1MFG8HYHDcnGVm/27q8TWOnTRTkLSQhlJJD6DQq6NQMknVZfMZM/tKZrsT4bX9ShNPW96Yyad5ljS2qeNmdmWtY8a43wcmmlnK0kg23gqE0czFzwXwl0J1WXsQu7pfQMjsjFCSPTFFj66q0+SZQmV5fMBbA0kXmtn36p2OWpN0IbABDb/CDgBeMLNka+4qrM+8Lo3nPlqqwbQtknQGYTqWd4CJwA1m9maO8fdI1ZsrU/oqq9Y95FozzxRKqJlFs1N2+WuvJHUnFMvXJ6yBe7nlNOmXpH1o6D1yr5ndnDDWOYSMZxYNE8VZqsFymXahRhK3CSFpKOE6v0VYe2CnlPEycZN1iMi79NWaMyFvU1haYdBTd0Id5hOEao6hwDRCMa9dkbSJmc1KGOJKwgjf+wgN+JsQGvDy8Biw0MzulrSipJ4WJx9LYG9gkOWwYl40InO/O6Fr8Wo5xH2LMK3GAkJjfl5SrpWcpMqtCdPi362BjQklLwj/w6fLPiMnXlKoQNJNwBmFMQSSBgM/N7N965uy2sthgronzWxIvN+FUBWXvAuspKMIo0NXM7P1JG0A/NHMdkwU75+ESRQ/THH+KtMw3cw2T3Tu4wjVR32AG4DrS0ccpyRplJmlbEgndhIoV/oakyjew8A2hZJz7PF0n5mlGhfVLC8pVDYoO6jMzJ6SlKyBss5SL5RSmAcICwuYJA5XdDwwCngkxn5eCSY1zFQFfAzMkDQJKJYWUlUFlFR1diKUHFJ+ptcBxpnZjIQxGlFYh/oHQH8zOypm7IMSjhT/YeZ+d0IVWcqqzlWBXjT0clw57qsbzxQqmynpUuDquH0woT68XYiNhoUeQX0l/axwzMxq3c1wmKTCIu8CesTtpL2PgE/N7LNCJhRLKSmKxoWqgOnEVd4yUhbFs/M7LQbmkHB0upmdDvnMfZRxBeF1LVTbvkYopSTJFMysdGzQA5JSlk7OZuluzD9PGK9ZnilUdjhwLA113/eSfs3kPM3J3P8cSLIQOoCZdU517mbcI+lHhExoZ8IMlH+rdZBCfbSkk8zsD9ljCjOZJmFmO5TE6gwcCDyXIp7CCnrnUjL3EaGNKJX1zOyA2EUcC4v7JCtqSsq2yXQCNifhIEQzuyJWOxbWfz+13r0cvU3B5TrNRZ7il8eRhEVoBNwBXGqJ3vTlXscUY0Ak9SJUja1NWO3t7rj9A2Cmme1Vy3iZuE8AY4C7zWzTOLbmEDNLtmaypAcJcyw9YGHhpPWAa81sVKJ42ZH+iwnzaJ1pZveniNcaeUnBQfo2hdzFX82zzGwjwvoNKWMdRBhkNVCN13HoSUNdcS39GXgXeIiwJvSPCf/DfRLX939uZgskdZLUycwmSzovYTwIVSn/AtaRdA2ht85hqYJlR/p3VJ4pOAi/xNoVM1siabYyCyUl9CAwjzBTabaefyFp2qG+nOnNdWmM3T+Hkb6FuY/uI/3cRwCY2Z2SphNmZxVhOdUUU9h/s5l0pJwvq1XxTKEFJP3WzH7Y/CNbN5Us7GNm78T97WZhn2hVwtxAj5L58qr1YDILi9y8LOlaQvXNu7U8fxnZ3lxLJM3NaeqHPQmT751EmM2zF5B0ASVJfyPMInqbmaXMgArrluQ2iWKs3hxFqAaE0Ij+aKrqzWp5m0ILSHrFzPrXOx3LS61gYZ88SNq+3H4zuydRvF8SGnofAy4H7kjxAZe0hIZMLjufVJLeXJm5qxrtjn8XAS8CPzazSbWMG2NvTxg9/XVgKnAdcHuqTDBOojjWSiZRNLNdaxxnF+AiwrKphbmk+hFG/R9nZnfWMl6L0uaZQvUkvWpm69Q7HctL0lQzG1nhWHGgmWu5+OtvF0LvtRHA9cBl7aj01UhsuxkMXGNmg5t7/HLGGUNoQ9ktVTfmvCZRlPQM8DUzm1OyfyDwj1rHawmvPipR0iWt0SHaT4Ns7yaO9cgrEamV/MLtBnQFPko4LgIzM0lvEKaBWEyowrpR0l1mdkqquPViZkuAJ+IAviQUFg/6BqHEsBlh2pRUJkm6g8aTKN6dIE4XYG6Z/a8R3qd145nC0qbT0CWt1Odl9rVFdVnYJ29m1rNwP/6C34t0y6oWxiQcCrxNWOf3ZDP7PP7afB5od5lCgZmNT3FeSdcT6t3/BVwI3GNx4asUzOx7JZMoXpJoEsXLgakKa1G/GvetQ6h+vCxBvKp59VEHJKkvcDPwGWUW9qn34JmUUowbyJz7F4QZYJcaCCjpK2aWcgWvdknSroRxEUtyjNmXkBEZoeH3rURxvkL4oZJtaL4tz/mkyvFMoYQ60NTZquPCPnko6WZYmBtoezOr6Uy3ajw1+JOENoRcpgZvrySNMbN/V+oqmqqLqMJKb/8HTCHUFmxLKPHdmCJea+SZQglJXwBPEaoAoHE1kqWaLdHVnqTs2reFuYH+VOtffpIm0jA1+NeAl80sr6nB2yVJvzCzM0r+hwVmZkckivsEsHPhPSKpD6GkMixFvApp+LmZ/TyveKW8TWFp3wf2JaxFex1ws9VxKmS3XC4tjMUoiGMxal0dsHFmMNllpF0nuUMwszPi3TPN7D/ZY7GHTiqdSn40LCCUMvNU13a9vC+21TOz88xsG+AEQsPPJEnXSxpe35S5ZVCuR0yKXjKNpgZPcP6O7K9l9qWsyvmXpDskHSbpMODvwD8TxluKmdV80saW8JJCBWb2kqRbCV00vw1sCMyoa6JcVSRtRRiV2kdhsfmCXkCKGVvrNTV4uyVpI8Lsq6uUtCv0IjNtd62Z2cmSvkWYYwnS9T6qSNLPrPbT11fNM4USkr5M6Ba2F6Gr2HWEUb6f1DVhriW6ERYr6UKYlK7gA0LVYE1Z/aYGb88GAXsQxtRkR9gvJAxgS8bM/irpLuL3o6TVClPB5ORIoG6Zgjc0l4gNzTMJUxJ/QMnwfjM7tx7pci0nad1y3UNd2yFpKzN7KMd43yXM57QI+IKG0t6Xaxzng0qHgB5mVrcf7N6msLRfEPrwf0H4tdmz5Obajksl9S5sSFo1jlZ1bccxZf6HlyeM90NgsJkNMLMvm9nAWmcI0XvABmbWq+TWkzDrbd149dHSFpjZhfVOhKuJNczsvcKGmb2rBGs0u6SGlvkfJhl8GL1ImFwwtasIK9e9WebYX3KIX5FnCks7gjCc3rV9X2TXU5C0LmnXTHa110nSqoXpyOPcZCm/t04HHpT0CPBpYaeZnVjLIGb2kyaOnVrLWC3lmYJrz34M3C/pHhpGpx5d3yS5Fvod8JCkG+L2fsCvEsYbT1hL4UlCFXKH4w3NJSQtpnzx0bsXtkGS1qBhEryHLcGqXS4tSRsTps0G+HfKuYFSzo3VVnimUMLfFO2HpO3K7Teze/NOi1t2krYhNMpeEaedWLl0lHMNY/2aMB3K32hcfZRnl9S68kyhhGcK7UdcyrGgO2Hmy+k+f1XbIekMwkSGg8xsQ0lrATeY2dbNPHVZ45XLbGreJbWZNNR1hUdvU1jaDc0/xLUFVrKsqKR1gPPqkxq3jPYBNiUscYqZvS4pWddwM0s5r1K16rqYl2cKS1tT0vmVDta6F4LL1VygbsscumXyWVzNzgAkrVTvBOWgrtU3niksbVrm/i+AMyo90LVucYnIwgesEzCc+IvTtRnXSxoP9JZ0FKHL+J+aeU6rVzInV6NDhEGzdeNtCk3w9oW2TdLYzOZiYE7pVNqu9ZO0M7AL4QvzDjO7q85JWm6xraQiM/tFXmkp5ZlCEyQ9ZmZNrsTmWidJnYGrzOzgeqfFtT2SVibMjPxSdkR1R+DVR65dMrMlktaV1M3MPqt3elzLSLrfzLaRtJDydewLgP8zs4tqFO8iMzsu3t+GMNXEi8D6kr5rZv+oRZxMvIrtllDftksvKZQoeROuSMNANh+81sZIuorQsHwb8FFhv8902/ZJWh140MwG1eh8xVoBSZOBH5jZY3Eq/evNbEQt4mTifUZY9vd64HVKehyZ2ZW1jNcSXlIoEWcpdO3Di/HWiYYZbv1XUBsjaTNgG8L/7n4ze9zMFkganShkLzMrdIF9SVKK2aTXJEzZcQChvWsicGNrqKrykoJrtyTtZ2Y3NLfPtV6Sfkb48rwp7tqbMHjtlzWO8zHwAuEX+wCgf5yRtRMw08wG1zJeSex+hIW9vg+camZ/ThWrqvR4puDaq3IdBbzzQNsiaTYwzMwWxe0ewIxaVRtl4qxbsmuemX0W587azsxuKve8GsTdDDgI2BmYDvwu5dxO1fDqI9fuSPoasDuwdkmDXi9CUd21Ha8TpihZFLdXAF6rdZBKK/TFCRRrniFIOhP4OvAMYcnf082sVbw3vaTg2h1JwwgD1c4EfpY5tBCYXJib37VemYGH/YGRwF1xe2fgUTP7Zo3jPUn59qZCB5OhNY73BfAfGjqyFGInidcSnim4dktSVzP7XFJXYDDwmpm9Ve90ueaVDDxcSq1755SpPiqNV9O1vvOO1xKeKbh2R9IfgQvMbJakVYCHgCXAasAPzezauibQVU1Sd2D9uPlCoW0hUazOwN1mtkOqGJlYxRUByxzb1szuS52GSlJ0tXKu3rY1s1nx/uHAc2Y2BNgcOKV+yXLVktRF0m8IkxheSVjT+FVJv4klv5ozsyWEJVxXSXH+ElMknRIzIgAk9ZV0NfD7HOJX5JmCa4+yI5h3Bm4BMLM36pIatyz+j1CyG2hmm8ceY+sBvYHfJoz7IfCkpMsknV+4JYizOeF6ZkgaI+kk4FFCqXZUgnhV8+oj1+7EEam/I/RSmQxsZGZvSOoCPGVmG9U1ga5Zkp4HNrSSL6j4y/pZM9sgUdyybRmpRhjHzOD3hF5WW5rZ3BRxWsK7pLr26LvA+cCXgHGZEsKOwN/rlirXElaaIcSdSwprKyQKemUcC9HfzGaniiOpN3AOsAWwG6EL9T8lnWRm/04Vt6q0eUnBOdfaSLoFuMnMrirZfwiwv5ntmSjuNwjVU93MbKCk4cCZtY4n6SXgIuC8wviEGOsi4GUzO6iW8VqUNs8UXHslaUPgYqCvmQ2WNBTYs9ZTJLjak7Q2YdDYJ4SRvhDWau4B7GNmNR/AFuNOB8YAUwprqUh6qtbTXEjqV6mqSNJRZla3hYQ8U3DtlqR7gJOB8Sk/4C4dSWOATeLm02Y2KXG8h81sy+wCW5Jm1nMwWd68TcG1Zyua2aNSo1mJW8VUAq46sX49zzr2WZL+G+gsaQPgRODBHOPXnXdJde3Z25LWI04hIGlfYF59k+RauRMIJZNPCQvtvA+Mq2eC8uYlBdeeHQ9cAmwk6TXCXDO+PKdbShw5fQxh9PSTwFatZYK6vHmbgmv3JK1EKBV/DBxoZtfUOUmulZE0EfgcuA/4GjDHzMbVNVF14pmCa3ck9SKUEtYGbgXujts/ICyYslcdk+daIUlPxqlQiIMcH+2o62549ZFrj/4MvEuYMuAo4MeEKYn3MbMZdUyXa70+L9wxs8UlnRM6FC8puHan5FdfZ0Ljcv+UM2y6tk3SEuCjwiZhPMTHNKxv0KteacublxRce5T91bdE0lzPEFxTzKxz84/qGLyk4Nod/9Xn3LLzTME551yRD15zzjlX5JmCc865Is8UnHPOFXmm4JxzrsgzBeecc0X/H9sRjZFUhN64AAAAAElFTkSuQmCC\n",
- "text/plain": [
- "<Figure size 432x288 with 1 Axes>"
- ]
- },
- "metadata": {
- "needs_background": "light"
- },
- "output_type": "display_data"
- }
- ],
- "source": [
- "import numpy as np\n",
- "import matplotlib.pyplot as plt\n",
- "\n",
- "values_ok = [guesses_ok[i] for i in range(len(CODE_TYPES))]\n",
- "values_bad = [guesses_bad[i] for i in range(len(CODE_TYPES))]\n",
- "x_positions = np.arange(len(CODE_TYPES))\n",
- "\n",
- "p1 = plt.bar(x_positions, guesses_ok)\n",
- "p2 = plt.bar(x_positions, guesses_bad, bottom=guesses_ok)\n",
- "\n",
- "plt.ylabel('Tipo de código')\n",
- "plt.title('Aciertos o no, por tipo de código')\n",
- "plt.xticks(x_positions, CODE_TYPES, rotation=90)\n",
- "#plt.yticks(np.arange(0, 81, 10))\n",
- "plt.legend((p1[0], p2[0]), ('Correcto', 'Incorrecto'))\n",
- "\n",
- "plt.show()"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- }
- ],
- "metadata": {
- "kernelspec": {
- "display_name": "Python 3",
- "language": "python",
- "name": "python3"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.8.2"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/Master/texmf-dist/doc/latex/jupynotex/tests/run b/Master/texmf-dist/doc/latex/jupynotex/tests/run
deleted file mode 100755
index a5fa69f44d2..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/tests/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-PYTHONPATH=. fades -d pytest -x pytest -sv "$@"
diff --git a/Master/texmf-dist/doc/latex/jupynotex/tests/test_cellparser.py b/Master/texmf-dist/doc/latex/jupynotex/tests/test_cellparser.py
deleted file mode 100644
index f9108f4bb8f..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/tests/test_cellparser.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2020 Facundo Batista
-# All Rights Reserved
-# Licensed under Apache 2.0
-
-import pytest
-import re
-
-from jupynotex import _parse_cells
-
-
-def test_empty():
- msg = "Empty cells spec not allowed"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('', 100)
-
-
-def test_simple():
- r = _parse_cells('1', 100)
- assert r == [1]
-
-
-def test_several_comma():
- r = _parse_cells('1,3,5,9,7', 100)
- assert r == [1, 3, 5, 7, 9]
-
-
-def test_several_range():
- r = _parse_cells('1-9', 100)
- assert r == [1, 2, 3, 4, 5, 6, 7, 8, 9]
-
-
-def test_several_limited():
- msg = "Notebook loaded of len 3, smaller than requested cells: [1, 2, 3, 4]"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('1-4', 3)
-
-
-def test_range_default_start():
- r = _parse_cells('-3', 8)
- assert r == [1, 2, 3]
-
-
-def test_range_default_end():
- r = _parse_cells('5-', 8)
- assert r == [5, 6, 7, 8]
-
-
-def test_not_int():
- msg = "Found forbidden characters in cells definition (allowed digits, '-' and ',')"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('1,a', 3)
-
-
-def test_not_positive():
- msg = "Cells need to be >=1"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('3,0', 3)
-
-
-def test_several_mixed():
- r = _parse_cells('1,3,5-7,2,9,11-13', 80)
- assert r == [1, 2, 3, 5, 6, 7, 9, 11, 12, 13]
-
-
-def test_overlapped():
- r = _parse_cells('3,5-7,6-9,8', 80)
- assert r == [3, 5, 6, 7, 8, 9]
-
-
-def test_bad_range_equal():
- msg = "Range 'from' need to be smaller than 'to' (got '12-12')"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('12-12', 80)
-
-
-def test_bad_range_smaller():
- msg = "Range 'from' need to be smaller than 'to' (got '3-2')"
- with pytest.raises(ValueError, match=re.escape(msg)):
- _parse_cells('3-2', 80)
diff --git a/Master/texmf-dist/doc/latex/jupynotex/tests/test_main.py b/Master/texmf-dist/doc/latex/jupynotex/tests/test_main.py
deleted file mode 100644
index fabfa4e01eb..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/tests/test_main.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2020 Facundo Batista
-# All Rights Reserved
-# Licensed under Apache 2.0
-
-import textwrap
-
-import jupynotex
-from jupynotex import main
-
-
-class FakeNotebook:
- """Fake notebook.
-
- The instance supports calling (as it if were instantiated). The .get will return the
- value in a dict for received key; raise it if exception.
- """
-
- def __init__(self, side_effects):
- self.side_effects = side_effects
-
- def __call__(self, path):
- return self
-
- def __len__(self):
- return len(self.side_effects)
-
- def get(self, key):
- """Return or raise the stored side effect."""
- value = self.side_effects[key]
- if isinstance(value, Exception):
- raise value
- else:
- return value
-
-
-def test_simple_ok(monkeypatch, capsys):
- fake_notebook = FakeNotebook({
- 1: ("test cell content up", "test cell content down"),
- })
- monkeypatch.setattr(jupynotex, 'Notebook', fake_notebook)
-
- main('boguspath', '1')
- expected = textwrap.dedent("""\
- \\begin{tcolorbox}[title=Cell {01}]
- test cell content up
- \\tcblower
- test cell content down
- \\end{tcolorbox}
- """)
- assert expected == capsys.readouterr().out
-
-
-def test_simple_only_first(monkeypatch, capsys):
- fake_notebook = FakeNotebook({
- 1: ("test cell content up", ""),
- })
- monkeypatch.setattr(jupynotex, 'Notebook', fake_notebook)
-
- main('boguspath', '1')
- expected = textwrap.dedent("""\
- \\begin{tcolorbox}[title=Cell {01}]
- test cell content up
- \\end{tcolorbox}
- """)
- assert expected == capsys.readouterr().out
-
-
-def test_simple_error(monkeypatch, capsys):
- fake_notebook = FakeNotebook({
- 1: ValueError("test problem"),
- })
- monkeypatch.setattr(jupynotex, 'Notebook', fake_notebook)
-
- main('boguspath', '1')
-
- # verify the beginning and the end, as the middle part is specific to the environment
- # where the test runs
- expected_ini = [
- r"\begin{tcolorbox}[colback=red!5!white,colframe=red!75!,title={ERROR when parsing cell 1}]", # NOQA
- r"\begin{verbatim}",
- r"Traceback (most recent call last):",
- ]
- expected_end = [
- r"ValueError: test problem",
- r"\end{verbatim}",
- r"\end{tcolorbox}",
- ]
- out = [line for line in capsys.readouterr().out.split('\n') if line]
- assert expected_ini == out[:3]
- assert expected_end == out[-3:]
-
-
-def test_multiple(monkeypatch, capsys):
- fake_notebook = FakeNotebook({
- 1: ("test cell content up", "test cell content down"),
- 2: ("test cell content ONLY up", ""),
- })
- monkeypatch.setattr(jupynotex, 'Notebook', fake_notebook)
-
- main('boguspath', '1-2')
- expected = textwrap.dedent("""\
- \\begin{tcolorbox}[title=Cell {01}]
- test cell content up
- \\tcblower
- test cell content down
- \\end{tcolorbox}
- \\begin{tcolorbox}[title=Cell {02}]
- test cell content ONLY up
- \\end{tcolorbox}
- """)
- assert expected == capsys.readouterr().out
diff --git a/Master/texmf-dist/doc/latex/jupynotex/tests/test_notebook.py b/Master/texmf-dist/doc/latex/jupynotex/tests/test_notebook.py
deleted file mode 100644
index bf6511cbd30..00000000000
--- a/Master/texmf-dist/doc/latex/jupynotex/tests/test_notebook.py
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 2020 Facundo Batista
-# All Rights Reserved
-# Licensed under Apache 2.0
-
-import base64
-import json
-import os
-import pathlib
-import re
-import tempfile
-import textwrap
-
-import pytest
-
-from jupynotex import Notebook
-
-
-@pytest.fixture
-def notebook():
- _, name = tempfile.mkstemp()
-
- def _f(cells):
- with open(name, 'wt', encoding='utf8') as fh:
- json.dump({'cells': cells}, fh)
-
- return Notebook(name)
-
- yield _f
- os.unlink(name)
-
-
-def test_empty(notebook):
- nb = notebook([])
- assert len(nb) == 0
-
-
-def test_source_code(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': ['line1\n', ' line2\n'],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- src, _ = nb.get(1)
- expected = textwrap.dedent("""\
- \\begin{verbatim}
- line1
- line2
- \\end{verbatim}
- """)
- assert src == expected
-
-
-def test_source_markdown(notebook):
- rawcell = {
- 'cell_type': 'markdown',
- 'source': ['line1\n', ' line2\n'],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- src, _ = nb.get(1)
- expected = textwrap.dedent("""\
- \\begin{verbatim}
- line1
- line2
- \\end{verbatim}
- """)
- assert src == expected
-
-
-def test_output_missing(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- assert out is None
-
-
-def test_output_simple_executeresult_plain(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'execute_result',
- 'data': {
- 'text/plain': ['default always present', 'line2'],
- },
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- expected = textwrap.dedent("""\
- \\begin{verbatim}
- default always present
- line2
- \\end{verbatim}
- """)
- assert out == expected
-
-
-def test_output_simple_executeresult_latex(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'execute_result',
- 'data': {
- 'text/latex': ['some latex line', 'latex 2'],
- 'text/plain': ['default always present'],
- },
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- expected = textwrap.dedent("""\
- some latex line
- latex 2
- """)
- assert out == expected
-
-
-def test_output_simple_executeresult_image(notebook):
- raw_content = b"\x01\x02 asdlklda3wudghlaskgdlask"
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'execute_result',
- 'data': {
- 'image/png': base64.b64encode(raw_content).decode('ascii'),
- 'text/plain': ['default always present'],
- },
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- m = re.match(r'\\includegraphics\{(.+)\}\n', out)
- assert m
- (fpath,) = m.groups()
- assert pathlib.Path(fpath).read_bytes() == raw_content
-
-
-def test_output_simple_stream(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'stream',
- 'text': ['some text line', 'text 2'],
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- expected = textwrap.dedent("""\
- \\begin{verbatim}
- some text line
- text 2
- \\end{verbatim}
- """)
- assert out == expected
-
-
-def test_output_simple_display_data(notebook):
- raw_content = b"\x01\x02 asdlklda3wudghlaskgdlask"
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'display_data',
- 'data': {
- 'image/png': base64.b64encode(raw_content).decode('ascii'),
- },
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- m = re.match(r'\\includegraphics\{(.+)\}\n', out)
- assert m
- (fpath,) = m.groups()
- assert pathlib.Path(fpath).read_bytes() == raw_content
-
-
-def test_output_multiple(notebook):
- rawcell = {
- 'cell_type': 'code',
- 'source': [],
- 'outputs': [
- {
- 'output_type': 'execute_result',
- 'data': {
- 'text/latex': ['some latex line', 'latex 2'],
- },
- }, {
- 'output_type': 'stream',
- 'text': ['some text line', 'text 2'],
- },
- ],
- }
- nb = notebook([rawcell])
- assert len(nb) == 1
-
- _, out = nb.get(1)
- expected = textwrap.dedent("""\
- some latex line
- latex 2
- \\begin{verbatim}
- some text line
- text 2
- \\end{verbatim}
- """)
- assert out == expected
diff --git a/Master/texmf-dist/doc/latex/jwjournal/README.md b/Master/texmf-dist/doc/latex/jwjournal/README.md
index 6185459348b..f48c6a87458 100644
--- a/Master/texmf-dist/doc/latex/jwjournal/README.md
+++ b/Master/texmf-dist/doc/latex/jwjournal/README.md
@@ -1,7 +1,9 @@
-<!-- Copyright (C) 2023 by Jinwen XU -->
+<!-- Copyright (C) 2023-2024 by Jinwen XU -->
# `jwjournal`, a personal LaTeX class for writing journals
+> Package dependencies: [`enumitem`](https://ctan.org/pkg/enumitem), [*`einfart`*](https://ctan.org/pkg/minimalist), [`minimalist`](https://ctan.org/pkg/minimalist), [`needspace`](https://ctan.org/pkg/needspace), [`projlib`](https://ctan.org/pkg/projlib), [`tcolorbox`](https://ctan.org/pkg/tcolorbox).
+
## Introduction
A typical journal entry produced by `jwjournal` looks like this:
@@ -25,9 +27,9 @@ Codewise, it is as simple as below:
(( <0.45> {example-image-c}
```
-> It is also possible to write the date as `2023/01/01`.
+> It is also possible to write the date with other separators, such as `2023/01/01` or `2023.01.01`.
-> With the options `month-day-year` or `day-month-year`, you can also write date in the format `mm-dd-yyyy` or `dd-mm-yyyy`, respectively. You may refer to the English and French demo documents for examples.
+> With the options `month-day-year` or `day-month-year`, you can also write date in the format `mm-dd-yyyy` or `dd-mm-yyyy`, respectively. You may refer to the English, French and German demo documents for examples.
Every day of the week has its unique color, like this:
![image](https://github.com/Jinwen-XU/jwjournal/raw/main/screenshots/demo2.png)
@@ -44,7 +46,7 @@ By the way, the conversion from plain date string like `2023-01-01` to natural l
The structure of the document is very simple:
```latex
-\documentclass[11pt, paperstyle = light yellow, color entry]{jwjournal}
+\documentclass[11pt, paperstyle = light yellow, color entry, use indent = false]{jwjournal}
\UseLanguage{⟨language⟩} % For English this line can be omitted.
\begin{document}
@@ -62,6 +64,12 @@ The available class options include:
- `color entry` adds more color to the title of each entry;
- `scroll` turns the scroll mode on, which generates a single-page pdf similar to a long screenshot.
+> There are also some relevant options provided by the base class of `jwjournal`:
+> - `use indent = false`: disable the paragraph indentation and add some space between each paragraph instead.
+> - `use style = ⟨provided style⟩`: select the designing style of the current article; for our purpose here, it is recommended to use the style `classical` (with this the option `use indent = false` is added by default), together with the options `title in boldface` and `title in sffamily`, see the comment below regarding the usage of "Section".
+>
+> You may refer to the demo documents to see their actual usage.
+
Here are the major syntaxes for your main text:
1) Title
- Any line begins with date like `2023-01-01` or `2023/01/01` would be regard as the *Title* line.
@@ -70,7 +78,7 @@ Here are the major syntaxes for your main text:
```
2023-01-01 Sunny | Apartment
```
- > With the options `month-day-year` or `day-month-year`, you can also write date in the format `mm-dd-yyyy` or `dd-mm-yyyy`, respectively. You may refer to the English and French demo documents for examples.
+ > With the options `month-day-year` or `day-month-year`, you can also write date in the format `mm-dd-yyyy` or `dd-mm-yyyy`, respectively. You may refer to the English, French and German demo documents for examples.
1) Note
- Any line begins with something like `[Note]` would be regard as the *Note* line.
- Example:
@@ -241,6 +249,12 @@ Language and date format can both be set in two ways: as class option or with co
### Scroll mode
The scroll mode is achieved by directly accessing `\pdfpageheight` (pdfTeX and XeTeX) or `\pageheight` (LuaTeX). The minimal page height is set to be `10in`. It is worth noting that in order to calculate the height needed, the entire content are put into a single box, which puts a limitation on the length of your document (but this usually wouldn't be a problem).
-# License
+
+## Acknowledgement
+
+The author would like to thank his friend Junzhuo Zhao for his valuable help with the German language. Danke schön!
+
+
+## License
This work is released under the LaTeX Project Public License, v1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.pdf b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.pdf
index 010d83d0248..ba83bdf73e8 100644
--- a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.pdf
+++ b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.tex b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.tex
index 213bf34d51e..639fabf9039 100644
--- a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.tex
+++ b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-cn.tex
@@ -14,9 +14,9 @@
在文中出现的日期和标注ä¸ä¼šè¢«è¯†åˆ«ï¼š 2023-12-25ã€[标注]ã€ã€æ ‡æ³¨ã€‘,放心使用ï¼
[文本]
- ä½ å¯ä»¥ä½¿ç”¨*斜体*ã€**粗体**或者***两者结åˆ***。
+ ä½ å¯ä»¥ä½¿ç”¨*斜体*ã€**粗体**或者***两者结åˆ***(具体效果å–决于字体设置)。
\\
- 数学模å¼ä¸‹çš„星å·ä¸ä¼šè¢«è¯†åˆ«ï¼š
+ 数学模å¼ä¸‹çš„星å·ä¸ä¼šè¢«è¯†åˆ«ï¼š$a^* b^*$。
ã€è¯´æ˜Žã€‘ % ã€...】与 [...] 效果相åŒ
在一些特殊情况需è¦æŠŠæ˜Ÿå·ç”¨ \texttt{\{\}} 隔开:**åƒ**{}***è¿™***{}*æ ·*。
diff --git a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.pdf b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.pdf
new file mode 100644
index 00000000000..4f4efc58cc9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.tex b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.tex
new file mode 100644
index 00000000000..ac4ff8b96fc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jwjournal/jwjournal-demo-de.tex
@@ -0,0 +1,118 @@
+\documentclass[11pt, paperstyle=light yellow, color entry, day-month-year,
+ title in boldface, title in sffamily, use style = classical]{jwjournal}
+% "paperstyle = ..." passt die Papierfarbe an, Optionen sind: lightyellowã€yellowã€parchmentã€greenã€lightgrayã€grayã€nordã€dark
+% "color entry" fügt dem Titel jedes Eintrags mehr Farbe hinzu
+% "scroll" schaltet den Scroll-Modus ein und kann ein einseitiges PDF ähnlich einem langen Screenshot generieren
+
+\UseLanguage { German }
+
+\begin{document}
+
+
+01.01.2024 Sonnig | Ort
+
+ Im Text erscheinende Daten und Anmerkungen werden nicht erkannt: 25.12.2023, [Anmerkung], können Sie diese ruhig schreiben.
+
+ [Text]
+ Sie können Text in *kursiv*, **fett** oder ***beides*** schreiben.
+ \\
+ Sternchen im Mathematikmodus werden nicht erkannt: $a^* b^*$.
+
+ [Anmerkung] In einigen Sonderfällen kann es notwendig sein, die Sternchen mit~\texttt{\{\}} zu trennen: **genau**{}***wie***{}*dieses*.
+
+ >>> Sie können Text in einen farbigen Block wie diesen einfügen.
+
+ Bilder können eingefügt über:
+
+ || <.4> {example-image} % oder || {example-image} <.4>
+ >> (Anmerkung zum Bild)
+ >> (Weitere Bemerkung...)
+
+ +++
+ Sie können das Bild auch links oder rechts anzeigen:
+ (( <.4> {example-image-a} % oder (( {example-image-a} <.4>
+ -> <.3> % fügen Sie etwas vertikalen Abstand hinzu, hier ist „0.3\baselineskip“
+ )) <.4> {example-image-b} % oder )) {example-image-b} <.4>
+
+
+## {\textsc{Ein neuer Abschnitt}}
+
+02.01.2024
+Unbekannt (das Wetter kann je nach Wunsch auch in die zweite Zeile geschrieben werden)
+
+ Die Farbe der Beschriftungen ändert sich je nach Datum und langer Text wird automatisch umbrochen und eingerückt:
+
+ [Hinweis] Ich habe heute nicht gelernt, aber ich habe sehr, sehr, sehr, sehr, sehr, sehr, sehr, sehr, sehr, sehr, sehr viel Code geschrieben: `Inline-Code`.
+
+ [Achtung] Sonderzeichen im Inline-Code müssen maskiert werden. Beispielsweise sollte `\textbackslash` als `\textbackslash textbackslash` geschrieben werden, `\{` sollte als `\textbackslash\{` geschrieben werden, `\%` sollte als `\textbackslash\%` geschrieben werden usw.
+
+ -----
+
+ Drei oder mehr \textquote{\texttt{-}} in einem separaten Absatz ergeben eine Trennlinie ---
+
+ ---
+
+ --- aber die aktuelle Zeile wird nicht abgeglichen, da sich hinter \texttt{-}\texttt{-}\texttt{-} zusätzlicher Text befindet.
+
+ -----
+
+ Wenn auf die Beschriftung mehrere Absätze folgen, können Sie \texttt{\textbackslash\textbackslash} und \texttt{\slash\slash} verwenden, um sie zu verketten, sodass alle Texte richtig eingerückt werden:
+
+ [Beschriftung] Etwas Text.
+ //
+ Mehr Text (mit \texttt{\slash\slash}, also mit etwas vertikalem Abstand zum obigen Text).
+ //
+ Mehr Text (dasselbe, mit etwas vertikalem Abstand zum obigen Text).
+ //
+ (Einige Anmerkungen)
+ \\
+ (Eine weitere Anmerkung, die aufgrund der Verwendung von \texttt{\textbackslash\textbackslash} direkt neben der obigen Anmerkung)
+ \\
+ (Weitere Anmerkungen --- ähnlich, direkt neben der obigen Anmerkung)
+
+
+
+03.01.2024
+
+ [Anmerkung] Wenn nur das Datum geschrieben wird, dann gäbe es kein zweites Trennzeichen danach.
+
+
++++
+04.01.2024 Bewölkt
+
+ Drei Pluszeichen \texttt{+++} können die aktuelle Seite um etwa eine Zeile vergrößern. Manchmal fallen ein einzelner Satz oder ein paar Wörter auf die nächste Seite --- in solchen Fällen können Sie es verwenden, um den Anzeigeeffekt zu verbessern.
+
+
+
+05.01.2024 Bewölkt --- Arbeit zu Hause
+===============================================
+
+Sie können Ihren Code auch so organisieren.
+
+
+==========
+06.01.2024 Sonnig --- Arbeit zu Hause
+==========
+
+Oder so...
+
+
+
+07.01.2024 Bewölkt
+
+ ...
+
+
+
+08.01.2024 Bewölkt
+
+ Eine Woche später wird die Farbe wieder auf die vorherige zurückgesetzt.
+
+
+
+09.01.2024 Bewölkt
+
+ ...
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/keytheorems/CHANGELOG.md b/Master/texmf-dist/doc/latex/keytheorems/CHANGELOG.md
new file mode 100644
index 00000000000..5183d6cd2b8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/keytheorems/CHANGELOG.md
@@ -0,0 +1,44 @@
+# Changelog for keytheorems package
+
+## [v0.1.6]
+- add `\renewkeytheorem`, `\providekeytheorem`, and `\declarekeytheorem`
+- tcolorbox theorems no longer error with beamer
+- add support for beamer action spec
+
+## [v0.1.5]
+- add `format-code` list key
+- can now use `\thmname`, `\thmnumber`, `\thmnote` in `headformat`
+
+## [v0.1.4]
+- add `store-sets-label` option
+- add `restatable*` environment for `thmtools-compat`
+- add `numberfont` style key
+- add `restate-keys` key
+- styles defined with `\newkeytheoremstyle` now work as expected with `\theoremstyle`
+
+## [v0.1.3]
+- add `noteseparator` key
+- add `\IfRestatingT`, `\IfRestatingF`
+- add `store*` key
+- add Portuguese translations
+
+## [v0.1.2]
+- Move support for memoir and AMS classes to dedicated files
+- document `headformat` key
+- add Italian translations
+- add `indent` list key
+- add `no-toc` list key
+- documentation improvements
+
+## [v0.1.1] - 2024-09-09
+- First CTAN release
+
+## 0.1.0 - 2024-09-04
+- First release
+
+[v0.1.6]: https://github.com/mbertucci47/keytheorems/compare/v0.1.5...v0.1.6
+[v0.1.5]: https://github.com/mbertucci47/keytheorems/compare/v0.1.4...v0.1.5
+[v0.1.4]: https://github.com/mbertucci47/keytheorems/compare/v0.1.3...v0.1.4
+[v0.1.3]: https://github.com/mbertucci47/keytheorems/compare/v0.1.2...v0.1.3
+[v0.1.2]: https://github.com/mbertucci47/keytheorems/compare/v0.1.1...v0.1.2
+[v0.1.1]: https://github.com/mbertucci47/keytheorems/compare/v0.1.0...v0.1.1 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/keytheorems/README.md b/Master/texmf-dist/doc/latex/keytheorems/README.md
new file mode 100644
index 00000000000..a8f56bd507f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/keytheorems/README.md
@@ -0,0 +1,609 @@
+# keytheorems
+
+A LaTeX package to use [`amsthm`](https://www.ctan.org/pkg/amsthm)
+with a key-value interface.
+Provides most of the functionality of [`thmtools`](https://www.ctan.org/pkg/thmtools) (and a bit more!) but written in expl3.
+If you find a bug please open an issue or pull request.
+
+The package is maintained by Matthew Bertucci.
+
+## Sample document
+```tex
+\documentclass{article}
+\usepackage{amssymb,amsmath}
+\usepackage{keytheorems}
+\usepackage{hyperref}
+
+\newkeytheoremstyle{mystyle}{
+ % <insert options>
+ }
+\newkeytheorem{theorem}[
+ style=mystyle,
+ parent=section
+ ]
+\newkeytheorem{remark}[
+ style=remark,
+ numbered=no
+ ]
+
+\begin{document}
+
+\section{Some theorems}
+
+\begin{theorem}[
+ note=Strong Bertini over $\mathbb{C}$,
+ label=strongbertini
+ ]
+Let $X$ be a smooth complex variety and let $\mathfrak{D}$ be a positive
+dimensional linear system on $X$. Then the general element of $\mathfrak{D}$ is
+smooth away from the base locus $B_{\mathfrak{D}}$. That is, the set
+ \[\{H\in\mathfrak{D}\mid D_H \text{ is smooth away from } B_{\mathfrak{D}}\}\]
+is a Zariski dense open subset of $\mathfrak{D}$.
+\end{theorem}
+
+\begin{remark}
+In fact, \autoref{strongbertini} holds over any algebraically closed field of
+characteristic zero.
+\end{remark}
+
+\begin{theorem}[Bertini over any field]
+Let $X\subset\mathbb{P}_k^n$ be a smooth projective variety over a field $k$.
+Then the set of hyperplanes $H\subseteq\mathbb{P}_k^n$ such that $X\cap H$ is
+smooth is a Zariski dense open subset of $(\mathbb{P}_k^n)^*$.
+\end{theorem}
+
+\listofkeytheorems
+
+%%% compare with
+%\listofkeytheorems[ignoreall,show=theorem]
+%\listofkeytheorems[swapnumber]
+%\listofkeytheorems[title=BLUB]
+%\listofkeytheorems[print-body] % needs 'store-all' package option
+
+\end{document}
+```
+
+## Documentation
+There is a list of commands and keys offered by the package
+[here](https://github.com/mbertucci47/keytheorems/blob/main/doc/keytheorems-doc.pdf).
+More of a reference document than documentation.
+
+## Differences with thmtools
+
+Some of the code is a direct translation from thmtools but a few things are changed:
+- The only backend supported is amsthm, and it is loaded by the package. As I understand it,
+ [`ntheorem`](https://www.ctan.org/pkg/ntheorem) has quite a few bugs and no active development, and
+ if you're just using the kernel `\newtheorem` then you don't need a package like this.
+- Theorem hooks use the kernel hooks. Thus unlike the `prefoot` and `postfoot` hooks of
+ thmtools, all code chunks are added to hooks in the order declared (unless given a
+ distinct label; then the chunks are reversed). The order of generic/specific hooks
+ remains the same. Furthermore, the command for adding to theorem hooks is `\addtotheoremhook{<hook name>}{<theorem name>}`.
+- thmtools changes some style settings to be default that are different from
+ amsthm defaults, but only if a custom style is called. Example:
+ ```tex
+ \declaretheoremstyle[spaceabove=20pt]{mythmsty}
+ \declaretheorem[style=mythmsty]{mythm}
+ ```
+
+ is different from just
+
+ ```tex
+ \declaretheorem{mythm}
+ ```
+
+ as in the former, `bodyfont` is `\normalfont`, not the default `\itshape`.
+ This package keeps the defaults unless a key is specifically given.
+- There is no `restatable(*)` environment except with package option `thmtools-compat`. Use the
+ `store` (alias `restate`) key. For counters and labels pointing to the restated theorem,
+ use `store*` (alias `restate*`).
+- Rather than `restate=foo` defining a command `\foo*`, theorems are retrieved with `\getkeytheorem{foo}`.
+ For just the theorem body, use `\getkeytheorem[body]{foo}`. Also, this retrieval
+ can happen even before the theorem is stated since keytheorems writes the contents
+ to a file.
+- The `shaded` and `thmbox` keys are only available with the package option `thmtools-compat`,
+ and they are emulated with [`tcolorbox`](https://www.ctan.org/pkg/tcolorbox). Instead there's
+ an interface to tcolorbox with the `tcolorbox={<options>}` and `tcolorbox-no-titlebar={<options>}` key.
+ The `mdframed` key is not implemented.
+- You can reuse styles with the `inherit-style` key.
+- With thmtools, the command `\newtheorem{<envname>}{<heading>}` is changed to behave like
+ `\declaretheorem[name=<heading>]{<envname>}`. This is not the default here. Instead either
+ only use the new interface or load the package with option `overload`.
+- Adds several new keys (see doc for details).
+
+## thmtools issues resolved by keytheorems
+Issues from the thmtools [github page](https://github.com/muzimuzhi/thmtools),
+with corresponding keytheorems code that shows the issue resolved.
+### [\listoftheorems: filter out restated ones #7](https://github.com/muzimuzhi/thmtools/issues/7)
+keytheorems does not list restated theorems in the `\listofkeytheorems`.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}[store=foo]
+text
+\end{theorem}
+
+\getkeytheorem{foo}
+
+\listofkeytheorems
+
+\end{document}
+```
+
+### [\listoftheorems: hide title #8](https://github.com/muzimuzhi/thmtools/issues/8)
+keytheorems provides the `no-title` key.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{axiom}
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\listofkeytheorems[ignoreall,show=axiom]
+\listofkeytheorems[ignoreall,show=theorem,no-title]
+
+\begin{axiom}
+some axiom
+\end{axiom}
+
+\begin{theorem}
+some theorem
+\end{theorem}
+
+\begin{axiom}
+another axiom
+\end{axiom}
+
+\begin{theorem}
+another theorem
+\end{theorem}
+
+\end{document}
+```
+
+### [Case in point: the tcolorbox key #9](https://github.com/muzimuzhi/thmtools/issues/9)
+keytheorems provides the `tcolorbox` and `tcolorbox-no-titlebar` keys.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{theorem}[
+ tcolorbox={
+ colback=blue!10,
+ colframe=blue!75
+ }
+ ]
+\newkeytheorem{corollary}[
+ tcolorbox-no-titlebar={colback=red!10}
+ ]
+
+\begin{document}
+
+\begin{theorem}
+some theorem
+\end{theorem}
+
+\begin{corollary}
+some corollary
+\end{corollary}
+
+\end{document}
+```
+
+### [thm-listof: document \thmtformatoptarg, new list option? #14](https://github.com/muzimuzhi/thmtools/issues/14)
+keytheorems provides the `note-code` key for `\listofkeytheorems` and
+`\keytheoremlistset`.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}[my heading]
+some theorem
+\end{theorem}
+
+\listofkeytheorems[note-code={ [\textit{#1}]}]
+
+\end{document}
+```
+
+### [Style inheritance in thmtools #15](https://github.com/muzimuzhi/thmtools/issues/15)
+keytheorems provides the `inherit-style` key.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheoremstyle{mysty1}{notefont=\itshape}
+\newkeytheoremstyle{mysty2}{inherit-style=mysty1,bodyfont=\normalfont}
+\newkeytheorem{theorem}[style=mysty1]
+\newkeytheorem{corollary}[style=mysty2]
+
+\begin{document}
+
+\begin{theorem}[my heading]
+some theorem
+\end{theorem}
+
+\begin{corollary}[my heading]
+some corollary
+\end{corollary}
+
+\end{document}
+```
+
+### [Restate without theorem headings (head + note) #19](https://github.com/muzimuzhi/thmtools/issues/19)
+Use `\getkeytheorem[body]{foo}`.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}[store=hello]
+Hello!
+\end{theorem}
+
+\getkeytheorem{hello}
+
+\section{\getkeytheorem[body]{hello}}
+
+\end{document}
+```
+
+### [Option clash: numbered=no and thmbox #25](https://github.com/muzimuzhi/thmtools/issues/25)
+Fixed with keytheorem's implementation of the `thmbox` key with `thmtools-compat`.
+```tex
+\documentclass{article}
+\usepackage[thmtools-compat]{keytheorems}
+
+\declaretheorem[numbered=no, name=TheoremA, ]{mytheo1}
+\declaretheorem[ name=TheoremB, thmbox=M]{mytheo2}
+\declaretheorem[numbered=no, name=TheoremC, thmbox=M]{mytheo3}
+
+\begin{document}
+
+\begin{mytheo1}
+ test1
+\end{mytheo1}
+
+\begin{mytheo2}
+ test2
+\end{mytheo2}
+
+\begin{mytheo3}
+ test3
+\end{mytheo3}
+
+\end{document}
+```
+
+### [Skip the title of the theorem but leave the []. #30](https://github.com/muzimuzhi/thmtools/issues/30)
+Fixed in keytheorems.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{Teorema}[name=Theorem]
+
+\begin{document}
+
+\begin{Teorema}
+ body
+\end{Teorema}
+
+\begin{Teorema}[]
+ body
+\end{Teorema}
+
+\begin{Teorema}[title]
+ body
+\end{Teorema}
+
+\end{document}
+```
+
+### [too much space with restatable #40](https://github.com/muzimuzhi/thmtools/issues/40)
+Fixed in keytheorems.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+\usepackage{kantlipsum}
+
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}
+\kant[2][1]
+\end{theorem}
+
+\begin{theorem}[store=foo]
+\kant[1][2]
+\end{theorem}
+
+\begin{theorem}
+\kant[2][1]
+\end{theorem}
+
+\getkeytheorem{foo}
+
+\end{document}
+```
+
+### [restate key with no name leads to (,) in restated title #41](https://github.com/muzimuzhi/thmtools/issues/41)
+Fixed in keytheorems.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+\usepackage{kantlipsum}
+
+\newkeytheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}[restate=foo]
+\kant[1][2]
+\end{theorem}
+
+\getkeytheorem{foo}
+
+\begin{theorem}[restate=foobar,name=Heading]
+\kant[2][1]
+\end{theorem}
+
+\getkeytheorem{foobar}
+
+\end{document}
+```
+### [[Help Wanted] Print all Theorems? #43](https://github.com/muzimuzhi/thmtools/issues/43)
+Use the `store-all` load-time option with `\listofkeytheorems[print-body]`.
+```tex
+\documentclass{article}
+\usepackage[store-all]{keytheorems}
+
+\newkeytheorem{theorem}
+\newkeytheorem{lemma}
+
+\begin{document}
+
+\begin{theorem}
+some theorem
+\end{theorem}
+
+\begin{lemma}
+some lemma
+\end{lemma}
+
+\listofkeytheorems[print-body]
+
+\end{document}
+```
+
+### [qed option without value fails in \declaretheoremstyle #47](https://github.com/muzimuzhi/thmtools/issues/47)
+Fixed in keytheorems.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheoremstyle{mythmsty}{qed}
+\newkeytheorem{theorem}[style=mythmsty]
+
+\begin{document}
+
+\begin{theorem}
+Text
+\end{theorem}
+
+\end{document}
+```
+
+### [prefoot and postfoot hooks called twice with restate key #54](https://github.com/muzimuzhi/thmtools/issues/54)
+Fixed in keytheorems.
+```tex
+\documentclass{article}
+\usepackage{keytheorems}
+
+\newkeytheorem{theorem}
+
+\addtotheoremhook{prehead}{PREHEAD}
+\addtotheoremhook{posthead}{POSTHEAD}
+\addtotheoremhook{prefoot}{PREFOOT}
+\addtotheoremhook{postfoot}{POSTFOOT}
+
+\begin{document}
+
+\begin{theorem}
+body text
+\end{theorem}
+
+\begin{theorem}[store=foo]
+body text
+\end{theorem}
+
+\end{document}
+```
+
+### [restate key incompatible with beamer #58](https://github.com/muzimuzhi/thmtools/issues/58)
+```tex
+\documentclass{beamer}
+\setbeamertemplate{theorems}[numbered]
+\usepackage{keytheorems}
+
+\newkeytheorem{MyTheorem}
+
+\begin{document}
+
+\begin{frame}
+\begin{MyTheorem}[restate=foo]
+text
+\end{MyTheorem}
+
+\getkeytheorem{foo}
+\end{frame}
+
+\end{document}
+```
+
+## Notes/issues on thmtools, not on Github
+
+### continues with unless unique and restate
+Should this be numbered or not?
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheorem[numbered=unless unique]{theorem}
+
+\begin{document}
+
+\begin{theorem}[label=foo]
+bla
+\end{theorem}
+
+\begin{theorem}[continues=foo]
+bla
+\end{theorem}
+
+\end{document}
+```
+It does the correct thing when a parent counter is given and is split across that counter.
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheorem[numbered=unless unique,parent=section]{theorem}
+
+\begin{document}
+
+\begin{theorem}[label=foo]
+bla
+\end{theorem}
+
+\section{bla}
+
+\begin{theorem}[continues=foo]
+bla
+\end{theorem}
+
+\end{document}
+```
+Also adds a number if restated, which seems wrong.
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheorem[numbered=unless unique]{theorem}
+
+\begin{document}
+
+\begin{restatable}{theorem}{foo}
+bla
+\end{restatable}
+
+\foo*
+
+\end{document}
+```
+
+### qed in both `\declaretheoremstyle` and `\declaretheorem`
+One would expect the one in `\declaretheorem` to overwrite, but because the code just adds to the hooks without checking,
+it's additive.
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheoremstyle[qed=$\clubsuit$]{mysty}
+\declaretheorem[style=mysty,qed]{theorem}
+
+\begin{document}
+
+\begin{theorem}
+bla
+\end{theorem}
+
+\end{document}
+```
+
+### restate incompatible with thmbox
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheorem[thmbox]{theorem}
+
+\begin{document}
+
+\begin{theorem}[restate=foo]
+bla
+\end{theorem}
+
+\foo*
+
+\end{document}
+```
+
+### adding to listoftheorems doesn't work as expected
+```tex
+\documentclass{article}
+\usepackage{amsthm,thmtools}
+
+\declaretheorem{theorem}
+
+\begin{document}
+
+\begin{theorem}
+bla
+\end{theorem}
+
+\addcontentsline{loe}{section}{some text}
+
+\begin{theorem}
+bla
+\end{theorem}
+
+\listoftheorems
+
+\end{document}
+```
+
+### new theorem styles do not preserve "plain" keys
+With keytheorems, this is handled only for the AMS classes and acmart.
+```tex
+\documentclass{amsbook}
+\usepackage{thmtools}
+
+\declaretheoremstyle[bodyfont=\upshape]{upsty}
+\declaretheorem{theorem}
+\declaretheorem[style=upsty]{lemma}
+
+\begin{document}
+
+\begin{theorem}
+blub
+\end{theorem}
+
+\begin{lemma}
+blub
+\end{lemma}
+
+\end{document}
+```
+
+## Things to do
+
+- Clean up the code. Things are out of order, poorly named, etc.
+- For a complete list, see [`keytheorems-ideas.md`](https://github.com/mbertucci47/keytheorems/blob/main/keytheorems-ideas.md)
+
+## License
+Released under the LaTeX Project Public License v1.3c or later. See https://www.latex-project.org/lppl.txt. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.pdf b/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.pdf
new file mode 100644
index 00000000000..618f53722cb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.tex b/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.tex
new file mode 100644
index 00000000000..546435fd596
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/keytheorems/keytheorems-doc.tex
@@ -0,0 +1,1157 @@
+% !TeX program = txs:///lualatex | txs:///makeindex | txs:///lualatex | txs:///view-pdf
+\PassOptionsToPackage{hyperindex}{hyperref}
+\PassOptionsToPackage{dvipsnames}{xcolor}
+\documentclass{ltxdoc}
+\usepackage{geometry}
+\geometry{margin=1.5in}
+\usepackage{tcolorbox}
+\tcbuselibrary{documentation,minted,breakable,hooks}
+\tcbset{
+ listing engine=minted,
+ minted language=latex,
+ }
+\ifTUTeX
+\usepackage{newcomputermodern}
+\else
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage{amssymb}
+\fi
+\usetikzlibrary{cd}
+\usepackage{booktabs}
+\usepackage{keytheorems}
+\usepackage{cleveref}
+
+\def\version{0.1.6}
+
+\title{%
+ \pkg{keytheorems} package \\[1ex]
+ \large version \version \\[1ex]
+ \href{https://github.com/mbertucci47/keytheorems}
+ {\texttt{github.com/mbertucci47/keytheorems}}
+ }
+\author{Matthew Bertucci}
+
+\newkeytheoremstyle{breaksty}{break}
+\newkeytheorem{theorem}
+\newkeytheorem{mythm}[name=Some Name]
+\newkeytheorem{theorem*}[name=Theorem,numbered=false]
+\newkeytheorem{conjecture}[parent=section]
+\newkeytheorem{lemma}[sibling=theorem]
+\newkeytheorem{test}[
+ preheadhook=PREHEAD,
+ postheadhook=POSTHEAD,
+ prefoothook=PREFOOT,
+ postfoothook=POSTFOOT
+]
+\newkeytheorem{prop}[
+ name=Proposition,
+ refname={proposition,propositions},
+ Refname={Proposition,Propositions}
+ ]
+\newkeytheorem{example}[qed]
+\newkeytheorem{solution}[qed=$\clubsuit$]
+\newkeytheorem{remark}[style=remark]
+\tcbset{
+ defstyle/.style={arc=0mm,colback=blue!5!white,colframe=blue!75!black},
+ thmstyle/.style={colback=green!5,colframe=green!35!black},
+ }
+\newkeytheoremstyle{tcb-standard}{
+ tcolorbox=thmstyle,
+ headpunct={},
+ notebraces={}{},
+ noteseparator={: },
+ notefont=\bfseries,
+ bodyfont=\normalfont,
+ }
+\newkeytheorem{mytheo}[name=My Theorem,style=tcb-standard]
+\newkeytheorem{corollary}[tcolorbox]
+\newkeytheorem{definition}[
+ style=definition,
+ tcolorbox={defstyle}
+ ]
+\newkeytheorem{boxcor}[
+ tcolorbox-no-titlebar={colback=red!10},
+ name=Corollary,
+ sibling=corollary,
+ ]
+\newkeytheorem{observation}[style=breaksty]
+
+\MakeShortVerb{\|}
+\newcommand{\env}{\texttt}
+\newcommand{\hook}{\texttt}
+\NewCommandCopy{\braces}{\brackets}
+\newcommand{\bracks}[1]{\texttt{[#1]}}
+\newcommand{\ttbraces}[1]{\braces{\texttt{#1}}}
+%\tcbset{index gather commands=false}
+\colorlet{ExampleBack}{yellow!10}
+\tcbset{
+ color command=BrickRed,
+ color key=Fuchsia,
+ color value=teal,
+ before doc body={%
+ \setlength{\parindent}{15pt}
+ \noindent
+ },
+ docexample/.append style={boxrule=0pt,arc=0pt,after app={\noindent}}
+ }
+\tcbset{
+ withpreamble/.style = {
+ before upper = {%
+ {\ttfamily\itshape \% preamble}%
+ \vspace{-0.7\baselineskip}%
+ \tcbusetemplisting%
+ {\ttfamily\itshape \% document}%
+ \vspace{-0.7\baselineskip}%
+ }
+ }
+ }
+
+\NewTCBListing{keythmscode}{ O{} }
+ {
+ colback=ExampleBack,
+ arc=0pt,
+ boxrule=0pt,
+% listing side text,
+% lower separated=false,
+ skin=bicolor,
+ colbacklower=yellow!25,
+ breakable,
+% enhanced,
+% segmentation engine=path,
+% segmentation style={solid,gray},
+ #1
+ }
+\newtcolorbox{notebox}[1][]{enhanced,
+ before skip balanced=2mm,after skip balanced=4mm,
+ boxrule=0.4pt,left=5mm,right=2mm,top=1mm,bottom=1mm,
+ colback=red!20,
+ colframe=red!40!black,
+ sharp corners,rounded corners=southeast,arc is angular,arc=3mm,
+ underlay={%
+ \path[fill=tcbcolback!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2);
+ \path[draw=tcbcolframe,shorten <=-0.05mm,shorten >=-0.05mm] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2);
+ \path[fill=red!40!black,draw=none] (interior.south west) rectangle node[white]{\LARGE\bfseries !} ([xshift=4mm]interior.north west);
+ },
+ drop fuzzy shadow,#1}
+\makeatletter
+% allow for optional argument specifying printed text, mostly for starred keys
+\RenewDocumentCommand\tcb@ref@doc{msom}{%
+ \hyperref[{#1:#4}]{%
+ \IfValueTF{#3}{\texttt{#3}}{\texttt{\ref*{#1:#4}}}%
+ \IfBooleanTF{#2}{}{%
+ \ifnum\getpagerefnumber{#1:#4}=\thepage\relax%
+ \else%
+ \kvtcb@doc@format@page{{\fontfamily{pzd}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont\char213}%
+ \,\kvtcb@text@pageshort\,\pageref*{#1:#4}}%
+ \fi}}%
+}
+\makeatother
+\makeindex
+
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+An \pkg{expl3}-implementation of a key-value interface to \pkg{amsthm}, implementing most of the functionality provided by \pkg{thmtools}.
+Several issues encountered with \pkg{thmtools} are avoided (see the README for a list) and a few new features are added.
+\end{abstract}
+
+\tableofcontents
+
+\section{Dependencies}
+
+The package depends on the \pkg{aliascnt}, \pkg{amsthm}, \pkg{refcount}, \pkg{translations} packages.
+The \refKey{tcolorbox} and \refKey{tcolorbox-no-titlebar} keys require \pkg{tcolorbox}, and the \refKey[numbered=unless-unique]{numbered} key requires the \pkg{unique} package.
+A \LaTeX{} kernel no older than 2023-06-01 is required; if older than 2024-06-01, \pkg{nameref} is required.
+
+\section{Global options}
+
+\begin{docCommand}{keytheoremset}
+ {\marg{options}}
+Every key in this section can be given as an option to \cs{usepackage} or in \cs{keytheoremset}, with the exception that \refKey{continues-code} can only be used in the latter.
+\end{docCommand}
+
+\subsection{Compatibility options}
+
+\begin{docKey}{overload}
+ {}
+ {initially unset}
+Redefines \cs{newtheorem} to internally use the \pkg{keytheorems} machinery. The syntax remains the same.
+This is automatically set by \refKey{thmtools-compat}.
+\end{docKey}
+
+\begin{docKey}{thmtools-compat}
+ {}
+ {initially unset}
+For compatibility with \pkg{thmtools} syntax.
+For most documents,
+\begin{dispListing}
+\usepackage[thmtools-compat]{keytheorems}
+\end{dispListing}
+should be a drop-in replacement for \cs{usepackage}\ttbraces{amsthm,thmtools}.
+The option defines the commands in the left column below.
+The right column lists the corresponding \pkg{keytheorems} replacement that should be used in new documents.
+\begin{center}
+\begin{tabular}{rcl}
+\multicolumn{1}{c}{\pkg{thmtools} command} & & \multicolumn{1}{c}{\pkg{keytheorems} replacement} \\
+\toprule
+\docAuxCommand*{declaretheorem} & $\rightarrow$ & \refCom{newkeytheorem} \\
+\docAuxCommand*{declaretheoremstyle} & $\rightarrow$ & \refCom{newkeytheoremstyle} \\
+\docAuxCommand*{listoftheorems} & $\rightarrow$ & \refCom{listofkeytheorems} \\
+\docAuxCommand*{listtheoremname} & $\rightarrow$ & \refKey{title} key \\
+\begin{tabular}{r@{}}
+\docAuxCommand*{addtotheorempreheadhook}\\
+\docAuxCommand*{addtotheorempostheadhook}\\
+\docAuxCommand*{addtotheoremprefoothook}\\
+\docAuxCommand*{addtotheorempostfoothook}\\
+\end{tabular} & $\rightarrow$ & \refCom{addtotheoremhook} \\
+\docAuxEnvironment*{restatable} environment & $\rightarrow$ & \refKey{store} key \\
+\docAuxEnvironment*{restatable*} environment & $\rightarrow$ & \refKey[store*]{store} key
+\end{tabular}
+\end{center}
+Also defined are the \docAuxKey*{shaded} and \docAuxKey*{thmbox} keys, implemented internally with \pkg{tcolorbox} rather than the \pkg{shadethm} and \pkg{thmbox} packages, respectively.
+\end{docKey}
+
+\subsection{Other global options}
+
+\begin{docKey}{auto-translate}
+ {\colOpt{=true\textbar false}}
+ {default |true|, initially |true|}
+If |false|, \pkg{keytheorems} does not automatically translate the title text used for \refCom{listofkeytheorems} and the note produced by the \refKey{continues} key.
+These texts can be manually customized with the \refKey{title} and \refKey{continues-code} keys, respectively.
+\end{docKey}
+
+\begin{docKey}{continues-code}
+ {=\meta{code with \textup{\texttt{\#1}}}}
+ {initially\\ \cs{GetTranslation}\ttbraces{keythms\string_continues}\cs{pageref}\ttbraces{\#1}}
+The code used to typeset the note produced by the \refKey{continues} key.
+If English or an unknown language is used, defaults to \texttt{continuing from p.}\cs{,}\cs{pageref}\ttbraces{\#1}.
+Currently (likely inaccurate!) translations exist for French, German, Italian, Portuguese, and Spanish.
+\end{docKey}
+
+\begin{docKey}{qed-symbol}
+ {=\meta{symbol}}
+ {initially \cs{openbox}}
+Redefines \cs{qedsymbol} to be \meta{symbol}.
+\end{docKey}
+
+\begin{docKey}{restate-counters}
+ {=\marg{comma-list of counters}}
+ {initially \ttbraces{equation}}
+Additional counters whose values are preserved when a theorem is restated.
+This key does not reset the list, so you don't need to include |equation| in \meta{comma-list}.
+\end{docKey}
+
+\begin{docKey}{store-all}
+ {}
+ {initially unset}
+Tells \pkg{keytheorems} to grab the body of each theorem so it can later be printed with the \refKey{print-body} option of \refCom{listofkeytheorems}.
+Note that this means a theorem body \emph{cannot} contain verbatim material.
+\end{docKey}
+
+\begin{docKey}{store-sets-label}
+ {}
+ {initially unset}
+Defines the \refKey{store} key to also set \refKey{label}, i.e. it makes |store=|\meta{tag} equivalent to |store=|\meta{tag}|,label=|\meta{tag}. Similarly for \refKey[store*]{store}.
+\end{docKey}
+
+\section{Defining theorems}
+
+\begin{docCommand}{newkeytheorem}
+ {\marg{env name}\oarg{options}}
+Defines a theorem environment \meta{env name} which itself takes a few options (see \autoref{in-doc-keys}).
+You can also declare multiple theorems at once by replacing \meta{env name} with a comma-list of names, e.g.
+\begin{center}
+\cs{newkeytheorem}\ttbraces{theorem,lemma,proposition}\bracks{\meta{options}}.
+\end{center}
+
+By default, the theorem's printed name is a title-cased \meta{env name}.
+This can be changed with the \refKey{thm/name} key.
+All \meta{options} are described in subsections \ref{thm-thmtools-keys} and \ref{thm-added-keys}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{theorem}
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{theorem}
+Some text
+\end{theorem}
+\end{keythmscode}
+
+\end{docCommand}
+
+\begin{docCommands}[
+ doc parameter=\marg{env name}\oarg{options}
+ ]
+ {
+ {doc name = renewkeytheorem},
+ {doc name = providekeytheorem},
+ {doc name = declarekeytheorem},
+ }
+Sometimes a package or class defines theorems that need to be overwritten by the user. For this case, \pkg{keytheorems} provides \cs{renewkeytheorem} which redefines \meta{env name} or errors if it is not defined. For completeness, also provided are \cs{providekeytheorem} and \cs{declarekeytheorem}. The former only defines \meta{env name} if it is not already defined; the latter always overwrites \meta{env name}.
+\end{docCommands}
+
+\subsection{Keys available to theorem environments} \label{in-doc-keys}
+
+As in \pkg{amsthm}, theorems can take an optional argument that contains a note or heading.
+
+\begin{keythmscode}[]
+\begin{theorem}[some heading]
+Some text
+\end{theorem}
+\end{keythmscode}
+
+Alternatively, the optional argument may contain any of the following keys.
+
+\begin{docKey}{note}
+ {=\meta{text}}
+ {initially unset}
+Alias \docAuxKey[][doc label=thmuse/name]{name}.
+This is the key-value equivalent of the optional argument described above.
+This syntax, however, allows the argument to contain other keys.
+
+\begin{keythmscode}[]
+\begin{theorem}[note=another heading]
+Some more text
+\end{theorem}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{short-note}
+ {=\meta{text}}
+ {initially unset}
+Alias \docAuxKey{short-name}.
+This replaces the value of \refKey{note} when displayed in the list of theorems (\refCom{listofkeytheorems}).
+\end{docKey}
+
+\begin{docKey}{label}
+ {=\meta{label name}}
+ {initially unset}
+This is the key-value equivalent of |\begin{theorem}| \cs{label}\marg{label name}.
+
+\begin{keythmscode}[]
+\begin{theorem}[label=foo]
+Some text
+\end{theorem}
+\ref{foo}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{continues}
+ {\sarg=\meta{label name}}
+ {initially unset}
+Pick up a theorem where you left off.
+The theorem number remains the same.
+The printed text can be customized with the \refKey{continues-code} option.
+The starred version also copies the theorem note, if it exists.
+
+\begin{keythmscode}[]
+\begin{theorem}[continues=foo]
+\dots and some more text.
+\end{theorem}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{store}
+ {\sarg=\meta{tag}}
+ {initially unset}
+Alias \docAuxKey{restate}\sarg.
+Stores the the theorem to be restated at any point in the document with \refCom{getkeytheorem}.
+With the starred version, counters and labels are taken from the copy called with \cs{getkeytheorem}, so in this case can only be restated once.
+This allows you, for example, to write all theorems and proofs in the appendix and call \cs{getkeytheorem} at the appropriate time mid-document.
+For the numbering to be correct, the unstarred key will need at most two runs and the starred key at most three runs.
+
+\begin{keythmscode}[]
+\begin{theorem}[store=blub]
+A theorem worth restating.
+\end{theorem}
+More brilliant mathematics.
+\getkeytheorem{blub}
+\end{keythmscode}
+
+A theorem given this key \emph{cannot} contain verbatim material or other unexpected catcodes, such as a \pkg{tikz-cd} diagram.
+The latter issue can be averted with the \texttt{ampersand-replacement} key.
+
+\begin{tcbwritetemp}
+\usepackage{tikz}
+\usetikzlibrary{cd}
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{lemma}[store=diagram]
+Some commutative diagram:
+\[\begin{tikzcd}[ampersand replacement=\&]
+X\times_S Y \ar[r] \ar[d] \& X \ar[d] \\
+Y \ar[r] \& S
+\end{tikzcd}\]
+\end{lemma}
+\dots
+\getkeytheorem{diagram}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{restate-keys}
+ {=\marg{list of keys}}
+ {initially unset}
+Allows passing different keys to the restated theorem.
+At the moment this is only useful with the \refKey{note} key.
+
+\begin{keythmscode}[]
+\begin{theorem}[
+ store=rktest,
+ note=ORIGINAL,
+ restate-keys={note=RESTATED}]
+Wow, yet another theorem.
+\end{theorem}
+\getkeytheorem{rktest}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{listhack}
+ {=\docValue*{true}\textbar\docValue*{false}}
+ {initially |false|}
+Meant only to be used with the \refKey{break} style key for a theorem starting with a list.
+Compare:
+
+\begin{tcbwritetemp}
+\newkeytheoremstyle{breaksty}{break}
+\newkeytheorem{observation}[style=breaksty]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{observation}
+\begin{enumerate}
+\item First item
+\end{enumerate}
+\end{observation}
+
+\begin{observation}[listhack=true]
+\begin{enumerate}
+\item First item
+\end{enumerate}
+\end{observation}
+\end{keythmscode}
+
+Note that the value |true| must be explicitly set so that |listhack| is not interpreted as the note text.
+\end{docKey}
+
+\begin{docKey}[][doc label=thm/seq]{seq}
+ {=\meta{name}}
+ {initially unset}
+Adds the theorem to a custom sequence \meta{name} that can then be listed with \cs{listofkeytheorems}\bracks{seq=\meta{name}}.
+See \refKey{listof/seq} for more details.
+\end{docKey}
+
+\subsection{Keys also defined in \pkg{thmtools}} \label{thm-thmtools-keys}
+
+These are the \oarg{options} available to \cs{newkeytheorem}.
+Except for \refKey{thm/name} and \refKey{style}, each key below can also be used in \refCom{newkeytheoremstyle}.
+For more description, see the \href{https://ctan.org/pkg/thmtools}{\pkg{thmtools}} package.
+
+\begin{docKey}[][doc label=thm/name]{name}
+ {=\meta{display name}}
+ {initially title-cased \meta{env name}}
+Aliases \docAuxKey{heading} and \docAuxKey{title}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{mythm}[name=Some Name]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{mythm}
+Some text
+\end{mythm}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{numbered}
+ {=\docValue*{true}\textbar\docValue*{false}\textbar \docValue{unless-unique}}
+ {default |true|, initially |true|}
+For compatibility with \pkg{thmtools}, also accepts the values \docValue*{yes}, \docValue*{no}, and \docValue*{unless unique}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{theorem*}[name=Theorem, numbered=false]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{theorem*}
+An unnumbered theorem.
+\end{theorem*}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{parent}
+ {=\meta{counter}}
+ {initially unset}
+Aliases \docAuxKey{numberwithin} and \docAuxKey{within}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{conjecture}[parent=section]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{conjecture}
+The first number is the section.
+\end{conjecture}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{sibling}{=\meta{counter}}{initially unset}
+Aliases \docAuxKey{numberlike} and \docAuxKey{sharenumber}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{lemma}[sibling=theorem]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{lemma}
+This shares its counter with \texttt{theorem}.
+\end{lemma}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{style}
+ {=\meta{style name}}
+ {initially unset}
+Accepts any \meta{style name} defined by \refCom{newkeytheoremstyle}, as well as any of the predefined \pkg{amsthm} styles: \docValue{plain}, \docValue{definition}, and \docValue{remark}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{remark}[style=remark]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{remark}
+Some text
+\end{remark}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKeys}[
+ doc parameter = {=\meta{code}},
+ doc description = initially unset,
+ ]
+ {
+ { doc name = preheadhook },
+ { doc name = postheadhook },
+ { doc name = prefoothook },
+ { doc name = postfoothook },
+ }
+Details in \autoref{keythms-hooks}.
+
+\begin{tcbwritetemp}
+\newkeytheorem{test}[
+ preheadhook=PREHEAD,
+ postheadhook=POSTHEAD,
+ prefoothook=PREFOOT,
+ postfoothook=POSTFOOT
+]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{test}
+Some text
+\end{test}
+\end{keythmscode}
+
+\end{docKeys}
+
+\begin{docKey}{qed}
+ {\colOpt{=\meta{symbol}}}
+ {default \cs{qedsymbol}, initially unset}
+Adds \colOpt{\meta{symbol}} to the end of the theorem body.
+If no value is given, the symbol \qedsymbol{} is used.
+
+\begin{tcbwritetemp}
+\newkeytheorem{example}[qed]
+\newkeytheorem{solution}[qed=$\clubsuit$]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{example}
+Some text
+\end{example}
+\begin{solution}
+Some more text
+\end{solution}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{refname}
+ {=\meta{ref name} \textrm{or} \brackets{\meta{singular name},\meta{plural name}}}
+ {initially \meta{display name}}
+If a single string, then the name used by \pkg{hyperref}'s \cs{autoref} and \pkg{cleveref}'s \cs{cref}.
+If two strings separated by a comma, then the second string is the plural form used by \cs{cref}.
+\end{docKey}
+
+\begin{docKey}{Refname}
+ {=\meta{ref name} \textrm{or} \brackets{\meta{singular name},\meta{plural name}}}
+ {initially \meta{display name}}
+Same as \refKey{refname} but for \docAuxCommand{Autoref} and \cs{Cref}.
+Note that \cs{Autoref} is defined by \pkg{keytheorems}, but requires \pkg{hyperref} to work.
+As with \cs{autoref}, there is also a starred version \docAuxCommand{Autoref*} that suppresses the hyperlink.
+
+\begin{tcbwritetemp}
+\newkeytheorem{prop}[
+ name=Proposition,
+ refname={proposition,propositions},
+ Refname={Proposition,Propositions}
+ ]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{prop}[label=abc]
+Some text
+\end{prop}
+\begin{prop}[label=def]
+Some more text
+\end{prop}
+\begin{theorem}
+Consider \cref{abc,def}. \Autoref{abc} \dots
+\end{theorem}
+\end{keythmscode}
+
+\end{docKey}
+
+\subsection{Keys added by \pkg{keytheorems}} \label{thm-added-keys}
+
+\begin{docKey}{tcolorbox}
+ {\colOpt{=\marg{tcolorbox options}}}
+ {initially unset}
+This key specifies that the theorem be placed inside a tcolorbox environment with \colOpt{\meta{options}}.
+The theorem head is typeset as a tcolorbox title; to avoid this see \refKey{tcolorbox-no-titlebar}.
+
+\begin{tcbwritetemp}
+\tcbset{
+ defstyle/.style={
+ arc=0mm,
+ colback=blue!5!white,
+ colframe=blue!75!black
+ },
+ }
+\newkeytheorem{corollary}[tcolorbox]
+\newkeytheorem{definition}[style=definition, tcolorbox={defstyle}]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{corollary}
+Some text
+\end{corollary}
+\begin{definition}[A nice definition]
+Some more text
+\end{definition}
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{tcolorbox-no-titlebar}
+ {\colOpt{=\marg{tcolorbox options}}}
+ {initially unset}
+Same usage as \refKey{tcolorbox} but the theorem head is typeset as usual, not as a tcolorbox title.
+
+\begin{tcbwritetemp}
+\newkeytheorem{boxcor}[
+ tcolorbox-no-titlebar={colback=red!10},
+ name=Corollary, sibling=corollary
+ ]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{boxcor}
+Some text
+\end{boxcor}
+\end{keythmscode}
+
+\end{docKey}
+
+\pkg{tcolorbox} offers its own comprehensive \texttt{theorems} library. If all of your theorems are to be tcolorboxes, I highly recommend using it instead of this package! However, if only some of your theorems will use a tcolorbox, you may want to replicate the styles of \cs{NewTcbTheorem}. Here is an example that emulates \pkg{tcolorbox}'s \texttt{standard} theorem style.
+
+\begin{tcbwritetemp}
+\tcbset{
+ thmstyle/.style={
+ colback=green!5,
+ colframe=green!35!black},
+ }
+\newkeytheoremstyle{tcb-standard}{
+ tcolorbox=thmstyle,
+ headpunct={},
+ notebraces={}{},
+ noteseparator={: },
+ notefont=\bfseries,
+ bodyfont=\normalfont,
+ }
+\newkeytheorem{mytheo}[
+ name=My Theorem,
+ style=tcb-standard]
+\end{tcbwritetemp}
+
+\begin{keythmscode}[withpreamble]
+\begin{mytheo}[This is my title]
+Some theorem text
+\end{mytheo}
+\end{keythmscode}
+
+\section{Theorem styles}
+
+\begin{docCommand}{newkeytheoremstyle}
+ {\marg{name}\marg{options}}
+This is \pkg{keytheorems}' version of \pkg{thmtools}' \cs{declaretheoremstyle}.
+Since it makes little sense to define a style with no keys, we've made the \meta{options} argument mandatory.
+Note that unlike \pkg{amsthm}'s \cs{newtheoremstyle}, this command will error if a style has already been defined.
+To overwrite an existing style, there is the analogous \docAuxCommand{renewkeytheoremstyle}.
+For completeness, there are also \docAuxCommand{providekeytheoremstyle} and \docAuxCommand{declarekeytheoremstyle}.
+
+The defined style can be used with either the \refKey{style} key or the traditional \cs{theoremstyle}.
+\end{docCommand}
+
+\begin{notebox}
+For the AMS classes \cls{amsart}, \cls{amsbook}, and \cls{amsproc}, as well as the \cls{amsart}-based \cls{acmart}, the initial key values are slightly different than what's below in order to match those class's defaults.
+\end{notebox}
+
+\subsection{Keys also defined in \pkg{thmtools}}
+
+The following keys have the same meaning and syntax as the corresponding \pkg{thmtools} keys.
+In addition to the list below, most of the keys available to \refCom{newkeytheorem} can be used in \cs{newkeytheoremstyle}.
+
+\begin{docKey}{bodyfont}
+ {=\meta{font declarations}}
+ {initially \cs{itshape}}
+
+\end{docKey}
+
+\begin{docKey}{break}
+ {}
+ {initially unset}
+Do not use this with the \refKey{postheadspace} key.
+\end{docKey}
+
+\begin{docKey}{headfont}
+ {=\meta{font declarations}}
+ {initially \cs{bfseries}}
+
+\end{docKey}
+
+\begin{docKey}{headformat}
+ {=\docValue{margin}\textbar\docValue{swapnumber}\textbar\meta{code using \cs{NAME}, \cs{NUMBER}, and \cs{NOTE}\,}}
+ {}
+Alias \docAuxKey{headstyle}. Within \meta{code}, the commands \docAuxCommand{NAME}, \docAuxCommand{NUMBER}, and \docAuxCommand{NOTE} correspond to the formatted parts of the theorem head.
+\end{docKey}
+
+\begin{notebox}
+In \refKey{headformat}, you may also use the traditional \pkg{amsthm} commands \cs{thmname}, \cs{thmnumber}, and \cs{thmnote}, where |#1| is the theorem name, |#2| the number, and |#3| the note. \pkg{keytheorems} expands the head spec inside |\text_expand:n| so for these commands to work properly, the package adds them to |\l_text_expand_exclude_tl|. Note also that if you use these lower-level commands, the style keys \refKey{notebraces}, \refKey{notefont}, \refKey{noteseparator}, and \refKey{numberfont} will have no effect (of course, you can manually control these things inside the commands' arguments).
+\end{notebox}
+
+\begin{docKey}{headindent}
+ {=\meta{length}}
+ {initially |0pt|}
+
+\end{docKey}
+
+\begin{docKey}{headpunct}
+ {=\meta{code}}
+ {initially \ttbraces{.}}
+
+\end{docKey}
+
+\begin{docKey}{notebraces}
+ {=\marg{left brace}\marg{right brace}}
+ {initially \ttbraces{(}\ttbraces{)}}
+
+\end{docKey}
+
+\begin{docKey}{notefont}
+ {=\meta{font declarations}}
+ {initially \cs{fontseries}\cs{mddefault}\cs{upshape}}
+
+\end{docKey}
+
+\begin{docKey}{postheadspace}
+ {=\meta{length}}
+ {initially |5pt plus 1pt minus 1pt|}
+Do not use this with the \refKey{break} key.
+\end{docKey}
+
+\begin{docKey}{spaceabove}
+ {=\meta{length}}
+ {initially \cs{topsep}}
+
+\end{docKey}
+
+\begin{docKey}{spacebelow}
+ {=\meta{length}}
+ {initially \cs{topsep}}
+
+\end{docKey}
+
+\subsection{Keys added by \pkg{keytheorems}}
+
+\begin{docKey}{inherit-style}
+ {=\meta{style name}}
+ {initially unset}
+Inherit the keys of any style declared with \refCom{newkeytheoremstyle}.
+Additionally, the three styles predefined by \pkg{amsthm} are possible values: \docValue{plain}, \docValue{definition}, and \docValue{remark}.
+\end{docKey}
+
+\begin{docKey}{noteseparator}
+ {=\meta{code}}
+ {initially \textvisiblespace}
+The code inserted before the note, and printed only if there is a note. This is executed \emph{before} the font commands set by \refKey{notefont} take effect.
+\end{docKey}
+
+\begin{docKey}{numberfont}
+ {=\meta{font declarations}}
+ {initially |\upshape|}
+For almost all theorem styles, it is recommended that you \emph{do not} change this setting.
+\end{docKey}
+
+\section{Restating theorems}
+
+When a theorem is given the \refKey{store} key, the contents of the theorem are saved and written to a |.thlist| file.
+At the start of the next run, this file is input at the beginning of the document and allows you to retrieve the stored theorems at any point, before or after the original theorem.
+
+\begin{docCommand}{getkeytheorem}
+ {\oarg{property}\marg{tag}}
+Retrieves the theorem given the key |store=|\meta{tag} or |store*=|\meta{tag}.
+An optional \meta{property} can be given to retrieve only the corresponding part of the theorem.
+Currently only the property |body| is implemented, which retrieves the (unformatted) body of the theorem.
+
+\begin{keythmscode}[]
+\getkeytheorem{mytag}
+
+\begin{example}[store=mytag]
+Fascinating example.
+\end{example}
+
+\getkeytheorem[body]{mytag}
+\end{keythmscode}
+
+\end{docCommand}
+
+\begin{docCommands}
+ {
+ {
+ doc name = IfRestatingTF,
+ doc parameter=\marg{true code}\marg{false code}
+ },
+ {
+ doc name = IfRestatingT,
+ doc parameter=\marg{true code}
+ },
+ {
+ doc name = IfRestatingF,
+ doc parameter=\marg{false code}
+ }
+ }
+Executes \meta{true code} if being retrieved with \refCom{getkeytheorem} and \meta{false code} if in the original theorem. This is reversed if \texttt{store*} is used.
+
+\begin{keythmscode}[]
+\begin{example}[store=hmm]
+I am the
+\IfRestatingTF{restated}{original}
+example!
+\end{example}
+
+\getkeytheorem{hmm}
+\end{keythmscode}
+
+\end{docCommands}
+
+\section{Listing theorems}
+
+\begin{docCommand}{listofkeytheorems}
+ {\oarg{options}}
+Similar to \cs{listoffigures} or \cs{listoftables} but for theorems.
+For \cls{memoir} and the AMS classes, \pkg{keytheorems} tries to copy the formatting of these commands as defined by the class.
+For other classes, manual adjustments to \refKey{numwidth} and \refKey{indent} may be necessary.
+\end{docCommand}
+
+\begin{docCommand}{keytheoremlistset}
+ {\marg{options}}
+
+\end{docCommand}
+
+\begin{keythmscode}[]
+\listofkeytheorems
+\end{keythmscode}
+
+\subsection{Keys inherited from \pkg{thmtools}}
+
+\begin{docKey}{ignore}
+ {=\marg{comma-list of env names}}
+ {initially unset}
+
+\end{docKey}
+
+\begin{docKey}{ignoreall}
+ {}
+ {initially unset}
+
+\begin{keythmscode}[]
+\listofkeytheorems[ignoreall,show=theorem]
+\listofkeytheorems[
+ ignoreall, show=conjecture,
+ title=List of Conjectures
+ ]
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{numwidth}
+ {=\meta{length}}
+ {initially |2.3em|}
+For the AMS classes, this is initially |1.5pc|.
+\end{docKey}
+
+\begin{docKey}{onlynamed}
+ {\colOpt{=\marg{comma-list of env names}}}
+ {initially unset}
+
+\end{docKey}
+
+\begin{docKey}{show}
+ {=\marg{comma-list of env names}}
+ {initially all theorems}
+
+\end{docKey}
+
+\begin{docKey}{showall}
+ {}
+ {initially set}
+
+\end{docKey}
+
+\begin{docKey}{swapnumber}
+ {\colOpt{=true\textbar false}}
+ {initially |false|}
+
+\end{docKey}
+
+\begin{docKey}{title}
+ {=\meta{text}}
+ {initially \cs{GetTranslation}\ttbraces{keythms\string_listof\string_title}}
+Defaults to ``List of Theorems'' if English or an unknown language is used.
+Currently French, German, Italian, Portuguese, and Spanish have (likely inaccurate!) translations.
+A translation can be added with a GitHub pull request or manually with
+\begin{center}
+\cs{DeclareTranslation}\marg{lang}\ttbraces{keythms\string_listof\string_title}\marg{text}.
+\end{center}
+\end{docKey}
+
+\subsection{Keys added by \pkg{keytheorems}}
+
+\begin{docKey}{format-code}
+ {=\meta{code with \textup{\texttt{\#1}}, \textup{\texttt{\#2}}, and \textup{\texttt{\#3}}}}
+ {initially \cs{numberline}\texttt{\{\#2\}\#1\#3}}
+Allows full control over the format for list entries. The theorem name is |#1|, the number is |#2|, and the (formatted) note is |#3|. The note formatting is still controlled by \refKey{note-code}.
+\end{docKey}
+
+\begin{docKey}{indent}
+ {=\meta{length}}
+ {initially |1.5em|}
+Sets the left indent of items in the list of theorems.
+For \cls{memoir} and the AMS classes, the indent is initially |0pt|.
+It is not recommended to change this unless your class has different defaults not already covered.
+\end{docKey}
+
+\begin{docKey}{no-chapter-skip}
+ {\colOpt{=true\textbar false}}
+ {initially |false|}
+By default a small vertical space is inserted between each chapter's chunk of theorems.
+Setting this key to |true| removes this space.
+\end{docKey}
+
+\begin{docKey}{chapter-skip-length}
+ {=\meta{dimension}}
+ {initially |10pt|}
+Controls the amount of space inserted between chunks.
+\end{docKey}
+
+\begin{docKey}{no-continues}
+ {\colOpt{=true\textbar false}}
+ {initially |false|}
+Suppresses the printing of theorems given the \refKey{continues} key in the list of theorems.
+\end{docKey}
+
+\begin{docKey}{no-title}
+ {\colOpt{=true\textbar false}}
+ {initially |false|}
+Suppresses the title of the list of theorems.
+Useful for custom ordering of the list.
+
+\begin{keythmscode}[]
+\keytheoremlistset{ignoreall}
+\listofkeytheorems[show=example]
+\listofkeytheorems[show=solution, no-title]
+\end{keythmscode}
+
+\end{docKey}
+
+\begin{docKey}{no-toc}
+ {\colOpt{=true\textbar false}}
+ {initially false}
+With the standard classes, lists of figures/tables are not added to the table of contents by default. The same is true for \cs{listofkeytheorems}, and with those classes this key does nothing. However some classes, notably \cls{memoir} and the AMS classes, do add lists to the table of contents. With these classes, this key suppresses the addition of the list of theorems to the table of contents.
+\end{docKey}
+
+\begin{docKey}{note-code}
+ {=\meta{code with \textup{\texttt{\#1}}}}
+ {initially \ttbraces{ (\#1)}}
+Formats the optional note in the list of theorems.
+\end{docKey}
+
+\begin{docKey}{onlynumbered}
+ {\colOpt{=\marg{comma-list of env names}}}
+ {initially unset}
+Similar to \refKey{onlynamed}, but lists only those theorems which are numbered.
+This is useful if you'd like to exclude things like unnumbered definitions and remarks from the list of theorems.
+\end{docKey}
+
+\begin{docKey}{print-body}
+ {}
+ {initially unset}
+Instead of listing the theorem headings, the theorems are restated with their body text.
+Not very useful without the \refKey{store-all} load-time option.
+\end{docKey}
+
+\begin{docKey}[][doc label=listof/seq]{seq}
+ {=\meta{name}}
+ {initially unset}
+Used to list only the theorems added to the custom sequence \meta{name} with the \refKey{thm/seq} theorem key.
+This is the only way to fully customize which theorems appear in the list of theorems.
+Unlike with \refKey{show}, you do not need to use \refKey{ignoreall} to prevent theorems not in \meta{name} from being printed.
+\end{docKey}
+
+\begin{docKey}{title-code}
+ {=\meta{code with \textup{\texttt{\#1}}}}
+ {initially \cs{section*}\ttbraces{\#1}}
+If \cs{chapter} is defined, then initially this is instead \cs{chapter*}\ttbraces{\#1}. This key has no effect if used with an AMS class because these classes hard-code the section heading into \cs{@starttoc}.
+\end{docKey}
+
+\subsection{Adding code to list of theorems}
+
+There are analogous commands to \cs{addcontentsline} and \cs{addtocontents} for adding entries or arbitrary code to the list of theorems.
+
+\begin{notebox}
+You \emph{must} use these commands rather than the aforementioned because the |.thlist| file is also used to define restated theorems and cannot contain unexpected code.
+\end{notebox}
+
+\begin{docCommand}{addtheoremcontentsline}
+ {\marg{level}\marg{text}}
+
+\end{docCommand}
+
+\begin{docCommand}{addtotheoremcontents}
+ {\marg{code}}
+
+\end{docCommand}
+
+\section{Theorem hooks} \label{keythms-hooks}
+
+\begin{docCommand}{addtotheoremhook}
+ {\oarg{env name}\marg{hook name}\marg{code}}
+\meta{hook name} can be \hook{prehead}, \hook{posthead}, \hook{prefoot}, \hook{postfoot}, or \hook{restated}.
+If no \meta{env name} is given, the \meta{code} is added to the ``generic'' hook, i.e. applied to all theorems.
+As in \pkg{thmtools}, the order of hooks is as follows:
+
+\begin{center}
+ \small
+ \tcbset{
+ nobeforeafter,
+ tikznode,
+ tcbox width=forced center,
+ width=1.85cm,
+ tcbox raise=-0.4cm,
+ size=fbox,
+ after=\;$\rightarrow$
+ }
+ \tcbox{\meta{env name}\\ \hook{prehead}}
+ \tcbox{generic\\ \hook{prehead}}
+ \tcbox[width=3.25cm,tcbox raise=-0.2cm]{\cs{begin}\brackets{\meta{env name}}}
+ \tcbox{\meta{env name}\\ \hook{posthead}}
+ \tcbox[after={}]{generic\\ \hook{posthead}}
+ \\[2ex]
+ \tcbset{before=$\rightarrow$\;}
+ \tcbox[width=2.25cm,tcbox raise=-0.2cm]{\meta{theorem body}}
+ \\[2ex]
+ \tcbset{after={}}
+ \tcbox[before={}]{generic\\ \hook{prefoot}}
+ \tcbox{\meta{env name}\\ \hook{prefoot}}
+ \tcbox[width=3.25cm,tcbox raise=-0.2cm]{\cs{end}\brackets{\meta{env name}}}
+ \tcbox{generic\\ \hook{postfoot}}
+ \tcbox{\meta{env name}\\ \hook{postfoot}}
+\end{center}
+The \hook{restated} hook is applied at the start of theorems retrieved with the command \cs{getkeytheorem}, before the \hook{prehead} hook.
+This can be useful for disabling commands such as \cs{footnote} in the restated theorems, e.g.
+\begin{dispListing}
+\addtotheoremhook{restated}{\renewcommand\footnote[2][]{}}
+\end{dispListing}
+By default, \pkg{keytheorems} disables the \cs{label} and \cs{RecordProperties} commands in restated theorems.
+
+In \pkg{thmtools}, the \hook{prefoot} and \hook{postfoot} hooks always prepend code, i.e. the code
+\begin{dispListing}
+\addtotheorempostfoothook{A}
+\addtotheorempostfoothook{B}
+\end{dispListing}
+results in |BA| after the theorem.
+With \pkg{keytheorems}, code is added in the order declared, meaning
+\begin{dispListing}
+\addtotheoremhook{postfoot}{A}
+\addtotheoremhook{postfoot}{B}
+\end{dispListing}
+results in |AB| after the theorem.
+This is the behavior of the \LaTeX{} kernel hooks that \pkg{keytheorems} uses under the hood.
+
+Code added using the hook keys \refKey{preheadhook}, etc. is outermost, meaning executed first in \hook{prehead} and \hook{posthead} and last in \hook{prefoot} and \hook{postfoot}.
+\end{docCommand}
+
+\section{Miscellaneous notes}
+
+\subsection{\cls{beamer} support}
+
+The package contains some \emph{highly experimental} code to support theorems with \cls{beamer}, including overlays.
+Most style keys are disabled by the |default| \cls{beamer} theorem template.
+More become functional by setting
+\begin{dispListing}
+\setbeamertemplate{theorems}[ams style]
+\end{dispListing}
+in the preamble.
+Alternatively, you have full control of theorems by setting the class option |noamsthm|.
+
+Note that by default \cls{beamer} defines a set of theorems when the class is loaded.
+These can be overwritten with \refCom{renewkeytheorem} or disabled entirely with the |notheorems| class option.
+
+Due to complications with overlays, writing contents of theorems to the |thlist| file is disabled. This means theorems can only be restated \emph{after} their original statement. Furthermore, \refCom{listofkeytheorems} is disabled and a warning issued if used.
+
+User feedback is necessary to make this code fully compatible. Please report issues on the \href{https://github.com/mbertucci47/keytheorems/issues}{Github page}!
+
+\subsection{Public coding interfaces}
+
+\begin{itemize}
+ \item |\l_keythms_thmuse_envname_tl|
+
+ Inside theorem environments, as well as in all of the theorem hooks, you have access to the theorem's environment and counter name in this token list variable.
+\end{itemize}
+
+\section{Further examples}
+
+More examples will be added soon -- rather, eventually\dots{}
+For now, you can find a \pkg{keytheorems} adaptation of \pkg{amsthm}'s classic file \href{https://mirrors.ctan.org/macros/latex/required/amscls/doc/thmtest.tex}{\texttt{thmtest.tex}} in the Github \texttt{tests} folder: \href{https://github.com/mbertucci47/keytheorems/blob/main/tests/keytheorems-amsthmtest.tex}{\texttt{keytheorems-amsthmtest.tex}}.
+
+%\section{Implementation}
+%\inputminted[linenos,style=bw]{latex}{../keytheorems.sty}
+
+\printindex
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
index fff85488a70..70b869d905e 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
@@ -7,6 +7,23 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-09-10]
+
+### Fixed
+- `\seq_map_pairwise_function:NNN` not work with `\seq_map_break:(n)` (issue \#1587)
+
+### Changed
+- Increase outdent of long function names in `l3doc` (issue \#1585)
+
+## [2024-08-30]
+
+### Changed
+- Reduce memory usage when building Unicode data storage
+- Avoid recursive doc for `\file_if_exist:n(TF)` (issue \#1573)
+
+### Fixed
+- Handling of `ltcmd` newlines (`\obeyedline`) in `l3doc` (issue \#1577)
+
## [2024-08-16]
### Added
@@ -1759,7 +1776,9 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2024-08-16...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2024-09-10...HEAD
+[2024-09-10]: https://github.com/latex3/latex3/compare/2024-08-30...2024-09-10
+[2024-08-30]: https://github.com/latex3/latex3/compare/2024-08-16...2024-08-30
[2024-08-16]: https://github.com/latex3/latex3/compare/2024-07-20...2024-08-16
[2024-07-20]: https://github.com/latex3/latex3/compare/2024-06-19...2024-07-20
[2024-06-19]: https://github.com/latex3/latex3/compare/2024-05-27...2024-06-19
diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md
index 5807a75274a..76cf62b3101 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/README.md
+++ b/Master/texmf-dist/doc/latex/l3kernel/README.md
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2024-08-16
+Release 2024-09-10
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
index 0c0ef88180a..bb587f0e6da 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
index b632b9b9e9a..18107793a05 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
index 1a5cc9564fb..9db72db2f00 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
@@ -58,7 +58,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-08-16}
+\date{Released 2024-09-10}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
index e0a3169c1db..638e46c9d5d 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
index b37e4f8ef8b..9d8ce16a48c 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
index a37482f3349..5c652bbb5b9 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
index 2a2f19457c6..f6c06f33329 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
index 146556e785b..c8b5c4850ea 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
index af48654a635..f4b4cf4a2a4 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
index bb18f756c35..338fbe49258 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
index 0c286452f1a..9f94db53dde 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
index 986ad4d58be..f6f6ff27bc0 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
index edfce03b2c3..41bac946e0b 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
index 1efb7d184b2..cc395aeebfb 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
index 1a24b2e13cd..f638662aaed 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
index 37c75d8fe9c..9f019c7f1f1 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
index c1db8425f15..498b027d6f5 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
index c4890bac7bc..55c60bb5cf6 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
index 47cd011a5c9..11cfeb08f48 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
@@ -205,6 +205,7 @@ piton,piton,François Pantigny,,,,29/09/2022,29/09/2022,
pkgploader,pkgploader,Michiel Helvensteijn,,,,2014-02-05,2014-02-05,
platex,platex,Japanese TeX Development Community,https://github.com/texjporg/platex,https://github.com/texjporg/platex.git,https://github.com/texjporg/platex/issues,2020-09-30,2020-09-30,
polyglossia,polyglossia,Arthur Reutenauer,https://www.polyglossia.org/,https://github.com/reutenauer/polyglossia,https://github.com/reutenauer/polyglossia/issues,2019-09-03,,
+polyomino,polyomino,Matthias Floré,,,,2024-09-05,2024-09-05
postnotes,postnotes,gusbrs,https://github.com/gusbrs/postnotes,https://github.com/gusbrs/postnotes.git,https://github.com/gusbrs/postnotes/issues,2022-04-23,2022-04-23,
prelim,prelim2e,Marei Peischl,https://github.com/TeXhackse/prelim2e,https://github.com/TeXhackse/prelim2e.git,https://github.com/TeXhackse/prelim2e/issues,2020-11-24,2020-11-24,
prg,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
index 1898163d394..abb2d50509d 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
index 5c511252102..c94b0a862a8 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
index 0500ec57cdc..46c5109535c 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-08-16}
+\date{Released 2024-09-10}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
index 766d21a8a68..1ae90ae8203 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
index 8631fe09b83..3e3da5f95e7 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-08-16}
+\date{Released 2024-09-10}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
index 2f4e0d80ff4..59f4e3b48d7 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
index b150aee1e9c..6432d71c88d 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-08-16}
+\date{Released 2024-09-10}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
index 03bbce81fcf..24cc4ba8d57 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.tex b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
index 9abacf77623..c8322135ccf 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
@@ -57,7 +57,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-08-16}
+\date{Released 2024-09-10}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3body.tex b/Master/texmf-dist/doc/latex/l3kernel/source3body.tex
index db5b907e7b6..44b67816d6f 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3body.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3body.tex
@@ -285,7 +285,7 @@ pass it to |\foo:N|.
Variables are named in a similar manner to functions, but begin with
a single letter to define the type of variable:
-\begin{description}
+\begin{description}[leftmargin=2\parindent, labelindent*=-\parindent]
\item[\texttt{c}] Constant: global parameters whose value should not
be changed.
\item[\texttt{g}] Parameters whose value should only be set globally.
@@ -302,7 +302,7 @@ function, typically starting with the module\footnote{The module names are
\texttt{\string\l_int_tmpa_int} would be very unreadable.} name
and then a descriptive part.
Variables end with a short identifier to show the variable type:
-\begin{description}%
+\begin{description}[leftmargin=2\parindent, labelindent*=-\parindent]
\item[\texttt{bitset}] a set of bits (a string made up of a series of \texttt{0}
and \texttt{1} tokens that are accessed by position).
\item[\texttt{clist}] Comma separated list.
@@ -318,7 +318,7 @@ Variables end with a short identifier to show the variable type:
Applying \texttt{V}-type or \texttt{v}-type expansion to variables of
one of the above types is supported, while it is not supported for the
following variable types:
-\begin{description}
+\begin{description}[leftmargin=2\parindent, labelindent*=-\parindent]
\item[\texttt{bool}] Either true or false.
\item[\texttt{box}] Box register.
\item[\texttt{coffin}] A \enquote{box with handles} --- a higher-level
@@ -345,7 +345,7 @@ with any other scratch variable, these should only be set and used with no
intervening third-party code.
There are two more special types of constants:
-\begin{description}
+\begin{description}[leftmargin=2\parindent, labelindent*=-\parindent]
\item[\texttt{q}] Quark constants.
\item[\texttt{s}] Scan mark constants.
\end{description}
diff --git a/Master/texmf-dist/doc/latex/latex-doc-ptr/README b/Master/texmf-dist/doc/latex/latex-doc-ptr/README
index dfb20a8bc60..898cf775a43 100644
--- a/Master/texmf-dist/doc/latex/latex-doc-ptr/README
+++ b/Master/texmf-dist/doc/latex/latex-doc-ptr/README
@@ -18,27 +18,19 @@ Install:
pdflatex latex-doc-ptr
should do nicely.
- My version of TeX is old, so I have some trouble with tex4ht. If you
-are in my situation then try the Makefile, which does a lot of hacking.
-
Notes:
-1) My version of make4ht requires that I change
- \def\IfFileExists#1#2#3{%
-to
- \long\def\IfFileExists#1#2#3{%
-in a local copy of tex4ht.sty. See https://tex.stackexchange.com/a/423729/339
-
-2) Repo is here.
+This document's git repository is here:
https://gitlab.com/jim.hefferon/latex-doc-ptr
Comments to:
- Jim Hefferon email jhefferon@smcvt.edu
+ Jim Hefferon email: jim.hefferon@gmail.com
History:
+ 2024-Sep-29 JH, KB Add contact information.
2021-Jan-02 JH, KB Merged with another doc, first-packages.
2009-Mar-24 Jim Hefferon, Manuel Pégourié-Gonnard, Karl Berry
diff --git a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.css.replacement b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.css.replacement
deleted file mode 100644
index db1fcd494c4..00000000000
--- a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.css.replacement
+++ /dev/null
@@ -1,148 +0,0 @@
-
-/* start css.sty */
-.Spectral-Light-osf-t-1x-x-109{}
-.Spectral-Bold-osf-t-1x-x-172{font-size:156%;}
-.ectt-1095{ font-family: monospace;}
-.ectt-1095{ font-family: monospace;}
-.ectt-1095{ font-family: monospace;}
-.Spectral-Bold-osf-t-1x-x-109{}
-.cmr-8{font-size:72%;}
-.cmr-6{font-size:54%;}
-.cmmi-10x-x-109{font-style: italic;}
-.Spectral-Light-osf-t-1{font-size:90%;}
-.ectt-1000{font-size:90%; font-family: monospace;}
-.ectt-1000{ font-family: monospace;}
-.ectt-1000{ font-family: monospace;}
-.Spectral-LightItalic-osf-t-1x-x-109{}
-.Spectral-Light-osf-sc-t-1x-x-109{}
-.ectt-0900{font-size:81%; font-family: monospace;}
-.ectt-0900{ font-family: monospace;}
-.ectt-0900{ font-family: monospace;}
-p.noindent { text-indent: 0em }
-td p.noindent { text-indent: 0em; margin-top:0em; }
-p.nopar { text-indent: 0em; }
-p.indent{ text-indent: 1.5em }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-li p.indent { text-indent: 0em }
-li p:first-child{ margin-top:0em; }
-li p:last-child, li div:last-child { margin-bottom:0.5em; }
-li p~ul:last-child, li p~ol:last-child{ margin-bottom:0.5em; }
-.enumerate1 {list-style-type:decimal;}
-.enumerate2 {list-style-type:lower-alpha;}
-.enumerate3 {list-style-type:lower-roman;}
-.enumerate4 {list-style-type:upper-alpha;}
-div.newtheorem { margin-bottom: 2em; margin-top: 2em;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-div.verbatim {font-family: monospace; white-space: nowrap; text-align:left; clear:both; }
-.fbox {padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-div.fbox {display:table}
-div.center div.fbox {text-align:center; clear:both; padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-div.minipage{width:100%;}
-div.center, div.center div.center {text-align: center; margin-left:1em; margin-right:1em;}
-div.center div {text-align: left;}
-div.flushright, div.flushright div.flushright {text-align: right;}
-div.flushright div {text-align: left;}
-div.flushleft {text-align: left;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-.framebox-c, .framebox-l, .framebox-r { padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-.framebox-c {text-align:center;}
-.framebox-l {text-align:left;}
-.framebox-r {text-align:right;}
-span.thank-mark{ vertical-align: super }
-span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript{ font-size:80%; }
-div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
-table.tabular td p{margin-top:0em;}
-table.tabular {margin-left: auto; margin-right: auto;}
-td p:first-child{ margin-top:0em; }
-td p:last-child{ margin-bottom:0em; }
-div.td00{ margin-left:0pt; margin-right:0pt; }
-div.td01{ margin-left:0pt; margin-right:5pt; }
-div.td10{ margin-left:5pt; margin-right:0pt; }
-div.td11{ margin-left:5pt; margin-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-td.td00{ padding-left:0pt; padding-right:0pt; }
-td.td01{ padding-left:0pt; padding-right:5pt; }
-td.td10{ padding-left:5pt; padding-right:0pt; }
-td.td11{ padding-left:5pt; padding-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
-.tabbing-right {text-align:right;}
-span.TEX {letter-spacing: -0.125em; }
-span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
-a span.TEX span.E {text-decoration: none; }
-span.LATEX span.A{ position:relative; top:-0.5ex; left:-0.4em; font-size:85%;}
-span.LATEX span.TEX{ position:relative; left: -0.4em; }
-div.float, div.figure {margin-left: auto; margin-right: auto;}
-div.float img {text-align:center;}
-div.figure img {text-align:center;}
-.marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
-.marginpar p{margin-top:0.4em; margin-bottom:0.4em;}
-table.equation {width:100%;}
-.equation td{text-align:center; }
-td.equation { margin-top:1em; margin-bottom:1em; }
-td.equation-label { width:5%; text-align:center; }
-td.eqnarray4 { width:5%; white-space: normal; }
-td.eqnarray2 { width:5%; }
-table.eqnarray-star, table.eqnarray {width:100%;}
-div.eqnarray{text-align:center;}
-div.array {text-align:center;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-span.pmatrix img{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-span.bar-css {text-decoration:overline;}
-img.cdots{vertical-align:middle;}
-.partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;}
-.index-item, .index-subitem, .index-subsubitem {display:block}
-div.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:left;}
-div.caption span.id{font-weight: bold; white-space: nowrap; }
-h1.partHead{text-align: center}
-p.bibitem { text-indent: -2em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
-p.bibitem-p { text-indent: 0em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
-.paragraphHead, .likeparagraphHead { margin-top:2em; font-weight: bold;}
-.subparagraphHead, .likesubparagraphHead { font-weight: bold;}
-.quote {margin-bottom:0.25em; margin-top:0.25em; margin-left:1em; margin-right:1em; text-align:justify;}
-.verse{white-space:nowrap; margin-left:2em}
-div.maketitle {text-align:center;}
-h2.titleHead{text-align:center;}
-div.maketitle{ margin-bottom: 2em; }
-div.author, div.date {text-align:center;}
-div.thanks{text-align:left; margin-left:10%; font-size:85%; font-style:italic; }
-div.author{white-space: nowrap;}
-.quotation {margin-bottom:0.25em; margin-top:0.25em; margin-left:1em; }
-.abstract p {margin-left:5%; margin-right:5%;}
-div.abstract {width:100%;}
-.figure img.graphics {margin-left:10%;}
-.lstlisting .label{margin-right:0.5em; }
-div.lstlisting{font-family: monospace; white-space: nowrap; margin-top:0.5em; margin-bottom:0.5em; }
-div.lstinputlisting{ font-family: monospace; white-space: nowrap; }
-.lstinputlisting .label{margin-right:0.5em;}
-.columns-2 p:first-child { margin-top: 0em; }
-/* .columns-2{-moz-column-count:2; -webkit-column-count:2; column-count:2; -moz-column-gap: 27.2197pt; -webkit-column-gap: 27.2197pt; column-gap: 27.2197pt; -moz-column-rule-width: 0.0pt; -webkit-column-rule-width: 0.0pt; column-rule-rule-width: 0.0pt; -moz-column-rule-color: #555;; -webkit-column-rule-color: #555;; column-rule-color: #555;; -moz-column-rule-style: outset; -webkit-column-rule-style: outset; column-rule-style: outset; -moz-column-fill: balance; -webkit-column-fill: balance; column-fill: balance; } */
-/* end css.sty */
-
-/* added JH */
-/* Adjust the generated defs */
-.Spectral-Bold-lf-t-1x-x-172 {font-size:156%;
- font-weight: bold;} /* doc title in bold */
-.Spectral-Bold-lf-t-1x-x-109 {margin-top:2em;
- font-weight: bold;
- margin-right: 0.25em} /* run-in subsection name */
-p.indent{ text-indent: 0em } /* make all paragraphs un-indented */
-a { text-decoration: none; } /* remove underlines, since below LaTeX is ugly*/
-
-.Spectral-LightItalic-osf-t-1x-x-109 { font-style: italic;
- } /* make "name" in `texdoc name' */
diff --git a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.html b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.html
index 674de5fabbd..a91afeddc9a 100644
--- a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.html
+++ b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.html
@@ -1,778 +1,213 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd-->
-<html xmlns="http://www.w3.org/1999/xhtml"
->
+<!DOCTYPE html>
+<html lang='en-US' xml:lang='en-US'>
<head><title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)" />
-<meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" />
-<!-- xhtml,html -->
-<meta name="src" content="latex-doc-ptr.tex" />
-<link rel="stylesheet" type="text/css" href="latex-doc-ptr.css" />
-</head><body
->
-<div class="center"
->
-<!--l. 6--><p class="noindent" >
-</p><!--l. 7--><p class="noindent" ><span
-class="Spectral-Bold-lf-t-1x-x-172">A First Set of </span><span class="LATEX"><span
-class="Spectral-Bold-lf-t-1x-x-172">L</span><span class="A"><span
-class="Spectral-Bold-lf-t-1x-x-172">A</span></span><span class="TEX"><span
-class="Spectral-Bold-lf-t-1x-x-172">T</span><span
-class="E"><span
-class="Spectral-Bold-lf-t-1x-x-172">E</span></span><span
-class="Spectral-Bold-lf-t-1x-x-172">X</span></span></span> <span
-class="Spectral-Bold-lf-t-1x-x-172">Resources</span></p></div>
- <div class="columns-2">
-<!--l. 17--><p class="indent" > This page suggests documentation, add-on components, and other resources for a beginning <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>
+<meta charset='utf-8' />
+<meta content='TeX4ht (https://tug.org/tex4ht/)' name='generator' />
+<meta content='width=device-width,initial-scale=1' name='viewport' />
+<link href='latex-doc-ptr.css' rel='stylesheet' type='text/css' />
+<meta content='latex-doc-ptr.tex' name='src' />
+</head><body>
+<div class='center'>
+<!-- l. 6 --><p class='noindent'>
+</p><!-- l. 7 --><p class='noindent'><span class='Spectral-Bold-lf-t1-x-x-172'>A First Set of LaTeX Resources</span></p></div>
+ <div class='columns-2'>
+<!-- l. 17 --><p class='indent'> This page suggests documentation, add-on components, and other resources for a beginning LaTeX
user.
-</p><!--l. 20--><p class="indent" > The links here are to freely available materials, so you can click to see the documentation online. Where
-the documentation is also available offline in a typical <span class="TEX">T<span
-class="E">E</span>X</span> installation, we provide its name as an end note.
-View it by running `<span
-class="ectt-1095">texdoc </span><span
-class="Spectral-LightItalic-lf-t-1x-x-109">name</span>' in a terminal.
+</p><!-- l. 20 --><p class='indent'> The links here are to freely available materials, so you can click to see the documentation online. Where
+the documentation is also available offline in a typical TeX installation, we provide its name as an end note.
+View it by running ‘<span class='ectt-1095'>texdoc </span><span class='Spectral-LightItalic-lf-t1-x-x-109'>name</span>’ in a terminal.
</p>
-<h3 class="sectionHead"><a
- id="x1-1000"></a>Starting</h3>
-<!--l. 32--><p class="noindent" >To run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>, you must use an online service or install a distribution. Online services are commercial;
-find them by entering `online latex' in a search engine. For distributions, your choices are <a
-href="https://tug.org/texlive/" ><span class="TEX">T<span
-class="E">E</span>X</span>&#x00A0;Live</a> on a
-Unix system, including GNU/Linux, or on Windows, or the related <a
-href="https://tug.org/mactex/" >Mac<span class="TEX">T<span
-class="E">E</span>X</span></a> on Macintosh, or <a
-href="https://miktex.org/" >MiK<span class="TEX">T<span
-class="E">E</span>X</span></a> on
+ <h3 class='sectionHead' id='starting'><a id='x1-1000'></a>Starting</h3>
+<!-- l. 32 --><p class='noindent'>To run LaTeX, you must use an online service or install a distribution. Online services are commercial; find
+them by entering ‘online latex’ in a search engine. For distributions, your choices are <a href='https://tug.org/texlive/'>TeX Live</a> on a Unix
+system, including GNU/Linux, or on Windows, or the related <a href='https://tug.org/mactex/'>MacTeX</a> on Macintosh, or <a href='https://miktex.org/'>MiKTeX</a> on
Windows or a Unix system.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Tutorials </span>The site <a
-href="https://www.learnlatex.org/" ><span
-class="ectt-1095">learnlatex.org</span></a> teaches you the basics in a sound way, and also lets you play with the
-commands to see the results. For a more traditional document, the most widely recommended one is <a
-href="https://ctan.org/pkg/lshort-english" >The
-Not-So Short Guide to <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>2<span
-class="cmmi-10x-x-109">&#x03B5;</span></a>, available in many languages.<sup><a
-href="#ennote-1" id="enmark-1"><span
-class="cmr-8">1</span></a></sup>
- <p>Many people use <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> to write mathematical text and for this the premier choice is from the
-American Mathematical Society. See their <a
-href="http://mirror.ctan.org/info/amslatex/primer/amshelp.pdf" >Getting up and running with AMS-<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span></a>,<sup><a
-href="#ennote-2" id="enmark-2"><span
-class="cmr-8">2</span></a></sup> and more detail is
-in <a
-href="http://mirror.ctan.org/macros/latex/required/amsmath/amsldoc.pdf" >Users Guide for the <span
-class="ectt-1095">amsmath </span>package</a>.<sup><a
-href="#ennote-3" id="enmark-3"><span
-class="cmr-8">3</span></a></sup>
+</p><!-- l. 44 --><p class='noindent'>
</p>
-<h3 class="sectionHead"><a
- id="x1-2000"></a>Documentation</h3>
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">References </span>The nearest thing to a general reference for <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> is <a
-href="http://mirror.ctan.org/info/latex2e-help-texinfo/latex2e.html" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>2<span
-class="cmmi-10x-x-109">&#x03B5;</span> unofficial reference manual</a>.<sup><a
-href="#ennote-4" id="enmark-4"><span
-class="cmr-8">4</span></a></sup>
-Look for symbols in the <a
-href="http://mirror.ctan.org/info/symbols/comprehensive/symbols-letter.pdf" >Comprehensive List of Symbols</a>.<sup><a
-href="#ennote-5" id="enmark-5"><span
-class="cmr-8">5</span></a></sup> And, <a
-href="https://tug.org/TUGboat/" >TUGboat</a>, the journal of the <a
-href="https://tug.org" ><span class="TEX">T<span
-class="E">E</span>X</span> Users
-Group</a>, has published many articles, at levels from beginner to expert, almost since the inception of
-<span class="TEX">T<span
-class="E">E</span>X</span>.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">FAQs </span>Many web pages offer quick help with <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>, although they can be out of date. Particularly useful
-and reliable are the <a
-href="https://texfaq.org/" ><span class="TEX">T<span
-class="E">E</span>X</span> FAQ</a>,<sup><a
-href="#ennote-6" id="enmark-6"><span
-class="cmr-8">6</span></a></sup> as well as <a
-href="https://tug.org/interest.html" ><span class="TEX">T<span
-class="E">E</span>X</span> Resources on the Web</a>. You can also get a handy
-general <a
-href="http://mirror.ctan.org/info/latexcheat/latexcheat/latexsheet.pdf" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> Cheat Sheet</a>,<sup><a
-href="#ennote-7" id="enmark-7"><span
-class="cmr-8">7</span></a></sup> as well as the <a
-href="http://mirrors.ctan.org/info/undergradmath/undergradmath.pdf" >Math for Undergraduates Cheat Sheet</a>.<sup><a
-href="#ennote-8" id="enmark-8"><span
-class="cmr-8">8</span></a></sup> Also,
-<a
-href="http://mirror.ctan.org/info/l2tabu/english/l2tabuen.pdf" >An essential guide to <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>2<span
-class="cmmi-10x-x-109">&#x03B5;</span> usage</a><sup><a
-href="#ennote-9" id="enmark-9"><span
-class="cmr-8">9</span></a></sup> helps you develop sound habits, by saying what not to
+ <h4 class='subsectionHead' id='tutorials'><a id='x1-2000'></a>Tutorials</h4>
+<!-- l. 45 --><p class='noindent'>The site <a href='https://www.learnlatex.org/'><span class='ectt-1095'>learnlatex.org</span></a> teaches you the basics in a sound way, and also lets you play with the commands
+to see the results. For a more traditional document, the most widely recommended one is <a href='https://ctan.org/pkg/lshort-english'>The Not-So Short
+Guide to LaTeX2e</a>, available in many languages.<sup class='textsuperscript'><a href='#ennote-1' id='enmark-1'><span class='Spectral-Light-lf-t1-'>1</span></a></sup>
+</p><!-- l. 59 --><p class='indent'> <p>Many people use LaTeX to write mathematical text and for this the premier choice is from the
+American Mathematical Society. See their <a href='http://mirror.ctan.org/info/amslatex/primer/amshelp.pdf'>Getting up and running with AMS-LaTeX</a>,<sup class='textsuperscript'><a href='#ennote-2' id='enmark-2'><span class='Spectral-Light-lf-t1-'>2</span></a></sup> and more detail is
+in <a href='http://mirror.ctan.org/macros/latex/required/amsmath/amsldoc.pdf'>Users Guide for the <span class='ectt-1095'>amsmath </span>package</a>.<sup class='textsuperscript'><a href='#ennote-3' id='enmark-3'><span class='Spectral-Light-lf-t1-'>3</span></a></sup>
+</p><!-- l. 72 --><p class='noindent'>
+</p>
+ <h3 class='sectionHead' id='documentation'><a id='x1-3000'></a>Documentation</h3>
+<!-- l. 75 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='references'><a id='x1-4000'></a>References</h4>
+<!-- l. 76 --><p class='noindent'>The nearest thing to a general reference for LaTeX is <a href='http://mirror.ctan.org/info/latex2e-help-texinfo/latex2e.html'>LaTeX2e unofficial reference manual</a>.<sup class='textsuperscript'><a href='#ennote-4' id='enmark-4'><span class='Spectral-Light-lf-t1-'>4</span></a></sup> Look for
+symbols in the <a href='http://mirror.ctan.org/info/symbols/comprehensive/symbols-letter.pdf'>Comprehensive List of Symbols</a>.<sup class='textsuperscript'><a href='#ennote-5' id='enmark-5'><span class='Spectral-Light-lf-t1-'>5</span></a></sup> And, <a href='https://tug.org/TUGboat/'>TUGboat</a>, the journal of the <a href='https://tug.org'>TeX Users Group</a>,
+has published many articles, at levels from beginner to expert, almost since the inception of
+
+
+TeX.
+</p><!-- l. 90 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='faqs'><a id='x1-5000'></a>FAQs</h4>
+<!-- l. 91 --><p class='noindent'>Many web pages offer quick help with LaTeX, although they can be out of date. Particularly useful and
+reliable are the <a href='https://texfaq.org/'>TeX FAQ</a>,<sup class='textsuperscript'><a href='#ennote-6' id='enmark-6'><span class='Spectral-Light-lf-t1-'>6</span></a></sup> as well as <a href='https://tug.org/interest.html'>TeX Resources on the Web</a>. You can also get a handy
+general <a href='http://mirror.ctan.org/info/latexcheat/latexcheat/latexsheet.pdf'>LaTeX Cheat Sheet</a>,<sup class='textsuperscript'><a href='#ennote-7' id='enmark-7'><span class='Spectral-Light-lf-t1-'>7</span></a></sup> as well as the <a href='http://mirrors.ctan.org/info/undergradmath/undergradmath.pdf'>Math for Undergraduates Cheat Sheet</a>.<sup class='textsuperscript'><a href='#ennote-8' id='enmark-8'><span class='Spectral-Light-lf-t1-'>8</span></a></sup> Also,
+<a href='http://mirror.ctan.org/info/l2tabu/english/l2tabuen.pdf'>An essential guide to LaTeX2e usage</a><sup class='textsuperscript'><a href='#ennote-9' id='enmark-9'><span class='Spectral-Light-lf-t1-'>9</span></a></sup> helps you develop sound habits, by saying what not to
do.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Questions </span>If you are stuck on an issue, the <a
-href="https://tex.stackexchange.com/" ><span class="TEX">T<span
-class="E">E</span>X</span>-<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> Stack Exchange</a> site and the mailing list
-<a
-href="https://lists.tug.org/texhax" >texhax@tug.org</a> are where knowledgeable people hang out. You are likely to find an answer in their past
-discussions, which cover decades, and if not then you can post a question yourself.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Books </span>There are many excellent books about <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>. Visit the <a
-href="https://tug.org/books/" ><span class="TEX">T<span
-class="E">E</span>X</span> Users Group's book list</a> for a
-selection, and for discounts.
-<h3 class="sectionHead"><a
- id="x1-3000"></a>Packages</h3>
-<!--l. 131--><p class="noindent" >One of <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>'s strengths is the tremendous number of available add-on packages. This list covers most of
+</p><!-- l. 109 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='questions'><a id='x1-6000'></a>Questions</h4>
+<!-- l. 110 --><p class='noindent'>If you are stuck on an issue, the <a href='https://tex.stackexchange.com/'>TeX-LaTeX Stack Exchange</a> site and the mailing list <a href='https://lists.tug.org/texhax'>texhax@tug.org</a> are
+where knowledgeable people hang out. You are likely to find an answer in their past discussions, which
+cover decades, and if not then you can post a question yourself.
+</p><!-- l. 119 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='books'><a id='x1-7000'></a>Books</h4>
+<!-- l. 120 --><p class='noindent'><p>There are many excellent books about LaTeX. Visit the <a href='https://tug.org/books/'>TeX Users Group’s book list</a> for a selection, and for
+discounts.
+</p><!-- l. 129 --><p class='noindent'>
+</p>
+ <h3 class='sectionHead' id='packages'><a id='x1-8000'></a>Packages</h3>
+<!-- l. 131 --><p class='noindent'>One of LaTeX’s strengths is the tremendous number of available add-on packages. This list covers most of
what beginners want to do. (There are some comments in parentheses that often come up in conjunction
+with these recommendations.)
+</p><!-- l. 139 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='our-archive'><a id='x1-9000'></a>Our archive</h4>
+<!-- l. 140 --><p class='noindent'>The Comprehensive TeX Archive Network, <a href='https://ctan.org'><span class='Spectral-Light-lf-t1-'>CTAN</span></a>, has the latest official versions of the packages that are
+in the distributions, along with documentation. <a href='https://ctan.org/topics/cloud'>Browsing by topic</a> can be very handy.
+</p><!-- l. 149 --><p class='indent'> <p>If you have trouble finding something, it may be the house package of a journal or institution. Look on
+their web page as well as on <span class='Spectral-Light-lf-t1-'>CTAN</span>.
-with these recommendations.)
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Our archive </span>The Comprehensive <span class="TEX">T<span
-class="E">E</span>X</span> Archive Network, <a
-href="https://ctan.org" ><span
-class="Spectral-Light-lf-t-1">CTAN</span></a>, has the latest official versions of the
-packages that are in the distributions, along with documentation. <a
-href="https://ctan.org/topics/cloud" >Browsing by topic</a> can be very
-handy.
-
-<p><p>If you have trouble finding something, it may be the house package of a journal or institution. Look on
-their web page as well as on <span
-class="Spectral-Light-lf-t-1">CTAN</span>.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Every document </span>To change page size, margins, and orientation, use <a
-href="https://ctan.org/pkg/geometry" ><span
-class="ectt-1095">geometry</span></a>.<sup><a
-href="#ennote-10" id="enmark-10"><span
-class="cmr-8">10</span></a></sup> Get multiple columns
-with <a
-href="https://ctan.org/pkg/multicol" ><span
-class="ectt-1095">multicol</span></a>.<sup><a
-href="#ennote-11" id="enmark-11"><span
-class="cmr-8">11</span></a></sup>
- <p>As referred to above, any document containing significant amounts of mathematics should use the
-American Mathematical Society's packages <a
-href="https://ctan.org/pkg/amsmath" ><span
-class="ectt-1095">amsmath</span></a><sup><a
-href="#ennote-12" id="enmark-12"><span
-class="cmr-8">12</span></a></sup> and <a
-href="https://ctan.org/pkg/amsfonts" ><span
-class="ectt-1095">amsfonts</span></a>.<sup><a
-href="#ennote-13" id="enmark-13"><span
-class="cmr-8">13</span></a></sup> Also use their <a
-href="https://ctan.org/pkg/amsthm" ><span
-class="ectt-1095">amsthm</span></a><sup><a
-href="#ennote-14" id="enmark-14"><span
-class="cmr-8">14</span></a></sup> for
-producing theorem environments. Notes: (1)&#x00A0;<a
-href="https://ctan.org/pkg/amsfonts" ><span
-class="ectt-1095">amssymb</span></a> inputs <a
-href="https://ctan.org/pkg/amsfonts" ><span
-class="ectt-1095">amsfonts</span></a> so load the former instead of the
-latter, (2)&#x00A0;many authors also use the calligraphic characters in <a
-href="https://ctan.org/pkg/rsfs" ><span
-class="ectt-1095">rsfs</span></a>,<sup><a
-href="#ennote-15" id="enmark-15"><span
-class="cmr-8">15</span></a></sup> (3)&#x00A0;get bold math symbols with <a
-href="https://ctan.org/pkg/bm" ><span
-class="ectt-1095">bm</span></a>,<sup><a
-href="#ennote-16" id="enmark-16"><span
-class="cmr-8">16</span></a></sup>
-(4)&#x00A0;don't load <a
-href="https://ctan.org/pkg/amsmath" ><span
-class="ectt-1095">amsmath</span></a> directly, instead get it by loading <a
-href="https://ctan.org/pkg/mathtools" ><span
-class="ectt-1095">mathtools</span></a><sup><a
-href="#ennote-17" id="enmark-17"><span
-class="cmr-8">17</span></a></sup> for some useful improvements, and
-(4)&#x00A0;load <a
-href="https://ctan.org/pkg/amsthm" ><span
-class="ectt-1095">amsthm</span></a> after <a
-href="https://ctan.org/pkg/mathtools" ><span
-class="ectt-1095">mathtools</span></a>.
- <p>Also, include <a
-href="https://ctan.org/pkg/microtype" ><span
-class="ectt-1095">microtype</span></a>.<sup><a
-href="#ennote-18" id="enmark-18"><span
-class="cmr-8">18</span></a></sup> It will make your document have fewer awkward lines.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Inside a document </span>Tweak the layout of lists with <a
-href="https://ctan.org/pkg/enumitem" ><span
-class="ectt-1095">enumitem</span></a>.<sup><a
-href="#ennote-19" id="enmark-19"><span
-class="cmr-8">19</span></a></sup>
- <p>Enhance captions with <a
-href="https://ctan.org/pkg/caption" ><span
-class="ectt-1095">caption</span></a><sup><a
-href="#ennote-20" id="enmark-20"><span
-class="cmr-8">20</span></a></sup> and control floating environments with <a
-href="https://ctan.org/pkg/float" ><span
-class="ectt-1095">float</span></a>.<sup><a
-href="#ennote-21" id="enmark-21"><span
-class="cmr-8">21</span></a></sup> (In particular, this
-package provides the `<span
-class="ectt-1095">H</span>' option to override automatic float placement and put something exactly where you
+</p><!-- l. 155 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='every-document'><a id='x1-10000'></a>Every document</h4>
+<!-- l. 156 --><p class='noindent'>To change page size, margins, and orientation, use <a href='https://ctan.org/pkg/geometry'><span class='ectt-1095'>geometry</span></a>.<sup class='textsuperscript'><a href='#ennote-10' id='enmark-10'><span class='Spectral-Light-lf-t1-'>10</span></a></sup> Get multiple columns with
+<a href='https://ctan.org/pkg/multicol'><span class='ectt-1095'>multicol</span></a>.<sup class='textsuperscript'><a href='#ennote-11' id='enmark-11'><span class='Spectral-Light-lf-t1-'>11</span></a></sup>
+</p><!-- l. 160 --><p class='indent'> <p>As referred to above, any document containing significant amounts of mathematics should use the
+American Mathematical Society’s packages <a href='https://ctan.org/pkg/amsmath'><span class='ectt-1095'>amsmath</span></a><sup class='textsuperscript'><a href='#ennote-12' id='enmark-12'><span class='Spectral-Light-lf-t1-'>12</span></a></sup> and <a href='https://ctan.org/pkg/amsfonts'><span class='ectt-1095'>amsfonts</span></a>.<sup class='textsuperscript'><a href='#ennote-13' id='enmark-13'><span class='Spectral-Light-lf-t1-'>13</span></a></sup> Also use their <a href='https://ctan.org/pkg/amsthm'><span class='ectt-1095'>amsthm</span></a><sup class='textsuperscript'><a href='#ennote-14' id='enmark-14'><span class='Spectral-Light-lf-t1-'>14</span></a></sup> for
+producing theorem environments. Notes: (1)  <a href='https://ctan.org/pkg/amsfonts'><span class='ectt-1095'>amssymb</span></a> inputs <a href='https://ctan.org/pkg/amsfonts'><span class='ectt-1095'>amsfonts</span></a> so load the former instead of the
+latter, (2) many authors also use the calligraphic characters in <a href='https://ctan.org/pkg/rsfs'><span class='ectt-1095'>rsfs</span></a>,<sup class='textsuperscript'><a href='#ennote-15' id='enmark-15'><span class='Spectral-Light-lf-t1-'>15</span></a></sup> (3) get bold math symbols with <a href='https://ctan.org/pkg/bm'><span class='ectt-1095'>bm</span></a>,<sup class='textsuperscript'><a href='#ennote-16' id='enmark-16'><span class='Spectral-Light-lf-t1-'>16</span></a></sup>
+(4) don’t load <a href='https://ctan.org/pkg/amsmath'><span class='ectt-1095'>amsmath</span></a> directly, instead get it by loading <a href='https://ctan.org/pkg/mathtools'><span class='ectt-1095'>mathtools</span></a><sup class='textsuperscript'><a href='#ennote-17' id='enmark-17'><span class='Spectral-Light-lf-t1-'>17</span></a></sup> for some useful improvements, and
+(4) load <a href='https://ctan.org/pkg/amsthm'><span class='ectt-1095'>amsthm</span></a> after <a href='https://ctan.org/pkg/mathtools'><span class='ectt-1095'>mathtools</span></a>.
+</p><!-- l. 178 --><p class='indent'> <p>Also, include <a href='https://ctan.org/pkg/microtype'><span class='ectt-1095'>microtype</span></a>.<sup class='textsuperscript'><a href='#ennote-18' id='enmark-18'><span class='Spectral-Light-lf-t1-'>18</span></a></sup> It will make your document have fewer awkward lines.
+</p><!-- l. 185 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='inside-a-document'><a id='x1-11000'></a>Inside a document</h4>
+<!-- l. 186 --><p class='noindent'>Tweak the layout of lists with <a href='https://ctan.org/pkg/enumitem'><span class='ectt-1095'>enumitem</span></a>.<sup class='textsuperscript'><a href='#ennote-19' id='enmark-19'><span class='Spectral-Light-lf-t1-'>19</span></a></sup>
+</p><!-- l. 188 --><p class='indent'> <p>Enhance captions with <a href='https://ctan.org/pkg/caption'><span class='ectt-1095'>caption</span></a><sup class='textsuperscript'><a href='#ennote-20' id='enmark-20'><span class='Spectral-Light-lf-t1-'>20</span></a></sup> and control floating environments with <a href='https://ctan.org/pkg/float'><span class='ectt-1095'>float</span></a>.<sup class='textsuperscript'><a href='#ennote-21' id='enmark-21'><span class='Spectral-Light-lf-t1-'>21</span></a></sup> (In particular, this
+package provides the ‘<span class='ectt-1095'>H</span>’ option to override automatic float placement and put something exactly where you
ask. This may cause issues&nbsp;&mdash; what if you want to include a two inch tall graphic on a page that has only an
inch left?&nbsp;&mdash; but it sometimes is what you want.)
- <p>Get hyperlinks and turn references into links with <a
-href="https://ctan.org/pkg/hyperref" ><span
-class="ectt-1095">hyperref</span></a><sup><a
-href="#ennote-22" id="enmark-22"><span
-class="cmr-8">22</span></a></sup> (make sure to set it up, as with
-<span class="lstinline"></span><span
-class="ectt-1000">\</span><span
-class="ectt-1000">hypersetup</span><span
-class="ectt-1000">{</span><span
-class="ectt-1000">colorlinks</span><span
-class="ectt-1000">=</span><span
-class="ectt-1000">true</span><span
-class="ectt-1000">}</span>). Have cross-references that say `Theorem&#x00A0;1.2' instead of just `1.2' with
-<a
-href="https://ctan.org/pkg/cleveref" ><span
-class="ectt-1095">cleveref</span></a>.<sup><a
-href="#ennote-23" id="enmark-23"><span
-class="cmr-8">23</span></a></sup> For <span
-class="Spectral-Light-lf-t-1">URL</span>'s and file paths that can break across lines, use <a
-href="https://ctan.org/pkg/url" ><span
-class="ectt-1095">url</span></a>.<sup><a
-href="#ennote-24" id="enmark-24"><span
-class="cmr-8">24</span></a></sup> (If you use <a
-href="https://ctan.org/pkg/hyperref" ><span
-class="ectt-1095">hyperref</span></a> then note
-that it has its own commands for the <a
-href="https://ctan.org/pkg/cleveref" ><span
-class="ectt-1095">cleveref</span></a> and <a
-href="https://ctan.org/pkg/url" ><span
-class="ectt-1095">url</span></a> functions.)
- <p>Inside verbatim text, make single quotes come out correctly with <a
-href="https://ctan.org/pkg/upquote" ><span
-class="ectt-1095">upquote</span></a>.<sup><a
-href="#ennote-25" id="enmark-25"><span
-class="cmr-8">25</span></a></sup> For including computer
-code, the <a
-href="https://ctan.org/pkg/listings" ><span
-class="ectt-1095">listings</span></a><sup><a
-href="#ennote-26" id="enmark-26"><span
-class="cmr-8">26</span></a></sup> package is very popular. (Copy and paste for computer code is especially convenient.
-This is a start for the <a
-href="https://ctan.org/pkg/listings" ><span
-class="ectt-1095">listings</span></a> package. </p><!--l. 219-->
- <div class="lstlisting" id="listing-1"><span class="label"><a
- id="x1-3001r1"></a></span><span
-class="ectt-1000">\</span><span
-class="ectt-1000">lstset</span><span
-class="ectt-1000">{</span><span
-class="ectt-1000">basicstyle</span><span
-class="ectt-1000">=\</span><span
-class="ectt-1000">ttfamily</span><span
-class="ectt-1000">,</span><span
-class="ectt-1000">&#x00A0;</span><br /><span class="label"><a
- id="x1-3002r2"></a></span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">keepspaces</span><span
-class="ectt-1000">=</span><span
-class="ectt-1000">true</span><span
-class="ectt-1000">,</span><span
-class="ectt-1000">&#x00A0;</span><br /><span class="label"><a
- id="x1-3003r3"></a></span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">&#x00A0;</span><span
-class="ectt-1000">columns</span><span
-class="ectt-1000">=</span><span
-class="ectt-1000">fullflexible</span><span
-class="ectt-1000">}</span>
+</p><!-- l. 199 --><p class='indent'> <p>Get hyperlinks and turn references into links with <a href='https://ctan.org/pkg/hyperref'><span class='ectt-1095'>hyperref</span></a><sup class='textsuperscript'><a href='#ennote-22' id='enmark-22'><span class='Spectral-Light-lf-t1-'>22</span></a></sup> (make sure to set it up, as with
+<code class='lstinline'><span style='color:#000000'>\hypersetup{colorlinks=true}</span></code>). Have cross-references that say ‘Theorem 1.2’ instead of just ‘1.2’ with
+<a href='https://ctan.org/pkg/cleveref'><span class='ectt-1095'>cleveref</span></a>.<sup class='textsuperscript'><a href='#ennote-23' id='enmark-23'><span class='Spectral-Light-lf-t1-'>23</span></a></sup> For <span class='Spectral-Light-lf-t1-'>URL</span>’s and file paths that can break across lines, use <a href='https://ctan.org/pkg/url'><span class='ectt-1095'>url</span></a>.<sup class='textsuperscript'><a href='#ennote-24' id='enmark-24'><span class='Spectral-Light-lf-t1-'>24</span></a></sup> (If you use <a href='https://ctan.org/pkg/hyperref'><span class='ectt-1095'>hyperref</span></a> then note
+that it has its own commands for the <a href='https://ctan.org/pkg/cleveref'><span class='ectt-1095'>cleveref</span></a> and <a href='https://ctan.org/pkg/url'><span class='ectt-1095'>url</span></a> functions.)
+</p><!-- l. 210 --><p class='indent'> <p>Inside verbatim text, make single quotes come out correctly with <a href='https://ctan.org/pkg/upquote'><span class='ectt-1095'>upquote</span></a>.<sup class='textsuperscript'><a href='#ennote-25' id='enmark-25'><span class='Spectral-Light-lf-t1-'>25</span></a></sup> For including computer
+code, the <a href='https://ctan.org/pkg/listings'><span class='ectt-1095'>listings</span></a><sup class='textsuperscript'><a href='#ennote-26' id='enmark-26'><span class='Spectral-Light-lf-t1-'>26</span></a></sup> package is very popular. (Copy and paste for computer code is especially convenient.
+This is a start for the <a href='https://ctan.org/pkg/listings'><span class='ectt-1095'>listings</span></a> package. </p><!-- l. 219 -->
+ <pre class='lstlisting' id='listing-2'><span class='label'><a id='x1-11001r1'></a></span><span style='color:#000000'><span class='ectt-1000'>\</span></span><span style='color:#000000'><span class='ectt-1000'>lstset</span></span><span style='color:#000000'><span class='ectt-1000'>{</span></span><span style='color:#000000'><span class='ectt-1000'>basicstyle</span></span><span style='color:#000000'><span class='ectt-1000'>=\</span></span><span style='color:#000000'><span class='ectt-1000'>ttfamily</span></span><span style='color:#000000'><span class='ectt-1000'>,</span></span>
+<span class='label'><a id='x1-11002r2'></a></span><span style='color:#000000'> <span class='ectt-1000'>keepspaces=true,</span>
+</span><span class='label'><a id='x1-11003r3'></a></span><span style='color:#000000'> <span class='ectt-1000'>columns=fullflexible}</span></span></pre>
- </div>
- But it is not a full solution. The results depend on the <span
-class="Spectral-Light-lf-t-1">PDF </span>viewer and worse, if your code line begins
+<!-- l. 224 --><p class='indent'> But it is not a full solution. The results depend on the <span class='Spectral-Light-lf-t1-'>PDF </span>viewer and worse, if your code line begins
with blank spaces then after copy and paste those spaces are gone.)
- <p>If you use Python, <a
-href="https://ctan.org/pkg/pythontex" ><span
-class="ectt-1095">pythontex</span></a><sup><a
-href="#ennote-27" id="enmark-27"><span
-class="cmr-8">27</span></a></sup> will show code listings, but it also allows you to execute Python and put
-the results in your output. Do the same for the <span
-class="Spectral-LightItalic-lf-t-1x-x-109">Sage </span>mathematics software with <a
-href="https://ctan.org/pkg/sagetex" ><span
-class="ectt-1095">sagetex</span></a>, and similar
+</p><!-- l. 229 --><p class='indent'> <p>If you use Python, <a href='https://ctan.org/pkg/pythontex'><span class='ectt-1095'>pythontex</span></a><sup class='textsuperscript'><a href='#ennote-27' id='enmark-27'><span class='Spectral-Light-lf-t1-'>27</span></a></sup> will show code listings, but it also allows you to execute Python and put
+the results in your output. Do the same for the <span class='Spectral-LightItalic-lf-t1-x-x-109'>Sage </span>mathematics software with <a href='https://ctan.org/pkg/sagetex'><span class='ectt-1095'>sagetex</span></a>, and similar
support exists for other languages.
- <p>There are many packages that add table capabilities, such as multirow entries and breaking across
-pages. The first package to try is <a
-href="https://ctan.org/pkg/array" ><span
-class="ectt-1095">array</span></a>,<sup><a
-href="#ennote-28" id="enmark-28"><span
-class="cmr-8">28</span></a></sup> which lets you define your own column types. To handle
-scientific units, use <a
-href="https://ctan.org/pkg/siunitx" ><span
-class="ectt-1095">siunitx</span></a><sup><a
-href="#ennote-29" id="enmark-29"><span
-class="cmr-8">29</span></a></sup> (which also has a table column type for aligning on a decimal
+</p><!-- l. 238 --><p class='indent'> <p>There are many packages that add table capabilities, such as multirow entries and breaking across
+pages. The first package to try is <a href='https://ctan.org/pkg/array'><span class='ectt-1095'>array</span></a>,<sup class='textsuperscript'><a href='#ennote-28' id='enmark-28'><span class='Spectral-Light-lf-t1-'>28</span></a></sup> which lets you define your own column types. To handle
+scientific units, use <a href='https://ctan.org/pkg/siunitx'><span class='ectt-1095'>siunitx</span></a><sup class='textsuperscript'><a href='#ennote-29' id='enmark-29'><span class='Spectral-Light-lf-t1-'>29</span></a></sup> (which also has a table column type for aligning on a decimal
point).
- <p>Make boxes that are colored or framed, such as boxes for theorems, with <a
-href="https://ctan.org/pkg/tcolorbox" ><span
-class="ectt-1095">tcolorbox</span></a>.<sup><a
-href="#ennote-30" id="enmark-30"><span
-class="cmr-8">30</span></a></sup>
- <p>Use <a
-href="https://ctan.org/pkg/babel" ><span
-class="ectt-1095">babel</span></a><sup><a
-href="#ennote-31" id="enmark-31"><span
-class="cmr-8">31</span></a></sup> for internationalization, including changing the title of the abstract or the bibliography.
-(Note that <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> now defaults to UTF-8 encoded input.)
- <p>Finally, when developing a document, you often want to generate filler text. Use <a
-href="https://ctan.org/pkg/lipsum" ><span
-class="ectt-1095">lipsum</span></a>.<sup><a
-href="#ennote-32" id="enmark-32"><span
-class="cmr-8">32</span></a></sup>
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Color and graphics </span>For colors, use <a
-href="https://ctan.org/pkg/xcolor" ><span
-class="ectt-1095">xcolor</span></a>.<sup><a
-href="#ennote-33" id="enmark-33"><span
-class="cmr-8">33</span></a></sup>
- <p>To include graphics and do simple manipulations such as resizing, use <a
-href="https://ctan.org/pkg/graphicx" ><span
-class="ectt-1095">graphicx</span></a>.<sup><a
-href="#ennote-34" id="enmark-34"><span
-class="cmr-8">34</span></a></sup> Use the <span
-class="Spectral-Light-lf-t-1">JPG </span>format
-for photos, <span
-class="Spectral-Light-lf-t-1">PNG </span>for other kinds of raster graphics, and <span
-class="Spectral-Light-lf-t-1">PDF </span>for vector graphics. If your graphic is in another
+</p><!-- l. 247 --><p class='indent'> <p>Make boxes that are colored or framed, such as boxes for theorems, with <a href='https://ctan.org/pkg/tcolorbox'><span class='ectt-1095'>tcolorbox</span></a>.<sup class='textsuperscript'><a href='#ennote-30' id='enmark-30'><span class='Spectral-Light-lf-t1-'>30</span></a></sup>
+</p><!-- l. 251 --><p class='indent'> Use <a href='https://ctan.org/pkg/babel'><span class='ectt-1095'>babel</span></a><sup class='textsuperscript'><a href='#ennote-31' id='enmark-31'><span class='Spectral-Light-lf-t1-'>31</span></a></sup> for internationalization, including changing the title of the abstract or the bibliography.
+(Note that LaTeX now defaults to UTF-8 encoded input.)
+</p><!-- l. 256 --><p class='indent'> <p>Finally, when developing a document, you often want to generate filler text. Use <a href='https://ctan.org/pkg/lipsum'><span class='ectt-1095'>lipsum</span></a>.<sup class='textsuperscript'><a href='#ennote-32' id='enmark-32'><span class='Spectral-Light-lf-t1-'>32</span></a></sup>
-format then convert it to one of these three. (Usually in your <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> source, you give the file name without
-the extension, as with <span class="lstinline"></span><span
-class="ectt-1000">\</span><span
-class="ectt-1000">includegraphics</span><span
-class="ectt-1000">{</span><span
-class="ectt-1000">myplot</span><span
-class="ectt-1000">}</span>.) Include parts of an outside <span
-class="Spectral-Light-lf-t-1">PDF </span>document with
-<a
-href="https://ctan.org/pkg/pdfpages" ><span
-class="ectt-1095">pdfpages</span></a>.<sup><a
-href="#ennote-35" id="enmark-35"><span
-class="cmr-8">35</span></a></sup> Include video or sound using <a
-href="https://ctan.org/pkg/media9" ><span
-class="ectt-1095">media9</span></a>.<sup><a
-href="#ennote-36" id="enmark-36"><span
-class="cmr-8">36</span></a></sup>
- <p>In your plots and graphics, you want that the fonts and notations match your document. You have a few
-choices. Draw inside your document with <a
-href="https://ctan.org/pkg/pgf" >Ti<span
-class="Spectral-LightItalic-lf-t-1x-x-109">k</span>Z</a>.<sup><a
-href="#ennote-37" id="enmark-37"><span
-class="cmr-8">37</span></a></sup> You can instead draw using an external command
-language such as <a
-href="https://asymptote.sourceforge.io/" >Asymptote</a>,<sup><a
-href="#ennote-38" id="enmark-38"><span
-class="cmr-8">38</span></a></sup> and bring the results in as graphics. And there are other options, such as
-that the <a
-href="http://www.gnuplot.info/" >Gnuplot</a> plotting software will output Ti<span
-class="Spectral-LightItalic-lf-t-1x-x-109">k</span>Z commands, and the <a
-href="https://inkscape.org/" >Inkscape</a> vector graphics editor
-allows you to embed <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>-generated equations.
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Front and back matter, headers, footers </span>To style chapter and section titles, use <a
-href="https://ctan.org/pkg/titlesec" ><span
-class="ectt-1095">titlesec</span></a>.<sup><a
-href="#ennote-39" id="enmark-39"><span
-class="cmr-8">39</span></a></sup> For page
-headers and footers, reach for <a
-href="https://ctan.org/pkg/fancyhdr" ><span
-class="ectt-1095">fancyhdr</span></a>.<sup><a
-href="#ennote-40" id="enmark-40"><span
-class="cmr-8">40</span></a></sup> You can tweak the format of tables of contents, lists of figures,
-etc., with <a
-href="https://ctan.org/pkg/tocloft" ><span
-class="ectt-1095">tocloft</span></a>.<sup><a
-href="#ennote-41" id="enmark-41"><span
-class="cmr-8">41</span></a></sup>
- <p>For footnotes, use <a
-href="https://ctan.org/pkg/footmisc" ><span
-class="ectt-1095">footmisc</span></a>.<sup><a
-href="#ennote-42" id="enmark-42"><span
-class="cmr-8">42</span></a></sup> Make an index with <a
-href="https://ctan.org/pkg/makeindex" ><span
-class="ectt-1095">makeindex</span></a>.<sup><a
-href="#ennote-43" id="enmark-43"><span
-class="cmr-8">43</span></a></sup> With <a
-href="https://ctan.org/pkg/answers" ><span
-class="ectt-1095">answers</span></a><sup><a
-href="#ennote-44" id="enmark-44"><span
-class="cmr-8">44</span></a></sup> you can send exercise
-answers to an external file, where you can make them a separate document or include them at the end of the
-current one.
- <p>Bibliographies are a thorny area. Often you have strict requirements, such as from the <a
-href="https://ctan.org/pkg/MLA" ><span
-class="ectt-1095">MLA</span></a>.<sup><a
-href="#ennote-45" id="enmark-45"><span
-class="cmr-8">45</span></a></sup> <span
-class="Spectral-Light-lf-t-1">CTAN </span>is a
-big help here; check out the many styles for both <a
-href="https://ctan.org/topic/bibtex-sty" >B<span
-class="Spectral-Light-lf-sc-t-1x-x-109">ib</span><span class="TEX">T<span
-class="E">E</span>X</span></a><sup><a
-href="#ennote-46" id="enmark-46"><span
-class="cmr-8">46</span></a></sup> and <a
-href="https://ctan.org/topic/biblatex" >B<span
-class="Spectral-Light-lf-sc-t-1x-x-109">ib</span><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span></a>.<sup><a
-href="#ennote-47" id="enmark-47"><span
-class="cmr-8">47</span></a></sup>
-<p class="subsection"><span
-class="Spectral-Bold-lf-t-1x-x-109">Special documents </span>Make exams and problem sets with the <a
-href="https://ctan.org/pkg/exam" ><span
-class="ectt-1095">exam</span></a><sup><a
-href="#ennote-48" id="enmark-48"><span
-class="cmr-8">48</span></a></sup> class.
- <p>There are many, many resume and CV packages. Start with <span
-class="Spectral-Light-lf-t-1">CTAN</span>'s <a
-href="https://ctan.org/topic/cv" >cv topic</a>.
- <p>To make presentations, use the <a
-href="https://ctan.org/pkg/beamer" ><span
-class="ectt-1095">beamer</span></a><sup><a
-href="#ennote-49" id="enmark-49"><span
-class="cmr-8">49</span></a></sup> class. (However, with this package you are entering another
+</p><!-- l. 263 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='color-and-graphics'><a id='x1-12000'></a>Color and graphics</h4>
+<!-- l. 264 --><p class='noindent'>For colors, use <a href='https://ctan.org/pkg/xcolor'><span class='ectt-1095'>xcolor</span></a>.<sup class='textsuperscript'><a href='#ennote-33' id='enmark-33'><span class='Spectral-Light-lf-t1-'>33</span></a></sup>
+</p><!-- l. 267 --><p class='indent'> <p>To include graphics and do simple manipulations such as resizing, use <a href='https://ctan.org/pkg/graphicx'><span class='ectt-1095'>graphicx</span></a>.<sup class='textsuperscript'><a href='#ennote-34' id='enmark-34'><span class='Spectral-Light-lf-t1-'>34</span></a></sup> Use the <span class='Spectral-Light-lf-t1-'>JPG </span>format
+for photos, <span class='Spectral-Light-lf-t1-'>PNG </span>for other kinds of raster graphics, and <span class='Spectral-Light-lf-t1-'>PDF </span>for vector graphics. If your graphic is in another
+format then convert it to one of these three. (Usually in your LaTeX source, you give the file name without
+the extension, as with <code class='lstinline'><span style='color:#000000'>\includegraphics{myplot}</span></code>.) Include parts of an outside <span class='Spectral-Light-lf-t1-'>PDF </span>document with
+<a href='https://ctan.org/pkg/pdfpages'><span class='ectt-1095'>pdfpages</span></a>.<sup class='textsuperscript'><a href='#ennote-35' id='enmark-35'><span class='Spectral-Light-lf-t1-'>35</span></a></sup> Include video or sound using <a href='https://ctan.org/pkg/media9'><span class='ectt-1095'>media9</span></a>.<sup class='textsuperscript'><a href='#ennote-36' id='enmark-36'><span class='Spectral-Light-lf-t1-'>36</span></a></sup>
+</p><!-- l. 280 --><p class='indent'> <p>In your plots and graphics, you want that the fonts and notations match your document. You have a few
+choices. Draw inside your document with <a href='https://ctan.org/pkg/pgf'>Ti<span class='Spectral-LightItalic-lf-t1-x-x-109'>k</span>Z</a>.<sup class='textsuperscript'><a href='#ennote-37' id='enmark-37'><span class='Spectral-Light-lf-t1-'>37</span></a></sup> You can instead draw using an external command
+language such as <a href='https://asymptote.sourceforge.io/'>Asymptote</a>,<sup class='textsuperscript'><a href='#ennote-38' id='enmark-38'><span class='Spectral-Light-lf-t1-'>38</span></a></sup> and bring the results in as graphics. And there are other options, such as
+that the <a href='http://www.gnuplot.info/'>Gnuplot</a> plotting software will output Ti<span class='Spectral-LightItalic-lf-t1-x-x-109'>k</span>Z commands, and the <a href='https://inkscape.org/'>Inkscape</a> vector graphics editor
+allows you to embed LaTeX-generated equations.
+</p><!-- l. 296 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='front-and-back-matter-headers-footers'><a id='x1-13000'></a>Front and back matter, headers, footers</h4>
+<!-- l. 297 --><p class='noindent'>To style chapter and section titles, use <a href='https://ctan.org/pkg/titlesec'><span class='ectt-1095'>titlesec</span></a>.<sup class='textsuperscript'><a href='#ennote-39' id='enmark-39'><span class='Spectral-Light-lf-t1-'>39</span></a></sup> For page headers and footers, reach for <a href='https://ctan.org/pkg/fancyhdr'><span class='ectt-1095'>fancyhdr</span></a>.<sup class='textsuperscript'><a href='#ennote-40' id='enmark-40'><span class='Spectral-Light-lf-t1-'>40</span></a></sup>
+You can tweak the format of tables of contents, lists of figures, etc., with <a href='https://ctan.org/pkg/tocloft'><span class='ectt-1095'>tocloft</span></a>.<sup class='textsuperscript'><a href='#ennote-41' id='enmark-41'><span class='Spectral-Light-lf-t1-'>41</span></a></sup>
+</p><!-- l. 305 --><p class='indent'> <p>For footnotes, use <a href='https://ctan.org/pkg/footmisc'><span class='ectt-1095'>footmisc</span></a>.<sup class='textsuperscript'><a href='#ennote-42' id='enmark-42'><span class='Spectral-Light-lf-t1-'>42</span></a></sup> Make an index with <a href='https://ctan.org/pkg/makeindex'><span class='ectt-1095'>makeindex</span></a>.<sup class='textsuperscript'><a href='#ennote-43' id='enmark-43'><span class='Spectral-Light-lf-t1-'>43</span></a></sup> With <a href='https://ctan.org/pkg/answers'><span class='ectt-1095'>answers</span></a><sup class='textsuperscript'><a href='#ennote-44' id='enmark-44'><span class='Spectral-Light-lf-t1-'>44</span></a></sup> you can send
+exercise answers to an external file, where you can make them a separate document or include them at the
+end of the current one.
+</p><!-- l. 313 --><p class='indent'> <p>Bibliographies are a thorny area. Often you have strict requirements, such as from the <a href='https://ctan.org/pkg/MLA'><span class='ectt-1095'>MLA</span></a>.<sup class='textsuperscript'><a href='#ennote-45' id='enmark-45'><span class='Spectral-Light-lf-t1-'>45</span></a></sup> <span class='Spectral-Light-lf-t1-'>CTAN </span>is a
+big help here; check out the many styles for both <a href='https://ctan.org/topic/bibtex-sty'>B<span class='Spectral-Light-lf-sc-t1-x-x-109'>ib</span>TeX</a><sup class='textsuperscript'><a href='#ennote-46' id='enmark-46'><span class='Spectral-Light-lf-t1-'>46</span></a></sup> and <a href='https://ctan.org/topic/biblatex'>B<span class='Spectral-Light-lf-sc-t1-x-x-109'>ib</span>LaTeX</a>.<sup class='textsuperscript'><a href='#ennote-47' id='enmark-47'><span class='Spectral-Light-lf-t1-'>47</span></a></sup>
+</p><!-- l. 324 --><p class='noindent'>
+</p>
+ <h4 class='subsectionHead' id='special-documents'><a id='x1-14000'></a>Special documents</h4>
+<!-- l. 325 --><p class='noindent'>Make exams and problem sets with the <a href='https://ctan.org/pkg/exam'><span class='ectt-1095'>exam</span></a><sup class='textsuperscript'><a href='#ennote-48' id='enmark-48'><span class='Spectral-Light-lf-t1-'>48</span></a></sup> class.
+</p><!-- l. 329 --><p class='indent'> <p>There are many, many resume and CV packages. Start with <span class='Spectral-Light-lf-t1-'>CTAN</span>’s <a href='https://ctan.org/topic/cv'>cv topic</a>.
+</p><!-- l. 333 --><p class='indent'> <p>To make presentations, use the <a href='https://ctan.org/pkg/beamer'><span class='ectt-1095'>beamer</span></a><sup class='textsuperscript'><a href='#ennote-49' id='enmark-49'><span class='Spectral-Light-lf-t1-'>49</span></a></sup> class. (However, with this package you are entering another
world, where many of the packages discussed here do not work. For example, section title styling happens
via a completely different mechanism.)
-<h3 class="sectionHead"><a
- id="x1-4000"></a>Fonts and engines</h3>
-<!--l. 344--><p class="noindent" >The documentation for font use commands from the <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> developers is <a
-href="http://mirror.ctan.org/macros/latex/base/fntguide.pdf" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>2<span
-class="cmmi-10x-x-109">&#x03B5;</span> font selection</a>.<sup><a
-href="#ennote-50" id="enmark-50"><span
-class="cmr-8">50</span></a></sup>
-</p><!--l. 348--><p class="indent" > To move beyond the default fonts, visit the <a
-href="https://tug.org/FontCatalogue/" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>&#x00A0;Font Catalogue</a>, which includes copy and paste code
+</p><!-- l. 343 --><p class='noindent'>
+</p>
+ <h3 class='sectionHead' id='fonts-and-engines'><a id='x1-15000'></a>Fonts and engines</h3>
+<!-- l. 344 --><p class='noindent'>The documentation for font use commands from the LaTeX developers is <a href='http://mirror.ctan.org/macros/latex/base/fntguide.pdf'>LaTeX2e font selection</a>.<sup class='textsuperscript'><a href='#ennote-50' id='enmark-50'><span class='Spectral-Light-lf-t1-'>50</span></a></sup>
+</p><!-- l. 348 --><p class='indent'> To move beyond the default fonts, visit the <a href='https://tug.org/FontCatalogue/'>LaTeX Font Catalogue</a>, which includes copy and paste code
to make each one work.
-</p><!--l. 353--><p class="indent" > Beyond that list, you can also use your computer system's fonts (beware this makes your source
-harder to share with friends, though). The background is:&#x00A0;to convert <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> source to <span
-class="Spectral-Light-lf-t-1">PDF</span>
-output there are three varieties of the <span class="TEX">T<span
-class="E">E</span>X</span> engine. Currently the most common is <a
-href="https://tug.org/applications/pdftex/" >pdf<span class="TEX">T<span
-class="E">E</span>X</span></a>.<sup><a
-href="#ennote-51" id="enmark-51"><span
-class="cmr-8">51</span></a></sup>
-For instance, this document was generated with <span class="obeylines-h"><span class="verb"><span
-class="ectt-1095">pdflatex</span><span
-class="ectt-1095">&#x00A0;latex-doc-ptr.tex</span></span></span>. Two further
-developments, <a
-href="https://tug.org/xetex/" >Xe<span class="TEX">T<span
-class="E">E</span>X</span></a>,<sup><a
-href="#ennote-52" id="enmark-52"><span
-class="cmr-8">52</span></a></sup> and <a
-href="http://www.luatex.org/" >Lua<span class="TEX">T<span
-class="E">E</span>X</span></a>,<sup><a
-href="#ennote-53" id="enmark-53"><span
-class="cmr-8">53</span></a></sup> can leverage the <a
-href="https://ctan.org/pkg/fontspec" ><span
-class="ectt-1095">fontspec</span></a><sup><a
-href="#ennote-54" id="enmark-54"><span
-class="cmr-8">54</span></a></sup> package to use your system's fonts,
-such as OpenType and TrueType fonts, in addition to the ones from your <span class="TEX">T<span
-class="E">E</span>X</span> distribution.
+</p><!-- l. 353 --><p class='indent'> Beyond that list, you can also use your computer system’s fonts (this may make your source file harder to
+share with friends, though). The background is: to convert LaTeX source to <span class='Spectral-Light-lf-t1-'>PDF </span>output there
+
+
+are three varieties of the TeX engine. Currently the most common is <a href='https://tug.org/applications/pdftex/'>pdfTeX</a>.<sup class='textsuperscript'><a href='#ennote-51' id='enmark-51'><span class='Spectral-Light-lf-t1-'>51</span></a></sup> For instance,
+this document was generated with <span class='obeylines-h'><code class='verb'>pdflatex latex-doc-ptr.tex</code></span>. Two further developments,
+<a href='https://tug.org/xetex/'>X ETeX</a>,<sup class='textsuperscript'><a href='#ennote-52' id='enmark-52'><span class='Spectral-Light-lf-t1-'>52</span></a></sup> and <a href='http://www.luatex.org/'>LuaTeX</a>,<sup class='textsuperscript'><a href='#ennote-53' id='enmark-53'><span class='Spectral-Light-lf-t1-'>53</span></a></sup> can leverage the <a href='https://ctan.org/pkg/fontspec'><span class='ectt-1095'>fontspec</span></a><sup class='textsuperscript'><a href='#ennote-54' id='enmark-54'><span class='Spectral-Light-lf-t1-'>54</span></a></sup> package to use your system’s fonts,
+such as OpenType and TrueType fonts, in addition to the ones from your TeX distribution.
(Mathematics requires much special tuning, though, so most of the time you cannot use system fonts for
math.)
-</p><!--l. 376--><p class="indent" > More is on the <a
-href="https://tug.org/fonts/" ><span class="TEX">T<span
-class="E">E</span>X</span> Users Group's font page</a>.
+</p><!-- l. 376 --><p class='indent'> More is on the <a href='https://tug.org/fonts/'>TeX Users Group’s font page</a>.
+</p><!-- l. 384 --><p class='noindent'>
</p>
-<h3 class="sectionHead"><a
- id="x1-5000"></a>Writing <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span></h3>
-<!--l. 386--><p class="noindent" ><p>There are many ways to make writing <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> source easier. Most people use a source code editor, such as
-<a
-href="https://www.texstudio.org/" ><span class="TEX">T<span
-class="E">E</span>X</span>studio</a>, or Emacs with the add-on mode <a
-href="https://www.gnu.org/software/auctex/" >AUC-<span class="TEX">T<span
-class="E">E</span>X</span></a>, or <a
-href="https://pages.uoregon.edu/koch/texshop/" ><span class="TEX">T<span
-class="E">E</span>X</span>Shop</a> on a Mac.
+ <h3 class='sectionHead' id='writing-latex'><a id='x1-16000'></a>Writing LaTeX</h3>
+<!-- l. 386 --><p class='noindent'><p>There are many ways to make writing LaTeX source easier. Most people use a source code editor, such as
+<a href='https://www.texstudio.org/'>TeXstudio</a>, or Emacs with the add-on mode <a href='https://www.gnu.org/software/auctex/'>AUC-TeX</a>, or <a href='https://pages.uoregon.edu/koch/texshop/'>TeXShop</a> on a Mac.
+</p><!-- l. 400 --><p class='noindent'>
</p>
-<h3 class="sectionHead"><a
- id="x1-6000"></a>Pronunciation</h3>
-<!--l. 401--><p class="noindent" >Pronounce <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span> as &apos;la-tech&apos; or &apos;lay-tech&apos;, with emphasis on either syllable. We prefer the first, with
+ <h3 class='sectionHead' id='pronunciation'><a id='x1-17000'></a>Pronunciation</h3>
+<!-- l. 401 --><p class='noindent'>Pronounce LaTeX as &apos;la-tech&apos; or &apos;lay-tech&apos;, with emphasis on either syllable. We prefer the first, with
emphasis on the first syllable.
+</p><!-- l. 408 --><p class='noindent'>
</p>
-<h3 class="sectionHead"><a
- id="x1-7000"></a>Welcome to the community!</h3>
-<!--l. 409--><p class="noindent" >One reason that all of these resources are available is the work of the many <a
-href="https://tug.org/usergroups.html" >user groups</a>, including the <a
-href="https://tug.org/" ><span class="TEX">T<span
-class="E">E</span>X</span>
-
-
+ <h3 class='sectionHead' id='this-document'><a id='x1-18000'></a>This document</h3>
+<!-- l. 409 --><p class='noindent'>To contact this document’s authors with suggestions and corrections please see its page at
+<a class='url' href='https://ctan.org/pkg/latex-doc-ptr'><span class='ectt-1095'>https://ctan.org/pkg/latex-doc-ptr</span></a>.
+</p><!-- l. 415 --><p class='noindent'>
+</p>
+ <h3 class='sectionHead' id='welcome-to-the-community'><a id='x1-19000'></a>Welcome to the community!</h3>
+<!-- l. 417 --><p class='noindent'>One reason that all of these resources are available is the work of the many <a href='https://tug.org/usergroups.html'>user groups</a>, including the <a href='https://tug.org/'>TeX
Users Group</a>. Please consider joining.
-</p><!--l. 421--><p class="noindent" >_________________________________________________________________________________________
+</p><!-- l. 426 --><p class='noindent'>_________________________________________________________________________________________
+</p><!-- l. 429 --><p class='noindent'>
</p>
-<h3 class="sectionHead"><a
- id="x1-8000"></a>Package names, for texdoc</h3>
-<!--l. 424--><p class="noindent" ></p><!--l. 4--><p class="indent" > <a
-href="#enmark-1" id="ennote-1"><sup><span
-class="cmr-6">1</span></sup></a><a
-href="https://ctan.org/pkg/lshort" ><span
-class="ectt-0900">lshort</span></a> <a
-href="#enmark-2" id="ennote-2"><sup><span
-class="cmr-6">2</span></sup></a><a
-href="https://ctan.org/pkg/amshelp" ><span
-class="ectt-0900">amshelp</span></a> <a
-href="#enmark-3" id="ennote-3"><sup><span
-class="cmr-6">3</span></sup></a><a
-href="https://ctan.org/pkg/amsmath" ><span
-class="ectt-0900">amsmath</span></a> <a
-href="#enmark-4" id="ennote-4"><sup><span
-class="cmr-6">4</span></sup></a><a
-href="https://ctan.org/pkg/latex2e" ><span
-class="ectt-0900">latex2e</span></a> <a
-href="#enmark-5" id="ennote-5"><sup><span
-class="cmr-6">5</span></sup></a><a
-href="https://ctan.org/pkg/comprehensive" ><span
-class="ectt-0900">comprehensive</span></a> <a
-href="#enmark-6" id="ennote-6"><sup><span
-class="cmr-6">6</span></sup></a><a
-href="https://ctan.org/pkg/faq" ><span
-class="ectt-0900">faq</span></a> <a
-href="#enmark-7" id="ennote-7"><sup><span
-class="cmr-6">7</span></sup></a><a
-href="https://ctan.org/pkg/latexcheat" ><span
-class="ectt-0900">latexcheat</span></a> <a
-href="#enmark-8" id="ennote-8"><sup><span
-class="cmr-6">8</span></sup></a><a
-href="https://ctan.org/pkg/undergradmath" ><span
-class="ectt-0900">undergradmath</span></a> <a
-href="#enmark-9" id="ennote-9"><sup><span
-class="cmr-6">9</span></sup></a><a
-href="https://ctan.org/pkg/l2tabuen" ><span
-class="ectt-0900">l2tabuen</span></a> <a
-href="#enmark-10" id="ennote-10"><sup><span
-class="cmr-6">10</span></sup></a><a
-href="https://ctan.org/pkg/geometry" ><span
-class="ectt-0900">geometry</span></a>
-<a
-href="#enmark-11" id="ennote-11"><sup><span
-class="cmr-6">11</span></sup></a><a
-href="https://ctan.org/pkg/multicol" ><span
-class="ectt-0900">multicol</span></a> <a
-href="#enmark-12" id="ennote-12"><sup><span
-class="cmr-6">12</span></sup></a><a
-href="https://ctan.org/pkg/amsmath" ><span
-class="ectt-0900">amsmath</span></a> <a
-href="#enmark-13" id="ennote-13"><sup><span
-class="cmr-6">13</span></sup></a><a
-href="https://ctan.org/pkg/amssymb" ><span
-class="ectt-0900">amssymb</span></a> <a
-href="#enmark-14" id="ennote-14"><sup><span
-class="cmr-6">14</span></sup></a><a
-href="https://ctan.org/pkg/amsthm" ><span
-class="ectt-0900">amsthm</span></a> <a
-href="#enmark-15" id="ennote-15"><sup><span
-class="cmr-6">15</span></sup></a><a
-href="https://ctan.org/pkg/rsfs" ><span
-class="ectt-0900">rsfs</span></a> <a
-href="#enmark-16" id="ennote-16"><sup><span
-class="cmr-6">16</span></sup></a><a
-href="https://ctan.org/pkg/bm" ><span
-class="ectt-0900">bm</span></a> <a
-href="#enmark-17" id="ennote-17"><sup><span
-class="cmr-6">17</span></sup></a><a
-href="https://ctan.org/pkg/mathtools" ><span
-class="ectt-0900">mathtools</span></a> <a
-href="#enmark-18" id="ennote-18"><sup><span
-class="cmr-6">18</span></sup></a><a
-href="https://ctan.org/pkg/microtype" ><span
-class="ectt-0900">microtype</span></a> <a
-href="#enmark-19" id="ennote-19"><sup><span
-class="cmr-6">19</span></sup></a><a
-href="https://ctan.org/pkg/enumitem" ><span
-class="ectt-0900">enumitem</span></a> <a
-href="#enmark-20" id="ennote-20"><sup><span
-class="cmr-6">20</span></sup></a><a
-href="https://ctan.org/pkg/caption" ><span
-class="ectt-0900">caption</span></a> <a
-href="#enmark-21" id="ennote-21"><sup><span
-class="cmr-6">21</span></sup></a><a
-href="https://ctan.org/pkg/float" ><span
-class="ectt-0900">float</span></a>
-<a
-href="#enmark-22" id="ennote-22"><sup><span
-class="cmr-6">22</span></sup></a><a
-href="https://ctan.org/pkg/hyperref" ><span
-class="ectt-0900">hyperref</span></a> <a
-href="#enmark-23" id="ennote-23"><sup><span
-class="cmr-6">23</span></sup></a><a
-href="https://ctan.org/pkg/cleveref" ><span
-class="ectt-0900">cleveref</span></a> <a
-href="#enmark-24" id="ennote-24"><sup><span
-class="cmr-6">24</span></sup></a><a
-href="https://ctan.org/pkg/url" ><span
-class="ectt-0900">url</span></a> <a
-href="#enmark-25" id="ennote-25"><sup><span
-class="cmr-6">25</span></sup></a><a
-href="https://ctan.org/pkg/upquote" ><span
-class="ectt-0900">upquote</span></a> <a
-href="#enmark-26" id="ennote-26"><sup><span
-class="cmr-6">26</span></sup></a><a
-href="https://ctan.org/pkg/listings" ><span
-class="ectt-0900">listings</span></a> <a
-href="#enmark-27" id="ennote-27"><sup><span
-class="cmr-6">27</span></sup></a><a
-href="https://ctan.org/pkg/pythontex" ><span
-class="ectt-0900">pythontex</span></a> <a
-href="#enmark-28" id="ennote-28"><sup><span
-class="cmr-6">28</span></sup></a><a
-href="https://ctan.org/pkg/array" ><span
-class="ectt-0900">array</span></a> <a
-href="#enmark-29" id="ennote-29"><sup><span
-class="cmr-6">29</span></sup></a><a
-href="https://ctan.org/pkg/siunitx" ><span
-class="ectt-0900">siunitx</span></a> <a
-href="#enmark-30" id="ennote-30"><sup><span
-class="cmr-6">30</span></sup></a><a
-href="https://ctan.org/pkg/tcolorbox" ><span
-class="ectt-0900">tcolorbox</span></a> <a
-href="#enmark-31" id="ennote-31"><sup><span
-class="cmr-6">31</span></sup></a><a
-href="https://ctan.org/pkg/babel" ><span
-class="ectt-0900">babel</span></a> <a
-href="#enmark-32" id="ennote-32"><sup><span
-class="cmr-6">32</span></sup></a><a
-href="https://ctan.org/pkg/lipsum" ><span
-class="ectt-0900">lipsum</span></a>
-<a
-href="#enmark-33" id="ennote-33"><sup><span
-class="cmr-6">33</span></sup></a><a
-href="https://ctan.org/pkg/xcolor" ><span
-class="ectt-0900">xcolor</span></a> <a
-href="#enmark-34" id="ennote-34"><sup><span
-class="cmr-6">34</span></sup></a><a
-href="https://ctan.org/pkg/graphics" ><span
-class="ectt-0900">graphics</span></a> <a
-href="#enmark-35" id="ennote-35"><sup><span
-class="cmr-6">35</span></sup></a><a
-href="https://ctan.org/pkg/pdfpages" ><span
-class="ectt-0900">pdfpages</span></a> <a
-href="#enmark-36" id="ennote-36"><sup><span
-class="cmr-6">36</span></sup></a><a
-href="https://ctan.org/pkg/media9" ><span
-class="ectt-0900">media9</span></a> <a
-href="#enmark-37" id="ennote-37"><sup><span
-class="cmr-6">37</span></sup></a><a
-href="https://ctan.org/pkg/tikz" ><span
-class="ectt-0900">tikz</span></a> <a
-href="#enmark-38" id="ennote-38"><sup><span
-class="cmr-6">38</span></sup></a><a
-href="https://ctan.org/pkg/asymptote" ><span
-class="ectt-0900">asymptote</span></a> <a
-href="#enmark-39" id="ennote-39"><sup><span
-class="cmr-6">39</span></sup></a><a
-href="https://ctan.org/pkg/titlesec" ><span
-class="ectt-0900">titlesec</span></a> <a
-href="#enmark-40" id="ennote-40"><sup><span
-class="cmr-6">40</span></sup></a><a
-href="https://ctan.org/pkg/fancyhdr" ><span
-class="ectt-0900">fancyhdr</span></a> <a
-href="#enmark-41" id="ennote-41"><sup><span
-class="cmr-6">41</span></sup></a><a
-href="https://ctan.org/pkg/tocloft" ><span
-class="ectt-0900">tocloft</span></a> <a
-href="#enmark-42" id="ennote-42"><sup><span
-class="cmr-6">42</span></sup></a><a
-href="https://ctan.org/pkg/footmisc" ><span
-class="ectt-0900">footmisc</span></a>
-<a
-href="#enmark-43" id="ennote-43"><sup><span
-class="cmr-6">43</span></sup></a><a
-href="https://ctan.org/pkg/makeindex" ><span
-class="ectt-0900">makeindex</span></a> <a
-href="#enmark-44" id="ennote-44"><sup><span
-class="cmr-6">44</span></sup></a><a
-href="https://ctan.org/pkg/answers" ><span
-class="ectt-0900">answers</span></a> <a
-href="#enmark-45" id="ennote-45"><sup><span
-class="cmr-6">45</span></sup></a><a
-href="https://ctan.org/pkg/mla" ><span
-class="ectt-0900">mla</span></a> <a
-href="#enmark-46" id="ennote-46"><sup><span
-class="cmr-6">46</span></sup></a><a
-href="https://ctan.org/pkg/bibtex" ><span
-class="ectt-0900">bibtex</span></a> <a
-href="#enmark-47" id="ennote-47"><sup><span
-class="cmr-6">47</span></sup></a><a
-href="https://ctan.org/pkg/biblatex" ><span
-class="ectt-0900">biblatex</span></a> <a
-href="#enmark-48" id="ennote-48"><sup><span
-class="cmr-6">48</span></sup></a><a
-href="https://ctan.org/pkg/exam" ><span
-class="ectt-0900">exam</span></a> <a
-href="#enmark-49" id="ennote-49"><sup><span
-class="cmr-6">49</span></sup></a><a
-href="https://ctan.org/pkg/beamer" ><span
-class="ectt-0900">beamer</span></a> <a
-href="#enmark-50" id="ennote-50"><sup><span
-class="cmr-6">50</span></sup></a><a
-href="https://ctan.org/pkg/fntguide" ><span
-class="ectt-0900">fntguide</span></a> <a
-href="#enmark-51" id="ennote-51"><sup><span
-class="cmr-6">51</span></sup></a><a
-href="https://ctan.org/pkg/pdftex" ><span
-class="ectt-0900">pdftex</span></a> <a
-href="#enmark-52" id="ennote-52"><sup><span
-class="cmr-6">52</span></sup></a><a
-href="https://ctan.org/pkg/xetex" ><span
-class="ectt-0900">xetex</span></a> <a
-href="#enmark-53" id="ennote-53"><sup><span
-class="cmr-6">53</span></sup></a><a
-href="https://ctan.org/pkg/luatex" ><span
-class="ectt-0900">luatex</span></a>
-<a
-href="#enmark-54" id="ennote-54"><sup><span
-class="cmr-6">54</span></sup></a><a
-href="https://ctan.org/pkg/fontspec" ><span
-class="ectt-0900">fontspec</span></a>
+ <h3 class='sectionHead' id='package-names-for-texdoc'><a id='x1-20000'></a>Package names, for texdoc</h3>
+<!-- l. 429 --><p class='noindent'>
+
+
+</p><!-- l. 4 --><p class='indent'> <a href='#enmark-1' id='ennote-1'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>1</span></sup></a><a id='x1-20001x'></a> <a href='https://ctan.org/pkg/lshort'><span class='ectt-0900'>lshort</span></a> <a href='#enmark-2' id='ennote-2'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>2</span></sup></a><a id='x1-20002x'></a> <a href='https://ctan.org/pkg/amshelp'><span class='ectt-0900'>amshelp</span></a> <a href='#enmark-3' id='ennote-3'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>3</span></sup></a><a id='x1-20003x'></a> <a href='https://ctan.org/pkg/amsmath'><span class='ectt-0900'>amsmath</span></a> <a href='#enmark-4' id='ennote-4'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>4</span></sup></a><a id='x1-20004x'></a> <a href='https://ctan.org/pkg/latex2e'><span class='ectt-0900'>latex2e</span></a> <a href='#enmark-5' id='ennote-5'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>5</span></sup></a><a id='x1-20005x'></a> <a href='https://ctan.org/pkg/comprehensive'><span class='ectt-0900'>comprehensive</span></a> <a href='#enmark-6' id='ennote-6'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>6</span></sup></a><a id='x1-20006x'></a> <a href='https://ctan.org/pkg/faq'><span class='ectt-0900'>faq</span></a> <a href='#enmark-7' id='ennote-7'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>7</span></sup></a><a id='x1-20007x'></a> <a href='https://ctan.org/pkg/latexcheat'><span class='ectt-0900'>latexcheat</span></a> <a href='#enmark-8' id='ennote-8'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>8</span></sup></a><a id='x1-20008x'></a> <a href='https://ctan.org/pkg/undergradmath'><span class='ectt-0900'>undergradmath</span></a> <a href='#enmark-9' id='ennote-9'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>9</span></sup></a><a id='x1-20009x'></a> <a href='https://ctan.org/pkg/l2tabuen'><span class='ectt-0900'>l2tabuen</span></a> <a href='#enmark-10' id='ennote-10'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>10</span></sup></a><a id='x1-20010x'></a>
+<a href='https://ctan.org/pkg/geometry'><span class='ectt-0900'>geometry</span></a> <a href='#enmark-11' id='ennote-11'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>11</span></sup></a><a id='x1-20011x'></a> <a href='https://ctan.org/pkg/multicol'><span class='ectt-0900'>multicol</span></a> <a href='#enmark-12' id='ennote-12'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>12</span></sup></a><a id='x1-20012x'></a> <a href='https://ctan.org/pkg/amsmath'><span class='ectt-0900'>amsmath</span></a> <a href='#enmark-13' id='ennote-13'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>13</span></sup></a><a id='x1-20013x'></a> <a href='https://ctan.org/pkg/amssymb'><span class='ectt-0900'>amssymb</span></a> <a href='#enmark-14' id='ennote-14'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>14</span></sup></a><a id='x1-20014x'></a> <a href='https://ctan.org/pkg/amsthm'><span class='ectt-0900'>amsthm</span></a> <a href='#enmark-15' id='ennote-15'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>15</span></sup></a><a id='x1-20015x'></a> <a href='https://ctan.org/pkg/rsfs'><span class='ectt-0900'>rsfs</span></a> <a href='#enmark-16' id='ennote-16'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>16</span></sup></a><a id='x1-20016x'></a> <a href='https://ctan.org/pkg/bm'><span class='ectt-0900'>bm</span></a> <a href='#enmark-17' id='ennote-17'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>17</span></sup></a><a id='x1-20017x'></a> <a href='https://ctan.org/pkg/mathtools'><span class='ectt-0900'>mathtools</span></a> <a href='#enmark-18' id='ennote-18'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>18</span></sup></a><a id='x1-20018x'></a> <a href='https://ctan.org/pkg/microtype'><span class='ectt-0900'>microtype</span></a> <a href='#enmark-19' id='ennote-19'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>19</span></sup></a><a id='x1-20019x'></a> <a href='https://ctan.org/pkg/enumitem'><span class='ectt-0900'>enumitem</span></a> <a href='#enmark-20' id='ennote-20'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>20</span></sup></a><a id='x1-20020x'></a> <a href='https://ctan.org/pkg/caption'><span class='ectt-0900'>caption</span></a> <a href='#enmark-21' id='ennote-21'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>21</span></sup></a><a id='x1-20021x'></a>
+<a href='https://ctan.org/pkg/float'><span class='ectt-0900'>float</span></a> <a href='#enmark-22' id='ennote-22'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>22</span></sup></a><a id='x1-20022x'></a> <a href='https://ctan.org/pkg/hyperref'><span class='ectt-0900'>hyperref</span></a> <a href='#enmark-23' id='ennote-23'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>23</span></sup></a><a id='x1-20023x'></a> <a href='https://ctan.org/pkg/cleveref'><span class='ectt-0900'>cleveref</span></a> <a href='#enmark-24' id='ennote-24'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>24</span></sup></a><a id='x1-20024x'></a> <a href='https://ctan.org/pkg/url'><span class='ectt-0900'>url</span></a> <a href='#enmark-25' id='ennote-25'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>25</span></sup></a><a id='x1-20025x'></a> <a href='https://ctan.org/pkg/upquote'><span class='ectt-0900'>upquote</span></a> <a href='#enmark-26' id='ennote-26'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>26</span></sup></a><a id='x1-20026x'></a> <a href='https://ctan.org/pkg/listings'><span class='ectt-0900'>listings</span></a> <a href='#enmark-27' id='ennote-27'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>27</span></sup></a><a id='x1-20027x'></a> <a href='https://ctan.org/pkg/pythontex'><span class='ectt-0900'>pythontex</span></a> <a href='#enmark-28' id='ennote-28'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>28</span></sup></a><a id='x1-20028x'></a> <a href='https://ctan.org/pkg/array'><span class='ectt-0900'>array</span></a> <a href='#enmark-29' id='ennote-29'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>29</span></sup></a><a id='x1-20029x'></a> <a href='https://ctan.org/pkg/siunitx'><span class='ectt-0900'>siunitx</span></a> <a href='#enmark-30' id='ennote-30'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>30</span></sup></a><a id='x1-20030x'></a> <a href='https://ctan.org/pkg/tcolorbox'><span class='ectt-0900'>tcolorbox</span></a> <a href='#enmark-31' id='ennote-31'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>31</span></sup></a><a id='x1-20031x'></a> <a href='https://ctan.org/pkg/babel'><span class='ectt-0900'>babel</span></a> <a href='#enmark-32' id='ennote-32'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>32</span></sup></a><a id='x1-20032x'></a>
+<a href='https://ctan.org/pkg/lipsum'><span class='ectt-0900'>lipsum</span></a> <a href='#enmark-33' id='ennote-33'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>33</span></sup></a><a id='x1-20033x'></a> <a href='https://ctan.org/pkg/xcolor'><span class='ectt-0900'>xcolor</span></a> <a href='#enmark-34' id='ennote-34'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>34</span></sup></a><a id='x1-20034x'></a> <a href='https://ctan.org/pkg/graphics'><span class='ectt-0900'>graphics</span></a> <a href='#enmark-35' id='ennote-35'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>35</span></sup></a><a id='x1-20035x'></a> <a href='https://ctan.org/pkg/pdfpages'><span class='ectt-0900'>pdfpages</span></a> <a href='#enmark-36' id='ennote-36'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>36</span></sup></a><a id='x1-20036x'></a> <a href='https://ctan.org/pkg/media9'><span class='ectt-0900'>media9</span></a> <a href='#enmark-37' id='ennote-37'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>37</span></sup></a><a id='x1-20037x'></a> <a href='https://ctan.org/pkg/tikz'><span class='ectt-0900'>tikz</span></a> <a href='#enmark-38' id='ennote-38'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>38</span></sup></a><a id='x1-20038x'></a> <a href='https://ctan.org/pkg/asymptote'><span class='ectt-0900'>asymptote</span></a> <a href='#enmark-39' id='ennote-39'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>39</span></sup></a><a id='x1-20039x'></a> <a href='https://ctan.org/pkg/titlesec'><span class='ectt-0900'>titlesec</span></a> <a href='#enmark-40' id='ennote-40'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>40</span></sup></a><a id='x1-20040x'></a> <a href='https://ctan.org/pkg/fancyhdr'><span class='ectt-0900'>fancyhdr</span></a> <a href='#enmark-41' id='ennote-41'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>41</span></sup></a><a id='x1-20041x'></a> <a href='https://ctan.org/pkg/tocloft'><span class='ectt-0900'>tocloft</span></a> <a href='#enmark-42' id='ennote-42'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>42</span></sup></a><a id='x1-20042x'></a> <a href='https://ctan.org/pkg/footmisc'><span class='ectt-0900'>footmisc</span></a> <a href='#enmark-43' id='ennote-43'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>43</span></sup></a><a id='x1-20043x'></a>
+<a href='https://ctan.org/pkg/makeindex'><span class='ectt-0900'>makeindex</span></a> <a href='#enmark-44' id='ennote-44'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>44</span></sup></a><a id='x1-20044x'></a> <a href='https://ctan.org/pkg/answers'><span class='ectt-0900'>answers</span></a> <a href='#enmark-45' id='ennote-45'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>45</span></sup></a><a id='x1-20045x'></a> <a href='https://ctan.org/pkg/mla'><span class='ectt-0900'>mla</span></a> <a href='#enmark-46' id='ennote-46'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>46</span></sup></a><a id='x1-20046x'></a> <a href='https://ctan.org/pkg/bibtex'><span class='ectt-0900'>bibtex</span></a> <a href='#enmark-47' id='ennote-47'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>47</span></sup></a><a id='x1-20047x'></a> <a href='https://ctan.org/pkg/biblatex'><span class='ectt-0900'>biblatex</span></a> <a href='#enmark-48' id='ennote-48'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>48</span></sup></a><a id='x1-20048x'></a> <a href='https://ctan.org/pkg/exam'><span class='ectt-0900'>exam</span></a> <a href='#enmark-49' id='ennote-49'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>49</span></sup></a><a id='x1-20049x'></a> <a href='https://ctan.org/pkg/beamer'><span class='ectt-0900'>beamer</span></a> <a href='#enmark-50' id='ennote-50'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>50</span></sup></a><a id='x1-20050x'></a> <a href='https://ctan.org/pkg/fntguide'><span class='ectt-0900'>fntguide</span></a> <a href='#enmark-51' id='ennote-51'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>51</span></sup></a><a id='x1-20051x'></a> <a href='https://ctan.org/pkg/pdftex'><span class='ectt-0900'>pdftex</span></a> <a href='#enmark-52' id='ennote-52'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>52</span></sup></a><a id='x1-20052x'></a> <a href='https://ctan.org/pkg/xetex'><span class='ectt-0900'>xetex</span></a> <a href='#enmark-53' id='ennote-53'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>53</span></sup></a><a id='x1-20053x'></a> <a href='https://ctan.org/pkg/luatex'><span class='ectt-0900'>luatex</span></a> <a href='#enmark-54' id='ennote-54'><sup class='textsuperscript'><span class='Spectral-Light-lf-t1-'>54</span></sup></a><a id='x1-20054x'></a>
+<a href='https://ctan.org/pkg/fontspec'><span class='ectt-0900'>fontspec</span></a>
</p>
</div>
-</body></html>
-
-
-
-
+</body>
+</html>
diff --git a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.pdf b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.pdf
index 82a55bfefa6..4fc54ddcc51 100644
--- a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.pdf
+++ b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.tex b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.tex
index 590bebb76b7..387969008d7 100644
--- a/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.tex
+++ b/Master/texmf-dist/doc/latex/latex-doc-ptr/latex-doc-ptr.tex
@@ -351,7 +351,7 @@ visit the
which includes copy and paste code to make each one work.
Beyond that list, you can also use your computer system's fonts
-(beware this makes your source file harder to share with friends, though).
+(this may make your source file harder to share with friends, though).
The background is:~to convert \LaTeX{} source to \PDF{} output
there are three varieties of the \TeX{} engine.
Currently the most common is
@@ -403,6 +403,14 @@ Pronounce \LaTeX{} as
We prefer the first, with emphasis on the first syllable.
+
+% ====================================================
+\section{This document}
+To contact this document's authors with suggestions and corrections
+please see its page at
+\url{https://ctan.org/pkg/latex-doc-ptr}.
+
+
% ====================================================
\section{Welcome to the community!}
@@ -411,9 +419,6 @@ the work of the many
\href{https://tug.org/usergroups.html}{user groups},
including the \href{https://tug.org/}{\TeX{} Users Group}.
Please consider joining.
-% The
-% \href{https://www.ctan.org/}{Comprehensive \TeX{} Archive Network}
-% contains more packages than any distribution.
% \vfill\null
% \columnbreak
diff --git a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf
index da1506f1df9..a04038050ff 100644
--- a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf
+++ b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf
index b4bfc0d79ed..8e2038ce2d8 100644
--- a/Master/texmf-dist/doc/latex/listings/listings.pdf
+++ b/Master/texmf-dist/doc/latex/listings/listings.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
index 0315d2cad2b..51d045113b4 100644
--- a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
+++ b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/README.md b/Master/texmf-dist/doc/latex/litetable/README.md
index 146ccaf19b3..f09ce486fba 100644
--- a/Master/texmf-dist/doc/latex/litetable/README.md
+++ b/Master/texmf-dist/doc/latex/litetable/README.md
@@ -1,17 +1,13 @@
-# The `LiteTable` document
+# The `litetable` class
-This template provides a beautiful design of class schedule with colorful course blocks.
+This class provides a beautiful design of timetable with colorful course blocks.
-**Welcome to pull requests
-[here](https://github.com/xiamyphys/LiteTable).**
+**Welcome to pull requests [here](https://github.com/xiamyphys/litetable).**
## License
-This work may be distributed and/or modified under the conditions of the
-[LaTeX Project Public License](http://www.latex-project.org/lppl.txt),
-either version 1.3c of this license or (at your option) any later version.
+This work may be distributed and/or modified under the conditions of the [LaTeX Project Public License](http://www.latex-project.org/lppl.txt), either version 1.3c of this license or (at your option) any later version.
This work has the LPPL maintenance status `maintained`.
-The Current Maintainer of this work is
-[Mingyu Xia](https://www.ctan.org/author/xia-my). \ No newline at end of file
+The Current Maintainers of this work are [Mingyu Xia](https://www.ctan.org/author/xia-my) and [Lijun Guo](https://ctan.org/author/guo). \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/litetable/favicon.png b/Master/texmf-dist/doc/latex/litetable/favicon.png
deleted file mode 100644
index 4e105b2ce0c..00000000000
--- a/Master/texmf-dist/doc/latex/litetable/favicon.png
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf
index 6e91dd6280d..ef997cdccc1 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex b/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex
index cf2cc129ad3..61bea4cb280 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex
@@ -1,302 +1,143 @@
-%% ******************************************************
-%% * This work may be distributed and/or modified under *
-%% * the conditions of the LaTeX Project Public License *
-%% * http://www.latex-project.org/lppl.txt *
-%% * either version 1.3c of this license or any later *
-%% * version. *
-%% ******************************************************
-\PassOptionsToPackage{quiet}{xeCJK}
-\PassOptionsToPackage{quiet, no-math}{fontspec}
-\documentclass[11pt]{article}
-\usepackage{geometry,pdfpages,caption,indentfirst,setspace,xeCJK}
-\captionsetup[table]{name={\textsc{Table}},labelsep=period}
-\usepackage[level]{datetime}
-\usepackage{authblk,xltxtra,bigfoot,enumitem}
-\usepackage{booktabs,diagbox,ragged2e,tabularx}
-\renewcommand\tabularxcolumn[1]{>{\Centering}m{#1}}
-\usepackage[toc]{multitoc}
-\usepackage[mono=false]{libertine}
-\setstretch{1.15}
-\setCJKmainfont{Chiron Sung HK}
-[BoldFont=Chiron Sung HK Bold,
- ItalicFont=Kaiti SC]
-\usepackage{hyperref,xcolor,tikz}
-\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output}
-\definecolor{pkgcolor}{Hsb}{103,.8,.5}
-\definecolor{moducolor}{Hsb}{290,.8,.5}
-\definecolor{cmdcolor}{Hsb}{188,.8,.5}
-\definecolor{filecolor}{Hsb}{207,.6,.7}
-\definecolor{H1}{Hsb}{349,.8,.8} % 海棠紅 (Hangzhou MTR L 1 )
-\definecolor{H2}{Hsb}{23, .8,.8} % 丹桂橙 (Hangzhou Metro 2 )
-\definecolor{H3}{Hsb}{48, .8,.8} % 柠檬黄 (Hangzhou Metro 3 )
-\definecolor{H4}{Hsb}{103,.8,.8} % 香樟绿 (Hangzhou Metro 4 )
-\definecolor{H5}{Hsb}{188,.8,.8} % é’è—色 (Hangzhou MTR L 5 )
-\definecolor{H6}{Hsb}{207,.8,.8} % æµ·æ´‹è“ (Hangzhou Metro 6 )
-\definecolor{H7}{Hsb}{290,.8,.8} % 浪漫紫 (Hangzhou Metro 7 )
-\definecolor{W1}{HTML}{CCAD52}
-\definecolor{W2}{HTML}{8FCC52}
-\definecolor{W3}{HTML}{52CC70}
-\definecolor{W4}{HTML}{52CCCC}
-\definecolor{W5}{HTML}{5270CC}
-\definecolor{W6}{HTML}{8F52CC}
-\definecolor{W7}{HTML}{CC52AD}
-\def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}}
-\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}}
-\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}}
-\def\datechange#1#2{%
- \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
- \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
-
-\title{\bfseries\pkg{LiteTable} -- 多彩的课程表\textsf{\LaTeX} 模æ¿}
-\author{\href{https://www.hdu.edu.cn}{æ­å·žç”µå­ç§‘技大学}, å¤æ˜Žå®‡}
-\yyyymmdddate
-\date{\today}
-\affil{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}}
-\date{\today\quad Version 2.4c\thanks{%
- \url{https://github.com/xiamyphys/litetable}}}
+\documentclass[letterpaper]{l3doc}
+
+\hypersetup{urlcolor = teal, filecolor = violet}
+\usepackage[mono = false]{libertine}
+\usepackage{pdfpages,hologo,framed}
+\hologoFontSetup{general = \sffamily}
+\FrameSep = 0pt
+\usepackage[fontset = none]{ctex}
+\setCJKmainfont[BoldFont = *-Bold]{LXGW WenKai}
+\setCJKsansfont[BoldFont = *-Bold]{LXGW WenKai}
+\setCJKmonofont[BoldFont = *-Bold]{LXGW WenKai}
+\usepackage[os = mac]{menukeys}
+\AddToHook{env/function/before}{\vspace{-.3\baselineskip}}
+\AddToHook{env/syntax/after}{\vspace{-.2\baselineskip}}
+
+\title
+{
+ \bfseries\cls{litetable} 文档类:多彩的课程表
+ \thanks{\url{https://github.com/xiamyphys/litetable}}
+}
+\author
+{
+ å¤æ˜Žå®‡ \texttt{<\href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}>}
+ \thanks{\href{https://github.com/ljguo1020}{郭æŽå†›}å¼€å‘äº†è¯»å– \meta{left} -> \meta{right} åž‹æ•°æ®ç»“构模å—和低版本 \hologo{TeX} Live 兼容模å—.}
+}
+\date{Version 3.1B, \today}
+
\begin{document}
+
\maketitle
-\vspace{-2em}
-\begin{abstract}
-\pkg{LiteTable} 模æ¿æ供了一个多彩的课程表设计,本文档为 \pkg{LiteTable} 模æ¿çš„说明文档.
-\end{abstract}
+\section{介ç»}
-\tableofcontents
+\cls{litetable} 文档类æ供了一个多彩的课程表设计,基于 \cls{article} 文档类,由 \pkg{expl3} å’Œ \pkg{tikz} 构建. 兼容å‘行版 \hologo{TeX} Live 2019 åŠæ›´é«˜ç‰ˆæœ¬ï¼Œåœ¨ \hologo{pdfLaTeX} å’Œ \hologo{XeLaTeX} 编译器下å‡å¯æ­£å¸¸è¿è¡Œ. 本文档为 \cls{litetable} 文档类的中文用户手册,手册åŒæ—¶æœ‰\href{./litetable-en.pdf}{英文}å’Œ\href{./litetable-hk.pdf}{粤语}版本\footnote{\href{https://qm.qq.com/q/RyssAhG4qy}{QQ Group: 760570712}}.
-\clearpage
+\section{载入 \cls{litetable} 并生æˆè¯¾ç¨‹è¡¨æ¡†æž¶}
-\section{Introduction}
+åŒåŠ è½½å…¶ä»–文档类一样,åªéœ€å†™ä¸‹
-\subsection{本模æ¿çš„目的}
-本模æ¿æ供了一个多彩的课程表设计. 如果在使用本模æ¿æ—¶é‡åˆ°é—®é¢˜æˆ–有更好的建议,或者你想å‚与本模æ¿æˆ–本人其他模æ¿çš„å¼€å‘,欢迎通过邮件 \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com} è”络我.
-
-åŒæ ·ï¼Œä½ ä¹Ÿå¯ä»¥åŠ å…¥æˆ‘çš„\textsf\LaTeX{} 技術交æµç¾¤ \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} 与我交æµï¼Œæ¥èŽ·å–模æ¿çš„内测版本.
-
-\subsection{所需å®é›†}
-本模æ¿åŸºäºŽ \pkg{standalone} 文档类开å‘. å…¶éœ€è¦ \pkg{tikz} å®é›†åŽ»ç»˜åˆ¶å›¾å½¢ï¼Œ\pkg{kvoptions} å’Œ \pkg{etoolbox} å®é›†ç”¨äºŽæ供全局模å¼ï¼Œ\pkg{expl3}\footnote{请使用 2023/10/10 åŠä»¥åŽç‰ˆæœ¬çš„ \pkg{expl3} å®é›†ä»¥æ”¯æŒ e-type å˜é‡å±•å¼€: \verb|\clist_count:e|} å®é›†ç”¨äºŽæ”¯æŒæ•°ç»„,\pkg{ctex}å®é›†ç”¨äºŽæ”¯æŒä¸­æ–‡è¯­è¨€ï¼Œ\pkg{fontawesome5} å®é›†æ供一系列精美的图标.
-
-\subsection{安装并载入 \pkg{LiteTable} 模æ¿}
-å…安装使用方法如下,从 \href{https://github.com/xiamyphys/LiteTable}{GitHub} 或 \href{https://ctan.org/pkg/litetable}{CTAN} 下载最新的 \verb|litetable.cls| 文件并将它ä¿å­˜è‡³ä½ çš„项目根目录. è¿™ç§å®‰è£…æ–¹å¼æ˜¯æœ€ä¾¿æ·çš„,但是当模æ¿æ›´æ–°åŽï¼Œä½ éœ€è¦æ‰‹åŠ¨æ›¿æ¢ \verb|.cls| 文件.
-
-然而我强烈建议您使用终端机去执行以下命令,以将所有å®é›†æ›´æ–°åˆ°æœ€æ–°ç‰ˆæœ¬ï¼Œå¹¶å®‰è£…此模æ¿
-\begin{verbatim}
- sudo tlmgr update --self --all
-\end{verbatim}
-
-如果您所在的地区存在网路å°é”(如 GFW 干扰),你å¯ä»¥é€‰æ‹©åˆé€‚çš„é•œåƒç½‘站或其他方法\footnote{请éµå®ˆå½“地的网路æ¡ä¾‹.}. 欲详细了解,请å‰å¾€ \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \textsf{\TeX} distribution?}
-
-本模æ¿æ供了两个选项:\mode{direction} å’Œ \mode{font}. 将你è¦ä½¿ç”¨çš„选项模å¼æ·»åŠ åœ¨ \verb|.tex| 文件中命令 \verb|\documentclass[ ]{litetable}| 的方括å·ä¸­å³å¯.
-
-\subsection{兼容性}
-所使用的测试环境为 macOS + MacTeX 2023 / Overleaf,都å¯åœ¨ \XeLaTeX{} 编译方å¼ä¸‹é¡ºåˆ©è¿è¡Œ, Windows, Linux å’Œ Unix å¹³å°å…¼å®¹æ€§æœªçŸ¥.
-
-此模æ¿åœ¨ macOS å¹³å°å¼€å‘,使用 ``Heiti SC'' 字体. 如果你未安装此字体,请在命令 \verb|\documentclass{litetable}| åŽä½¿ç”¨å‘½ä»¤ \verb|\setCJKfamilyfont{zhhei}{ }| å°† ``Heiti SC'' 替æ¢ä¸ºç”µè„‘中存在的字体.
-
-\section{\pkg{LiteTable} 的全局选项}
-\begin{verbatim}
- \documentclass[options]{litetable}
-\end{verbatim}
-
-\subsection{\mode{direction} 选项}
-此选项有两个模å¼ï¼Œ\mode{portrait} å’Œ \mode{landscape}, å¯ä½¿è¯¾ç¨‹è¡¨çºµå‘或横å‘显示,默认为纵å‘.
-
-\subsection{\mode{font} 选项}
-此选项有两个模å¼ï¼Œ\mode{times} å’Œ \mode{libertinus},å¯ä½¿å­—体为 ``Times New Roman'' 或 ``Libertinus'',默认为 ``Times New Roman''\footnote{使用 \mode{libertinus} 模å¼æ—¶è¯·ç¡®ä¿å·²å®‰è£…该字体.}.
-
-\section{\pkg{LiteTable} 的命令}
-
-\subsection{\cmd{makeframe} 命令}
-\begin{verbatim}
- \makeframe[Sem 6]{Axia's Timetable}
-\end{verbatim}
-
-此命令有两个å‚数,用于建立空白课程表. 第二个å‚数用于设置标题,第一个å¯é€‰å‚数用于在标题å³ä¾§æ·»åŠ å¯è·³è½¬è‡³ç¬¬äºŒé¡µçš„学期按钮.
-
-\subsection{\cmd{weeklist} 命令}
-\begin{verbatim}
- \weeklist{
- \textcolor{W1}{星期一}, \textcolor{W2}{星期二},
- \textcolor{W3}{星期三}, \textcolor{W4}{星期四},
- \textcolor{W5}{星期五}, \textcolor{W6}{星期六};
- 0,.175,.35,.525,.7,.875,1
- }
-\end{verbatim}
-
-\begin{figure}[!ht]
- \centering
- \tikz
- {
- \tikzset{every node/.style={font=\footnotesize}}
- \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0);
- \draw ({-5.10 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|};
- \draw ({0.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|};
- \draw ({.175*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.175|};
- \draw ({.350*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.35|};
- \draw ({.525*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.525|};
- \draw ({.700*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.7|};
- \draw ({.875*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.875|};
- \draw ({1.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|};
- \node [above] at ({.0875*5.1 in},0) {\textcolor{W1}{星期一}};
- \node [above] at ({.2625*5.1 in},0) {\textcolor{W2}{星期二}};
- \node [above] at ({.4375*5.1 in},0) {\textcolor{W3}{星期三}};
- \node [above] at ({.6125*5.1 in},0) {\textcolor{W4}{星期四}};
- \node [above] at ({.7875*5.1 in},0) {\textcolor{W5}{星期五}};
- \node [above] at ({.9375*5.1 in},0) {\textcolor{W6}{星期六}};
- }
- \caption*{命令 \cmd{weeklist} 中的第二行数组与å标相对应.}
-\end{figure}
-
-此命令å¯åœ¨è¯¾ç¨‹è¡¨é¡¶éƒ¨æ·»åŠ å·¥ä½œæ—¥ï¼Œä½ å¯ä»¥è‡ªç”±å†³å®šæ˜¾ç¤ºæ ·å¼ï¼Œç”šè‡³æ˜¯å‰é¢çš„ logo. ä½ å¯ä»¥è‡ªå®šä¹‰è¯¾ç¨‹è¡¨ä¸­æ¯ä¸€åˆ—的宽度,如图所示. 课程表å¯æ ¹æ®ä½ è¾“入的时间组数自动生æˆç›¸åº”的列数. 如上方代ç å…±æœ‰ 5 ä¸ªå·¥ä½œæ—¥ï¼Œå°±ä¼šç”Ÿæˆ 5 列的课程表.
-
-\subsection{\cmd{timelist} 命令}
-\begin{verbatim}
- \timelist [13] {%
- 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10;
- 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55
- }
- \timelist [13] {}
-\end{verbatim}
-
-命令 \cmd{timelist} 有两个å‚数,第二个å‚æ•° \cmd{\ttfamily\{\#2\}} å¯å°†æ—¶é—´æ·»åŠ è‡³è¯¾ç¨‹è¡¨çš„左侧,内容的第一行是æ¯èŠ‚课程开始时间,第二行是æ¯èŠ‚课程的结æŸæ—¶é—´ï¼Œæ—¶é—´ä¹‹é—´ç”¨é€—å·ï¼ˆ\verb|,|)分隔,行之间用分å·ï¼ˆ\verb|;|)分隔.
-
-课程表å¯æ ¹æ®ä½ è¾“入的时间组数自动生æˆç›¸åº”的行数. 如上方代ç å…±æœ‰ 12 ç»„æ—¶é—´ï¼Œå°±ä¼šç”Ÿæˆ 12 行的课程表.
-
-第一个å¯é€‰å‚æ•° \cmd{\ttfamily[\#1]} å¯ç›´æŽ¥æŒ‡å®šè¯¾ç¨‹è¡¨ä¸Šä½ æƒ³è¦ç”Ÿæˆçš„行数并ä¸ä¼šåœ¨è¯¾ç¨‹è¡¨å·¦ä¾§æ·»åŠ æ—¶é—´ï¼Œå·¦ä¾§åªä¼šæœ‰ä¸€åˆ—\emph{在æ¯è¡Œç«–直居中}çš„åºå·.
-
-\begin{table}[!ht]
-\centering
-\caption{两个å‚数的使用情况.}
-
-\begin{tabularx}{\textwidth}{c >{\raggedright\arraybackslash}X >{\raggedright\arraybackslash}X}
- \toprule
- \diagbox{\cmd{\ttfamily[\#1]}}{\cmd{\ttfamily\{\#2\}}} & \multicolumn{1}{c}{使用} & \multicolumn{1}{c}{ä¸ä½¿ç”¨}\\
- \midrule
- 使用 &
- 效果和 \cmd{\ttfamily\{\#2\}} æ述相åŒï¼Œä½†ç”Ÿæˆè¡Œæ•°ç”± \cmd{\ttfamily[\#1]} 决定 &
- 效果和命令 \cmd{\ttfamily[\#1]} æ述相åŒ\\
- \midrule
- ä¸ä½¿ç”¨ &
- 效果和命令 \cmd{\ttfamily\{\#2\}} æè¿°ç›¸åŒ &
- 效果和命令 \cmd{\ttfamily[\#1]} æ述相åŒ\newline\emph{å¹¶é»˜è®¤ç”Ÿæˆ 12 è¡Œ}.\\
- \bottomrule
-\end{tabularx}
-\end{table}
-
-如果你è¦åªä½¿ç”¨ç¬¬ä¸€ä¸ªå‚æ•° \cmd{\ttfamily[\#1]},那么请ä¸è¦åœ¨ç¬¬äºŒä¸ªå‚æ•° \cmd{\ttfamily\{\#2\}} 中添加任何东西.
-
-\begin{itemize}
- \item è‹¥å‚æ•° \cmd{\ttfamily\{\#2\}} 中有 12 组时间,å‚æ•° \cmd{\ttfamily[\#1]} 传递的数值为 14,那么课程表的左侧会åªæœ‰ 1 -- 12 行有时间标注,最åŽä¸¤è¡Œæ²¡æœ‰æ—¶é—´æ ‡æ³¨ä½†æœ€åŽä¸¤è¡Œçš„æ ‡å·ä»ç„¶å上方,并ä¸ä¼šç«–直对é½.
- \item 若命令 \cmd{\ttfamily\{\#2\}} 中有 14 组时间,å‚æ•° \cmd{\ttfamily[\#1]} 传递的数值为 12,那么åªä¼šç”Ÿæˆ 12 行的课程表并且左侧å‡æœ‰æ—¶é—´æ ‡æ³¨ï¼Œä¹Ÿå°±æ˜¯åœ¨å‚æ•° \cmd{\ttfamily\{\#2\}} 中输入的最åŽä¸¤ç»„时间无效.
-\end{itemize}
-
-\subsection{\cmd{weeks} 命令}
-\begin{verbatim}
- \weeks{Week 1 -- 16}
-\end{verbatim}
-
-此命令å¯æŒ‡å®šå‘½ä»¤ \cmd{course} 第 7 个å‚数的默认值.
-
-\subsection{\cmd{course} 命令}
-\begin{verbatim}
- \course[H1]{8}{9}{群论}{第6教研楼 · 中211}{Li Ge}[Week 1 -- 16]
-\end{verbatim}
-
-此命令共有7个å‚æ•°.
-\begin{itemize}
- \item 第 1 个为课程å—的颜色,从 ``H1'' 到 ``H9'' 供选择,此å‚数是å¯é€‰å‚数,默认为 ``H1''.
- \item 第 2 -- 6 个为课程的起始节数和结æŸèŠ‚æ•°ã€å称,地å€å’Œæ•™å¸ˆçš„åå­—.
- \item 第 7 个为课程的首末周,此å‚数是å¯é€‰å‚数,默认值由命令 \cmd{weeks} 指定,若未指定则默认值为 ``Week 1 -- 12''.
-\end{itemize}
-
-\subsection{\cmd{corner} 命令}
-\begin{verbatim}
- \corner{6 pt}
-\end{verbatim}
-
-此命令å¯å†³å®šè¯¾ç¨‹å—的圆角åŠå¾„.
-
-\subsection{\cmd{newday} 命令}
-此命令å¯åˆ‡æ¢å½“å‰æ—¥åˆ°ç¬¬äºŒå¤©ï¼Œæ­¤æ—¶è¯¾ç¨‹å—会å³ç§»ä¸€æ ¼.
-
-\subsection{\cmd{more} 命令}
-\begin{verbatim}
- \more{· School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024}
-\end{verbatim}
-
-此命令å¯åœ¨è¯¾ç¨‹è¡¨æœ«å°¾æ·»åŠ å¤‡æ³¨ä¿¡æ¯.
-
-\subsection{\cmd{sticker} 命令}
-\begin{verbatim}
- \sticker{favicon}
-\end{verbatim}
-
-在使用此命令åŽé¡µé¢çš„å³ä¸‹æ–¹ä¼šæ·»åŠ ä¸€å¼ è´´çº¸.
-
-\section{版本历å²}
-
-课程表的设计æºäºŽ\href{https://www.hdu.edu.cn}{æ­å·žç”µå­ç§‘技大学}æ­ç”µåŠ©æ‰‹å­¦ç”Ÿè¯¾è¡¨é¡µé¢ï¼ˆä»…本校师生å¯è®¿é—®ï¼‰. 页é¢æŽ’版å分精美,于是本人使用 \textsf{\LaTeX{}} å¤åˆ»å‡ºäº†è¯¾ç¨‹è¡¨æ ·å¼ï¼Œå¹¶åˆ¶ä½œæˆæ¨¡æ¿åˆ†äº«ç»™å¤§å®¶.
-
-\textsf{\bfseries Version 1.0} 于01/09/2023完æˆå¼€å‘,并å‘布在 \href{https://www.latexstudio.net/index/details/index/mid/3625.html}{\textsf{\LaTeX}工作室} (æ­å·žè§å±±ï¼‰ä¸Šï¼Œèµ¢å¾—了许多人的喜爱.
-\clearpage
-\setlist[itemize]{noitemsep, topsep=0pt}
-\datechange{2023/11/01}{Version 2.0a}
-\begin{itemize}
- \item 支æŒè¯¾ç¨‹å—显示为圆角或直角.
- \item 支æŒä¸€ä¸ª \verb|.tex| 文件中生æˆå¤šå¼ è¯¾è¡¨.
-\end{itemize}
-
-\datechange{2023/11/05}{Version 2.1a}
-\begin{itemize}
- \item æ”¯æŒ libertinus 字体.
-\end{itemize}
-
-\datechange{2024/01/31}{Version 2.2a}
-\begin{itemize}
- \item ä¿®å¤äº†åˆ†è¾¨çŽ‡è¶…出的 bug.
- \item 更改纸张类型为美国信纸.
- \item 支æŒè‡ªå®šä¹‰è¯¾ç¨‹èµ·å§‹å’Œç»“æŸæ—¶é—´.
- \item 支æŒåœ¨é¡µé¢å³ä¸‹è§’添加一个你喜欢的å°è´´çº¸.
- \item æ供简体中文说明文档.
-\end{itemize}
-\setstretch{1}
-\datechange{2024/02/02}{Version 2.3a}
-\begin{itemize}
- \item 支æŒæ ¹æ®æ‰€è¾“入的时间组数自动生æˆç›¸åº”的行数.
- \item 课程表å¯çºµå‘或横å‘显示.
-\end{itemize}
-
-\datechange{2024/02/03}{Version 2.3b}
-\begin{itemize}
- \item 优化å标计算,æå‡ç¼–译速度.
-\end{itemize}
-
-\datechange{2024/02/24}{Version 2.4a}
-\begin{itemize}
- \item 支æŒè‡ªå®šä¹‰å·¥ä½œæ—¥æ˜¾ç¤ºæ ·å¼.
- \item 支æŒéšè—时间,仅显示竖直对é½è¯¾ç¨‹åºå·.
- \item 支æŒè®¾ç½®é»˜è®¤é¦–末周.
-\end{itemize}
-
-\datechange{2024/03/01}{Version 2.4b}
-\begin{itemize}
- \item ä¿®å¤äº†åœ¨ \mode{landscape} 模å¼ä¸­æ·»åŠ è¶…过 7 个工作日时 \emph{分辨率溢出}的错误.
- \item 支æŒè‡ªå®šä¹‰è¯¾ç¨‹è¡¨ä¸­æ¯ä¸€åˆ—的宽度.
- \item 优化圆角设计,支æŒè‡ªå®šä¹‰åœ†è§’åŠå¾„.
- \item æ„Ÿè°¢ @egreg 在 \TeX{} Exchange 上æ供的 \href{https://tex.stackexchange.com/a/711657/299948}{输出数组中æ¯ä¸€åˆ—元素个数} 的代ç æ–¹æ¡ˆ.
-\end{itemize}
-
-\datechange{\today}{Version 2.4c}
-\begin{itemize}
- \item 支æŒåœ¨æ ‡é¢˜å³ä¾§æ·»åŠ å­¦æœŸæŒ‰é’®.
-\end{itemize}
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
+ \end{verbatim}
+\end{framed}
+
+如需输入中文,å¯è‡ªè¡Œè½½å…¥ \pkg{ctex} å®åŒ…并设置字体.
+
+\begin{function}{\timelist,\weeklist}
+ \begin{syntax}
+ \cs{timelist}\oarg{rows}\marg{time list} \cs{timelist}\marg{time list}\oarg{rows}
+ \cs{weeklist}\oarg{default weeks}\marg{week list} \cs{weeklist}\marg{week list}\oarg{default weeks}
+ \end{syntax}
+
+ 命令 \cs{timelist} çš„å¯é€‰å‚æ•°å¯å¼ºåˆ¶è®¾å®šè¯¾ç¨‹è¡¨çš„行数,命令 \cs{weeklist} çš„å¯é€‰å‚æ•°å¯è®¾å®šé»˜è®¤çš„星期数目并会在æ¯ä¸ªè¯¾ç¨‹ç›’å­çš„å³ä¸‹è§’显示. 两个命令的强制å‚æ•°å‡æŽ¥æ”¶æ•°ç»„,å¯åˆ†åˆ«åœ¨è¯¾ç¨‹è¡¨çš„左侧添加时间列表ã€åœ¨è¯¾ç¨‹è¡¨çš„顶部添加对应宽度比例的工作日. 输入数组的用例è§Appendix \ref{mwe}.
+
+ 若命令 \cs{timelist} 中时间数组数大于强制设定的行数,则多余的时间数组将被忽略,并返回一个警告. 如果åªéœ€åœ¨è¯¾ç¨‹è¡¨å·¦ä¾§æ·»åŠ ä¸€åˆ—åºå·ï¼Œä½¿å¼ºåˆ¶å‚数为空å³å¯.
+\end{function}
+
+\begin{function}{\more}
+ \begin{syntax}
+ \cs{more}\marg{comment}
+ \end{syntax}
+
+ 此命令å¯åœ¨é¡µé¢çš„å³ä¸‹è§’添加备注.
+\end{function}
+
+\begin{function}{\maketable}
+ \begin{syntax}
+ \cs{maketable}\oarg{keyvals}\marg{title}\oarg{keyvals}
+ \end{syntax}
+
+ 此命令å¯ç”Ÿæˆä¸€ä¸ªç©ºç™½çš„课程表框架,需在命令 \cs{timelist},\cs{weeklist} å’Œ \cs{more} åŽï¼Œå¹¶åœ¨å¸¦æœ‰ \cmd{[remember picture, overaly]} 选项的 \env{tikz} 环境中执行. å¯é€‰å‚数接收键 \keys{\cmdmac~color} \keys{\cmdmac~sem},å¯åˆ†åˆ«åœ¨è®¾ç½®è¯¾ç¨‹è¡¨æ¡†æž¶çš„背景色和在页é¢çš„å³ä¸Šè§’添加学期,键 \keys{\cmdmac~color} 的默认值为 \cmd{gray}. 强制å‚æ•°å¯è®¾å®šæ ‡é¢˜.
+\end{function}
+
+\section{添加课程盒å­}
+
+\begin{function}{\course}
+ \begin{syntax}
+ \cs{course}\oarg{keyvals}\marg{start number}\oarg{keyvals}\marg{end number}\oarg{keyvals}
+ \end{syntax}
+ \cs{course} 命令å¯åœ¨å½“å‰å·¥ä½œæ—¥æ·»åŠ è¯¾ç¨‹ç›’å­ï¼Œéœ€åœ¨å‘½ä»¤ \cs{maketable} åŽï¼Œå¹¶åœ¨å¸¦æœ‰ \cmd{[remember picture, overaly]} 选项的 \env{tikz} 环境中执行.
+
+ 此命令的å¯é€‰å‚数接收下列键:\keys{\cmdmac~color} \keys{\cmdmac~subject} \keys{\cmdmac~location} \keys{\cmdmac~teacher} \keys{\cmdmac~weeks}. é”® \keys{\cmdmac~color} 默认值为 \cmd{teal},键 \keys{\cmdmac~weeks} 默认值由命令 \cs{weeklist} çš„å¯é€‰å‚数设定. 第一个和第二个强制å‚数分别为课程的开始和结æŸåºå·. 命令的用例è§Appendix \ref{mwe}.
+
+ \begin{itemize}
+ \item 若课程盒å­çš„高度åªæœ‰ä¸€æ ¼ï¼Œå³$\meta{start number} = \meta{end number}$,则键 \keys{\cmdmac~location} å’Œ \keys{\cmdmac~teacher} 的值将输出在åŒä¸€è¡Œå¹¶ä»¥é€—å· (,) 间隔,键 \keys{\cmdmac~weeks} 的值将会éšè—.
+ \item 若键 \keys{\cmdmac~location} å’Œ \keys{\cmdmac~teacher} å‡æœªèµ‹å€¼ï¼Œåˆ™é”® \keys{\cmdmac~subject} 的值将输出在课程盒å­ä¸­å¿ƒ.
+ \item 超出课程表工作日范围的课程盒å­å°†ä¸ä¼šæ˜¾ç¤ºï¼Œå¹¶è¿”回一æ¡è­¦å‘Š.
+ \end{itemize}
+\end{function}
+
+\begin{function}{\newday}
+ \begin{syntax}
+ \cs{newday}\oarg{integral value}
+ \end{syntax}
+
+ 此命令å¯ä½¿å…¶åŽé¢æ·»åŠ çš„课程盒å­åŽç§» \meta{intergal value} 个工作日. å¯é€‰å‚数的默认值为 \cmd{1},å³åŽç§» \cmd{1} 个工作日.
+\end{function}
+
+\clearpage
\appendix
-\includepdf[pages={1,3}]{litetable-demo.pdf}
-\includepdf[pages={2,4},nup=1x2,pagecommand={
- \tikz[remember picture, overlay]
- \node [rotate=90,below,yshift=-1em] at (current page.west) {\bfseries\LARGE Document Example: \texttt{litetable-demo.tex}};
- }
-]{litetable-demo.pdf}
-
-\end{document} \ No newline at end of file
+
+\section{最å°å·¥ä½œç¤ºä¾‹}\label{mwe}
+
+æ­¤MWE生æˆçš„课程表有13行但是åªæœ‰å‰12行标注时间,课程表顶部共有5个工作日,工作日之间的宽度比例为$4:5:4:6:5$,键 \keys{\cmdmac~weeks} 的默认值被赋为 \cmd{Weeks 1 - 16}. 添加了注释和两个课程盒å­.
+
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
+
+ \begin{document}
+
+ \timelist[13]
+ {
+ 08:05 -> 08:50, 08:55 -> 09:40, 10:00 -> 10:45, 10:50 -> 11:35,
+ 11:40 -> 12:25, 13:30 -> 14:15, 14:20 -> 15:05, 15:15 -> 16:00,
+ 16:05 -> 16:50, 18:30 -> 19:15, 19:20 -> 20:05, 20:10 -> 20:55
+ }
+ \weeklist[Weeks 1 - 16]
+ {
+ Mon -> 4, Tue -> 5, Wed -> 4, Thu -> 6, Fri -> 5
+ }
+ \more{Author: Mingyu Xia \& Lijun Guo}
+
+ \begin{tikzpicture}[remember picture, overlay]
+ \maketable
+ \course [ subject = Keep on {\TeX}ing ] {10} {11}
+ \newday
+ \course [ color = DarkSlateGray, subject = litetable,
+ location = Hong Kong, teacher = M.Y. Xia
+ ] {8} {8}
+ \end{tikzpicture}
+
+ \end{document}
+ \end{verbatim}
+\end{framed}
+
+\includepdf[pages = 1]{litetable-demo.pdf}
+
+\end{document}
+
+% End of file litetable-cn.tex
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf
index 136369231ab..30e84ee31eb 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex b/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex
index f2210298bf2..32ab4d89e96 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex
@@ -1,175 +1,70 @@
-\documentclass[times]{litetable}
+\documentclass[letterpaper, svgnames]{litetable}
-% \setCJKfamilyfont{zhhei}{Chiron Sung HK}
-
-\corner{6 pt}
-\sticker{favicon}
+\usepackage{twemojis,newtxtext}
+\usepackage[scaled = .9]{helvet}
+\renewcommand*\familydefault{\sfdefault}
\begin{document}
-\timelist[12]{%
- 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20;
- 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05
+\timelist [ 13 ]
+{
+ 08:05 -> 08:50, 08:55 -> 09:40, 10:00 -> 10:45,
+ 10:50 -> 11:35, 11:40 -> 12:25, 13:30 -> 14:15,
+ 14:20 -> 15:05, 15:15 -> 16:00, 16:05 -> 16:50,
+ 18:30 -> 19:15, 19:20 -> 20:05, 20:10 -> 20:55
}
-\weeklist{
- \heiti\bfseries\textcolor{W1}{\faIcon{moon}~星期一},
- \heiti\bfseries\textcolor{W2}{\faIcon{fire}~星期二},
- \heiti\bfseries\textcolor{W3}{\faIcon{water}~星期三},
- \heiti\bfseries\textcolor{W4}{\faIcon{tree}~星期四},
- \heiti\bfseries\textcolor{W5}{\faIcon{coins}~星期五};
- 0,.17,.34,.56,.78,1
+\weeklist [ Weeks 1 - 16 ]
+{
+ \scshape\texttwemoji{1f312} Mon -> 1,
+ \scshape\texttwemoji{1f525} Tue -> 1,
+ \scshape\texttwemoji{1f30a} Wed -> 1,
+ \scshape\texttwemoji{1f332} Thu -> 1,
+ \scshape\texttwemoji{1fa99} Fri -> 1
}
-\weeks{Week 1 -- 16}
-
-\begin{tikzpicture}
- \makeframe[SEM 6]{Axia\!\texttt{'}\!s Timetable}
-
- % Mon.
- \course[H5]{7}{8}{å‡èšæ€ç‰©ç†}{第6教研楼 · 中225}{Mn Chen}
-
- \newday % Tue.
- \course[H1]{8}{9}{群论}{第6教研楼 · 中211}{Li Ge}
- \course[H5]{10}{11}{介观物ç†}{第6教研楼 · 中211}{Yuan Li \& Mn Chen}
-
- \newday % Wed.
- \course[H6]{1}{2}{工程制图}{第7教研楼 · 中3012}{Hc Wang}
- \course[H9]{8}{9}{形势与政策6}{第6教研楼 · 北302}{Xr Qi}[Double Week 10 -- 16]
- \course[H9]{10}{11}{高级创业è¿è¥ä»¿çœŸ}{第4教研楼 · 411 -- 413}{Li Zhang}[Week 1 -- 8]
-
- \newday % Thu.
- \course[H4]{1}{2}{跨文化交际}{第3教研楼 · 422}{Cl Zuo}
- \course[H2]{3}{4}{无线电测å‘}{东边田径场}{Ys Yu}
- \course[H5]{6}{8}{固体物ç†}{第6教研楼 · 北408}{Kw Sun}
-
- \newday % Fri.
- \course[H8]{1}{2}{光电显示技术}{第7教研楼 · 中3012}{Wt Su}
- \course[H3]{6}{8}{研究生组会}{第6教研楼 · 中}{Yuan Li}
-
- \more{ · School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024}
-\end{tikzpicture}
-
-\rotatepage
-
-\weeklist{
- \bfseries\sffamily\textcolor{W1}{\faIcon{moon}~Monday},
- \bfseries\sffamily\textcolor{W2}{\faIcon{fire}~Tuesday},
- \bfseries\sffamily\textcolor{W3}{\faIcon{water}~Wednesday},
- \bfseries\sffamily\textcolor{W4}{\faIcon{tree}~Thursday},
- \bfseries\sffamily\textcolor{W5}{\faIcon{coins}~Friday},
- \bfseries\sffamily\textcolor{W6}{\faIcon{mountain}~Saturday},
- \bfseries\sffamily\textcolor{W7}{\faIcon{sun}~Sunday};
- 0,.16,.32,.48,.64,.8,.9,1
+\more
+{
+ School Starts: 06 / 09 / 2024\quad Summer Vacation: 26 / 01 / 2025
}
-\begin{tikzpicture}
- \makeframe[SEM 6]{Axia\!\texttt{'}\!s Timetable}
-
- % Mon.
- \course[H5]{7}{8}{Introduction to Cond.}{Building 6 · Middle 225}{Mn Chen}
-
- \newday % Tue.
- \course[H1]{8}{9}{Group Theory}{Building 6 · Middle 211}{Li Ge}
- \course[H5]{10}{11}{Mesoscopic Physics}{Building 6 · Middle 211}{Yuan Li \& Mn Chen}
-
- \newday % Wed.
- \course[H6]{1}{2}{Engineering Drawing}{Building 7 · North 3012}{Hc Wang}
- \course[H9]{8}{9}{Situation \& Policy 6}{Building 6 · North 302}{Xr Qi}[Double Week 10 -- 16]
- \course[H9]{10}{11}{Operational Simu.}{Building 4 · 411 -- 413}{Li Zhang}[Week 1 -- 8]
-
- \newday % Thu.
- \course[H4]{1}{2}{Intercultural Comm.}{Building 3 · 422}{Cl Zuo}
- \course[H2]{3}{4}{Radio Direction}{Athletic Field}{Ys Yu}
- \course[H5]{6}{8}{Solid State Physics}{Building 6 · North 408}{Kw Sun}
-
- \newday % Fri.
- \course[H8]{1}{2}{OE. Display}{Building 7 · North 3012}{Wt Su}
- \course[H3]{6}{8}{Group Meeting}{Building 6 · Middle}{Yuan Li}
-
- \more{ · School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024}
+\begin{tikzpicture}[remember picture, overlay]
+ \maketable [ color = MidnightBlue,
+ sem = SEM 6
+ ] { Skyrmion's Course Schedule }
+ \course [ color = DarkBlue, subject = interface3,
+ teacher = The {\LaTeX} Project
+ ] {4} {5}
+ \newday
+ \course [ color = Purple, subject = expl3,
+ teacher = The {\LaTeX} Project
+ ] {8} {8}
+ \course [ color = FireBrick, subject = usrguide,
+ teacher = {\LaTeX} Project Team, weeks = Weeks 7 - 14
+ ] {1} {2}
+ \newday
+ \course [ subject = Keep on {\TeX}ing ] {10} {11}
+ \newday
+ \course [ color = Crimson, subject = Ti\textit kZ,
+ teacher = The PGF/Ti\textit kZ Team
+ ] {3} {5}
+ \newday
+ \course [ color = DarkSlateGray, subject = litetable,
+ location = Hong Kong, teacher = M.Y. Xia
+ ] {8} {8}
\end{tikzpicture}
-\rerotatepage
+\clearpage
-\timelist{
- 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10;
- 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55
-}
-\weeklist
+\timelist [ 12 ] { }
+\weeklist [ Weeks 1 - 16 ]
{
- \heiti\bfseries\textcolor{W1}{\faIcon{moon}~星期一},
- \heiti\bfseries\textcolor{W2}{\faIcon{fire}~星期二},
- \heiti\bfseries\textcolor{W3}{\faIcon{water}~星期三},
- \heiti\bfseries\textcolor{W4}{\faIcon{tree}~星期四},
- \heiti\bfseries\textcolor{W5}{\faIcon{coins}~星期五},
- \heiti\bfseries\textcolor{W6}{\faIcon{mountain}~星期六};
- 0,.175,.35,.525,.7,.875,1
+ Mon -> 1, Tue -> 1, Wed -> 1, Thu -> 1, Fri -> 1
}
-\weeks{Week 1 -- 18}
-\begin{tikzpicture}
- \makeframe[SEM 5]{Axia\!\texttt{'}\!s Timetable} % make title & background
- % Mon.
- \course[H1]{1}{2}{羽毛çƒ}{羽毛çƒåœº}{Ys Yu}
- \course[H7]{3}{5}{光学镜头设计实验}{第6教研楼 · å—402}{Hao Ying}[Week 5 -- 15]
- \newday % Tue.
- \course[H9]{3}{5}{马克æ€ä¸»ä¹‰åŽŸç†}{第6教研楼 · 北320}{Yang Wang}
- \course[H8]{6}{8}{光电检测技术}{第6教研楼 · 北320}{Xf Huang}
- \newday % Wed.
- \course[H7]{3}{4}{激光原ç†}{第6教研楼 · 中301}{Hd Mao}
- \course[H9]{6}{7}{就业3 | 形策5}{6教中301 | 6教北208}{MJH | QXR}[Week 5 -- 14]
- \course[H5]{8}{9}{计算物ç†}{第6教研楼 · 中215}{Wj Rao}
- \course[H1]{10}{11}{论文写作指导}{第6教研楼 · 北416}{Yq Shi}
- \newday % Thu.
- \course[H6]{1}{2}{智能传感系统}{第6教研楼 · 北110}{Bx Cai}
- \course[H5]{3}{5}{高等é‡å­åŠ›å­¦}{第6教研楼 · 中225}{Mn Chen \& Yuan Li}
- \course[H3]{6}{8}{近代物ç†å®žéªŒ2}{第6教研楼 · å—}{Xx Chen}[Week 5 -- 16]
- \course[H8]{10}{12}{光电信æ¯æŠ€æœ¯å®žéªŒ}{第6教研楼 · å—302}{Yu Zhou}[Week 5 -- 15]
- \newday % Fri.
- \course[H7]{1}{2}{光学镜头设计}{第6教研楼 · 北422}{Hao Ying}
- \course[H5]{3}{5}{光电å­å­¦}{第6教研楼 · 北202}{Rx Li \& Yuan Li}
- \course[H8]{6}{7}{光电创新实践4}{第6教研楼 · å—302}{Ql Huang}[Week 5 -- 16]
- \course[H5]{8}{9}{研究生组会}{第6教研楼 · 中}{Yuan Li}
- \more{ · Hangzhou Asian Games: 23 / 09 / 2023 -- 08 / 10 / 2023 · School Starts: 11 / 09 / 2023
- · Winter Vacation: 26 / 01 / 2024}
+\begin{tikzpicture}[remember picture, overlay]
+ \maketable { Skyrmion's Course Schedule }
+ %
\end{tikzpicture}
-\rotatepage
-
-\weeklist{
- \bfseries\sffamily\textcolor{W1}{\faIcon{moon}~Monday},
- \bfseries\sffamily\textcolor{W2}{\faIcon{fire}~Tuesday},
- \bfseries\sffamily\textcolor{W3}{\faIcon{water}~Wednesday},
- \bfseries\sffamily\textcolor{W4}{\faIcon{tree}~Thursday},
- \bfseries\sffamily\textcolor{W5}{\faIcon{coins}~Friday},
- \bfseries\sffamily\textcolor{W6}{\faIcon{mountain}~Saturday};
- 0,.175,.35,.525,.7,.875,1
-}
-
-\begin{tikzpicture}
- \makeframe[SEM 5]{Axia\!\texttt{'}\!s Timetable} % make title
- % Mon.
- \course[H1]{1}{2}{Badminton}{Badminton Court}{Ys Yu}
- \course[H7]{3}{5}{Lens Design Expt.}{Building 6 · South 402}{Hao Ying}[Week 5 -- 15]
- \newday % Tue.
- \course[H9]{3}{5}{Marx's Principles}{Building 6 · North 320}{Yang Wang}
- \course[H8]{6}{8}{OE Detection Tech.}{Building 6 · North 320}{Xf Huang}
- \newday % Wed.
- \course[H7]{3}{4}{Laster Principle}{Building 6 Middle · 301}{Hd Mao}
- \course[H9]{6}{7}{Empl Guide | Situ Policy}{Build 6 · 301 | Build 6 · 208}{MJH | QXR}[Week 5 -- 14]
- \course[H5]{8}{9}{Computational Phys}{Building 6 · Middle 215}{Wj Rao}
- \course[H1]{10}{11}{Essay Writing}{Building 6 · North 416}{Yq Shi}
- \newday % Thu.
- \course[H6]{1}{2}{Sensing System}{Building 6 · North 110}{Bx Cai}
- \course[H5]{3}{5}{Quantum Mechanics$^\dagger$}{Building 6 · Middle 225}{Mn Chen \& Yuan Li}
- \course[H3]{6}{8}{Modern Phys Expt. 2}{Building 6 · South}{Xx Chen}[Week 5 -- 16]
- \course[H8]{10}{12}{OE Info Experiment}{Building 6 · South 302}{Yu Zhou}[Week 5 -- 15]
- \newday % Fri.
- \course[H7]{1}{2}{Optical Lens Design}{Building 6 · North 422}{Hao Ying}
- \course[H5]{3}{5}{Optoelectronics}{Building 6 · North 202}{Rx Li \& Yuan Li}
- \course[H8]{6}{7}{Innovative Practice 4}{Building 6 · South 302}{Ql Huang}[Week 5 -- 16]
- \course[H5]{8}{9}{Group Meeting}{Building 6 · Middle}{Yuan Li}
- \more{ · Hangzhou Asian Games: 23 / 09 / 2023 -- 08 / 10 / 2023
- · School Starts: 11 / 09 / 2023 · Winter Vacation: 26 / 01 / 2024 }
-\end{tikzpicture}
+\end{document}
-\end{document} \ No newline at end of file
+%% \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf
index 33f8659677c..f6c9a4cf2a4 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-en.tex b/Master/texmf-dist/doc/latex/litetable/litetable-en.tex
index 267f0f83464..17ab3050700 100644
--- a/Master/texmf-dist/doc/latex/litetable/litetable-en.tex
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-en.tex
@@ -1,304 +1,143 @@
-%% ******************************************************
-%% * This work may be distributed and/or modified under *
-%% * the conditions of the LaTeX Project Public License *
-%% * http://www.latex-project.org/lppl.txt *
-%% * either version 1.3c of this license or any later *
-%% * version. *
-%% ******************************************************
-% \PassOptionsToPackage{quiet}{xeCJK}
-% \PassOptionsToPackage{quiet, no-math}{fontspec}
-\documentclass[11pt]{article}
-\usepackage{geometry,pdfpages,caption,indentfirst,setspace}
-\captionsetup[table]{name={\textsc{Table}},labelsep=period}
-\usepackage[level]{datetime}
-\usepackage{authblk,xltxtra,bigfoot,enumitem}
-\usepackage{booktabs,diagbox,ragged2e,tabularx}
-\renewcommand\tabularxcolumn[1]{>{\Centering}m{#1}}
-\usepackage[toc]{multitoc}
-\usepackage[mono=false]{libertine}
-% \setstretch{1.15}
-% \setCJKmainfont{Chiron Sung HK}
-% [BoldFont=Chiron Sung HK Bold,
-% ItalicFont=Kaiti SC]
-\usepackage{hyperref,xcolor,tikz}
-\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output}
-\definecolor{pkgcolor}{Hsb}{103,.8,.5}
-\definecolor{moducolor}{Hsb}{290,.8,.5}
-\definecolor{cmdcolor}{Hsb}{188,.8,.5}
-\definecolor{filecolor}{Hsb}{207,.6,.7}
-\definecolor{H1}{Hsb}{349,.8,.8} % 海棠紅 (Hangzhou MTR L 1 )
-\definecolor{H2}{Hsb}{23, .8,.8} % 丹桂橙 (Hangzhou Metro 2 )
-\definecolor{H3}{Hsb}{48, .8,.8} % 柠檬黄 (Hangzhou Metro 3 )
-\definecolor{H4}{Hsb}{103,.8,.8} % 香樟绿 (Hangzhou Metro 4 )
-\definecolor{H5}{Hsb}{188,.8,.8} % é’è—色 (Hangzhou MTR L 5 )
-\definecolor{H6}{Hsb}{207,.8,.8} % æµ·æ´‹è“ (Hangzhou Metro 6 )
-\definecolor{H7}{Hsb}{290,.8,.8} % 浪漫紫 (Hangzhou Metro 7 )
-\definecolor{W1}{HTML}{CCAD52}
-\definecolor{W2}{HTML}{8FCC52}
-\definecolor{W3}{HTML}{52CC70}
-\definecolor{W4}{HTML}{52CCCC}
-\definecolor{W5}{HTML}{5270CC}
-\definecolor{W6}{HTML}{8F52CC}
-\definecolor{W7}{HTML}{CC52AD}
-\def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}}
-\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}}
-\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}}
-\def\datechange#1#2{%
- \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
- \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
-
-\title{\bfseries The \pkg{LiteTable} Template: Colorful Timetable}
-\author{Xia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
-\yyyymmdddate
-\date{\today}
-\affil{\href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}}
-\date{\today\quad Version 2.4c\thanks{%
- \url{https://github.com/xiamyphys/litetable}}}
+\documentclass[letterpaper]{l3doc}
+
+\hypersetup{urlcolor = teal, filecolor = violet}
+\usepackage[mono = false]{libertine}
+\usepackage{pdfpages,hologo,framed}
+\hologoFontSetup{general = \sffamily}
+\FrameSep = 0pt
+\linespread{1.12}
+\usepackage{indentfirst}
+\setlength{\parindent}{2em}
+\usepackage[os = mac]{menukeys}
+\AddToHook{env/function/before}{\vspace{-.3\baselineskip}}
+\AddToHook{env/syntax/after}{\vspace{-.2\baselineskip}}
+
+\title
+{
+ \bfseries
+ The \cls{litetable} Class: Colorful Timetable
+ \thanks{\url{https://github.com/xiamyphys/litetable}}
+}
+\author
+{
+ Mingyu Xia \texttt{<\href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}>}
+ \thanks{\href{https://github.com/ljguo1020}{Lijun Guo} developed modules for reading \meta{left} -> \meta{right} data structure and supporting low version \hologo {TeX} Live.}
+}
+\date{Version 3.1B, \today}
+
\begin{document}
+
\maketitle
-\vspace{-2em}
-\begin{abstract}
-This is the document for \pkg{LiteTable} template, which provides a beautiful design of class schedule with colorful course blocks.
-\end{abstract}
+\section{Introduction}
-\tableofcontents
+The \cls{litetable} class provides a design of timetable with colorful course boxes, which is based on the \cls{article} class, and conducted on \pkg{expl3} and \pkg{tikz}. It is compatible with \hologo{TeX}Live 2019 or later distributions, they all work fine for \hologo{pdfLaTeX} and \hologo{XeLaTeX} compilers. This is the Chinese manual for the \cls{litetable} class, manuals in \href{./litetable-cn.pdf}{Chinese} and \href{./litetable-hk.pdf}{Cantonese} versions are also provided\footnote{\href{https://qm.qq.com/q/RyssAhG4qy}{QQ Group: 760570712}}.
-\clearpage
+\section{Loading \cls{litetable} and generate the timetable frame}
-\section{Introduction}
+Just like loading any class, write
-\subsection{The purpose of this template}
-This template provides a beautiful design of class schedule with colorful course blocks.
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
+ \end{verbatim}
+\end{framed}
-If you meet bugs when using this template, or you have better suggestions or ideas, or you want to participate in the development of the template or other templates by me, welcome to contact via email \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}.
+One can load the \pkg{ctex} package and set the font to input the CJK characters, if necessary.
-Also, you can join my \textsf\LaTeX{} Template Discussion \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} to communicate with me and get the insider preview edition of the template.
+\begin{function}{\timelist,\weeklist}
+ \begin{syntax}
+ \cs{timelist}\oarg{rows}\marg{time list} \cs{timelist}\marg{time list}\oarg{rows}
+ \cs{weeklist}\oarg{default weeks}\marg{week list} \cs{weeklist}\marg{week list}\oarg{default weeks}
+ \end{syntax}
-\subsection{Packages required}
-This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global options, \pkg{expl3}\footnote{Please use the \pkg{expl3} version after 2023/10/10 to support the e-type variants for expand: \verb|\clist_count:e|.} package to support \cmd{timelist} array, \pkg{xeCJK} package to support the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provide a set of beautiful icons.
+ The optional argument of the command \cs{timelist} can force the number of rows on the timetable, and that of the command \cs{weeklist} can set the default number of weeks and print it at every course box's southeast corner. Each mandatory argument of the two commands accepts an array that can add a time list to the left side of the timetable and add workdays with corresponding width ratios at the top of the timetable, respectively. The example for inputting the arrays is shown in Appendix \ref{mwe}
-\subsection{Installing \pkg{LiteTable} and loading it}
-For portable version, simply download latest \verb|litetable.cls| file from \href{https://github.com/xiamyphys/LiteTable}{GitHub} or \href{https://ctan.org/pkg/litetable}{CTAN} and save it under your working directory. This way of installation is simple and convenient, but you have to manually update \verb|.cls| now and then.
-
-However, I strongly suggest that you should use terminal/cmd to implement the commands to update all the packages (and install this package) to the latest version or switch to portable version instead
-\begin{verbatim}
- sudo tlmgr update --self --all
-\end{verbatim}
-
-If you are in some areas with awful Internet environment (such as GFW), you can choose proper mirror source or use other means\footnote{Please comply with local network regulations.}. To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \textsf{\TeX} distribution?}
-
-The template provides two options, \mode{direction} and \mode{font}. Add the modes of the options you want in the square bracket of the command \verb|\documentclass[ ]{litetable}| in \verb|.tex| file.
-
-\subsection{Compatibility}
-The test environments are macOS + Mac\TeX{} 2023 / Overleaf and they all work fine for \XeLaTeX{} compiler, Windows, Linux and Unix platforms compatibility unknown.
-
-This template is developed on macOS platform and using the font ``Heiti SC''. If this font is not installed on your computer, please use the command \verb|\setCJKfamilyfont{zhhei}{ }| after \verb|\documentclass{litetable}| to replace ``Heiti SC'' to the font exists in your computer.
-
-\section{Global Options of \pkg{LiteTable}}
-\begin{verbatim}
- \documentclass[options]{litetable}
-\end{verbatim}
-
-\subsection{The \mode{direction} option}
-This option has two modes, \mode{portrait} and \mode{landscape}, which can make the timetable displayed portrait or horizontally.
-
-\subsection{The \mode{font} option}
-This option has two modes, \mode{times} and \mode{libertinus}, which can make the font to be ``Times New Roman'' or ``Libertinus'', and the default mode is ``Times New Roman''\footnote{Please ensure that your computer has been already installed the font when using this option.}.
-
-\section{Commands of \pkg{LiteTable}}
-
-\subsection{The \cmd{makeframe} command}
-\begin{verbatim}
- \makeframe[Sem 6]{Timetable}
-\end{verbatim}
-
-This command has two variables can create an empty class schedule. The second variable can assign the title while the first optional one can add a button that forward to the next page on the right.
-
-\subsection{The \cmd{weeklist} command}
-\begin{verbatim}
- \weeklist{
- \textcolor{W1}{Monday}, \textcolor{W2}{Tuesday},
- \textcolor{W3}{Wednesday}, \textcolor{W4}{Thursday},
- \textcolor{W5}{Friday};
- 0,.17,.34,.56,.78,1
- }
-\end{verbatim}
-
-
-\begin{figure}[!ht]
- \centering
- \tikz
- {
- \tikzset{every node/.style={font=\small}}
- \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0);
- \draw ({-5.1 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|};
- \draw ({0.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|};
- \draw ({.17*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.17|};
- \draw ({.34*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.34|};
- \draw ({.56*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.56|};
- \draw ({.78*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.78|};
- \draw ({1.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|};
- \node [above] at ({.085*5.1 in},0) {\sffamily\textcolor{W1}{Monday}};
- \node [above] at ({.255*5.1 in},0) {\sffamily\textcolor{W2}{Tuesday}};
- \node [above] at ({.45*5.1 in},0) {\sffamily\textcolor{W3}{Wednesday}};
- \node [above] at ({.67*5.1 in},0) {\sffamily\textcolor{W4}{Thursday}};
- \node [above] at ({.89*5.1 in},0) {\sffamily\textcolor{W5}{Friday}};
- }
- \caption*{The second line of array in the \cmd{weeklist} command corresponds to the axis coordinates.}
-\end{figure}
-
-
-This command can add workdays to the top side of the timetable, you can adjust the format (the icon before it), every width of the columns in the timetable like the figure. The timetable can automatically generate the corresponding number of columns based on the number of workdays you enter. For example, the code above has 5 workdays, a 5-column timetable will be generated.
-
-\subsection{The \cmd{timelist} command}
-\begin{verbatim}
- \timelist [13] {%
- 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10;
- 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55
- }
- \timelist [13] {}
-\end{verbatim}
-
-The command \cmd{timelist} has two variables while the second one \cmd{\ttfamily\{\#2\}} can add time to the left side of the timetable, and the first line of the content is the start time of the classes while the second line of the content is the end time of the classes, each time separates with a comma (\verb|,|), the first line and the second line separates with a semicolon (\verb|;|).
-
-The timetable can automatically generate the corresponding number of rows based on the number of time groups you enter. For example, the code above has 12 groups of times, a 12-row timetable will be generated.
-
-The first optional variable \cmd{\ttfamily[\#1]} can directly assign the number of rows on the timetable you want without adding time to the left side of the timetable, and there will only be a series of numbers that \emph{aligned vertically to the center of every line}.
-
-\begin{table}[!ht]
-\centering
-\caption{Usage of the two variables.}
-
-\begin{tabularx}{\textwidth}{c >{\raggedright\arraybackslash}X >{\raggedright\arraybackslash}X}
- \toprule
- \diagbox{\cmd{\ttfamily[\#1]}}{\cmd{\ttfamily\{\#2\}}} & \multicolumn{1}{c}{To use} & \multicolumn{1}{c}{Not to use}\\
- \midrule
- To use &
- The effect is the description of \cmd{\ttfamily\{\#2\}}, but number of rows assign by \cmd{\ttfamily[\#1]} &
- The effect is the description of \cmd{\ttfamily[\#1]}\\
- \midrule
- Not to use &
- The effect is the description of \cmd{\ttfamily\{\#2\}} &
- The effect is the description of \cmd{\ttfamily[\#1]} before with \emph{default format of 12 lines}\\
- \bottomrule
-\end{tabularx}
-\end{table}
-
-If you want to use the first variable \cmd{\ttfamily[\#1]} only, not to add anything in the second variable.
+ If the number of time arrays received by the command \cs{timelist} is greater than the forced number of rows, then the extra time sets are ignored, and it will return a warning. If one wants to add a series of numbers to the left side of the timetable without time, just leave the mandatory argument blank.
+\end{function}
-\begin{itemize}
- \item Assume that \cmd{\ttfamily\{\#2\}} has 12 groups of times, and \cmd{\ttfamily[\#1]} passed a value of 14, then the left side of the timetable will have only 1 -- 12 rows with time while the last two rows without time the label of them is still upward, not vertically aligned in the center.
- \item Assume that \cmd{\ttfamily\{\#2\}} has 14 sets of times, and \cmd{\ttfamily[\#1]} passes a value of 12, then only 12 rows of timetables will be generated with time on the left side of each row, that is, the last two sets of data in \cmd{\ttfamily\{\#2\}} will be invalid.
-\end{itemize}
+\begin{function}{\more}
+ \begin{syntax}
+ \cs{more}\marg{comment}
+ \end{syntax}
-\subsection{The \cmd{weeks} command}
-\begin{verbatim}
- \weeks{Week 1 -- 16}
-\end{verbatim}
+ This command can add a comment at the southwest corner of the page.
+\end{function}
-This command can assign the default value of the 7th variable of the command \cmd{course}.
+\begin{function}{\maketable}
+ \begin{syntax}
+ \cs{maketable}\oarg{keyvals}\marg{title}\oarg{keyvals}
+ \end{syntax}
-\subsection{The \cmd{course} command}
-\begin{verbatim}
- \course[H1]{8}{9}{Group Theory}{Building 6 · 211}{Li Ge}[Week 1 -- 16]
-\end{verbatim}
+ This command can create a blank timetable frame, and it should execute after commands \cs{timelist} and \cs{weeklist} in the \env{tikzpicture} environment with the option of \cmd{[remember picture, overaly]}. The optional argument accepts keys, it can set the background color of the timetable, and add the semester at the northeast corner of the page, the default value of the key \keys{\cmdmac~color} is \cmd{gray}. The mandatory argument can set the title.
+\end{function}
-There are 7 variables in this command.
-\begin{itemize}
- \item The 1st one is the color of the class, from ``H1'' to ``H9'', it's optional and the default is ``H1''.
- \item The 2nd -- 6th ones is the starting number and ending number, name, address, teacher(s) of the class.
- \item The last one is the start week and end week of the timetable, it's optional and the default value is the value that you've adjusted in the command \cmd{weeks} or it will be ``Week 1 -- 12''.
-\end{itemize}
+\section{Add course boxes}
-\subsection{The \cmd{corner} command}
-\begin{verbatim}
- \corner{6 pt}
-\end{verbatim}
+\begin{function}{\course}
+ \begin{syntax}
+ \cs{course}\oarg{keyvals}\marg{start number}\oarg{keyvals}\marg{end number}\oarg{keyvals}
+ \end{syntax}
+\end{function}
-This command determines the corner radius of the course block.
+The \cs{course} command can add course boxes on the current workday, it should execute after command \cs{maketable} in the \env{tikzpicture} environment with the option of \cmd{[remember picture, overaly]}.
-\subsection{The \cmd{newday} command}
-This command can switch the current weekday to the next day, then the course will move right one grid.
+The optional argument accepts the following keys: \keys{\cmdmac~color} \keys{\cmdmac~subject} \keys{\cmdmac~location} \keys{\cmdmac~teacher} \keys{\cmdmac~weeks}. The default value of the key \keys{\cmdmac~color} is \cmd{teal}, and the default value of the key \keys{\cmdmac~weeks} is determined by the argument of the command \cs{weeklist}. The first and second mandatory arguments are the start and end numbers of the course, respectively. The example of this command is shown in Appendix \ref{mwe}
-\subsection{The \cmd{more} command}
-\begin{verbatim}
- \more{· School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024}
-\end{verbatim}
+\begin{itemize}
+ \item If the course box's height is only one unit, that is $\meta{start number} = \meta{end number}$, the values of keys \keys{\cmdmac~location} and \keys{\cmdmac~teacher} will print on the same line with a comma (,) separated, and the value of the key \keys{\cmdmac~weeks} will be hidden.
+ \item If neither the key \keys{\cmdmac~location} nor the key \keys{\cmdmac~teacher} is assigned value, then the value of the key \keys{\cmdmac~subject} will print at the center of the course box.
+ \item course boxes that are out of the timetable will not display, and it will return a warning.
+\end{itemize}
-This command can add remark at the end of the class schedule.
+\begin{function}{\newday}
+ \begin{syntax}
+ \cs{newday}\oarg{intergal value}
+ \end{syntax}
-\subsection{The \cmd{sticker} command}
-\begin{verbatim}
- \sticker{favicon}
-\end{verbatim}
+ This command has an optional argument that can move the course boxes right \meta{intergal value} working days. The default value of the optional argument is \cmd{1} to move right \cmd{1} workday.
+\end{function}
-There will be a sticker on the southeast of the page after you add, otherwise it won't.
+\clearpage\linespread{1.375}
+\appendix
-\section{Version History}
+\section{Minimal Working Example}\label{mwe}
-The design of this course schedule originated from the student course schedule web page (only personnel of this school can access) of the \href{https://www.hduhelp.cn/}{HDUHelp} in \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}. The layout is very beautiful and I used \textsf{\LaTeX} to imitate that style and made a template to share with everyone.
+The following MWE could generate a timetable of 13 lines but only the top 12 lines have been marked with time, and there are 5 workdays at the top of the timetable, ratios between them are $4:5:4:6:5$. The default value of the key \keys{\cmdmac~weeks} will be set to \cmd{Weeks 1 - 16}. A comment and two course boxes are added.
-\textsf{\bfseries Version 1.0} was finished on 2023/09/01 and released on \href{https://www.latexstudio.net}{\textsf{\LaTeX} Studio} (Hsiaoshan, Hangzhou), where has won the favor of many people.
-\clearpage
-\setlist[itemize]{noitemsep, topsep=0pt}
-\datechange{2023/11/01}{Version 2.0a}
-\begin{itemize}
- \item Supports to set the course block's corners be round or sharp.
- \item Supports to add multiply class schedules in one \verb|.tex| file.
-\end{itemize}
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
-\datechange{2023/11/05}{Version 2.1a}
-\begin{itemize}
- \item Supports to use the libertinus font.
-\end{itemize}
+ \begin{document}
-\datechange{2024/01/31}{Version 2.2a}
-\begin{itemize}
- \item Fixed the bug of resolution exceeded.
- \item Changed paper type to US letter.
- \item Support to custom course start time and end time.
- \item Support to add sticker as you like at the southeast of the page.
- \item Provide simplified Chinese documentation.
-\end{itemize}
+ \timelist[13]
+ {
+ 08:05 -> 08:50, 08:55 -> 09:40, 10:00 -> 10:45, 10:50 -> 11:35,
+ 11:40 -> 12:25, 13:30 -> 14:15, 14:20 -> 15:05, 15:15 -> 16:00,
+ 16:05 -> 16:50, 18:30 -> 19:15, 19:20 -> 20:05, 20:10 -> 20:55
+ }
+ \weeklist[Weeks 1 - 16]
+ {
+ Mon -> 4, Tue -> 5, Wed -> 4, Thu -> 6, Fri -> 5
+ }
+ \more{Author: Mingyu Xia \& Lijun Guo}
-\datechange{2024/02/02}{Version 2.3a}
-\begin{itemize}
- \item Supports to generate the corresponding number of rows based on the number of time groups you enter automatically.
- \item Timetable can be displayed portrait or horizontally as you like.
-\end{itemize}
-
-\datechange{2024/02/03}{Version 2.3b}
-\begin{itemize}
- \item Optimized coordinate calculation and improved compilation speed.
-\end{itemize}
+ \begin{tikzpicture}[remember picture, overlay]
+ \maketable
+ \course [ subject = Keep on {\TeX}ing ] {10} {11}
+ \newday
+ \course [ color = DarkSlateGray, subject = litetable,
+ location = Hong Kong, teacher = M.Y. Xia
+ ] {8} {8}
+ \end{tikzpicture}
-\datechange{2024/02/24}{Version 2.4a}
-\begin{itemize}
- \item Supports to custom workday display style.
- \item Supports to hide time and only showing course program number vertically aligned.
- \item Supports to set default first and last week.
-\end{itemize}
+ \end{document}
+ \end{verbatim}
+\end{framed}
-\datechange{2024/03/01}{Version 2.4b}
-\begin{itemize}
- \item Fixed the error of \emph{resolution exceed} in the \mode{landscape} mode and added over 7 workdays.
- \item Supports to custom every width of the columns in the timetable.
- \item Optimized the design of round corners, supports custom the radius of corners.
- \item Thanks for @egreg's code solution on \TeX{} StackExchange for \href{https://tex.stackexchange.com/a/711657/299948}{Printing the number of each rows' elements in an array respectively}.
-\end{itemize}
+\includepdf[pages = 1]{litetable-demo.pdf}
-\datechange{\today}{Version 2.4c}
-\begin{itemize}
- \item Supports to add the `Semester' button on the right side of the title.
-\end{itemize}
+\end{document}
-\appendix
-\includepdf[pages={2,4},nup=1x2,pagecommand={
- \tikz[remember picture, overlay]
- \node [rotate=90,below,yshift=-1em] at (current page.west) {\bfseries\LARGE Document Example: \texttt{litetable-demo.tex}};
- }
-]{litetable-demo.pdf}
-\includepdf[pages={1,3}]{litetable-demo.pdf}
-
-\end{document} \ No newline at end of file
+% End of file litetable-en.tex
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-hk.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-hk.pdf
new file mode 100644
index 00000000000..d2f1234e753
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-hk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-hk.tex b/Master/texmf-dist/doc/latex/litetable/litetable-hk.tex
new file mode 100644
index 00000000000..6f48cc6fd15
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/litetable/litetable-hk.tex
@@ -0,0 +1,143 @@
+\documentclass[letterpaper]{l3doc}
+
+\hypersetup{urlcolor = teal, filecolor = violet}
+\usepackage[mono = false]{libertine}
+\usepackage{pdfpages,hologo,framed}
+\hologoFontSetup{general = \sffamily}
+\FrameSep = 0pt
+\usepackage[fontset = none]{ctex}
+\setCJKmainfont[BoldFont = *-Bold]{LXGW WenKai}
+\setCJKsansfont[BoldFont = *-Bold]{LXGW WenKai}
+\setCJKmonofont[BoldFont = *-Bold]{LXGW WenKai}
+\usepackage[os = mac]{menukeys}
+\AddToHook{env/function/before}{\vspace{-.3\baselineskip}}
+\AddToHook{env/syntax/after}{\vspace{-.2\baselineskip}}
+
+\title
+{
+ \bfseries\cls{litetable} 文檔類:多彩嘅課程表
+ \footnote{\url{https://github.com/xiamyphys/litetable}}
+}
+\author
+{
+ å¤æ˜Žå®‡ \texttt{<\href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}>}
+ \thanks{\href{https://github.com/ljguo1020}{郭æŽè»}é–‹ç™¼å’—è®€å– \meta{left} -> \meta{right} 型資料çµæ§‹ç³¢å¡ŠåŒä½Žç‰ˆæœ¬ \hologo{TeX} Live 相容糢塊.}
+}
+\date{Version 3.1B, \today}
+
+\begin{document}
+
+\maketitle
+
+\section{介紹}
+
+\cls{litetable} 文檔類æ供咗個多彩嘅課程表設計,基於 \cls{article} 文檔類,由 \pkg{expl3} å’Œ \pkg{tikz} 構建. 相容發行版 \hologo{TeX} Live 2019 åŒæ›´é«˜ç‰ˆæœ¬ï¼Œå–º \hologo{pdfLaTeX} åŒ \hologo{XeLaTeX} 編譯器下å‡å¯æ­£å¸¸é‹è¡Œ. 本文檔系 \cls{litetable} 文檔類嘅用户手冊放,手冊放åŒæ™‚有\href{./litetable-en.pdf}{英文}åŒ\href{./litetable-cn.pdf}{官話}版本\footnote{\href{https://qm.qq.com/q/RyssAhG4qy}{QQ Group: 760570712}}.
+
+\section{載入 \cls{litetable} 並建置課程表框架}
+
+åŒè¼‰å…¥å…¶ä»–文檔類一樣,åªä»¤å¯«ä¸‹
+
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
+ \end{verbatim}
+\end{framed}
+
+如需輸入中文,å¯è‡ªè¡Œè¼‰å…¥ \pkg{ctex} å®åŒ…並設置字型.
+
+\begin{function}{\timelist,\weeklist}
+ \begin{syntax}
+ \cs{timelist}\oarg{rows}\marg{time list} \cs{timelist}\marg{time list}\oarg{rows}
+ \cs{weeklist}\oarg{default weeks}\marg{week list} \cs{weeklist}\marg{week list}\oarg{default weeks}
+ \end{syntax}
+
+ 命令 \cs{timelist} 嘅å¯é¸åƒæ•¸å¯å¼·åˆ¶è¨­å®šèª²ç¨‹è¡¨å˜…行數,命令 \cs{weeklist} 嘅å¯é¸åƒæ•¸å¯è¨­å®šé è¨­å˜…星期數目並會喺æ¯å€‹èª²ç¨‹ç›’å­å˜…å³ä¸‹è§’顯示. 兩個命令嘅強制åƒæ•¸å‡æŽ¥å—數組,å¯åˆ†åˆ¥å°±ç³»èª²ç¨‹è¡¨å˜…å·¦å´æ·»åŠ æ™‚間表ã€å–ºèª²ç¨‹è¡¨å˜…頂部添加å°æ‡‰å¯¬åº¦æ¯”例嘅工作日. 輸入數組嘅用例見Appendix \ref{mwe}.
+
+ 若命令 \cs{timelist} 中時間數組數字大於å¯é¸åƒæ•¸æŽ¥å—值,就多餘嘅時間數組將畀忽略,並返回一個警告. 如果åªç³»èª²ç¨‹è¡¨å·¦å´æ·»åŠ ä¸€éƒ¨åºè™Ÿï¼Œä»¤å¼·åˆ¶åƒæ•¸ç‚ºç©ºå³å¯.
+\end{function}
+
+\begin{function}{\more}
+ \begin{syntax}
+ \cs{more}\marg{comment}
+ \end{syntax}
+
+ 此命令å¯å–ºé é¢å˜…嘅å³ä¸‹è§’添加備注.
+\end{function}
+
+\begin{function}{\maketable}
+ \begin{syntax}
+ \cs{maketable}\oarg{keyvals}\marg{title}\oarg{keyvals}
+ \end{syntax}
+
+ 此命令å¯å»ºç½®ä¸€å€‹ç©ºç™½å˜…課程表框架,使喺命令 \cs{timelist},\cs{weeklist} åŒ \cs{more} 後,並喺帶有 \cmd{[remember picture, overaly]} é¸é …嘅 \env{tikz} 環境中執行. å¯é¸å¼•æ•¸æŽ¥å—éµ \keys{\cmdmac~color} \keys{\cmdmac~sem},å¯åˆ†åˆ¥å°±å–ºè¨­ç½®èª²ç¨‹è¡¨æ¡†æž¶å˜…背景色åŒå–ºé é¢å˜…嘅å³åº¦è§’æ·»åŠ å­¸æœŸï¼Œéµ \keys{\cmdmac~color} 嘅默èªå€¼ç‚º \cmd{gray}. 強制åƒæ•¸å¯è¨­å®šæ¨™é¡Œ.
+\end{function}
+
+\section{添加課程盒å­}
+
+\begin{function}{\course}
+ \begin{syntax}
+ \cs{course}\oarg{keyvals}\marg{start number}\oarg{keyvals}\marg{end number}\oarg{keyvals}
+ \end{syntax}
+
+ \cs{course} 命令å¯å–ºç•¶å‰å·¥ä½œæ—¥æ·»åŠ èª²ç¨‹ç›’å­ï¼Œè¦å–ºå‘½ä»¤ \cs{maketable} 後,並喺帶有 \cmd{remember picture,overaly} é¸é …嘅 \env{tikzpicture} 環境中執行.
+
+ 此命令嘅å¯é¸åƒæ•¸æŽ¥å—下列éµï¼š\keys{\cmdmac~color} \keys{\cmdmac~subject} \keys{\cmdmac~location} \keys{\cmdmac~teacher} \keys{\cmdmac~weeks}. éµ \keys{\cmdmac~color} 默èªå€¼ç‚º \cmd{teal}ï¼Œéµ \keys{\cmdmac~weeks} 默èªå€¼ç”±å‘½ä»¤ \cs{weeklist} 嘅å¯é¸åƒæ•¸æ±ºå®š. 第一個åŒç¬¬äºŒå€‹å¼·åˆ¶åƒæ•¸å‹’分別為課程嘅開始åŒçµæŸåºè™Ÿ. 命令嘅用例見Appendix \ref{mwe}.
+
+ \begin{itemize}
+ \item 若課程盒å­é«˜åº¦å¾—一格,å³$\marg{start number} = \marg{end number}$ï¼Œå°±éµ \keys{\cmdmac~location} åŒ \keys{\cmdmac~teacher} 嘅值將輸出喺åŒä¸€è¡Œä¸¦ä»¥é€—號 (,) éš”ï¼Œéµ \keys{\cmdmac~weeks} 嘅值將會隱è—.
+ \item è‹¥éµ \keys{\cmdmac~location} åŒ \keys{\cmdmac~teacher} å‡æœªè³¦å€¼ï¼Œå°±éµ \keys{\cmdmac~subject} 嘅值將輸出喺課程盒å­ä¸­å¿ƒ.
+ \item 超出課程表工作日範åœå˜…課程盒å­å°‡å””會顯示,åªæœƒè¿”回一æ¢è­¦å‘Š.
+ \end{itemize}
+\end{function}
+
+\begin{function}{\newday}
+ \begin{syntax}
+ \cs{newday}\oarg{integral value}
+ \end{syntax}
+
+ 此命令有一個å¯é¸åƒæ•¸ï¼Œå¯ä»¤å…¶å¾Œé¢æ·»åŠ å˜…課程盒å­å¾Œç§» \meta{intergal value} 個工作日. å¯é¸åƒæ•¸å˜…默èªå€¼ç‚º\cmd{1},å³å¾Œç§»\cmd{1}個工作日.
+\end{function}
+
+\clearpage
+\appendix
+
+\section{最å°å·¥ä½œç¯„例}\label{mwe}
+
+æ­¤MWE建置嘅課程表有13行但系得å‰12行标注时间,課程表顶部共有五个工作日,工作日之间嘅宽度比例为$4:5:4:6:5$,键 \keys{\cmdmac~weeks} 嘅默认值畀赋为 \cmd{Weeks 1 - 16}. 添加咗註解åŒå…©å€‹èª²ç¨‹ç›’å­.
+
+\begin{framed}
+ \begin{verbatim}
+ \documentclass{litetable}
+
+ \begin{document}
+
+ \timelist[13]
+ {
+ 08:05 -> 08:50, 08:55 -> 09:40, 10:00 -> 10:45, 10:50 -> 11:35,
+ 11:40 -> 12:25, 13:30 -> 14:15, 14:20 -> 15:05, 15:15 -> 16:00,
+ 16:05 -> 16:50, 18:30 -> 19:15, 19:20 -> 20:05, 20:10 -> 20:55
+ }
+ \weeklist[Weeks 1 - 16]
+ {
+ Mon -> 4, Tue -> 5, Wed -> 4, Thu -> 6, Fri -> 5
+ }
+ \more{Author: Mingyu Xia \& Lijun Guo}
+
+ \begin{tikzpicture}[remember picture, overlay]
+ \maketable
+ \course [ subject = Keep on {\TeX}ing ] {10} {11}
+ \newday
+ \course [ color = DarkSlateGray, subject = litetable,
+ location = Hong Kong, teacher = M.Y. Xia
+ ] {8} {8}
+ \end{tikzpicture}
+
+ \end{document}
+ \end{verbatim}
+\end{framed}
+
+\includepdf[pages = 1]{litetable-demo.pdf}
+
+\end{document}
+
+% End of file litetable-hk.tex
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 712cf2598ed..a6b05247892 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,18 @@
+2024-09-16
+ * v1.29 : media9.sty
+ * v0.59 : pdfbase.sty
+ * fix : missing AS entry in widget annot
+
+2024-09-13
+ * v1.28 : media9.sty
+ * v0.58 : pdfbase.sty
+ * fix : xetex/dvipdfmx-related `Missing number' error, fixes #19
+
+2024-09-02
+ * v1.27 : media9.sty
+ * v0.57 : pdfbase.sty
+ * fix : internal page counter
+
2024-08-28
* v1.26 : media9.sty
* v0.56 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 526dc374089..9ca4fb4d4f9 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/minted/CHANGELOG_LATEXMINTED_PYTHON_PACKAGE.md b/Master/texmf-dist/doc/latex/minted/CHANGELOG_LATEXMINTED_PYTHON_PACKAGE.md
new file mode 100644
index 00000000000..5f4caab542a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/minted/CHANGELOG_LATEXMINTED_PYTHON_PACKAGE.md
@@ -0,0 +1,38 @@
+# Changelog: `latexminted` — Python library for LaTeX minted package
+
+
+## v0.2.0 (2024-10-03)
+
+* All config data passed back to LaTeX is now processed with `\detokenize`
+ (#405).
+
+* In a cache, `*.index.minted` files are now overwritten only when the data
+ they contain is modified. This fixes compatibility with build tools
+ (T-F-S/tcolorbox/issues/294).
+
+* Fixed a bug that could prevent a cache from being fully cleaned when it is
+ shared by multiple documents.
+
+* All file reading and writing for files received from/sent to LaTeX is now
+ UTF-8 (#411).
+
+* The cache path is now processed correctly when it is an empty string,
+ instead of resulting in an error, so the `minted` package will now function
+ when `cache=false`.
+
+* Refactored the `cleanfile` subcommand into `cleanconfig`. This is more
+ descriptive for actual usage and allows all subcommands to take the same
+ arguments.
+
+* Added subcommand `cleantemp`, which only cleans temp files, not cache
+ files.
+
+* All subcommands now take exactly the same arguments.
+
+* Added short summary and links to `latexminted --version` (#404).
+
+
+
+## v0.1.0 (2024-09-22)
+
+* Initial release.
diff --git a/Master/texmf-dist/doc/latex/minted/CHANGELOG_MINTED_LATEX_PACKAGE.md b/Master/texmf-dist/doc/latex/minted/CHANGELOG_MINTED_LATEX_PACKAGE.md
new file mode 100644
index 00000000000..ce573e9c1e2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/minted/CHANGELOG_MINTED_LATEX_PACKAGE.md
@@ -0,0 +1,960 @@
+# Changelog — minted LaTeX package
+
+
+## v3.1.1 (2024/10/03)
+
+* Fixed bugs in processing temporary files regardless of `highlightmode` from
+ v3.1.0. With `highlightmode=fastfirst` (default), this would cause an
+ error during the first compile, but then all subsequent compiles would
+ complete correctly.
+
+
+
+## v3.1.0 (2024/10/03)
+
+* All timestamp comparisons that are part of communicating with the
+ `latexminted` Python executable now use timestamps that have been processed
+ with `\detokenize` (#405).
+
+* Option processing now wraps values in curly braces to prevent escaping
+ issues when options are passed on to other packages for further processing
+ (#407).
+
+* Fixed compatibility with `dvilualatex` (#406).
+
+* Temporary files with common file extensions are now automatically detected
+ and processed correctly regardless of `highlightmode` (#401). Previously,
+ `highlightmode=immediate` was needed for working with temp files that are
+ overwritten or deleted during compilation; the default
+ `highlightmode=fastfirst` gave an error message during the first compile
+ but worked correctly during subsequent compiles.
+
+* Fixed bug when `cache=false`. When caching is disabled, `highlightmode` is
+ now set to `immediate`.
+
+* The minimum supported `latexminted` version is now 0.2.0. The new
+ `latexminted` subcommand `cleantemp` is now used instead of `clean` when
+ the cache does not require cleaning. This prevents errors when
+ `cache=false`.
+
+* Fixed docs for `breakbeforeinrun` and `breakafterinrun` (#408). These had
+ not been properly updated after `fvextra` renamed the options.
+
+
+
+## v3.0.0 (2024/09/22)
+
+* Backward compatibility: The new `minted2` package provides the features of
+ `minted` v2.9, the final release before v3. No additional v2 releases are
+ planned; no changes to the `minted2` package are expected.
+
+* `minted` v3 is a complete rewrite from v2.9. `minted` v3 includes
+ significant changes from `minted` v2 on the LaTeX side, and also uses a new
+ `minted`-specific Python executable called `latexminted` to perform syntax
+ highlighting. This executable is specifically designed to meet the
+ security requirements for restricted shell escape programs. Once it has
+ passed a security review and is accepted by TeX distributions, it will be
+ possible to highlight code without `-shell-escape` and its attendant
+ security vulnerabilities.
+
+ Syntax highlighting is still performed with Pygments, but the `pygmentize`
+ executable included with Pygments is no longer used.
+
+* Installing the `minted` package now also installs the `latexminted` Python
+ executable and all required Python libraries, including Pygments, within
+ your TeX distribution. These require Python >= 3.8. If the default Python
+ version on `PATH` is < 3.8, then the `latexminted` Python executable will
+ attempt to locate a more recent version and run itself with that version in
+ a subprocess.
+
+ Manually installing Python libraries is only necessary if you want to use
+ plugin packages for Pygments. In that case, install the `latexminted`
+ Python package in a Python installation. This automatically installs
+ `latex2pydata`, `latexrestricted`, and Pygments as dependencies.
+ `latexminted` is available from the
+ [Python Package Index (PyPI)](https://pypi.org/project/latexminted/). Then
+ install plugin packages for Pygments within the same Python installation.
+
+* The new `latexminted` Python executable is designed to be compatible with
+ the security requirements for restricted shell escape, so that in the
+ future TeX distributions can enable `latexminted` without requiring
+ `-shell-escape`. It is possible to benefit from these enhanced security
+ capabilities immediately and avoid the need for `-shell-escape`.
+
+ - TeX Live: Copy the variable `shell_escape_commands` from the
+ distribution `texmf.cnf` (typically something like
+ `<tex_distro>/texmf-dist/web2c/texmf.cnf`) into the user `texmf.cnf`
+ (typically something like `<tex_distro>/texmf.cnf`), and then add
+ `latexminted` to the end of the `shell_escape_commands` list. The
+ location of the `texmf.cnf` files can be determined by running
+ `kpsewhich -all texmf.cnf`.
+
+ - MiKTeX: Add a line `AllowedShellCommands[] = latexminted` to the
+ existing list of allowed commands in `miktex.ini`. You may want to
+ modify the user-scoped configuration instead of the system-wide
+ configuration. See the
+ [MiKTeX documentation](https://docs.miktex.org/manual/miktex.ini.html)
+ for more details, particularly `initexmf --edit-config-file <file>`.
+
+* Errors and warnings that occur within Python are now reported as `minted`
+ package errors and warnings within LaTeX in nearly all cases. It should no
+ longer be necessary to look through the compile log for Python errors and
+ warnings. A temp file `*.errlog.minted` containing Python traceback
+ information is created in some cases when errors cannot be fully reported
+ within LaTeX or more details may be needed.
+
+* [`latex2pydata`](https://github.com/gpoore/latex2pydata) is now required
+ for passing data from LaTeX to Python and then processing it within Python.
+ This consists of a LaTeX package, available from
+ [CTAN](https://ctan.org/pkg/latex2pydata), and a Python package, available
+ from [PyPI](https://pypi.org/project/latex2pydata/). The LaTeX package can
+ typically be installed with your TeX distribution's package manager. The
+ Python package is automatically installed within your TeX distribution when
+ `minted` is installed.
+
+* On the LaTeX side, all syntax highlighting settings are now serialized in
+ Python literal format using `latex2pydata` and then saved to a temp file,
+ which is loaded on the Python side. Settings are no longer passed to the
+ Python side using command-line arguments. Temp files for passing data to
+ Python are now named using MD5 hashes, instead of using a sanitized version
+ of document `\jobname`. This eliminates an entire class of security issues
+ and bugs related to escaping and quoting command-line arguments (#180,
+ #276, #298, #322, #338, #354). It also eliminates bugs related to
+ processing settings as a sequence of command-line options, since
+ `pygmentize` accumulates some options that are used multiple times rather
+ than overwriting earlier values with later values (#258, #337).
+
+* Options are now handled with `pgfkeys` and `pgfopts`, instead of
+ `keyval` and `kvoptions`.
+
+* Temporary files are no longer created unless the cache needs to be updated
+ (or caching is disabled). All MD5 hashing of code now takes place in
+ memory instead of using one temp file per command/environment.
+
+ All temporary files are cleaned up automatically when compiling completes
+ without interruption. All temporary files now have names of the form
+ `_<hash>.<role>.minted`. `<hash>` is an MD5 hash of `\jobname` (if
+ `\jobname` is wrapped in double or single quotation marks, these are
+ stripped before the MD5 is computed). `<role>` is the role of the temp
+ file: `data` (data passed to Python), `config` (detected system
+ configuration), `style` (highlighting style definition), `highlight`
+ (highlighted code), or `message` (message passed back to LaTeX by Python
+ executable). `<role>` can also be `errlog` when the Python executable
+ encounters an unexpected error that it is not designed to report to the
+ LaTeX side; this is not automatically cleaned up. There are no more
+ `<jobname>.pyg` and `<jobname>.out.pyg` files.
+
+* Several package options are no longer supported and result in errors or
+ warnings.
+
+ - `finalizecache`: No longer needed. The `frozencache` package option now
+ uses the regular cache, rather than requiring a new, special cache
+ containing files with sequentially numbered names (#342). When using
+ `frozencache` with `-output-directory`, the `cachedir` package option
+ should be used to specify a full relative path to the cache (for
+ example, `cachedir=./<output_directory>/_minted`).
+
+ - `outputdir`: No longer needed (#268). TeX Live 2024+ saves a custom
+ output directory from `-output-directory` in the environment variable
+ [`TEXMF_OUTPUT_DIRECTORY`](https://tug.org/texinfohtml/web2c.html#Output-file-location).
+ The environment variable `TEXMF_OUTPUT_DIRECTORY` can be set manually in
+ other cases.
+
+ - `kpsewhich`: No longer needed. `kpsewhich` is now automatically
+ invoked as necessary by the `latexminted` Python executable in locating
+ files.
+
+ - `draft` and `final`: These no longer have any effect and result in a
+ warning. They will soon be removed altogether. Improvements in caching
+ have largely eliminated the overhead that `draft` mode was designed to
+ avoid, while new features that are implemented purely within Python have
+ made it impossible in some cases to typeset code using only LaTeX. The
+ new package options `placeholder` and `verbatim` offer alternatives when
+ maximum compilation speed is needed or the `latexminted` Python
+ executable is unavailable.
+
+* New package options:
+
+ - `debug`: Keep temp files from highlighting to aid in debugging. Also
+ write current file name and line number to log before `\input` of
+ highlighted code (#348).
+
+ - `highlightmode`: Determines when code is highlighted. The default is
+ `fastfirst`. If a cache for the document exists, then code is
+ highlighted immediately. If a cache for the document does not exist,
+ then typeset a placeholder instead of code and highlight all code at the
+ end of the document. This will require a second compile before code is
+ typeset, but because all code is highlighted at once, there is less
+ overhead and the total time required can be significantly less for
+ documents that include many code snippets. The alternatives are `fast`
+ (always highlight at end of document, requiring a second compile) and
+ `immediate` (always highlight immediately, so no second compile is
+ needed). `immediate` should be used when typesetting code in external
+ temp files that are overwritten during compilation.
+
+ When code is highlighted at the end of the document with `fast` or
+ `fastfirst`, any error and warning messages will refer to a location at
+ the end of the document rather than the original code location, since
+ highlighting occurred at the end of the document. In this case, messages
+ are supplemented with original LaTeX source file names and line numbers
+ to aid in debugging.
+
+ - `placeholder`: Instead of typesetting code, insert a placeholder. This
+ is enabled automatically when working with PGF/TikZ externalization.
+
+ - `verbatim`: Instead of highlighting code, attempt to typeset it verbatim
+ without using the `latexminted` Python executable. This is not
+ guaranteed to be an accurate representation of the code, since some
+ features such as `autogobble` require Python.
+
+* `bgcolor` now uses the new `bgcolor` option from `fvextra` v1.8, rather
+ than `snugshade*` from `framed`. This resolves incompatibilities between
+ `bgcolor` and `xleftmargin`/`xrightmargin` (#214), eliminates unneeded
+ whitespace before/after the background (#220), prevents text from
+ overflowing the background (#278), and provides uniform background height
+ for `\mintinline` (#397). Because `bgcolor` now introduces no additional
+ whitespace or padding, existing documents may require some modification.
+
+ Added new option `bgcolorpadding` for modifying padding in background color
+ regions. Added new option `bgcolorvphantom` for setting height of
+ background color in inline contexts.
+
+* Renamed package options `langlinenos` to `lexerlinenos` and
+ `inputlanglinenos` to `inputlexerlinenos`. The old names are still
+ supported.
+
+* The default cache directory name is now `_minted`. All files within a
+ directory now share the same cache, instead of having separate per-document
+ caches. The new `latexminted` Python executable improves cache management
+ so that a shared cache functions correctly. A cache file that is shared by
+ multiple documents will not be deleted if one document ceases to use the
+ file.
+
+ Document-specific caching as in `minted` v2 can be restored using the
+ package option `cachedir`. For example, for files whose names do not
+ contain spaces, simply use `cachedir=\detokenize{_minted-}\jobname`. For
+ files with names that do contain spaces, use a copy of `\jobname` in which
+ the wrapping quotation marks have been removed or replaced with other
+ characters and the spaces have been replaced with placeholders such as `_`.
+
+* Cache file names now take the form `<hash>_highlight.minted` and
+ `<style>_style.minted`. `<hash>` is a single MD5 hash of code and options,
+ when serialized in Python literal format. Cache file names no longer use
+ two concatenated MD5 hashes, one of code and one of options. The cache
+ directory will also contain files `_<hash>.index.minted`. These list all
+ cache files used by a given document. In this case, `<hash>` is the MD5
+ hash of the document's `\jobname` (if `\jobname` is wrapped in double or
+ single quotation marks, these are stripped before the MD5 is computed).
+
+* Highlighting style names must now match the regular expression
+ `^[0-9A-Za-z_-]+$`. This is checked on the LaTeX side.
+
+* `\inputminted` is redefined as robust and is usable in movable arguments.
+
+* `\newminted` now creates an environment that takes an optional argument
+ consisting of options, instead of taking no argument. It still creates a
+ starred `*` environment variant that takes a mandatory argument consisting
+ of options, but this is only retained for backward-compatibility purposes.
+
+* Improved fallback behavior in the event of errors. If code cannot be
+ highlighted, it is automatically typeset with a verbatim approximation if
+ possible and otherwise replaced by a placeholder. If a highlighting style
+ definition cannot be generated, it is automatically replaced with the
+ default style if available, and otherwise a built-in style with no syntax
+ highlighting is used.
+
+* File encoding changes:
+
+ - The new `latexminted` executable assumes that LaTeX output files are
+ UTF-8, and saves highlighted code as UTF-8. That is, LaTeX should be
+ configured so that everything is UTF-8.
+
+ - The `encoding` option now defaults to UTF-8. It is only used in decoding
+ files for `\inputminted` and commands based on it.
+
+ - The `outencoding` option is no longer supported.
+
+* Added new options for including ranges of code based on literal string
+ delimiters or regular expressions. These work with all commands and
+ environments, including `\inputminted`.
+
+ - `rangestartstring`: Select code starting with this string.
+
+ - `rangestartafterstring`: Select code starting immediately after this
+ string.
+
+ - `rangestopstring`: Select code ending with this string.
+
+ - `rangestopbeforestring`: Select code ending immediately before this
+ string.
+
+ - `rangeregex`: Select code that matches this regular expression.
+
+ - `rangeregexmatchnumber` [default=`1`]: If there are multiple
+ non-overlapping matches for `rangeregex`, this determines which is
+ used.
+
+ - `rangeregexdotall` [default=`false`]: `.` matches any character
+ including the newline.
+
+ - `rangeregexmultiline` [default=`false`]: `^` and `$` match at
+ internal newlines, not just at the start/end of the string.
+
+ If line numbers are displayed, they are based on the range of code that is
+ selected; code that is discarded in selecting the range is not considered
+ in calculating line numbers.
+
+ String values and regular expressions can be set using text with backslash
+ escapes, in a manner analogous to regular (non-raw) Python strings. Any
+ ASCII symbols and punctuation, including those that have special LaTeX
+ meaning, can be backslash escaped. For example, `rangeregex=\\\\.` is
+ processed like the Python string `"\\\\."`, becoming the literal text
+ `\\.`, which is then interpreted as the regular expression for a literal
+ backslash followed by any character. Alternatively, string values and
+ regular expressions can be set using a single macro that, when fully
+ expanded (`\edef`), gives the desired literal text. For example,
+ `\def\pattern{\detokenize{\\.}}` and then `rangeregex=\pattern` would be
+ equivalent to `rangeregex=\\\\.`.
+
+* There is now official support for custom lexers. Custom lexers that are
+ installed as Pygments [plugins](https://pygments.org/docs/plugins/) have
+ always been supported, since Pygments can find them automatically.
+ However, custom lexers in the form of `*.py` files in the document
+ directory have not officially been supported.
+
+ Custom lexers can be specified in place of builtin lexers. For example,
+ `\inputminted{lexer.py}{<file>}` or
+ `\inputminted{./path/lexer.py:LexerClass}{<file>}`.
+
+ Custom lexers in the form of `*.py` files are not automatically enabled,
+ since they are equivalent to arbitrary code execution and are thus a
+ significant security risk. To enable custom lexers, create a file
+ `.latexminted_config`. This can be in your home directory (as found by
+ Python's `pathlib.Path.home()`) or in `TEXMFHOME`; if this file is found in
+ both locations, settings from the TeX location overwrite settings from the
+ home directory. It is also possible to enable a `.latexminted_config` file
+ in your document directory; see the documentation for
+ `.latexminted_config`. This file must contain data in Python literal,
+ JSON, or TOML format. TOML requires Python >= 3.11. The data must contain
+ an entry equivalent to this Python data:
+ ```
+ {
+ "custom_lexers": {
+ "<lexer file name>": "<SHA-256 hash of lexer file>"
+ }
+ }
+ ```
+ `<lexer file name>` is just the name of the file, with no path or class
+ included. For example, for `./path/lexer.py:LexerClass` it would be just
+ `lexer.py`. Any number of file names and hashes can be provided.
+
+* Enhancements of existing options:
+
+ - `codetagify` now supports comma-delimited lists of strings, not just
+ space-delimited lists (#126).
+
+* New options:
+
+ - `envname`: Name of the environment that wraps typeset code. By default,
+ it is `Verbatim` in block contexts and `VerbEnv` in inline contexts.
+ This is compatible with `fancyvrb`'s `BVerbatim` (#281).
+
+ Implementation note: Code is actually wrapped a `MintedVerbatim`
+ environment, and then this is redefined to be equivalent to `envname`
+ (see the new option `literalenvname`).
+
+ - `literalenvname`: This is the name of the environment that literally
+ appears in highlighted code output as a wrapper around the code. By
+ default it is `MintedVerbatim`. This environment is redefined to be
+ equivalent to the current value of `envname`. There should be few if any
+ situations where modifying `literalenvname` rather than `envname` is
+ actually necessary.
+
+ - `literatecomment`: This is for compatibility with literate programming
+ formats, such as the `.dtx` format commonly used for writing LaTeX
+ packages. If all lines of code begin with `<literatecomment>`, then
+ `<literatecomment>` is removed from the beginning of all lines. For
+ example, for `.dtx`, `literatecomment=\%`.
+
+ - `listparameters`: Previously unsupported `fancyvrb` option (#256).
+
+ - `breakanywhereinlinestretch`: New `fvextra` option.
+
+* `gobble` is now applied to code before syntax highlighting and no longer
+ uses the Pygments `gobble` filter, which operates on the token stream
+ generated by a lexer. This makes `gobble` and `autogobble` behave in the
+ same manner. The Pygments `gobble` filter is still accessible via the new
+ option `gobblefilter` (#379).
+
+* Standard catcodes are now enforced in reading the optional argument of
+ environments that wrap Pygments output. This prevents issues with
+ `babel`'s `magyar` (#382).
+
+
+
+## v2.9 (2023/12/18)
+
+* This is expected to be the last release of `minted` v2.x. If so, it will
+ then become the new package `minted2` for backward compatibility.
+
+* Added new option `ignorelexererrors`. When lexer errors are shown in
+ highlighted output (default), they are typically displayed as red boxes
+ that surround the relevant text. When lexer errors are ignored, the
+ literal text that caused lexer errors is shown but there is no indication
+ that it caused errors (#374).
+
+* There is now a warning if `fvextra` version is less than 1.5.
+
+
+
+## v2.8 (2023/09/12)
+
+* Under non-Windows operating systems, detect executables with `command -v`
+ rather than `which` to provide better cross-platform support (#345).
+
+* Added new package option `inputlanglinenos`. This extends the existing
+ `langlinenos` to cover `\inputminted` as well (#361).
+
+* Improved and updated Pygments documentation (#339).
+
+* Improved `\mintinline` documentation to address packages that redefine
+ `\section` (#368).
+
+* Added support for `fvextra` options `breakafterinrun` and
+ `breakbeforeinrun` (#358). In `fvextra` version 1.5, `breakaftergroup`
+ and `breakbeforegroup` were renamed to `breakafterinrun` and
+ `breakbeforeinrun` to avoid naming ambiguity with new options. The old
+ options `breakaftergroup` and `breakbeforegroup` are no longer supported.
+
+* Added `DEPENDS.txt` (#331).
+
+* Removed unnecessary dependency on `calc` package (#313).
+
+* Added documentation in FAQ about copy and paste limitations (#302).
+
+* Added note on `text` lexer to documentation (#274).
+
+
+
+## v2.7 (2022/12/12)
+
+* Reimplemented `\mintinline` to use `fvextra`'s argument reading and
+ processing macros, and to use `fvextra`'s `\Verb` internally.
+ `\mintinline` now works with all line breaking options supported by
+ `fvextra`'s `\Verb`, including `breakanywhere` (#329, #340). It now
+ gives better results when used inside other commands, since it uses
+ `fvextra`'s retokenization macros. It is now compatible with `hyperref`
+ for PDF strings such as bookmarks.
+
+* Reimplemented `\newmintinline` based on new `\mintinline`.
+
+* Reimplemented `\mint` to use `fvextra`'s argument reading and processing
+ macros. It now gives better results when used inside other commands,
+ since it uses `fvextra`'s retokenization macros. Fixed a bug that caused
+ a continued paragraph after `\mint` to be indented (#218).
+
+* Reimplemented `\newmint` based on new `\mint`. Commands created with
+ `\newmint` can now use curly braces as delimiters, just like `\mint`
+ (#254).
+
+* Settings passed to `pygmentize` as command-line options are now quoted.
+ This prevents `escapeinside` characters from being interpreted as special
+ shell characters (#179, #262).
+
+* Fixed bug with `autogobble` that produced incorrect dedent when using
+ `lastline` with the lines beyond `lastline` having less indentation than
+ the selected range (#326).
+
+* Fixed unintended line breaks after hyphens under LuaTeX (#263).
+
+* Added warning to documentation of `\inputminted` regarding filenames
+ and shell command execution (#338).
+
+
+
+## v2.6 (2021/12/24)
+
+* `autogobble` automatically uses `python` or `python3` executables,
+ depending on availability, instead of requiring `python`. A custom
+ executable can be specified by redefining `\MintedPython` (#277, #287).
+
+* Fixed `autogobble` compatibility with `fancyvrb` 4.0+ (#315, #316).
+
+* Pygments style names may now contain arbitrary non-whitespace characters.
+ Previously, style names containing digits and some punctuation characters
+ were incompatible (#210, #294, #299, #317). Pygments macros are now only
+ defined just before use locally within `minted` commands and environments,
+ rather than globally. Pygments macros now always use a `\PYG` prefix
+ regardless of style, rather than a prefix of the form `\PYG<style>` (for
+ example, what was previously `\PYGdefault` is now simply `\PYG`).
+
+* Removed Python-based MD5 hashing for XeTeX, which was necessary before
+ XeTeX added `\mdfivesum` in 2017.
+
+* The default for `stripnl` is now `false`, so that original code is
+ preserved exactly by default (#198).
+
+* Added support for `fontencoding` option from `fvextra` (#208).
+
+* Added note to FAQ about getting `texi2pdf` to work with `minted` given
+ `texi2pdf`'s assumptions about temp files (#186).
+
+* Reimplemented `bgcolor` option to be compatible with `color` package.
+
+
+
+## v2.5 (2017/07/19)
+
+* The default placement for the `listing` float is now `tbp` instead of `h`,
+ to parallel `figure` and `table` and also avoid warnings caused by `h`
+ (#165). The documentation now contains information about changing default
+ placement. The `float` package is no longer loaded when the `newfloat`
+ package option is used.
+
+* Added support for `*nchars` options from `fvextra` v1.3 that allow setting
+ `breaklines`-related indentation in terms of a number of characters, rather
+ than as a fixed dimension.
+
+* Fixed incompatibility with `babel magyar` (#158).
+
+* Added support for `beamer` overlays with `beameroverlays` option (#155).
+
+* Comments in the Pygments LaTeX style files no longer appear as literal
+ text when `minted` is used in `.dtx` files (#161).
+
+* `autogobble` now works with package option `kpsewhich` (#151). Under
+ Windows, the `kpsewhich` option no longer requires PowerShell.
+
+* Fixed a bug that prevented `finalizecache` from working with `outputdir`
+ (#149).
+
+* Fixed a bug with `firstline` and `lastline` that prevented them from
+ working with the `minted` environment (#145).
+
+* Added note on `breqn` conflicts to FAQ (#163).
+
+
+
+## v2.4.1 (2016/10/31)
+
+* Single quotation marks in `\jobname` are now replaced with underscores in
+ `\minted@jobname` to prevent quoting errors (#137).
+
+* The `autogobble` option now takes `firstline` and `lastline` into account
+ (#130).
+
+* Fixed `numberblanklines`, which had been lost in the transition to v2.0+
+ (#135).
+
+
+
+## v2.4 (2016/07/20)
+
+* Line breaking and all associated options are now completely delegated to
+ `fvextra`.
+
+* Fixed a bug from v2.2 that could cause the first command or environment to
+ vanish when `cache=false` (related to work on `\MintedPygmentize`).
+
+
+
+## v2.3 (2016/07/14)
+
+* The `fvextra` package is now required. `fvextra` extends and patches
+ `fancyvrb`, and includes improved versions of `fancyvrb` extensions that
+ were formerly in `minted`.
+
+* As part of `fvextra`, the `upquote` package is always loaded. `fvextra`
+ brings the new option `curlyquotes`, which allows curly single quotation
+ marks instead of the literal backtick and typewriter single quotation mark
+ produced by `upquote`. This allows the default `upquote` behavior to be
+ disabled when desired.
+
+* Thanks to `fvextra`, the options `breakbefore`, `breakafter`, and
+ `breakanywhere` are now compatible with non-ASCII characters under
+ pdfTeX (#123).
+
+* Thanks to `fvextra`, `obeytabs` no longer causes lines in multi-line
+ comments or strings to vanish (#88), and is now compatible with
+ `breaklines` (#99). `obeytabs` will now always give correct results with
+ tabs used for indentation. However, tab stops are not guaranteed to be
+ correct for tabs in the midst of text.
+
+* `fvextra` brings the new options `space`, `spacecolor`, `tab`, and
+ `tabcolor` that allow these characters and their colors to be redefined
+ (#98). The tab may now be redefined to a flexible-width character such
+ as `\rightarrowfill`. The visible tab will now always be black by default,
+ instead of changing colors depending on whether it is part of indentation
+ for a multiline string or comment.
+
+* `fvextra` brings the new options `highlightcolor` and `highlightlines`,
+ which allow single lines or ranges of lines to be highlighted based on line
+ number (#124).
+
+* `fvextra` brings the new options `numberfirstline`, `stepnumberfromfirst`,
+ and `stepnumberoffsetvalues` that provide better control over line
+ numbering when `stepnumber` is not 1.
+
+* Fixed a bug from v2.2.2 that prevented `upquote` from working.
+
+
+
+## v2.2.2 (2016/06/21)
+
+* Fixed a bug introduced in v2.2 that prevented setting the Pygments style in
+ the preamble. Style definitions are now more compatible with using
+ `\MintedPygmentize` to call a custom `pygmentize`.
+
+
+
+## v2.2.1 (2016/06/15)
+
+* The `shellesc` package is loaded before `ifplatform` and other packages
+ that might invoke `\write18` (#112).
+
+* When caching is enabled, XeTeX uses the new `\mdfivesum` macro from TeX
+ Live 2016 to hash cache content, rather than using `\ShellEscape` with
+ Python to perform hashing.
+
+
+
+## v2.2 (2016/06/08)
+
+* All uses of `\ShellEscape` (`\write18`) no longer wrap file names and paths
+ with double quotes. This allows a cache directory to be specified relative
+ to a user's home directory, for example, `~/minted_cache`. `cachedir` and
+ `outputdir` paths containing spaces will now require explicit quoting of
+ the parts of the paths that contain spaces, since `minted` no longer
+ supplies quoting. See the updated documentation for examples (#89).
+
+* Added `breakbefore`, `breakbeforegroup`, `breakbeforesymbolpre`, and
+ `breakbeforesymbolpost`. These parallel `breakafter*`. It is possible to
+ use `breakbefore` and `breakafter` for the same character, so long as
+ `breakbeforegroup` and `breakaftergroup` have the same setting (#117).
+
+* Added package options `finalizecache` and `frozencache`. These allow the
+ cache to be prepared for (`finalizecache`) and then used (`frozencache`) in
+ an environment in which `-shell-escape`, Python, and/or Pygments are not
+ available. Note that this only works if `minted` content does not need to
+ be modified, and if no settings that depend on Pygments or Python need to
+ be changed (#113).
+
+* Style names containing hyphens and underscores (`paraiso-light`,
+ `paraiso-dark`, `algol_nu`) now work (#111).
+
+* The `shellesc` package is now loaded, when available, for compatibility
+ with LuaTeX 0.87+ (TeX Live 2016+, etc.). `\ShellEscape` is now used
+ everywhere instead of `\immediate\write18`. If `shellesc` is not available,
+ then a `\ShellEscape` macro is created. When `shellesc` is loaded, there
+ is a check for versions before v0.01c to patch a bug in v0.01b (present in
+ TeX Live 2015) (#112).
+
+* The `bgcolor` option now uses the `snugshade*` environment from the `framed`
+ package, so `bgcolor` is now compatible with page breaks. When `bgcolor`
+ is in use, immediately preceding text will no longer push the `minted`
+ environment into the margin, and there is now adequate spacing from
+ surrounding text (#121).
+
+* Added missing support for `fancyvrb`'s `labelposition` (#102).
+
+* Improved fix for TikZ externalization, thanks to Patrick Vogt (#73).
+
+* Fixed `breakautoindent`; it was disabled in version 2.1 due to a bug in
+ `breakanywhere`.
+
+* Properly fixed handling of `\MintedPygmentize` (#62).
+
+* Added note on incompatibility of `breaklines` and `obeytabs` options.
+ Trying to use these together will now result in a package error (#99).
+ Added note on issues with `obeytabs` and multiline comments (#88). Due to
+ the various `obeytabs` issues, the docs now discourage using `obeytabs`.
+
+* Added note to FAQ on `fancybox` and `fancyvrb` conflict (#87).
+
+* Added note to docs on the need for `\VerbatimEnvironment` in environment
+ definitions based on `minted` environments.
+
+
+
+## v2.1 (2015/09/09)
+
+* Changing the highlighting style now no longer involves re-highlighing
+ code. Style may be changed with almost no overhead.
+
+* Improved control of automatic line breaks. New option `breakanywhere`
+ allows line breaks anywhere when `breaklines=true`. The pre-break and
+ post-break symbols for these types of breaks may be set with
+ `breakanywheresymbolpre` and `breakanywheresymbolpost` (#79). New option
+ `breakafter` allows specifying characters after which line breaks are
+ allowed. Breaks between adjacent, identical characters may be controlled
+ with `breakaftergroup`. The pre-break and post-break symbols for these
+ types of breaks may be set with `breakaftersymbolpre` and
+ `breakaftersymbolpost`.
+
+* `breakbytoken` now only breaks lines between tokens that are separated by
+ spaces, matching the documentation. The new option `breakbytokenanywhere`
+ allows for breaking between tokens that are immediately adjacent. Fixed a
+ bug in `\mintinline` that produced a following linebreak when
+ `\mintinline` was the first thing in a paragraph and `breakbytoken` was
+ true (#77).
+
+* Fixed a bug in draft mode option handling for `\inputminted` (#75).
+
+* Fixed a bug with `\MintedPygmentize` when a custom `pygmentize` was
+ specified and there was no `pygmentize` on the default path (#62).
+
+* Added note to docs on caching large numbers of code blocks under OS X (#78).
+
+* Added discussion of current limitations of `texcomments` (#66) and
+ `escapeinside` (#70).
+
+* PGF/Ti*k*Z externalization is automatically detected and supported
+ (#73).
+
+* The package is now compatible with LaTeX files whose names contain spaces (#85).
+
+
+
+## v2.0 (2015/01/31)
+
+* Added the compatibility package `minted1`, which provides the `minted` 1.7
+ code. This may be loaded when 1.7 compatibility is required. This package
+ works with other packages that `\RequirePackage{minted}`, so long as it is
+ loaded first.
+
+* Moved all old `\changes` into `changelog`.
+
+
+
+## Development releases for 2.0 (2014-January 2015)
+
+* Caching is now on by default.
+
+* Fixed a bug that prevented compiling under Windows when file names
+ contained commas.
+
+* Added `breaksymbolleft`, `breaksymbolsepleft`,
+ `breaksymbolindentleft`, `breaksymbolright`, `breaksymbolsepright`,
+ and `breaksymbolindentright` options. `breaksymbol`,
+ `breaksymbolsep`, and `breaksymbolindent` are now aliases for the
+ correspondent `*left` options.
+
+* Added `kpsewhich` package option. This uses `kpsewhich` to locate
+ the files that are to be highlighted. This provides compatibility
+ with build tools like `texi2pdf` that function by modifying
+ `TEXINPUTS` (#25).
+
+* Fixed a bug that prevented `\inputminted` from working with `outputdir`.
+
+* Added informative error messages when Pygments output is missing.
+
+* Added `final` package option (opposite of `draft`).
+
+* Renamed the default cache directory to `_minted-<jobname>` (replaced
+ leading period with underscore). The leading period caused the cache
+ directory to be hidden on many systems, which was a potential source
+ of confusion.
+
+* `breaklines` and `breakbytoken` now work with `\mintinline` (#31).
+
+* `bgcolor` may now be set through `\setminted` and `\setmintedinline`.
+
+* When math is enabled via `texcomments`, `mathescape`, or
+ `escapeinside`, space characters now behave as in normal math by
+ vanishing, instead of appearing as literal spaces. Math need no
+ longer be specially formatted to avoid undesired spaces.
+
+* In default value of `\listoflistingscaption`, capitalized “Listings†so that
+ capitalization is consistent with default values for other lists
+ (figures, tables, algorithms, etc.).
+
+* Added `newfloat` package option that creates the `listing`
+ environment using `newfloat` rather than `float`, thus providing
+ better compatibility with the `caption` package (#12).
+
+* Added support for Pygments option `stripall`.
+
+* Added `breakbytoken` option that prevents `breaklines` from breaking
+ lines within Pygments tokens.
+
+* `\mintinline` uses a `\colorbox` when `bgcolor` is set, to give more
+ reasonable behavior (#57).
+
+* For PHP, `\mintinline` automatically begins with `startinline=true` (#23).
+
+* Fixed a bug that threw off line numbering in `minted` when
+ `langlinenos=false` and `firstnumber=last`. Fixed a bug in `\mintinline` that
+ threw off subsequent line numbering when `langlinenos=false` and
+ `firstnumber=last`.
+
+* Improved behavior of `\mint` and `\mintinline` in `draft` mode.
+
+* The `\mint` command now has the additional capability to take code
+ delimited by paired curly braces `{}`.
+
+* It is now possible to set options only for `\mintinline` using the new
+ `\setmintedinline` command. Inline options override options specified via
+ `\setminted`.
+
+* Completely rewrote option handling. `fancyvrb` options are now handled on the
+ LaTeX side directly, rather than being passed to Pygments and then
+ returned. This makes caching more efficient, since code is no longer
+ rehighlighted just because options changed.
+
+* Fixed buffer size error caused by using `cache` with a very large
+ number of files (#61).
+
+* Fixed `autogobble` bug that caused failure under some operating
+ systems.
+
+* Added support for `escapeinside` (requires Pygments 2.0+; #38).
+
+* Fixed issues with XeTeX and caching (#40).
+
+* The `upquote` package now works correctly with single quotes when
+ using Pygments 1.6+ (#34).
+
+* Fixed caching incompatibility with Linux and OS X under xelatex
+ (#18 and #42).
+
+* Fixed `autogobble` incompatibility with Linux and OS X.
+
+* `\mintinline` and derived commands are now robust, via `\newrobustcmd`
+ from `etoolbox`.
+
+* Unused styles are now cleaned up when caching.
+
+* Fixed a bug that could interfere with caching (#24).
+
+* Added `draft` package option (#39). This typesets all code using
+ `fancyvrb`; Pygments is not used. This trades syntax highlighting
+ for maximum speed in compiling.
+
+* Added automatic line breaking with `breaklines` and related options
+ (#1).
+
+* Fixed a bug with boolean options that needed a False argument to
+ cooperate with `\setminted` (#48).
+
+
+
+## v2.0-alpha3 (2013/12/21)
+
+* Added `autogobble` option. This sends code through Python's
+ `textwrap.dedent()` to remove common leading whitespace.
+
+* Added package option `cachedir`. This allows the directory in which
+ cached content is saved to be specified.
+
+* Added package option `outputdir`. This allows an output directory for
+ temporary files to be specified, so that the package can work with
+ LaTeX's `-output-directory` command-line option.
+
+* The `kvoptions` package is now required. It is needed to process
+ key-value package options, such as the new `cachedir` option.
+
+* Many small improvements, including better handling of paths under
+ Windows and improved key system.
+
+
+
+## v2.0-alpha2 (2013/08/21)
+
+* `\DeleteFile` now only deletes files if they do indeed exist. This
+ eliminates warning messages due to missing files.
+
+* Fixed a bug in the definition of `\DeleteFile` for non-Windows systems.
+
+* Added support for Pygments option `stripnl`.
+
+* Settings macros that were previously defined globally are now defined
+ locally, so that `\setminted` may be confined by `\begingroup...\endgroup`
+ as expected.
+
+* Macro definitions for a given style are now loaded only once per document,
+ rather than once per command/environment. This works even without caching.
+
+* A custom script/executable may now be substituted for `pygmentize` by
+ redefining `\MintedPygmentize`.
+
+
+
+## v2.0alpha (2013/07/30)
+
+* Added the package option `cache`. This significantly increases
+ compilation speed by caching old output. For example, compiling the
+ documentation is around 5x faster.
+
+* New inline command `\mintinline`. Custom versions can be created via
+ `\newmintinline`. The command works inside other commands (for example,
+ footnotes) in most situations, so long as the percent and hash
+ characters are avoided.
+
+* The new `\setminted` command allows options to be specified at the
+ document and language levels.
+
+* All extended characters (Unicode, etc.) supported by `inputenc` now
+ work under the pdfTeX engine. This involved using `\detokenize` on
+ everything prior to saving.
+
+* New package option `langlinenos` allows line numbering to pick up
+ where it left off for a given language when `firstnumber=last`.
+
+* New options, including `style`, `encoding`, `outencoding`,
+ `codetagify`, `keywordcase`, `texcomments` (same as `texcl`),
+ `python3` (for the `PythonConsoleLexer`), and `numbers`.
+
+* `\usemintedstyle` now takes an optional argument to specify the style for a
+ particular language, and works anywhere in the document.
+
+* `xcolor` is only loaded if `color` isn’t, preventing potential
+ package clashes.
+
+
+
+## v1.7 (2011/09/17)
+
+* Options for float placement added [2011/09/12]
+
+* Fixed `tabsize` option [2011/08/30]
+
+* More robust detection of the `-shell-escape` option [2011/01/21]
+
+* Added the `label` option [2011/01/04]
+
+* Installation instructions added [2010/03/16]
+
+* Minimal working example added [2010/03/16]
+
+* Added PHP-specific options [2010/03/14]
+
+* Removed unportable flag from Unix shell command [2010/02/16]
+
+
+## v1.6 (2010/01/31)
+
+* Added font-related options [2010/01/27]
+
+* Windows support added [2010/01/27]
+
+* Added command shortcuts [2010/01/22]
+
+* Simpler versioning scheme [2010/01/22]
+
+
+
+## v0.1.5 (2010/01/13)
+
+* Added `fillcolor` option [2010/01/10]
+
+* Added float support [2010/01/10]
+
+* Fixed `firstnumber` option [2010/01/10]
+
+* Removed `caption` option [2010/01/10]
+
+
+
+## v0.0.4 (2010/01/08)
+
+* Initial version [2010/01/08]
diff --git a/Master/texmf-dist/doc/latex/minted/DEPENDS.txt b/Master/texmf-dist/doc/latex/minted/DEPENDS.txt
index 5c39ebf2e93..9f4eafc4e1d 100644
--- a/Master/texmf-dist/doc/latex/minted/DEPENDS.txt
+++ b/Master/texmf-dist/doc/latex/minted/DEPENDS.txt
@@ -1,15 +1,11 @@
catchfile
etoolbox
float
-framed
fvextra
-ifplatform
-ifthen
-keyval
-kvoptions
-lineno
+latex2pydata
newfloat
pdftexcmds
+pgfkeys
+pgfopts
shellesc
xcolor
-xstring
diff --git a/Master/texmf-dist/doc/latex/minted/README b/Master/texmf-dist/doc/latex/minted/README
index b2a13a8afff..c6c12221145 100644
--- a/Master/texmf-dist/doc/latex/minted/README
+++ b/Master/texmf-dist/doc/latex/minted/README
@@ -8,9 +8,7 @@ See the documentation (minted.pdf) for examples and instructions for
installation and usage.
This work may be distributed and/or modified under the conditions of the
-LaTeX Project Public License (LPPL), version 1.3 or later. Additionally,
-the project may be distributed under the terms of the 3-Clause ("New") BSD
-license.
+LaTeX Project Public License (LPPL), version 1.3c or later.
For suggestions, feature requests, and bug reports, please use the project's
GitHub site: https://github.com/gpoore/minted.
diff --git a/Master/texmf-dist/doc/latex/minted/minted.pdf b/Master/texmf-dist/doc/latex/minted/minted.pdf
index 352f07b6673..9e94c21fc06 100644
--- a/Master/texmf-dist/doc/latex/minted/minted.pdf
+++ b/Master/texmf-dist/doc/latex/minted/minted.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf b/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
index e7f9b4a01ac..a007efaeea8 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
index fc7e8a88f15..4449939a2c6 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex
@@ -3,7 +3,7 @@
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.14, 2024/07/19
+% Version: 1.15, 2024/08/31
%
% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
@@ -17,12 +17,11 @@
lang = en-US,
% pdfversion = 2.0,
% pdfstandard = a-4,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[twoside]{mitthesis} %,fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[twoside]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
@@ -53,12 +52,21 @@
\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
-%\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
-% \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Can set graphicspath to point to specific directories containing figures (the current directory is searched automatically)
@@ -188,10 +196,10 @@
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
- \Acceptor{Primus Castor}{Professor of Wetlands Engineering}{}%{Undergraduate Officer, Department of Physics}
-% \Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
% Valid degree months are February, May, June, or September
@@ -239,7 +247,6 @@
% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
% when the page is too full.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Make titlepage
@@ -250,9 +257,11 @@
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
-
%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
+
% The abstract environment creates all the required headings and footers.
% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
@@ -283,7 +292,7 @@
\appendix
\include{appendixa}
-
+\include{appendixb}
%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixa.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixa.tex
index a7914cb8511..cb61cca4309 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixa.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixa.tex
@@ -5,6 +5,10 @@
\chapter{Code listing}
+This example uses the \texttt{listings} package.
+
+\bigskip
+
\lstdefinestyle{mystyle}{
backgroundcolor=\color{CadetBlue!15!white},
commentstyle=\color{Red3},
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixb.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixb.tex
new file mode 100644
index 00000000000..1d9dd847c07
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/appendixb.tex
@@ -0,0 +1,108 @@
+\chapter{One-term coefficients for heat conduction}
+
+\section{A multipage table of numbers}
+This example uses the \texttt{longtable} package: $\theta = A_1 f_1 \exp(-\lambda_1^2\mkern2mu\textrm{Fo})$, $\overline{\theta} = D_1 \exp(-\lambda_1^2\mkern2mu\textrm{Fo})$.
+
+
+{\footnotesize
+%\newcolumntype{d}[1]{D{.}{.}{#1}} % defined in root .tex file
+\renewcommand{\doublerulesep}{0pt}%
+\newcolumntype{X}{>{\hspace{1ex}}c@{\hspace{2ex}}c@{\hspace{2ex}}c<{\hspace{1ex}}}%
+
+\begin{longtable}{|||d{3.2}|X|X|X|||}
+
+\caption{One-term coefficients for one-dimensional heat conduction with a convective boundary condition. Data follow H. D. Baehr and K. Stephan~\cite{baehr1998}.}%
+
+\\
+\hline\hline\hline
+&&&&&&&&&\\[-7pt]
+& \multicolumn{3}{c|}{\textsf{\textit{Plate}}} & \multicolumn{3}{c|}{\textsf{\textit{Cylinder}}} & \multicolumn{3}{c|||}{\textsf{\textit{Sphere}}}
+\\
+\cline{2-10}
+\multicolumn{1}{|||c|}{\raisebox{1.5ex}[0cm][0cm]{Bi}}
+ & $\lambda_1$\rule[0pt]{0pt}{11pt} & $A_1$ & $D_1$ & $\lambda_1$ & $A_1$ & $D_1$ & $\lambda_1$ & $A_1$ & $D_1$
+\\
+\hline
+\endfirsthead
+\caption[]{(continued)} \\
+\hline\hline\hline
+&&&&&&&&&\\[-7pt]
+& \multicolumn{3}{c|}{\textsf{\textit{Plate}}} & \multicolumn{3}{c|}{\textsf{\textit{Cylinder}}} & \multicolumn{3}{c|||}{\textsf{\textit{Sphere}}}
+\\
+\cline{2-10}
+\multicolumn{1}{|||c|}{\raisebox{1.5ex}[0cm][0cm]{Bi}}
+ & $\lambda_1$\rule[0pt]{0pt}{11pt} & $A_1$ & $D_1$ & $\lambda_1$ & $A_1$ & $D_1$ & $\lambda_1$ & $A_1$ & $D_1$
+\\ \hline
+&&&&&&&&&\\[-1ex]
+\endhead
+\hline\hline\hline
+\endfoot
+\hline\hline\hline
+\endlastfoot
+0.01 & 0.09983 & 1.0017 & 1.0000 & 0.14124 & 1.0025 & 1.0000 & 0.17303 & 1.0030 & 1.0000\rule[0pt]{0pt}{15pt} \\
+0.02 & 0.14095 & 1.0033 & 1.0000 & 0.19950 & 1.0050 & 1.0000 & 0.24446 & 1.0060 & 1.0000 \\
+0.03 & 0.17234 & 1.0049 & 1.0000 & 0.24403 & 1.0075 & 1.0000 & 0.29910 & 1.0090 & 1.0000 \\
+0.04 & 0.19868 & 1.0066 & 1.0000 & 0.28143 & 1.0099 & 1.0000 & 0.34503 & 1.0120 & 1.0000 \\
+0.05 & 0.22176 & 1.0082 & 0.9999 & 0.31426 & 1.0124 & 0.9999 & 0.38537 & 1.0150 & 1.0000 \\
+0.06 & 0.24253 & 1.0098 & 0.9999 & 0.34383 & 1.0148 & 0.9999 & 0.42173 & 1.0179 & 0.9999 \\
+0.07 & 0.26153 & 1.0114 & 0.9999 & 0.37092 & 1.0173 & 0.9999 & 0.45506 & 1.0209 & 0.9999 \\
+0.08 & 0.27913 & 1.0130 & 0.9999 & 0.39603 & 1.0197 & 0.9999 & 0.48600 & 1.0239 & 0.9999 \\
+0.09 & 0.29557 & 1.0145 & 0.9998 & 0.41954 & 1.0222 & 0.9998 & 0.51497 & 1.0268 & 0.9999 \\
+0.10 & 0.31105 & 1.0161 & 0.9998 & 0.44168 & 1.0246 & 0.9998 & 0.54228 & 1.0298 & 0.9998 \\[6pt]
+%
+0.15 & 0.37788 & 1.0237 & 0.9995 & 0.53761 & 1.0365 & 0.9995 & 0.66086 & 1.0445 & 0.9996 \\*
+0.20 & 0.43284 & 1.0311 & 0.9992 & 0.61697 & 1.0483 & 0.9992 & 0.75931 & 1.0592 & 0.9993 \\
+0.25 & 0.48009 & 1.0382 & 0.9988 & 0.68559 & 1.0598 & 0.9988 & 0.84473 & 1.0737 & 0.9990 \\
+0.30 & 0.52179 & 1.0450 & 0.9983 & 0.74646 & 1.0712 & 0.9983 & 0.92079 & 1.0880 & 0.9985 \\
+0.40 & 0.59324 & 1.0580 & 0.9971 & 0.85158 & 1.0931 & 0.9970 & 1.05279 & 1.1164 & 0.9974 \\
+0.50 & 0.65327 & 1.0701 & 0.9956 & 0.94077 & 1.1143 & 0.9954 & 1.16556 & 1.1441 & 0.9960 \\
+0.60 & 0.70507 & 1.0814 & 0.9940 & 1.01844 & 1.1345 & 0.9936 & 1.26440 & 1.1713 & 0.9944 \\
+0.70 & 0.75056 & 1.0918 & 0.9922 & 1.08725 & 1.1539 & 0.9916 & 1.35252 & 1.1978 & 0.9925 \\
+0.80 & 0.79103 & 1.1016 & 0.9903 & 1.14897 & 1.1724 & 0.9893 & 1.43203 & 1.2236 & 0.9904 \\
+0.90 & 0.82740 & 1.1107 & 0.9882 & 1.20484 & 1.1902 & 0.9869 & 1.50442 & 1.2488 & 0.9880 \\[6pt]
+%
+1.00 & 0.86033 & 1.1191 & 0.9861 & 1.25578 & 1.2071 & 0.9843 & 1.57080 & 1.2732 & 0.9855 \\*
+1.10 & 0.89035 & 1.1270 & 0.9839 & 1.30251 & 1.2232 & 0.9815 & 1.63199 & 1.2970 & 0.9828 \\
+1.20 & 0.91785 & 1.1344 & 0.9817 & 1.34558 & 1.2387 & 0.9787 & 1.68868 & 1.3201 & 0.9800 \\
+1.30 & 0.94316 & 1.1412 & 0.9794 & 1.38543 & 1.2533 & 0.9757 & 1.74140 & 1.3424 & 0.9770 \\
+1.40 & 0.96655 & 1.1477 & 0.9771 & 1.42246 & 1.2673 & 0.9727 & 1.79058 & 1.3640 & 0.9739 \\
+1.50 & 0.98824 & 1.1537 & 0.9748 & 1.45695 & 1.2807 & 0.9696 & 1.83660 & 1.3850 & 0.9707 \\
+1.60 & 1.00842 & 1.1593 & 0.9726 & 1.48917 & 1.2934 & 0.9665 & 1.87976 & 1.4052 & 0.9674 \\
+1.70 & 1.02725 & 1.1645 & 0.9703 & 1.51936 & 1.3055 & 0.9633 & 1.92035 & 1.4247 & 0.9640 \\*
+1.80 & 1.04486 & 1.1695 & 0.9680 & 1.54769 & 1.3170 & 0.9601 & 1.95857 & 1.4436 & 0.9605 \\*
+1.90 & 1.06136 & 1.1741 & 0.9658 & 1.57434 & 1.3279 & 0.9569 & 1.99465 & 1.4618 & 0.9570 \\[6pt]
+%
+2.00 & 1.07687 & 1.1785 & 0.9635 & 1.59945 & 1.3384 & 0.9537 & 2.02876 & 1.4793 & 0.9534 \\*
+2.20 & 1.10524 & 1.1864 & 0.9592 & 1.64557 & 1.3578 & 0.9472 & 2.09166 & 1.5125 & 0.9462 \\
+2.40 & 1.13056 & 1.1934 & 0.9549 & 1.68691 & 1.3754 & 0.9408 & 2.14834 & 1.5433 & 0.9389 \\
+2.60 & 1.15330 & 1.1997 & 0.9509 & 1.72418 & 1.3914 & 0.9345 & 2.19967 & 1.5718 & 0.9316 \\
+2.80 & 1.17383 & 1.2052 & 0.9469 & 1.75794 & 1.4059 & 0.9284 & 2.24633 & 1.5982 & 0.9243 \\
+3.00 & 1.19246 & 1.2102 & 0.9431 & 1.78866 & 1.4191 & 0.9224 & 2.28893 & 1.6227 & 0.9171 \\
+3.50 & 1.23227 & 1.2206 & 0.9343 & 1.85449 & 1.4473 & 0.9081 & 2.38064 & 1.6761 & 0.8995 \\
+4.00 & 1.26459 & 1.2287 & 0.9264 & 1.90808 & 1.4698 & 0.8950 & 2.45564 & 1.7202 & 0.8830 \\*
+4.50 & 1.29134 & 1.2351 & 0.9193 & 1.95248 & 1.4880 & 0.8830 & 2.51795 & 1.7567 & 0.8675 \\*
+5.00 & 1.31384 & 1.2402 & 0.9130 & 1.98981 & 1.5029 & 0.8721 & 2.57043 & 1.7870 & 0.8533 \\[6pt]
+%
+6.00 & 1.34955 & 1.2479 & 0.9021 & 2.04901 & 1.5253 & 0.8532 & 2.65366 & 1.8338 & 0.8281 \\*
+7.00 & 1.37662 & 1.2532 & 0.8932 & 2.09373 & 1.5411 & 0.8375 & 2.71646 & 1.8673 & 0.8069 \\
+8.00 & 1.39782 & 1.2570 & 0.8858 & 2.12864 & 1.5526 & 0.8244 & 2.76536 & 1.8920 & 0.7889 \\
+9.00 & 1.41487 & 1.2598 & 0.8796 & 2.15661 & 1.5611 & 0.8133 & 2.80443 & 1.9106 & 0.7737 \\
+10.00 & 1.42887 & 1.2620 & 0.8743 & 2.17950 & 1.5677 & 0.8039 & 2.83630 & 1.9249 & 0.7607 \\
+12.00 & 1.45050 & 1.2650 & 0.8658 & 2.21468 & 1.5769 & 0.7887 & 2.88509 & 1.9450 & 0.7397 \\
+14.00 & 1.46643 & 1.2669 & 0.8592 & 2.24044 & 1.5828 & 0.7770 & 2.92060 & 1.9581 & 0.7236 \\
+16.00 & 1.47864 & 1.2683 & 0.8541 & 2.26008 & 1.5869 & 0.7678 & 2.94756 & 1.9670 & 0.7109 \\*
+18.00 & 1.48830 & 1.2692 & 0.8499 & 2.27556 & 1.5898 & 0.7603 & 2.96871 & 1.9734 & 0.7007 \\*
+20.00 & 1.49613 & 1.2699 & 0.8464 & 2.28805 & 1.5919 & 0.7542 & 2.98572 & 1.9781 & 0.6922 \\[6pt]
+%
+25.00 & 1.51045 & 1.2710 & 0.8400 & 2.31080 & 1.5954 & 0.7427 & 3.01656 & 1.9856 & 0.6766 \\*
+30.00 & 1.52017 & 1.2717 & 0.8355 & 2.32614 & 1.5973 & 0.7348 & 3.03724 & 1.9898 & 0.6658 \\
+35.00 & 1.52719 & 1.2721 & 0.8322 & 2.33719 & 1.5985 & 0.7290 & 3.05207 & 1.9924 & 0.6579 \\
+40.00 & 1.53250 & 1.2723 & 0.8296 & 2.34552 & 1.5993 & 0.7246 & 3.06321 & 1.9942 & 0.6519 \\
+50.00 & 1.54001 & 1.2727 & 0.8260 & 2.35724 & 1.6002 & 0.7183 & 3.07884 & 1.9962 & 0.6434 \\
+60.00 & 1.54505 & 1.2728 & 0.8235 & 2.36510 & 1.6007 & 0.7140 & 3.08928 & 1.9974 & 0.6376 \\
+80.00 & 1.55141 & 1.2730 & 0.8204 & 2.37496 & 1.6013 & 0.7085 & 3.10234 & 1.9985 & 0.6303 \\
+100.00 & 1.55525 & 1.2731 & 0.8185 & 2.38090 & 1.6015 & 0.7052 & 3.11019 & 1.9990 & 0.6259 \\*
+200.00 & 1.56298 & 1.2732 & 0.8146 & 2.39283 & 1.6019 & 0.6985 & 3.12589 & 1.9998 & 0.6170 \\*
+\infty & 1.57080 & 1.2732 & 0.8106 & 2.40483 & 1.6020 & 0.6917 & 3.14159 & 2.0000 & 0.6079 \\[3pt]
+\end{longtable}
+}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/committee_members.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/committee_members.tex
new file mode 100644
index 00000000000..b09f276c8b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/committee_members.tex
@@ -0,0 +1,69 @@
+% Sample thesis committee page for mitthesis.cls
+% Version 1.00, 2024/08/24
+%
+% This page is not required by the MIT Libraries, but some departments require it
+%
+% Insert between title page and abstract page.
+% Format this page in any way that you like.
+% Add supervisor titles, degrees, and departments as appropriate
+
+%%%%% FORMATTING COMMANDS %%%%%%%%%%%%%%%%%%
+
+%% Format title
+\NewDocumentCommand\CommitteePageTitle{m}{
+ \vspace*{75pt}%36pt}
+ \IfPackageLoadedTF{microtype}
+ {\textls*{\Large\textbf{\MakeUppercase{#1}}}}
+ {{\Large\textbf{\MakeUppercase{#1}}}}%
+ \pdfbookmark[0]{#1}{Committee}%
+ \vspace*{10pt}%
+}
+% \textls* produces additional letter separation (appropriate for capitalized display text),
+% PROVIDED THAT \usepackage{microtype} has been loaded in the preamble.
+% The extra space added is 100/1000 em (adjustable, see package documentation).
+
+%% Format committee member subheadings
+\NewDocumentCommand\Role{m}{
+ \vspace*{50pt}%25pt}
+ \IfPackageLoadedTF{microtype}
+ {\textls*{\large{\textsc{#1}}}}
+ {{\large\textsc{#1}}}%
+ \vspace*{12pt}%
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{flushright}
+
+\CommitteePageTitle{Thesis committee}
+
+\Role{Thesis Supervisor}
+
+ \textbf{Marcus Gavius Apicius} \\
+ {\itshape
+ Professor of Cooking Arts \\
+ Department of Food Science \\
+ }
+
+\Role{Thesis Readers}
+
+ \textbf{Marie-Antoine Carême} \\
+ {\itshape
+ Professor of Haute Cuisine \\
+ Department of Food Science \\[18pt]
+ }
+
+ \textbf{Julia Child}\\
+ {\itshape
+ Professor of French Cuisine \\
+ Department of Food Science \\[18pt]
+ }
+
+ \textbf{Magnus Dicen, Ph.D.} \\
+ {\itshape
+ Gloriosus Professor of Personal Pronouns \\
+ Department of Rhetoric \\
+ }
+
+\end{flushright}
+
+\cleardoublepage
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
index 8795eb547e0..bc7ba62c916 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-defaultfonts.tex
@@ -1,16 +1,16 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-defaultfonts.tex}[2023/09/12 v1.03 Load Computer/Latin Modern text and math fonts]
+\ProvidesFile{mitthesis-defaultfonts.tex}[2024/06/28 v1.04 Load Computer/Latin Modern text and math fonts]
%% Default fonts
%
\ifpdftex
- \typeout{^^JLoading Computer Modern text and math fonts (default for pdftex).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Computer Modern text and math fonts (default for pdftex)}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading Latin Modern text and math fonts (default for unicode engines).^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Latin Modern text and math fonts (default for unicode engines)}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
index 01fa981d78b..ebba9ab190a 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-fira-newtxsf.tex
@@ -1,19 +1,19 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-fira-newtxsf.tex}[2023/09/12 v1.04 Load Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font]
+\ProvidesFile{mitthesis-fira-newtxsf.tex}[2024/06/28 v1.05 Load Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font]
%% Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font
%
\ifpdftex
- \typeout{^^JLoading Fira sans text font with newtx sans serif math font and Inconsolata typewriter^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Fira sans text font with newtx sans serif math font and Inconsolata typewriter}
\RequirePackage[sfdefault,scaled=0.90]{FiraSans} % sans serif text package %,scaled=.85
\RequirePackage[T1]{fontenc}
\RequirePackage[varqu,varl,scaled=1.05]{zi4} % inconsolata font for typewriter
\RequirePackage[scaled=1.05]{newtxsf} % sans serif math
\RequirePackage{bm}
\else
- \ClassWarning{mitnewthesis}{The fira-newtxsf font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The fira-newtxsf font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
index 26ee2ab07bc..1535771f11f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-heros-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-heros-stix2.tex}[2023/09/12 v1.02 Load TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font]
+\ProvidesFile{mitthesis-heros-stix2.tex}[2024/06/28 v1.03 Load TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font]
%% TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JTeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{TeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
index 57cf26f915b..41b2f561dff 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-libertine.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-libertine.tex}[2023/09/12 v1.02 Load Libertine and related fonts]
+\ProvidesFile{mitthesis-libertine.tex}[2024/06/28 v1.03 Load Libertine and related fonts]
%% Linux Libertine (serif) text font with newtxmath[libertine] (pdftex) or Libertinus (unicode) math font
%
@@ -10,7 +10,7 @@
% install these as system fonts on your computer
%
\ifpdftex
- \typeout{^^JLoading newtx-libertine text and math fonts with Insolata typewriter font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading newtx-libertine text and math fonts with Insolata typewriter font}
\RequirePackage[lining,semibold]{libertine}
\RequirePackage[T1]{fontenc}
\RequirePackage[varqu,varl]{inconsolata}% typewriter
@@ -18,7 +18,7 @@
\RequirePackage[libertine,vvarbb]{newtxmath}
\RequirePackage{bm}% load after all math to give access to bold math
\else
- \typeout{^^JLoading Linux Libertine (serif) text font with Libertinus math font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading Linux Libertine (serif) text font with Libertinus math font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
index 6466c369294..e18c72fd924 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-lucida.tex
@@ -1,11 +1,11 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-lucida.tex}[2023/09/12 v1.02 Load Lucida fonts]
+\ProvidesFile{mitthesis-lucida.tex}[2024/06/28 v1.03 Load Lucida fonts]
%% Lucida Bright and Lucida Bright Math fonts (available from the TeX Users Group)
-\typeout{^^JLucida Bright and Lucida Bright Math fonts^^J}
+\ClassNoteNoLine{\ClassName}{Lucida Bright and Lucida Bright Math fonts}
\ifpdftex
\RequirePackage[LY1]{fontenc}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
index 03d62286e2c..b76428f383f 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx-sans-text.tex
@@ -1,11 +1,12 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-newtx-sans-text.tex}[2023/10/03 v1.03 Load newtx sans-serif text and regular math fonts]
+\ProvidesFile{mitthesis-newtx-sans-text.tex}[2024/06/68 v1.04 Load newtx sans-serif text and regular math fonts]
%% newtx package with sans-serif text (Helvetica-like text with Times-like math)
%
\ifpdftex
+ \ClassNoteNoLine{\ClassName}{Loading newtx sans-serif text and newtx serif math fonts}
\RequirePackage[T1]{fontenc}
\RequirePackage[subscriptcorrection,varvw,helvratio=0.91,defaultsups]{newtx}% upint for upright integrals
\AtEndPreamble{% added to accommodate v1.731 of newtx, 2023/11/03
@@ -17,7 +18,7 @@
% \DeclareFontFamily{\encodingdefault}{\ttdefault}{\hyphenchar\font=`\-} %
\RequirePackage{bm}% bold math
\else
- \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
index cc43427055b..b1541bbd051 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-newtx.tex
@@ -1,17 +1,17 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-newtx.tex}[2023/09/12 v1.03 Load newtx text and math fonts]
+\ProvidesFile{mitthesis-newtx.tex}[2024/06/28 v1.04 Load newtx text and math fonts]
\ifpdftex
- \typeout{^^JLoading newtx fonts with inconsolata typewriter^^J}
+ \ClassNoteNoLine{\ClassName}{Loading newtx fonts with inconsolata typewriter}
\RequirePackage[T1]{fontenc}
\RequirePackage[subscriptcorrection,varvw,helvratio=0.91]{newtx}% stix2, upint
\RequirePackage[varl,varqu,hyphenate,mono]{inconsolata}% sans typewriter font; mono = fixed word spacing, hyphenate = allow hyphenation
\RequirePackage{bm}
\let\textsuperscript\textsu% newtx changes the default superiors font; this is needed to get commas aligned in sequential footnotes
\else
- \ClassWarning{mitnewthesis}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math.
% Unicode-math loads the fontspec package, but the default fonts are not selected by fontspec in this case.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
index de3983fe4ee..c178ff233fa 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-stix2.tex}[2023/09/12 v1.03 Load STIX Two text and math fonts]
+\ProvidesFile{mitthesis-stix2.tex}[2024/06/28 v1.04 Load STIX Two text and math fonts]
%% STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{Loading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
index 1e65724cc0b..ed2abc16557 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes-stix2.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-termes-stix2.tex}[2023/09/12 v1.03 Load TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font]
+\ProvidesFile{mitthesis-termes-stix2.tex}[2024/10/28 v1.04 Load TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font]
%% TeX Gyre Termes text font and Heros sans serif font with STIX2 math font and Inconsolata monospaced font
%
@@ -12,11 +12,11 @@
% Install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font.^^J}
+ \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font}
%
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
index 64fffb92643..fd1e15bab87 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/fontsets/mitthesis-termes.tex
@@ -1,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-termes.tex}[2023/09/12 v1.03 Load TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font]
+\ProvidesFile{mitthesis-termes.tex}[2024/06/28 v1.04 Load TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font]
%% TeX Gyre Termes (Times-like) text font with Termes math font and Heros sans serif font and Cursor monospaced font
%
@@ -9,11 +9,11 @@
% install these as system fonts on your computer
%
\ifpdftex
- \ClassWarning{mitnewthesis}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{\ClassName}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \typeout{^^JLoading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font^^J}
+ \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font}
\RequirePackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math}
% suppress tiresome warnings about lack of integration between mathtools and unicode-math
% unicode-math loads the fontspec package
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mitthesis-sample.bib b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mitthesis-sample.bib
index 1131bed50dc..98ba37532e7 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mitthesis-sample.bib
+++ b/Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/mitthesis-sample.bib
@@ -1,6 +1,6 @@
%% Sample bibliography file for mitthesis.cls
%%
-%% Revised: 12 September 2023
+%% Revised: 01 August 2024
%% Copyright John H. Lienhard, MIT
%% Offered under the MIT license: https://ctan.org/license/mit
@@ -322,4 +322,14 @@
address = {San Francisco, CA},
month = sep,
}
+
+@book{baehr1998,
+ author ={H. D. Baehr and K. Stephan},
+ title = {Heat and Mass Transfer},
+ publisher = {Springer-Verlag},
+ address = {Berlin},
+ year = {1998},
+ isbn = {3-540-63695-1},
+}
+
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/mitthesis/README.md b/Master/texmf-dist/doc/latex/mitthesis/README.md
index 9d2918ca360..3a307488628 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/README.md
+++ b/Master/texmf-dist/doc/latex/mitthesis/README.md
@@ -1,7 +1,7 @@
#mitthesis --- A LaTeX template for an MIT thesis#
- v1.14 dated 2024/07/19
+ v1.16 dated 2024/09/06
####Overview####
This class provides a LaTeX template to format an MIT thesis according to
@@ -26,8 +26,10 @@
abstract.tex -- put your abstract in this file
acknowledgments.tex -- put your acknowledgments in this file
biosketch.tex -- put your biosketch in this file (optional)
- chapter1.tex -- put your first chapter in this file (etc.)
- appendixa.tex -- put your first appendix in this file (etc.)
+ chapter1.tex -- sample first chapter
+ committee_members.tex -- sample thesis committee members page (optional)
+ appendixa.tex -- sample appendix with code listing
+ appendixb.tex -- sample appendix with multipage table
mitthesis-sample.bib -- a sample bibliography file with many examples
mydesign.tex -- an optional file to load packages for document design
fontsets/ -- a subdirectory of input files that load optional fonts
@@ -53,8 +55,21 @@
---
####Change log####
+
+ v1.16 (06 September 2024)
+ - Same as v1.15, but now with the correct version of MIT-Thesis.tex
+
+ v1.15 (31 August 2024)
+ - add an example for the longtable package (App. B)
+ - add sample Thesis Committee page (optional)
+ - load microtype package, enable tracking for capitalized strings (degree name[s], institution name)
+ - fix typo in MIT-Thesis.tex
+ - edit documentation
+ - edit pdfauthor string to separator authors with semicolon, not comma (per Dublin Core recommendation)
+ - define \\@author and \\@title in case needed
+
v1.14 (19 July 2024)
- - add backward compatibility code for \\text_titlecase_all:n
+ - add backward compatibility code for \\text\_titlecase\_all:n
- adjust supervisor and acceptor titles used on sample cover pages
- format J/psi as \\symbfit in sample chapter 1 and regenerate font samples
- edit documentation
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
index 97243bde84e..ef504238422 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
index cc3e40ce75e..ab8796fe83b 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
index c09afd43ee7..888046a1d80 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
index 418bf7e8d3a..ab8fa1531fb 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
index 43081a36f02..e81c2109522 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
index d21ca4d0578..5bd39289573 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
index 45952c0c528..2ccbde4b1de 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
index 0792ee30f92..d13e8a05c4d 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
index 80b8e07d107..5601e9541a0 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
index 90dfd3ab31a..0451bdf8809 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
index b6480ef9527..33fa1e5d3a6 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Defaultfonts.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +308,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
index f2c8ed11584..c574f2bf8c4 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Fira_Newtxsf.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=fira-newtxsf]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=fira-newtxsf]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
+
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
-
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
-
+\include{appendixa}
+\include{appendixb}
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -252,8 +303,12 @@
\printbibliography[title={\refname},heading=bibintoc]
+% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
+% see the biblatex manual, section 3.14.3
+
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
index 7e914bfa38e..8d39d55b8a9 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Heros-Stix2.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=heros-stix2]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=heros-stix2]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
+
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,67 +217,98 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
% change "backmatter" to "chapter" if you prefer a bold face entry in the table of contents
-{ \raggedright% to avoid stretched white space and split urls; DELETE THIS if you prefer justified text
-%
\printbibliography[title={\refname},heading=bibintoc]
-}
+
% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
% see the biblatex manual, section 3.14.3
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
index 9198d8a489f..eb0798989ef 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Libertine.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=libertine]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=libertine]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +308,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
index 3fd445d4ff2..9c7284cd7c3 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Lucida.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=lucida]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=lucida]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +308,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
index 9729118c307..11edff3cdc4 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx-sans-text.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=newtx-sans-text]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=newtx-sans-text]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
+
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
-
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
-
+\include{appendixa}
+\include{appendixb}
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -252,8 +303,12 @@
\printbibliography[title={\refname},heading=bibintoc]
+% biblatex also supports chapter-by-chapter bibliography, https://tex.stackexchange.com/a/296502/119566
+% see the biblatex manual, section 3.14.3
+
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
index e2cebe98acb..d755977cb5e 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Newtx.tex
@@ -1,12 +1,11 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +15,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=newtx]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=newtx]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +40,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +80,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +111,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +124,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +150,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +176,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +190,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +216,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +307,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
index beacdde0a3e..18b95f79ec3 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/README_font_sample_sources.txt
@@ -6,11 +6,16 @@ These font sample files call the following additional files as inputs:
abstract.tex
acknowledgments.tex
appendixa.tex
+appendixb.tex
biography.tex
chapter1.tex
+committee_members.tex
mitthesis-sample.bib
mydesign.tex
All of those files are in the directory mitthesis/MIT-thesis-template.
You should also copy the fontsets directory (and mitthesis.cls) into this folder.
+
+Run as % ./compile-font-samples.sh
+
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
index 6fe4965432f..aabac07cda7 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Stix2.tex
@@ -1,12 +1,12 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
+% !BIB program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +16,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=stix2]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=stix2]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +41,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +81,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +112,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +125,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +151,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +177,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +191,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +217,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +308,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
index 3bbf3c83336..3b17a9c4cdf 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes-stix2.tex
@@ -1,12 +1,11 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +15,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=termes-stix2]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=termes-stix2]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +40,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +80,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +111,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +124,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +150,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +176,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +190,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +216,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +307,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
index 92a905fe998..6733f96f130 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/Termes.tex
@@ -1,12 +1,11 @@
% !TEX encoding = UTF-8 Unicode
-% !BIB TS-program = biber
-% !BIB program = biber
+% !BIB TS-program = biber
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.06, 2023/08/28
+% Version: 1.15, 2024/08/31
%
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation is here: https://ctan.org/pkg/mitthesis
@@ -16,19 +15,21 @@
pdfstandard = a-2b,
pdfversion = 1.7,
lang = en-US,
-% debug = {xmp-export}, % uncomment to output a separate xmpi file showing the metadata
+% pdfversion = 2.0,
+% pdfstandard = a-4,
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[fontset=termes]{mitthesis} %,fontset=libertine ,fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
+\documentclass[fontset=termes]{mitthesis}% fontset=newtx, fontset=libertine, fontset=newtx-sans-text, fontset=heros-stix2, fontset=stix2
%
% option [twoside] gives facing-page behavior for printing; omitting twoside will eliminate even-numbered blank pages.
% option [lineno] provides line numbers, as for editing
% option [mydesign] loads packages for color, title and list formats, margins, or captions: edit mydesign.tex to change defaults.
% option [fontset] is a keyvalue which can be:
-% pdftex or unicode engines: defaultfonts, libertine, lucida
-% pdftex only: fira-newtxsf, newtx, newtx-sans-text
-% unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
+% for pdftex or unicode engines: defaultfonts, libertine, lucida
+% for pdftex only: fira-newtxsf, newtx, newtx-sans-text
+% for unicode engines (luatex): heros-stix2, stix2, termes, termes-stix2
% if no key value is given, fonts default to CMR (pdftex) or LMR (unicode), i.e., "the LaTeX font".
% You can edit the fontset files or you can write your own, myfonts.tex, and do [fontset=myfonts].
% If you are using multiple languages, load the babel package in your fontset file, before the fonts.
@@ -39,12 +40,32 @@
\usepackage{listings}% documentation is here https://ctan.org/pkg/listings
%% Set chemical formulas nicely
-\usepackage[version=4]{mhchem}% documentation is here https://ctan.org/pkg/mhchem
+\usepackage[version=4]{mhchem}% documentation at https://ctan.org/pkg/mhchem
-%% Latin filler used in Chapter 1, with a test for package version date. https://ctan.org/pkg/lipsum
+%% Latin filler used in Chapter 1, with a test for package version date (https://ctan.org/pkg/lipsum)
\usepackage{lipsum}
\IfPackageAtLeastTF{lipsum}{2021/09/20}{\setlipsum{auto-lang=false}}{}
+%% Table related packages
+
+\usepackage{booktabs}% publication quality tables (https://ctan.org/pkg/booktabs)
+
+\usepackage{array}% Additional options for column formats (https://ctan.org/pkg/array)
+
+\usepackage{dcolumn}% For alignment of numbers on the decimal place (https://ctan.org/pkg/dcolumn)
+ \newcolumntype{d}[1]{D{.}{.}{#1}}% use with dcolumn package
+ % syntax: d{x.y} where x is max number of digits before decimal and y is max number after.
+
+% Package for multipage table in Appendix B.
+\usepackage{longtable}% typeset multi-page tables (https://ctan.org/pkg/longtable)
+
+%\usepackage{tabularx}% adjustable-width columns in tabular (https://ctan.org/pkg/tabularx)
+
+
+%% Package for improved typography
+
+\usepackage{microtype}% typographic fine-tuning, used in sample thesis committee page, but also acting globally on the text
+
%%%%%%%%% Graphics path (to figure files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -59,16 +80,26 @@
%% Numerical citations of references
\usepackage[style=ext-numeric-comp,giveninits=true,maxbibnames=10,sorting=none]{biblatex}
+%% IEEE style citations and references
+% \usepackage[style=ieee,maxbibnames=10,sorting=none]{biblatex}% style=ext-numeric-comp,articlein=false,giveninits=true
+% \DefineBibliographyStrings{english}{url= \textsc{url} , }% replaces the IEEE default "[Online]. Available" by "URL"
-\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <================= CHANGE
+%% author-year style citations and references
+%% use \parencite, not \cite, when you want "(Author, year)"
+%% The sample files are not set up to include parentheses.
+% \usepackage[style=authoryear, maxbibnames=10]{biblatex}
-%% These two commands enable line breaks in long URLs in the bibliography (delete if you don't want that)
-\setcounter{biburllcpenalty}{7000}
-\setcounter{biburlucpenalty}{8000}
-% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
-% documentation is here: https://ctan.org/pkg/biblatex
+\addbibresource{mitthesis-sample.bib}%% <== change to YOUR bib file <= CHANGE
+%% to avoid split urls and stretched white space, you can set the bibliography ragged-right:
+%\appto{\bibsetup}{\raggedright}
+
+%% biblatex is very powerful, and you can customize most aspects the reference list and citations to suit your needs.
+%% documentation is here: https://ctan.org/pkg/biblatex
+%% cheat sheet is here: https://tug.ctan.org/info/biblatex-cheatsheet/biblatex-cheatsheet.pdf
+
+%% To ensure citations are set, run Latex --> biblatex/biber --> Latex again
%%%%%%%%%% Option to use natbib %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,19 +111,9 @@
%%% You can use this to rename the bibliography section
%\renewcommand{\bibname}{References}
-%%% Can adjust space between bibliography items (change 4pt to something else; don't drop last two lengths, they are stretchable "glue")
+%%% To adjust space between bibliography items
%\setlength\bibsep{4pt plus 1pt minus 1pt}
-
-
-%%%%%%%%%% Table related packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{booktabs}% better quality tables, https://ctan.org/pkg/booktabs
-\usepackage{array}% additional options for table columns, https://ctan.org/pkg/array
-
-%\usepackage{tabularx}% https://ctan.org/pkg/tabularx
-
-%\usepackage{dcolumn}% alignment on decimal place, https://ctan.org/pkg/dcolumn
-%\newcolumntype{d}[1]{D{.}{.}{#1}}
+% change 4pt to something else; don't drop last two lengths (they are stretchable "glue")
%%%%%%%%%% Option for "double spacing" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -103,18 +124,18 @@
%% to change the line separation, the most attractive results will be obtained by changing the
%% leading in proportion to the the current font size, rather than just doubling the space.
-%% The setspace package provides a tool for changing line separation (use thesetwo here)
+%% The setspace package provides a tool for changing line separation. Use these two commands here:
%
% \usepackage{setspace}% documentation at https://ctan.org/pkg/setspace
% \setstretch{1.1}% you can choose some other value for the stretch of space between lines
%
-%% Use the these commands AFTER the frontmatter
+%% Use one or more of the these commands *AFTER* the frontmatter
%
% \onehalfspacing
% \doublespacing
% \singlespacing % will turn these effects off (you can use these anywhere in the document)
-%% The best result may be to stay with leading selected by the typographer who set up the font.
+%% The best result is usually to stay with leading selected by the typographer who set up the font.
%%%%%%%%%%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,7 +150,7 @@
pdfkeywords={Massachusetts Institute of Technology, MIT},
% Add keywords that will help search engines and libraries to find your work.
% Includes the name[s] of the author[s]
- % (If you have used \DocumentMetadata, at line 15, you can just put "\CopyrightAuthor," for the names.)
+ % (If you used \DocumentMetadata at line 14, you can just put "\CopyrightAuthor," for the names.)
%
pdfurl={},
% If you have a url for the thesis, put it here. Otherwise delete this.
@@ -155,11 +176,11 @@
% \Author{Author full name}{Author department}[Author's first PREVIOUS degree][Author's second PREVIOUS degree][...
% Note that third, fourth, fifth, and sixth arguments are optional [] and may be omitted
-% note on names: most of the following names are made up; Silas Holman was a professor at MIT in the 19th century.
+% note on names: most of the following names are made up; Silas Holman was a physics professor at MIT in the 19th century.
-\Author{Silas W. Holman}{Department of Physics}%[B.S. Physics, MIT, 1876][MBA, Ferengi School of Management, 2022]
-%\Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
-%\Author{Thurston Howell III}{Department of Economics}
+\Author{Silas W. Holman}{Department of Physics}
+% \Author{Luisa Hernández}{Department of Research}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020]
+% \Author{Thurston Howell III}{Department of Economics}[MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -169,22 +190,19 @@
% If there is more than one supervisor, use the \Supervisor command for each.
\Supervisor{Edward C. Pickering}{Professor of Physics}
-%\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+% \Supervisor{Edward C. Pickering}{Professor of Physics, and \\ \> Professor of Something Else}
+% \Supervisor{Secunda Castor}{Professor of Research}
+% \Supervisor{Quintus Castor}{Professor of Log Dams}
% Professor who formally accepts theses for your department (e.g., the Graduate Officer, Professor Sméagol,...)
% If more than one department, use more than once
-% **If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank {}.**
-\Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
-%\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research}
-%\Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
-
-% If your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
+\Acceptor{Tertius Castor}{Professor of Log Dams}{Graduate Officer, Department of Research} % \\ \> Third title}
+% \Acceptor{Quarta Castor}{Professor of Lodge Building}{Graduate Officer, Department of Mechanical Engineering}
+%%% If you need to reduce vertical space, put the acceptor title in the second argument and leave the third blank, {}.
+% \Acceptor{Primus Castor}{Professor and Undergraduate Officer, Department of Physics}{}
% Usage: \DegreeDate{Month}{year}
-% Valid degree months are September, February, or June.
+% Valid degree months are February, May, June, or September
\DegreeDate{June}{1876}
% Date that final thesis is submitted to department
@@ -198,53 +216,85 @@
%
\CClicense{CC BY-NC-ND 4.0}{https://creativecommons.org/licenses/by-nc-nd/4.0/}
%
+
+%%%%%%% Solutions for overflowing titlepage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% If your title page is overflowing (from too many names, degrees, etc.):
+%
+% (a) you can reduce the 12pt and 18pt skips between various blocks to 6pt with this command:
+%
+% \Tighten
+%
+% (b) you can scale down the Signature block at the bottom with this command:
+%
+% \SignatureBlockSize{\small} %or this one \SignatureBlockSize{\footnotesize}
+%
+% (c) you can put the acceptor name and title onto two lines, rather than three like this:
+%
+% \Acceptor{Tertius Castor}{Professor and Graduate Officer, Department of Research}{}
+%
+% (d) you can change the font size of the author name[s] with
+%
+% \AuthorNameSize{\normalsize}
+%
+% (e) and you can omit any previous degrees from the title page, instead mentioning them in the biographical sketch
+
+% Also, if you prefer to keep the text toward the top of the page with most white space at the bottom, you
+% can use this command to squash all of the vertical glue (stretchy space) with this command:
+%
+% \Squash
+%
+% This command is useful when the text has not already reach the bottom of the page, since the glue gets squashed automatically
+% when the page is too full.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Titlepage
+%%% Make titlepage
\maketitle
-%%%%%%%%% Contents that you need to write follows %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Contents that you need to write follows! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \includeonly{acknowledgments,biography,chapter1,chapter2,...,appendixa,...}
-% for usage, see https://latexref.xyz/dev/latex2e.html#g_t_005cinclude-_0026-_005cincludeonly
+% for usage of includeonly, see https://latexref.xyz/_005cinclude-_0026-_005cincludeonly.html
+
+%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Frontmatter (write this material in the mentioned files) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This page is optional. Edit the file committee_members.tex
+\include{committee_members}
-% The abstract environment creates all the required headers and footnote.
-% You only need to add the text of the abstract itself in the file abstract.tex
+% The abstract environment creates all the required headings and footers.
+% You only need to the text of the abstract in the file abstract.tex
\begin{abstract}
- \input{abstract.tex}% in this case, use \input rather than \include because you are inside an environment
+ \input{abstract.tex}% use \input rather than \include because we're inside an environment
\end{abstract}
-\include{acknowledgments.tex}
+\include{acknowledgments}% acknowledgments.tex (.tex extension is presumed by \include)
-\include{biography.tex}% optional, see MIT Libraries https://libraries.mit.edu/distinctive-collections/thesis-specs/#format
+\include{biography}% biography.tex (optional, see https://libraries.mit.edu/distinctive-collections/thesis-specs/#format)
-
-%%% Table of contents and lists of stuff (delete lists you don't need, e.g., if no tables) %%%%%%%%
+%%% Table of contents and lists of stuff (delete unused lists, i.e., if no tables or figures) %%%%%
\tableofcontents
\listoffigures
\listoftables
-
%%% Chapters of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to use "double spacing", you can start here...
+%% If you want to use "double spacing", you should start here...
-\include{chapter1.tex}
-%\include{chapter2.tex}
-%\include{chapter3.tex}
-%\include{chapter4.tex}
+ \include{chapter1}% .tex extension is presumed
+% \include{chapter2}
+%\include{chapter3}
+%\include{chapter4}
%%% Appendicies of thesis %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
-\include{appendixa.tex}
+\include{appendixa}
+\include{appendixb}
-
-%%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Bibliography (biblatex) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\defbibheading{bibintoc}{\chapter*{#1}\addcontentsline{toc}{backmatter}{\refname}}
% this sets the title of contents name for bibliography to \refname (= References)
@@ -257,6 +307,7 @@
%%%% Option for natbib %%%%%%%%%%%%%
+
%% use an appropriate style (.bst) and your own .bib file[s]
%\bibliographystyle{plainnat}
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh
index fdb19c1f4fa..16b0d5bc485 100755
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/latex_sources/compile-font-samples.sh
@@ -1,60 +1,67 @@
#! /bin/bash
-# first run
-
+# Default fonts
+pdflatex Defaultfonts
+biber Defaultfonts
pdflatex Defaultfonts
-pdflatex Fira_Newtxsf
-pdflatex Libertine
-pdflatex Lucida
-pdflatex Newtx-sans-text
-pdflatex Newtx
-
-lualatex Heros-Stix2
-lualatex Stix2
-lualatex Termes-stix2
-lualatex Termes
-
-# biber
-
-biber Defaultfonts
-biber Fira_Newtxsf
-biber Libertine
-biber Lucida
-biber Newtx-sans-text
-biber Newtx
-biber Heros-Stix2
-biber Stix2
-biber Termes-stix2
-biber Termes
-
-# second run
-
pdflatex Defaultfonts
+
+# Fira_Newtxsf
+pdflatex Fira_Newtxsf
+biber Fira_Newtxsf
pdflatex Fira_Newtxsf
+pdflatex Fira_Newtxsf
+
+# Libertine
+pdflatex Libertine
+biber Libertine
pdflatex Libertine
+pdflatex Libertine
+
+# Lucida
+pdflatex Lucida
+biber Lucida
+pdflatex Lucida
pdflatex Lucida
+
+# Newtx-sans-text
+pdflatex Newtx-sans-text
+biber Newtx-sans-text
+pdflatex Newtx-sans-text
pdflatex Newtx-sans-text
+
+# Newtx
+pdflatex Newtx
+biber Newtx
+pdflatex Newtx
pdflatex Newtx
+# Heros-Stix2
+lualatex Heros-Stix2
+biber Heros-Stix2
lualatex Heros-Stix2
+lualatex Heros-Stix2
+
+# Stix2
+lualatex Stix2
+biber Stix2
lualatex Stix2
+lualatex Stix2
+
+# Termes-stix2
+lualatex Termes-stix2
+biber Termes-stix2
+lualatex Termes-stix2
lualatex Termes-stix2
-lualatex Termes
-# third run
-pdflatex Defaultfonts
-pdflatex Fira_Newtxsf
-pdflatex Libertine
-pdflatex Lucida
-pdflatex Newtx-sans-text
-pdflatex Newtx
-
-lualatex Heros-Stix2
-lualatex Stix2
-lualatex Termes-stix2
+# Termes
+lualatex Termes
+biber Termes
+lualatex Termes
lualatex Termes
+
# clean up
mkdir pdffiles
@@ -68,5 +75,3 @@ rm *.lot
rm *.lof
rm *.toc
rm *.xml
-
-
diff --git a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
index ab61cf59e59..69af5643cee 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
index 4e5e739585b..dc0dd3ed8ad 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex
@@ -1,14 +1,14 @@
% !TEX TS-program = lualatex
% !TEX encoding = UTF-8 Unicode
-% Version date: 19 July 2024
+% Version date: 31 August 2024
\DocumentMetadata
{
pdfstandard = a-4,
pdfversion = 2.0,
-% testphase = {phase-III, table, firstaid, math},
lang = en-US,
+% testphase = {phase-III, table, firstaid, math, title},
% debug = {xmp-export}, % note that subject entries are all fine in dc format of outputted xmpi file.
}
@@ -17,9 +17,10 @@
\documentclass[11pt]{article}
\usepackage[letterpaper,margin=1in,footskip=0.5in]{geometry}
-\usepackage{metalogo}
+
\usepackage{hologo}
\newcommand*\pdfTeX{\hologo{pdfTeX}}
+\newcommand*\LuaLaTeX{\hologo{LuaLaTeX}}
\usepackage[x11names,svgnames,dvipsnames,table]{xcolor}
\usepackage{luacolor} % load AFTER xcolor
@@ -84,13 +85,11 @@
\usepackage[psdextra]{hyperref}
-\hypersetup{%
- unicode,%
-% pdftex,%
- pdfborder={0 0 0},%
- bookmarksnumbered=true,%
- bookmarksopen=true,%
- bookmarksopenlevel=2,%
+\hypersetup{
+ pdfborder={0 0 0},
+ bookmarksnumbered=true,
+ bookmarksopen=true,
+ bookmarksopenlevel=2,
colorlinks=true,
linkcolor=blue,
citecolor=blue,
@@ -99,15 +98,15 @@
anchorcolor=yellow,% not all pdf viewers recognize this field (Firefox does)
% colorscheme=phelype,% overrides link, cite, url, file colors with a preset scheme, through \DocumentMetadata
pdfpagelayout=SinglePage,
- pdfdisplaydoctitle=true,%
+ pdfdisplaydoctitle=true,
pdfstartview=Fit,
pdfmetalang={en},
- pdftitle={Documentation for the MIT thesis template},%
- pdfkeywords={John Lienhard, Massachusetts Institute of Technology, MIT, thesis, dissertation, template, latex},%
- pdfnewwindow=true,%
+ pdftitle={Documentation for the MIT thesis template},
+ pdfkeywords={John Lienhard, Massachusetts Institute of Technology, MIT, thesis, dissertation, template, latex},
+ pdfnewwindow=true,
pdfauthor={John H. Lienhard},
pdfauthortitle={Professor of Mechanical Engineering},
- pdfcaptionwriter={{John H. Lienhard, V}}, %{\xmpquote{John H. Lienhard\xmpcomma\ V}},
+ pdfcaptionwriter={{John H. Lienhard, V}},
pdfurl={https://lienhard.mit.edu},
pdfcontactemail={lienhard@mit.edu},
pdfcontactaddress={77 Massachusetts Avenue, Room 3-166},
@@ -126,10 +125,7 @@
\cs_if_exist:NTF \pdfmeta_xmp_add:n {\pdfmeta_xmp_add:n{<xmpRights:Marked>True</xmpRights:Marked>}}{}
\ExplSyntaxOff
-\urlstyle{same} % this changes font for \url to the current text font, but it is not recognized by \href.
-
-%\RequirePackage{bookmark}% improves handling of pdf bookmarks
-%\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code
+\urlstyle{same}% this changes font for \url to the current text font, but it is not recognized by \href.
%%%%%%%% A nomenclature environment, if needed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -155,7 +151,7 @@
% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns.
% Second optional argument can be used to rename the environment, e.g., to List of Symbols.
% Third optional argument selects section-level or chapter-level style for the nomenclature list.
-\newcounter{dummy}% for tagging code
+%\newcounter{dummy}% for tagging code
\NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname} O{section}}{%
\setlength\columnsep{2em}
\setlength{\nomenwidth}{#1}
@@ -316,7 +312,7 @@ By default, \texttt{mitthesis.cls} will load the traditional \LaTeX\ typeface, C
Ten font sets are predefined, including the default set (see Table~\ref{tab:2}). Three work only with \pdfTeX, four work only with unicode engines, and three work with either. These options include a mixture of serif or sans serif text and math fonts, as shown in the table. To access the predefined font sets, you \textit{must} have the directory \texttt{fontsets} as a subdirectory of your working directory, including its files as named. For unicode engines, you must have the relevant fonts installed as system fonts on your computer.
-Among the predefined font sets, Termes and NewTX are serifed typefaces similar to the digital typeface Times New Roman. STIX Two is more similar to the original metal-type Times typeface. Linux Libertine is a serif typeface inspired by 19\textsuperscript{th} century book type. Lucida is a serifed typeface designed for high legibility at small size or on low resolution devices. Lucida is excellent for mathematics and includes a complete bold-face math font, but it is not free. Heros and NewTX-sans are sans-serif text typefaces similar to Helvetica. NewTXsf is a sans-serif math font which draws upon glyphs from the STIX fonts. Fira is a humanist sans-serif text typeface designed in association with the Firefox browser. Finally, Computer Modern (and its extension Latin Modern)---the traditional \LaTeX\ typeface---is a Didone typeface, with high contrast between thick and thin elements.
+Among the predefined font sets, Termes and NewTX are serifed typefaces similar to the digital typeface Times New Roman. STIX Two is more similar to the original metal-type Times typeface. Linux Libertine is a serif typeface inspired by 19\textsuperscript{th} century book type. Lucida is a serifed typeface designed for high legibility at small size or on low resolution devices. Lucida is excellent for mathematics and includes a complete bold-face math font, but it is not free. Heros and NewTX-sans are sans-serif text typefaces similar to Helvetica. NewTXsf is a sans-serif math font which draws upon glyphs from the STIX fonts. Fira is a humanist sans-serif text typeface designed in conjunction with the Firefox operating system. Finally, Computer Modern (and its extension Latin Modern)---the traditional \LaTeX\ typeface---is a Didone typeface, with high contrast between thick and thin elements.
% STIX Two, Termes, and LMR do not include a separate bold math font.
You may also place your own font-set file, say \texttt{Myfontset.tex}, in your working directory, and load it with:
@@ -402,7 +398,7 @@ The \texttt{mitthesis} class loads the \texttt{amsmath} package and its extensio
Specialized packages for many disciplines can be found in \hrefurl{https://ctan.org}{CTAN}. These include subjects like \hrefurl{https://ctan.org/topic/chemistry}{chemistry}, \hrefurl{https://ctan.org/topic/linguistic}{linguistics}, and \hrefurl{https://ctan.org/topic/physics}{physics}. As examples of such packages, the sample thesis template uses the package \texttt{\hrefurl{https://ctan.org/pkg/mhchem}{mhchem}} to set chemical equations and the package \texttt{\hrefurl{https://ctan.org/pkg/listings}{listings}} to list computer code.
-Several packages focus on table and tabular environments. The \texttt{\hrefurl{https://ctan.org/pkg/booktabs}{booktabs}} package, use in the sample thesis template, produces better quality horizontal lines (called \textit{rules}) for separating material in tables. The \texttt{\hrefurl{https://ctan.org/pkg/array}{array}} package (also used) provides additional options for column formats in tabular environments, and the \texttt{\hrefurl{https://ctan.org/pkg/dcolumn}{dcolumn}} package aligns columns of numbers on the decimal separator.
+Several packages focus on table and tabular environments. The \texttt{\hrefurl{https://ctan.org/pkg/booktabs}{booktabs}} package, use in the sample thesis template, produces better quality horizontal lines (called \textit{rules}) for separating material in tables. The \texttt{\hrefurl{https://ctan.org/pkg/array}{array}} package (also used) provides additional options for column formats in tabular environments, the \texttt{\hrefurl{https://ctan.org/pkg/dcolumn}{dcolumn}} package aligns columns of numbers on the decimal separator, and the \texttt{\hrefurl{https://ctan.org/pkg/longtable}{longtable}} package (also used) formats multipage tables with automatic page breaking.
When selecting a package to use, check that it is currently maintained (with relatively recent updates), and compare it to other packages that perform similar functions. Some packages are better than others, and some obsolete packages remain online.
@@ -410,8 +406,7 @@ The packages called by \texttt{mitthesis} are listed in Table~\ref{tab:3} on pag
\begin{table}
\caption{External packages used. For documentation, visit CTAN, \url{https://ctan.org}. Alternatively, if you have \hrefurl{https://www.tug.org/texlive/}{\TeX\ Live} installed, you can open a terminal window and type \texttt{\%\ texdoc package-name}.\label{tab:3}}
-\vskip5pt
-\centering{\small%
+\centering{\footnotesize%
\setlength\extrarowheight{3pt}
\begin{tabular*}{\textwidth}{>{\ttfamily}l<{}@{\extracolsep{\fill}}p{18em} p{22em} }
\\[-5pt]
@@ -419,20 +414,20 @@ The packages called by \texttt{mitthesis} are listed in Table~\ref{tab:3} on pag
Package & Class & User \\
\midrule
bm & defines commands to access bold math symbols (loaded for default fonts) & with \pdfTeX, the command \verb|\bm{..}| produces a bold math symbol \\
-bookmarks& is loaded automatically under the new pdf-management system & customize pdf bookmarks \\
+bookmark & is loaded automatically under the new pdf-management system & customize pdf bookmarks \\
doi & support for hyperlinking DOIs & hyperlink a doi number: \verb|\doi{..}| \\
etoolbox & extend or modify other macros & can use in preamble if needed \\
geometry & set page size and margins & can use \verb|\newgeometry| in \texttt{mydesign.tex}\\
graphicsx& support for inserting images & use to include graphics\\
hyperref & support for hyperlinks and metadata & must complete setup in preamble\\
iftex & check which \LaTeX\ engine is running& macros to check which engine, e.g., \verb|\ifpdftex| \\
-mathtools& loads and extends \texttt{amsmath} & \textbf{many useful math macros available}. See documentation for \texttt{amsmath} and \texttt{mathtools} \\[0.7em]
+mathtools& loads and extends \texttt{amsmath} & \textbf{many useful math macros available}. See documentation for \texttt{amsmath} and \texttt{mathtools} \\
\midrule
hyperxmp & fallback if no \verb|\DocumentMetadata{..}|& ---\\
kvoptions& key values for systems pre 2022/11/01 & ---\\
xparse & for systems older than 2020/10/01 & macros to define new commands\\
\midrule
-lineno & loaded if class option is given & keyvalue \texttt{lineno} will give line numbers; \texttt{lineno} package adds commands to control numbering\\[0.7em]
+lineno & loaded if class option is given & keyvalue \texttt{lineno} will give line numbers; \texttt{lineno} package adds commands to control numbering\\
\midrule
caption & also loaded by \texttt{mydesign.tex} & support for caption styling \\
subcaption & also loaded by \texttt{mydesign.tex} & support for subfigures within figures \\
@@ -441,6 +436,8 @@ xcolor & also loaded by \texttt{mydesign.tex} & support for colors, includi
array & --- & additional options for formatting table columns \\
booktabs & --- & better quality tables, with additional commands \\
dcolumn & --- & align number columns on selectable separators \\
+longtable & --- & multipage tables with automatic page breaking \\
+microtype & --- & typographical refinements: character protrusion, font expansion, letter spacing (tracking), etc. \\
\midrule
babel & --- & if you use multiple languages, load \texttt{babel} in a fontset file before loading fonts \\
biblatex & --- & sample template uses this bibliography tool. Change to \texttt{natbib} if you prefer\\
@@ -465,7 +462,8 @@ When a thesis supervisor has multiple titles (which will not fit on one line), y
\vskip 5pt
\quad\verb|\Supervisor{name}{first title and \\ \> second title}|
\vskip 5pt
-\noindent\textbf{\TeX hackers note:} The signature block is typeset as a \LaTeX\ \texttt{tabbing} environment.
+\noindent The same trick works in the \verb|\Acceptor| command.
+\textbf{\TeX hackers note:} The signature block is typeset as a \LaTeX\ \texttt{tabbing} environment.
\subsection{Overflowing title page: managing space} If your title page overflows the vertical space (from too many authors, degrees, previous degrees, etc.), you can use some or all of the following techniques. The commands must be given before \verb|\maketitle|.
\begin{enumerate}
diff --git a/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf b/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
index de61b592bf5..560e110b66c 100644
--- a/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
+++ b/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mlacls/mla.pdf b/Master/texmf-dist/doc/latex/mlacls/mla.pdf
index 937392ba705..6849a5c61c4 100644
--- a/Master/texmf-dist/doc/latex/mlacls/mla.pdf
+++ b/Master/texmf-dist/doc/latex/mlacls/mla.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/naive-ebnf/README.md b/Master/texmf-dist/doc/latex/naive-ebnf/README.md
index 6e02dfc45c6..27852bc9f8f 100644
--- a/Master/texmf-dist/doc/latex/naive-ebnf/README.md
+++ b/Master/texmf-dist/doc/latex/naive-ebnf/README.md
@@ -1,12 +1,13 @@
+# EBNF Diagrams in LaTeX
+
[![l3build](https://github.com/yegor256/naive-ebnf/actions/workflows/l3build.yml/badge.svg)](https://github.com/yegor256/naive-ebnf/actions/workflows/l3build.yml)
[![CTAN](https://img.shields.io/ctan/v/naive-ebnf)](https://ctan.org/pkg/naive-ebnf)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/naive-ebnf/blob/master/LICENSE.txt)
-This LaTeX package helps you typeset an
-[Extended Backus-Naur Form](https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_form) (EBNF)
-using plain text format.
+This LaTeX package helps you typeset an [Extended Backus-Naur Form][EBNF]
+(EBNF) using plain text format.
-First, [install it](https://en.wikibooks.org/wiki/LaTeX/Installing_Extra_Packages)
+First, [install it][LaTeX]
from [CTAN](https://ctan.org/pkg/naive-ebnf)
and then use in the preamble:
@@ -22,12 +23,16 @@ and then use in the preamble:
\end{document}
```
-Otherwise, you can download [`naive-ebnf.sty`](https://raw.githubusercontent.com/yegor256/naive-ebnf/gh-pages/naive-ebnf/naive-ebnf.sty) and add to your project.
+Otherwise, you can download [`naive-ebnf.sty`][sty] and add to your project.
## How to Contribute
-If you want to contribute yourself, make a fork, then create a branch,
+If you want to contribute yourself, make a fork, then create a branch,
then run `l3build ctan` in the root directory.
It should compile everything without errors. If not, submit an issue and wait.
Otherwise, make your changes and then run `l3build ctan` again. If the build is
still clean, submit a pull request.
+
+[EBNF]: https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_form
+[LaTeX]: https://en.wikibooks.org/wiki/LaTeX/Installing_Extra_Packages
+[sty]: https://raw.githubusercontent.com/yegor256/naive-ebnf/gh-pages/naive-ebnf/naive-ebnf.sty
diff --git a/Master/texmf-dist/doc/latex/naive-ebnf/naive-ebnf.pdf b/Master/texmf-dist/doc/latex/naive-ebnf/naive-ebnf.pdf
index 4d7e89803d2..6b65d1f271d 100644
--- a/Master/texmf-dist/doc/latex/naive-ebnf/naive-ebnf.pdf
+++ b/Master/texmf-dist/doc/latex/naive-ebnf/naive-ebnf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/README b/Master/texmf-dist/doc/latex/nfssext-cfr/README
deleted file mode 100644
index 5a59f6bf043..00000000000
--- a/Master/texmf-dist/doc/latex/nfssext-cfr/README
+++ /dev/null
@@ -1,26 +0,0 @@
-nfssext-cfr.sty is an extension of Philipp Lehman's nfssext.sty. nfssext.sty
-provides commands which enable one to specify font features not covered by
-the New Font Selection Scheme of LaTeX-2e. nfssext-cfr.sty provides
-additional commands, further extending the facilities offered by NFSS.
-
-nfssext-cfr.sty is required by various font support packages I've written.
-It is being released separately to avoid unnecessary duplication and
-confusion. At least, I hope it will remove at least one source of unnecessary
-confusion. I have no reason to think it will avoid any of the others.
-
-The code is somewhat experimental. It works for me. So far. If you discover
-problems, please let me know. If you know how to fix them, even better.
-
-The 2010 update includes an attempt to improve the behaviour of \ofstyle, and to
-add support for microtype. I didn't publish this at the time because I wanted
-to test it first. I have just discovered that I am still using a local copy.
-Insofar as one person can test something, I figure that 5 years ought to be
-enough to pick up the most obvious problems. However, your kilometres may, as
-always, vary.
-
-There should be no changes for the end user except that in certain cases it is
-possible that line-breaks may be altered if microtype is in use due to the
-enhanced support included for variant font families.
-
-- Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk)
-2017/03/28
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/README.md b/Master/texmf-dist/doc/latex/nfssext-cfr/README.md
new file mode 100644
index 00000000000..cc73c40237f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nfssext-cfr/README.md
@@ -0,0 +1,114 @@
+$Id: README.md 10366 2024-09-18 14:25:21Z cfrees $
+
+=================================================
+# nfssext-cfr
+=================================================
+
+Additions and changes Copyright (C) 2008-2024 Clea F. Rees.
+Code from The Font Installation Guide Copyright (C) 2002-2004 Philipp Lehman
+(see below)
+
+This work may be distributed and/or modified under the conditions of the
+LaTeX Project Public License, either version 1.3c of this license or (at your
+option) any later version. The latest version of this license is in
+ https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX version
+2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Clea F. Rees.
+
+This work consists of all files listed in manifest.txt.
+
+
+The files nfssext-cfr.sty, nfssext-cfr-nfss.sty and nfssext-cfr-nnfss.sty are
+derived works under the terms of the LPPL. They are based on version 1.2 of
+nfssext.sty which was supplied with fontinstallationguide by Philipp Lehman.
+A copy of fontinstallationguide, including an unmodified version of
+nfssext.sty is available from
+ https://tug.ctan.org/pkg/fontinstallationguide.
+nfssext.sty wajs part of the included archive figuide-examples.tar.gz which
+consisted of examples and templates released under the LPPL. nfssext.sty was
+included in the files for tutorials 3, 5 and 6.
+
+The main modifications made to this file are described in nfssext-cfr.dtx.
+
+
+In versions which use docstrip, the docstrip files nfssext-cfr.ins,
+nfssext-cfr.dtx, nfssext-cfr-t1.dtx and nfssext-cfr-t1.ins are derived
+from skeleton.ins and skeleton.dtx, both part of of version 2.4 of Scott
+Pakin's dtxtut. A copy of dtxtut including unmodified copies of skeleton.dtx
+and skeleton ins is available from https://www.ctan.org/pkg/dtxtut and
+released under the LPPL.
+
+Other attributions are included in the source of the package itself.
+
+=================================================
+## Origins & Purpose
+=================================================
+
+nfssext-cfr is an extension of Philipp Lehman's nfssext. nfssext
+provides commands which enable one to specify font features not covered by
+the New Font Selection Scheme of LaTeX-2e. nfssext-cfr provides
+additional commands, further extending the facilities offered by NFSS.
+
+nfssext-cfr is required by various font support packages I've written.
+It is released separately both to avoid unnecessary duplication and
+confusion and to make it available for other purposes.
+
+=================================================
+## Revision History
+=================================================
+
+Please see nfssext-cfr.pdf and nfssext-cfr.dtx.
+
+=================================================
+## Current Version
+=================================================
+
+The current version is an extremely belated update for compatibility with
+the (New) New Font Selection Scheme (NNFSS) introduced in 2020. This has
+somewhat complicated things in various ways and the current version may best
+be described as a compromise which will please nobody equally.
+
+The package includes three .sty files. The main package is a wrapper which
+decides which of the other two to load, together with a small amount of common
+code.
+
+The documentation explains changes required in font definition files for
+backwards compatibility and the options users have if reliant on files which
+have not been updated. No additional incompabilities should be introduced by
+the update to nfssext-cfr. At worst, things which were broken in 2020 will
+remain broken, but breakage which can be fixed in this package _should_ be
+fixed.
+
+nfssext-cfr interferes with kernel code in various ways. This is nothing new.
+nfssext rewrote kernel definitions. nfssext-cfr rewrote kernel definitions.
+The new version of nfssext-cfr rewrites kernel definitions. Details of what is
+done under what conditions are included in the documentation.
+
+=================================================
+## Code Repositories
+=================================================
+
+Code for the LaTeX support package is hosted at
+ https://codeberg.org/cfr/nfssext
+For convenience, the repository is mirrored at
+ https://github.com/cfr42/nfssext
+
+=================================================
+## Contact Details
+=================================================
+
+Bug reports, feature requests etc. concerning the LaTeX support or packaging
+should be filed at
+ https://codeberg.org/cfr/nfssext/issues
+
+
+Clea F. Rees
+Version 1.1
+2024-10-03
+
+=================================================
+vim: et:tw=80:sw=2:
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/manifest.txt b/Master/texmf-dist/doc/latex/nfssext-cfr/manifest.txt
new file mode 100644
index 00000000000..6d7b8ab324f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nfssext-cfr/manifest.txt
@@ -0,0 +1,71 @@
+# Manifest for nfssext-cfr
+
+Copyright (C) 2008-2024 Clea F. Rees
+
+This work may be distributed and/or modified under the conditions of the LaTeX
+Project Public License, either version 1.3c of this license or (at your option)
+any later version. The latest version of this license is in
+ https://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX version
+2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Clea F. Rees.
+
+This work consists of all files listed in manifest.txt.
+
+This file was automatically generated by `l3build manifest`.
+
+## Source files
+
+
+### Package files
+
+
+* manifest.txt
+* README.md
+* nfssext-cfr.dtx
+* nfssext-cfr.ins
+
+### Development files
+
+
+* build.lua
+* manifest.lua
+* tag.lua
+* ot1cmrw.fd
+* ot1cmrj.fd
+* ot1cmr2j.fd
+* ot1cmr1.fd
+* ot1cmr0.fd
+* ot1cmr-mod.fd
+* ot1cmr2.fd
+* ot1cmr2dj.fd
+* nfssext-cfr-t1-fam.tlg
+* nfssext-cfr-t1-series.tlg
+* nfssext-cfr-t1-shape.tlg
+* nfssext-cfr-t1.dtx
+* nfssext-cfr-t1.ins
+
+
+## Derived files
+
+
+### Package files
+
+* nfssext-cfr-nfss.sty
+* nfssext-cfr-nnfss.sty
+* nfssext-cfr.sty
+
+### Development files
+
+* nfssext-cfr-t1-fam.lvt
+* nfssext-cfr-t1-series.lvt
+* nfssext-cfr-t1-shape.lvt
+* nfssext-cfr-t1-splitter.lvt
+* nfssext-cfr-t1-splitter.lve
+
+### Typeset documentation
+
+* nfssext-cfr.pdf
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf
index 42380dd2241..a6020b4a66c 100644
--- a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf
+++ b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex b/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex
deleted file mode 100644
index 8cf5a6c788f..00000000000
--- a/Master/texmf-dist/doc/latex/nfssext-cfr/nfssext-cfr.tex
+++ /dev/null
@@ -1,196 +0,0 @@
-% !TEX TS-program = pdflatex
-% !TEX encoding = UTF-8 Unicode
-% arara: pdflatex: { synctex: true }
-\pdfminorversion=7
-\RequirePackage{svn-prov}
-\ProvidesFileSVN{$Id: nfssext-cfr.tex 6143 2017-03-28 22:45:37Z cfrees $}[\revinfo{}]
-\documentclass[pagesize=auto, fontsize=10pt, DIV=11]{scrartcl}
-
-\usepackage{cfr-lm}
-\usepackage{textcomp,longtable,array,booktabs}
-\usepackage{microtype}
-
-\newcommand*{\mail}[1]{\texttt{#1}}
-\newcommand*{\pkg}[1]{\mbox{\textsf{#1}}}
-\newcommand*{\cs}[1]{\texttt{\textbackslash #1}}
-
-\addtokomafont{title}{\rmfamily}
-
-\title{The \pkg{nfssext-cfr} package}
-\author{Clea F. Rees\thanks{\mail{ReesC21 <at> cardiff <dot> ac <dot> uk}}}
-\date{2017/03/28}
-
-
-\begin{document}
-
-\maketitle
-
-\begin{abstract}
- \noindent \pkg{nfssext-cfr} is an extension of Philipp Lehman's \pkg{nfssext}\@.
- \pkg{nfssext} provides commands which enables one to specify font features not covered by the New Font Selection Scheme of \LaTeXe\@.
- \pkg{nfssext-cfr} provides additional commands, further extending the facilities offered by NFSS.
-\end{abstract}
-
-\section*{Introduction}
-
-\pkg{nfssext-cfr} is required by various font support packages I've written.
-It is being released separately to avoid unnecessary duplication and confusion.
-At least, I hope it will remove at least one source of unnecessary confusion.
-I have no reason to think it will avoid any of the others.
-
-The code is somewhat experimental.
-It works for me.
-So far.
-If you discover problems, please let me know.
-If you know how to fix them, even better.
-
-\section*{Caveats, Warnings and Qualifications}
-
-The actual effect of any macro depends on any changes made to the defaults for various font features, the current font and, of course, what is available.
-
-For example, \cs{itdefault} is intended to be the name of italic shape and is used by the redefined \cs{itshape} supplied by this package.
-By default, \cs{itdefault} is \texttt{it}.
-However, if you change that to, say, \texttt{sl}, then \cs{itshape} will use \texttt{sl} instead.
-
-Moreover, if the current shape is small-caps, \cs{itshape} will attempt to merge the default italic shape with the small-caps.
-That is, it will try to select small-caps italic, if possible, before resorting to plain italic.
-
-The macros operating on family names are almost entirely reliant on font names adhering strictly to the Karl Berry schema.
-This includes the stipulation that multiple variants be listed in alphabetical order.
-These macros cannot be used with fonts named in any other way.
-
-Likewise, the macros for series and shapes are unlikely to have their expected effects if fonts are not packaged in ways which both adhere to the NFSS schema and, where relevant, to the specific way that schema is extended here.
-In particular, note that italic small-caps is assumed to be coded as \texttt{si}.
-
-If a macro's attempt to enable or disable a font feature fails, a warning will generally be written to the console, but the code tries hard not to trigger errors.
-If an attempt triggers an error, that's a bug, so please let me know.
-If an attempt triggers a warning, please note that there may be no bug at all and, if there is a bug, it is probably not in this package.
-
-To be clear, there certainly are bugs.
-It is just statistically unlikely that any given warning is caused by one.
-
-{%
- \fontfamily{pzc}\fontshape{it}\fontseries{m}\selectfont\Large Caveat emptor \dots\par
-}
-
-\section*{Macros}
-
-The following table includes macros supplied by the original \pkg{nfssext} and additions available with \pkg{nfssext-cfr}.
-
-The third column lists the default letter codes for various font features.
-As explained above, if the defaults are changed, the macros will try to do something different.
-
-A \texttt{+} indicates that the macro will attempt to merge the addition into the current font's family name, series or shape.
-For example, if the current font uses oldstyle figures, the \texttt{+2} indicates that \cs{pstyle} will attempt to select a font with figures which are both proportional and oldstyle.
-
-A \textt{-} indicates that the macro will attempt to subtract from the current font's family name, series or shape.
-For example, if the current font uses oldstyle figures, the \texttt{-2} indicates that \cs{tstyle} will attempt to select a font with figures which are both tabular and oldstyle.
-
-A comma-separated list indicates consecutive additions and/or subtraction.
-
-If no \texttt{+-} is used, the macro tries to select a font with the given feature without merging.
-For example \cs{sistyle} tries to switch to \texttt{si} shape regardless of the current font shape.
-
-A \texttt{--} indicates that the macro will try to clear all relevant letter codes from the current font's family name, series or shape.
-For example, \cs{regwidth} tries to switch to a series with no letter codes indicating non-standard widths in its name.
-
-Additions, subtractions and clearances operate on font family names, series or shapes, as appropriate.
-In general, macros with \texttt{style} in their names operate on family names; those with \texttt{shape} operate on shape codes; and those with \textt{width} or \texttt{weight} operate on series codes.
-
-The letter codes correspond to those specified by the NFSS specification, unless the specification does not include the relevant feature.
-In the latter case, I tried to choose something sensible i.e.~something which made sense to me at the time.
-
-
-\begin{longtable}{lll>{\ttfamily}ll}
- \toprule\endhead
- \bottomrule\endfoot
- \multicolumn{5}{l}{\sffamily Standard macros redefined:}\\
- \cmidrule(lr){1-5}
- & \cs{itshape}\\
- & \cs{scshape}\\
- & \cs{upshape}\\
- \cmidrule(lr){1-5}
- \multicolumn{5}{l}{\sffamily Families --- Styles:}\\
- \cmidrule(lr){1-5}
- & \cs{textti} & \cs{tistyle} & +d & titling/display\\
- & \cs{textlt} & \cs{ltstyle} & +l & light (when separate family)\\
- & \cs{textof} & \cs{ofstyle} & +l & open-face (or outline or blank) style\\
- & \cs{textalt} & \cs{altstyle} & +a & alternative style\\
- & \cs{textreg} & \cs{regstyle} & -- & regular style\\
- & \cs{emboss} & \cs{embossstyle} & +e & \\
- & \cs{textorn} & \cs{ornamentalstyle} & +p & intended primarily for decorative initials etc.\\
- & \cs{ornament} & \\
- & \cs{textqt} & \cs{qtstyle} & +q & quotation style\\
- & \cs{textsh} & \cs{shstyle} & +h & shadowed style\\
- & \cs{texttm} & \cs{tmstyle} & -s,-v,+t & monowidth typewriter\\
- & \cs{texttv} & \cs{tvstyle} & -s,-t,+v & variable width typewriter\\
- & \cs{textswash} & \cs{swashstyle} & +w & an attempt to improve on \cs{textsw}\\
- \cmidrule(lr){1-5}
- \multicolumn{5}{l}{\sffamily Families --- Figures:}\\
- \cmidrule(lr){1-5}
- & \cs{textln} & \cs{lnstyle} & -- & lining figures (cf.~macro below)\\
- & \cs{textos} & \cs{osstyle} & j & oldstyle figures (cf.~macro below)\\
- & \cs{textin} & \cs{instyle} & 0 & inferior figures\\
- & \cs{textsu} & \cs{sustyle} & 1 & superior figures\\
- & \cs{textl} & \cs{lstyle} & -j & lining figures (cf.~command above)\\
- & \cs{texto} & \cs{ostyle} & +j & oldstyle figures (cf.~original \cs{osstyle} above)\\
- & \cs{textp} & \cs{pstyle} & +2 & proportional figures\\
- & \cs{textt} & \cs{tstyle} & -2 & tabular figures\\
- & \cs{textpl} & \cs{plstyle} & -j,+2 & proportional lining figures \\
- & \cs{textpo} & \cs{postyle} & +2j & proportional oldstyle figures \\
- & \cs{texttl} & \cs{tlstyle} & -j,-2 & tabular lining figures\\
- & \cs{textto} & \cs{tostyle} & +j,-2 & tabular oldstyle figures\\
- \cmidrule(lr){1-5}
- \multicolumn{5}{l}{\sffamily Shapes:}\\
- \cmidrule(lr){1-5}
- & \cs{scolshape} & & scol & \\
- & \cs{textol} & \cs{olshape} & ol & outline\\
- & \cs{textsi} & \cs{sishape} & si & italic small-caps\\
- & \cs{textu} & \cs{ushape} & u & \\
- & \cs{textscu} & \cs{scushape} & su & \\
- & \cs{textui} & \cs{uishape} & ui & upright italic\\
- & \cs{textri} & \cs{rishape} & ri & reverse italic\\
- & \cs{textdf} & \cs{dfshape} & n & default shape\\
- & \cs{textsw} & \cs{swshape} & it & swash shape (cf.~\cs{swstyle} above)\\
- & & \cs{swstyle} & \\
- \cmidrule(lr){1-5}
- \multicolumn{5}{l}{\sffamily Series --- Widths:}\\
- \cmidrule(lr){1-5}
- & \cs{textnw} & \cs{nwwidth} & +c & \\
- & \cs{textcd} & \cs{cdwidth} & +c & \\
- & \cs{textec} & \cs{ecwidth} & +ec & \\
- & \cs{textuc} & \cs{ucwidth} & +uc & \\
- & \cs{textet} & \cs{etwidth} & +x & \\
- & \cs{textep} & \cs{epwidth} & +x & \\
- & \cs{textex} & \cs{exwidth} & +ex & \\
- & \cs{textux} & \cs{uxwidth} & +ux & \\
- & \cs{textrw} & \cs{regwidth} & -- & \\
- \cmidrule(lr){1-5}
- \multicolumn{5}{l}{\sffamily Series --- Weights:}\\
- \cmidrule(lr){1-5}
- & \cs{textmb} & \cs{mbweight} & +mb & \\
- & \cs{textdb} & \cs{dbweight} & +db & \\
- & \cs{textsb} & \cs{sbweight} & +sb & \\
- & \cs{texteb} & \cs{ebweight} & +eb & \\
- & \cs{textub} & \cs{ubweight} & +ub & \\
- & \cs{textlg} & \cs{lgweight} & +l & \\
- & \cs{textel} & \cs{elweight} & +el & \\
- & \cs{textul} & \cs{ulweight} & +ul & \\
-\end{longtable}
-
-\section*{History}
-
-\subsection*{2017-03-28}
-Attempt to modify \cs{tmstyle} and \cs{tvstyle} to work as advertised.
-Extend documentation somewhat.
-
-\subsection*{2010}
-The 2010 update includes an attempt to improve the behaviour of \verb|\ofstyle|, and to add support for \pkg{microtype}.
-I didn't publish this at the time because I wanted to test it first.
-I have just discovered that I am still using a local copy.
-Insofar as one person can test something, I figure that 5 years ought to be enough to pick up the most obvious problems.
-However, your kilometres may, as always, vary.
-
-There should be no changes for the end user except that in certain cases it is possible that line-breaks may be altered if \pkg{microtype} is in use due to the enhanced support included for variant font families.
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
index 2aa9c201796..2fb1d2c57f1 100644
--- a/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/ocgx2/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-16
+ * v0.60: ocgx2.sty
+ * fix: typos in pkg decription (log output)
+
+2024-09-15
+ * v0.59: ocgx2.sty
+ * v0.24: ocgbase.sty
+ * fix: pdf/a compliance (issue #22); log output (issue #20)
+
2024-08-28
* v0.58: ocgx2.sty
* v0.23: ocgbase.sty
diff --git a/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.pdf b/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.pdf
index 9234ec35961..6f09abae4e6 100644
--- a/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.pdf
+++ b/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.tex b/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.tex
index ae8de674507..413d7368cc0 100644
--- a/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.tex
+++ b/Master/texmf-dist/doc/latex/panneauxroute/PanneauxRoute-doc.tex
@@ -36,8 +36,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.0}
-\def\TPdate{14 août 2023}
+\def\TPversion{0.1.2}
+\def\TPdate{14 septembre 2024}
\usepackage{tcolorbox}
@@ -135,6 +135,10 @@ Les panneaux sont au format \MontreCode{pdf}, obtenu à l'aide de fichiers \Mont
\subsection{Historique}
+\verb|v0.1.2|~:~~~~Nouveaux panneaux
+
+\verb|v0.1.1|~:~~~~Ajout du panneau B14 (80) pour la limitation de vitesse 80
+
\verb|v0.1.0|~:~~~~Version initiale
\subsection{Chargement}
@@ -178,12 +182,12 @@ Par défaut (dû à \MontreCode{\textbackslash includegraphics}) les \textit{ima
Pour les panneaux de (début/fin de) limitation de vitesse, la commande associée nécessite un argument obligatoire, et entre \MontreCode{\{...\}}, avec comme possibilités \MontreCode{15/30/50/70/90/110/130} :
\begin{demohigh}[language=latex/latex3,style/main=cyan!5,style/code=cyan!5,style/demo=cyan!5]
-\prLimVites{15}\prLimVites{30}\prLimVites{50}\prLimVites{70}
-\prLimVites{90}\prLimVites{110}\prLimVites{130}
+\prLimVites{15}\prLimVites{30}\prLimVites{50}\prLimVites{70}%
+\prLimVites{80}\prLimVites{90}\prLimVites{110}\prLimVites{130}
\end{demohigh}
\begin{demohigh}[language=latex/latex3,style/main=cyan!5,style/code=cyan!5,style/demo=cyan!5]
-\prFinLimVit{15}\prFinLimVit{30}\prFinLimVit{50}\prFinLimVit{70}
+\prFinLimVit{15}\prFinLimVit{30}\prFinLimVit{50}\prFinLimVit{70}%
\prFinLimVit{90}\prFinLimVit{110}\prFinLimVit{130}
\end{demohigh}
@@ -228,6 +232,24 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
\pagebreak
+\subsection{Panneaux de Danger temporaires}
+
+\begin{longtblr}[label=none,entry=none]{width=0.95\linewidth,hlines,vlines,colspec={Q[12.5mm,m,c]Q[m,c]X[l,m]Q[m,c,35mm]},row{1}={cyan!5,font=\Large\sffamily},row{2-Z}={font=\sffamily},cell{2-Z}{Z}={font=\footnotesize}}
+ Type & Panneau & Signification & Alias \\
+ AK2 & \PanneauTableau{AK2} & Dos d'âne ou cassis & \fakeverb{\prDosAneTemp} \\
+ AK3 & \PanneauTableau{AK3} & Rétrécissement de chaussée & \fakeverb{\prChausRetTemp}\\
+ AK4 & \PanneauTableau{AK4} & Chaussée glissante & \fakeverb{\prChaussGlissTemp} \\
+ AK5 & \PanneauTableau{AK5} & Travaux & \fakeverb{\prTravauxTemp} \\
+ AK14 & \PanneauTableau{AK14} & Danger & \fakeverb{\prDangerTemp} \\
+ AK17 & \PanneauTableau{AK17} & Feux temporaires & \fakeverb{\prFeuxTemp} \\
+ AK22 & \PanneauTableau{AK22} & Projection de gravillons & \fakeverb{\prGraviersTemp} \\
+ AK30 & \PanneauTableau{AK30} & Embouteillage & \fakeverb{\prBouchonTemp} \\
+ AK31 & \PanneauTableau{AK31} & Accident & \fakeverb{\prAccidentTemp} \\
+ AK32 & \PanneauTableau{AK32} & Brouillard ou fumées épaisses & \fakeverb{\prBrouillardTemp} \\
+\end{longtblr}
+
+\pagebreak
+
\subsection{Panneaux d'Interdiction et de Priorité}
\begin{longtblr}[label=none,entry=none]{width=0.95\linewidth,hlines,vlines,colspec={Q[12.5mm,m,c]Q[m,c]X[l,m]Q[m,c,35mm]},row{1}={cyan!5,font=\Large\sffamily},row{2-Z}={font=\sffamily},cell{2-Z}{Z}={font=\footnotesize}}
@@ -251,11 +273,11 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
Type & Panneau & Signification & Alias \\
B0 & \PanneauTableau{B0} & Circulation interdite à tout véhicule dans les deux sens & \fakeverb{\prCircInterd} \\
B1 & \PanneauTableau{B1} & Sens interdit à tout véhicule & \fakeverb{\prSensInterdit} \\
- %B1j & \PanneauTableau{B1j} & Répétition d'interdiction d'accès à contresens de bretelles [\ldots] \\
+ B1j & \PanneauTableau{B1j} & Répétition d'interdiction d'accès à contresens de bretelles [\ldots] & \fakeverb{\prSensInterditJ} \\
B2a & \PanneauTableau{B2a} & Interdiction de tourner à gauche à la prochaine intersection & \fakeverb{\prInterdTournG} \\
B2b & \PanneauTableau{B2b} & Interdiction de tourner à droite à la prochaine intersection & \fakeverb{\prInterdTournD} \\
B2c & \PanneauTableau{B2c} & Interdiction de faire demi-tour sur la route suivie jusqu'à la prochaine intersection & \fakeverb{\prInterdDemiTour} \\
- B3 & \PanneauTableau{B31} & Interdiction de dépasser tous les véhicules à moteur autres que ceux à deux roues sans side-car & \fakeverb{\prInterdDepass} \\
+ B3 & \PanneauTableau{B3} & Interdiction de dépasser tous les véhicules à moteur autres que ceux à deux roues sans side-car & \fakeverb{\prInterdDepass} \\
B3a & \PanneauTableau{B3a} & Interdiction aux véhicules automobiles, véhicules articulés, trains doubles ou [\ldots] & \fakeverb{\prInterdVehic} \\
B4 & \PanneauTableau{B4} & Arrêt au poste de douane & \fakeverb{\prHalteDouane} \\
B5a & \PanneauTableau{B5a} & Arrêt au poste de gendarmerie & \fakeverb{\prHalteGendarm} \\
@@ -282,7 +304,7 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
B12 & \PanneauTableau{B12} & Accès interdit aux véhicules dont la hauteur, chargement compris, est supérieure [\ldots] & \fakeverb{\prInterdHaut} \\
B13 & \PanneauTableau{B13} & Accès interdit aux véhicules, véhicules articulés, trains doubles ou ensemble de véhicules [\ldots] & \fakeverb{\prInterdPoids} \\
B13a & \PanneauTableau{B13a} & Accès interdit aux véhicules pesant sur un essieu plus que le nombre indiqué & \fakeverb{\prInterdPoidsEssieu} \\
- B14\_x & Limite de vitesse & \PanneauTableau{B14_15}\PanneauTableau{B14_30}\PanneauTableau{B14_50}\PanneauTableau{B14_70}\PanneauTableau{B14_90}\PanneauTableau{B14_110}\PanneauTableau{B14_130} & \fakeverb{\prLimVites{x}}\\
+ B14\_x & Limite de vitesse & \PanneauTableau{B14_15}\PanneauTableau{B14_30}\PanneauTableau{B14_50}\PanneauTableau{B14_70}\PanneauTableau{B14_80}\PanneauTableau{B14_90}\PanneauTableau{B14_110}\PanneauTableau{B14_130} & \fakeverb{\prLimVites{x}}\\
B15 & \PanneauTableau{B15} & Cédez le passage à la circulation venant en sens inverse & \fakeverb{\prCedezInv} \\
B16 & \PanneauTableau{B16} & Signaux sonores interdits & \fakeverb{\prInterdSons} \\
B17 & \PanneauTableau{B17} & Interdiction aux véhicules de circuler sans maintenir entre eux un intervalle [\ldots] & \fakeverb{\prDistance} \\
@@ -461,6 +483,28 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
%CE100 & \PanneauTableau{CE100} & Indication de l’enseigne de la ou des sociétés commerciales offrant un [\ldots] \\
\end{longtblr}
+\subsection{Panneaux divers}
+
+\NewDocumentCommand\AffPanneauGenerique{ m }{%
+ \raisebox{-0.2\height}{\AffPanneau[height=1.5cm]{#1}} : \texttt{#1}
+}
+\begin{multicols}{3}
+ \AffPanneauGenerique{B50a} \\
+ \AffPanneauGenerique{B50b} \\
+ \AffPanneauGenerique{B50c} \\
+ \AffPanneauGenerique{B50d} \\
+ \AffPanneauGenerique{B50e} \\
+ \raisebox{-0.2\height}{\AffPanneau[height=1.5cm]{B51_30}} : \texttt{B51\_30} \\
+ \AffPanneauGenerique{B53} \\
+ \AffPanneauGenerique{B55} \\
+ \AffPanneauGenerique{B57} \\
+ \AffPanneauGenerique{B59} \\
+ \AffPanneauGenerique{B49VL} \\
+ \AffPanneauGenerique{C24a}
+\end{multicols}
+
+\pagebreak
+
\section{Aliases, de hauteur 2.5ex}
\begin{multicols}{3}
@@ -494,6 +538,19 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
\raisebox{-0.2\height}{\prVent[height=2.5ex]} : \verb+\prVent+
\end{multicols}
+\begin{multicols}{3}%temporaire
+ \raisebox{-0.2\height}{\prDosAneTemp[height=2.5ex]} : \verb+\prDosAneTemp+ \\
+ \raisebox{-0.2\height}{\prChausRetTemp[height=2.5ex]} : \verb+\prIntersectPrio+ \\
+ \raisebox{-0.2\height}{\prChaussGlissTemp[height=2.5ex]} : \verb+\prChaussGlissTemp+ \\
+ \raisebox{-0.2\height}{\prTravauxTemp[height=2.5ex]} : \verb+\prTravauxTemp+ \\
+ \raisebox{-0.2\height}{\prDangerTemp[height=2.5ex]} : \verb+\prDangerTemp+ \\
+ \raisebox{-0.2\height}{\prFeuxTemp[height=2.5ex]} : \verb+\prFeuxTemp+ \\
+ \raisebox{-0.2\height}{\prGraviersTemp[height=2.5ex]} : \verb+\prGraviersTemp+ \\
+ \raisebox{-0.2\height}{\prBouchonTemp[height=2.5ex]} : \verb+\prBouchonTemp+ \\
+ \raisebox{-0.2\height}{\prAccidentTemp[height=2.5ex]} : \verb+\prAccidentTemp+ \\
+ \raisebox{-0.2\height}{\prBrouillardTemp[height=2.5ex]} : \verb+\prBrouillardTemp+
+\end{multicols}
+
\begin{multicols}{3}
\raisebox{-0.2\height}{\prIntersect[height=2.5ex]} : \verb+\prIntersect+ \\
\raisebox{-0.2\height}{\prIntersectPrio[height=2.5ex]} : \verb+\prIntersectPrio+ \\
@@ -509,6 +566,7 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
\begin{multicols}{3}
\raisebox{-0.2\height}{\prCircInterd[height=2.5ex]} : \verb+\prCircInterd+ \\
\raisebox{-0.2\height}{\prSensInterdit[height=2.5ex]} : \verb+\prSensInterdit+ \\
+ \raisebox{-0.2\height}{\prSensInterditJ[height=2.5ex]} : \verb+\prSensInterditJ+ \\
\raisebox{-0.2\height}{\prInterdTournG[height=2.5ex]} : \verb+\prInterdTournG+ \\
\raisebox{-0.2\height}{\prInterdTournD[height=2.5ex]} : \verb+\prInterdTournD+ \\
\raisebox{-0.2\height}{\prInterdDemiTour[height=2.5ex]} : \verb+\prInterdDemiTour+ \\
@@ -543,6 +601,7 @@ Pour les panneaux de (début/fin de) limitation de vitesse, la commande associé
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{30}} : \verb+\prLimVites{30}+ \\
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{50}} : \verb+\prLimVites{50}+ \\
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{70}} : \verb+\prLimVites{70}+ \\
+ \raisebox{-0.2\height}{\prLimVites[height=2.5ex]{80}} : \verb+\prLimVites{80}+ \\
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{90}} : \verb+\prLimVites{90}+ \\
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{110}} : \verb+\prLimVites{110}+ \\
\raisebox{-0.2\height}{\prLimVites[height=2.5ex]{130}} : \verb+\prLimVites{130}+ \\
diff --git a/Master/texmf-dist/doc/latex/pas-tableur/README b/Master/texmf-dist/doc/latex/pas-tableur/README
deleted file mode 100644
index 001719afbb6..00000000000
--- a/Master/texmf-dist/doc/latex/pas-tableur/README
+++ /dev/null
@@ -1,37 +0,0 @@
-********* README file for pas-tableur ******************
-********************* ENGLISH *****************************
-
-This package uses TikZ to imitate spreadsheet.
-
-Licence
--------
-
-This program can be redistributed and/or modified under the terms
-of the LaTeX Project Public License Distributed from CTAN
-archives in directory macros/latex/base/lppl.txt.
-
-Documentation
--------------
-
-The documentation of the package is under the
-directory /doc/ in french language.
-
-Thanks to use pas-tableur.sty.
-
-********* Fichier README pour pas-tableur ******************
-********************** FRANCAIS *******************************
-
-Cette extension utilise TikZ pour imiter les feuilles de calculs sous tableur.
-
-Licence
--------
-
-L'extension peut être redistribuée et/ou modifiée sous les termes
-de la licence LaTeX Project Public (voir macros/latex/base/lppl.txt).
-
-Documentation
--------------
-
-La documentation de l'extension se trouve dans le répertoire /doc/.
-
-Merci d'utiliser pas-tableur.sty.
diff --git a/Master/texmf-dist/doc/latex/pas-tableur/README.txt b/Master/texmf-dist/doc/latex/pas-tableur/README.txt
new file mode 100644
index 00000000000..a5e7692b4e9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pas-tableur/README.txt
@@ -0,0 +1,40 @@
+************* README file for pas-tableur **********************
+********************* ENGLISH *****************************
+
+This package uses TikZ to imitate spreadsheets.
+
+Licence
+-------
+
+This program can be redistributed and/or modified under the terms
+of the LaTeX Project Public License Distributed from CTAN
+archives in directory macros/latex/base/lppl.txt.
+
+Documentation
+-------------
+
+The documentation of the package is in the ZIP file or under the
+directory /doc/ in french language.
+If you don't find it, go to the URL http://get-software.net/macros/latex/contrib/pas-tableur/doc/pas-tableur.pdf
+
+Thanks to use pas-tableur.sty.
+
+************* Fichier README pour pas-tableur **********************
+********************** FRANCAIS *******************************
+
+Cette extension utilise TikZ pour imiter des tableurs.
+
+Licence
+-------
+
+L'extension peut être redistribuée et/ou modifiée sous les termes
+de la licence LaTeX Project Public (voir macros/latex/base/lppl.txt).
+
+Documentation
+-------------
+
+La documentation de l'extension se trouve dans le fichier ZIP ou
+dans dans le répertoire /doc/.
+Si vous ne trouvez pas cette documentation, allez sur la page http://get-software.net/macros/latex/contrib/pas-tableur/doc/pas-tableur.pdf
+
+Merci d'utiliser pas-tableur.sty.
diff --git a/Master/texmf-dist/doc/latex/pas-tableur/pas-tableur.tex b/Master/texmf-dist/doc/latex/pas-tableur/pas-tableur.tex
index 89a961a1d75..ede47ac5a81 100644
--- a/Master/texmf-dist/doc/latex/pas-tableur/pas-tableur.tex
+++ b/Master/texmf-dist/doc/latex/pas-tableur/pas-tableur.tex
@@ -31,13 +31,15 @@
\begin{center}
\begin{tcolorbox}[head]
{\bfseries\LARGE Documentation \texttt{pas-tableur} }\\[3mm]
-{\large Version 2.05 -- \today}
+{\large Version 2.06 -- \today}
\end{tcolorbox}
{\large
\href{http://www.mathweb.fr/contact.html}{St\'ephane Pasquet}}
-{\small\emph{Thanks to Susumu Tanimura for his contribution th the improvement of this package}}
+{\small\emph{Thanks to \textbf{Susumu Tanimura} for his contribution to the improvement of this package}}
+
+{\small\emph{Thanks to \textbf{Emiel van Miltenburg} for his contribution to the improvement of this package with the \textbackslash multimultiSelect macro.}}
\end{center}
\begin{tcolorbox}[toc]
@@ -372,6 +374,33 @@ Voyons un exemple pour comprendre la syntaxe :
\end{tikzpicture}
\end{tcblisting}
+\subsection{\textbackslash multimultiSelec : pour visualiser l'\'etirement}
+
+\begin{tcblisting}{listing}
+\sffamily
+\begin{tikzpicture}
+\begin{scope}[shift={(0,0)}]
+\tableur*[7]{A/1cm, B/1cm}
+\celtxt[width=1cm,align=right]{A}{1}{1}
+\celtxt[width=1cm,align=right]{A}{2}{2}
+\celtxt[width=1cm,align=right]{A}{3}{3}
+\multimultiSelec{A-1}{A-3}{A-6}
+\end{scope}
+
+\node at (2,-2) {\Large $\Rightarrow$};
+
+\begin{scope}[shift={(4,0)}]
+\tableur*[7]{A/1cm, B/1cm}
+\celtxt[width=1cm,align=right]{A}{1}{1}
+\celtxt[width=1cm,align=right]{A}{2}{2}
+\celtxt[width=1cm,align=right]{A}{3}{3}
+\celtxt[width=1cm,align=right]{A}{4}{4}
+\celtxt[width=1cm,align=right]{A}{5}{5}
+\celtxt[width=1cm,align=right]{A}{6}{6}
+\end{scope}
+\end{tikzpicture}
+\end{tcblisting}
+
\subsection{Les couleurs par d\'efaut}
@@ -411,6 +440,8 @@ Voyons un exemple pour comprendre la syntaxe :
\hline
\texttt{\textbackslash multiSelec\{A-1\}\{C-2\}} & Simule la s\'election des cellules allant de A1 \`a C2.\\
\hline
+\texttt{\textbackslash multimultiSelec\{A-1\}\{A-3\}\{A-6\}} & Simule l'étirement des cellules allant de A1 \`a A3 jusqu'à A6.\\
+\hline
\texttt{\{\textbackslash helvbx A1\}} & Affiche : \helvbx{A1}.\\
\hline
\end{tabularx}
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
index 4c4251c47ee..a3369c7b740 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
@@ -5,7 +5,38 @@ first release 0.95a, 2021-02-23 will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
+## [2024-09-29]
+
+### Changed
+
+ - generic driver:
+ expand values of pdfauthor and similar to allow the use of commands
+
+### Fixed
+ - color-ltx.sty: adapted \color@endgroup to change in LaTeX format.
+
+## [2024-09-13]
+Version: 2024-09-02 v0.96l
+
+### Added
+ - ltdocinit.dtx: add \LogDocumentProperties
+ - l3pdfmeta: Support additions of external schemas like ZUGferd with
+ \pdfmeta_xmp_schema_new:nnn \pdfmeta_xmp_property_new:nnnnn
+
+### Fixed
+ - colorspace-patches-tmp-ltx.sty: fixes hook use, issue #78
+
+## [2024-09-02]
+Version: 2024-09-02 v0.96k
+
+### Added
+ - l3pdfmeta.dtx: add standard test `Catalog_no_OCProperties_AS`, (issue#77)
+
+### Fixed
+ - l3pdfmeta.dtx: remove Catalog_no_OCProperties from pdf/a-2b onwards (issue#77)
+
## [2024-08-17]
+Version: 2024-08-17 v0.96j
### Added
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
index 9ac57108e03..7862282bf12 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.96j, 2024-08-17
+Version: 0.96m, 2024-09-29
This package is used during a test phase to load the new PDF management code
of LaTeX.
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
index ab0f008a55e..4a558b98fb0 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
index f15724e4d41..4be7d7fac3a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
index 568726ab7d6..986283a9d5b 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
index 37534467d57..fe89538394b 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
index 1981d6c95c0..b9c29679d47 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index 1b9850003eb..81718e2d11a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
index f17a26c1b89..ba209d60367 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index f6a8c91e702..856c4cd1357 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index dcbce59fbfe..ad0c890ad0b 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 1551733a91d..94600e84878 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
index 395c405a567..440c2a30075 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
index ec0b0616e81..4d701b76944 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
index 8f126de6159..99f5ef94903 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
index 9a5de671748..d9ad3802f7a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfoutline.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfoutline.pdf
new file mode 100644
index 00000000000..5d40c31cf9e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfoutline.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
index 88abccd671e..ddcb4d6afe3 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
index 2debc154943..d5996aa0008 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
index 7bfd5bb36b2..0b2c81696d3 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index 8c4d7d88cb3..7a05279fa05 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index f2dc6282dbd..29e450f72a9 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index a5ea1485bc4..b4182f36dfe 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/README b/Master/texmf-dist/doc/latex/pgf-periodictable/README
index f761cd24392..bfdfafd70ac 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/README
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/README
@@ -1,4 +1,4 @@
-This is pgf-PeriodicTable, version 2.1.3 (2024/08/07).
+This is pgf-PeriodicTable, version 2.1.4 (2024/09/08).
The purpose of this package is to provide the Periodic Table of Elements in
a simple way. It relies on pgf/TikZ to offer a full or partial periodic table with
@@ -22,6 +22,13 @@ ____________________________________________________________
Major changes:
+*** v2.1.4 (08/09/2024) ***
+Fixed wrong box width on extra legend of Country of Discovery.
+Fixed minor issues in pgfPTbuildcell macros.
+Added the prefix 'pgfPT' to the built-in back color schemes. They are now 'pgfPTdefault', 'pgfPTSoft', 'pgfPTJmol',
+'pgfPTCPK', 'pgfPTRasmol', 'pgfPTRasmolNew', 'pgfPTWikipedia', 'pgfPTMNM', 'pgfPTPS', 'pgfPTRadio' and 'pgfPTBlocks'.
+Fixed some typos in the manual.
+
*** v2.1.3 (07/08/2024) ***
The engine's detection mechanism (pdfLaTeX, LuaLaTeX or XeTeX) has been changed to prevent erroneous detection when the packages 'hyperref' or 'bookmark' are loaded and the document is compiled with LuaLaTeX - in this case, pgf-PeriodicTable disturbs the selection of the document font.
Fixed an issue with the Chemical Symbol color when a non-rgb color is used, such as cyan or yellow , which are defined in the xcolor package using the cmyk model (when loaded without options).
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex
index 66e67fc3c77..9a18c1f8dd3 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex
@@ -1,23 +1,23 @@
%\vfill%
-\subsubsection{\texorpdfstring{\ding{224} The discovery year}{The discovery year}}\vspace{6pt}%
+\subsubsection{\texorpdfstring{\ding{224} The year of discovery}{The year of discovery}}\vspace{6pt}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% DiscY color
\pgfPTMoption{4}{DiscY color}{black}{%
-Sets the discovery year color.
+Sets the color of the discovery year.
}
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY color=red]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY color=red]}}%
\\ [5pt]\pgfPTendoption%
% DiscY font
\pgfPTMoption{4}{DiscY font}{\string\tiny\string\bfseries}{%
-Sets the discovery year font.
+Sets the font of the discovery year.
}
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY font=\string\fontfamily{pbk}\string\selectfont\string\tiny\string\bfseries]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY font=\fontfamily{pbk}\selectfont\tiny\bfseries]}}%
\\ [5pt]\pgfPTendoption%
% DiscY BC scale
\pgfPTMoption{4}{DiscY BC scale}{1}{%
-Sets the font factor scaling for the Before Christ (BC) acronym in the discovery year.
+Sets the font factor scaling for the Before Christ (BC) acronym in the year of discovery.
}
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY BC scale=.8]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY BC scale=.8]}}%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex
index b9b76f64d1a..4b9211dc547 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex
@@ -71,7 +71,7 @@ The following examples could be used for students or for any other purposes.
\def\grupo[#1][#2] #3{%
\begin{tikzpicture}[inner xsep=0pt]
\node[below left,text width=1.75cm,text centered] (figura) at (0,0) %
-{\scalebox{.5}{\pgfPT[show title=false,show label LaAc=true,show legend=false,back color scheme=MNM,%
+{\scalebox{.5}{\pgfPT[show title=false,show label LaAc=true,show legend=false,back color scheme=pgfPTMNM,%
font=Roboto-TLF,CS font=\fontfamily{RobotoSlab-TLF}\bfseries\large,eDist color=blue!70!black,%
DiscC font=\fontsize{4}{4}\selectfont,DiscY font=\fontsize{4}{4}\selectfont\bfseries,%
name font=\fontseries{l}\fontsize{6pt}{6pt}\selectfont,name color=red!50!black,%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
index c90a4cae942..6b57de7bb07 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex
@@ -7,7 +7,7 @@ For all the \textit{other contents} available for the cells of the periodic tabl
\begin{itemlist}
%\item\red{\textbf{name}}:\hspace{.5ex}element name
\item\red{\textbf{R}}:\hspace{.5ex}atomic radius
-\item\red{\textbf{Rcov}}:\hspace{.5ex}covalente radius
+\item\red{\textbf{Rcov}}:\hspace{.5ex}covalent radius
\item\red{\textbf{Rion}}:\hspace{.5ex}ionic radius
\item\red{\textbf{Ei}}:\hspace{.5ex}first ionization energy
\item\red{\textbf{eneg}}:\hspace{.5ex}electronegativity (Pauling)
@@ -29,7 +29,7 @@ For all the \textit{other contents} available for the cells of the periodic tabl
\item\red{\textbf{lsb}}:\hspace{.5ex}lattice constant -- b
\item\red{\textbf{lsc}}:\hspace{.5ex}lattice constant -- c
\item\red{\textbf{lsca}}:\hspace{.5ex}lattice c/a ratio
-\item\red{\textbf{DiscC}}:\hspace{.5ex}discover country
+\item\red{\textbf{DiscC}}:\hspace{.5ex}country of discovery
\item\red{\textbf{spectra}}:\hspace{.5ex}visible range spectral lines
\end{itemlist}
\end{minipage}
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex
index 9e1ba554059..cbc7cbc2fad 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex
@@ -33,8 +33,8 @@
\\ [0pt]\pgfPTMline%
\newpage%
This command can also be used with options -- as described in section \hyperlink{OPTIONS}{Options for \textbackslash pgfPT: creating a «Periodic Table»} -- to modify, for instance, the font of the Periodic Table or the colors of the cells:
-\\ [10pt]\pgfPTMmacrobox{pgfPT}[font=pnc,back color scheme=MNM]%
-\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[font=pnc,back color scheme=MNM]}}%
+\\ [10pt]\pgfPTMmacrobox{pgfPT}[font=pnc,back color scheme=pgfPTMNM]%
+\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[font=pnc,back color scheme=pgfPTMNM]}}%
\\ [0pt]\pgfPTMline%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\\ [-32pt]\ %
@@ -87,7 +87,7 @@ It is possible to locally override the \textit{global style} defined:
\\ [-32pt]\ %
\def\tmpSection{\bs{pgfPTresetcell}}%
\subsection*{}{\normalfont\large\bfseries\raisebox{1.25pt}{\color{black}$\mathbf{\blacktriangleright}$}\ Utilization of \tmpSection}%
-\label{command:pgfPTresetcell}\addcontentsline{toc}{subsection}{\texorpdfstring{\tmpSection{}}{\textbackslash pgfPTbuildcellstyle}}%
+\label{command:pgfPTresetcell}\addcontentsline{toc}{subsection}{\texorpdfstring{\tmpSection{}}{\textbackslash pgfPTresetcell}}%
\index{COMMANDS@\textbf{COMMANDS}!\textbackslash pgfPTresetcell}%
\\ [4pt]The \pgfPTMmacro{pgfPTresetcell}[] resets the cell to its default layout.
\\ [-32pt]\ %
@@ -154,16 +154,16 @@ It is possible to locally override the \textit{global style} defined:
There are a few \textit{color schemes} predefined:
\index{BUILT-IN@\textbf{BUILT-IN}!color schemes}%
\begin{itembar}
-\item\textbf{default}, the default built-in color scheme, which is loaded if no value is passed to the \red{back color scheme} key.
-\item\textbf{Soft}, a soft color pattern for cells, differentiating metals, non metals, semimetals, lanthanides and actinides.
-\item\textbf{Jmol}, a color scheme based upon \href{http://www.jmol.org/}{Jmol: an open-source Java viewer for chemical structures in 3D}.
-\item\textbf{CPK}, a color scheme that is based upon the colors of the popular plastic spacefilling models which were developed by Corey, Pauling and later improved by Kultun.
-\item\textbf{Rasmol} and \textbf{RasmolNew}, two color schemes based upon the computer program \href{http://www.rasmol.org/}{RasMol}.
-\item\textbf{Wikipedia}, a color scheme built on the Periodic Table of Elements available at \href{https://en.wikipedia.org/wiki/Periodic_table#Classification_of_elements}{Wikipedia}.
-\item\textbf{MNM}, a color pattern which distinguishes between \textbf{M}etals, semimetals and \textbf{N}on \textbf{M}etals.
-\item\textbf{PS}, a color scheme depicting the \textbf{P}hysical \textbf{S}tate at room temperature.
-\item\textbf{Radio}, a two color color scheme showing the radioactivity of the elements.
-\item\textbf{Blocks}, a four colored color scheme showing the \textit{s}, \textit{p}, \textit{d} and \textit{f} blocks of the Periodic Table.
+\item\textbf{pgfPTdefault}, the default built-in color scheme, which is loaded if no value is passed to the \red{back color scheme} key.
+\item\textbf{pgfPTSoft}, a soft color pattern for cells, differentiating metals, non metals, semimetals, lanthanides and actinides.
+\item\textbf{pgfPTJmol}, a color scheme based upon \href{http://www.jmol.org/}{Jmol: an open-source Java viewer for chemical structures in 3D}.
+\item\textbf{pgfPTCPK}, a color scheme that is based upon the colors of the popular plastic spacefilling models which were developed by Corey, Pauling and later improved by Kultun.
+\item\textbf{pgfPTRasmol} and \textbf{pgfPTRasmolNew}, two color schemes based upon the computer program \href{http://www.rasmol.org/}{RasMol}.
+\item\textbf{pgfPTWikipedia}, a color scheme built on the Periodic Table of Elements available at \href{https://en.wikipedia.org/wiki/Periodic_table#Classification_of_elements}{Wikipedia}.
+\item\textbf{pgfPTMNM}, a color pattern which distinguishes between \textbf{M}etals, semimetals and \textbf{N}on \textbf{M}etals.
+\item\textbf{pgfPTPS}, a color scheme depicting the \textbf{P}hysical \textbf{S}tate at room temperature.
+\item\textbf{pgfPTRadio}, a two color color scheme showing the radioactivity of the elements.
+\item\textbf{pgfPTBlocks}, a four colored color scheme showing the \textit{s}, \textit{p}, \textit{d} and \textit{f} blocks of the Periodic Table.
\end{itembar}
\vspace{5pt}
Writing a color scheme can be painstaking work, so a \textit{script} is provided for that:
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex
index 6658536639e..3c32e1a95cd 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex
@@ -151,27 +151,27 @@ any \textbf{user defined} name via \pgfPTMmacro{pgfPTnewZlist}[]\{name\}\{list\}
% back color scheme
\label{option_back color scheme}%
\vfill
-\pgfPTMoption{4}{back color scheme}{default}%
+\pgfPTMoption{4}{back color scheme}{pgfPTdefault}%
{Sets a \blue{named} back color scheme for the Periodic Table.}%
-\\ [5pt]\pgfPTMmacrobox{pgfPT}[back color scheme=Soft]%
-\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[back color scheme=Soft]}}%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[back color scheme=pgfPTSoft]%
+\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[back color scheme=pgfPTSoft]}}%
\newpage%
\pgfPTMoptiontxt{%
The possible \lblue{name} is one of the following:
\begin{itembar}
\item\textbf{built-in}:
\begin{itemize}
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Soft}, a soft color scheme that distinguishes metal, non metals, silicon and germanium, lanthanoids and actinoids.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Jmol}, is the color scheme used in the computer software \href{http://jmol.sourceforge.net/}{Jmol}: an open-source Java viewer for chemical structures in 3D.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{CPK}, is the color scheme of the popular color convention for distinguishing atoms of different chemical
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTSoft}, a soft color scheme that distinguishes metals, non metals, silicon and germanium, lanthanoids and actinoids.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTJmol}, is the color scheme used in the computer software \href{http://jmol.sourceforge.net/}{Jmol}: an open-source Java viewer for chemical structures in 3D.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTCPK}, is the color scheme of the popular color convention for distinguishing atoms of different chemical
elements in molecular models. The scheme is named after the CPK molecular models designed by chemists Robert Corey and Linus Pauling, and improved by Walter Koltun.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Rasmol}, is the color scheme used in the computer software \href{http://www.rasmol.org/}{RasMol}, a program for molecular graphics visualization originally developed by Roger Sayle.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{RasmolNew}, is a color scheme used in RasMol with revision of CPK colors made by C. Chigbo (RasMol 2.7.3).
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Wikipedia}, is the color scheme based on the \href{https://en.wikipedia.org/wiki/Periodic_table\#Classification_of_elements}{Wikipedia Periodic Table of Elements}.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{MNM}, is designed to show \textbf{M}etals and \textbf{N}on \textbf{M}etals in two different colors, showing also the semi-metals in a third color.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{PS}, is designed to show the \textbf{P}hysical \textbf{S}tate of the elements at normal temperature and pressure (NTP) in different colors.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Radio}, is designed to show the \textbf{R}adioactive elements in one color and the non radioactive elements in another color.
-\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Blocks}, for showing the elements in each block of the Periodic Table with the same color.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRasmol}, is the color scheme used in the computer software \href{http://www.rasmol.org/}{RasMol}, a program for molecular graphics visualization originally developed by Roger Sayle.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRasmolNew}, is a color scheme used in RasMol with revision of CPK colors made by C. Chigbo (RasMol 2.7.3).
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTWikipedia}, is the color scheme based on the \href{https://en.wikipedia.org/wiki/Periodic_table\#Classification_of_elements}{Wikipedia Periodic Table of Elements}.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTMNM}, is designed to show \textbf{M}etals and \textbf{N}on \textbf{M}etals in two different colors, showing also the semi-metals in a third color.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTPS}, is designed to show the \textbf{P}hysical \textbf{S}tate of the elements at normal temperature and pressure (NTP) in different colors.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRadio}, is designed to show the \textbf{R}adioactive elements in one color and the non radioactive elements in another color.
+\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTBlocks}, for showing the elements in each block of the Periodic Table with the same color.
\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{solid}, to show the background of each cell of the Periodic Table with the same color specified by the key \sq{\red{back color}}.
\end{itemize}
\item any \textbf{user defined} name via \bs{pgfPTnewColorScheme}\lb\red{name}\rb\lb\red{color list}\rb%
@@ -201,7 +201,7 @@ elements in molecular models. The scheme is named after the CPK molecular models
\newpage\vspace{-34pt}\ %
\foreach \csName/\x in {Soft/0,Jmol/1,CPK/0,Rasmol/1,RasmolNew/0,Wikipedia/1,MNM/0,PS/1,Radio/0,Blocks/1}{%
\pgfPTMstyletxt{4}{cs\csName}{no value}%
-{A style equivalent to \red{back color scheme=\csName}}%
+{A style equivalent to \red{back color scheme=pgfPT\csName}}%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[cs\csName]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[cs\csName]}}%
\\ [0pt]\pgfPTendstyle%
@@ -262,7 +262,7 @@ elements in molecular models. The scheme is named after the CPK molecular models
\vfill
\label{option_languages}%
\pgfPTMoption[\pgfPTchangedinversion{2.1.0}]{4}{languages}{\{\}}%
-{Sets a language list to use in the Periodic Table. It is a comma separated list of language flags: \sq{pt}, \sq{en}, \sq{fr}, \sq{de}, \sq{it}, \sq{es} or \sq{br}. If a user language has been loaded, the corresponding ISO 639-1 code can also be used as a language flag. \textit{This key overrides the default language, that is, the language loaded at package inclusion}.\\ \ }%
+{Sets a language list to use in the Periodic Table. It is a comma separated list of language flags: \sq{pt}, \sq{en}, \sq{fr}, \sq{de}, \sq{it}, \sq{es} or \sq{br}. If a user language has been loaded, the corresponding ISO 639-1 code can also be used as a language flag. \textit{This key locally overrides the default language, that is, the language loaded at package inclusion}.\\ \ }%
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},languages=pt]%
\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},languages=pt]}}%
\\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPT2lang,languages={en,fr}]%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex
index 5e8ffea167a..e973146b7f0 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex
@@ -232,7 +232,7 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb%
\label{command:pgfPTCScombine}\addcontentsline{toc}{subsubsection}{\texorpdfstring{\tmpSectionIII{}}{\textbackslash pgfPTCScombine}}%
\index{LIBRARIES@\textbf{\cyan{LIBRARIES}}!colorschemes@\textbf{\red{Color Schemes Library}}!\tmpSectionIII}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\\ [10pt]This command \textbf{combines two named Color Schemes} and merges the result in a new Color Scheme with \red{name of the new color scheme}.
+\\ [10pt]This command \textbf{combines two named Color Schemes} and merges the result into a new Color Scheme with \red{name of the new color scheme}.
\\ For example \bs{pgfPTCScombine}\lb\red{myCSA,myCSB,myCSC}\rb\ adds the color scheme \red{myCSA} to the color scheme \red{myCSB} and their sum will be available as the color scheme \red{myCSC}.
\\ [3pt]\blue{\textbf{NOTE}}: if the Color Schemes have different sizes (\ie, different number of colors), the last color from the color scheme that ends first will be used until the other color scheme also ends.
\\ [3pt]The optional parameters \lp\red{prop1:prop2,mode}\rp\ are for controlling how the two Color Schemes are combined:
@@ -292,24 +292,24 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb%
}{%
\scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}%
}% -----
-\vfill\pgfPTCScombine[add]{Soft,group,mix}%
+\vfill\pgfPTCScombine[add]{pgfPTSoft,group,mix}%
\textit{Built-in color schemes can also be mixed}:
\\ [10pt]\pgfPTMlibexample{%
-\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{Soft,group,mix}\rb%
+\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{pgfPTSoft,group,mix}\rb%
\\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]%
}{%
\scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}%
}% -----
-\newpage\pgfPTCScombine[add,3:1]{Soft,PS,mix}%
+\newpage\pgfPTCScombine[add,3:1]{pgfPTSoft,pgfPTPS,mix}%
\pgfPTMlibexample{%
-\bs{pgfPTCScombine}\lp\red{add,3:1}\rp\lb\red{Soft,PS,mix}\rb%
+\bs{pgfPTCScombine}\lp\red{add,3:1}\rp\lb\red{pgfPTSoft,pgfPTPS,mix}\rb%
\\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]%
}{%
\scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}%
}% -----
-\\ [4pt]\pgfPTCScombine{Radio,Wikipedia,mix}%
+\\ [4pt]\pgfPTCScombine{pgfPTRadio,pgfPTWikipedia,mix}%
\pgfPTMlibexample{%
-\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{Radio,Wikipedia,mix}\rb%
+\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{pgfPTRadio,pgfPTWikipedia,mix}\rb%
\\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]%
}{%
\scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}%
@@ -322,7 +322,7 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb%
\index{LIBRARIES@\textbf{\cyan{LIBRARIES}}!colorschemes@\textbf{\red{Color Schemes Library}}!\tmpSectionIV}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\\ [10pt]This command \textbf{writes the provided Color Schemes to a file} for later use without loading this library. It has a mandatory argument, the \red{list of the color schemes names} to be written and an optional argument, the \red{filename}. If no \red{filename} is provided the first name on the \red{list of the color schemes names} is used.
-\\ For example, \bs{pgfPTCSwrite}\lp\red{myGroupColors}\rp\lb\red{myGroupGradGreenToRed,myGroupGreens, myGroupGradYellowToRed}\rb, \dcyan{\textit{will create (or overwrite), in the current working directory, a file with name} \texttt{\large myGroupColors.tex} \textit{with the follwing contents}}:
+\\ For example, \bs{pgfPTCSwrite}\lp\red{myGroupColors}\rp\lb\red{myGroupGradGreenToRed,myGroupGreens, myGroupGradYellowToRed}\rb, \dcyan{\textit{will create (or overwrite), in the current working directory, a file with name} \texttt{\large myGroupColors.tex} \textit{with the following contents}}:
\mymfbox{\textsf{%
\textbackslash pgfPTnewColorScheme\{myGroupGradGreenToRed\}\{0/1/0,\myldots%
\\ \textbackslash pgfPTnewColorScheme\{myGroupGreens\}\{0/1/.1,\myldots%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex
index 04a606adfda..019fcf8e2b1 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex
@@ -21,7 +21,7 @@
{Sets the color used in the filling of the \textit{arrows} for the atomic radius variations.
\\ [10pt]\tikz{\node[text width=\linewidth-.6666em,fill=orange!5!white,draw=orange,rounded corners=2pt] {\textbf{\orange{NOTE}}:\\ The color provided to \red{varR color} could be any defined color via the command \texttt{\normalsize\textbackslash definecolor} or by \textit{mixing} colors, using, for instance, the syntax \texttt{\normalsize color1!value!color2}, as explained in the \href{https://ctan.org/pkg/xcolor}{xcolor} package documentation.};}
}%
-\\ [5pt]\pgfPTMmacrobox{pgfPT}[show periodic variations,cell style=pgfPTR,varR color=teal,R color=purple]%
+\\ [5pt]\pgfPTMmacrobox{pgfPT}[show periodic variations,cell style=pgfPTR,varR color=purple!50!white,R color=purple]%
\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[show periodic variations,cell style=pgfPTR,varR color=purple!50!white, R color=purple]}}%
\\ [5pt]\pgfPTendoption%
% varR font
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
index f53b6659cee..0783999e805 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
@@ -1,5 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Definitions for pgf-PeriodicTable Manual
+% Hugo Gomes @ 09/09/2024 v2.1.4
% Hugo Gomes @ 07/08/2024 v2.1.3
% Hugo Gomes @ 01/08/2024 v2.1.2
% Hugo Gomes @ 07/07/2024 v2.1.1
@@ -9,7 +10,7 @@
% Hugo Gomes @ 20/02/2023 v2.0.0
% Hugo Gomes @ 08/11/2022 v1.0.1
% Hugo Gomes @ 10/10/2022 v1.0.0
-\def\pgfPTversion{2.1.3}%
+\def\pgfPTversion{2.1.4}%
\def\pgfPTnewinversion#1{new in v#1}%
\def\pgfPTchangedinversion#1{changed in v#1}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
index e8c9672259b..9eff3db20be 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/README.md b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
index 893666ec528..841bb3e5ffd 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/README.md
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
@@ -1,17 +1,17 @@
-# pgfornament-han 2023/10/29
-A pgfornament library for Chinese traditional motifs and patterns.
+# pgfornament-han 2024/09/19
+A pgfornament library for Chinese traditional motifs and patterns. We also provide three beamer themes namely XiaoShan, HeavenlyClouds and TianQing based on these motifs. TianQing can also be used as a `beamerposter` theme, with some modifications.
-以 pgfornament å®åŒ…的机制,实现绘制汉风图纹。在此基础上设计了三款beamer主题:「è§å±±ã€(XiaoShan)ã€ã€Œç¥žé©¬æµ®äº‘ã€(Heavenly Clouds)ã€ã€Œå¤©é’ã€(TianQing)。
+以 pgfornament å®åŒ…的机制,实现绘制汉风图纹。在此基础上设计了三款beamer主题:「è§å±±ã€(XiaoShan)ã€ã€Œç¥žé©¬æµ®äº‘ã€(HeavenlyClouds)ã€ã€Œå¤©é’ã€(TianQing)。「天é’ã€äº¦å¯ç•¥åŠ ä¿®æ”¹åº”用在海报设计上。
-# Maintainers å®åŒ…维护
+## Maintainers å®åŒ…维护
LianTze Lim æž—èŽ²æž (liantze@gmail.com)
-# Contributors å¼€å‘人员
+## Contributors å¼€å‘人员
Chennan Zhang (23637935@qq.com) drew the motifs using a CAD application,
re-drew them in `TikZ`, and granted permission for these to be turned into
a library suitable for use with the `pgfornament` package by LianTze Lim.
所有图纹å‡ç”±å¼ æ™¨å—以 CAD 设计ã€ä»¥TikZ绘制,å†ç”±æž—莲æžè½¬ä¸ºé€‚用 pgfornament 机制的å®åŒ…代ç ã€‚
-# License
+## License
[LaTeX Project Public License (LPPL 1.3c)](https://www.latex-project.org/lppl/lppl-1-3c/)
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/SiO2.jpg b/Master/texmf-dist/doc/latex/pgfornament-han/SiO2.jpg
new file mode 100644
index 00000000000..f62d8acf576
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/SiO2.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.pdf
index e2abf948f9e..00c808de95f 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.tex b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.tex
index a5c6be5f1c7..aa12a9c0d7c 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han-doc.tex
@@ -5,6 +5,7 @@
\setmainfont{Linux Libertine O}
\setsansfont{Linux Biolinum O}
+\usepackage{multicol}
\usepackage{ragged2e}
\usepackage[svgnames]{xcolor}
\usepackage{pgfornament-han}
@@ -103,7 +104,7 @@
\title{汉风图纹 \texttt{pgfornament-han}}
\author{林莲æžã€å¼ æ™¨å—}
-\date{2023/10/29\\\url{https://github.com/liantze/pgfornament-han}}
+\date{2024/09/19\\\url{https://github.com/liantze/pgfornament-han}}
\begin{document}
@@ -111,7 +112,7 @@
\begin{abstract}
利用 \texttt{pgfornament} å®åŒ…å¯ä»¥åœ¨ \LaTeX{} 文件里便æ·åœ°ç”»å‡ºå分典雅漂亮的ã€æ¬§å¼é£Žæ ¼çš„花纹。(详情请自行访问 \url{http://ctan.org/pkg/pgfornament})
- \texttt{pgfornament-han} å®åŒ…的用æ„,正是为了å°è¯•ç”¨ \texttt{pgfornament} 的已有机制,æ供一些汉风的传统图纹。所有图纹å‡ç”±\emph{张晨å—}以 CAD 程å¼å®šç¨¿ã€TikZ 绘制,å†ç”±\emph{林莲æž}è½¬ä¸ºé€‚åˆ \texttt{pgfornament} 机制使用的å®åŒ…代ç ã€‚
+ \texttt{pgfornament-han} å®åŒ…的用æ„,正是为了å°è¯•ç”¨ \texttt{pgfornament} 的已有机制,æ供一些汉风的传统图纹。所有图纹å‡ç”±\emph{张晨å—}以 CAD 程å¼å®šç¨¿ã€TikZ 绘制,å†ç”±\emph{林莲æž}è½¬ä¸ºé€‚åˆ \texttt{pgfornament} 机制使用的å®åŒ…代ç ã€‚我们也基于这些图纹å°è¯•è®¾è®¡äº†ä¸€äº›beamerå¹»ç¯ç‰‡åŠæµ·æŠ¥ä¸»é¢˜ï¼Œè¯¦è§\hyperref[appendix-start]{附录}。
\end{abstract}
\part{基本用法}
@@ -515,7 +516,7 @@
\appendix
\setlength{\parindent}{2\ccwd}\justifying
\ctexset{section/name={附录}}
-\phantomsection\addcontentsline{toc}{part}{附录}
+\phantomsection\label{appendix-start}\addcontentsline{toc}{part}{附录}
\section{传统中国颜色 \texttt{cncolours.sty}}
@@ -2063,10 +2064,10 @@
\end{minted}
\end{itemize}
-\clearpage
+
\section{å¤©é’ Beamer 主题 Tian Qing Beamer Theme \texttt{beamerthemeTianqing.sty}}
-几年å‰çœ‹åˆ°ä¸€ä¸ªå¾ˆå–œæ¬¢çš„舞å°æ¼”出,根æ®ä¸ªäººå°è±¡åšçš„一个Beamer主题。本æ¥æƒ³å–å「é’花瓷ã€çš„。ä¸è¿‡å§‹ç»ˆæ²¡èƒ½åŠ›é‡çŽ°å‡ºæ¥é‚£ç§æ„Ÿè§‰å•¦ï¼Œçœ¼é«˜æ‰‹ä½Žï¼Œæƒ­æ„§ã€‚
+几年å‰çœ‹åˆ°ä¸€ä¸ª\href{https://www.bilibili.com/video/BV1my4y1B7Vx/?p=156}{很喜欢的舞å°æ¼”出},根æ®ä¸ªäººå°è±¡åšçš„一个Beamer主题。本æ¥æƒ³å–å「é’花瓷ã€çš„。ä¸è¿‡å§‹ç»ˆæ²¡èƒ½åŠ›é‡çŽ°å‡ºæ¥é‚£ç§æ„Ÿè§‰å•¦ï¼Œçœ¼é«˜æ‰‹ä½Žï¼Œæƒ­æ„§ã€‚
(è¯è¯´æ‹¿è¿™ä¸ªæ¨¡æ¿åŽ»åšç§‘研学术性报告,真的ä¸ä¼šè¢«å¯¼å¸ˆä¸¢å‡ºæ¥å—。)
@@ -2102,7 +2103,8 @@
\mintinline{latex}|\setCJKfamilyfont{zhkai}{Xingkai SC}|
-一些å¯ä»¥è‡ªå·±æ›´æ”¹çš„颜色:
+\begin{multicols}{2}
+\noindent 一些å¯ä»¥è‡ªå·±æ›´æ”¹çš„颜色:
\begin{minted}{latex}
\setbeamercolor{structure}{fg=墨色}
\setbeamercolor{section page}{fg=紫檀}
@@ -2112,5 +2114,43 @@
\setbeamercolor{example text}{fg=鸦é’}
\setbeamercolor{block title}{fg=绀é’}
\end{minted}
+\columnbreak
+\noindent 其它一些å¯ä»¥è‡ªå·±æ›´æ”¹çš„设置:
+\begin{minted}{latex}
+\setlength{\TQTopDecoWidth}{0.7\paperwidth}
+\setlength{\TQBottomDecoWidth}{0.2\paperwidth}
+\renewcommand{\TQTopDecoOpacity}{0.3}
+\renewcommand{\TQBottomDecoOpacity}{0.45}
+\end{minted}
+\end{multicols}
+
+这些设置(以åŠbeamer本身自带的设置å‚数)ç»è¿‡ä¸€äº›é€‚当更改,也å¯ä»¥é…åˆ\texttt{beamerposter}å®åŒ…制作学术海报。请å‚考 \texttt{qianqing-poster.tex} 示范文档。
+
+\begin{tcblisting}{listing side comment,title={海报范例},image comment={width=\hsize}{tianqing-poster.pdf}}
+ \documentclass[t,linewidth=1.4]{ctexbeamer}
+ \usepackage[size=a4,orientation=portrait,
+ scale=1.4]{beamerposter}
+ \usetheme{TianQing}
+
+ \setbeamerfont{block title}{size=\Large}
+ \setlength{\TQBottomDecoWidth}{0.2\paperwidth}
+ % ...以åŠå…¶å®ƒé€‚当改动,
+ % 详è§tianqing-poster.tex
+
+ \title{当天é’beamer主题拿æ¥åšæµ·æŠ¥}
+ \author{作者甲ã€ä½œè€…ä¹™ã€ä½œè€…丙}
+ \begin{document}
+ \begin{frame}
+ \frametitle{\insertshorttitle}
+ \framesubtitle{\insertshortauthor}
+ \begin{block}{天é’色等烟雨}
+ \begin{itemize}
+ \item 炊烟袅袅å‡èµ·ï¼Œ 隔江åƒä¸‡é‡Œã€‚
+ \item ...
+ \end{itemize}
+ \end{block}
+ \end{frame}
+ \end{document}
+ \end{tcblisting}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/sample-refs.bib b/Master/texmf-dist/doc/latex/pgfornament-han/sample-refs.bib
new file mode 100644
index 00000000000..9c17647239b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/sample-refs.bib
@@ -0,0 +1,10 @@
+@article{ShaoShen2022,
+ author={邵æ¾é›ª and 沈海云},
+ title={é’花瓷选美记},
+ journal={大学化学},
+ year={2022},
+ volume={37},
+ number={9},
+ pages={2110061},
+ doi={10.3866/PKU.DXHX202110061}
+} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.pdf
new file mode 100644
index 00000000000..dd47dd39ec3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.tex b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.tex
new file mode 100644
index 00000000000..39e6d7011e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-poster.tex
@@ -0,0 +1,134 @@
+% !TEX program=xelatex
+\documentclass[t,linewidth=1.4]{ctexbeamer}
+
+\usepackage[size=a4,orientation=portrait,scale=1.4]{beamerposter}
+
+\usetheme{TianQing}
+% å¯ä»¥æŠŠzhkai,zhfs更改æˆè‡ªå·±å–œæ¬¢çš„美术字体ã€ä¹¦æ³•å­—体等
+% \setCJKfamilyfont{zhkai}{STXingkai} % Win有
+% \setCJKfamilyfont{zhkai}{Xingkai SC} % Mac有
+% \setCJKfamilyfont{zhkai}{鸿雷æ¿ä¹¦ç®€ä½“-æ­£å¼ç‰ˆ.otf}[Path=fonts/] % 自行下载
+% \setCJKfamilyfont{zhfs}{ZhuqueFangsong-Regular.ttf}[Path=fonts/] % 自行下载
+
+\usepackage[style=gb7714-2015]{biblatex}
+\addbibresource{sample-refs.bib}
+\usepackage{chemformula}
+\usepackage{qrcode}
+\usepackage{graphicx}
+
+% å¹»ç¯ç‰‡->海报需è¦çš„一些改动
+\setbeamerfont{frametitle}{size=\Huge}
+\setbeamerfont{framesubtitle}{size=\large}
+\setbeamerfont{block title}{size=\Large}
+% 。左上角ã€å³ä¸‹è§’的装饰å¯ä»¥é…Œæƒ…调整大å°â€¦â€¦ä¸ç„¶å³ä¸‹çœŸçš„有点太大
+% (或者è¦æ•…æ„ä¿ç•™åŽŸå¤§å°æ¥å……版é¢ä¹Ÿä¸æ˜¯ä¸å¯ä»¥å“ˆå“ˆå“ˆ
+% \setlength{\TQTopDecoWidth}{0.5\paperwidth}
+\setlength{\TQBottomDecoWidth}{0.2\paperwidth}
+% \renewcommand{\TQTopDecoOpacity}{0.3}
+% \renewcommand{\TQBottomDecoOpacity}{0.45}
+
+\title{当天é’beamer主题拿æ¥åšæµ·æŠ¥}
+\author{作者甲ã€ä½œè€…ä¹™ã€ä½œè€…丙}
+
+\begin{document}
+
+\begin{frame}
+
+% ……懒得折腾了,\frametitle挺好看的,就这样å§ã€èººå¹³ing
+\frametitle{\insertshorttitle}
+\framesubtitle{\insertshortauthor}
+
+\begin{block}{天é’色等烟雨}
+ \begin{itemize}
+ \item 炊烟袅袅å‡èµ·ï¼Œ 隔江åƒä¸‡é‡Œã€‚
+ \begin{itemize}
+ \item 在瓶底书刻隶仿å‰æœçš„飘逸
+ \begin{itemize}
+ \item 就当我为é‡è§ä½ ä¼ç¬”
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+
+ \begin{enumerate}
+ \item 本æ¥è¿™ä¸ªbeamer主题样å¼ï¼Œæƒ³å–å“é’花瓷â€çš„。ä¸è¿‡å§‹ç»ˆæ²¡èƒ½åŠ›é‡çŽ°å‡ºæ¥é‚£ç§æ„Ÿè§‰å•¦ï¼Œå°±ç®—了。
+ \item è¯è¯´æ‹¿è¿™ä¸ªæ¨¡æ¿åŽ»åšç§‘研学术性报告,真的ä¸ä¼šè¢«å¯¼å¸ˆä¸¢å‡ºæ¥å—。
+ \end{enumerate}
+\end{block}
+
+\begin{columns}[T]
+ \column{.47\textwidth}
+
+ \begin{exampleblock}{算了我也ä¸çŸ¥é“在写什么,do you?}
+ Now solve $x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a}$. 对å„ä½åŒå­¦æ¥è¯´åº”该挑战ä¸å¤§ã€‚
+ \end{exampleblock}
+
+ \begin{alertblock}{算了我也ä¸çŸ¥é“在写什么,do you?}
+ \[ x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a} \]
+ \end{alertblock}
+
+ \begin{block}{算了我也ä¸çŸ¥é“在写什么,do you?}
+ \[ x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a} \]
+ \end{block}
+
+ \begin{proof}
+ 显而易è§ï¼Œ$1+1=2$.
+ \end{proof}
+
+ \begin{theorem}
+ 有一件很美好的事情将è¦å‘生,它终会å‘生。
+ \end{theorem}
+
+ \column{.47\textwidth}
+
+ \begin{block}{é’花瓷}
+ \begin{itemize}
+ \item 炊烟袅袅å‡èµ·ï¼Œ 隔江åƒä¸‡é‡Œã€‚
+ \begin{itemize}
+ \item 在瓶底书刻隶仿å‰æœçš„飘逸
+ \begin{itemize}
+ \item 就当我为é‡è§ä½ ä¼ç¬”
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+
+ \begin{enumerate}
+ \item 本æ¥è¿™ä¸ªbeamer主题样å¼ï¼Œæƒ³å–å“é’花瓷â€çš„。ä¸è¿‡å§‹ç»ˆæ²¡èƒ½åŠ›é‡çŽ°å‡ºæ¥é‚£ç§æ„Ÿè§‰å•¦ï¼Œå°±ç®—了。
+ \item è¯è¯´æ‹¿è¿™ä¸ªæ¨¡æ¿åŽ»åšç§‘研学术性报告,真的ä¸ä¼šè¢«å¯¼å¸ˆä¸¢å‡ºæ¥å—。
+ \item \begin{minipage}[t]{.8\hsize}(其实我当åˆè®¾è®¡è¿™ä¸ªbeamer主题的å°è±¡ä¸å®Œå…¨æºè‡ªåŽŸæ›²ï¼Œæ›´å¤šæ˜¯æ¥è‡ªè¿™ä¸ªç‰‡æ®µï¼‰\end{minipage}\quad
+ \raisebox{-.5em}{\structure{\qrcode[height=2\ccwd]{https://www.bilibili.com/video/BV1my4y1B7Vx/?p=156}}}
+ \end{enumerate}
+ \end{block}
+
+ 有时ä¸ç”¨blocks也挺好的。
+ \begin{enumerate}
+ \item 雨纷纷 旧故里è‰æœ¨æ·±
+ \item 我å¬é—» 你始终一个人
+ \begin{enumerate}
+ \item 斑驳的城门 盘踞ç€è€æ ‘æ ¹
+ \begin{enumerate}
+ \item 石æ¿ä¸Šå›žè¡çš„是 å†ç­‰
+ \item 石æ¿ä¸Šå›žè¡çš„是 å†ç­‰
+ \end{enumerate}
+ \end{enumerate}
+ \end{enumerate}
+\end{columns}
+
+\begin{block}{\ch{SiO2}与\ch{Al2O3}å—热å˜åŒ–过程 \cite{ShaoShen2022}}
+ \Large\centering
+\ch{!(高岭石)( Al2O3*2 SiO2*2 H2O ) ->[脱水] !(å高岭石)( Al2O3 * 2 SiO2 ) ->[加热] !(ç¡…é“尖晶石)( 2 Al2O3 * 3 SiO2 ) ->[加热] !(莫æ¥çŸ³)( 3 Al2O3 * 2 SiO2 )}
+\end{block}
+
+\begin{block}{二氧化硅结构åŠå­˜åœ¨å½¢æ€\cite{ShaoShen2022}}
+\centering
+\includegraphics[width=.8\textwidth]{SiO2}\par
+(1) 二氧化硅(SiO2)结构;(2) 结晶二氧化硅;(3) 无定形二氧化硅
+\end{block}
+
+\vfill
+
+\begin{block}[width=.9\textwidth]{\refname}
+\printbibliography[heading=none]
+\end{block}
+
+\end{frame}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex
index 70c1b3d938d..1cd65837e22 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex
@@ -12,9 +12,13 @@
% \setbeamercolor{section page deco}{fg=紫檀}
% \setbeamercolor{top deco}{fg=è€é“¶}
% \setbeamercolor{normal text}{bg=铅白}
-% \setbeamercolor{alerted text}{fg=玄色}
-% \setbeamercolor{example text}{fg=鸦é’}
-% \setbeamercolor{block title}{fg=绀é’}
+% \setbeamercolor{alerted text}{fg=栗色}
+% \setbeamercolor{example text}{fg=è‹é’}
+% \setbeamercolor{block title}{fg=é›é’}
+% \setlength{\TQTopDecoWidth}{0.7\paperwidth}
+% \setlength{\TQBottomDecoWidth}{0.2\paperwidth}
+% \renewcommand{\TQTopDecoOpacity}{0.3}
+% \renewcommand{\TQBottomDecoOpacity}{0.45}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/LICENSE.txt b/Master/texmf-dist/doc/latex/polyglossia/LICENSE.txt
new file mode 100644
index 00000000000..7cb05b23f69
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/polyglossia/LICENSE.txt
@@ -0,0 +1,20 @@
+MIT Licence (https://opensource.org/licenses/MIT)
+=================================================
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the “Softwareâ€), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Master/texmf-dist/doc/latex/polyglossia/README.md b/Master/texmf-dist/doc/latex/polyglossia/README.md
index a3f65bbb9d6..9aed8759796 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/README.md
+++ b/Master/texmf-dist/doc/latex/polyglossia/README.md
@@ -1,4 +1,4 @@
-# THE POLYGLOSSIA PACKAGE v2.2
+# THE POLYGLOSSIA PACKAGE v2.3
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
deleted file mode 100644
index 4808227a41a..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex
deleted file mode 100644
index 0e7a197b09d..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.tex
+++ /dev/null
@@ -1,114 +0,0 @@
-% !TeX TS-program = xelatex
-\documentclass[a4paper]{book}%
-\usepackage[no-math]{fontspec}
-\usepackage{xltxtra,url,amsmath}
-\setmainfont{Linux Libertine O}
-\defaultfontfeatures{Scale=MatchLowercase}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- Extension = .ttf,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic]
-\newfontfamily\arabicfonttt[Script=Arabic,Scale=.75]{DejaVu Sans Mono}
-\newfontfamily\farsifont[Script=Arabic,Scale=1.1,WordSpace=2]{IranNastaliq}
-\let\XeTeX\undefined
-\let\XeLaTeX\undefined
-\usepackage[quiet,nolocalmarks]{polyglossia}
-\setdefaultlanguage[calendar=gregorian,hijricorrection=1,locale=mashriq]{arabic}
-\setotherlanguage[variant=british]{english}
-\setotherlanguage{farsi}
-\parindent 0pt
-\title{اختبار دعم اللغة العربية}
-\author{Ùرانسوا شاريت}
-\begin{document}
-\pagenumbering{alph}
-\maketitle
-\tableofcontents
-\chapter{تجربة}
-\pagenumbering{arabic}
-\section{لغات مختلÙØ©}
-
-\textbf{العربية}\footnote{%
-من «\LR{\textenglish{\url{http://ar.wikipedia.org/wiki/}}\RL{\ttfamily لغة عربية}}»}
-أكبر لغات المجموعة السامية من حيث عدد المتحدثين، وإحدى أكثر اللغات انتشارا ÙÙŠ
-العالم، يتحدثها أكثر من ٤٢٢ مليون نسمة، ويتوزع متحدثوها ÙÙŠ المنطقة المعروÙØ©
-باسم الوطن العربي، بالإضاÙØ© إلى العديد من المناطق الأخرى المجاورة كالأحواز وتركيا
-وتشاد ومالي والسنغال. وللغة العربية أهمية قصوى لدى أتباع الديانة الإسلامية، Ùهي
-لغة مصدري التشريع الأساسيين ÙÙŠ الإسلام: القرآن، والأحاديث النبوية المروية عن النبي
-محمد، ولا تتم الصلاة ÙÙŠ الإسلام (وعبادات أخرى) إلا بإتقان بعض من كلمات هذه اللغة.
-والعربية هي أيضًا لغة طقسية رئيسية لدى عدد من الكنائس المسيحية ÙÙŠ العالم العربي،
-كما كتبت بها الكثير من أهم الأعمال الدينية والÙكرية اليهودية ÙÙŠ العصور الوسطى.
-وإثر انتشار الإسلام، وتأسيسه دولا، ارتÙعت مكانة اللغة العربية، وأصبحت لغة السياسة
-والعلم والأدب لقرون طويلة ÙÙŠ الأراضي التي حكمها المسلمون، وأثرت العربية، تأثيرا
-مباشرا أو غير مباشر على كثير من اللغات الأخرى ÙÙŠ العالم الإسلامي، كالتركية
-والÙارسية والأردية مثلا.
-
-\textlang{farsi}{\bfseries Ùارسی}\footnote{%
-از «\LR{\textenglish{\url{http://fa.wikipedia.org/wiki/}}\RL{\ttfamily Ùارسي}}»}
-\begin{farsi}
-یا پارسی، (Ú©Ù‡ دری، Ùارسی دری، Ùˆ پارسی دری نیز نامیده می‌شود) زبانی است Ú©Ù‡
-در کشورهای ایران، اÙغانستان، تاجیکستان Ùˆ ازبکستان به آن سخن می‌رانند.
-(برخی زبان Ùارسی در تاجیکستان Ùˆ ازبکستان Ùˆ چین را Ùارسی تاجیکی نام
-می‌گذارند).
-\end{farsi}
-
-\newpage
-\begin{english}
-\textbf{English}\footnote{%
- From \url{http://en.wikipedia.org/wiki/English_language}}
-is a West Germanic language originating in England, and the first language for
-most people in Australia, Canada, the Commonwealth Caribbean, Ireland, New
-Zealand, the United Kingdom and the United States of America (also commonly
-known as the Anglosphere). It is used extensively as a second language and as
-an official language throughout the world, especially in Commonwealth countries
-and in many international organisations.
-
-\textarabic{Ù¡ Ù¢ Ù£}
-
-\end{english}
-\clearpage
-
-\section{أعمال تأريخية \textenglish{(Calendar operations)}}
-
-%\textenglish{\today} = \LTR{\today} =
-\setfootnoteLR
-\today\ = \Hijritoday%\footnote{
-% محسوب بـ \textenglish{\textsf{hijrical.sty}}}
-\LTRfootnote{ What is this?}
-\setfootnoteRL
-
-%\newpage
-\subsection{Ùلان}
-\textenglish{This is English: a b c}\marginpar{انكليزي} %FIXME! cf farsitex?
-
-\subsubsection{Ùلان Ùلان}
-\begin{enumerate}
- \item مثال
- \item مثال
- \begin{enumerate}
- \item مثال
- \item مثال
- \end{enumerate}
-
- \item مثال
-\end{enumerate}
-
-\begin{table}[h]
- \centering
- \begin{tabular}{cc}
- ا & ب \\
- ج & د
- \end{tabular}
- \caption{هذا المثال}
-\end{table}
-
-\[
-x^\text{مال مال}
-\]
-
-\begin{equation}
- x^2 + y^2 = z^2
- \label{test}
-\end{equation}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-chinese.tex b/Master/texmf-dist/doc/latex/polyglossia/example-chinese.tex
deleted file mode 100644
index 57b6e4ba1b0..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-chinese.tex
+++ /dev/null
@@ -1,61 +0,0 @@
-\documentclass{article}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\setdefaultlanguage{chinese}
-\setotherlanguage{english}
-% Package noto, notoCJKsc
-\setmainfont{Noto Serif CJK SC}[Script=CJK]
-\newfontfamily\chinesefont{Noto Serif CJK SC}[Script=CJK]
-% Package arphic-ttf
-%\setmainfont{bkai00mp.ttf}[Script=CJK]% ZenKai-Medium
-%\setmainfont{bsmi00lp.ttf}[Script=CJK]% ShanHeiSun-Light
-%\setmainfont{gbsn00lp.ttf}[Script=CJK]% BousungEG-Light-GB
-%\setmainfont{gkai00mp.ttf}[Script=CJK]% GBZenKai-Medium
-\begin{document}
-\XeTeXlinebreaklocale "zh"
-\XeTeXlinebreakskip=0em plus 0.1em minus 0.01em
-\parindent0em
-
-\begin{center}
- \abstractname
-\end{center}
-\begin{english}
-All human beings are born free and equal in dignity and rights.
-They are endowed with reason and conscience and should act towards one another in a spirit of brotherhood.
-\footnote{%
- This is a footnote.}
-
-This is today: \today
-\end{english}
-
-\section{ç¬¬ä¸€æ¡ (简体中文, Simplified Chinese)}
-
-人人生而自由ã€åœ¨å°Šä¸¥å’Œæƒåˆ©ä¸Šä¸€å¾‹å¹³ç­‰ã€‚他们赋有ç†æ€§å’Œè‰¯å¿ƒã€å¹¶åº”以兄弟关系的精神相对待。
-
-\today
-
-localnumeral: \localnumeral{1863}, chinesenumeral: \chinesenumeral{1863}
-
-\renewfontfamily\chinesefont{Noto Serif CJK TC}[Script=CJK]
-\begin{chinese}[variant=traditional,numerals=chinese]
-
-\section{ç¬¬ä¸€æ¢ (ç¹é«”中文, Traditional Chinese)}
-
-人人生而自由ã€åœ¨å°Šåš´å’Œæ¬Šåˆ©ä¸Šä¸€å¾‹å¹³ç­‰ã€‚他們賦有ç†æ€§å’Œè‰¯å¿ƒã€ä¸¦æ‡‰ä»¥å…„弟關係的精神相å°å¾…。
-
-\today
-
-localnumeral: \localnumeral{1863}, chinesenumeral: \chinesenumeral{1863}
-
-\end{chinese}
-
-\section{numeral}
-\begin{english}
-
-numerals=arabic: \textchinese[numerals=arabic]{\localnumeral{1863}, \chinesenumeral{1863}}
-
-numerals=chinese: \textchinese[numerals=chinese]{\localnumeral{1863}, \chinesenumeral{1863}}
-
-\end{english}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-japanese.tex b/Master/texmf-dist/doc/latex/polyglossia/example-japanese.tex
deleted file mode 100644
index e446d245d96..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-japanese.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass{article}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\setdefaultlanguage{japanese}
-\setotherlanguage{english}
-\setmainfont{Noto Serif CJK JP}[Script=CJK]
-\newfontfamily\japanesefont{Noto Serif CJK JP}[Script=CJK]
-\begin{document}
-\XeTeXlinebreaklocale "ja"
-\XeTeXlinebreakskip=0em plus 0.1em minus 0.01em
-\parindent0em
-
-\begin{center}
- \abstractname
-\end{center}
-\begin{english}
-All human beings are born free and equal in dignity and rights.
-They are endowed with reason and conscience and should act towards one another in a spirit of brotherhood.
-\footnote{%
- This is a footnote.}
-
-This is today: \today
-\end{english}
-
-\section{第一æ¡}
-
-ã™ã¹ã¦ã®äººé–“ã¯ã€ç”Ÿã¾ã‚ŒãªãŒã‚‰ã«ã—ã¦è‡ªç”±ã§ã‚ã‚Šã€ã‹ã¤ã€å°ŠåŽ³ã¨æ¨©åˆ©ã¨ã«ã¤ã„ã¦å¹³ç­‰ã§ã‚る。人間ã¯ã€ç†æ€§ã¨è‰¯å¿ƒã¨ã‚’授ã‘られã¦ãŠã‚Šã€äº’ã„ã«åŒèƒžã®ç²¾ç¥žã‚’ã‚‚ã£ã¦è¡Œå‹•ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„。
-
-\today
-
-localnumeral: \localnumeral{1863}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
deleted file mode 100644
index dba7be728be..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-korean.tex b/Master/texmf-dist/doc/latex/polyglossia/example-korean.tex
deleted file mode 100644
index 7d16cdac03e..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-korean.tex
+++ /dev/null
@@ -1,37 +0,0 @@
-\documentclass{article}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\setdefaultlanguage{korean}
-\setotherlanguage{english}
-\setmainfont[Script=Hangul]{UnBatang}
-\newfontfamily\hangulfont[Script=Hangul]{UnBatang}
-\begin{document}
-\begin{center}
- \abstractname
-\end{center}
-\begin{english}
-Some English to begin with.\footnote{ %
- Blabla}
-\end{english}
-
-\section{제1 조}
-
-모든 ì¸ê°„ì€ íƒœì–´ë‚  때부터 ìžìœ ë¡œìš°ë©° ê·¸ ì¡´ì—„ê³¼ ê¶Œë¦¬ì— ìžˆì–´ ë™ë“±í•˜ë‹¤. ì¸ê°„ì€ ì²œë¶€ì ìœ¼ë¡œ ì´ì„±ê³¼ ì–‘ì‹¬ì„ ë¶€ì—¬ë°›ì•˜ìœ¼ë©° 서로 í˜•ì œì• ì˜ ì •ì‹ ìœ¼ë¡œ í–‰ë™í•˜ì—¬ì•¼ 한다.
-
-\today
-
-\begin{english}
-This is today: \today
-\end{english}
-
-% \begin{enumerate}
-% \item A
-% \item B
-% \begin{enumerate}
-% \item a
-% \item b
-% \item c
-% \end{enumerate}
-% \item C
-% \end{enumerate}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-odia.tex b/Master/texmf-dist/doc/latex/polyglossia/example-odia.tex
deleted file mode 100644
index bd37ee10251..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-odia.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-\documentclass{article}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\usepackage{titletoc}
-
-\setdefaultlanguage{odia}
-\setmainfont[Script=Odia]{Noto Sans Oriya}
-\newfontfamily\odiafont[Script=Odia]{Noto Sans Oriya}
-\setdefaultlanguage[numerals=odia,changecounternumbering=true]{odia}
-
-\setotherlanguage{english}
-\newfontfamily\englishfont{Times New Roman}
-
-
-
-\setcounter{page}{1}\renewcommand{\thepage}{\alph{page}} %Not mandatory. Added to demonstrate the numbering using odia alphabets
-
-% If not mentioned or mentioned \arabic, it uses odia digits
-% If mentioned \alph, it uses series କ, ଖ, ଗ, ଘ ..
-% If mentioned \roman, it uses series ଅ, ଆ, ଇ, ଈ ..
-
-
-\begin{document}
-
-
-\begin{titlepage}
-\begin{center}
-\Huge\bfseries ଉଦାହରଣ\\
-\textenglish {Example}
-\end{center}
-\end{titlepage}
-
-\tableofcontents
-\clearpage
-
-
-\section {\abstractname}
-à¬à¬¹à¬¿ ପୃଷà­à¬ à¬¾à¬Ÿà¬¿ ଉଦà­à¬¦à­‡à¬¶à­à­Ÿà¬®à­‚ଳକ ଭାବେ ଖାଲି ରଖାଯାଇଛି
-\clearpage
-\section{ଉଦà­à¬¦à­‡à¬¶à­à­Ÿ}
-à¬à¬¹à¬¿ ପୃଷà­à¬ à¬¾à¬Ÿà¬¿ ଉଦà­à¬¦à­‡à¬¶à­à­Ÿà¬®à­‚ଳକ ଭାବେ ଖାଲି ରଖାଯାଇଛି
-\clearpage
-\section{ବିଶେଷ ଧନà­à­Ÿà¬¬à¬¾à¬¦}
-à¬à¬¹à¬¿ ପୃଷà­à¬ à¬¾à¬Ÿà¬¿ ଉଦà­à¬¦à­‡à¬¶à­à­Ÿà¬®à­‚ଳକ ଭାବେ ଖାଲି ରଖାଯାଇଛି
-\clearpage
-
-\setcounter{page}{1}\renewcommand{\thepage}{\arabic{page}} %Not mandatory. Added to demonstrate switching of numbering from odia alphabets to odia digits
-
-\section{ଓଡ଼ିଆ ଭାଷା}
-
-\subsection{ଓଡ଼ିଆ କଥିତ ଅଞà­à¬šà¬³}
-\subsection{ଉତà­à¬¸}
-\subsection{ଇତିହାସ}
-ଓଡ଼ିଆ à¬à¬• ଭାରତୀୟ ଭାଷା । ମୂଳ ଓଡ଼ିଆ ଭାଷା ପାଲି ଓ ଔଡà­à¬°à­€ ପà­à¬°à¬¾à¬•à­ƒà¬¤à¬°à­ ସିଧା ସୃଷà­à¬Ÿà¬¿ ହୋଇଥିବା ଭାଷା ବିଜà­à¬žà¬¾à¬¨à­€à¬®à¬¾à¬¨à­‡ ପà­à¬°à¬®à¬¾à¬£ ଦିଅନà­à¬¤à¬¿, à¬à¬¹à¬¿ ଭାଷା ଭାରତରରେ à­¨,୫୦୦ ବରà­à¬·à¬°à­ ଅଧିକ ବରà­à¬· ଆଗରୠକà­à¬¹à¬¾à¬¯à¬¾à¬‰à¬¥à¬¿à¬²à¬¾ ଓ ବୌଦà­à¬§ ଧରà­à¬®à¬° ତିପିଟକ ଓ ଜୈନ ଧରà­à¬®à¬—à­à¬°à¬¨à­à¬¥à¬° ମୂଳ ଭାଷା ଥିଲା । ଓଡ଼ିଆ ବାକି ଭାରତୀୟ ଭାଷାମାନଙà­à¬• ତà­à¬³à¬¨à¬¾à¬°à­‡ ଖà­à¬¬ କମ ପାରସୀ ଓ ଆରବୀ ଭାଷାଦà­à­±à¬¾à¬°à¬¾ ପà­à¬°à¬¾à¬­à¬¾à¬¬à¬¿à¬¤ ।\footnote{ ଉତà­à¬¸: ଉଇକିପିଡ଼ିଆ}
-
-ଇଂଲଣà­à¬¡à¬° କà­à¬‡à¬¨à¬Ÿà­‡à¬¸à­‡à¬¨à¬¸à¬¿à¬†à¬²à¬™à­à¬• ଭାଷା ବିଭାଗର ମତରେ ଧଉଳିଠାରୠମିଳିଥିବା ଅଶୋକଙà­à¬• ସମୟର ଶିଳାଲେଖ, ଜଉଗଡ଼ର ଶିଳାଲେଖ ଆଉ ଖାରବେଳଙà­à¬• ବେଳରେ ତିଆରି ଖଣà­à¬¡à¬—ିରି ଓ ହାତୀଗà­à¬®à­à¬«à¬¾à¬° ଶିଳାଲେଖ ଓଡ଼ିଆ ଭାଷାର ମୂଳ ଇତିହାସ ଉପରେ ସୂଚନା ଦିà¬à¥¤ ହାତିଗà­à¬®à­à¬«à¬¾à¬° ଶିଳାଲେଖରୠଜଣା ଯାଠଯେ ଆଧà­à¬¨à¬¿à¬• ଓଡ଼ିଆ ଭାଷାର ମୂଳ ପାଳି ଭାଷାରୠ। ହାତିଗà­à¬®à­à¬«à¬¾à¬° ଶିଳାଲେଖରେ ଲେଖା ଭାଷା ହେଉଛି ପାଳି ଆଉ ଲିପି ହେଉଛି ବà­à¬°à¬¾à¬¹à­à¬®à­€, ତେବେ à¬à¬¹à¬¿ ଶିଳାଲେଖ ହିଠପà­à¬°à¬®à¬¾à¬£ କରିଦିଠଯେ ଓଡ଼ିଆ ଭାଷା ଅନà­à­Ÿ ଭାଷାଠାରୠପà­à¬°à¬¾à¬¤à¬¨à¥¤ ସଂସà­à¬•à­ƒà¬¤ ଭାଷାର ପà­à¬°à¬­à¬¾à¬¬à¬°à­‡ ପà­à¬°à­à¬£à¬¾ ପାଳି ଭାଷାରେ ଅନେକ ଜାଗାରେ ଶବà­à¬¦ ସବୠବଦଳି ଯାଇଛି । ତେବେ ଓଡ଼ିଆରେ ବିଦେଶୀ ଭାଷାର ପà­à¬°à¬­à¬¾à¬¬ ଖà­à¬¬ କମ ଦେଖାଯାଠଯାହାକି ଅନà­à­Ÿ ଭାରତୀୟ ଭାଷାଠାରୠଖà­à¬¬ ଗୌଣ । ପà­à¬°à¬«à­‡à¬¸à¬° ଓଲଡେନବରà­à¬—ଙà­à¬• ମତରେ ପାଳି ଭାଷା ହିଠଓଡ଼ିଆ ଭାଷାର ମୂଳ ।
-
-ଓଡ଼ିଆ ଶବà­à¬¦à¬° ବà­à­Ÿà¬¬à¬¹à¬¾à¬° ୭ମ ଶତାବà­à¬¦à­€à¬° ତାଳପତà­à¬°à¬°à­‡ ଦେଖିବାକୠମିଳେ। ବିଶେଷକରି ନେପାଳ ରାଜଦରବାରରୠସଂଗୃହୀତ ବୌଦà­à¬§ ଆଚାରà­à¬¯à­à­Ÿà¬™à­à¬•à¬¦à­à­±à¬¾à¬°à¬¾ ରଚିତ ଚରà­à¬¯à­à­Ÿà¬¾à¬¸à¬¾à¬¹à¬¿à¬¤à­à­Ÿ ହେଉଛି ପà­à¬°à¬¾à¬šà­€à¬¨ ଓଡ଼ିଆ ଶବà­à¬¦à¬¾à¬¬à¬³à­€à¬° ଗନà­à¬¤à¬¾à¬˜à¬°à¥¤ ସେହିପରି ଭଦà­à¬°à¬•à¬°à­ ପà­à¬°à¬¾à¬ªà­à¬¤ ମହାରାଜ ଗଣଙà­à¬• ୯ମ ଶତାବà­à¬¦à­€à¬°à­‡ ଲିଖିତ ଶିଳାଲେଖରେ 'ଦେବ କହି ଭକତି କରà­à¬£ ବୋଲନà­à¬¤à¬¿ ଭୋ କà­à¬®à¬¾à¬° ଶେଣ' ହେଉଛି ଓଡ଼ିଆ ଭାଷାରେ ରଚିତ ସà­à­±à­Ÿà¬‚ସଂପୂରà­à¬£à­à¬£ ଓଡ଼ିଆ ଶବà­à¬¦à¥¤ ଓଡ଼ିଆ ଶବà­à¬¦ କà­à¬®à­à¬­à¬¾à¬° \textenglish {/kumbha:rÉ”/} ର ବà­à­Ÿà¬¬à¬¹à¬¾à¬° ତମà­à¬¬à¬¾à¬ªà¬Ÿà¬¾à¬°à­‡ ଲେଖାଥିବାର ଦେଖିବାକୠମିଳେ । ସେମିତି ୯୯୧ ସନର ଲେଖ ଓ ୭୧୫ ସନର ଲେଖରେ ଓଡ଼ିଆ ଶବà­à¬¦ ଭିତà­à¬°à­ \textenglish {/bhituru/} ଆଉ ପନà­à¬¦à¬° \textenglish {/pÉ”ndÉ”rÉ”/} ପà­à¬°à¬­à­ƒà¬¤à¬¿à¬° ବà­à­Ÿà¬¬à¬¹à¬¾à¬° ଦେଖିବାକୠମିଳେ।
-\subsection{ଶାସà­à¬¤à­à¬°à­€à­Ÿ ମାନà­à­Ÿà¬¤à¬¾}
-\subsection{ଓଡ଼ିଆ କଥନ}
-\subsection{ଓଡ଼ିଆ ଲିପି}
-\subsection{କମà­à¬ªà­à­Ÿà­à¬Ÿà¬°à¬°à­‡ ଓଡ଼ିଆ}
-\subsection{ଓଡ଼ିଆ ଭାଷାର ସରକାରୀକରଣ}
-\subsection{ଇଉନିକୋଡ଼ରେ ଓଡ଼ିଆ}
-\subsection{ଆଧାର}
-
-
-\bigskip
-\today
-
-
-
-\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
deleted file mode 100644
index b291acb0b5e..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-thai.tex b/Master/texmf-dist/doc/latex/polyglossia/example-thai.tex
deleted file mode 100644
index b443c36fc90..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-thai.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[no-math]{fontspec}
-\usepackage{xltxtra,url}
-\usepackage{polyglossia}
-\setdefaultlanguage[numerals=thai]{thai}
-\setotherlanguage{english}
-\setmainfont{Norasi}
-\begin{document}
-\begin{center}
- \abstractname
-\end{center}
-\begin{english}
-Some English to begin with.\footnote{ %
- Blabla}
-\end{english}
-%%% NOTE: The wordbreak (\wbr) commands were inserted by the preprocessor cttex
-%%% (available from http://linux.thai.net/pub/thailinux/cvs/software/cttex/
-%%% or from http://packages.debian.org/cttex)
-%%% using the command :
-%%% $ cttex-utf8 <infile.tex> <outfile.tex>
-%%% where cttex-utf8 is the following simple shell script:
-%%% #!/bin/bash
-%%% cat $1 | iconv -f UTF-8 -t TIS-620 | cttex -w | sed 's/<WBR>/\\wbr /g' | iconv -f TIS-620 -t UTF8 > $2
-%%% (this should also work on MacOSX; windows users need to tweak it into a batch file I guess)
-
-เป็น\wbr à¹à¸œà¸™à¸‡à¸²à¸™à¹€à¸žà¸·à¹ˆà¸­\wbr สนับสนุน\wbr à¸à¸²à¸£\wbr ร่วมà¸à¸±à¸™\wbr สร้าง, à¸à¸²à¸£\wbr ร่วมà¸à¸±à¸™à¹ƒà¸Šà¹‰, à¹à¸¥à¸°\wbr à¸à¸²à¸£%
-ร่วมà¸à¸±à¸™\wbr พัฒนา\wbr ทรัพยาà¸à¸£\wbr ทาง\wbr ภาษา\wbr ของ\wbr ภาษา\wbr ไทย, บน\wbr เครือข่าย World Wide Web. à¹à¸œà¸™à¸‡à¸²à¸™à¸™à¸µà¹‰\wbr มี%
-จุด\wbr ประสงค์หลั\wbr à¸à¸­à¸¢à¸¹à¹ˆ\wbr สอง\wbr ประà¸à¸²à¸£à¸„ือ เพื่อà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²\wbr à¸à¸³\wbr à¹à¸žà¸‡\wbr ทาง\wbr ภาษา, à¹à¸¥à¸°à¸£à¸±à¸à¸©à¸²%
-ไว้เพื่อ\wbr ความค\wbr งอยู่\wbr ของ\wbr ภาษา\wbr à¹à¸¥à¸°\wbr วัฒนธรรม\wbr ไทย.
-
-เรา\wbr ตระหนัà¸\wbr ดีถึง\wbr ความ\wbr สำคัà¸\wbr ของ\wbr ภาษา ซึ่ง\wbr นอà¸à¸ˆà¸²à¸\wbr จะ\wbr เป็นสื่อ\wbr ระหว่าง\wbr คนà¸à¸±à¸š\wbr คน\wbr à¹à¸¥à¹‰à¸§ ยัง\wbr เป็น%
-รูปà¹à¸—น\wbr ความคิด à¹à¸¥à¸°\wbr เป็น\wbr เครื่องมือ\wbr ใน\wbr à¸à¸²à¸£à¹ƒà¸Šà¹‰\wbr ความคิด\wbr ด้วย. เครือข่าย\wbr คอมพิวเตอร์%
-ใน\wbr ปัจจุบัน\wbr ทำให้ข้อมูล\wbr ข่าวสาร\wbr à¹à¸žà¸£à¹ˆà¸«à¸¥à¸²à¸¢\wbr ไป\wbr อย่าง\wbr รวดเร็ว. เครื่องมือที่ใช้\wbr ใน\wbr à¸à¸²à¸£à¹à¸ª\wbr ดง\wbr ผล%
-à¹à¸¥à¸°\wbr à¸à¸²à¸£à¹€à¸•\wbr รี\wbr ยมข้อมูล\wbr ข่าวสาร\wbr นั้น จึง\wbr เป็นสิ่ง\wbr จำ\wbr เป็น. ด้วย\wbr เทคโนโลยีที่\wbr à¸à¹‰à¸²à¸§à¸«à¸™à¹‰à¸²\wbr ไป%
-อย่าง\wbr รวดเร็ว, à¸à¸²à¸£à¸—ี่\wbr เพียง\wbr จะ\wbr สามารถà¹à¸ª\wbr ดง\wbr ผลได้หรือ\wbr ป้อนข้อมูลได้\wbr เท่านั้น ไม่\wbr เป็นที่%
-เพียงพออีà¸\wbr à¹à¸¥à¹‰à¸§. à¸à¸²à¸£à¹à¸ª\wbr ดง\wbr ผลที่\wbr สวย\wbr งาม\wbr ถูà¸\wbr ต้อง\wbr ตาม\wbr à¹à¸šà¸šà¹à¸œà¸™ หรือ\wbr à¸à¸²à¸£à¹€à¸•\wbr รี\wbr ยมข้อมูลได้\wbr อย่าง%
-ถูà¸\wbr ต้อง à¹à¸¥à¸°\wbr รวดเร็วจึง\wbr เป็นสิ่งที่\wbr จำ\wbr เป็นที่\wbr จะ\wbr ต้อง\wbr พัฒนาให้\wbr ทันตาม\wbr à¸à¸²à¸£\wbr เปลี่ยนà¹à¸›à¸¥à¸‡\wbr ของ%
-เทคโนโลยี.\footnote{ %
- Second footnote}
-
-\today
-
-\begin{english}
-This is today: \today
-\end{english}
-
-\begin{enumerate}
- \item A
- \item B
- \begin{enumerate}
- \item a
- \item b
- \item c
- \end{enumerate}
- \item C
-\end{enumerate}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex b/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex
deleted file mode 100644
index b226e61f186..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/example-uyghur.tex
+++ /dev/null
@@ -1,128 +0,0 @@
-% !TeX TS-program = xelatex
-\documentclass[a4paper]{book}
-\usepackage{polyglossia}
-\usepackage{graphicx}
-\usepackage{url,amsmath}
-
-\setmainlanguage{uyghur}
-\newfontfamily\arabicfont[Script=Arabic,Scale=1]{UKIJ Tuz}
-\let\arabicfonttt\ttfamily
-
-\setotherlanguage[variant=british]{english}
-
-\title{لاتÛكىس قوللانمىسى}
-\author{neouyghur}
-\date{\today}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\listoffigures
-
-\listoftables
-
-\pagenumbering{arabic}
-
-\chapter{ئۇيغۇرلار}
-
-\section{ئۇيغۇرلار ۋە ئۇلارنىڭ تۇرمۇش مەدەنىيىتى}
-
-ئۇيغۇرلار شىنجاڭ ئۇيغۇر ئاپتونوم رايونىنىڭ ھەقىقىي ئىگىلىرى Û‹Û• مىراسخورلىرى بولۇپ، بۇ رايوندا توپلىشىپ ياشايدىغان غوللۇق، يەرلىك مىللەت Û‹Û• ئاپتونومىيە ھوقۇقى يۈرگۈزگۈچى مىللەت. ئۇيغۇرلار پارچە ھالەتتە، جۇڭگونىڭ بىر قاتار Ú†ÙˆÚ­ شەھەرلىرىدە خىزمەت Û‹Û• تىجارەت قىلىدۇ. ئۇيغۇرلار شىنجاڭ ئۇيغۇر ئاپتونوم رايونىدىن باشقا، ÙŠÛ•Ù†Û• جۇڭگو، قازاقىستان، قىرغىزىستان، ئۆزبÛكىستان، تاجىكىستان، تۈركمەنىستان (ئاساسلىقى بايرام ئەلى رايونى)ØŒ پاكىستان، ئەرەبىستان، تۈركىيە، ئاۋسترالىيە، Ú¯Ûرمانىيە، نورۋىگىيە، گوللاندىيە، شىۋىتسىيە، Ùىنلاندىيە، بÛلگىيە، روسيە، ئامÛرىكا قاتارلىق دۆلەتلەردە كۆرۈنەرلىك نوپۇستا، مۇئەييەن جامائەت تۈركۈمى شەكلىدە ياشايدۇ.
-
-\begin{english}
-The \textbf{Uyghurs}\footnote{%
- From \url{https://en.wikipedia.org/wiki/Uyghurs}} have traditionally inhabited a series of oases scattered across the Taklamakan Desert within the Tarim Basin. These oases have historically existed as independent states or were controlled by many civilizations including China, the Mongols, the Tibetans and various Turkic polities. The Uyghurs gradually started to become Islamized in the 10th century and most Uyghurs identified as Muslims by the 16th century. Islam has since played an important role in Uyghur culture and identity.
-\end{english}
-
-\section{نىكاھ}
-ئۇيغۇرلاردا نىكاھ مۇناسىۋىتى بىلەن چاي ئىچكۈزۈش، توي ئالدىدىكى مەسلىھەت چايلىرى، نىكاھ ئوقۇپ قىز-يىگىتنىڭ رازىلىقىنى ئÛلىش، توي مۇراسىمى، يىگىت-قىزلار ئولتۇرۇشى، قۇدىلار چىللاقلىرى ئىزچىل ساقلىنىپ كەلدى. ئۇيغۇرلاردا دەپنە مۇراسىمى ھەرقايسى دىنىي مەدەنىيەتلەر تەسىرىدە ھەرخىل بولسىمۇ، ئەمما Ù…Ûيىتنى پاكىزە ÙŠÛ‡ÙŠÛ‡Ù¾ ÙƒÛپەنلەش، ھازىدارلار ئاق رومال سÛلىپ، ئاق بەلۋاغ باغلاپ يىغا-زارە قىلىش، Ù…Ûيىتنىڭ نامىزىنى چۈشۈرۈش، جىنازىنى ئالمىشىپ تالىشىپ كۈتۈرۈپ قەبرىستانلىققا ئÛلىپ بÛرىش، لەھەتتە Ù…Ûيىتنىڭ يۈزىنى قىبلە (غەرب) تەرەپكە قىلىپ ياتقۇزۇش، ئىچ گۆرنىڭ ئاغزىنى ÙƒÛسەك بىلەن ئÛتىپ، تاش گۆرنى توپا بىلەن كۆمۈش، قەبرە بÛشىدا Ù…Ûيىتنىڭ ئىجابىي تەرىپىگە گۇۋاھلىق بÛرىش، قەبرە تÛشى-گۈمبەز ئورنىتىش، Ù…Ûيىتنىڭ يەتتە، قىرىق، يىل نەزىرلىرىنى ئۆتكۈزۈش ئادەتلىرى بىردەك ئىزچىل بۇلۇپ كەلدى. ئۇيغۇرلار Û‹Û• ئۇلارنىڭ ئەجدادلىرى Ù…Ûيىت سۆڭىكىنى كاھىش (ساپال) ساندۇققا سÛلىپ يەرلىككە قۇيۇش، Ù…Ûيىتنى تاش گۆرگە كۆمۈش، Ù…Ûيىتنى ئاستىغا ياغاچ شادا قويۇلغان گۆرگە ياتقۇزۇپ، ئۈستىگە قىزىل تۇپراق Û‹Û• Ù‚Û‡Ù… تۆكۈپ كۆمۈش، شام گۆرگە قويۇش قاتارلىق دەپنە قىلىش ئۇسۇللىرىنىمۇ قوللاندى.
-
-\section{Ú¾Ûيت-ئايەم}
-
-
-\begin{figure}
- \begin{center}
-\includegraphics[scale=1]{example-image-a}
-\caption{ئا رەسىم.}
- \end{center}
-\end{figure}
-
-\begin{table}
-\begin{center}
- \begin{tabular}{||c c c c||}
- \hline
- Col1 & Col2 & Col2 & Col3 \\ [0.5ex]
- \hline\hline
- 1 & 6 & 87837 & 787 \\
- \hline
- 2 & 7 & 78 & 5415 \\
- \hline
- 3 & 545 & 778 & 7507 \\
- \hline
- 4 & 545 & 18744 & 7560 \\
- \hline
- 5 & 88 & 788 & 6344 \\ [1ex]
- \hline
- \end{tabular}
- \caption{بىر سىناق جەدۋەل}
-\end{center}
-\end{table}
-
-\begin{equation}
- x^2 + y^2 = z^2
- \label{test}
-\end{equation}
-
-
-\chapter{مەڭگۈ تاش يادىكارلىقلىرى}
-
-\section{تەس Ù…Û•Ú­Ú¯Ûˆ تÛشى}
-بۇ Ù…Û•Ú­Ú¯Ûˆ تاش يادىكارلىقى 1976- يىلى موڭغۇلىيەدىكى تەس دەرياسىنىڭ سول قىرغىدىكى نوغۇن تولغوي ئىگىزلىكىنىڭ ÙŠÛنىدىن تÛپىلغانلىقى ئۈچۈن، «تەس Ù…Û•Ú­Ú¯Ûˆ تÛشى» دەپ ئاتالغان. «تەس Ù…Û•Ú­Ú¯Ûˆ تÛشى» ئورخۇن ئۇيغۇر خانلىقى دەۋرىگە مەنسۇپ يادىكارلىقلارنىڭ ئىچىدە بۇزغۇنچىلىققا ئۇچرىشى ئÛغىرراق. ئەڭ مۇھىم بولغان يازما يادىكارلىق. ئۇنىڭدا بۆگۈ قاغان (759- 780- يىللار) ئەجدادى (دادىسى) بولغان ئەل ئەتمىش بىلگە قاغان (مويۇنچۇر، 747- 759- يىللار9 دەۋرىگىچە بولغان ئۇيغۇر قاغانلىرىنىڭ تارىخى، جۈملىدىن بىرىنچى Û‹Û• ئىككىنچى ئۇيغۇر خانلىقىنىڭ تەقدىرى. ÙƒÛ†Ù„ بىلگە قاغان Û‹Û• ئەل ئەتمىش بىلگە قاغان باشچىلىقىدىكى ئۈچىنچى ئۇيغۇر خانلىقىنىڭ بەرپا بولۇشى قاتارلىق مەسىلىلەر ھەققىدە مەلۇمات بÛرىلگەن. بۇ ھەقتىكى بىر قىسىم مەزمۇنلار كونا- ÙŠÛÚ­Ù‰ تاڭنامىلەردە ئۇچرىمايدۇ. شۇڭا تەس Ù…Û•Ú­Ú¯Ûˆ تÛشىدىكى مەلۇماتلار زور سÛلىشتۇرما قىممەتكە ئىگە. تەتقىقاتلارغا قارىغاندا، «تەس Ù…Û•Ú­Ú¯Ûˆ تÛشى» نىڭ ئاپتورى مويۇنچۇر قاغاننىڭ ÙŠÛقىن تۇققىنى تۈپەك ئالىپ Ø´Û‡Ù„ دÛÚ¯Û•Ù† كىشى بولۇپ، Ù…Û•Ú­Ú¯Ûˆ تاشنى قاغان ÙŠÛڭىدىن تەختكە چىققان ۋاقىتتا توغرىسى 761- 762- يىللىرى ئورنىتىلغان، دÛيىشكە بولىدۇ.
-
-
-\begin{table}
- \begin{center}
- \begin{tabular}{||c c c c||}
- \hline
- Col1 & Col2 & Col2 & Col3 \\ [0.5ex]
- \hline\hline
- 1 & 6 & 87837 & 787 \\
- \hline
- 2 & 7 & 78 & 5415 \\
- \hline
- 3 & 545 & 778 & 7507 \\
- \hline
- 4 & 545 & 18744 & 7560 \\
- \hline
- 5 & 88 & 788 & 6344 \\ [1ex]
- \hline
- \end{tabular}
- \caption{يەنە بىر سىناق جەدۋەل}
- \end{center}
-\end{table}
-
-\section{تÛرخىن Ù…Û•Ú­Ú¯Ûˆ تÛشى}
-
-\begin{figure}
- \begin{center}
- \includegraphics[scale=0.5]{example-image-b}
- \caption{ب رەسىم.}
- \end{center}
-\end{figure}
-
-\begin{thebibliography}{9}
- \bibitem{latexcompanion}
- Michel Goossens, Frank Mittelbach, and Alexander Samarin.
- \textit{The \LaTeX\ Companion}.
- Addison-Wesley, Reading, Massachusetts, 1993.
-
- \bibitem{einstein}
- ئو. تۇرسۇن.
- \textit{لاتÛكىست قوللانمىسى}. (ئۇيغۇرچە)
- [\textit{بىر ژورنال}]. , 322(10):891–921, 1905.
-\end{thebibliography}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
deleted file mode 100644
index ad1d2d4f693..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.tex b/Master/texmf-dist/doc/latex/polyglossia/examples.tex
deleted file mode 100644
index 09beb075e70..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/examples.tex
+++ /dev/null
@@ -1,151 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[no-math]{fontspec}
-\usepackage{xltxtra,url}
-\let\XeTeX\undefined
-\let\XeLaTeX\undefined
-\usepackage{polyglossia}
-\usepackage{trace}
-\setdefaultlanguage{french}
-\setotherlanguage[variant=british,ordinalmonthday=false]{english}
-\setotherlanguage[variant=poly]{greek}
-\setotherlanguage[numerals=thai]{thai}
-\setotherlanguage[locale=mashriq]{arabic}
-\setotherlanguage[spelling=new,latesthyphen=true,babelshorthands=true]{german}
-\setotherlanguages{latin,russian,turkish,polish,latvian,sanskrit,ukrainian,farsi,syriac,divehi,hebrew,amharic,nko}
-\setotherlanguage[calendar=gregorian,numerals=western]{urdu}
-\setmainfont{Linux Libertine O}
-\defaultfontfeatures{Scale=MatchLowercase}
-\setmonofont{Inconsolata}
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}[%
- UprightFont = *-Regular,
- BoldFont = *-Bold,
- Extension = .ttf,
- ItalicFont = *-Italic,
- BoldItalicFont = *-BoldItalic]
-\newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
-\newfontfamily\hebrewfont[Script=Hebrew]{Ezra SIL}
-\newfontfamily\sanskritfont[Script=Devanagari]{Sanskrit 2003}
-\newfontfamily\thaifont[Script=Thai]{Norasi}
-\newfontfamily\thaanafont[Script=Thaana,WordSpace=2]{FreeSerif}
-\newfontfamily\ethiopicfont[Script=Ethiopic]{Abyssinica SIL}
-\newfontfamily\nkofont[Renderer=Graphite]{Conakry}
-\parskip 1.33\baselineskip
-%\newcommand\showhyphmin{\fbox{\the\lefthyphenmin\ \the\righthyphenmin}}
-\begin{document}
-\hyphenation{Bru-xel-les}
-\noindent
-\textbf{Le français}\footnote{ From \url{http://fr.wikipedia.org/wiki/Français}} est une langue romane parlée en France, dont elle est originaire (la «langue d'oïl»), ainsi qu'en Afrique francophone, au Canada (principalement au Québec, au Nouveau-Brunswick et en Ontario), en Belgique (en Région wallonne et à Bruxelles), en Suisse, au Liban, en Haïti et dans d'autres régions du monde, soit au total dans 51 pays du monde ayant pour la plupart fait partie des anciens empires coloniaux français et belge. \\
-(\today)
-
-\begin{english}
-\textbf{English}\footnote{From \url{http://en.wikipedia.org/wiki/English_language}} is a West Germanic language originating in England, and the first language for most people in Australia, Canada, the Commonwealth Caribbean, Ireland, New Zealand, the United Kingdom and the United States of America (also commonly known as the Anglosphere). It is used extensively as a second language and as an official language throughout the world, especially in Commonwealth countries and in many international organisations. \\
-(\today)
-\end{english}
-
-\begin{german}
-\textbf{Die deutsche Sprache}\footnote{ From \url{http://de.wikipedia.org/wiki/Deutsche_Sprache}} (auch das Deutsche) gehört zum westlichen Zweig der germanischen Sprachen und ist eine der meistgesprochenen europäischen Sprachen weltweit, und gilt so als Weltsprache.\\
-(\today)
-\end{german}
-
-\begin{russian}
-\textbf{РуÑÑкий Ñзык} — один из воÑточноÑлавÑнÑких Ñзыков, один из крупнейших Ñзыков мира, в том чиÑле Ñамый раÑпроÑтранённый из ÑлавÑнÑких Ñзыков и Ñамый раÑпроÑтранённый Ñзык Европы, как географичеÑки, так и по чиÑлу ноÑителей Ñзыка как родного (Ñ…Ð¾Ñ‚Ñ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ, и географичеÑки боÌльшаÑ, чаÑÑ‚ÑŒ руÑÑкого Ñзыкового ареала находитÑÑ Ð² Ðзии). \\
-(\today)
-\end{russian}
-
-\begin{latin}
-\textbf{Lingua Latina} est lingua Indoeuropaea. Nomen ductum est de terra in paeninsula Italica quam Latine loquentes incolebant, Vetus Latium appellata sitaque inter flumen Tiberis, Volscam terram, mare Tyrrhenicum, montes Apenninos.
-Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loqui possint, lingua mortua appellari solet, multas tamen peperit linguas quae linguae romanicae vocantur, sicut Hispanicam, Francogallicam, Italicam, Lusitanam, Dacoromanicam, Gallaicam, ne omnes afferam. \\
-(\today)
-\end{latin}
-
-\begin{greek}
-\textbf{Η ελληνική γλώσσα} είναι μία από τις ινδοευÏωπαϊκές γλώσσες, για την
-οποία έχουμε γÏαπτά κείμενα από τον 15ο αιώνα Ï€.Χ. μέχÏι σήμεÏα. Αποτελεί το
-μοναδικό μέλος ενός κλάδου της ινδοευÏωπαϊκής οικογένειας γλωσσών. Ανήκει
-επίσης στον βαλκανικό γλωσσικό δεσμό.\\
-(\today)
-\end{greek}
-
-
-\begin{hebrew}[numerals=hebrew]
-\textbf{עברית} ×”×™× ×©×¤×” ממשפחת השפות השמיות, הידועה כשפתו של ×”×¢× ×”×™×”×•×“×™, ו×שר ניב מודרני שלה משמש כשפה הרשמית והעיקרית של מדינת ישר×ל. \\
-(\today\ = \hebrewtoday)
-\end{hebrew}
-
-\begin{syriac}[numerals=abjad]
-Ü Ü«Ü¢Ü ÜܪܡÜÜ Üܘ ÜܪܡÜܬ ܗܘ Ü Ü«Ü¢ÌˆÜ Ü¥Ü¡ ܬܫܥÜÜ¬Ü Ü•\textrm{3000} ܫܢ̈ÜÜÜ‚ Ü—Ü˜Ü Ü Ü«Ü¢Ü Ü•Ü¡Ü ÜŸÜ˜ÌˆÜ¬Ü Ü˜Ü¬Ü˜Ü•ÌˆÜܬÜÜ‚ ܥܡ Ü Ü«Ü¢Ü Ü¥Ü’ÜªÜÜÜ„ Ü—Ü˜Ü Ü Ü«Ü¢Ü Ü•Ü£Ü¦ÜªÌˆÜ Ü•Ü•Ü¢ÜÜÜÜ  Ü˜Ü¥Ü™ÜªÜ Ü˜Ü—Ü˜ Ü Ü«Ü¢Ü ÜšÜ•Ü¢ÜÜ Ü•Ü¬Ü Ü¡Ü˜Ü•Ü‚ ÜܪܡÜÜ Ü—Ü˜Ü Ü Ü«Ü¢Ü Ü•Üܫܘܥ܂ ÜÜ•Üܘܡ܄ ÜܪܡÜÜ Ü—Ü˜ Ü Ü«Ü¢Ü Ü•ÜŸÜ Ü•ÌˆÜÜÜ„ Üܬܘܪ̈ÜÜÜ„ ܡܪ̈ܘܢÜÜÜ„ ܘܣܘܪ̈ÜÜÜÜ€ \\
-(\today)
-\end{syriac}
-
-\begin{turkish}
-\textbf{Türkiye Türkçesi}, Ural-Altay Dilleri içerisinde Türk dil ailesinin Oğuz Grubu'na mensup lehçedir. Anadolu, Kıbrıs, Balkanlar ve Orta Avrupa'da geniş yayılım alanı bulmuş olup, Türkiye Cumhuriyeti, Kuzey Kıbrıs Türk Cumhuriyeti, Güney Kıbrıs Rum Kesimi, Makedonya ve Kosova'nın resmî dilidir. \\
-(\today = \Hijritoday)
-\end{turkish}
-
-\begin{polish}
-\textbf{Język polski (polszczyzna)} należy wraz z językiem czeskim, słowackim, pomorskim (kaszubskim), dolnołużyckim, górnołużyckim oraz wymarłym połabskim do grupy języków zachodniosłowiańskich, stanowiących część rodziny języków indoeuropejskich. Ocenia się, że język polski jest językiem ojczystym około 44 milionów ludzi na świecie (w literaturze naukowej można spotkać szacunki od 40 do 48 milionów), mieszkańców Polski oraz Polaków zamieszkałych za granicą (Polonia).\\
-(\today)
-\end{polish}
-
-\begin{latvian}
-\textbf{LatvieÅ¡u valoda} ir dzimtÄ valoda apmÄ“ram 1,5 miljoniem cilvÄ“ku, galvenokÄrt LatvijÄ, kurÄ tÄ ir vienÄ«gÄ valsts valoda. LielÄkÄs latvieÅ¡u valodas pratÄ“ju kopienas ÄrzemÄ“s ir AustrÄlijÄ, ASV, ZviedrijÄ, LielbritÄnijÄ, VÄcijÄ, BrazÄ«lijÄ, KrievijÄ. LatvieÅ¡u valoda pieder indoeiropieÅ¡u valodu saimes baltu valodu grupai.\\
-(\today)
-\end{latvian}
-
-\begin{ukrainian}
-\textbf{УкраїнÑька мова} — ÑхідноÑлов'ÑнÑька мова, входить до однієї підгрупи з білоруÑькою та роÑійÑькою. Подібно до цих мов українÑьку запиÑують кирилицею. ІÑторично білоруÑька та українÑька мови походÑÑ‚ÑŒ з давньоруÑької (давньоукраїнÑької) — розмовної мови КиївÑької РуÑÑ–.\\
-(\today)
-\end{ukrainian}
-
-\begin{sanskrit}
-{\Large ससकत} पृथिवà¥à¤¯à¤¾à¤‚ पà¥à¤°à¤¾à¤šà¥€à¤¨à¤¾ समृदà¥à¤˜à¤¾ वैजà¥à¤žà¤¾à¤¨à¤¿à¤•à¥€ च भाषा मनà¥à¤¯à¤¤à¥‡ । विशà¥à¤µà¤µà¤¾à¤™à¥â€Œà¤®à¤¯à¥‡à¤·à¥ संसà¥à¤•à¥ƒà¤¤à¤‚ शà¥à¤°à¥‡à¤·à¥à¤ à¤°à¤¤à¥à¤¨à¤®à¥ इति न केवलं भारते अपि तॠसमगà¥à¤°à¤µà¤¿à¤¶à¥à¤µà¥‡ à¤à¤¤à¤¦à¥à¤µà¤¿à¤·à¤¯à¥‡ निरà¥à¤£à¤¯à¤¾à¤§à¤¿à¤•à¤¾à¤°à¤¿à¤­à¤¿: जनै: सà¥à¤µà¥€à¤•à¥ƒà¤¤à¤®à¥ । महरà¥à¤·à¤¿ पाणिनिना विरचिता अषà¥à¤Ÿà¤¾à¤§à¥à¤¯à¤¾à¤¯à¥€ इति संसà¥à¤•à¥ƒà¤¤à¤µà¥à¤¯à¤¾à¤•à¤°à¤£à¤®à¥â€Œ अधà¥à¤¨à¤¾à¤ªà¤¿ भारते विदेशेषॠच भाषाविजà¥à¤žà¤¾à¤¨à¤¿à¤¨à¤¾à¤‚ पà¥à¤°à¥‡à¤°à¤£à¤¾à¤¸à¥â€à¤¥à¤¾à¤¨à¤‚ वरà¥à¤¤à¤¤à¥‡ . संसà¥à¤•à¥ƒà¤¤à¤¶à¤¬à¥à¤¦à¤¾: à¤à¤µ उतà¥à¤¤à¤°à¤‚ दकà¥à¤·à¤¿à¤£à¤‚ च भारतं संयोजयनà¥à¤¤à¤¿ ।
-\end{sanskrit}
-
-\begin{Arabic}[]
-«اعلم أنّ Ùنّ التاريخ Ùنّ عزيز المذهب، جمّ الÙوائد، شري٠الغاية؛ إذ هو يوقÙنا على أحوال الماضين من الأمم ÙÙŠ أخلاقهم، Ùˆ الأنبياء ÙÙŠ سيرهم، Ùˆ الملوك ÙÙŠ دولهم Ùˆ سياستهم؛ حتّى تتمّ Ùائدة الإقتداء ÙÙŠ ذلك لمن يرومه ÙÙŠ أحوال الدين Ùˆ الدنيا.» (ابن خلدون، المقدّمة)\\
-(\today\ = \Hijritoday[0])
-\end{Arabic}
-
-\begin{farsi}
-Ùارسی یا پارسی، (Ú©Ù‡ دری، Ùارسی دری، Ùˆ پارسی دری نیز نامیده می‌شود) زبانی است Ú©Ù‡
-در کشورهای ایران، اÙغانستان، تاجیکستان Ùˆ ازبکستان به آن سخن می‌رانند. \\
-(\Jalalitoday = \Hijritoday)
-\end{farsi}
-
-\pagebreak
-\begin{urdu}
-اÙردو ایک Ûندآریائی زبان ÛÛ’ جس کا تعلّق Ûند یوروپی لسانی خاندان Ú©ÛŒ Ûندایرانی شاخ سے ÛÛ’Û” بارÛویں صدی میں Ûندوستان Ú©ÛŒ مقامی زبانوں اور Ùارسی، عربی، اور تÙرکی زبانوں Ú©Û’ اختلاط سے اردو وجود میں آئی۔ اردو پاکستان Ú©ÛŒ قومی زبان ÛÛ’ØŒ اور Ûندوستان Ú©ÛŒ 23 سرکاری زبانوں میں سے ایک ÛÛ’Û” جنوبی ایشیا Ú©Û’ باÛر خلیج٠Ùارس Ú©Û’ ممالک، سعودی عرب، برطانیÛØŒ امریکÛØŒ کنیڈا، جرمنی، ناروے، اور آسٹریلیا میں بھی جنوبی ایشیائی Ù…Ûاجرین Ú©ÛŒ بڑی تعداد اردو بولتی ÛÛ’Û” \\
-
-(\today\ مطابق \Hijritoday[0])
-\end{urdu}
-
-\begin{thai}
-เป็น\wbr à¹à¸œà¸™à¸‡à¸²à¸™à¹€à¸žà¸·à¹ˆà¸­\wbr สนับสนุน\wbr à¸à¸²à¸£\wbr ร่วมà¸à¸±à¸™\wbr สร้าง, à¸à¸²à¸£\wbr ร่วมà¸à¸±à¸™à¹ƒà¸Šà¹‰, à¹à¸¥à¸°\wbr à¸à¸²à¸£%
-ร่วมà¸à¸±à¸™\wbr พัฒนา\wbr ทรัพยาà¸à¸£\wbr ทาง\wbr ภาษา\wbr ของ\wbr ภาษา\wbr ไทย, บน\wbr เครือข่าย World Wide Web. à¹à¸œà¸™à¸‡à¸²à¸™à¸™à¸µà¹‰\wbr มี%
-จุด\wbr ประสงค์หลั\wbr à¸à¸­à¸¢à¸¹à¹ˆ\wbr สอง\wbr ประà¸à¸²à¸£à¸„ือ เพื่อà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²\wbr à¸à¸³\wbr à¹à¸žà¸‡\wbr ทาง\wbr ภาษา, à¹à¸¥à¸°à¸£à¸±à¸à¸©à¸²%
-ไว้เพื่อ\wbr ความค\wbr งอยู่\wbr ของ\wbr ภาษา\wbr à¹à¸¥à¸°\wbr วัฒนธรรม\wbr ไทย. \\
-(\today)
-\end{thai}
-
-\begin{divehi}\small\sloppy
-Þ‹Þ¨ÞˆÞ¬Þ€Þ¨Þ„Þ¦Þ€Þ¦Þ†Þ© Þ‹Þ¨ÞˆÞ¬Þ€Þ¨ÞƒÞ§Þ‡Þ°Þ–Þ­ÞŽÞ¬ ÞƒÞ¦ÞÞ°Þ‰Þ© Þ„Þ¦Þ€Þ¬ÞˆÞ¬. Þ‰Þ¨ Þ„Þ¦Þ€ÞªÞ‚Þ° ÞˆÞ§Þ€Þ¦Þ†Þ¦ Þ‹Þ¦Þ‡Þ°Þ†Þ¦Þ‡Þ¨ Þ‡ÞªÞ…Þ¬Þ‚Þ© Þ‹Þ¨ÞˆÞ¬Þ€Þ¨ÞƒÞ§Þ‡Þ°Þ–Þ­ÞŽÞ¬ Þ‡Þ¦Þ€ÞªÞÞªÞˆÞ¬ÞƒÞ¨Þ‚Þ°ÞŽÞ¬ އިތުރުން Þ€Þ¨Þ‚Þ°Þ‹ÞªÞްތާނުގެ Þ‰Þ¦ÞÞ¨Þ†Þª ÞŽÞ¬
-Þ‡Þ¦Þ€ÞªÞÞªÞˆÞ¬ÞƒÞ¨Þ‚Þ°Þ‚Þ¬ÞˆÞ¬. Þ‡Þ¬Þ„Þ¦Þ‡Þ¨Þ‰Þ©Þ€ÞªÞ‚Þ° Þ‰Þ¨ Þ„Þ¦Þ€Þ¦ÞÞ° Þ†Þ¨Þ”Þ¦Þ‚Þ© Þ‰Þ¦Þ€Þ¦ÞÞ° Þ„Þ¦Þ€Þ¬ÞˆÞ¬. Þ„Þ¦Þ€Þ§Þ„Þ¬Þ€Þ­ Þ‰Þ§Þ€Þ¨ÞƒÞªÞ‚Þ° Þ‹Þ¨ÞˆÞ¬Þ€Þ¨Þ„Þ¦ÞÞ° Þ€Þ¨Þ‰Þ¦Þ‚ÞªÞ‡Þ°ÞˆÞ¦Þ‡Þ¨ÞŠÞ¦Þ‡Þ¨ÞˆÞ¦Þ‚Þ© Þ‡Þ¨Þ‚Þ°Þ‘Þ¯ Þ‡Þ§ÞƒÞ¨Þ”Þ¦Þ‚Þ° Þ„Þ¦Þްތަކުގެ
-ތެރޭގަ އެވެ.
-\end{divehi}
-
-%\fontspec[Script=Georgian]{DejaVu Serif}
-%ქáƒáƒ áƒ—ული ენრáƒáƒ áƒ˜áƒ¡ სáƒáƒ¥áƒáƒ áƒ—ველáƒáƒ¡ სáƒáƒ®áƒ”ლმწიფრენრ(áƒáƒ¤áƒ®áƒáƒ–ეთის áƒáƒ•áƒ¢áƒáƒœáƒáƒ›áƒ˜áƒ£áƒ  რესპ\-უბლიკáƒáƒ¨áƒ˜ მის პáƒáƒ áƒáƒšáƒ”ლურáƒáƒ“ სáƒáƒ®áƒ”ლმწიფრენáƒáƒ“ áƒáƒ¦áƒ˜áƒáƒ áƒ”ბულირáƒáƒ’რეთვე áƒáƒ¤áƒ®áƒáƒ–ური ენáƒ). ქáƒáƒ áƒ—ულ ენáƒáƒ–ე 7 მილიáƒáƒœáƒ–ე მეტი áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ˜ ლáƒáƒžáƒáƒ áƒáƒ™áƒáƒ‘ს.
-%
-
-\begin{amharic}
-\textbf{አማርኛ} የኢትዮጵያ መደበኛ ቋንቋ áŠá‹á¢ ከሴማዊ ቋንቋዎች እንደ ዕብራይስጥ ወይሠዓረብኛ አንዱ áŠá‹á¢ እንዲያá‹áˆ 27 ሚሊዮን ያህሠተናጋሪዎች እያሉትᣠአማርኛ ከአረብኛ ቀጥሎ ትáˆá‰ ሴማዊ ቋንቋ áŠá‹á¢ የሚጻáˆá‹áˆ በáŒá‹•á‹ áŠá‹°áˆ áŠá‹á¢ አማርኛ ክዓረብኛና ከዕብራይስጥ ያለዠመሰረታዊ áˆá‹©áŠá‰µ አንደላቲን ከáŒáˆ« ወደ ቀአመጻበáŠá‹á¢ \\
-(\today)
-\end{amharic}
-
-\begin{nko}
-ß’ßžß ß¦ß‹ß« ߛߓßߟߌߞߊ߲ߞߋ ߟߋ߬ ߘߌ߫ ßߘߊ߬ßߌ߲߬ߠߊ߫ ߕߟߋ߬ߓߋ ߘßß« ߡߊ߲߬ߘߋ߲߬ ߡߌߙߌ߲ߘߌ ߞߊ߲ ߞߊߡߊ߬߸ ߊ߬ ߣߴߊ߬ ߡߟߋߞߎߦߊߞߊ߲ ß•ßß® ߟߋ߬. ߞߊ߬ߕߎ߲߯ ߸ ߊ߬ ßžß˜ß ßŸß‹ß¬ ߡߊ߲߬ߘߋ߲߫ ßߘß߬ߓߊ߬ߞߊ߲ ß“ßߟßß² ß“ß߯ ߘßß« ßžßß«: ß’ ߞߊ߲߫ ߠߋ߬ ßžßß«. ßߣߊ߫߸ ߊ߬ ߦߋ߫ ߟߊߓߊ߯ߙߟߊ߫ ߟߊ߫ ߖߡߊ߬ߣߊ ߢߌ߲߬ ߠߎ߫ ߟߋ߬ ߘßß« ߓߊߞßß­: ߖߌ߬ߣßß«ØŒ ߜߋ߲ߞß߰ߖߌ߬ߘߊ، ߊ߬ ߣߌ߫ ߡߊߟߌ߫.
-\\
-(\today)
-\end{nko}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
index f7b12a7bd6b..4c8fabc1d78 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
index 77fb0f02ac3..5cdaf757695 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
@@ -169,7 +169,7 @@
\title{{\textgreek{\xpgtitlefont\color{lightblue}\MakeUppercase{Πολυγλωσσία}}}
\\[16pt]
\color{xpgblue}Polyglossia: Modern multilingual typesetting with \XeLaTeX\ and \LuaLaTeX}
-\author{\TA{François Charette} \and \TA{Arthur Reutenauer}\thanks{Current maintainer}
+\author{\TA{François Charette} \and \TA{Arthur Reutenauer}
\and \TA{Udi Fogiel} \and \TA{Bastien Roucariès} \and \TA{Jürgen Spitzmüller}}
\date{\filedate \qquad \fileversion\thanks{Please report bugs to \url{http://github.com/reutenauer/polyglossia/issues}}\\
\footnotesize (\textsc{pdf} file generated on \today)}
@@ -289,6 +289,9 @@ that are explained in section \ref{specific} below.
\end{table}
+\paragraph{Nota bene} Support for Chinese and Japanese is experimental. This particularly concerns the line breaking mechanism which is a proof of concept.
+Please use with care and report any issues and unexpected output you encounter.
+
\paragraph{Version Notes} The support for Amharic\new{1.0.1} should be considered an experimental attempt to
port the package \pkg{ethiop}; feedback is welcome.
Version 1.1.1\new{1.1.1} added support for Asturian, %\footnote{ Provided by Kevin Godby and Xuacu Saturio.},
@@ -828,21 +831,24 @@ which override the hyphenation patterns for specified words. The command takes a
list of words where hyphenation points are marked by a dash (if no dash is used, the respective word is not
hyphenated at all):
\begin{quote}
-\begin{minipage}{.7\textwidth}
\begin{verbatim}
\hyphenation{%
po-ly-glos-sia
LaTeX
}
\end{verbatim}
-\end{minipage}
\end{quote}
%
-These exceptions, however, apply to all languages. In addition to this, \pkg{polyglossia} provides
+These exceptions, however, apply only to the currently active language.
+
+In addition to this, \pkg{polyglossia} provides
the command\new{1.45}
\displaycmd{\pghyphenation\oarg{options}\marg{lang}\marg{exceptions}}{\pghyphenation}
which can be used to define exceptions that only apply to a specific language or language variant,
-respectively.
+respectively.\footnote{More precisely, it applies to all languages or varieties that share the
+same hyphenation patterns. Hence, for instance, all variants of \xpgoption{german} with
+\xpgoption{spelling=new} will share the same exceptions, as opposed to \xpgoption{spelling=old}
+which uses different patterns.}
\subsection{Hyphenation thresholds}
@@ -2324,14 +2330,15 @@ Ukrainian mathematical symbols.
\meta{lang} is activated locally via \cmd\text\meta{lang} command
\item \Cmd{\noextras@\meta{lang}} stores macros that are to be executed when the language
\meta{lang} is closed
+ \item \Cmd{\nestedextras@\meta{lang}}\new{2.3} stores macros that are to be executed when a nested language
+ is closed and \meta{lang} is the active language again. This is useful
+ for settings that are only possible on global scale.
\end{itemize}
%
-In order to redefine internal macros, we recommend to use the command \cmd\gappto.
-For compatibility with \pkg{babel} the command \cmd\addto\ is also available
-to the same effect. For instance, to change the \cmd\chaptername\ for language ¦lingua¦,
-you can do this:
+In order to redefine internal macros, we recommend to use the command \cmd\addto.
+For instance, to change the \cmd\chaptername\ for language ¦lingua¦, you can do this:
\begin{verbatim}
-\gappto\captionslingua{\def\chaptername{Caput}}
+\addto\captionslingua{\def\chaptername{Caput}}
\end{verbatim}
%
Note that this needs to be done after the respective language has been loaded with
@@ -2722,6 +2729,23 @@ where \meta{type} is a supported language id type (such as ¦bcp-47¦) and \meta
\bgroup\footnotesize
+\subsection*{2.3 (2024/09/23)}
+
+\subsubsection*{Bug fixes}
+\begin{itemize}
+ \item Line-breaking for Japanese and Chinese has been implemented. This is still
+ considered experimental, please test and report any issues (\TXI{635}).
+ \item Prevent the Latin gloss from writing undefined commands
+ to the aux file (\TXI{643}).
+ \item Fix use of \cmd\pghyphenation\ in preamble (\TXI{654}).
+ \item Fix handling of current language options in lists of figures/tables (\TXI{657}).
+ \item Fix definition of \cmd\cyrdash\ so that no linebreak is added when it is used at
+ paragraph begin.
+ \item Fix test for KOMA class in Hungarian and Russian glosses (\TXP{447}).
+ \item Fix display of font name in package error.
+ \item Remove spurious spaces from Korean, Sanskrit, and Serbian glosses (\TXI{659}, \TXI{660})
+\end{itemize}
+
\subsection*{2.2 (2024/07/15)}
\subsubsection*{Bug fixes}
diff --git a/Master/texmf-dist/doc/latex/polyglossia/test-welsh.tex b/Master/texmf-dist/doc/latex/polyglossia/test-welsh.tex
deleted file mode 100644
index 8322392e809..00000000000
--- a/Master/texmf-dist/doc/latex/polyglossia/test-welsh.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\documentclass{article}
-
-\usepackage{polyglossia}
-\setmainlanguage{welsh}
-\setotherlanguage[variant=british,ordinalmonthday=false]{english}
-\usepackage{xinttools}
-\usepackage{longtable}
-
-\begin{document}
-
-\month=8
-\year=2015
-\begin{longtable}{lll}
-\xintFor* #1 in {\xintSeq{7}{9}}\do
- {\xintFor* ##1 in {\xintSeq{1}{31}}\do
- {\day=##1\month=#1\relax\today & \day=##1\month=#1\relax\formaltoday & \day=##1\month=#1\relax\textenglish{\today} \\ }}
-
-\end{longtable}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf
index 794f5fdcb02..2cc561202dd 100644
--- a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf
+++ b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
index 3b52f98102b..27a32654690 100644
--- a/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
+++ b/Master/texmf-dist/doc/latex/profcollege/profcollege-doc.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
index b4802be53e6..d39eb8a06fb 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
index 2fef183bb19..f42b5ce629a 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-docctan.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
index c3e58a2813b..e9dc581cd84 100644
--- a/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
+++ b/Master/texmf-dist/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proflycee/README.md b/Master/texmf-dist/doc/latex/proflycee/README.md
index 11502d6f774..63ddb981978 100644
--- a/Master/texmf-dist/doc/latex/proflycee/README.md
+++ b/Master/texmf-dist/doc/latex/proflycee/README.md
@@ -8,6 +8,7 @@ proflycee est un package qui pourra vous aider à utiliser LaTeX au quotidien.
----------------
-Author : Cédric Pierquet
-email : cpierquet@outlook.fr
-Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+Author : Cédric Pierquet
+email : cpierquet@outlook.fr
+Licences : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+ CC0 for cliparts (from openclipart)
diff --git a/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf b/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf
index 17618e7120f..dfa1dab825f 100644
--- a/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf
+++ b/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip b/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip
index 60298056841..16633c30b93 100644
--- a/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip
+++ b/Master/texmf-dist/doc/latex/profmaquette/profmaquette-doc.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.pdf b/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.pdf
index 3e23a4d2272..3769f87f68e 100644
--- a/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.tex b/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.tex
index 431958ee1f7..d75019352d2 100644
--- a/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/quizztex/quizztex-doc-fr.tex
@@ -4,8 +4,8 @@
\documentclass[french,a4paper,11pt]{article}
\usepackage[margin=2cm,includefoot]{geometry}
-\def\TPversion{0.1.2}
-\def\TPdate{5 novembre 2023}
+\def\TPversion{0.1.4}
+\def\TPdate{10 septembre 2024}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{amsmath,amssymb}
@@ -85,7 +85,7 @@
keywordstyle={\color{violet}},%
classoffset=2,%
alsoletter={-},%
- morekeywords={\QuizzMillions,\QuizzPrendrePlace},%
+ morekeywords={\QuizzMillions,\QuizzPrendrePlace,\SetDefautPrendrePlace,\SetDefautMillions},%
keywordstyle={\color{green!50!black}},%
classoffset=3,%
morekeywords={Largeur,Marge,Hauteurs,Couleur,CouleurFond,CouleurLettre,CouleurTexte,Bonne,Mauvaise,Choix,CoulBonne,CoulChoix,CoulMauvaise,Affichage,EspacementV,OffsetV,Decorations,AffChoix,Jokers,AffJokers,CodeAvant,Offset,Theme,Type,Effet,PositionJokers,Points},%
@@ -205,6 +205,10 @@
\section{Historique}
+\verb|v0.1.4|~:~~~~Ajout d'une commande pour forcer, de manière globale, des paramètres par défaut.
+
+\verb|v0.1.3|~:~~~~Annulation du chargement de \textsf{tikz.babel}.
+
\verb|v0.1.2|~:~~~~Migration de \textsf{\textbackslash tikzstyle} à \textsf{\textbackslash tikzset}.
\verb|v0.1.1|~:~~~~Amélioration de la gestion des hauteurs + modification de la clé \Cle{CodeAvant}.
@@ -255,7 +259,7 @@ Il n'existe pas d'option pour le package, et \packagetex!xcolor! n'est pas charg
\item \packagetex!tikz.calc!
\item \packagetex!tikz.positioning! ;
\item \packagetex!tikz.shapes.geometric! ;
- \item \packagetex!tikz.babel! ;
+ %\item \packagetex!tikz.babel! ;
\item \packagetex!tikz.fadings!.
\end{itemize}
\end{itemize}
@@ -629,4 +633,26 @@ Les cinq arguments obligatoires correspondent à la question et aux réponses, s
{$\mathtt{f'(x)=\dfrac{1}{x}}$}
\end{DemoCode}
+\pagebreak
+
+\section{Modification globale des valeurs par défaut}
+
+\subsection{À la manière de \og Qui veut gagner des Millions ? \fg}
+
+La commande \motcletex!\SetDefautMillions! permet de modifier, de manière globale l'un ou plusieurs des paramètres par défaut.
+
+\begin{DemoCode}[listing only]
+%permet d'enlever les Jokers pour tous les environnements \QuizzMillions
+\SetDefautMillions{Jokers=false}
+\end{DemoCode}
+
+\subsection{À la manière de \og Tout le monde veut prendre sa place \fg}
+
+La commande \motcletex!\SetDefautPrendrePlace! permet de modifier, de manière globale l'un ou plusieurs des paramètres par défaut.
+
+\begin{DemoCode}[listing only]
+%permet d'enlever les effets pour tous les environnements \QuizzPrendrePlace
+\SetDefautPrendrePlace{Effet=false}
+\end{DemoCode}
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/quran/README b/Master/texmf-dist/doc/latex/quran/README
index fdcbe8ab0f0..9ae892af836 100644
--- a/Master/texmf-dist/doc/latex/quran/README
+++ b/Master/texmf-dist/doc/latex/quran/README
@@ -1,23 +1,21 @@
_____________________
The quran package
-v2.2
+v2.3
-The package is prepared for typesetting the holy Quran.
-This work provides several macros for typesetting the whole or
-any parts of the holy Quran based on its popular divisions.
+The package is designed for typesetting the Holy Quran.
+It offers several macros for typesetting the entire text
+or specific sections, based on its traditional divisions.
-For more information, please see the documentation.
+For further details, please refer to the documentation.
-Current version release date: 2023/08/01
+Release Date of the Current Version: 2024/09/07
___________________
Seiied-Mohammad-Javad Razvian
javadr@gmail.com
-Copyright © 2015-2023
-It may be distributed and/or modified under the LaTeX Project Public License,
-version 1.3c or higher "(your choice)". The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
+Copyright © 2015-2024
+This package may be distributed and/or modified under the terms of the LaTeX Project Public License,
+version 1.3c or later (at your option). The latest version of
+the license is at: http://www.latex-project.org/lppl.txt
-This work is “author-maintained†(as per LPPL maintenance status)
-
-by Seiied-Mohammad-Javad Razavian.
+This work has the LPPL maintenance status 'author-maintained'.
diff --git a/Master/texmf-dist/doc/latex/quran/quran-doc.pdf b/Master/texmf-dist/doc/latex/quran/quran-doc.pdf
index 477b8b3dbae..5e06c4c6643 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-doc.pdf
+++ b/Master/texmf-dist/doc/latex/quran/quran-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/quran/quran-doc.tex b/Master/texmf-dist/doc/latex/quran/quran-doc.tex
index a117afc002a..afaebfa8f76 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-doc.tex
+++ b/Master/texmf-dist/doc/latex/quran/quran-doc.tex
@@ -1,6 +1,6 @@
%% This is file `quran-doc.tex',
%%
-%% Copyright © 2015-2023
+%% Copyright © 2015-2024
%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
%%
-%% to one who has devoted his life to Quran
+%% To one who has devoted his life to Quran
%%
\documentclass{ltxdoc}
@@ -112,10 +112,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{\includegraphics[scale=.3]{quran.png}\\
-The \xpackage{quran} Package\thanks{To one having devoted his life to the Holy Quran}}
+The \xpackage{quran} Package\thanks{To one who has devoted his life to the Holy Quran}}
\author{Seiied Mohammad Javad Razavian\\\xemail{javadr@gmail.com}}
-\date{\qurandate,\space version \quranversion\footnote{First release: June 1st, 2015}}
+\date{\qurandate,\space version \quranversion\footnote{Initial release: June 1st, 2015}}
\parindent=0pt
@@ -124,16 +124,22 @@ The \xpackage{quran} Package\thanks{To one having devoted his life to the Holy Q
\maketitle{
\centerline{\large\bfseries Abstract}
\bigskip
+
The \xpackage{quran} package\footnote{This work has been inspired by \xpackage{lipsum} and
-\xpackage{ptext} packages and was initially released in June 2015 (Sha'ban 1436 AH).}
-has been prepared for typesetting the Holy Quran.
-It provides several macros for typesetting not only the entire or any specific parts of the Holy Quran based on its popular divisions
-but also any segments of an ayah.
-Additionally, it supports four translations of the Holy Quran in German, English, French, and Persian,
-as well as its transliteration.%
-\footnote{There are three companion packages, \xpackage{quran-de}, \xpackage{quran-ur}, and \xpackage{quran-bn}, which provide several other translations in Deutsch, Urdu and Bengali, respectively.}
-Please report any issues including bugs or typos in the documentation
-or make feature requests on \url{https://github.com/javadr/quran/issues}.
+\xpackage{ptext} packages and was initially released in June 2015 (Sha'ban 1436 AH).}
+has been developed for typesetting the Holy Quran.
+It offers several macros for typesetting not only the entire text or
+specific sections of the Holy Quran based on its traditional divisions,
+but also individual segments of an ayah. Additionally,
+the package supports four translations of the Holy Quran in
+German, English, French, and Persian, as well as its transliteration.%
+\footnote{There are six companion packages, \xpackage{quran-de},
+\xpackage{quran-ur}, \xpackage{quran-bn}, \xpackage{quran-id}, \xpackage{quran-en}, and \xpackage{quran-es}.
+These packages provide additional translations of the Holy Quran in German,
+Urdu, Bengali, Indonesian, English, and Spanish, respectively.}
+
+Please report any issues, including bugs or typos in the documentation,
+or submit feature requests at \url{https://github.com/javadr/quran/issues}.
}
\null\vfill
@@ -150,11 +156,11 @@ or make feature requests on \url{https://github.com/javadr/quran/issues}.
I would like to express my utmost gratitude to:
\begin{enumerate}
\parskip=0pt
- \item \emph{Vafa Khaligi} who paved the way for typesetting right-to-left in \XeTeX.
- \item \emph{Hamid Zarrabi-Zadeh}, the creator of the invaluable website of \emph{Tanzil}
+ \item \emph{Vafa Khaligi}, who pioneered typesetting right-to-left in \XeTeX.
+ \item \emph{Hamid Zarrabi-Zadeh}, the creator of the invaluable \href{https://tanzil.net}{Tanzil} website,
for providing the text of the Holy Quran and some of its translations.
- \item Parsi\LaTeX\ group that tested and commented on the package in advance.
- \item Those who have \textbf{donated} to the \xpackage{quran} package--arranged in chronological order:
+ \item The Parsi\LaTeX\ group, which tested and provided feedback on the package.
+ \item Those who have \textbf{donated} to the \xpackage{quran} package, listed in chronological order:
\begin{enumerate}
\item \emph{Atiyah Elsheikh}, Feburary 2020.
\end{enumerate}
@@ -162,10 +168,13 @@ I would like to express my utmost gratitude to:
\newpage
-\section{Loading Package}
-The package can be loaded in the usual manner using the command
-\cs{usepackage[option]\{quran\}}. All \tt{option}s are explained in the section \ref{sec:options}.
-Once the package is loaded, it will write some information about itself to the log file. The information will be something like this:
+\section{Loading the Package}
+
+The package can be loaded using the standard command:\\
+\cs{usepackage[option]\{quran\}}\\
+All available \texttt{option}s are explained in Section \ref{sec:options}.
+Once the package is loaded, it will log some information about itself.
+The log entries will look something like this:
\begin{quote}
\begin{lstlisting}[style=BashInputStyle, escapechar={|},]
@@ -174,37 +183,45 @@ An easy way to typeset the whole or any parts of the Holy Quran
\end{lstlisting}
\end{quote}
-\section{Typesetting The Holy Quran}\label{sec:qurantypesetting}
-For typesetting any part or the entirety of the Holy Quran, several macros are provided in the package.
-These commands are responsible for typesetting all popular divisions of the Holy Quran based on Uthmani script, including Surah, Ayah, Page, Juz, Hizb, Quarter, Ruku, and Manzil, as well as any segments of an ayah.
+\section{Typesetting the Holy Quran}\label{sec:qurantypesetting}
+
+To typeset any part or the entirety of the Holy Quran,
+the package provides several macros.
+These commands support typesetting various traditional divisions
+of the Holy Quran based on the Uthmani script,
+including Surah, Ayah, Page, Juz, Hizb, Quarter, Ruku, and Manzil, as well as specific segments of an Ayah.
+
\subsection{Surah/Sovar}
\begin{declcs}{quransurah}\oarg{surah range}\\
\cs{quransurah*}\oarg{surah range}
\end{declcs}
-This macro can typeset any surah of the Quran. A \meta{range} consists
-either of a single \meta{number} or two numbers separated by a dash (-),
-as in \none-\ntwo. In \cs{quransurah} and similar commands,
-if \meta{range} does not satisfy \none~<~\ntwo{} within its domain,
-it might result in failure or produce undesired results. As you know there are 114 surahs in total,
-so \meta{range} should be an integer between 1 to 114.
-
-The macro \cs{quransurah} terminates the typesetting of every ayah using \cs{par} (depending on
-the package option) while \cs{quransurah*} uses a blank space for each ayah.
-As a simplified rule of thumb, \cs{quransurah} prints ayahs as multiple paragraphs whereas
-\cs{quransurah*} prints them as a single paragraph.
-All starred macros in the package function similarly in this manner; for futhur details,
-please refer to page~\pageref{starred}.
-
-The macro also accepts the anglicized title of the surah's name. For instance,
-both of \cs{quransurah[19]} and \cs{quransurah[Maryam]} have the same effect.
+
+This macro can typeset any Surah of the Quran.
+A \meta{range} can be either a single \meta{number} or two numbers separated by a dash
+(e.g., \none-\ntwo). In \cs{quransurah} and similar commands,
+if \meta{range} does not satisfy \none~<~\ntwo{} within the valid domain,
+it may result in an error or produce undesired results.
+As there are a total of 114 Surahs, \meta{range} should be an integer between 1 and 114.
+
+The macro \cs{quransurah} terminates the typesetting of each Ayah with \cs{par}
+(depending on the package option), whereas \cs{quransurah*} uses a blank space between Ayahs.
+As a rule of thumb, \cs{quransurah} prints Ayahs as multiple paragraphs,
+while \cs{quransurah*} prints them as a single paragraph.
+All starred macros in the package function similarly.
+For further details, please refer to page~\pageref{starred}.
+
+The macro also accepts the anglicized title of a Surah.
+For instance, both \cs{quransurah[19]} and \cs{quransurah[Maryam]} produce the same result:
\mgpar{quransurah[19]}\mgpar{quransurah[Maryam]}
-Refer to table~\ref{tab1} how to use the anglicized title of a surah instead of its order.
-As some anglicized titles include a dash (-), the
-\meta{range} has to be separated by two dashes (\tt{--}), for example, \cs{quransurah[An-Nasr--An-Naas]}.
+Refer to Table~\ref{tab1} for instructions on using the anglicized title of a Surah
+instead of its numerical order. As some anglicized titles include a dash (-),
+the \meta{range} should be separated by two dashes (\tt{--}),
+for example, \cs{quransurah[An-Nasr--An-Naas]}.
+
+The macro \cs{quransurah} without an optional argument outputs the default Surah of the package,
+Al-Ikhlaas, provided that this default has not been changed (see below).
-\cs{quransurah} without its optional argument outputs the default surah of the package, Al-Ikhlaas,
-(as long as the default has not been overwritten, see below).
\centerline{\mx{quransurah[94]}{\quransurah[94]} \hfill
\mx{quransurah[At-Tin]}{\quransurah[At-Tin]}}
@@ -216,10 +233,10 @@ As some anglicized titles include a dash (-), the
\centerline{\mx{quransurah*}{\quransurah*} \hfill\mx{quransurah}{\quransurah}}
-In order to change the default surah, use \cs{setsurahdefault\{m\}}.
-As you have noticed the package's default is 112. \mgpar{setsurahdefault}
-After changing package's default surah to 107 with \cs{setsurahdefault\{107\}},
-the output would be as show below:
+To change the default Surah, use \cs{setsurahdefault\{m\}}.
+By default, the package sets Surah 112. \mgpar{setsurahdefault}
+For example, after changing the default Surah to 107 with \cs{setsurahdefault\{107\}},
+the output will be as shown below:
\setsurahdefault{107}
\centerline{\mxf{quransurah*}{\quransurah*}}
@@ -243,32 +260,38 @@ the output would be as show below:
\thect & \mycell{ct} & \thect & \mycell{ct} & \thect & \mycell{ct}\\%
\hline
\end{tabular}
- \protect\caption{\scshape Anglicized Title of Surahs' Names}\label{tab1}
+ \protect\caption{\scshape Anglicized Titles of Surahs' Names}\label{tab1}
\end{table}
\subsection{Ayah/Ayat}
\begin{declcs}{quranayah}\oarg{surah range}\oarg{ayah range}\\
\cs{quranayah*}\oarg{surah range}\oarg{ayah range}
\end{declcs}
-\meta{range} is similar the one explained for \cs{quransurah} and
-this pattern applies to all commands defined in the package.
-Therefore, this command typesets the \textit{n}$^{th}$ ayah of a surah or \textit{m}$^{th}$ to \textit{n}$^{th}$ ayahs of a surah.
+
+The \meta{range} used here is similar to the one explained for \cs{quransurah},
+and this pattern applies to all commands defined in the package. Therefore,
+this command typesets the \textit{n}$^{th}$ Ayah of a Surah,
+or the range from the \textit{m}$^{th}$ to the \textit{n}$^{th}$ Ayahs of a Surah.
\centerline{\mx{quranayah[33][33]}{\quranayah[33][33]} \hfill
\mx{quranayah[Al-Ahzaab][33]}{\quranayah[Al-Ahzaab][33]}}
-The basmalah will not be printed if you intend to typeset the first ayah of any surah per se.
-To address this issue, you can use the \cs{basmalah} macro before the ayah. For further information, please refer to page~\pageref{sec:basmalah}.
+The Basmalah will not be printed automatically when typesetting the first Ayah of any Surah.
+To include the Basmalah, use the \cs{basmalah} macro before the Ayah.
+For further details, please refer to page~\pageref{sec:basmalah}.
+
\marginpar{\cs{basmalah}}
+
\centerline{\mx{quranayah[Ibrahim][1]}{\quranayah[Ibrahim][1]} \hfill
\mx{basmalah\textbackslash{}quranayah[14][1]}{\quran\basmalah\quranayah[14][1]}}
\centerline{\mx{quranayah*[Ash-Shura][22-26]}{\quranayah*[Ash-Shura][22-26]} \hfill
\mx{quranayah*[42][22-26]}{\quranayah*[42][22-26]}}
-Both \cs{quransurah} and \cs{quranayah} are \emph{case-insensitive} to the anglicized title of surah.
-In other words, there are, for example, no differences among `Al-Fatiha', `al-fatiha', or any other possible combinations of lowercase and uppercase letters.
+Both \cs{quransurah} and \cs{quranayah} are \emph{case-insensitive} with respect to the anglicized titles of Surahs.
+In other words, there is no distinction between `Al-Fatiha', `al-fatiha',
+or any other combination of uppercase and lowercase letters.
\centerline{\mx{quransurah*[Al-Faatiha]}{\quransurah*[Al-Faatiha]} \hfill
\mx{quransurah*[aL-fAatIhA]}{\quransurah*[aL-fAatIhA]}}
@@ -278,8 +301,9 @@ In other words, there are, for example, no differences among `Al-Fatiha', `al-fa
\cs{quranpage*}\oarg{page range}
\end{declcs}
-Typesets the specified \meta{range} of page(s) of the Holy Quran.
-The numbers in \meta{range} should be between $1$ to $604$, based on the Medina Mushaf.
+Typesets the specified \meta{range} of pages of the Holy Quran.
+The page numbers in \meta{range} should be between $1$ and $604$, based on the Medina Mushaf.
+
\centerline{\hboxR{\mx{quranpage*[249]}{\quranpage*[249]}
\hfill
@@ -292,11 +316,13 @@ The numbers in \meta{range} should be between $1$ to $604$, based on the Medina
\cs{quranjuz*}\oarg{juz range}
\end{declcs}
-This macro typesets the specified \meta{range} of juz(zes) of the Holy Quran, ranging from $1$ to $30$.
+This macro typesets the specified \meta{range} of Juz(zes) of the Holy Quran, ranging from $1$ to $30$.
\subsection{Hizb/Ahzab}
-Each juz of the Holy Quran is divided into two ahzab (groups), resulting in a total of 60 hizbs (ahzab).
-The following macro typesets hizb/ahzab of the Holy Quran.
+
+Each Juz of the Holy Quran is divided into two Hizbs/Ahzab (groups),
+resulting in a total of 60 Hizbs.
+The following macro typesets the specified Hizb(s) of the Holy Quran.
\begin{declcs}{quranhizb}\oarg{hizb range}\\
\cs{quranhizb*}\oarg{hizb range}
@@ -306,8 +332,12 @@ The following macro typesets hizb/ahzab of the Holy Quran.
\centerline{\mxf{quranquarter*[110]}{\quranquarter*[110]}}
\subsection{Quarter/Quarters}
-Eash hizb of the Holy Quran is devided into four quarters, making eight quarters per juz, called maqra.
-There are 240 of these quarters (of hizb) in the Holy Quran. These maqras are often used as sections for revision when memorizing the Holy Quran.\footnote{\url{https://en.wikipedia.org/wiki/Juz'}}
+
+Each Hizb of the Holy Quran is divided into four quarters, known as Maqras,
+resulting in eight Maqras per Juz.
+There are a total of 240 Maqras in the Holy Quran.
+These Maqras are often used as sections for revision
+during memorization of the Holy Quran.\footnote{\url{https://en.wikipedia.org/wiki/Juz'}}
\begin{declcs}{quranquarter}\oarg{quarter range}\\
\cs{quranquarter*}\oarg{quarter range}
@@ -316,7 +346,12 @@ There are 240 of these quarters (of hizb) in the Holy Quran. These maqras are of
\subsection{Ruku/Rukus}
-``The term ruk\= u --- roughly translated to ``passage", ``pericope" or ``stanza" --- is also used to denote a group of thematically related verses in the Qur'an. Longer suras (chapters) in the Qur'an are usually divided into several ruk\= us, so that the reciters could identify when to make ruk\= u in Salat without breaking an ongoing topic in the Quranic text."\footnote{\url{https://en.wikipedia.org/wiki/Ruku}} There are $556$ rukus.
+``The term ruk\=u --- roughly translated to ``passage", ``pericope" or ``stanza" ---
+is also used to denote a group of thematically related verses in the Qur'an.
+Longer suras (chapters) in the Qur'an are usually divided into several ruk\= us,
+so that the reciters could identify when to make ruk\= u in Salat
+without breaking an ongoing topic in the Quranic
+text."\footnote{\url{https://en.wikipedia.org/wiki/Ruku}} There are a total of $556$ Rukus.
\begin{declcs}{quranruku}\oarg{ruku range}\\
\cs{quranruku*}\oarg{ruku range}
@@ -328,29 +363,33 @@ There are 240 of these quarters (of hizb) in the Holy Quran. These maqras are of
\subsection{Manzil/Manazil}
-``For the convenience of people who wish to read the Qur'an in a week the text may be divided into 7 portions,
-with each portion known as Manzil.
-The following division into 7 equal portions is attributed to Hamza Al-Zayyat (d.156/772):
+``For those who wish to complete reading the Qur'an within a week,
+the text may be divided into 7 portions, each known as a Manzil.
+
+``The following division into 7 equal portions is attributed to Hamza Al-Zayyat (d. 156/772):
+
\begin{enumerate}
- \item Al-Faatiha (chapter 1) through An-Nisaa (chapter 4) consisting of 4 surahs.
- \item Al-Maaida (chapter 5) through At-Tawba (chapter 9) consisting of 5 surahs.
- \item Yunus (chapter 10) through An-Nahl (chapter 16) consisting of 7 surahs.
- \item Al-Israa (chapter 17) through Al-Furqaan (chapter 25) consisting of 9 surahs.
- \item Ash-Shu'araa (chapter 26) through YaSeen (chapter 36) consisting of 11 surahs.
- \item As-Saaffaat (chapter 37) through Al-Hujuraat (chapter 49) consisting of 13 surahs.
- \item Qaaf (chapter 50) through An-Naas (chapter 114) consisting of 65 surahs.''\footnote{\url{https://en.wikipedia.org/wiki/Manzil}}
+ \item Al-Fatiha (Surah 1) through An-Nisa (Surah 4) -- 4 Surahs.
+ \item Al-Maida (Surah 5) through At-Tawba (Surah 9) -- 5 Surahs.
+ \item Yunus (Surah 10) through An-Nahl (Surah 16) -- 7 Surahs.
+ \item Al-Isra (Surah 17) through Al-Furqan (Surah 25) -- 9 Surahs.
+ \item Ash-Shuara (Surah 26) through Ya-Sin (Surah 36) -- 11 Surahs.
+ \item As-Saffat (Surah 37) through Al-Hujurat (Surah 49) -- 13 Surahs.
+ \item Qaf (Surah 50) through An-Nas (Surah 114) — 65 Surahs.''\footnote{\url{https://en.wikipedia.org/wiki/Manzil}}
\end{enumerate}
\begin{declcs}{quranmanzil}\oarg{manzil range}\\
\cs{quranmanzil*}\oarg{manzil range}
\end{declcs}
-The above macro typesets manzil/manazil of the Holy Quran.
+The above macro typesets the Manzil(s)/Manazil of the Holy Quran.
+
+\subsection{Text of the Quran}
-\subsection{Text of Quran}
-The next macro is the core of all macros in the package, allowing typesetting of any range of Quranic verses.
-As you know, there are $6236$ ayahs in the Holy Quran. This macro can typeset a specific ayah or any range of ayahs.
+The following macro is central to all macros in the package,
+enabling the typesetting of any range of Quranic verses. The Holy Quran contains 6,236 Ayahs.
+This macro allows for the typesetting of a specific Ayah or any range of Ayahs.
\begin{declcs}{qurantext}\oarg{index range}\\
\cs{qurantext*}\oarg{index range}
@@ -360,8 +399,8 @@ As you know, there are $6236$ ayahs in the Holy Quran. This macro can typeset a
\centerline{\mxf{qurantext*[4111-4117]}{\begingroup\qurantext*[4111-4117]\endgroup}}
-Using \cs{qurantext} without its optional argument uses [1-7] at its default argument-- surah Al-Hamd. To
-change the default text use \cs{setqurantextdefault\{m-n\}}
+Using \cs{qurantext} without its optional argument defaults to \texttt{[1-7]},
+which corresponds to Surah Al-Fatiha. To change the default text, use \cs{setqurantextdefault\{m-n\}}.
\marginpar{\cs{qurantext}}
@@ -373,8 +412,9 @@ change the default text use \cs{setqurantextdefault\{m-n\}}
\setqurantextdefault{4128-4137}
\centerline{\mxf{qurantext*}{\qurantext*}}
-\subsection{Whole of The Holy Quran}
-The following macros, when provided with the specified parameters, can typeset the entire Holy Quran.
+\subsection{Whole of the Holy Quran}
+
+The following macros, when provided with the appropriate parameters, can be used to typeset the entire Holy Quran.
\begin{multicols}{2}
\begin{itemize}
@@ -396,11 +436,14 @@ The following macros, when provided with the specified parameters, can typeset t
\item \cs{quranmanzil*[1-7]}
\end{itemize}
\end{multicols}
+
\subsection{Chunks of an Ayah}\label{chunk}
-Starting from version 1.6 onward, the package is capable of typesetting not only a whole ayah but also any chunks of an ayah
-if the \xmgpar{wordwise} option has been loaded.\footnote{This new practical feature has been suggested and
-supported financially by \emph{Atiyah Elsheikh} in Feburary 2020.}
- In this case, \cs{quranayah} and \cs{qurantext} macros have additional optional parameters to enable this functionality.
+
+Starting from version 1.6, the package can typeset not only entire Ayahs but also specific segments of an Ayah,
+provided the \xmgpar{wordwise} option is enabled.\footnote{This practical feature was suggested and
+financially supported by \emph{Atiyah Elsheikh} in February 2020.}
+In this case, the \cs{quranayah} and \cs{qurantext} macros include additional optional parameters
+to enable this functionality.
\begin{declcs}{quranayah}\oarg{surah range}\oarg{ayah range}\oarg{chunk range}\\
\cs{quranayah}\oarg{surah range}\oarg{ayah range}\oarg{chunk range}\tt{+}
@@ -410,16 +453,17 @@ supported financially by \emph{Atiyah Elsheikh} in Feburary 2020.}
\cs{qurantext}\oarg{index range}\oarg{chunk range}\tt{+}
\end{declcs}
-These commands separate words included in \meta{ayah range}/\meta{index range}
-by white spaces and then output specified \meta{chunk range}.
-If \meta{chunk range} includes just one number, the output will be from the
-\meta{number}\textsuperscript{th} word to the end of \meta{ayah range}.
+These commands separate the words within the \meta{ayah range}/\meta{index range}
+by white spaces and then output the specified \meta{chunk range}.
+If the \meta{chunk range} includes only one number,
+the output will start from the \meta{number}\textsuperscript{th} word to the end of the \meta{ayah range}.
\centerline{\mx{quranayah[2][156][6]}{\quranayah[2][156][6]} \hfill
\mx{quranayah[2][286][31-43]}{\quranayah[2][286][31-43]}}
-The way the package enumerates the words of a specified \meta{ayah/index range} could be shown in the footnote
-if the above commands followed by \tt{+}.
+The package enumerates the words in a specified \meta{ayah/index range},
+which can be displayed in the footnote if the commands are followed by \tt{+}.
+
\centerline{\mxf{quranayah[Ar-Ra'd][23-24][10]+}{\quranayah[Ar-Ra'd][23-24][10]+}}
@@ -427,6 +471,9 @@ if the above commands followed by \tt{+}.
Fetching just one word from
an ayah requires the \meta{chunck range} to have both \meta{number}s as the same.
+To fetch a single word from an Ayah, the \meta{chunk range}
+must have both \meta{numbers} set to the same value.
+
\centerline{\mx{quranayah[18][19][34-34]}{\quranayah[18][19][34-34]} }
\section{Miscellaneous}
@@ -435,8 +482,9 @@ an ayah requires the \meta{chunck range} to have both \meta{number}s as the same
\begin{declcs}{surahname}\oarg{index}\\
\cs{surahname*}\oarg{index}
\end{declcs}
-These commands return the Anglicized/Arabic title of \textit{index}$^{th}$ surah of the Holy Quran,
-as depicted in table~\ref{tab1} and table~\ref{tab2}
+
+These commands return the Anglicized or Arabic title of the \textit{index}\textsuperscript{th}
+surah of the Holy Quran, as shown in Table~\ref{tab1} and Table~\ref{tab2}.
\centerline{\mx{surahname[19]}{\surahname[19]}
\hfill
@@ -470,9 +518,9 @@ as depicted in table~\ref{tab1} and table~\ref{tab2}
\begin{declcs}{basmalah}\\
\cs{Basmalah}
\end{declcs}
-It provides Basmalah (\RLE{\quran\Basmalah}) in Arabic text. There is a subtle
-difference between \cs{Basmalah} and \cs{basmalah} -- the latter is sometimes followed by a \cs{par}
-(depending on the package option).
+It provides the Basmalah (\RLE{\quran\Basmalah}) in Arabic text.
+There is a subtle difference between \cs{Basmalah} and \cs{basmalah} --
+the latter may be followed by a \cs{par} depending on the package option.
\centerline{\mx{basmalah\textbackslash{}quranayah*[14][1]}{\quran\basmalah\quranayah*[14][1]} \hfill
\mx{Basmalah\textbackslash{}space\textbackslash{}quranayah*[14][1}{\quran\Basmalah\ \quranayah*[14][1]}}
@@ -480,10 +528,12 @@ difference between \cs{Basmalah} and \cs{basmalah} -- the latter is sometimes fo
\subsection{Index Converting}
\begin{declcs}{indexconvert}\marg{index}\marg{surah macro}\marg{ayah macro}
\end{declcs}
-It converts an index number between $1$ to $6236$
-to its exact surah's index and ayah's index. The index must be either a number or a
-\TeX{} counter, and the surah macro and ayah would be defined as a \TeX{} counters if they are undefined. They
-will be set to the numbers representing the surah and ayah of the given index in text of the Holy Quran.
+
+It converts an index number between $1$ and $6236$ to its corresponding surah and ayah indices.
+The index can be either a number or a \TeX{} counter.
+If the surah and ayah macros are not already defined,
+they will be automatically set as \TeX{} counters,
+representing the surah and ayah of the given index in the text of the Holy Quran.
\begin{SaveVerbatim}{VerbEnv}
\newcount\index \index=5678
@@ -502,43 +552,47 @@ of surah number \the\surahcount\ (=\surahname[\the\surahcount]).
Index \the\index\ belongs to ayah number \the\ayahcount\ of surah number \the\surahcount\ (=\surahname[\the\surahcount]).
}+}
-\section{Options to The Package}\label{sec:options}
-All macros of the package, by default, separate ayahs with \cs{par}.
-The \xmgpar{nopar} option is available to change this default behaviour.
-In this case, ayahs will be separated with space instead \cs{par}.
-Another way to achieve this is by using the starred version of macros.
-All macros of the package \marginpar{starred macros}
-have starred versions that omit the \cs{par} in typesetting ayahs of the Holy Quran. \label{starred}
-With the \xmgpar{nopar} option, starred macros act as if this option was not loaded.
+\section{Options for the Package}\label{sec:options}
+
+By default, all macros in the package separate Ayahs with \cs{par}.
+To modify this behavior, use the \xmgpar{nopar} option,
+which changes the separation from \cs{par} to spaces. \marginpar{starred macros}
+Alternatively, you can use the starred versions of macros to achieve the same effect.
+Starred macros omit \cs{par} when typesetting Ayahs of the Holy Quran. \label{starred}
+With the \xmgpar{nopar} option, starred macros will function as if this option were not loaded.
+
\medskip
-All surahs of the Holy Quran are divided by ayahs which have their own indexes.
-By default, these numbers are typeset with text of each ayah. The \xmgpar{nonumber} option
-causes none of these numbers will be printed with ayahs.
+All surahs of the Holy Quran are divided into ayahs, each of which has its own index.
+By default, these numbers are typeset alongside the text of each ayah. To suppress these numbers,
+use the \xmgpar{nonumber} option, which prevents the ayah numbers from being printed.
+
\begin{declcs}{ToggleAyahNumber}{}
\end{declcs}
-This macro changes the default behavior of the package in the typesetting of the index of ayahs wherever it is called. It means that the macro can enable/disable the ayahs' index in the output text.
+This macro modifies the package's default behavior concerning the typesetting of ayah indices
+wherever it is invoked. In other words, the macro can toggle the display of ayah indices in the output text,
+enabling or disabling them as needed.
\centerline{\mxf{ToggleAyahNumber\textbackslash{}quransurah*[89]}
{\ToggleAyahNumber\quransurah*[89]}}
\medskip
-Version 1.9 introduces a new option called `\xmgpar{ornbraces}'.
-This option allows users to include ornamental braces around the Quran text,
-similar to the ones used around the Ayah numbers.
-To customize the ornamental braces, the `\cs{SetOrnamentalBraces}' macro can be utilized.
-This command takes two arguments: the starting brace and the ending brace.
-By leveraging the flexibility of `\cs{SetOrnamentalBraces}',
-users can personalize the appearance of the ornamental braces according to their preferences.
+Version 1.9 introduces a new option, \xmgpar{ornbraces},
+which allows users to add ornamental braces around the Quranic text,
+similar to those surrounding the Ayah numbers.
+To customize these ornamental braces, the \cs{SetOrnamentalBraces} macro can be employed.
+This command accepts two arguments: the opening brace and the closing brace.
+By utilizing the flexibility of the \cs{SetOrnamentalBraces} macro,
+users can tailor the appearance of the ornamental braces to suit their preferences.
\begin{declcs}{SetOrnamentalBraces}\marg{starting brace}\marg{ending brace}
\end{declcs}
-The \xmgpar{wordwise} option makes the package capable of outputing any chunks of an ayah.
-For more details, please refer to section~\ref{chunk}.
+The \xmgpar{wordwise} option enables the package to output specific portions of an ayah.
+For further details, please refer to Section~\ref{chunk}.
\centerline{\mx{quranayah[9][111][1-23]}{\quranayah[9][111][1-23]}}
\centerline{\mxf{ToggleAyahNumber\textbackslash{}quranayah[An-Nisaa][171-172][14-64]}
@@ -547,9 +601,10 @@ For more details, please refer to section~\ref{chunk}.
\medskip
-The package, by default, typesets the text of the Holy Quran in the simple script,
-but \xmgpar{uthmani} and \xmgpar{uthmani-min} change the default to Uthmani script.
-Compare the following texts to figure out the differences between ``default'', ``uthmani'', and ``uthmani-min'' scripts.
+By default, the package typesets the text of the Holy Quran in a simple script.
+However, the options \xmgpar{uthmani} and \xmgpar{uthmani-min} modify this default to the Uthmani script.
+You can compare the following texts to discern the differences between the
+``default'', ``uthmani,'' and ``uthmani-min'' scripts.
\makeatletter\let\qt@newcmd\renewcommand
\input{qurantext-simple.def}%
@@ -569,10 +624,11 @@ Compare the following texts to figure out the differences between ``default'', `
\medskip
-Starting from version 1.3, the package can typeset the transliteration of the Holy Quran.
-This option will be useful for those who don't know how to read the Arabic text.
-By loading the \xmgpar{translt} option, all macros defined in section~\ref{sec:qurantypesetting}
-will have an ``\texttt{lt}" version. In other words, the following macros are added by this option:
+Starting from version 1.3, the package is capable of typesetting the transliteration of the Holy Quran.
+This feature is particularly useful for those unfamiliar with reading Arabic script.
+By enabling the \xmgpar{translt} option, all macros defined in Section~\ref{sec:qurantypesetting}
+will also have a corresponding ``\texttt{lt}" version.
+In other words, the following macros are introduced through this option:
\begin{multicols}{3}
\begin{itemize}
@@ -594,21 +650,14 @@ will have an ``\texttt{lt}" version. In other words, the following macros are ad
\medskip
-The package can typeset some translations of the Holy Quran in other languages.
-These options were added because of some requests from users who had required the translation of the Holy Quran in their languages.
-Loading \xmgpar{transde}, \xmgpar{transen}, \xmgpar{transfr}, or \xmgpar{transfa} brings some other macros for typesetting the translation in
-German, English, French, and Persian, respectively.
-
-
-The package can typeset translations of the Holy Quran in several languages.
-These options were added in response to requests from users who needed the translation of the Holy Quran in their languages.
-By loading the \xmgpar{transde}, \xmgpar{transen}, \xmgpar{transfr}, or \xmgpar{transfa} option, additional macros are provided for typesetting the translation in `German', `English', `French', and `Persian', respectively.
-
+The package supports typesetting translations of the Holy Quran in various languages.
+These options were introduced in response to user requests for translations in their respective languages.
+By loading \xmgpar{transde}, \xmgpar{transen}, \xmgpar{transfr}, or \xmgpar{transfa},
+additional macros are provided for typesetting translations in German, English, French, and Persian, respectively.
By loading each of these options, all macros defined in section~\ref{sec:qurantypesetting} will have
-a ``\texttt{de}"/``\texttt{en}"/``\texttt{fr}"/``\texttt{fa}" version. In other words,
-these options will add the following macros:
-
+a ``\texttt{de}"/``\texttt{en}"/``\texttt{fr}"/``\texttt{fa}" version. In other words,
+these options will add the following macros:
\begin{multicols}{2}
\texttt{transde} option:
@@ -665,20 +714,24 @@ these options will add the following macros:
\end{multicols}
- All translations are sourced from \url{tanzil.net}.
- For Germen, English, French, and Persian languages the ``Abu Rida Muhammad ibn Ahmad ibn Rassoul",
- ``Ahmed Ali", ``Muhammad Hamidullah", and ``Mohammad Mahdi Fooladvand" have been chosen respectively,
- by suggestion of the package's users.
+ All translations are sourced from \url{tanzil.net}.
+ For the German, English, French, and Persian languages,
+ the following translators have been selected based on user suggestions:
+ ``Abu Rida Muhammad ibn Ahmad ibn Rassoul'' for German,
+ ``Ahmed Ali'' for English,
+ ``Muhammad Hamidullah'' for French, and
+ ``Mohammad Mahdi Fooladvand'' for Persian.
\medskip
- The \xmgpar{trans} option has been prepared to simplify the usage of mutiple translations simultaneously. This option accepts
- any permutation of ``\texttt{lt}", ``\texttt{de}", ``\texttt{en}", ``\texttt{fr}", and ``\texttt{fa}", e.g.
- ``\xoption{trans=\{de, en, lt\}}".
+ The \xmgpar{trans} option is designed to facilitate the simultaneous use of multiple translations.
+ This option accepts any combination of ``\texttt{lt}", ``\texttt{de}'', ``\texttt{en}'',
+ ``\texttt{fr}'' and ``\texttt{fa}''.
+ For example, you can specify multiple translations using \xoption{trans=\{de, en, lt\}}.
- \marginpar{\dbend} Typically, there is no way to load all translations together
- as it exceeds \TeX{} memory capacity. For more details and some hacks to break this limitation,
- see \emph{Why do I get the ``! TeX capacity exceeded'' error?} on page \pageref{sec:texcapacity}.
+ \marginpar{\dbend} Typically, loading all translations simultaneously is not feasible due to
+ \TeX{} memory limitations. For more details and potential solutions to overcome this restriction,
+ refer to \emph{Why do I get the ``! TeX capacity exceeded'' error?} on page \pageref{sec:texcapacity}.
\centerline{\mxf{quransurah*[108]}{\quransurah*[108]}}
@@ -711,13 +764,18 @@ these options will add the following macros:
Amiri is a free, open source project that everyone is encouraged to use and modify.
\end{quote}
+ \subsection{How to use the \xpackage{quran} package?}
- \subsection{How to use \xpackage{quran} package?}
- As you may have noticed, for typesetting quran text you need a package that can typeset text
- in RTL mode and use UTF-8 fonts, as the \xpackage{quran} draws its text from a
- Unicode database.
- The recommended packages for this purpose are \xpackage{polyglossia}, \xpackage{fontspec}, and \xpackage{bidi}, which will provide the necessary functionality. Alternatively, you can use \xpackage{xepersian}, which also relies on \xpackage{bidi}, and \xpackage{fontspec}.
- Another option is to use \xpackage{arabxetex} or \xpackage{arabluatex}. While the latter works only with \LuaLaTeX, the former supports \XeLaTeX. Both \xpackage{arabxetex} and \xpackage{arabluatex} use the Amiri font by default. Below are some examples demonstrating all four approaches:
+ To typeset Quranic text, you need a package that supports right-to-left (RTL) text and utilizes UTF-8 fonts,
+ as the \xpackage{quran} package relies on a Unicode database.
+ The recommended packages for this purpose are \xpackage{polyglossia}, \xpackage{fontspec}, and \xpackage{bidi},
+ which together provide the necessary functionality. Alternatively, you can use \xpackage{xepersian},
+ which also relies on \xpackage{bidi} and \xpackage{fontspec}.
+ Another option is to use \xpackage{arabxetex} or \xpackage{arabluatex}.
+ Note that \xpackage{arabxetex} works with \XeLaTeX,
+ while \xpackage{arabluatex} is compatible only with \LuaLaTeX.
+ Both \xpackage{arabxetex} and \xpackage{arabluatex} use the Amiri font by default.
+ Below are examples demonstrating all four approaches:
\begin{quote}
@@ -794,9 +852,9 @@ fontspec{,} and bidi"]
\end{quote}
- \subsection{How to set a default font for text of quran?}
- If you want to automatically change the font of Quranic text in your document,
- you can simply precede the \cs{qurantext} macro with the font you desire, like below:
+ \subsection{How to set a default font for Quranic text?}
+ To automatically change the font of Quranic text in your document,
+ you can simply precede the \cs{qurantext} macro with the desired font. For example:
\begin{quote}
@@ -820,19 +878,20 @@ fontspec{,} and bidi"]
\end{quote}
- By setting the default font as mentioned above, if you want to use \cs{qurantext},
- you have to enclose it in curly braces. If you don't,
- it will affect the font of the following texts.
+ By setting the default font as described above, if you want to use \cs{qurantext},
+ you must enclose it in curly braces. Otherwise,
+ the font change will affect the subsequent text as well.
+
\begin{quote}
\begin{lstlisting}[style=BashInputStyle]
{\qurantext[x-y]}
\end{lstlisting}
\end{quote}
- \subsection{How to typeset a portion of the Holy Quran in one paragraph
- with no ayah number without using \xoption{nopar} option?}
+ \subsection{How to Typeset a Portion of the Holy Quran in One Paragraph
+ without Ayah Numbers, without Using the \xoption{nopar} Option}
- Just put the code that was describled on page~\pageref{starred} in a group like below:
+ Just place the code described on page~\pageref{starred} within a group, as shown below:
\begin{quote}
\begin{lstlisting}[style=BashInputStyle]
{\ToggleAyahNumber\quransurah*}
@@ -843,24 +902,34 @@ fontspec{,} and bidi"]
\mxf{quransurah* «\{\textbackslash{}ToggleAyahNumber\textbackslash{}quransurah*\}» \textbackslash{}quransurah*}
{\quransurah* »{\ToggleAyahNumber\quransurah*}« \quransurah*}
- \subsection{Why do I get the ``\tt{! TeX capacity exceeded}'' error?}
+ \subsection{Why Do I Get the ``\tt{! TeX capacity exceeded}'' Error?}
\label{sec:texcapacity}
- The invention of \TeX{} dates back many years ago. Although we have powerful hardware nowadays,
- \TeX{} was originally designed to run efficiently on relatively limited computer hardware available at the time of its creation.
- The \xpackage{quran} package introduces numerous macros that may deplete \TeX's memory, leading to compilation errors on occasion.
- To address this issue, one potential solution is to expand \TeX's memory, which can be achieved by referring to the section ``Memory Limitations'' in the \xpackage{pgfplots} manual.
- However, increasing \TeX's memory might not always be the most optimal approach.
- Instead, I would recommend considering a redesign of your document. For example, if you are using the \xoption{wordwise} option, you may encounter ``\tt{! TeX capacity exceeded}'' errors when using the starred versions of macros that output large portions of Quran text.
+ The invention of \TeX{} dates back several decades. Despite the advancements in modern hardware,
+ \TeX{} was originally designed to operate efficiently on the relatively limited computer
+ resources available at the time of its creation. The \xpackage{quran} package includes
+ numerous macros that can potentially exhaust \TeX's memory, occasionally resulting in compilation errors.
+ To address this issue, one approach is to increase \TeX's memory allocation.
+ Detailed instructions on how to do this can be found in the section titled ``Memory Limitations''
+ in the \xpackage{pgfplots} manual. However, simply expanding \TeX's memory
+ may not always be the most effective solution.
+ A more practical approach might be to reconsider the design of your document.
+ For instance, when using the \xoption{wordwise} option, you might encounter
+ ``\texttt{! TeX capacity exceeded}'' errors, particularly when employing the starred versions
+ of macros that output large portions of Quranic text.
- In such cases, you can achieve a similar output by using smaller chunks. For example, if you encounter errors like the following when attempting to typeset the first ten juzes with the \cs{quranjuz*[1-10]} command:
+
+ In such cases, you can achieve a similar output by processing smaller chunks.
+ For example, if you encounter errors when attempting to typeset the first ten juzes
+ with the \cs{quranjuz*[1-10]} command, consider breaking the task into smaller segments.
\begin{quote}
\tt{! TeX capacity exceeded, sorry [main memory size=5000000]} \\or \\
\tt{! TeX capacity exceeded, sorry [parameter stack size=10000]}
\end{quote}
- It would be more effective to typeset each juz separately or even each page within the range.
- For instance, you can use the commands \cs{quranjuz*[1]} \cs{quranjuz*[2]} $\cdots$ \cs{quranjuz*[10]}
+
+ It would be more effective to typeset each Juz separately or even each page within the desired range.
+ For instance, you can use the commands \cs{quranjuz*[1]} \cs{quranjuz*[2]} $\cdots$ \cs{quranjuz*[10]}
or \cs{quranpage*[1]} \cs{quranpage*[2]} $\cdots$ \cs{quranpage*[201]} to accomplish this.
@@ -871,78 +940,79 @@ fontspec{,} and bidi"]
\begin{History}
\begin{Version}{2015/06/01 v0.1}
- \item Initial release in Parsi\LaTeX\ group under the name of \xpackage{qurantext}.
- \item \cs{qurantext} added.
+ \item Initial release in Parsi\LaTeX\ group under the name \xpackage{qurantext}.
+ \item Added \cs{qurantext} macro.
\end{Version}
\begin{Version}{2015/06/02 v0.2}
- \item Redefinition of \cs{do@qt} in a non-recursive style. The old recursive version sometimes led to \TeX\ stack overflow.
- Thanks to \emph{Masoud Yazdani} for suggesting a solution to this issue.
+ \item Redefined \cs{do@qt} in a non-recursive style to prevent \TeX\ stack overflow issues.
+ The previous recursive version occasionally caused stack overflows.
+ Thanks to \emph{Masoud Yazdani} for suggesting the solution.
\end{Version}
\begin{Version}{2015/06/02 v0.3}
- \item Ayah's number has been added to the end of each verse of the output.
+ \item Added Ayah numbers at the end of each verse in the output.
Thanks to \emph{Mahmood AminToosi} for suggesting this feature.
\end{Version}
\begin{Version}{2015/06/04 v0.4} %reluctant about date
- \item \cs{surahname} added. It outputs the Arabic/Anglicized title of a surah based on text direction.
- \item Package renamed from \xpackage{qurantext} to \xpackage{quran}
+ \item Added \cs{surahname} macro to output the Arabic or Anglicized title of a surah, based on text direction.
+ \item Renamed the package from \xpackage{qurantext} to \xpackage{quran}.
\end{Version}
\begin{Version}{2015/06/24 v0.5}
- \item \cs{quranayah} added. It outputs a \meta{range} of ayahs from a surah.
- \item \cs{quransurah} added. It outputs a \meta{range} of surahs.
- Thanks to \emph{Mahmood AminToosi} for suggesting this new feature.
+ \item Added \cs{quranayah} macro to output a \meta{range} of ayahs from a surah.
+ \item Added \cs{quransurah} macro to output a \meta{range} of surahs.
+ \item Special thanks to \emph{Mahmood AminToosi} for suggesting these new features.
\end{Version}
\begin{Version}{2015/06/28 v0.6}
- \item \cs{quranjuz} added, which outputs a juz's range of the Holy Quran.
+ \item Added \cs{quranjuz} macro to output a juz's range of the Holy Quran.
\end{Version}
\begin{Version}{2015/06/30 v0.7}
- \item \cs{quranpage} added, which outputs one or more pages of the Holy Quran.
+ \item Added \cs{quranpage} macro to output one or more pages of the Holy Quran.
\end{Version}
\begin{Version}{2015/07/02 v0.71}
- \item Added a \cs{par} after the basmalah. This change was suggested by \emph{Mahmood AminToosi}.
+ \item Added a \cs{par} command after the Basmalah, following the suggestion of \emph{Mahmood AminToosi}.
\end{Version}
\begin{Version}{2015/07/02 v0.72}
- \item Added \cs{basmalah} which typesets basmalah -- \hboxR{\Basmalah}.
+ \item Introduced the \cs{basmalah} macro to typeset the Basmalah: \hboxR{\Basmalah}.
\end{Version}
\begin{Version}{2015/07/04 v0.8}
- \item Added \cs{quranquarter} and \cs{quranruku}.
+ \item Added the \cs{quranquarter} and \cs{quranruku} macros.
\end{Version}
\begin{Version}{2015/07/07 v0.9}
- \item Added \cs{quranhizb} and \cs{quranmanzil}.
+ \item Added the \cs{quranhizb} and \cs{quranmanzil} macros.
\item The package was uploaded to CTAN.
\end{Version}
\begin{Version}{2015/07/10 v0.91}
- \item ``Al-Ikhlaas'' was set as default option for \cs{quransurah}.
+ \item The default option for \cs{quransurah} was set to ``Al-Ikhlaas''.
\end{Version}
\begin{Version}{2015/07/11 v0.94}
- \item Added two new macros, \cs{ChangeAyahNumber} and\cs{ChangeBasmalah}, to change the way ayah's number and basmalah will appear.
- \item A minor bug related to extra white spaces around one ayah was fixed, thanks to \emph{Masoud Yazdani} by reporting this issue.
+ \item Added two new macros, \cs{ChangeAyahNumber} and \cs{ChangeBasmalah}, to customize the appearance of ayah numbers and basmalah.
+ \item Fixed a minor bug related to extra white spaces around one ayah, with thanks to \emph{Masoud Yazdani} for reporting the issue.
\end{Version}
\begin{Version}{2015/07/11 v0.941}
- \item Reduced the size of the ``quran script'' file by moving \cs{qt@par} to the \cs{qurantext} macro.
+ \item Reduced the size of the ``quran script'' file by moving \cs{qt@par} into the \cs{qurantext} macro.
\end{Version}
\begin{Version}{2016/02/05 v1.0}
- \item Added support for using anglicized title of surah as well as its index in \cs{quransurah} and \cs{quranayah}.
+ \item Added support for using anglicized titles of surahs, as well as their indexes, in \cs{quransurah} and \cs{quranayah}.
\end{Version}
\begin{Version}{2016/02/09 v1.05}
- \item Renamed \cs{ChangeBasmalah} and \cs{ChangeAyahNumber} to \cs{ToggleBasmalah} and \cs{ToggleAyahNumber} respectively.
+ \item Renamed \cs{ChangeBasmalah} and \cs{ChangeAyahNumber} to \cs{ToggleBasmalah} and \cs{ToggleAyahNumber}, respectively.
\item Fixed a minor bug in \cs{quransurah*} that caused unwanted extra spaces in the output.
- Thanks \emph{Hosein Behboody} for reporting this issue.
+ Thanks to \emph{Hosein Behboody} for reporting this issue.
\end{Version}
\begin{Version}{2016/04/21 v1.1}
@@ -956,7 +1026,7 @@ fontspec{,} and bidi"]
\begin{Version}{2016/10/05 v1.2}
\item Added support for Uthmani script via \xoption{uthmani} option,
- which was requested by one of the package's users.
+ as requested by one of the package's users.
\end{Version}
\begin{Version}{2016/11/07 v1.21}
@@ -964,7 +1034,7 @@ fontspec{,} and bidi"]
\end{Version}
\begin{Version}{2016/11/08 v1.22}
- \item The sources of two pdf files used in the documentation were appended to the bundle.
+ \item The sources of two PDF files used in the documentation were appended to the bundle.
\end{Version}
\begin{Version}{2016/11/12 v1.24}
@@ -989,40 +1059,46 @@ fontspec{,} and bidi"]
\begin{Version}{2017/08/22 v1.26}
\item Minor improvements
- \item Bug in \cs{quranayah[x][y]} fixed by enclosing in a group. Thanks to \emph{Sayyed Saieed Mosavi Nadooshani} for reporting this issue.
+ \item Fixed a bug in \cs{quranayah[x][y]} by enclosing it in a group. Thanks to \emph{Sayyed Saieed Mosavi Nadooshani} for reporting this issue.
\item Documentation updates.
\end{Version}
\begin{Version}{2016/08/22 v1.261}
- \item Documentation updates--a typo in version number.
+ \item Documentation updates--corrected a typo in version number.
\end{Version}
\begin{Version}{2017/10/22 v1.3}
- \item Added support for transliteration. Now all macros have an ``lt" version for typesetting transliteration of the original macros.
- Thanks to \emph{Hamidreza Ahmadian} for suggesting this new feature.
+ \item Added support for transliteration. Now all macros include an ``lt" version
+ for typesetting transliteration of the original macros. Thanks to \emph{Hamidreza Ahmadian}
+ for suggesting this feature.
\end{Version}
\begin{Version}{2017/10/28 v1.4}
- \item Persian, English, and Deutsch translations added
- with the addition of the "fa", "en", and "de" versions of macros for them.
- Three new options, `\xoption{transfa}', `\xoption{transen}', and `\xoption{transde}',
- are defined to enable these translations.
- \item There is also a new option, `\xoption{trans}' which can take the values
- `lt', `en', `de', and `fa' separated by commas,
- allowing for multiple translations to be used simultaneously.
+ \item Added Persian, English, and Deutsch translations with the
+ inclusion of the ``fa", ``en", and ``de" versions of macros. Three new options,
+ \xoption{transfa}, \xoption{transen}, and \xoption{transde},
+ have been introduced to enable these translations.
+ \item Introduced a new option, \xoption{trans}, which can accept values `lt', `en', `de', and `fa'
+ separated by commas, allowing for the simultaneous use of multiple translations.
\end{Version}
\begin{Version}{2017/12/22 v1.41}
- \item In previous versions, \cs{quransurah} and \cs{quranayah} macros were case-sensitive when using surah names. However, starting from this version, both macros are case-insensitive. This means there is no difference between using "Al-Fatihda", "al-fatiha", "al-Fatiha", or any other possible combinations of lower and uppercase letters for specifying surah names.
+ \item In previous versions, the \cs{quransurah} and \cs{quranayah} macros were case-sensitive
+ with regard to surah names. From this version onward, both macros are case-insensitive.
+ This change allows for any combination of uppercase and lowercase letters when specifying surah names,
+ so ``Al-Fatihda", ``al-fatiha", and ``al-Fatiha" are treated equivalently.
\end{Version}
\begin{Version}{2017/12/22 v1.42}
- \item Starting from this version, the \cs{quransurahX} and \cs{quranayahX} macros also support case-insensitivity with anglicized titles of surahs. The `X' in the macro names stands for `en', `de', `fa', or `lt'.
+ \item Starting from this version, the \cs{quransurahX} and \cs{quranayahX} macros also
+ support case-insensitivity for the anglicized titles of surahs.
+ Here, `X' represents the language codes `en' (English), `de' (Deutsch), `fa' (Persian), or `lt' (Latin).
+ This ensures that variations in capitalization do not affect the macro's functionality.
\end{Version}
\begin{Version}{2017/12/22 v1.42a}
- \item Documentation update--a typo has been fixed.
- \item Some files were missed in the last update to CTAN.
+ \item Documentation update--A typo has been corrected.
+ \item Some files were missed in the last CTAN update.
\end{Version}
\begin{Version}{2018/11/29 v1.42b}
@@ -1030,7 +1106,8 @@ fontspec{,} and bidi"]
\end{Version}
\begin{Version}{2018/12/01}
- \item \xpackage{quran-de} package is released, adding 3 more translations in the German language.
+ \item \href{https://github.com/javadr/quran-de}{\xpackage{quran-de}}
+ package is released, adding support for three more translations in German.
\end{Version}
\begin{Version}{2018/12/31 v1.5}
@@ -1038,7 +1115,8 @@ fontspec{,} and bidi"]
\end{Version}
\begin{Version}{2019/05/03}
- \item \xpackage{quran-ur} package is released, adding 8 translations in the Urdu language.
+ \item \href{https://github.com/javadr/quran-ur}{\xpackage{quran-ur}}
+ package is released, adding eight translations in Urdu.
\end{Version}
\begin{Version}{2019/05/04 v1.51}
@@ -1046,42 +1124,48 @@ fontspec{,} and bidi"]
\end{Version}
\begin{Version}{2020/03/07 v1.6}
- \item support for getting any chunks of an ayah with two extra optional arguments for \cs{qurantext} and \cs{quranayah}.
- This feature has been suggested and supported financially by \emph{Atiyah Elsheikh}.
- May God bless him.
- \item \cs{Basmalah} outputs basmalah without any surrounding whitespaces.
- \item Documentation has beeb revision.
+ \item Added support for getting any chunks of an ayah with two extra optional arguments
+ for \cs{qurantext} and \cs{quranayah}. This feature was suggested and
+ financially supported by \emph{Atiyah Elsheikh}. May God bless him.
+ \item \cs{Basmalah} now outputs basmalah without any surrounding whitespaces.
+ \item Documentation has been revised.
\end{Version}
\begin{Version}{2020/03/09 v1.61}
- \item The current font of text is now applied in the footnote when \cs{quranayah} or \cs{qurantext} is called with its ``\tt{+}'' optional argument. In the last version, it used the Amiri font for footnotes.
+ \item The current font of the text is now applied to footnotes when \cs{quranayah} or \cs{qurantext}
+ is called with its \texttt{+} optional argument. Previously, footnotes used the Amiri font.
\end{Version}
\begin{Version}{2020/03/12 v1.62}
- \item The license has been updated to LPPL Version 1.3c from LPPL Version 1.3
+ \item The license has been updated from LPPL Version 1.3 to LPPL Version 1.3c.
\end{Version}
\begin{Version}{2020/03/14 v1.63}
- \item Pause marks (waqf symbols) have been removed from \cs{quranayah} and \cs{qurantext} whenever the optional parameter \oarg{chunk range} is used.
+ \item Pause marks (waqf symbols) have been removed from \cs{quranayah} and \cs{qurantext}
+ when the optional parameter \oarg{chunk range} is used.
\end{Version}
\begin{Version}{2020/06/10 v1.7}
- \item French translation added and ``fr'' version of macros defined for it. New option, \xoption{transfr}, is defined for this translation.
- \item There is also a new value `\xoption{fr}' for the \xoption{trans} option.
+ \item French translation added with the introduction of the ``fr'' version of macros.
+ The new option \xoption{transfr} is defined for this translation.
+ \item A new value \xoption{fr} has been added to the \xoption{trans} option.
\item Documentation updates.
\end{Version}
\begin{Version}{2020/06/12 v1.7a}
- \item Some of the missed files (the French part) were uploaded to CTAN.
+ \item Some of the missed files related to the French translation were uploaded to CTAN.
\end{Version}
\begin{Version}{2020/10/14 v1.8}
- \item New option `\xoption{uthmani-min}'; it behaves the same as the `\xoption{uthmani}' option prior to this release.
- \item Now, the `\xoption{uthmani}' option typesets the text of the Holy Quran with more diacritical marks, as requested on \href{https://github.com/javadr/quran/issues/4}{this issue}.
+ \item Added a new option `\xoption{uthmani-min}'; it behaves the same as
+ the `\xoption{uthmani}' option prior to this release.
+ \item The `\xoption{uthmani}' option now typesets the text of the Holy Quran with more diacritical marks,
+ as requested on \href{https://github.com/javadr/quran/issues/4}{this issue}..
\end{Version}
\begin{Version}{2021/02/01}
- \item \xpackage{quran-bn} package is released, adding 2 translations of the Bengali language
+ \item \href{https://github.com/javadr/quran-bn}{\xpackage{quran-bn}}
+ package is released, adding two translations in Bengali,
as requested on \href{https://github.com/javadr/quran/issues/2}{this issue}.
\end{Version}
@@ -1091,7 +1175,8 @@ fontspec{,} and bidi"]
\begin{Version}{2023/06/28 v1.9; Eid al-Adha 1444 AH}
\item The new option `\xoption{ornbraces}' adds ornamental braces around the Quran text.
- \item \cs{SetOrnamentalBraces} allows for personalization of the ornamental braces surrounding the Quran text.
+ \item The \cs{SetOrnamentalBraces} command allows for
+ the personalization of the ornamental braces surrounding the Quran text.
\end{Version}
\begin{Version}{2023/07/10 v2.0}
@@ -1099,11 +1184,39 @@ fontspec{,} and bidi"]
\end{Version}
\begin{Version}{2023/07/27 v2.1}
- \item Anglicized names of Quran surahs Revised Using \href{http://tanzil.net/res/text/metadata/quran-data.xml}{Quran Metadata}.
- See table~\ref{tab:newnames}
+ \item Anglicized names of Quran surahs revised using \href{http://tanzil.net/res/text/metadata/quran-data.xml}{Quran Metadata}.
+ See Table~\ref{tab:newnames}
\item Fixed the issue with dropping \cs{par} introduced in version 1.9.
\end{Version}
+ \begin{Version}{2023/08/01 v2.2}
+ \item Added support for old Anglicized names of Quran surahs,
+ ensuring backward compatibility with previous versions of the package.
+ \end{Version}
+
+ \begin{Version}{2023/11/01}
+ \item \href{https://github.com/javadr/quran-id}{\xpackage{quran-id}}
+ package is released, adding three translations in Indonesian
+ as requested on \href{https://github.com/javadr/quran/issues/11}{this issue}.
+ \end{Version}
+
+ \begin{Version}{2023/11/04}
+ \item \href{https://github.com/javadr/quran-en}{\xpackage{quran-en}}
+ package is released, adding three translations in English
+ as requested on \href{https://github.com/javadr/quran/issues/7}{this issue}.
+ \end{Version}
+
+ \begin{Version}{2024/09/05}
+ \item \href{https://github.com/javadr/quran-es}{\xpackage{quran-es}}
+ package is released, adding three translations in Spanish
+ as requested on \href{https://github.com/javadr/quran/issues/12}{this issue}.
+ \end{Version}
+
+ \begin{Version}{2024/09/07 v2.3}
+ \item Documentation update with the release of \href{https://github.com/javadr/quran-es}{\xpackage{quran-es}}.
+ \end{Version}
+
+
\begin{table}[!htbp]
\ttfamily\small
\begin{tabular}{|c|l|l||c|l|l|}
@@ -1146,10 +1259,6 @@ fontspec{,} and bidi"]
\caption{Revision of Anglicized Names of Quran Surahs in ver. 2.1}\label{tab:newnames}
\end{table}
- \begin{Version}{2023/08/01 v2.2}
- \item Added support for old Anglicized names of Quran surahs, making the package backward compatible.
- \end{Version}
-
\def\cb{{\tiny$\bullet$\space}}
\def\mrule{\leaders\vrule height 2.5pt depth -1.5pt \hfill}
@@ -1169,7 +1278,7 @@ fontspec{,} and bidi"]
\cb \cs{qurantext} \\
2015/06/02 & 0.2 & \cb Implementation of \cs{do@qt} in a non-recursive style \\
2015/06/02 & 0.3 & \cb Ayah's number has been appended to each verse.\\
- 2015/06/04 & 0.4 & \cb \cs{surahname} outputing the Arabic/Anglicized title of a surah\par
+ 2015/06/04 & 0.4 & \cb \cs{surahname} outputs the Arabic/Anglicized title of a surah\par
\cb The package renamed to \xpackage{quran}\\
2015/06/24 & 0.5 & \cb \cs{quranayah} and \cs{quransurah} \\
2015/06/28 & 0.6 & \cb \cs{quranjuz} \\
@@ -1189,7 +1298,7 @@ fontspec{,} and bidi"]
\cb Fixed a minor bug in \cs{quransurah*}\\
2016/04/21 & 1.1 & \cb \cs{indexconvert} \\
2016/05/15 & 1.14 & \cb Documentation updates \\
- 2016/10/05 & 1.2 & \cb \xoption{uthmani} option supporting Uthmani script \\
+ 2016/10/05 & 1.2 & \cb Added \xoption{uthmani} option supporting Uthmani script \\
2016/11/07 & 1.21 & \cb Fixed some minor bugs \\
2016/11/08 & 1.22 & \cb Documentation updates \\
2016/11/12 & 1.24 & \cb Documentation updates\par
@@ -1202,34 +1311,44 @@ fontspec{,} and bidi"]
\cb Bug fix in \cs{quranayah[x][y]}\par
\cb Documentation updates \\
2016/08/22 & 1.261 & \cb Documentation updates \\
- 2017/10/22 & 1.3 & \cb Transliteration supported via \xoption{translt} option \\
+ 2017/10/22 & 1.3 & \cb Added support for transliteration via \xoption{translt} option \\
2017/10/28 & 1.4 & \cb Persian, English, and Deutsch translations via \xoption{transfa}, \xoption{transen}, and \xoption{transde} options\par
\cb \xoption{trans} option with `lt', `en', `de', and `fa' values \\
- 2017/12/22 & 1.41 & \cb case-insensitive \cs{quransurah} and \cs{quranayah} \\
- 2017/12/22 & 1.42 & \cb case-insensitive \cs{quransurahX} and \cs{quranayahX} \par\tt{X} $\in$ \{`en', `de', `fa', `lt'\} \\
+ 2017/12/22 & 1.41 & \cb Case-insensitive \cs{quransurah} and \cs{quranayah} \\
+ 2017/12/22 & 1.42 & \cb Case-insensitive \cs{quransurahX} and \cs{quranayahX} \par\tt{X} $\in$ \{`en', `de', `fa', `lt'\} \\
2017/12/22 & 1.42a & \cb Documentation updates \\
2018/11/29 & 1.42b & \cb Fixed a typo in \tt{quran-transde.def}\\
- 2018/12/01 & \multicolumn{2}{c|}{ \null \mrule {\space}First release of the \xpackage{quran-de} package \mrule \space\null}\\
+ 2018/12/01 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-de}{\xpackage{quran-de}} package \mrule \space\null}\\
2018/12/31 & 1.5 & \cb Bug fix in \cs{ToggleBasmalah} and \cs{quransurah} \\
- 2019/05/03 & \multicolumn{2}{c|}{ \null \mrule {\space}First release of the \xpackage{quran-ur} package \mrule \space\null}\\
+ 2019/05/03 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-ur}{\xpackage{quran-ur}} package \mrule \space\null}\\
2019/05/04 & 1.51 & \cb Fixed a typo in \tt{quran-transde.def}\\
2020/03/07 & 1.6 & \cb \cs{qurantext} and \cs{quranayah} support any chunks of an ayah\par
\cb \cs{Basmalah} \hfil \cb Documentation revision\\
2020/03/09 & 1.61 & \cb Minor update in \cs{quranayah} and \cs{qurantext} \\
- 2020/03/12 & 1.62 & \cb License update to LPPL Version 1.3c \\
- 2020/03/14 & 1.63 & \cb Removing pause marks with \meta{chunk range} optional parameter\\
+ 2020/03/12 & 1.62 & \cb License updated to LPPL Version 1.3c \\
+ 2020/03/14 & 1.63 & \cb Removed pause marks with \meta{chunk range} optional parameter\\
2020/06/10 & 1.7 & \cb French translation available via
\xoption{transfr} option, or
\xoption{trans} option with ‘\xoption{fr}’ value\\
2020/06/12 & 1.7a & \cb CTAN upload correction. \\
- 2020/10/14 & 1.8 & \cb `\xoption{uthmani}' is renamed to `\xoption{uthmani-min}' \par
- \cb `\xoption{uthmani}' typesets text of the Holy Quran with more diacritical marks.\\
- 2021/02/01 & \multicolumn{2}{c|}{ \null \mrule {\space}First release of the \xpackage{quran-bn} package \mrule \space\null}\\
+ 2020/10/14 & 1.8 & \cb Renamed `\xoption{uthmani}' to `\xoption{uthmani-min}' \par
+ \cb `\xoption{uthmani}' now typesets text of the Holy Quran with more diacritical marks.\\
+ 2021/02/01 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-bn}{\xpackage{quran-bn}} package \mrule \space\null}\\
2021/02/02 & 1.81 & \cb Documentation updates \\
- 2023/06/28 & 1.9 & \cb `\xoption{ornbraces}' option \par\cb \cs{SetOrnamentalBraces} to customize the ornamental braces. \\
+ 2023/06/28 & 1.9 & \cb Added `\xoption{ornbraces}' option \par\cb \cs{SetOrnamentalBraces} to customize the ornamental braces. \\
2023/07/10 & 2.0 & \cb Quran text update in compliance with tanzil version 1.1. \\
- 2023/07/27 & 2.1 & \cb Revision of the Anglicized names of Quran surahs \\
+ 2023/07/27 & 2.1 & \cb Revised Anglicized names of Quran surahs \\
2023/08/01 & 2.2 & \cb Added support for old Anglicized names of Quran surahs \\
+ 2023/11/01 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-id}{\xpackage{quran-id}} package \mrule \space\null}\\
+ 2023/11/04 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-en}{\xpackage{quran-en}} package \mrule \space\null}\\
+ 2024/09/05 & \multicolumn{2}{c|}{ \null \mrule {\space}Initial release of the
+ \href{https://github.com/javadr/quran-es}{\xpackage{quran-es}} package \mrule \space\null}\\
+ 2024/09/07 & 2.3 & \cb Documentation retouching \\
\bottomrule
\end{longtable}
\end{small}
diff --git a/Master/texmf-dist/doc/latex/quran/quran-test.pdf b/Master/texmf-dist/doc/latex/quran/quran-test.pdf
index 9e24257de15..19cfd323f55 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-test.pdf
+++ b/Master/texmf-dist/doc/latex/quran/quran-test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/quran/quran-test1.pdf b/Master/texmf-dist/doc/latex/quran/quran-test1.pdf
index 84c465224ed..af981c10f26 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-test1.pdf
+++ b/Master/texmf-dist/doc/latex/quran/quran-test1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/quran/quran-test1.tex b/Master/texmf-dist/doc/latex/quran/quran-test1.tex
index cfacb4c87ff..d0f0026ea2e 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-test1.tex
+++ b/Master/texmf-dist/doc/latex/quran/quran-test1.tex
@@ -5,6 +5,7 @@
\setotherlanguage{arabic}
\usepackage{fontspec}
\setmainfont{Scheherazade}
+\newfontfamily\arabicfonttt[Script=Arabic]{Scheherazade}
\usepackage[uthmani, wordwise, ornbraces, nonumber]{quran}
%%% for typesetting in Rigth-To-Left direction
diff --git a/Master/texmf-dist/doc/latex/quran/quran-test2.pdf b/Master/texmf-dist/doc/latex/quran/quran-test2.pdf
index 586c41f3b78..133a813d64f 100644
--- a/Master/texmf-dist/doc/latex/quran/quran-test2.pdf
+++ b/Master/texmf-dist/doc/latex/quran/quran-test2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randintlist/README.md b/Master/texmf-dist/doc/latex/randintlist/README.md
new file mode 100644
index 00000000000..4cd0c343568
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/randintlist/README.md
@@ -0,0 +1,6 @@
+This package (like luarandom, but without the obligation to use lualatex) provides some macros for creating random integer number lists between a and b.
+This list can have multiple numbers or not, and this list can be sorted or not.
+--------------------------------------------------------------------------------------------------------------------------------------------------------
+Author..: Cédric Pierquet
+email...: cpierquet@outlook.fr
+Licence.: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.pdf b/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.pdf
new file mode 100644
index 00000000000..373177badb5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.tex b/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.tex
new file mode 100644
index 00000000000..d08d3edbb66
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/randintlist/randintlist-doc.tex
@@ -0,0 +1,351 @@
+% !TeX TXS-program:compile = txs:///arara
+% arara: pdflatex: {shell: no, synctex: no, interaction: batchmode}
+% arara: pdflatex: {shell: no, synctex: no, interaction: batchmode}
+
+\documentclass[11pt,a4paper]{ltxdoc}
+\usepackage{bera}
+\usepackage{inconsolata}
+\usepackage[T1]{fontenc}
+\usepackage[scale=0.875]{cabin}
+\usepackage{randintlist}
+\usepackage{fancyvrb}
+\usepackage{fancyhdr}
+\usepackage{tabularray}
+\usepackage{fontawesome5}
+\fancyhf{}
+\renewcommand{\headrulewidth}{0pt}
+\lfoot{\sffamily\small [randintlist]}
+\cfoot{\sffamily\small - \thepage{} -}
+\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
+\usepackage{hologo}
+\providecommand\tikzlogo{Ti\textit{k}Z}
+\providecommand\TeXLive{\TeX{}Live\xspace}
+\let\TikZ\tikzlogo
+
+\usepackage{hyperref}
+\urlstyle{same}
+\hypersetup{pdfborder=0 0 0}
+\usepackage[margin=2cm]{geometry}
+\setlength{\parindent}{0pt}
+\def\TPversion{0.1.1}
+\def\TPdate{24/09/2024}
+\usepackage{tcolorbox}
+\usepackage{pgffor}
+\tcbuselibrary{breakable,skins,hooks,listingsutf8}
+%\usepackage{soul}
+%\sethlcolor{lightgray!25}
+
+\lstset{
+ language=[LaTeX]TeX,%
+ basicstyle=\ttfamily,%
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={euromoney},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\randintlist,\getitemfromrandintlist},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={min,max,nb,seed,sort,sep,repeat,exclude},%
+ keywordstyle={\color{orange}}
+}
+
+\newtcblisting{DemoCode}[1]{%
+ enhanced,width=\linewidth,%
+ bicolor,size=title,%
+ colback=cyan!10!white,%
+ colbacklower=cyan!5!white,%
+ colframe=cyan!75!black,%
+ listing options={%
+ breaklines=true,%
+ breakatwhitespace=true,%
+ style=tcblatex,basicstyle=\small\ttfamily,%
+ tabsize=4,%
+ commentstyle={\itshape\color{gray}},
+ keywordstyle={\color{blue}},%
+ classoffset=0,%
+ keywords={\usepackage,\includegraphics,xstring,listofitems,tikz,calc,simplekv,graphicx,\readlist,\showitems,\xintFor,\xintSeq},%
+ alsoletter={-},%
+ keywordstyle={\color{blue}},%
+ classoffset=1,%
+ alsoletter={-},%
+ morekeywords={euromoney},%
+ keywordstyle={\color{violet}},%
+ classoffset=2,%
+ alsoletter={-},%
+ morekeywords={\randintlist,\getitemfromrandintlist,\ListeRandint,\ExtraireEltListeRandint},%
+ keywordstyle={\color{green!50!black}},%
+ classoffset=3,%
+ morekeywords={min,max,nb,seed,sort,sep,repeat,Min,Max,Nb,Graine,Sep,Tri,Repet,exclude,Exclure},%
+ keywordstyle={\color{orange}}
+ },%
+ #1
+}
+
+\newtcbinputlisting\DemoCodeFile[1]{%
+ enhanced,width=\linewidth,%
+ bicolor,size=title,%
+ colback=lightgray!10!white,%
+ colbacklower=lightgray!5!white,%
+ colframe=lightgray!75!black,%
+ listing options={%
+ breaklines=true,%
+ breakatwhitespace=true,%
+ style=tcblatex,
+ basicstyle=\scriptsize\ttfamily,%
+ tabsize=4,%
+ commentstyle={\itshape\color{gray}},%
+ lastline=148
+ },%
+ breakable,
+ listing only,%
+ listing file={#1}
+}
+
+\NewDocumentCommand\ShowCode{ m }{%
+ \lstinline{#1}%
+}
+
+\begin{document}
+
+\thispagestyle{empty}
+
+\begin{center}
+ \begin{minipage}{0.88\linewidth}
+ \begin{tcolorbox}[colframe=yellow,colback=yellow!15]
+ \begin{center}
+ \renewcommand{\arraystretch}{1.25}%
+ \begin{tabular}{c}
+ {\Huge \texttt{randintlist}}\\
+ \\
+ {\LARGE Creating random integer number lists,} \\
+ {\LARGE with multiple numbers or not,} \\
+ {\LARGE sorted or not.} \\
+ \\
+ {\small \texttt{Version \TPversion{} -- \TPdate}}
+ \end{tabular}
+ \end{center}
+ \end{tcolorbox}
+ \end{minipage}
+\end{center}
+
+\begin{center}
+ \begin{tabular}{c}
+ \texttt{Cédric Pierquet}\\
+ {\ttfamily c pierquet -- at -- outlook . fr}\\
+ \texttt{\url{https://github.com/cpierquet/randintlist}} \\
+ \end{tabular}
+\end{center}
+
+\hrule
+
+\vfill
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+10 numbers, between 1 and 100, without repetition :
+
+\hfill\randintlist[min=1,max=100,nb=10]{\mylist}\textcolor{red}{\mylist}\hfill~
+
+The 5th value is :
+
+\hfill\textcolor{blue}{\getitemfromrandintlist{\mylist}{5}}\hfill~
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+10 numbers, between 1 and 100, without multiples of 5 :
+
+\hfill\randintlist[min=1,max=100,nb=10,exclude={5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100}]{\mylist}\textcolor{olive}{\mylist}\hfill~
+
+The 9th value is :
+
+\hfill\textcolor{purple}{\getitemfromrandintlist{\mylist}{9}}\hfill~
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+15 numbers, between 1 and 20, with repetition :
+
+\hfill\randintlist[min=1,max=20,nb=15,repeat]{\mylist}\textcolor{red}{\mylist}\hfill~
+
+The last value is :
+
+\hfill\textcolor{blue}{\getitemfromrandintlist{\mylist}{-1}}\hfill~
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+6 sorted numbers, between 1 and 51, without repetition :
+
+\hfill\randintlist[min=1,max=51,nb=6,sort=asc]{\mylist}ascending : \textcolor{red}{\mylist}\hfill~
+
+\hfill\randintlist[min=1,max=51,nb=6,sort=des,sep=>]{\mylist}descending : \textcolor{red}{\mylist}\hfill~
+\end{tcolorbox}
+
+\vfill~
+
+\hrule
+
+\medskip
+
+\emph{%
+ The \textsf{luarandom} package do the same things, but with the obligation to compile with \hologo{LuaLaTeX}.
+}
+
+\medskip
+
+\hrule
+
+\vspace*{5mm}
+
+\pagebreak
+
+\phantomsection
+
+\hypertarget{matoc}{}
+
+\tableofcontents
+
+\vspace*{5mm}
+
+%\hrule
+
+\pagebreak
+
+\section{Loading, useful packages}
+
+In order to load \texttt{randintlist}, simply use :
+
+\begin{DemoCode}{listing only}
+\usepackage{randintlist}
+\end{DemoCode}
+
+Loaded packages are \texttt{ifthen}, \texttt{simplekv}, \texttt{listofitems}, \texttt{randomlist}, \texttt{xintexpr} and \texttt{xstring}
+
+\section{The Macros}
+
+\subsection{Global usage}
+
+Package \texttt{randintlist} supports the creation of random integer number lists where a number will appear only once or multiple times. Generated lists can te used with \texttt{listofitems}.
+
+\hfill\textbf{All engines \TeX\ are compatible with this package.}\hfill~
+
+\subsection{Generate the list}
+
+\begin{DemoCode}{listing only}
+%generate list
+\randintlist[keys]{\macro}
+\end{DemoCode}
+
+Available keys are :
+
+\begin{itemize}
+ \item \ShowCode{min} : minimum value (default \ShowCode{1}) ;
+ \item \ShowCode{max} : maximum value (default \ShowCode{50}) ;
+ \item \ShowCode{nb} : number of values (default \ShowCode{6}) ;
+ \item \ShowCode{sep} : separator for the list (default \ShowCode{,}) ;
+ \item \ShowCode{sort} : sorting options, within \ShowCode{no/asc/dec} (default \ShowCode{no}) ;
+ \item \ShowCode{repeat} : boolean to authorize repeating values (default \ShowCode{false}) ;
+ \item \ShowCode{exclude} : list of excluded values (default \ShowCode{empty}) ;
+ \item \ShowCode{seed} : random seed value according to used packages (default \ShowCode{-}).
+\end{itemize}
+
+\begin{DemoCode}{}
+%default values
+\randintlist{\mylistA}\mylistA
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%10 between 1 and 50, with ascending
+\randintlist[sort=asc,min=1,max=50,nb=10]{\mylistB}\mylistB
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%15 between 1 and 50, with ascending and repetitions allowed
+\randintlist[sort=asc,min=1,max=50,nb=15,repeat]{\mylistC}\mylistC
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%15 between 1 and 50, without multiples of 5
+\randintlist[%
+ sort=asc,min=1,max=50,nb=15,repeat,%
+ exclude={5,10,15,20,25,30,35,40,45,50}]%
+ {\mylistC}\mylistC
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%list used with listofitems
+\randintlist{\mylistD}\mylistD\par
+\readlist*\mylistused{\mylistD}\showitems{\mylistused}\par
+\mylistused[1] ; \mylistused[-1]
+\end{DemoCode}
+
+\subsection{Accessing elements}
+
+\begin{DemoCode}{listing only}
+%accessing item
+\getitemfromrandintlist[separator]{\macro}{index}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%with default keys
+\randintlist{\mylistE}raw list : \mylistE\par
+items list :\par
+\xintFor* #1 in {\xintSeq{1}{6}}\do{\getitemfromrandintlist{\mylistE}{#1}\par}
+first element : \getitemfromrandintlist{\mylistE}{1}
+\end{DemoCode}
+
+\subsection{Version française}
+
+Voilà les commandes en version française, la syntaxe et les clés ne seront pas explicitées.
+
+\begin{DemoCode}{listing only}
+%obtenir la liste
+\ListeRandint[Min=..,Max=..,Nb=..,Repet=..,Graine=..,Tri=..,Sep=..,Exclure=..]{\macro}
+
+%extraire un élément
+\ExtraireEltListeRandint[sep]{\macro}{position}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%liste
+\ListeRandint[Min=5,Max=15,Nb=7,Repet,Tri=croiss,Sep={/}]{\maliste}\maliste\\
+%élément
+\ExtraireEltListeRandint[/]{\maliste}{4}
+\end{DemoCode}
+
+\pagebreak
+
+\section{Example}
+
+The following example uses \TikZ, and comes from \texttt{luarandom}'s documentation.
+
+\begin{DemoCode}{}
+\begin{tikzpicture}[scale=0.75]
+ \randintlist[min=1,max=100,nb=100]{\mylistsquare}
+ \draw[thin,gray] (0,0) grid (10,10) ;
+ \foreach \i in {1,...,100}{%
+ \xdef\tmpnumber{\getitemfromrandintlist{\mylistsquare}{\i}}%
+ \xdef\tmpnumberrow{\xinteval{\xintiiRem{\i-1}{10}}}%
+ \xdef\tmpnumbercol{\xinteval{\xintiiQuo{\i-1}{10}}}%
+ \draw ({0.5+\tmpnumbercol},{0.5+\tmpnumberrow}) node {\tmpnumber} ;
+ }%
+\end{tikzpicture}
+\end{DemoCode}
+
+\pagebreak
+
+\section{History}
+
+\texttt{0.1.1 : Possibility to exclude values}
+
+\texttt{0.1.0 : Initial version}
+
+\section{The code}
+
+\DemoCodeFile{randintlist.sty}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/regulatory/README.md b/Master/texmf-dist/doc/latex/regulatory/README.md
index ec9a283dc9b..55a5e0f4bf8 100644
--- a/Master/texmf-dist/doc/latex/regulatory/README.md
+++ b/Master/texmf-dist/doc/latex/regulatory/README.md
@@ -1,4 +1,5 @@
# Regulatory
+![CTAN Version](https://img.shields.io/ctan/v/regulatory)
A LaTeX package which provides macro's for crafting regulatory documents.
diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf b/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf
index 7bac5e0c9b3..2c679dbcb1e 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-en.tex b/Master/texmf-dist/doc/latex/regulatory/example1-en.tex
index eeb17acc994..ae903d7ef09 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example1-en.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/example1-en.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[12pt,english]{article}
\usepackage{babel}
\usepackage[alldefs]{regulatory}
diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf
index bc3f8b1d537..5bcb030bd88 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-nl.tex b/Master/texmf-dist/doc/latex/regulatory/example1-nl.tex
index df01669786a..513c9bce6e5 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example1-nl.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/example1-nl.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[12pt,dutch]{article}
\usepackage{babel}
\usepackage[alldefs]{regulatory}
diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf b/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf
index e7fdc771783..3362320b7fd 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-en.tex b/Master/texmf-dist/doc/latex/regulatory/example2-en.tex
index f47f7d0d9ef..c800c7672f5 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example2-en.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/example2-en.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[12pt,english]{article}
\usepackage{babel}
\usepackage{regulatory}
diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf
index 6342318259e..e2606186ca8 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-nl.tex b/Master/texmf-dist/doc/latex/regulatory/example2-nl.tex
index 071cce4a009..67134956584 100644
--- a/Master/texmf-dist/doc/latex/regulatory/example2-nl.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/example2-nl.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[12pt,dutch]{article}
\usepackage{babel}
\usepackage{regulatory}
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf
index ac592a49898..c65752a189b 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex
index 55d42907535..e497d27fd84 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[10pt,english]{ltxdoc}
%! suppress = InclusionLoop
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf
index 9d4832ce44d..d8ff64100bc 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex
index f5c9f47259d..c8048c9025b 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\documentclass[10pt,dutch]{ltxdoc}
%! suppress = InclusionLoop
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-preamble.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory-preamble.tex
index 50c6db1bee0..0325d5aacfb 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory-preamble.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-preamble.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\usepackage{gitinfo-lua}
\usepackage{listings}
diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory.tex
index fbd5d35c3df..55bcbe8c6a2 100644
--- a/Master/texmf-dist/doc/latex/regulatory/regulatory.tex
+++ b/Master/texmf-dist/doc/latex/regulatory/regulatory.tex
@@ -19,7 +19,7 @@
% example1-nl.tex, example2-nl.tex,
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
-% fc-dutch.def and regulatory.sty
+% regulatory.sty
\translation{%
\title{Package \package{regulatory}\thanks{This document corresponds to \textsf{regulatory}~\packageversion, written on \packagedate.}}
}{%
@@ -176,16 +176,14 @@ lualatex main
}{, voor onderdelen.}
\translation{%
For ``subparagraphs'', \cmd{\abalpnum} from the \package{fmtcount}\footnote{%
- The Dutch language definition is currently in progress within the \href{https://github.com/vincentb1/fmtcount/pull/51}{\package{fmtcount}} package.
- In the meantime, this package includes the correct configuration for it.%
- } package is used to enumerate multiple subparagraphs.
+ The Dutch language definition is now included into package \href{https://github.com/Xerdi/fmtcount}{\package{fmtcount}} itself.
+ Be sure to update the package if \texttt{fc-dutch.def} is missing} package is used to enumerate multiple subparagraphs.
Suppose \cmd{\alph} were used; in that case, \option{paras} (second level) would be limited to 26 subparagraphs.
With \cmd{\abalphnum}, for example, with a value of 125, the result is `\texttt{du}'.
}{%
Voor onderdelen wordt er gebruik gemaakt van \cmd{\abalpnum} uit pakket \package{fmtcount}\footnote{%
- De Nederlandse taal definitie is momenteel nog in behandeling bij pakket \href{https://github.com/vincentb1/fmtcount/pull/51}{\package{fmtcount}}.
- In de tussentijd levert dit pakket daarvoor de juist configuratie mee.%
- } om meerdere onderdelen te kunnen opsommen.
+ De Nederlandse taal definitie is nu inbegrepen in pakket \href{https://github.com/Xerdi/fmtcount}{\package{fmtcount}} zelf.
+ Zorg ervoor dat het pakket up to date is als \texttt{fc-dutch.def} mist.} om meerdere onderdelen te kunnen opsommen.
Stel er zou gebruik gemaakt worden van \cmd{\alph}, dan is \option{paras} beperkt tot 26 onderdelen.
Bij \cmd{\abalphnum} met b\ij{}voorbeeld een waarde van 125 is `\texttt{du}' de uitkomst.
}
diff --git a/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf b/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
index cb574aa07cc..55b369d6201 100644
--- a/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
+++ b/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.pdf b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.pdf
index 891c9e8e978..0cbc015c8a7 100644
--- a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.pdf
+++ b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.tex b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.tex
index a119e6e416f..4f9f5d7686e 100644
--- a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.tex
+++ b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte-example.tex
@@ -33,11 +33,100 @@
\title{Example usage of the \textsf{rub-kunstgeschichte} class}
\author{Joran Schneyer}
+
+%% bibliography file (usually you would put this in a seperate .bib file)
+\begin{filecontents}{rub-kunstgeschichte-example.bib}
+@article{exampleArticle,
+ author = {Maxi Mustermann},
+ title = {A very interesting article},
+ year = {2001},
+ journal = {Important example journal}
+}
+@book{exampleBook,
+ author = {John Smith},
+ title = {A long example book},
+ year = {2024}
+}
+@online{exampleWebsite,
+ author = {{Example consortium}},
+ title = {The truth about example documents},
+ year = {2020},
+ note = {Internet forum article},
+ url = {https://example.com},
+ urldate = {2100-04-01}
+}
+@manual{biblatexDocs,
+ author = {Philip Kime and Moritz Wemheuer and Philipp Lehman},
+ title = {The biblatex Package},
+ subtitle = {Programmable Bibliographies and Citations},
+ year = {2024},
+ url = {https://ctan.org/pkg/biblatex},
+ urldate = {2024-06-25}
+}
+@online{biblatexCheatsheet,
+ title = {Biblatex Cheat Sheet},
+ author = {Clea F. Rees},
+ year = {2017},
+ url = {https://ctan.org/pkg/biblatex-cheatsheet},
+ urldate = {2024-06-25}
+}
+\end{filecontents}
+
+\addbibresource{rub-kunstgeschichte-example.bib}
\begin{document}
\maketitle
- Here is some text.
- Note, how the typeset text has 12pt font size as specified
- and there is a 1.5 times line-spacing present.
+ \tableofcontents
+
+ \section{Introduction}
+ The \textsf{rub-kunstgeschichte} class aims to implement
+ the guidelines on scientific writing of the art history institute
+ ``KGI'' (\textit{Kunstgeschichtliches Institut})
+ at Ruhr University Bochum.
+
+ This example document showcases a typical use
+ of the \textsf{rub-kunstgeschichte} class.
+ Just by using the class, the page is already formatted
+ so that the typeset text has 12pt font size,
+ there is a 1.5 times line-spacing present
+ and the page size is A4 with 2cm margins at top, left and bottom,
+ as well as a 4cm margin on the right.
+
+ Also, paragraphs don't have an indentation
+ in the first line by default,
+ contrary to typical \LaTeX{} documents.
+ Furthermore the \texttt{hyperref} package
+ is automatically loaded to enable clickable
+ links and references.
+
+ \section{How to cite sources}
+ This class automatically loads the \texttt{biblatex} package
+ for sophisticated bibliography and citations.
+ The class also sets some options by default
+ that make \texttt{biblatex} behave closer to the
+ suggested citation style in the guidelines of the institute.
+
+ You can cite sources using the \verb|\autocite| command,
+ which is configured by this class to use footnotes
+ \autocite{exampleArticle}.
+ Page numbers can be added in the optional argument
+ \autocite[394]{exampleBook}
+ and citation signals in a second one
+ that comes before the one for page numbers
+ \autocite[see][]{exampleWebsite}.
+ You can even cite multiple sources at once
+ using the \verb|\autocites| command
+ \autocites[111]{exampleBook}[see also][13]{exampleArticle}.
+
+ For more information refer to the documentation
+ of the \texttt{biblatex} package
+ \autocite{biblatexDocs}
+ or the biblatex cheatsheet
+ \autocite{biblatexCheatsheet}.
+
+ At the end of the document we can include a bibliography
+ containing all cited sources with \verb|\printbibliography|.
+
+ \printbibliography
\end{document}
\endinput
diff --git a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte.pdf b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte.pdf
index 98614bb7331..e62e392a4b9 100644
--- a/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte.pdf
+++ b/Master/texmf-dist/doc/latex/rub-kunstgeschichte/rub-kunstgeschichte.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/scrhack/LICENSE.md b/Master/texmf-dist/doc/latex/scrhack/LICENSE.md
new file mode 100644
index 00000000000..1863f2f61a2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/LICENSE.md
@@ -0,0 +1,19 @@
+----------------------------------------------------------------------------
+
+This work may be distributed and/or modified under the conditions of the
+LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
+or later. This work has the LPPL maintenance status “maintainedâ€.
+The current maintainer and author of this work is Markus Kohm.
+
+----------------------------------------------------------------------------
+
+Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+Version 1.3c oder später ist Teil aller Verteilungen von LaTeX 2005/12/01
+oder später. Dieses Werk hat den LPPL-Verwaltungs-Status „maintainedâ€.
+Der aktuelle Verwalter und Autor dieses Werks ist Markus Kohm.
+
+----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/scrhack/README.md b/Master/texmf-dist/doc/latex/scrhack/README.md
new file mode 100644
index 00000000000..b85195ab541
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/README.md
@@ -0,0 +1,207 @@
+# Package `scrhack`
+
+Copyright © 2008–2024 Markus Kohm
+
+Release: 2024-09-04 v3.42
+
+License: LPPL 1.3c
+
+KOMA presents the compatibility package to emulate the former
+[KOMA-Script](https://www.ctan.org/pkg/koma-script) package `scrhack` as part
+of the *third-party enhancements* project.
+
+------------------------------------------------------------------------------
+
+This work may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, version 1.3c of the license.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+The Current Maintainer and author of this work is Markus Kohm.
+
+------------------------------------------------------------------------------
+
+# Abstract
+
+For several years
+[KOMA-Script](https://www.sourceforge.net/project/koma-script) provided a
+package `scrhack`, that has been made not only to improve the compatibility of
+third-party packages with [KOMA-Script](https://www.ctan.org/pkg/koma-script)
+classes, but also to generally improve third-party packages. The package
+consisted not only in the package file `scrhack.sty` but also in several so
+called hacks as separate files with extension `.hak`. In the course of
+splitting off former [KOMA-Script](https://www.ctan.org/pkg/koma-script)
+packages from the [KOMA-Script](https://www.ctan.org/pkg/koma-script)
+collection, it was decided to create independent packages from the individual
+hacks. These new independent packages then serve as replacements for the
+original packages they were intended to improve. In addition, to preserve the
+functionality of loading the enhancements only when the corresponding original
+package is loaded, a new `scrhack` was created to do just that.
+
+# Installation for Users
+
+If you are a user, you should wait until all the packages of the third-party
+enhancement project have been added to your preferred TeX distribution. Then
+you can use the package manager of your TeX distribution to install all the
+packages at once.
+
+Note: If you have installed a
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) before version 3.42,
+ you should also update
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) using the package
+ manager of your TeX distribution as soon as such an update is
+ availiabe. Otherwise it could happen, that the old integrated `scrhack`
+ of [KOMA-Script](https://www.ctan.org/pkg/koma-script) is used instead
+ of the new installed version. On the one hand, KOMA-Script 3.41 works
+ with both the integrated `scrhack` and the new standalone `scrhack`. On
+ the other hand, KOMA-Script from version 3.42 does not provide an
+ integrated `scrhack`. So installing the new standalone `scrhack` before
+ or at least with KOMA-Script version 3.42 is the best option.
+
+# Unpacking for Distributors
+
+Distributors should download [the distribution from
+CTAN](https://www.ctan.org/pkg/scrhack). This consists in:
+
+* `scrhack.dtx`
+* `scrhack-2023-07-07.dtx`
+* `README.md`
+* `LICENSE.md`
+* `scrhack.pdf`
+* `scrhack-2023-07-07.pdf`
+
+If distributors also want to distribute `scrhack.sty`,
+`scrhack-2023-07-07.sty`, `float.hak`, `floatrow.hak`, `hyperref.hak`,
+`listings.hak`, `lscape.hak`, `nomencl.hak`, `setspace.hak`, and
+`standardsectioning.hak` they can unpack these using:
+
+ tex scrhack.dtx
+ tex scrhack-2023-07-07.dtx
+
+Note, that you have to use `tex` not `latex`, `pdflatex`, `xelatex` or
+`lualatex`!
+
+Note also, that a legal distribution consists at least in:
+
+* `scrhack.dtx`
+* `scrhack-2023-07-07.dtx`
+* `README.md`
+
+The following files are optionally, but must not be distributed without the
+previous ones:
+
+* `LICENSE.md`
+* `scrhack.sty`
+* `scrhack.pdf`
+* `scrhack-2023-07-07.sty`
+* `scrhack-2023-07-07.pdf`
+* `float.hak`
+* `floatrow.hak`
+* `hyperref.hak`
+* `listings.hak`
+* `lscape.hak`
+* `nomencl.hak`
+* `setspace.hak`
+* `standardsectioning.hak`
+
+
+# Unpacking and Installation for Developers
+
+Developers who want the current developer version of the code to be installed
+for testing, should clone [the `third-party-enhancements`
+repository](https://github.com/komascript/third-party-enhancements), e.g.,
+using
+
+ git clone https://github.com/komascript/third-party-enhancements.git
+
+You can than either unpack and install all the third-party enhancements using:
+
+ l3build install --full
+
+from within the main directory of the cloned respository. For installation of
+`scrhack` only you could run the same command from within the
+`scrhack` subdirectory. For installation without the manual omit
+option `--full`, but this is not recommended for developers.
+
+Note: Installation of `scrhack` does make sense only if all other packages of
+ the third-party enhancement project are also installed. The new
+ `scrhack` does not work without these packages.
+
+Note: If you have already an installation of
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) before version 3.42
+ in the user's texmf tree (`TEXMFHOME`), kpathsearch will usually find
+ the old integrated version of `scrhack`. Therefore LaTeX also will use
+ that old integrated version of `scrhack`. To prioritize the new
+ standalone version of `scrhack`, you would either have to remove
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) from the user's
+ texmf tree or copy `scrhack.sty` to the working directory from within
+ you are running LaTeX. Instead of the
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) version before 3.42
+ you can, after removing that installation, also install a
+ [KOMA-Script](https://www.ctan.org/pkg/koma-script) version from 3.42,
+ e.g., [the current pre-release](https://komascript.de/current) or [the
+ developer version from
+ SourceForge](https://sourceforge.net/p/koma-script/code/HEAD/tree/trunk/).
+
+# How to get the Manual
+
+After installation you should get the user manual using:
+
+ texdoc scrhack
+
+See the manual of your TeX distribution for more information.
+
+Developers or distributors can also build the manual from the source using:
+
+ l3build doc
+
+# How to Contribute
+
+To become a contributor, e.g., do heavy testing. If you find an issue, please
+report it using [the issue
+tracker](https://github.com/komascript/third-party-enhancements/issues).
+
+You can also become a developer and, e.g., make new test files to the
+packages. See the [`l3build`](https://ctan.org/pkg/l3build) manual for more
+information about tests. If you've created a new test and think that it would
+be useful. Please either do a pull request or [add a new
+issue](https://github.com/komascript/third-party-enhancements/issues/new/choose)
+and include your test file.
+
+Another kind of contribution would be to contact an author of one of the
+third-party packages and convince her or him to integrate the code of the
+corresponding enhancement package from this project into her or his package.
+
+# How to Report Issues
+
+If you think you have found a bug (or another kind of issue) using
+`scrhack` you should use [the issue
+tracker](https://github.com/komascript/third-party-enhancements/issues). Please
+first search for similar issues already reported and maybe also already fixed
+and closed. Maybe the replies to such a similar report would help you too.
+
+If your issue is new, you should report it also using [the issue
+tracker](https://github.com/komascript/third-party-enhancements/issues). Please
+be kind, not only when writing the report but also when reading replies and
+commenting or answering. And please always add a minimal working example and
+usually the relevant parts of the `log`-file to your report. Please use the
+[markdown for
+code](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks)
+to add such files into the text of your report. The correct language
+identifier for LaTeX code would be `latex`. For `log`-files you won't need any
+language identifier. Usually you should not use attachments for code or
+`log`-files unless you've been asked to do so. And please note, reports should
+always be self-containing. External links often break and so the report become
+useles.
+
+# How to Say Thank You for my Work
+
+Hey, I'm doing this as a hobby. So no need to say thank you. But I'm a vain
+fop, so I'm certainly up for a quick thank you by email. On komascript.de you
+can find an [explanation of my wishes](https://komascript.de/wunschliste) if
+you want to give more. If you don't understand German, just click to links at
+that page.
diff --git a/Master/texmf-dist/doc/latex/scrhack/float.hak b/Master/texmf-dist/doc/latex/scrhack/float.hak
new file mode 100644
index 00000000000..001e663e34a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/float.hak
@@ -0,0 +1,121 @@
+%%
+%% This is file `float.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,float,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,float,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from float.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{float.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ float)%
+]
+\scr@ifexpected{\newfloat}{%
+ \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
+ \let\float@do=\relax
+ \xdef\@tempa{\noexpand\float@exts{\the\float@exts \float@do{#3}}}%
+ \@tempa
+ \floatplacement{#1}{#2}%
+ \@ifundefined{fname@#1}{\floatname{#1}{#1}}{}
+ \expandafter\edef\csname ftype@#1\endcsname{\value{float@type}}%
+ \addtocounter{float@type}{\value{float@type}}
+ \restylefloat{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname%
+ {\expandafter\noexpand\csname fname@#1\endcsname{}
+ \expandafter\noexpand\csname the#1\endcsname}
+ \@ifnextchar[%]
+ {\float@newx{#1}}%
+ {\@ifundefined{c@#1}{\newcounter{#1}\@namedef{the#1}{\arabic{#1}}}%
+ {}}}%
+}{%
+ \scr@ifexpected{\listof}{%
+ \def\listof#1#2{%
+ \@ifundefined{ext@#1}{\float@error{#1}}{%
+ \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+ \float@listhead{#2}%
+ \begingroup\setlength{\parskip}{\z@}%
+ \@starttoc{\@nameuse{ext@#1}}%
+ \endgroup}}%
+ }{%
+ \RequirePackage{tocbasic}%
+ \PackageInfo{scrhack}{redefining \string\newfloat}%
+ \renewcommand\newfloat[3]{%
+ \Ifattoclist{#3}{%
+ \PackageError{scrhack}{extension `#3' already in use}{%
+ Each extension may be used only once.\MessageBreak
+ You, the class, or another package already uses extension
+ `#3'.\MessageBreak
+ \string\newfloat\space command will be ignored!}%
+ }{%
+ \addtotoclist[float]{#3}%
+ \setuptoc{#3}{chapteratlist}%
+ \@namedef{ext@#1}{#3}%
+ \let\float@do=\relax
+ \xdef\@tempa{\noexpand\float@exts{\the\float@exts \float@do{#3}}}%
+ \@tempa
+ \floatplacement{#1}{#2}%
+ \@ifundefined{fname@#1}{\floatname{#1}{#1}}{}%
+ \expandafter\edef\csname ftype@#1\endcsname{\value{float@type}}%
+ \addtocounter{float@type}{\value{float@type}}
+ \restylefloat{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname%
+ {\expandafter\noexpand\csname fname@#1\endcsname{}
+ \expandafter\noexpand\csname the#1\endcsname}%
+ \@ifnextchar[%]
+ {\float@newx{#1}}%
+ {\@ifundefined{c@#1}{\newcounter{#1}\@namedef{the#1}{\arabic{#1}}}%
+ {}}}%
+ }%
+ \PackageInfo{scrhack}{redefining \string\listof}%
+ \renewcommand*\listof[2]{%
+ \@ifundefined{ext@#1}{\float@error{#1}}{%
+ \@ifundefined{l@#1}{\expandafter\let\csname l@#1\endcsname\l@figure
+ \@ifundefined{l@#1}{%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]
+ {default}{#1}%
+ }{}%
+ }{}%
+ \listoftoc[{#2}]{\csname ext@#1\endcsname}%
+ }%
+ }%
+ \scr@ifexpected{\float@addtolists}{%
+ \long\def\float@addtolists#1{%
+ \def\float@do##1{\addtocontents{##1}{#1}} \the\float@exts}%
+ }{%
+ \PackageInfo{scrhack}{undefining \string\float@addtolists}%
+ \let\float@addtolists\relax
+ }{%
+ \PackageWarningNoLine{scrhack}{unkown \string\float@addtolists\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported float version}%
+ }%
+ }{%
+ \PackageWarningNoLine{scrhack}{unknown \string\listof\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported float version}%
+ }%
+}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\newfloat\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported float version}%
+}
+\endinput
+%%
+%% End of file `float.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/floatrow.hak b/Master/texmf-dist/doc/latex/scrhack/floatrow.hak
new file mode 100644
index 00000000000..ee02ca9d739
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/floatrow.hak
@@ -0,0 +1,108 @@
+%%
+%% This is file `floatrow.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,floatrow,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,floatrow,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from floatrow.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{floatrow.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ floatrow)%
+]
+\scr@ifexpected{\DeclareNewFloatType}{%
+ \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
+ \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
+ \addtocounter{float@type}{\value{float@type}}%
+ \@namedef{#1name}{#1}\newcounter{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname
+ {\expandafter\noexpand\csname #1name\endcsname\nobreakspace
+ \expandafter\noexpand\csname the#1\endcsname}%
+ \@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
+ \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+ \caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
+ \xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
+ \@tempa}%
+}{%
+ \scr@ifexpected{\listof}{%
+ \def\listof#1#2{%
+ \@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
+ \expandafter\providecommand\csname l@#1\endcsname
+ {\@dottedtocline{1}{1.5em}{2.3em}}%
+ \float@listhead{#2}%
+ \begingroup\setlength{\parskip}{\z@}%
+ \@starttoc{\@nameuse{ext@#1}}%
+ \endgroup}}%
+ }{%
+ \RequirePackage{tocbasic}%
+ \PackageInfo{scrhack}{redefining \string\DeclareNewFloatType}%
+ \renewcommand\DeclareNewFloatType[2]{\def\FB@captype{#1}%
+ \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
+ \addtocounter{float@type}{\value{float@type}}%
+ \@namedef{#1name}{#1}\newcounter{#1}%
+ \expandafter\edef\csname fnum@#1\endcsname
+ {\expandafter\noexpand\csname #1name\endcsname\nobreakspace
+ \expandafter\noexpand\csname the#1\endcsname}%
+ \@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]{default}{#1}%
+ \caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
+ \xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
+ \@tempa
+ \xdef\@tempa{\noexpand\addtotoclist[float]{\@nameuse{ext@\FB@captype}}%
+ \noexpand\setuptoc{\@nameuse{ext@\FB@captype}}{chapteratlist}%
+ }%
+ \@tempa
+ }%
+ \PackageInfo{scrhack}{redefining \string\listof}%
+ \renewcommand*\listof[2]{%
+ \@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
+ \@ifundefined{l@#1}{\expandafter\let\csname l@#1\endcsname\l@figure
+ \@ifundefined{l@#1}{%
+ \DeclareTOCStyleEntry[level=1,numwidth=2.3em,indent=1.5em]
+ {default}{#1}%
+ }{}%
+ }{}%
+ \listoftoc[{#2}]{\csname ext@#1\endcsname}%
+ }%
+ }%
+ \scr@ifexpected{\float@addtolists}{%
+ \long\def\float@addtolists#1{%
+ \def\float@do##1{\addtocontents{##1}{#1}} \the\float@exts}%
+ }{%
+ \PackageInfo{scrhack}{undefining \string\float@addtolists}%
+ \let\float@addtolists\relax
+ }{%
+ \PackageWarningNoLine{scrhack}{unkown \string\float@addtolists\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+ }%
+ }{%
+ \PackageWarningNoLine{scrhack}{unknown \string\listof\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+ }%
+}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\DeclareNewFloatType\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported floatrow version}%
+}
+\endinput
+%%
+%% End of file `floatrow.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/hyperref.hak b/Master/texmf-dist/doc/latex/scrhack/hyperref.hak
new file mode 100644
index 00000000000..40386e5c211
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/hyperref.hak
@@ -0,0 +1,132 @@
+%%
+%% This is file `hyperref.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,hyperref,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,hyperref,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from hyperref.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{hyperref.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ hyperref)%
+]
+\scr@ifexpected\@schapter{%
+ \def\@schapter#1{%
+ \H@old@schapter{#1}%
+ \begingroup
+ \let\@mkboth\@gobbletwo
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ \endgroup
+ }%
+}{%
+ \PackageInfo{scrhack}{redefining \string\@schapter}%
+ \def\@schapter#1{%
+ \begingroup
+ \let\@mkboth\@gobbletwo
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ \endgroup
+ \H@old@schapter{#1}%
+ }%
+}{%
+ \scr@ifexpected\@schapter{%
+ \def\@schapter#1{%
+ \begingroup
+ \let\@mkboth\@gobbletwo
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ \endgroup
+ \H@old@schapter{#1}%
+ }%
+ }{}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\@schapter\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported hyperref version}%
+ }%
+}
+\scr@ifexpected\@spart{%
+ \def\@spart#1{%
+ \H@old@spart{#1}%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ }%
+}{%
+ \PackageInfo{scrhack}{redefining \string\@spart}%
+ \def\@spart#1{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ \H@old@spart{#1}%
+ }%
+}{%
+ \scr@ifexpected\@spart{%
+ \def\@spart#1{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{part*.\the\Hy@linkcounter}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ \H@old@spart{#1}%
+ }%
+ }{}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\@spart\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported hyperref version}%
+ }%
+}
+\scr@ifexpected\@ssect{%
+ \def\@ssect#1#2#3#4#5{%
+ \H@old@ssect{#1}{#2}{#3}{#4}{#5}%
+ \phantomsection
+ }%
+}{%
+ \PackageInfo{scrhack}{redefining \string\@ssect}%
+ \def\@ssect#1#2#3#4#5{%
+ \H@old@ssect{#1}{#2}{#3}{#4}{\phantomsection\ignorespaces#5}%
+ }%
+}{%
+ \scr@ifexpected\@ssect{%
+ \def\@ssect#1#2#3#4#5{%
+ \H@old@ssect{#1}{#2}{#3}{#4}{\phantomsection\ignorespaces#5}%
+ }%
+ }{}{%
+ \PackageWarningNoLine{scrhack}{unknown \string\@ssect\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported hyperref version}%
+ }%
+}
+\endinput
+%%
+%% End of file `hyperref.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/listings.hak b/Master/texmf-dist/doc/latex/scrhack/listings.hak
new file mode 100644
index 00000000000..86d461dd7d2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/listings.hak
@@ -0,0 +1,115 @@
+%%
+%% This is file `listings.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,listings,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,listings,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from listings.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{listings.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ listings)%
+]
+\newcommand*{\scr@do@hack@listings}{%
+ \RequirePackage{tocbasic}%
+ \addtotoclist[float]{lol}%
+ \setuptoc{lol}{chapteratlist}%
+ \PackageInfo{scrhack}{redefining \string\lstlistoflistings}%
+ \renewcommand*{\lstlistoflistings}{\listoftoc[{\lstlistlistingname}]{lol}}%
+ \providecommand*{\ext@lstlisting}{lol}%
+ \@tempswafalse
+ \xpatchcmd\lst@MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext@lstlisting}}%
+ {\PackageInfo{scrhack}{patching \string\lst@MakeCaption}\@tempswatrue}%
+ {\PackageWarning{scrhack}{cannot patch \string\lst@MakeCaption}}%
+ \@whilesw\if@tempswa\fi{%
+ \xpatchcmd\lst@MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext@lstlisting}}%
+ {}%
+ {\@tempswafalse}%
+ }%
+ \AtBeginDocument{%
+ \scr@ifexpected{\float@addtolists}{%
+ \def\float@addtolists##1{\addtocontents{lol}{##1}}%
+ }{%
+ \PackageInfo{scrhack}{undefining \string\float@addtolists}%
+ \let\float@addtolists\relax
+ }{%
+ \scr@ifexpected{\float@addtolists}{%
+ \def\float@addtolists##1{\addtocontents{lol}{##1}%
+ \orig@float@addtolists{##1}}%
+ }{%
+ \PackageInfo{scrhack}{setting \string\float@addtolists\MessageBreak
+ to \string\orig@float@addtolists}%
+ \let\float@addtolists\orig@float@addtolists
+ }{%
+ \PackageWarningNoLine{scrhack}{unkown \string\float@addtolists\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported listings version}%
+ }%
+ }%
+ }%
+ \expandafter\def\expandafter\lst@makecaption\expandafter{%
+ \expandafter\def\expandafter\@captype\expandafter{%
+ \expandafter l\expandafter s\expandafter t\expandafter l%
+ \expandafter i\expandafter s\expandafter t\expandafter i%
+ \expandafter n\expandafter g\expandafter}\lst@makecaption
+ }%
+ \let\scr@do@hack@listings\relax
+}
+\scr@ifexpected{\lstlistoflistings}{%
+ \def\lstlistoflistings{\bgroup
+ \let\contentsname\lstlistlistingname
+ \let\lst@temp\@starttoc \def\@starttoc##1{\lst@temp{lol}}%
+ \tableofcontents \egroup}%
+}{%
+ \scr@do@hack@listings
+}{%
+ \scr@ifexpected{\lstlistoflistings}{%
+ \def\lstlistoflistings{%
+ \begingroup
+ \@ifundefined{@restonecoltrue}{}{%
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ }%
+ \float@listhead{\lstlistlistingname}%
+ \parskip\z@\parindent\z@\parfillskip \z@ \@plus 1fil%
+ \@starttoc{lol}%
+ \@ifundefined{@restonecoltrue}{}{%
+ \if@restonecol\twocolumn\fi
+ }%
+ \endgroup
+ }%
+ }{%
+ \scr@do@hack@listings
+ }{%
+ \PackageWarningNoLine{scrhack}{unknown \string\lstlistoflistings\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported listings version}%
+ }%
+}
+\endinput
+%%
+%% End of file `listings.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/lscape.hak b/Master/texmf-dist/doc/latex/scrhack/lscape.hak
new file mode 100644
index 00000000000..f00bf116889
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/lscape.hak
@@ -0,0 +1,49 @@
+%%
+%% This is file `lscape.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,lscape,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,lscape,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from lscape.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{lscape.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ lscape)%
+]
+\xpatchcmd{\landscape}{\textheight=\vsize}{%
+ \if@scrhack@lscape
+ \scrh@LT@textheight=\vsize
+ \let\scrh@LT@outputpage\@outputpage
+ \def\@outputpage{\scrh@LT@outputpage\global\@colht\scrh@LT@textheight}%
+ \else
+ \textheight=\vsize
+ \fi
+}{%
+ \PackageInfo{scrhack}{\string\landscape\space patched to make
+ \string\textheight\space change optional}%
+}{%
+ \PackageWarning{scrhack}{Cannot patch \string\landscape!\MessageBreak
+ Maybe you are using a unsupported lscape version}%
+ \@scrhack@lscapefalse
+}
+\newlength{\scrh@LT@textheight}
+\endinput
+%%
+%% End of file `lscape.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/nomencl.hak b/Master/texmf-dist/doc/latex/scrhack/nomencl.hak
new file mode 100644
index 00000000000..188ad4b57c5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/nomencl.hak
@@ -0,0 +1,118 @@
+%%
+%% This is file `nomencl.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,nomencl,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,nomencl,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from nomencl.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{nomencl.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ nomencl)%
+]
+\RequirePackage{tocbasic}
+\@ifpackagelater{nomencl}{2019/01/01}{%
+ \PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}%
+ \expandafter\endinput
+}{}
+\addtotoclist[nomencl]{nlo}
+\addtotoclist[nomencl]{nls}
+\xpatchcmd{\thenomenclature}{%
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+}{%
+ \scr@hack@nomencl@head
+}{%
+ \PackageInfo{scrhack}{\string\thenomenclature\space successfully patched}%
+}{%
+ \xpatchcmd{\thenomenclature}{%
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \markboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ }{%
+ \scr@hack@nomencl@head
+ }{%
+ \PackageInfo{scrhack}{\string\thenomenclature\space successfully patched}%
+ }{%
+ \xpatchcmd{\thenomenclature}{%
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \@mkboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ }{%
+ \scr@hack@nomencl@head
+ }{%
+ \PackageInfo{scrhack}{\string\thenomenclature\space successfully patched}%
+ }{%
+ \xpatchcmd{\thenomenclature}{%
+ \@ifundefined{chapter}%
+ }{%
+ \scr@hack@nomencl@head
+ \@gobbletwo
+ }{%
+ \PackageWarning{scrhack}{%
+ using emergency patch of \string\thenomenclature.\MessageBreak
+ This could happen if you are using an unknown\MessageBreak
+ release of package `nomencl'.\MessageBreak
+ Mostly this patch does work too, but it also could\MessageBreak
+ break `nomencl`. If this happens, please deactivate\MessageBreak
+ the `nomencl` hack of `scrhack`%
+ }%
+ }{%
+ \PackageWarning{scrhack}{%
+ cannot patch \string\thenomenclature.\MessageBreak
+ This could happen if you are using an unknown\MessageBreak
+ release of package `nomencl'%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\scr@hack@nomencl@head}{%
+ \providecommand*{\listofnlsname}{\nomname}%
+ \def\@currext{nls}%
+ \tocbasic@listhead{\nomname}%
+}
+\if@intoc
+ \setuptoc{nls}{totoc}
+\fi
+\endinput
+%%
+%% End of file `nomencl.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/scrhack-2023-07-07.pdf b/Master/texmf-dist/doc/latex/scrhack/scrhack-2023-07-07.pdf
new file mode 100644
index 00000000000..59ae934110b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/scrhack-2023-07-07.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/scrhack/scrhack.pdf b/Master/texmf-dist/doc/latex/scrhack/scrhack.pdf
new file mode 100644
index 00000000000..7766207b573
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/scrhack.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/scrhack/setspace.hak b/Master/texmf-dist/doc/latex/scrhack/setspace.hak
new file mode 100644
index 00000000000..6aede4d186e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/setspace.hak
@@ -0,0 +1,118 @@
+%%
+%% This is file `setspace.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,setspace,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,setspace,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from setspace.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{setspace.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (hacking package
+ setspace)%
+]
+\scr@ifexpected{\onehalfspacing}{%
+ \long\def\onehalfspacing{%
+ \setstretch{1.25}% default
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.25}%
+ \or % 11pt
+ \setstretch {1.213}%
+ \or % 12pt
+ \setstretch {1.241}%
+ \fi
+ }%
+}{%
+ \renewcommand*{\onehalfspacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*1500/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+}{%
+ \scr@ifexpected{\onehalfspacing}{%
+ \long\def\onehalfspacing{%
+ \setstretch{1.25}% default
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.25}%
+ \or % 11pt
+ \setstretch {1.213}%
+ \or % 12pt
+ \setstretch {1.241}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\onehalfspacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*1500/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
+}
+\scr@ifexpected{\doublespacing}{%
+ \long\def\doublespacing{%
+ \setstretch{1.667}% default
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.667}%
+ \or % 11pt
+ \setstretch {1.618}%
+ \or % 12pt
+ \setstretch {1.655}%
+ \fi
+ }%
+}{%
+ \renewcommand*{\doublespacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*2000/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+}{%
+ \scr@ifexpected{\doublespacing}{%
+ \long\def\doublespacing{%
+ \setstretch {1.667}% default
+ \ifx\@ptsize\@undefined\else
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.667}%
+ \or % 11pt
+ \setstretch {1.618}%
+ \or % 12pt
+ \setstretch {1.655}%
+ \fi
+ \fi
+ }%
+ }{%
+ \renewcommand*{\doublespacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*2000/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+ }{%
+ \PackageWarning{scrhack}{unknown \string\doublespacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+ }%
+}
+\endinput
+%%
+%% End of file `setspace.hak'.
diff --git a/Master/texmf-dist/doc/latex/scrhack/standardsections.hak b/Master/texmf-dist/doc/latex/scrhack/standardsections.hak
new file mode 100644
index 00000000000..b337558c8ca
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/scrhack/standardsections.hak
@@ -0,0 +1,568 @@
+%%
+%% This is file `standardsections.hak',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% scrhack-2023-07-07.dtx (with options: `hack,standardsections,identify')
+%% scrhack-2023-07-07.dtx (with options: `hack,standardsections,body')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from standardsections.hak.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+\ProvidesFile{standardsections.hak}[%
+ 2024-04-17 v3.42
+ scrhack part
+ (defining standard LaTeX class section headings)%
+]
+\PackageWarningNoLine{scrhack}{%
+ You are loosing every kind of support because of\MessageBreak
+ using the dangerous standard classes sections hack!\MessageBreak
+ This hack can break several classes and packages.\MessageBreak
+ However, sometimes it is needed to make a\MessageBreak
+ package work%
+}%
+\PackageInfo{scrhack}{%
+ Using code from the standard LaTeX classes.\MessageBreak
+ For more information about this code and the\MessageBreak
+ license of this code, please see:\MessageBreak
+ https://ctan.org/tex-archive/macros/latex/base/classes.dtx
+}%
+\@ifpackageloaded{hyperref}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `hyperref'}%
+}{}
+\@ifpackageloaded{titlesec}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `titlesec'}%
+}{}
+\@ifpackageloaded{sectsty}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `sectsty'}%
+}{}
+\scr@ifundefinedorrelax{chapter}{%
+ \scr@ifundefinedorrelax{c@part}{\newcounter{part}}{}%
+ \scr@ifundefinedorrelax{c@section}{\newcounter{section}}{}%
+ \scr@ifundefinedorrelax{c@subsection}{\newcounter{subsection}[section]}{}%
+ \scr@ifundefinedorrelax{c@subsubsection}{%
+ \newcounter{subsubsection}[subsection]}{}%
+ \scr@ifundefinedorrelax{c@paragraph}{%
+ \newcounter{paragraph}[subsubsection]}{}%
+ \scr@ifundefinedorrelax{c@subparagraph}{%
+ \newcounter{subparagraph}[paragraph]}{}%
+ \renewcommand\thepart {\@Roman\c@part}%
+ \renewcommand\thesection {\@arabic\c@section}%
+ \renewcommand\thesubsection {\thesection.\@arabic\c@subsection}%
+ \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}%
+ \renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph}%
+ \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}%
+ \def\part{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
+ \secdef\@part\@spart}%
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \Large\bfseries \partname\nobreakspace\thepart
+ \par\nobreak
+ \fi
+ \huge \bfseries #2%
+ \markboth{}{}\par}%
+ \nobreak
+ \vskip 3ex
+ \@afterheading}%
+ \def\@spart#1{%
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \huge \bfseries #1\par}%
+ \nobreak
+ \vskip 3ex
+ \@afterheading}%
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+}{%
+ \scr@ifundefinedorrelax{c@part}{\newcounter{part}}{}%
+ \scr@ifundefinedorrelax{c@chapter}{\newcounter{chapter}}{}%
+ \scr@ifundefinedorrelax{c@section}{\newcounter{section}[chapter]}{}%
+ \scr@ifundefinedorrelax{c@subsection}{\newcounter{subsection}[section]}{}%
+ \scr@ifundefinedorrelax{c@subsubsection}{%
+ \newcounter{subsubsection}[subsection]}{}%
+ \scr@ifundefinedorrelax{c@paragraph}{%
+ \newcounter{paragraph}[subsubsection]}{}%
+ \scr@ifundefinedorrelax{c@subparagraph}{%
+ \newcounter{subparagraph}[paragraph]}{}%
+ \def\@chapapp{\chaptername}%
+ \scr@ifundefinedorrelax{frontmatter}{%
+ \def\part{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \if@twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \null\vfil
+ \secdef\@part\@spart}
+
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >-2\relax
+ \huge\bfseries \partname\nobreakspace\thepart
+ \par
+ \vskip 20\p@
+ \fi
+ \Huge \bfseries #2\par}%
+ \@endpart}
+ \def\@spart#1{%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \Huge \bfseries #1\par}%
+ \@endpart}
+ \def\@endpart{\vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}
+ \def\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{plain}%
+ \global\@topnum\z@
+ \@afterindentfalse
+ \secdef\@chapter\@schapter}
+ \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\thechapter}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}
+ \def\@makechapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \huge\bfseries \@chapapp\space \thechapter
+ \par\nobreak
+ \vskip 20\p@
+ \fi
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}
+ \def\@schapter#1{\if@twocolumn
+ \@topnewpage[\@makeschapterhead{#1}]%
+ \else
+ \@makeschapterhead{#1}%
+ \@afterheading
+ \fi}
+ \def\@makeschapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright
+ \normalfont
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ }{%
+ \scr@ifundefinedorrelax{if@mainmatter}{%
+ \expandafter\newif\csname if@mainmatter\endcsname
+ }{}%
+ \def\frontmatter{%
+ \cleardoublepage
+ \@mainmatterfalse
+ \pagenumbering{roman}}%
+ \def\mainmatter{%
+ \cleardoublepage
+ \@mainmattertrue
+ \pagenumbering{arabic}}%
+ \def\backmatter{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \@mainmatterfalse}%
+ \def\part{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \if@twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \null\vfil
+ \secdef\@part\@spart}%
+
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >-2\relax
+ \huge\bfseries \partname\nobreakspace\thepart
+ \par
+ \vskip 20\p@
+ \fi
+ \Huge \bfseries #2\par}%
+ \@endpart}%
+ \def\@spart#1{%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \Huge \bfseries #1\par}%
+ \@endpart}%
+ \def\@endpart{\vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}%
+ \def\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{plain}%
+ \global\@topnum\z@
+ \@afterindentfalse
+ \secdef\@chapter\@schapter}%
+ \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\thechapter}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}%
+ \def\@makechapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \huge\bfseries \@chapapp\space \thechapter
+ \par\nobreak
+ \vskip 20\p@
+ \fi
+ \fi
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}%
+ \def\@schapter#1{\if@twocolumn
+ \@topnewpage[\@makeschapterhead{#1}]%
+ \else
+ \@makeschapterhead{#1}%
+ \@afterheading
+ \fi}%
+ \def\@makeschapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright
+ \normalfont
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}%
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ }%
+}% End of the derived code.
+\scr@ifundefinedorrelax{scr@saved@startsection}{}{%
+ \ifx\@startsection\scr@saved@startsection\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@startsection,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@startsection\scr@saved@startsection
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@sect}{}{%
+ \ifx\@sect\scr@latex@sect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@sect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@sect\scr@latex@sect
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@ssect}{}{%
+ \ifx\@ssect\scr@latex@ssect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@ssect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@ssect\scr@latex@ssect
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@xsect}{}{%
+ \ifx\@xsect\scr@latex@xsect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@xsect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@xsect\scr@latex@xsect
+ \fi
+}
+\scr@ifundefinedorrelax{DeclareSectionCommand}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\DeclareSectionCommand\space
+ and all derivates deactivated,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\DeclareSectionCommand\undefined
+ \let\DeclareSectionCommands\undefined
+ \let\RedeclareSectionCommand\undefined
+ \let\RedeclareSectionCommands\undefined
+ \let\DeclareNewSectionCommand\undefined
+ \let\DeclareNewSectionCommands\undefined
+ \let\ProvideSectionCommand\undefined
+ \let\ProvideSectionCommands\undefined
+}
+\let\scr@chapter@before@hyperref@patch\relax
+\let\scr@chapter@after@hyperref@patch\relax
+\scr@ifundefinedorrelax{scr@osectarg}{}{%
+ \def\reserved@a{0}%
+ \ifx\scr@osectarg\reserved@a\else
+ \let\scr@osectarg\reserved@a
+ \PackageWarningNoLine{scrhack}{%
+ Extended option handling for section commands deactivated,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \fi
+}%
+\scr@ifundefinedorrelax{scr@activate@xsection}{}{%
+ \renewcommand*{\scr@activate@xsection}[1]{%
+ \edef\scr@osectarg{#1}\def\reserved@a{0}%
+ \ifx\scr@osectarg\reserved@a
+ \else
+ \let\scr@osectarg\reserved@a
+ \PackageWarning{scrhack}{%
+ Because of loading the standard classes\MessageBreak
+ sections hack, the extended option handling\MessageBreak
+ of section commands failed%
+ }%
+ \fi
+ }%
+}
+\scr@ifundefinedorrelax{partformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\partformat\space
+ deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{chapterformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\chapterformat\space
+ deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{sectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\sectionformat\space set to
+ `\string\thesection\string\quad',\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\sectionformat}{\thesection\quad}%
+}
+\scr@ifundefinedorrelax{subsectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subsectionformat\space set to
+ `\string\thesubsection\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subsectionformat}{\thesubsection\quad}%
+}
+\scr@ifundefinedorrelax{subsubsectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subsubsectionformat\space set to
+ `\string\thesubsubsection\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subsubsectionformat}{\thesubsubsection\quad}%
+}
+\scr@ifundefinedorrelax{paragraphformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\paragraphformat\space set to
+ `\string\theparagraph\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\paragraphformat}{\theparagraph\quad}%
+}
+\scr@ifundefinedorrelax{subparagraphformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subparagraphformat\space set to
+ `\string\thesubparagraph\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subparagraphformat}{\thesubparagraph\quad}%
+}
+\scr@ifundefinedorrelax{partlineswithprefixformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\partlineswithprefixformat\space deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{chapterlineswithprefixformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\chapterlineswithprefixformat\space and\MessageBreak
+ \string\chapterlinesformat\space deactivated,\MessageBreak
+ because of using standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{sectionlinesformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\sectionlinesformat\space and\MessageBreak
+ \string\sectioncatchphraseformat\space deactivated,\MessageBreak
+ because of using standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{KOMAClassName}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ KOMA-Script option `headings' removed,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}%
+ \KOMA@kav@removekey{\KOMAClassFileName}{headings}%
+}
+\def\scr@class@titlesec@warning{%
+ \PackageWarning{scrhack}{%
+ Usage of `titlesec' should work, because of\MessageBreak
+ loading the standard classes sections hack.\MessageBreak
+ However, you should know, there is not any\MessageBreak
+ support for this combination by the\MessageBreak
+ KOMA-Script author%
+ }%
+}
+\endinput
+%%
+%% End of file `standardsections.hak'.
diff --git a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
index 2d81b57f6fb..bc9d84afe95 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
@@ -7,6 +7,20 @@ and this project adheres to
## [Unreleased]
+## [v4.3.4] – 2024–09–19
+
+### Fixed
+
+- Align logo on the right side regardless of the logo size (#22), thanks to
+ @wolfoo2931
+
+## [v4.3.3] – 2024–09–18
+
+### Added
+
+- Load the `mismath` package before the `unicode-math` package, which is
+ recommended according to `mismath`'s documentation.
+
## [v4.3.2] – 2024–08–12
### Fixed
@@ -267,7 +281,9 @@ These changes might be breaking changes!
### Added
- First official release
-[Unreleased]: https://github.com/se2p/se2thesis/compare/v4.3.2...HEAD
+[Unreleased]: https://github.com/se2p/se2thesis/compare/v4.3.4...HEAD
+[v4.3.4]: https://github.com/se2p/se2thesis/compare/v4.3.4...v4.3.3
+[v4.3.3]: https://github.com/se2p/se2thesis/compare/v4.3.3...v4.3.2
[v4.3.2]: https://github.com/se2p/se2thesis/compare/v4.3.2...v4.3.1
[v4.3.1]: https://github.com/se2p/se2thesis/compare/v4.3.1...v4.3.0
[v4.3.0]: https://github.com/se2p/se2thesis/compare/v4.3.0...v4.2.0
diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
index 4d224fe981f..822b87ed303 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
index e37c07abf4f..f11604c70bf 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
+++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
index ddf07bf4e29..c49cb0a63da 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
index c0f11de77cd..fd6fb8e484e 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
+++ b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
@@ -10,24 +10,25 @@
%
\begin{filecontents}{\jobname.bib}
@book{Tufte2006,
- author = {Edward R. Tufte},
- title = {Beautiful Evidence},
- year = {2006},
- publisher = {Graphics Press, {LLC}},
- isbn = {0-9613921-7-7}
+ author = {Edward R. Tufte},
+ title = {Beautiful Evidence},
+ year = {2006},
+ publisher = {Graphics Press, {LLC}},
+ isbn = {0-9613921-7-7}
}
@book{Tufte1990,
- author = {Edward R. Tufte},
- title = {Envisioning Information},
- publisher = {Graphics Press},
- year = {1990},
- isbn = {0-9613921-1-8}
+ author = {Edward R. Tufte},
+ title = {Envisioning Information},
+ publisher = {Graphics Press},
+ year = {1990},
+ isbn = {0-9613921-1-8}
}
\end{filecontents}
% -- language: English --
%
+\usepackage{csquotes}
\usepackage[english]{babel}
% -- biblatex --
\usepackage[backend=biber,style=philosophy-classic]{biblatex} % xxx
diff --git a/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf b/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
index 31e4fb443e5..e0363aa4422 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.pdf b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.pdf
index 530ec3542d1..916164bc452 100644
--- a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.tex b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.tex
index 9793f8c7e19..e6abbcb3a75 100644
--- a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc-fr.tex
@@ -23,8 +23,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.1}
-\def\TPdate{14/11/2023}
+\def\TPversion{0.1.3}
+\def\TPdate{28/09/2024}
\usepackage{soul}
\sethlcolor{lightgray!25}
\NewDocumentCommand\MontreCode{ m }{%
@@ -135,7 +135,7 @@ Les packages utiles, et chargés sont :
\begin{itemize}
\item \MontreCode{tikz} (avec \MontreCode{calc,positioning}), \MontreCode{pgf}, \MontreCode{pgffor} ;
- \item \MontreCode{calc}, \MontreCode{fontawesome5} ;
+ \item \MontreCode{calc}, \MontreCode{fontawesome5}, \MontreCode{forest} (avec \MontreCode{edges}) ;
\item \MontreCode{simplekv}, \MontreCode{xintexpr}, \MontreCode{listofitems}, \MontreCode{xstring} ;
\item \MontreCode{settobox}, \MontreCode{tabularray} ;
\item \MontreCode{tcolorbox} (avec \MontreCode{breakable,fitting,skins,listings,listingsutf8,hooks}).
@@ -147,6 +147,8 @@ Les packages utiles, et chargés sont :
\begin{quote}
\begin{verbatim}
+0.1.2 : Arborescence type explorateur
+0.1.2 : Visionneuse 'like' de scripts
0.1.1 : Ajout des commandes en [fr]
0.1.0 : Version initiale
\end{verbatim}
@@ -320,13 +322,18 @@ Pour créer une \og fausse\fg{} visionneuse, les environnements sont :
\begin{VisionnIMG}[clés]{options tcbox}
....
\end{VisionnIMG}
+
+%----Visionneuse de script python
+\begin{VisionnPY}[clés]{options tcbox}
+ ....
+\end{VisionnPY}
\end{verbatim}
\end{quote}
Les \textsf{clés}, optionnelles et entre \MontreCode{[...]}, sont :
\begin{itemize}
- \item \MontreCode{Titre} := titre du terminal (\MontreCode{Terminal Win/UNiX/Mac} par défaut) ;
+ \item \MontreCode{Titre} := titre de la visionneuse par défaut ;
\item \MontreCode{Align} := alignement horizontal (paragraphe) de la visionneuse (\MontreCode{center} par défaut) ;
\item \MontreCode{AlignH} := alignement horizontal (du contenu) de la visionneuse (\MontreCode{center} par défaut) ;
\item \MontreCode{Largeur} := largeur de la visionneuse (\MontreCode{\textbackslash linewidth} par défaut) ;
@@ -362,4 +369,125 @@ L'argument obligatoire, entre \MontreCode{\{...\}}, correspond à des options sp
\end{VisionnIMG}
\end{tcblisting}
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+%avec un environnement de présentation de codes si nécessaire
+\begin{VisionnPY}[Largeur=12cm]{}
+\begin{lstlisting}%
+ [
+ language=python,basicstyle=\ttfamily\small,
+ keywordstyle=\color{green!50!black},tabsize=4,
+ keywordstyle={[2]\color{magenta}},
+ numbers=left,numbersep=3mm,xleftmargin=5mm,
+ aboveskip=0pt,belowskip=0pt,
+ numberstyle=\footnotesize\ttfamily\color{gray}
+ ]
+nterms = int(input("Entrez un nombre: "))
+
+n1 = 0
+n2 = 1
+
+print("\n la suite Fibonacci est : ")
+print(n1, ",", n2, end=", ")
+
+for i in range(2, nterms):
+ suivant = n1 + n2
+ print(suivant, end=", ")
+
+n1 = n2
+n2 = suivant
+\end{lstlisting}
+\end{VisionnPY}
+\end{tcblisting}
+
+\pagebreak
+
+\subsection{Arborescence de dossiers/fichiers}
+
+Le package \MontreCode{forest}, et sa librairie \MontreCode{edges}, permet de présenter des arbres, à la manière d'une arborescence de fichiers.
+
+\begin{quote}
+\begin{verbatim}
+\begin{ArborDossiers}[clés]{options forest}
+ [dossier,ADdos
+ [sous-dossier,ADdos]
+ [sous-dossier,ADdos
+ [fichier1,ADfic]
+ [fichier2,ADfic]
+ ...
+ ]
+ ...
+ ]
+\end{ArborDossiers}
+\end{verbatim}
+\end{quote}
+
+Les \textsf{clés}, optionnelles et entre \MontreCode{[...]}, sont :
+
+\begin{itemize}
+ \item \MontreCode{Police} := police des labels ;
+ \item \MontreCode{CoulIcoD} := couleur des icones \textsf{dossier} (\MontreCode{gray} par défaut) ;
+ \item \MontreCode{CoulIcoF} := couleur des icones \textsf{fichier} (\MontreCode{gray} par défaut) ;
+ \item \MontreCode{AffIcoD} := booléen pour afficher les icones \textsf{dossier} ;
+ \item \MontreCode{AffIcoF} := booléen pour afficher les icones \textsf{fichier} ;
+ \item \MontreCode{EspaceV} := espace vertical entre les items (\MontreCode{0.15em} par défaut) ;
+ \item \MontreCode{IcoD} := icone par défaut \textsf{dossier} ;
+ \item \MontreCode{IcoF} := icone par défaut \textsf{fichier}.
+\end{itemize}
+
+\medskip
+
+Les \textsf{dossiers} sont à déclarer sous la forme \MontreCode{<nom\_dossier>,ADdos}.
+
+Les \textsf{fichiers} sont à déclarer sous la forme \MontreCode{<nom\_fichier>,ADfic}.
+
+\medskip
+
+L'argument obligatoire, entre \MontreCode{\{...\}}, correspond à des options spécifiques, à passer en langage \textsf{forest}.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{ArborDossiers}{}
+ [dossier,ADdos
+ [sous-dossier,ADdos]
+ [sous-dossier,ADdos
+ [fichier1,ADfic]
+ [fichier2,ADfic]
+ ]
+ [fichier3,ADfic]
+ ]
+\end{ArborDossiers}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{ArborDossiers}%
+ [Police=\sffamily,CoulIcoD=yellow!50!pink,AffIcoF,CoulIcoF=teal,EspaceV=0.5em]%
+ {}
+ [dossier,ADdos
+ [sous-dossier,ADdos]
+ [sous-dossier,ADdos
+ [fichier1,ADfic]
+ [fichier2,ADfic]
+ ]
+ [fichier3,ADfic]
+ ]
+\end{ArborDossiers}
+\end{tcblisting}
+
+Les styles sont définis de manière globale, et ils peuvent être redéfinis si besoin.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\tikzset{ADtrait/.style={thick,->,densely dashed,red,>=latex}}
+\begin{ArborDossiers}%
+ [Police=\sffamily,CoulIcoD=yellow!50!pink,AffIcoF,CoulIcoF=teal,EspaceV=0.5em]%
+ {l sep=2em}
+ [dossier,ADdos
+ [sous-dossier,ADdos]
+ [sous-dossier,ADdos
+ [fichier1,ADfic]
+ [fichier2,ADfic]
+ ]
+ [fichier3,ADfic]
+ ]
+\end{ArborDossiers}
+\end{tcblisting}
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.pdf b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.pdf
index 6550a4c0d5b..e350684ab68 100644
--- a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.pdf
+++ b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.tex b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.tex
index 229d3637009..ab3e44596f8 100644
--- a/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.tex
+++ b/Master/texmf-dist/doc/latex/sim-os-menus/sim-os-menus-doc.tex
@@ -23,8 +23,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.1}
-\def\TPdate{14/11/2023}
+\def\TPversion{0.1.3}
+\def\TPdate{28/09/2024}
\usepackage{soul}
\sethlcolor{lightgray!25}
\NewDocumentCommand\MontreCode{ m }{%
@@ -122,7 +122,7 @@ Global styles are mostly fixed, but some customizations are possible.
\subsection{Loading}
-To load the package, simply use :
+To load the package, simply use:
\begin{quote}
\begin{verbatim}
@@ -130,13 +130,13 @@ To load the package, simply use :
\end{verbatim}
\end{quote}
-The package loads the packages :
+The package loads the packages:
\begin{itemize}
- \item \MontreCode{tikz} (with \MontreCode{calc,positioning}), \MontreCode{pgf}, \MontreCode{pgffor} ;
- \item \MontreCode{calc}, \MontreCode{fontawesome5} ;
- \item \MontreCode{simplekv}, \MontreCode{xintexpr}, \MontreCode{listofitems}, \MontreCode{xstring} ;
- \item \MontreCode{settobox}, \MontreCode{tabularray} ;
+ \item \MontreCode{tikz} (with \MontreCode{calc,positioning}), \MontreCode{pgf}, \MontreCode{pgffor};
+ \item \MontreCode{calc}, \MontreCode{fontawesome5};
+ \item \MontreCode{simplekv}, \MontreCode{xintexpr}, \MontreCode{listofitems}, \MontreCode{xstring};
+ \item \MontreCode{settobox}, \MontreCode{tabularray};
\item \MontreCode{tcolorbox} (with \MontreCode{breakable,fitting,skins,listings,listingsutf8,hooks}).
\end{itemize}
@@ -146,8 +146,10 @@ The package loads the packages :
\begin{quote}
\begin{verbatim}
-0.1.1 : French version of the commands
-0.1.0 : Initial version
+0.1.3: Fofders/Files like in explorer
+0.1.2: Script editor viewer 'like'
+0.1.1: French version of the commands
+0.1.0: Initial version
\end{verbatim}
\end{quote}
@@ -157,7 +159,7 @@ The package loads the packages :
\subsection{Context menu}
-I order to create a context menu, the command is :
+I order to create a context menu, the command is:
\begin{quote}
\begin{verbatim}
@@ -166,35 +168,35 @@ I order to create a context menu, the command is :
\end{verbatim}
\end{quote}
-Optional keys, between \MontreCode{[...]} are :
+Optional keys, between \MontreCode{[...]} are:
\begin{itemize}
- \item \MontreCode{ColBack} := background color ;
- \item \MontreCode{ColHL} : = highlight color ;
- \item \MontreCode{Rounded} := boolean for rounded corners (\MontreCode{true} by default) ;
- \item \MontreCode{Font} := font for the items (\MontreCode{\textbackslash normalsize\textbackslash normalfont} by default) ;
- \item \MontreCode{ColItems} := color(s) for the items (\MontreCode{black} by default) ;
- \item \MontreCode{MarginV} := vertical margin of the lines (\MontreCode{6pt} by default) ;
- \item \MontreCode{MarginH} := horizontal margin of the lines (\MontreCode{12pt} by default) ;
- \item \MontreCode{Arrow} := character for the arrow (\MontreCode{\textbackslash faCaretRight} by default) ;
- \item \MontreCode{ListSeps} := list for the possible sep lines (empty or for all the levels !) ;
- \item \MontreCode{ListIcons} := list for the possible icons (empty or for all the levels/items !) ;
- \item \MontreCode{ListOffsets} := list for the possible vertical offset of levels (from 2, \ldots !) (empty or for all the sub-levels !) ;
- \item \MontreCode{Icons} := boolean for icons (\MontreCode{false} by default) ;
- \item \MontreCode{Bar} := boolean for small vertical bar with icons (\MontreCode{true} by default) ;
- \item \MontreCode{Space} := horizontal space between levels (\MontreCode{-0.125} by default).
+ \item \MontreCode{ColBack}: background color;
+ \item \MontreCode{ColHL}: = highlight color;
+ \item \MontreCode{Rounded}: boolean for rounded corners (\MontreCode{true} by default);
+ \item \MontreCode{Font}: font for the items (\MontreCode{\textbackslash normalsize\textbackslash normalfont} by default);
+ \item \MontreCode{ColItems}: color(s) for the items (\MontreCode{black} by default);
+ \item \MontreCode{MarginV}: vertical margin of the lines (\MontreCode{6pt} by default);
+ \item \MontreCode{MarginH}: horizontal margin of the lines (\MontreCode{12pt} by default);
+ \item \MontreCode{Arrow}: character for the arrow (\MontreCode{\textbackslash faCaretRight} by default);
+ \item \MontreCode{ListSeps}: list for the possible sep lines (empty or for all the levels !);
+ \item \MontreCode{ListIcons}: list for the possible icons (empty or for all the levels/items !);
+ \item \MontreCode{ListOffsets}: list for the possible vertical offset of levels (from 2, \ldots !) (empty or for all the sub-levels !);
+ \item \MontreCode{Icons}: boolean for icons (\MontreCode{false} by default);
+ \item \MontreCode{Bar}: boolean for small vertical bar with icons (\MontreCode{true} by default);
+ \item \MontreCode{Space}: horizontal space between levels (\MontreCode{-0.125} by default).
\end{itemize}
\medskip
-The mandatory argument, between \MontreCode{\{...\}}, is given as :
+The mandatory argument, between \MontreCode{\{...\}}, is given as:
\smallskip
\hfill\MontreCode{item1A,item1B,... § item2A,itemp2B,... § ...}\hfill~
\begin{itemize}
- \item if an item ends with \MontreCode{(*)}, this is the beginning of the next level (\underline{only one} by level !) ;
+ \item if an item ends with \MontreCode{(*)}, this is the beginning of the next level (\underline{only one} by level !);
\item if an item ends with \MontreCode{(>)} (\underline{before} optional \MontreCode{(*)}), an arrow is written at the end of the line.
\end{itemize}
@@ -202,11 +204,11 @@ A correct usage of the syntax is necessary for the code !
\vspace{5mm}
-A few tips, due to \MontreCode{ListIcons}, \MontreCode{ListOffsets} and \MontreCode{ListSeps} keys, which are \textit{sensitive} :
+A few tips, due to \MontreCode{ListIcons}, \MontreCode{ListOffsets} and \MontreCode{ListSeps} keys, which are \textit{sensitive}:
\begin{itemize}
- \item \MontreCode{ListIcons} must have the same number of elements than the number of levels/items (with possible empty items) ;
- \item \MontreCode{ListSeps} must have the same number of elements than the number of levels (with possible empty items) ;
+ \item \MontreCode{ListIcons} must have the same number of elements than the number of levels/items (with possible empty items);
+ \item \MontreCode{ListSeps} must have the same number of elements than the number of levels (with possible empty items);
\item \MontreCode{ListOffsets} must have the same number of elements than the numbers of sub-levels (with 0 si no offset !).
\end{itemize}
@@ -237,7 +239,7 @@ A few tips, due to \MontreCode{ListIcons}, \MontreCode{ListOffsets} and \MontreC
\subsection{Terminal}
-In order to create a terminal (Win/UNiX/Mac), environments are :
+In order to create a terminal (Win/UNiX/Mac), environments are:
\begin{quote}
\begin{verbatim}
@@ -258,12 +260,12 @@ In order to create a terminal (Win/UNiX/Mac), environments are :
\end{verbatim}
\end{quote}
-Optional keys, between \MontreCode{[...]} are :
+Optional keys, between \MontreCode{[...]} are:
\begin{itemize}
- \item \MontreCode{Title} := title of the terminal (\MontreCode{Terminal Win/UNiX/Mac} by default) ;
- \item \MontreCode{Align} := horizontal alignment of the box (\MontreCode{center} by default) ;
- \item \MontreCode{Width} := width of the box (\MontreCode{\textbackslash linewidth} by default).
+ \item \MontreCode{Title}: title of the terminal (\MontreCode{Terminal Win/UNiX/Mac} by default);
+ \item \MontreCode{Align}: horizontal alignment of the box (\MontreCode{center} by default);
+ \item \MontreCode{Width}: width of the box (\MontreCode{\textbackslash linewidth} by default).
\end{itemize}
\medskip
@@ -275,14 +277,14 @@ The mandatory argument, between \MontreCode{\{...\}}, are options to give to the
Microsoft Windows [version 10.0.22000.493]
(c) Microsoft Corporation. Tous droits réservés.
C:\Users\test>ping ctan.org
-Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
-Réponse de 5.35.249.60 : octets=32 temps=35 ms TTL=51
-Réponse de 5.35.249.60 : octets=32 temps=37 ms TTL=51
-Réponse de 5.35.249.60 : octets=32 temps=35 ms TTL=51
-Réponse de 5.35.249.60 : octets=32 temps=39 ms TTL=51
+Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données:
+Réponse de 5.35.249.60: octets=32 temps=35 ms TTL=51
+Réponse de 5.35.249.60: octets=32 temps=37 ms TTL=51
+Réponse de 5.35.249.60: octets=32 temps=35 ms TTL=51
+Réponse de 5.35.249.60: octets=32 temps=39 ms TTL=51
Statistiques Ping pour 5.35.249.60:
-Paquets : envoyés = 4, reçus = 4, perdus = 0 (perte 0%),
-Durée approximative des boucles en millisecondes :
+Paquets: envoyés = 4, reçus = 4, perdus = 0 (perte 0%),
+Durée approximative des boucles en millisecondes:
Minimum = 35ms, Maximum = 39ms, Moyenne = 36ms
\end{TermWin}
\end{tcblisting}
@@ -305,7 +307,7 @@ PING ctan.org (5.35.249.60) 56(84) bytes of data.
\subsection{Viewers}
-In order to create a 'fake' viewer (for \textsf{pdf} or \textsf{img}), environments are :
+In order to create a 'fake' viewer (for \textsf{pdf} or \textsf{img}), environments are:
\begin{quote}
\begin{verbatim}
@@ -318,17 +320,22 @@ In order to create a 'fake' viewer (for \textsf{pdf} or \textsf{img}), environme
\begin{IMGViewer}[keys]{tcbox options}
....
\end{IMGViewer}
+
+%----Script editor like
+\begin{PYViewer}[keys]{tcbox options}
+ ....
+\end{PYViewer}
\end{verbatim}
\end{quote}
-Optional keys, between \MontreCode{[...]} are :
+Optional keys, between \MontreCode{[...]} are:
\begin{itemize}
- \item \MontreCode{Title} := title of the terminal (\MontreCode{Terminal Windows} by default) ;
- \item \MontreCode{Align} := horizontal alignment of the box (\MontreCode{center} by default) ;
- \item \MontreCode{Width} := width of the box (\MontreCode{\textbackslash linewidth} by default) ;
- \item \MontreCode{Halign} := horizontal alignment fot the content (\MontreCode{left} by default) ;
- \item \MontreCode{Icons} := boolean for the icons (\MontreCode{true} by default).
+ \item \MontreCode{Title}: title of the viewer;
+ \item \MontreCode{Align}: horizontal alignment of the box (\MontreCode{center} by default);
+ \item \MontreCode{Width}: width of the box (\MontreCode{\textbackslash linewidth} by default);
+ \item \MontreCode{Halign}: horizontal alignment fot the content (\MontreCode{left} by default);
+ \item \MontreCode{Icons}: boolean for the icons (\MontreCode{true} by default).
\end{itemize}
\medskip
@@ -360,4 +367,125 @@ The mandatory argument, between \MontreCode{\{...\}}, are options to give to the
\end{IMGViewer}
\end{tcblisting}
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+%with listings, or piton, for example
+\begin{PYViewer}[width=12cm]{}
+\begin{lstlisting}%
+ [
+ language=python,basicstyle=\ttfamily\small,
+ keywordstyle=\color{green!50!black},tabsize=4,
+ keywordstyle={[2]\color{magenta}},
+ numbers=left,numbersep=3mm,xleftmargin=5mm,
+ aboveskip=0pt,belowskip=0pt,
+ numberstyle=\footnotesize\ttfamily\color{gray}
+ ]
+nterms = int(input("Entrez un nombre: "))
+
+n1 = 0
+n2 = 1
+
+print("\n la suite Fibonacci est: ")
+print(n1, ",", n2, end=", ")
+
+for i in range(2, nterms):
+ suivant = n1 + n2
+ print(suivant, end=", ")
+
+n1 = n2
+n2 = suivant
+\end{lstlisting}
+\end{PYViewer}
+\end{tcblisting}
+
+\pagebreak
+
+\subsection{Folders/files as in explrer}
+
+The \MontreCode{forest} package, with his library \MontreCode{edges}, can present foldertrees.
+
+\begin{quote}
+\begin{verbatim}
+\begin{ForestDirTree}[keys]{forest options}
+ [folder,FTdir
+ [subfolder1,FTdir]
+ [subfolder2,FTdir
+ [file1,FTfile]
+ [file2,FTfile]
+ ...
+ ]
+ ...
+ ]
+\end{ForestDirTree}
+\end{verbatim}
+\end{quote}
+
+Available \textsf{keys}, betweeen \MontreCode{[...]}, are:
+
+\begin{itemize}
+ \item \MontreCode{font}: font of texts;
+ \item \MontreCode{coliconfolder}: \MontreCode{gray} by default;
+ \item \MontreCode{coliconfile}: \MontreCode{gray} by default;
+ \item \MontreCode{iconfolders}: boolean for folder icons;
+ \item \MontreCode{iconfiles}: boolean for file icons;
+ \item \MontreCode{vsep}: vertical space between items (\MontreCode{0.15em} by default);
+ \item \MontreCode{iconfolder}: icon for folder;
+ \item \MontreCode{iconfile}: icone for file.
+\end{itemize}
+
+\medskip
+
+\textsf{Folders} need to be given within \MontreCode{<folder\_name>,FTdir}.
+
+\textsf{Files} need to be given within \MontreCode{<file\_name>,FTfile}.
+
+\medskip
+
+Mandatory argument, between \MontreCode{\{...\}}, corresponds to \textsf{forest} specific commands.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{ForestDirTree}{}
+ [folder,FTdir
+ [subfolder1,FTdir]
+ [subfolder2,FTdir
+ [file1,FTfile]
+ [file2,FTfile]
+ ]
+ [file3,FTfile]
+ ]
+\end{ForestDirTree}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{ForestDirTree}%
+ [font=\sffamily,coliconfolder=yellow!50!pink,iconfiles,coliconfile=teal,vsep=0.5em]%
+ {}
+ [folder,FTdir
+ [subfolder1,FTdir]
+ [subfolder2,FTdir
+ [file1,FTfile]
+ [file2,FTfile]
+ ]
+ [file3,FTfile]
+ ]
+\end{ForestDirTree}
+\end{tcblisting}
+
+Styles are global, but can be locally defined.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\tikzset{FTedge/.style={thick,->,densely dashed,red,>=latex}}
+\begin{ForestDirTree}%
+ [font=\sffamily,coliconfolder=yellow!50!pink,iconfiles,coliconfile=teal,vsep=0.5em]%
+ {l sep=2em}
+ [folder,FTdir
+ [subfolder1,FTdir]
+ [subfolder2,FTdir
+ [file1,FTfile]
+ [file2,FTfile]
+ ]
+ [file3,FTfile]
+ ]
+\end{ForestDirTree}
+\end{tcblisting}
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index 94d43ec98a2..bfc2c8dbd0b 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.22] - 2024-09-30
+
+### Fixed
+- Automatically set `unit-font-command` with `beamer` only when the user has
+ not manually adjusted (see issue
+ [\#748](https://github.com/josephwright/siunitx/issues/748))
+
## [v3.3.21] - 2024-08-20
### Fixed
@@ -2136,7 +2143,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.21...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.22...HEAD
+[v3.3.22]: https://github.com/josephwright/siunitx/compare/v3.3.21...v3.3.22
[v3.3.21]: https://github.com/josephwright/siunitx/compare/v3.3.20...v3.3.21
[v3.3.20]: https://github.com/josephwright/siunitx/compare/v3.3.19...v3.3.20
[v3.3.19]: https://github.com/josephwright/siunitx/compare/v3.3.18...v3.3.19
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index bef1e6afe6c..cc2cd36afdf 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 3454497b6f6..4dd0e88018f 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/1.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/1.0.0.0.0.m3u
index cc969b31f7f..91ac08fda49 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/1.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/1.0.0.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.0.0.0.0.ogg
-1.0.0.0.0-1.ogg
-1.0.0.0.0-2.ogg
-1.0.0.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0-2.ogg
index f8f68b313b3..02dde27b80c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0.m3u
index 38ff0aca21d..713b1fbef21 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/2.0.0.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.0.0.0.0.ogg
-2.0.0.0.0-1.ogg
-2.0.0.0.0-2.ogg
-2.0.0.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/2.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/2.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/2.0.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/2.0.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-1.ogg
index d500956316f..4eaba9ff014 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-2.ogg
deleted file mode 100644
index affd24989c3..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0-2.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.m3u
index 7126037f5dd..3671d80c2ff 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.m3u
@@ -1,5 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.0.0.0.0.ogg
-3.0.0.0.0-1.ogg
-3.0.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/3.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/3.0.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.ogg
index d7147b5cd60..6d927f70ee2 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/3.0.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-1.ogg
index c5307858c72..0997141f89d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-2.ogg
index ef40bd9734c..6149c8be5ec 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.m3u
index 3eebda66de9..db5793d3388 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.m3u
@@ -1,5 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.0.0.0.0.ogg
-4.0.0.0.0-1.ogg
-4.0.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/4.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/4.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/4.0.0.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.ogg
index 95da73a4f1b..0a32402724f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/4.0.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-1.ogg
new file mode 100644
index 00000000000..be2515b1e14
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-2.ogg
new file mode 100644
index 00000000000..ab833a6d749
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.m3u
index ed93b0f7180..7fa2b457268 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.m3u
@@ -1,8 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-5.0.0.0.0.ogg
-5.1.0.0.0.ogg
-5.1.0.0.0-1.ogg
-5.2.0.0.0.ogg
-5.2.0.0.0-1.ogg
-5.2.0.0.0-star-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/5.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/5.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/5.0.0.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.ogg
index ba529eb4c37..46f1a90aeed 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.0.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0-1.ogg
deleted file mode 100644
index e987134adf1..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.m3u
deleted file mode 100644
index 69e1f4059ec..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.m3u
+++ /dev/null
@@ -1,4 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-5.1.0.0.0.ogg
-5.1.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.ogg
deleted file mode 100644
index 8eab7ae3fbc..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.1.0.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-1.ogg
deleted file mode 100644
index dfa846e2fc1..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-star-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-star-1.ogg
deleted file mode 100644
index 14047018002..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0-star-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.m3u
deleted file mode 100644
index e5106355e4f..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.m3u
+++ /dev/null
@@ -1,5 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-5.2.0.0.0.ogg
-5.2.0.0.0-1.ogg
-5.2.0.0.0-star-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.ogg
deleted file mode 100644
index 7e2bb4d5027..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/5.2.0.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.m3u
new file mode 100644
index 00000000000..db6a522d98b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.m3u
@@ -0,0 +1,8 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0-star-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.ogg
new file mode 100644
index 00000000000..bed8f1bb034
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.0.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0-1.ogg
new file mode 100644
index 00000000000..6dfbf8a509c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.m3u
new file mode 100644
index 00000000000..b43f6329add
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.m3u
@@ -0,0 +1,4 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.1.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.ogg
new file mode 100644
index 00000000000..f9c2e18dcf6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.1.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-1.ogg
new file mode 100644
index 00000000000..922879ce560
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-star-1.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-star-1.ogg
new file mode 100644
index 00000000000..bdb2af86f55
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0-star-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.m3u
new file mode 100644
index 00000000000..29538b4e748
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.m3u
@@ -0,0 +1,5 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example/example-spel/6.2.0.0.0-star-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.ogg
new file mode 100644
index 00000000000..4e28b44c684
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/6.2.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/date.ogg b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/date.ogg
index 2c8670eb1ab..d69821531c3 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/date.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example-spel/date.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example.pdf b/Master/texmf-dist/doc/latex/spelatex/Example/example.pdf
index 81ace4e4e36..5de7e5035b7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example.pdf
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/Example/example.tex b/Master/texmf-dist/doc/latex/spelatex/Example/example.tex
index e7a5e8dc699..9bd4f3ca904 100644
--- a/Master/texmf-dist/doc/latex/spelatex/Example/example.tex
+++ b/Master/texmf-dist/doc/latex/spelatex/Example/example.tex
@@ -1,9 +1,12 @@
\documentclass{article}
-\usepackage[dutch,english]{babel} % load babel before spel to avoid
+\usepackage[dutch,english]{babel} % load babel before spelatex to avoid
% option clash!
\selectlanguage{english}
-\usepackage[format=ogg]{spelatex}
+\usepackage[format=ogg,
+ server=https://ctan.org/tex-archive/macros/latex/contrib/spelatex/Example
+ ]
+ {spelatex}
\newrobustcmd\CTAN{CTAN}
\spelmacad{CTAN}{see-tan}
@@ -12,7 +15,7 @@
\title{\spelatex{} Example}
\author{Walter Daems and Paul Levrie}
-\date{2011/04/12}
+\date{2024/09/09}
\setlength\parindent{0em}
\setlength\parskip{1ex}
@@ -22,10 +25,10 @@
\section{Introduction}
-\begin{spelchunk}
- This file is just a simple showcase of the features of \spelatex.
+\<<<{
+ This file is just a simple showcase of the features of \spelatex{}.
Below, you'll find examples of:
-\end{spelchunk}
+}
\begin{itemize}
\spelitem{a simple equation}
@@ -34,20 +37,25 @@
\section{A simple equation}
\label{eqn:simple}
-\begin{spelchunk}
+\<<<{
Consider the following simple definition of a polynomial function and
check its spoken version by clicking on it.
-\end{spelchunk}
-\begin{spelchunk}[arealink]
+}
+\<<<[arealink]{
\begin{equation}
- f(x) = x^{5}- x^4 + 7 x^3 + 3 x^2 - 8 x + 23
+ f(x) = x^{5}- x^4 + 7 x^3 + 3 x^2 - 8 x + 25
\end{equation}
-\end{spelchunk}
-\begin{spelchunk}
+}
+\<<<{
This seems a simple equation, however, it is not so straightforward
for an automated reader, to read it correctly.
-\end{spelchunk}
+}
+\section{Remark}
+\<<<{
+Instead of the \texttt{\textbackslash{}<<<} macro, one can also use the
+spelchunk environment. We did this in the next sections.
+}
\section{A more complex equation}
\newcommand\xx[2]{\ensuremath{#1_{#2}}}
\spelmacad{xx}[2]{#1 #2}
@@ -80,6 +88,7 @@ voorleesstem de geselecteerde taal zal volgen.
\end{spelchunk}
\selectlanguage{english}
+
\section{And some extras}
\subsection{Citations}
\begin{spelchunk}
@@ -93,6 +102,8 @@ equation. For a more complex equation, we refer the user to
section~\ref{eqn:complex}.
\end{spelchunk}
+\selectlanguage{dutch}
+
\bibliographystyle{alpha}
\begin{thebibliography}{99}
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-1.ogg
new file mode 100644
index 00000000000..df4aa6bb162
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-star-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-star-1.ogg
new file mode 100644
index 00000000000..880f14b74c2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/0.0.0.0.0-star-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.0.0.0.0.m3u
index a6c2dc392af..336bff82020 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.0.0.0.0.m3u
@@ -1,31 +1,30 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.0.0.0.0.ogg
-1.1.0.0.0.ogg
-1.1.0.0.0-1.ogg
-1.1.0.0.0-2.ogg
-1.1.0.0.0-3.ogg
-1.2.0.0.0.ogg
-1.2.1.0.0.ogg
-1.2.1.0.0-1.ogg
-1.2.1.0.0-2.ogg
-1.2.1.0.0-3.ogg
-1.2.2.0.0.ogg
-1.2.2.0.0-1.ogg
-1.2.2.0.0-2.ogg
-1.2.2.0.0-3.ogg
-1.2.2.0.0-4.ogg
-1.2.2.0.0-5.ogg
-1.3.0.0.0.ogg
-1.3.0.0.0-1.ogg
-1.3.0.0.0-2.ogg
-1.3.0.0.0-3.ogg
-1.3.0.0.0-4.ogg
-1.3.0.0.0-5.ogg
-1.3.0.0.0-6.ogg
-1.3.0.0.0-7.ogg
-1.3.0.0.0-8.ogg
-1.3.0.0.0-9.ogg
-1.3.0.0.0-10.ogg
-1.3.0.0.0-11.ogg
-1.3.0.0.0-12.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-1.ogg
index ea54ff261ae..a366bca8ad2 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-3.ogg
index 28092584edd..068f5fad070 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0.m3u
index 4ebe5bab70b..17ed4772e72 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.1.0.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.1.0.0.0.ogg
-1.1.0.0.0-1.ogg
-1.1.0.0.0-2.ogg
-1.1.0.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.0.0.0.m3u
index db1dae06a9d..66182bc053c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.0.0.0.m3u
@@ -1,13 +1,13 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.2.0.0.0.ogg
-1.2.1.0.0.ogg
-1.2.1.0.0-1.ogg
-1.2.1.0.0-2.ogg
-1.2.1.0.0-3.ogg
-1.2.2.0.0.ogg
-1.2.2.0.0-1.ogg
-1.2.2.0.0-2.ogg
-1.2.2.0.0-3.ogg
-1.2.2.0.0-4.ogg
-1.2.2.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.1.0.0.m3u
index b0e1e17f300..422edaa8722 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.1.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.2.1.0.0.ogg
-1.2.1.0.0-1.ogg
-1.2.1.0.0-2.ogg
-1.2.1.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
index a6220384091..92cd2374e67 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0.m3u
index ad741664295..fdae5dffb48 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.2.2.0.0.m3u
@@ -1,8 +1,8 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.2.2.0.0.ogg
-1.2.2.0.0-1.ogg
-1.2.2.0.0-2.ogg
-1.2.2.0.0-3.ogg
-1.2.2.0.0-4.ogg
-1.2.2.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-10.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-10.ogg
index fd861c66300..c3ff365f2d1 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-10.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-10.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-11.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-11.ogg
index c19ca3750d0..00c03765f7a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-11.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-11.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-12.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-12.ogg
deleted file mode 100644
index 896cfe1e9f4..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-12.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-2.ogg
index b2ceb636ed8..ccd92eec94f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-6.ogg
index 6432746abe4..8138640c62e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-6.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-6.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-7.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-7.ogg
index fd282fc22e4..c415458583b 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-7.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-7.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-8.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-8.ogg
index 11e45178a3f..5df4676bff9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-8.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-8.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-9.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-9.ogg
index 5df4676bff9..fd861c66300 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-9.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0-9.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0.m3u
index d6737201861..e7cfe5aa3bf 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/1.3.0.0.0.m3u
@@ -1,15 +1,14 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-1.3.0.0.0.ogg
-1.3.0.0.0-1.ogg
-1.3.0.0.0-2.ogg
-1.3.0.0.0-3.ogg
-1.3.0.0.0-4.ogg
-1.3.0.0.0-5.ogg
-1.3.0.0.0-6.ogg
-1.3.0.0.0-7.ogg
-1.3.0.0.0-8.ogg
-1.3.0.0.0-9.ogg
-1.3.0.0.0-10.ogg
-1.3.0.0.0-11.ogg
-1.3.0.0.0-12.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.0.0.0.0.m3u
index 9c053963b62..09f08f782b6 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.0.0.0.0.m3u
@@ -1,59 +1,49 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.0.0.0.0.ogg
-2.1.0.0.0.ogg
-2.1.0.0.0-1.ogg
-2.1.0.0.0-2.ogg
-2.1.0.0.0-3.ogg
-2.1.0.0.0-4.ogg
-2.1.0.0.0-5.ogg
-2.1.0.0.0-6.ogg
-footnote-1.ogg
-2.2.0.0.0.ogg
-2.2.1.0.0.ogg
-2.2.1.0.0-1.ogg
-2.2.1.0.0-2.ogg
-2.2.1.0.0-3.ogg
-2.2.1.0.0-4.ogg
-2.2.2.0.0.ogg
-2.2.2.0.0-1.ogg
-2.2.2.0.0-2.ogg
-2.2.2.0.0-3.ogg
-2.2.2.0.0-4.ogg
-footnote-2.ogg
-2.2.2.0.0-5.ogg
-2.2.2.0.0-6.ogg
-2.2.2.0.0-7.ogg
-2.2.2.0.0-8.ogg
-2.2.2.0.0-9.ogg
-2.2.2.0.0-10.ogg
-2.2.2.0.0-11.ogg
-2.2.2.0.0-12.ogg
-2.2.3.0.0.ogg
-2.2.3.0.0-1.ogg
-2.2.3.0.0-2.ogg
-2.2.4.0.0.ogg
-2.2.4.0.0-1.ogg
-2.2.4.0.0-2.ogg
-2.2.4.0.0-3.ogg
-2.2.4.0.0-4.ogg
-2.2.4.0.0-5.ogg
-2.2.4.0.0-6.ogg
-2.2.5.0.0.ogg
-2.2.5.0.0-1.ogg
-2.2.5.0.0-2.ogg
-2.2.6.0.0.ogg
-2.2.6.0.0-1.ogg
-2.2.6.0.0-2.ogg
-2.2.6.0.0-3.ogg
-2.3.0.0.0.ogg
-2.3.0.0.0-1.ogg
-2.3.0.0.0-2.ogg
-2.3.0.0.0-3.ogg
-2.3.0.0.0-4.ogg
-2.4.0.0.0.ogg
-2.4.0.0.0-1.ogg
-2.4.0.0.0-2.ogg
-2.4.0.0.0-3.ogg
-2.4.0.0.0-4.ogg
-2.4.0.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-11.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0-6.ogg
index 8f73c2c7ca9..821b83161e5 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0-6.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0-6.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0.m3u
index 639be865ec3..a090328abab 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.1.0.0.0.m3u
@@ -1,10 +1,10 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.1.0.0.0.ogg
-2.1.0.0.0-1.ogg
-2.1.0.0.0-2.ogg
-2.1.0.0.0-3.ogg
-2.1.0.0.0-4.ogg
-2.1.0.0.0-5.ogg
-2.1.0.0.0-6.ogg
-footnote-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.0.0.0.m3u
index 6fba59dcf3e..6c5d7a2f5c7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.0.0.0.m3u
@@ -1,39 +1,30 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.2.0.0.0.ogg
-2.2.1.0.0.ogg
-2.2.1.0.0-1.ogg
-2.2.1.0.0-2.ogg
-2.2.1.0.0-3.ogg
-2.2.1.0.0-4.ogg
-2.2.2.0.0.ogg
-2.2.2.0.0-1.ogg
-2.2.2.0.0-2.ogg
-2.2.2.0.0-3.ogg
-2.2.2.0.0-4.ogg
-footnote-2.ogg
-2.2.2.0.0-5.ogg
-2.2.2.0.0-6.ogg
-2.2.2.0.0-7.ogg
-2.2.2.0.0-8.ogg
-2.2.2.0.0-9.ogg
-2.2.2.0.0-10.ogg
-2.2.2.0.0-11.ogg
-2.2.2.0.0-12.ogg
-2.2.3.0.0.ogg
-2.2.3.0.0-1.ogg
-2.2.3.0.0-2.ogg
-2.2.4.0.0.ogg
-2.2.4.0.0-1.ogg
-2.2.4.0.0-2.ogg
-2.2.4.0.0-3.ogg
-2.2.4.0.0-4.ogg
-2.2.4.0.0-5.ogg
-2.2.4.0.0-6.ogg
-2.2.5.0.0.ogg
-2.2.5.0.0-1.ogg
-2.2.5.0.0-2.ogg
-2.2.6.0.0.ogg
-2.2.6.0.0-1.ogg
-2.2.6.0.0-2.ogg
-2.2.6.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-11.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
index 6bf77572b9c..a8a29d28016 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-10.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-10.ogg
new file mode 100644
index 00000000000..c7bb7a1b33d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-10.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-11.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-11.ogg
new file mode 100644
index 00000000000..162c3226cf3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-11.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
index fde009a238e..a4eb2eb9ccd 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
index 0c47ef1f1c5..3d2bc129e6d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
index ede30fbdfe9..0fb3364544b 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-5.ogg
new file mode 100644
index 00000000000..6abfabbd7fb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-6.ogg
new file mode 100644
index 00000000000..782ef826101
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-6.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-7.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-7.ogg
new file mode 100644
index 00000000000..af192260ab5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-7.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-9.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-8.ogg
index 69f1ac6701a..69f1ac6701a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-9.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-8.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-10.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-9.ogg
index 437bbfb2faa..437bbfb2faa 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-10.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0-9.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.m3u
index 98183521d86..d13d4ba9442 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.m3u
@@ -1,7 +1,15 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.2.1.0.0.ogg
-2.2.1.0.0-1.ogg
-2.2.1.0.0-2.ogg
-2.2.1.0.0-3.ogg
-2.2.1.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-11.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.ogg
index d62c585ba2f..61e1c172299 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.1.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
index a8a29d28016..95cc7304945 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-11.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-11.ogg
deleted file mode 100644
index 9770b89c6ef..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-11.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-12.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-12.ogg
deleted file mode 100644
index 3f7983f7c51..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-12.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-2.ogg
index 472d8030993..16a86de3111 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-3.ogg
deleted file mode 100644
index 375c547c08d..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-3.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-4.ogg
deleted file mode 100644
index cc8c3610253..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-4.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-5.ogg
deleted file mode 100644
index 72e05ea116c..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-5.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-6.ogg
deleted file mode 100644
index 9a790833943..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-6.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-7.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-7.ogg
deleted file mode 100644
index f154852d0ec..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-7.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-8.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-8.ogg
deleted file mode 100644
index 511d94185c7..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0-8.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.m3u
index 319b4974790..93e8f7c599b 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.m3u
@@ -1,16 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.2.2.0.0.ogg
-2.2.2.0.0-1.ogg
-2.2.2.0.0-2.ogg
-2.2.2.0.0-3.ogg
-2.2.2.0.0-4.ogg
-footnote-2.ogg
-2.2.2.0.0-5.ogg
-2.2.2.0.0-6.ogg
-2.2.2.0.0-7.ogg
-2.2.2.0.0-8.ogg
-2.2.2.0.0-9.ogg
-2.2.2.0.0-10.ogg
-2.2.2.0.0-11.ogg
-2.2.2.0.0-12.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.ogg
index 74ae517fa68..54e0e30302d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.2.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
index 95cc7304945..6bba254cb34 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
index 85b092fa09a..1d2baebe899 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-3.ogg
new file mode 100644
index 00000000000..c57aca5312f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-4.ogg
new file mode 100644
index 00000000000..23fdf04612c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-5.ogg
new file mode 100644
index 00000000000..757700d8439
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-6.ogg
new file mode 100644
index 00000000000..ebe78112d31
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0-6.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.m3u
index db806b06e63..cc10b81b718 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.m3u
@@ -1,5 +1,9 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.2.3.0.0.ogg
-2.2.3.0.0-1.ogg
-2.2.3.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.ogg
index a1832ce2db9..6704b231fd4 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.3.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
index 6bba254cb34..f557268e9a0 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
index be39c9b098d..949ad1f84f1 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-3.ogg
index 19449c37615..123857bab75 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-4.ogg
deleted file mode 100644
index c83f2d5cae9..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-4.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-5.ogg
deleted file mode 100644
index 550e0e4712a..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-5.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-6.ogg
deleted file mode 100644
index a7254181279..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0-6.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.m3u
index 5d6b37fe95b..c27985f67b7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.m3u
@@ -1,9 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.2.4.0.0.ogg
-2.2.4.0.0-1.ogg
-2.2.4.0.0-2.ogg
-2.2.4.0.0-3.ogg
-2.2.4.0.0-4.ogg
-2.2.4.0.0-5.ogg
-2.2.4.0.0-6.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.ogg
index ee376169910..9157c8ce9ec 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.4.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-1.ogg
deleted file mode 100644
index f557268e9a0..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-2.ogg
deleted file mode 100644
index 949ad1f84f1..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0-2.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.m3u
deleted file mode 100644
index 1a186d15de6..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.m3u
+++ /dev/null
@@ -1,5 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-2.2.5.0.0.ogg
-2.2.5.0.0-1.ogg
-2.2.5.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.ogg
deleted file mode 100644
index d2195a26cca..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.5.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-1.ogg
deleted file mode 100644
index cb6ebd11832..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-2.ogg
deleted file mode 100644
index 8ae2cccab12..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-2.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-3.ogg
deleted file mode 100644
index c93a3c6d6c3..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0-3.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.m3u
deleted file mode 100644
index ae395552176..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.m3u
+++ /dev/null
@@ -1,6 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-2.2.6.0.0.ogg
-2.2.6.0.0-1.ogg
-2.2.6.0.0-2.ogg
-2.2.6.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.ogg
deleted file mode 100644
index 8c827139734..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.2.6.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.3.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.3.0.0.0.m3u
index 8652268b66e..e86420bb63c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.3.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.3.0.0.0.m3u
@@ -1,7 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.3.0.0.0.ogg
-2.3.0.0.0-1.ogg
-2.3.0.0.0-2.ogg
-2.3.0.0.0-3.ogg
-2.3.0.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-2.ogg
index d137101e045..d343820cf45 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-3.ogg
index b5feb6b9cea..76bf1a76598 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-4.ogg
index a585c2e0358..130726016c8 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-5.ogg
deleted file mode 100644
index 59f9b5a3c66..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0-5.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0.m3u
index ee754a46276..ab915e0fa19 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/2.4.0.0.0.m3u
@@ -1,8 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-2.4.0.0.0.ogg
-2.4.0.0.0-1.ogg
-2.4.0.0.0-2.ogg
-2.4.0.0.0-3.ogg
-2.4.0.0.0-4.ogg
-2.4.0.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.0.0.0.0.m3u
index 8f2c49d9e4f..5af0ee212b2 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.0.0.0.0.m3u
@@ -1,26 +1,27 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.0.0.0.0.ogg
-3.1.0.0.0.ogg
-3.1.0.0.0-1.ogg
-3.1.0.0.0-2.ogg
-3.1.0.0.0-3.ogg
-3.2.0.0.0.ogg
-3.2.1.0.0.ogg
-3.2.1.0.0-1.ogg
-3.2.1.0.0-2.ogg
-3.2.1.0.0-3.ogg
-3.2.1.0.0-4.ogg
-3.2.1.0.0-5.ogg
-3.2.2.0.0.ogg
-3.2.2.0.0-1.ogg
-3.2.2.0.0-2.ogg
-3.2.2.0.0-3.ogg
-3.2.2.0.0-4.ogg
-3.2.2.0.0-5.ogg
-3.2.2.0.0-6.ogg
-3.3.0.0.0.ogg
-3.3.0.0.0-1.ogg
-3.4.0.0.0.ogg
-3.4.0.0.0-1.ogg
-3.4.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-2.ogg
index 181c6ce4dfb..ba55e226a01 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-3.ogg
index 374e4a19ed1..a6cfbe479f7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0.m3u
index 841095e90fd..82dc86d9fbd 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.1.0.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.1.0.0.0.ogg
-3.1.0.0.0-1.ogg
-3.1.0.0.0-2.ogg
-3.1.0.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.0.0.0.m3u
index 925bdb7d030..d4e62a851b0 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.0.0.0.m3u
@@ -1,16 +1,16 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.2.0.0.0.ogg
-3.2.1.0.0.ogg
-3.2.1.0.0-1.ogg
-3.2.1.0.0-2.ogg
-3.2.1.0.0-3.ogg
-3.2.1.0.0-4.ogg
-3.2.1.0.0-5.ogg
-3.2.2.0.0.ogg
-3.2.2.0.0-1.ogg
-3.2.2.0.0-2.ogg
-3.2.2.0.0-3.ogg
-3.2.2.0.0-4.ogg
-3.2.2.0.0-5.ogg
-3.2.2.0.0-6.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
index 9765dbb2c67..caeeff5108e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0.m3u
index 4dca129e2c5..df234b6cf64 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.1.0.0.m3u
@@ -1,8 +1,8 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.2.1.0.0.ogg
-3.2.1.0.0-1.ogg
-3.2.1.0.0-2.ogg
-3.2.1.0.0-3.ogg
-3.2.1.0.0-4.ogg
-3.2.1.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
index 02fd558b147..85cb0c85614 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
index 83c9a9a5f42..75df9339950 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
index 0c554f69ba7..e3c179b56a7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0.m3u
index f7480171449..b72666c7b5e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.2.2.0.0.m3u
@@ -1,9 +1,9 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.2.2.0.0.ogg
-3.2.2.0.0-1.ogg
-3.2.2.0.0-2.ogg
-3.2.2.0.0-3.ogg
-3.2.2.0.0-4.ogg
-3.2.2.0.0-5.ogg
-3.2.2.0.0-6.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0-1.ogg
index bcee2491e1b..58de83b9fbe 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0.m3u
index 6fc1783bdef..7245ad8b24c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.3.0.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.3.0.0.0.ogg
-3.3.0.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0-3.ogg
new file mode 100644
index 00000000000..4ed46f984aa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0.m3u
index 6839de2f602..0d0461c9a96 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/3.4.0.0.0.m3u
@@ -1,5 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-3.4.0.0.0.ogg
-3.4.0.0.0-1.ogg
-3.4.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.0.0.0.0.m3u
index 9d5aff05d53..06c90ea8511 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.0.0.0.0.m3u
@@ -1,53 +1,55 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.0.0.0.0.ogg
-4.1.0.0.0.ogg
-4.1.0.0.0-1.ogg
-4.1.0.0.0-2.ogg
-4.1.0.0.0-3.ogg
-4.1.0.0.0-4.ogg
-4.1.0.0.0-5.ogg
-4.1.0.0.0-6.ogg
-4.1.0.0.0-7.ogg
-4.1.0.0.0-8.ogg
-4.1.1.0.0.ogg
-4.1.1.0.0-1.ogg
-4.1.1.0.0-2.ogg
-4.1.1.0.0-3.ogg
-4.1.1.0.0-4.ogg
-4.1.2.0.0.ogg
-4.1.2.0.0-1.ogg
-4.1.2.0.0-2.ogg
-4.1.3.0.0.ogg
-4.1.3.0.0-1.ogg
-4.1.3.0.0-2.ogg
-4.1.3.0.0-3.ogg
-4.1.3.0.0-4.ogg
-4.1.3.0.0-5.ogg
-4.1.4.0.0.ogg
-4.1.4.0.0-1.ogg
-4.1.4.0.0-2.ogg
-4.1.4.0.0-3.ogg
-4.1.4.0.0-4.ogg
-4.1.5.0.0.ogg
-4.1.5.0.0-1.ogg
-4.1.5.0.0-2.ogg
-4.1.5.0.0-3.ogg
-4.1.5.0.0-4.ogg
-4.1.6.0.0.ogg
-4.1.6.0.0-1.ogg
-4.1.6.0.0-2.ogg
-4.1.6.0.0-3.ogg
-4.1.6.0.0-4.ogg
-4.1.6.0.0-5.ogg
-4.1.7.0.0.ogg
-4.1.7.0.0-1.ogg
-4.1.7.0.0-2.ogg
-4.1.7.0.0-3.ogg
-4.1.7.0.0-4.ogg
-4.2.0.0.0.ogg
-4.2.0.0.0-1.ogg
-4.2.0.0.0-2.ogg
-4.2.0.0.0-3.ogg
-4.2.0.0.0-4.ogg
-4.2.0.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-1.ogg
index 58dc04068d0..027bdbfb284 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-2.ogg
index a1483cea12e..8096fce85cb 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-3.ogg
index 44ca72ba648..6390a5734f2 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-4.ogg
index 39a304fb037..2a775460b48 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-5.ogg
index 67fa7fce214..bb3d00426a9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-5.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-6.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-6.ogg
index 8fd82f60d04..bc3c565f52c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-6.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-6.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-7.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-7.ogg
index 159cc44e6a0..a9a40c62a0e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-7.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-7.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-8.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-8.ogg
deleted file mode 100644
index d70d6468e8f..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0-8.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0.m3u
index 3a01c842f08..199a8099436 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.0.0.0.m3u
@@ -1,46 +1,48 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.0.0.0.ogg
-4.1.0.0.0-1.ogg
-4.1.0.0.0-2.ogg
-4.1.0.0.0-3.ogg
-4.1.0.0.0-4.ogg
-4.1.0.0.0-5.ogg
-4.1.0.0.0-6.ogg
-4.1.0.0.0-7.ogg
-4.1.0.0.0-8.ogg
-4.1.1.0.0.ogg
-4.1.1.0.0-1.ogg
-4.1.1.0.0-2.ogg
-4.1.1.0.0-3.ogg
-4.1.1.0.0-4.ogg
-4.1.2.0.0.ogg
-4.1.2.0.0-1.ogg
-4.1.2.0.0-2.ogg
-4.1.3.0.0.ogg
-4.1.3.0.0-1.ogg
-4.1.3.0.0-2.ogg
-4.1.3.0.0-3.ogg
-4.1.3.0.0-4.ogg
-4.1.3.0.0-5.ogg
-4.1.4.0.0.ogg
-4.1.4.0.0-1.ogg
-4.1.4.0.0-2.ogg
-4.1.4.0.0-3.ogg
-4.1.4.0.0-4.ogg
-4.1.5.0.0.ogg
-4.1.5.0.0-1.ogg
-4.1.5.0.0-2.ogg
-4.1.5.0.0-3.ogg
-4.1.5.0.0-4.ogg
-4.1.6.0.0.ogg
-4.1.6.0.0-1.ogg
-4.1.6.0.0-2.ogg
-4.1.6.0.0-3.ogg
-4.1.6.0.0-4.ogg
-4.1.6.0.0-5.ogg
-4.1.7.0.0.ogg
-4.1.7.0.0-1.ogg
-4.1.7.0.0-2.ogg
-4.1.7.0.0-3.ogg
-4.1.7.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0-4.ogg
index f05f6410f62..e0e77fd44c8 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0.m3u
index c456177811e..8b980c2b5fc 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.1.0.0.m3u
@@ -1,7 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.1.0.0.ogg
-4.1.1.0.0-1.ogg
-4.1.1.0.0-2.ogg
-4.1.1.0.0-3.ogg
-4.1.1.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
index 34c7209ae54..793d67f67ef 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-2.ogg
index d20e2c57c31..3421acb64e8 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0.m3u
index a00d94f72f0..b9158f1120b 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.2.0.0.m3u
@@ -1,5 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.2.0.0.ogg
-4.1.2.0.0-1.ogg
-4.1.2.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
index d20e2c57c31..a867f6c0a9c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-5.ogg
index d20e2c57c31..11a6de0fdc5 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-5.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0.m3u
index 6a3684a7b30..1e3af2b0b3e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.3.0.0.m3u
@@ -1,8 +1,8 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.3.0.0.ogg
-4.1.3.0.0-1.ogg
-4.1.3.0.0-2.ogg
-4.1.3.0.0-3.ogg
-4.1.3.0.0-4.ogg
-4.1.3.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.3.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
index 6052ee961af..bd0f1cedf2c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-2.ogg
index 362145b4035..ea8b480d225 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-3.ogg
deleted file mode 100644
index 9d0007377db..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-3.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-4.ogg
deleted file mode 100644
index e6633a1efc7..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0-4.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.m3u
index e9a7ce2db1b..f0c36d4b421 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.m3u
@@ -1,7 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.4.0.0.ogg
-4.1.4.0.0-1.ogg
-4.1.4.0.0-2.ogg
-4.1.4.0.0-3.ogg
-4.1.4.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.ogg
index e7b78665913..50e602af5e9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.4.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
index 1949056128e..f5279d44f1d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
index 247c35c3a4f..75a529af86d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
index 7f3d1fb857c..5bb4d35977c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-4.ogg
index 3f1990e971b..e6633a1efc7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.m3u
index 46999ff035d..13d65b54faa 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.m3u
@@ -1,7 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.5.0.0.ogg
-4.1.5.0.0-1.ogg
-4.1.5.0.0-2.ogg
-4.1.5.0.0-3.ogg
-4.1.5.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.5.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.ogg
index 2e17823934c..c170b1b3b68 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.5.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
index a3f5673c639..43bdb9bdd17 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
index e4469c62f87..3790ef30cad 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
index 2a89c9e2af9..6c8c3966093 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-4.ogg
index da6ed1a16f4..e471ee012cc 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-5.ogg
deleted file mode 100644
index 575d63530a8..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0-5.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.m3u
index 1b21289bb06..de9a5bcd555 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.m3u
@@ -1,8 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.6.0.0.ogg
-4.1.6.0.0-1.ogg
-4.1.6.0.0-2.ogg
-4.1.6.0.0-3.ogg
-4.1.6.0.0-4.ogg
-4.1.6.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.6.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.ogg
index e417d4427f1..339b70bca86 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.6.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
index cc6324a68b2..1fbd011b3f7 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
index d913b6722bb..57e5ebb7114 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
index 8049b4c6f22..5ae829e7fc9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
index 4b2aa15351c..64e02ba8286 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-5.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-5.ogg
new file mode 100644
index 00000000000..13c1a3a17d1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0-5.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.m3u
index 59d35f88640..34a94046e0a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.m3u
@@ -1,7 +1,8 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.1.7.0.0.ogg
-4.1.7.0.0-1.ogg
-4.1.7.0.0-2.ogg
-4.1.7.0.0-3.ogg
-4.1.7.0.0-4.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.ogg
index 5023aa141ef..bee00142bea 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.7.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-1.ogg
new file mode 100644
index 00000000000..8049b4c6f22
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-2.ogg
new file mode 100644
index 00000000000..d913b6722bb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-3.ogg
new file mode 100644
index 00000000000..4c6963eb491
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-4.ogg
new file mode 100644
index 00000000000..4b2aa15351c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.m3u
new file mode 100644
index 00000000000..7f7325a046d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.m3u
@@ -0,0 +1,7 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.1.8.0.0-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.ogg
new file mode 100644
index 00000000000..407a19cbf39
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.1.8.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.2.0.0.0.m3u
index dc99929f4ac..a8548a72e81 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/4.2.0.0.0.m3u
@@ -1,8 +1,8 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-4.2.0.0.0.ogg
-4.2.0.0.0-1.ogg
-4.2.0.0.0-2.ogg
-4.2.0.0.0-3.ogg
-4.2.0.0.0-4.ogg
-4.2.0.0.0-5.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/4.2.0.0.0-5.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/5.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/5.0.0.0.0.m3u
index 270a6f6c2b3..0019e5b0833 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/5.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/5.0.0.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-5.0.0.0.0.ogg
-5.0.0.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/5.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/5.0.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.0.0.0.0.m3u
index 1e0e8f06645..f9a6c25aedd 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.0.0.0.0.m3u
@@ -1,48 +1,49 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.0.0.0.0.ogg
-6.0.0.0.0-1.ogg
-6.1.0.0.0.ogg
-6.1.0.0.0-1.ogg
-6.2.0.0.0.ogg
-6.2.1.0.0.ogg
-6.2.1.0.0-1.ogg
-6.2.2.0.0.ogg
-6.2.2.0.0-1.ogg
-6.3.0.0.0.ogg
-6.3.1.0.0.ogg
-6.3.1.0.0-1.ogg
-6.3.2.0.0.ogg
-6.3.2.0.0-1.ogg
-6.3.2.0.0-2.ogg
-6.3.2.0.0-3.ogg
-6.3.2.0.0-4.ogg
-6.3.2.0.0-5.ogg
-6.3.2.0.0-6.ogg
-6.3.3.0.0.ogg
-6.3.3.0.0-1.ogg
-6.4.0.0.0.ogg
-6.4.0.0.0-1.ogg
-6.4.0.0.0-2.ogg
-6.5.0.0.0.ogg
-6.5.0.0.0-1.ogg
-6.5.0.0.0-2.ogg
-6.6.0.0.0.ogg
-6.6.1.0.0.ogg
-6.6.1.0.0-1.ogg
-6.6.1.0.0-2.ogg
-6.6.1.0.0-3.ogg
-6.6.2.0.0.ogg
-6.6.2.0.0-1.ogg
-6.7.0.0.0.ogg
-6.7.0.0.0-1.ogg
-6.7.0.0.0-2.ogg
-6.7.0.0.0-3.ogg
-6.7.0.0.0-4.ogg
-6.7.0.0.0-5.ogg
-6.7.0.0.0-6.ogg
-6.7.0.0.0-7.ogg
-6.7.0.0.0-8.ogg
-6.7.0.0.0-9.ogg
-6.7.0.0.0-10.ogg
-6.7.0.0.0-11.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.1.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-11.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.1.0.0.0.m3u
index 523f40cae33..079a63c2ab3 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.1.0.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.1.0.0.0.ogg
-6.1.0.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.1.0.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.0.0.0.m3u
index e204a3185cc..d579c3b2d32 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.0.0.0.m3u
@@ -1,7 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.2.0.0.0.ogg
-6.2.1.0.0.ogg
-6.2.1.0.0-1.ogg
-6.2.2.0.0.ogg
-6.2.2.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.1.0.0.m3u
index a5741a63f12..bf4f91e94d2 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.1.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.2.1.0.0.ogg
-6.2.1.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.2.0.0.m3u
index 47a9259f458..2f98a47e39a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.2.2.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.2.2.0.0.ogg
-6.2.2.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.2.2.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.0.0.0.m3u
index 5f1ab83f222..f8150e99d5a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.0.0.0.m3u
@@ -1,14 +1,14 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.3.0.0.0.ogg
-6.3.1.0.0.ogg
-6.3.1.0.0-1.ogg
-6.3.2.0.0.ogg
-6.3.2.0.0-1.ogg
-6.3.2.0.0-2.ogg
-6.3.2.0.0-3.ogg
-6.3.2.0.0-4.ogg
-6.3.2.0.0-5.ogg
-6.3.2.0.0-6.ogg
-6.3.3.0.0.ogg
-6.3.3.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.1.0.0.m3u
index 03c58738cd0..dbf894e3324 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.1.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.3.1.0.0.ogg
-6.3.1.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.1.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.2.0.0.m3u
index 9932c5cbfc6..e940e2e5c1f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.2.0.0.m3u
@@ -1,9 +1,9 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.3.2.0.0.ogg
-6.3.2.0.0-1.ogg
-6.3.2.0.0-2.ogg
-6.3.2.0.0-3.ogg
-6.3.2.0.0-4.ogg
-6.3.2.0.0-5.ogg
-6.3.2.0.0-6.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.2.0.0-6.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.3.0.0.m3u
index c4fd845f5bb..0a57cf270ba 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.3.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.3.3.0.0.m3u
@@ -1,4 +1,4 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.3.3.0.0.ogg
-6.3.3.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.3.3.0.0-1.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0-2.ogg
index 201f087a7ec..0fd28ae22a1 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0.m3u
index ef2790eb3c6..b93568e7caa 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.4.0.0.0.m3u
@@ -1,5 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.4.0.0.0.ogg
-6.4.0.0.0-1.ogg
-6.4.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.4.0.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.5.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.5.0.0.0.m3u
index 92cb21e03c5..e3cdf57ec05 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.5.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.5.0.0.0.m3u
@@ -1,5 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.5.0.0.0.ogg
-6.5.0.0.0-1.ogg
-6.5.0.0.0-2.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.5.0.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.0.0.0.m3u
index a3e705a5a5f..089d4134ec4 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.0.0.0.m3u
@@ -1,9 +1,10 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.6.0.0.0.ogg
-6.6.1.0.0.ogg
-6.6.1.0.0-1.ogg
-6.6.1.0.0-2.ogg
-6.6.1.0.0-3.ogg
-6.6.2.0.0.ogg
-6.6.2.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
index 5200b6e4058..6194ef0906f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0.m3u
index e45e6c34539..1c7be9ab2e9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.1.0.0.m3u
@@ -1,6 +1,6 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.6.1.0.0.ogg
-6.6.1.0.0-1.ogg
-6.6.1.0.0-2.ogg
-6.6.1.0.0-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.1.0.0-3.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
index 5eae47cfdea..b4e28cff5c0 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-2.ogg
new file mode 100644
index 00000000000..8e706e6e98f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0.m3u
index fbb664ca1e1..2a760f5e511 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.6.2.0.0.m3u
@@ -1,4 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.6.2.0.0.ogg
-6.6.2.0.0-1.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-2.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.7.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.7.0.0.0.m3u
index 81788dd3a98..7f9d1ac9c28 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.7.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/6.7.0.0.0.m3u
@@ -1,14 +1,14 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-6.7.0.0.0.ogg
-6.7.0.0.0-1.ogg
-6.7.0.0.0-2.ogg
-6.7.0.0.0-3.ogg
-6.7.0.0.0-4.ogg
-6.7.0.0.0-5.ogg
-6.7.0.0.0-6.ogg
-6.7.0.0.0-7.ogg
-6.7.0.0.0-8.ogg
-6.7.0.0.0-9.ogg
-6.7.0.0.0-10.ogg
-6.7.0.0.0-11.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-4.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-6.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-7.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-8.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-9.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-10.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-11.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.0.0.0.0.m3u
index 59c209eb26b..00755396851 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.0.0.0.0.m3u
@@ -1,27 +1,28 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.0.0.0.0.ogg
-7.0.0.0.0-1.ogg
-7.1.0.0.0.ogg
-7.2.0.0.0.ogg
-7.3.0.0.0.ogg
-7.4.0.0.0.ogg
-7.5.0.0.0.ogg
-7.6.0.0.0.ogg
-7.7.0.0.0.ogg
-7.8.0.0.0.ogg
-7.8.1.0.0.ogg
-7.8.2.0.0.ogg
-7.8.3.0.0.ogg
-7.8.4.0.0.ogg
-7.8.5.0.0.ogg
-7.8.6.0.0.ogg
-7.9.0.0.0.ogg
-7.9.1.0.0.ogg
-7.9.2.0.0.ogg
-7.10.0.0.0.ogg
-7.10.1.0.0.ogg
-7.10.2.0.0.ogg
-7.10.3.0.0.ogg
-7.10.4.0.0.ogg
-7.11.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.1.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.2.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.3.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.4.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.5.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.6.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.7.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.8.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.5.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.6.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.12.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.1.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.1.0.0.0.m3u
index aad84521936..1a174266182 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.1.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.1.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.1.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.1.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.m3u
index 4e2e99f016c..0aa31148094 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.m3u
@@ -1,7 +1,5 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.10.0.0.0.ogg
-7.10.1.0.0.ogg
-7.10.2.0.0.ogg
-7.10.3.0.0.ogg
-7.10.4.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.2.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.ogg
index 07be0051825..66dc25c269a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.m3u
index 9118733d864..8cc8424aa33 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.10.1.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.1.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.ogg
index 68f3689b554..2df5d0bbdb9 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.1.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.m3u
index 6eecefd4655..a30eafa4afc 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.10.2.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.10.2.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.ogg
index f368c080f11..5ed4db253aa 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.2.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.m3u
deleted file mode 100644
index 3adc9502acf..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.10.3.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.ogg
deleted file mode 100644
index ffd90a79f06..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.3.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.m3u
deleted file mode 100644
index 552f4fbbec2..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.10.4.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.ogg
deleted file mode 100644
index c7c77564946..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.10.4.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.m3u
index d1c41b06d69..341d6b5afa1 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.m3u
@@ -1,3 +1,7 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.11.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.4.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.ogg
index 8a4aa575b6f..765b284d18c 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.m3u
new file mode 100644
index 00000000000..981c8da8b37
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.1.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.ogg
new file mode 100644
index 00000000000..da1feae18e2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.1.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.m3u
new file mode 100644
index 00000000000..7a77c23c1b5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.2.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.ogg
new file mode 100644
index 00000000000..6f738b9552a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.2.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.m3u
new file mode 100644
index 00000000000..a8b4b0f8f48
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.3.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.ogg
new file mode 100644
index 00000000000..210080edf3c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.3.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.m3u
new file mode 100644
index 00000000000..1b26925fecf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.11.4.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.ogg
new file mode 100644
index 00000000000..c67d161bc77
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.11.4.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.m3u
new file mode 100644
index 00000000000..f94fed909c5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.12.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.ogg
new file mode 100644
index 00000000000..5c5a0cbad33
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.12.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.2.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.2.0.0.0.m3u
index 65dc14045ad..7e1163118fd 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.2.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.2.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.2.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.2.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.3.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.3.0.0.0.m3u
index 88d216c1229..1958cfe612e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.3.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.3.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.3.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.3.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.4.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.4.0.0.0.m3u
index 5ab8d891ca8..83042a92e39 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.4.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.4.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.4.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.4.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.5.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.5.0.0.0.m3u
index db3199ecb2b..22ebb4cdf23 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.5.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.5.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.5.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.5.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.6.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.6.0.0.0.m3u
index 2b73a9329d8..eb6918c140e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.6.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.6.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.6.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.6.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.7.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.7.0.0.0.m3u
index ad44439ec33..0f6cb103a64 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.7.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.7.0.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.7.0.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.7.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.m3u
index 7c9bda47ee5..c7288f1045f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.m3u
@@ -1,9 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.8.0.0.0.ogg
-7.8.1.0.0.ogg
-7.8.2.0.0.ogg
-7.8.3.0.0.ogg
-7.8.4.0.0.ogg
-7.8.5.0.0.ogg
-7.8.6.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.8.0.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.ogg
index 804b7f66b64..af1839e85e6 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.m3u
deleted file mode 100644
index 7e191476834..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.1.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.ogg
deleted file mode 100644
index 9dc083b3782..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.1.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.m3u
deleted file mode 100644
index e3b31c66bbf..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.2.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.ogg
deleted file mode 100644
index 706084cd9bd..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.2.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.m3u
deleted file mode 100644
index a88f6b83c08..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.3.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.ogg
deleted file mode 100644
index 427ff5ee221..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.3.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.m3u
deleted file mode 100644
index 35f43920c7f..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.4.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.ogg
deleted file mode 100644
index 09f9e2aa420..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.4.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.m3u
deleted file mode 100644
index a47d61bdd12..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.5.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.ogg
deleted file mode 100644
index 2b206fe380a..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.5.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.m3u
deleted file mode 100644
index fe1f3bdb656..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.m3u
+++ /dev/null
@@ -1,3 +0,0 @@
-#EXTM3U
-#EXTINF: section playlist generated with SpeLbox
-7.8.6.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.ogg
deleted file mode 100644
index f38ca7926f7..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.8.6.0.0.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.m3u
index 92e3c5d6e3d..baaf056dd6b 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.m3u
@@ -1,5 +1,9 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.9.0.0.0.ogg
-7.9.1.0.0.ogg
-7.9.2.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.1.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.2.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.3.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.4.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.5.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.6.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.ogg
index 9650ec95828..938acd95226 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.0.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.m3u
index 5e2efd9c5fe..2f6053e031f 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.9.1.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.1.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.ogg
index 527ae5ae02c..50dd2a2633a 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.1.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.m3u
index 9f4c5730bb9..d0ce528ae0d 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.m3u
@@ -1,3 +1,3 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-7.9.2.0.0.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.2.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.ogg
index ddf594575dd..32e86534e81 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.2.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.m3u
new file mode 100644
index 00000000000..a10e789e165
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.3.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.ogg
new file mode 100644
index 00000000000..0d821e4d742
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.3.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.m3u
new file mode 100644
index 00000000000..3dbe7e2ef65
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.4.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.ogg
new file mode 100644
index 00000000000..0e09b58a2d1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.4.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.m3u
new file mode 100644
index 00000000000..47416c24859
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.5.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.ogg
new file mode 100644
index 00000000000..e75694990ee
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.5.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.m3u
new file mode 100644
index 00000000000..25592e95dae
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.m3u
@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF: section playlist generated with SpeLbox
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/7.9.6.0.0.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.ogg
new file mode 100644
index 00000000000..9c99c737096
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/7.9.6.0.0.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-1.ogg
index a9f226ac104..f0b68066f03 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-1.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-1.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-1.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-1.ogg
deleted file mode 100644
index f270038b251..00000000000
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-1.ogg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-2.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-2.ogg
index a708edd941e..f270038b251 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-2.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-2.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-3.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-3.ogg
index 1c90a0e4b44..a708edd941e 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-3.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-3.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-4.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-4.ogg
new file mode 100644
index 00000000000..1c90a0e4b44
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0-star-4.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0.m3u b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0.m3u
index 83fe2049a43..ac5b71e6553 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0.m3u
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/8.0.0.0.0.m3u
@@ -1,9 +1,9 @@
#EXTM3U
#EXTINF: section playlist generated with SpeLbox
-8.0.0.0.0.ogg
-8.0.0.0.0-1.ogg
-8.0.0.0.0-2.ogg
-8.0.0.0.0-3.ogg
-8.0.0.0.0-star-1.ogg
-8.0.0.0.0-star-2.ogg
-8.0.0.0.0-star-3.ogg \ No newline at end of file
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-1.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-star-2.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-star-3.ogg
+https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/8.0.0.0.0-star-4.ogg \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/date.ogg b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/date.ogg
index 4bf1df7b7c4..f1073936cfa 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/date.ogg
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex-spel/date.ogg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spelatex/spelatex.pdf b/Master/texmf-dist/doc/latex/spelatex/spelatex.pdf
index d68cae1950f..498de5901ea 100644
--- a/Master/texmf-dist/doc/latex/spelatex/spelatex.pdf
+++ b/Master/texmf-dist/doc/latex/spelatex/spelatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/suanpan-l3/README.md b/Master/texmf-dist/doc/latex/suanpan-l3/README.md
index 626b8f857b2..6a1df4e510e 100644
--- a/Master/texmf-dist/doc/latex/suanpan-l3/README.md
+++ b/Master/texmf-dist/doc/latex/suanpan-l3/README.md
@@ -1,9 +1,9 @@
The traditional Chinese 7-bids suanpan(abacus) package based on l3draw
=======
-The `suanpan-l3` package is a traditional Chinese 7-bids abacus drawing package that utilizes l3draw and is developed with Expl3. It can effectively manage both upper and lower bids, while also considering bottom bid, top bid, and hanging bid.
+The `suanpan-l3` package is a traditional Chinese 7-bids abacus drawing package that utilizes l3draw and TikZ and is developed with Expl3. It can effectively manage both upper and lower bids, while also considering bottom bid, top bid, and hanging bid.
-The `suanpan-l3` package offers a unique environment for drawing abacuses, denoted as `suanpan`. Within this environment, 7 specialized macros are available for the creation of abacuses. The `\rod` macro is used to lay out a single rod, while the `\rod*` macro draws a counting point on this rod's beam. The `\rods` macro is capable of laying out a set of rods. The `\bid` macro colors the specified bid. The `\bids` macro colors all inner bids that are near the beam, while the `\bids*` macro colors all outer bids that are far from the beam. Lastly, the `\lrframe` macro is used to lay out the left and right frames of an abacus.
+The `suanpan-l3` package offers a unique environment for drawing abacuses, denoted as `suanpan`. Within this environment, 8 specialized macros are available for the creation of abacuses. The `\rod` macro is used to lay out a single rod, while the `\rod*` macro draws a counting point on this rod's beam. The `\rods` macro is capable of laying out a set of rods. The `\bid` macro colors the specified bid. The `\bids` macro colors all inner bids that are near the beam, while the `\bids*` macro colors all outer bids that are far from the beam. The `\rodmark` mark the rod on beam. Lastly, the `\mkfame` macro is used to lay out the frame of an abacus.
At the same time, the `suanpan-l3` package offers customization options for abacus, including line width, draw color, fill color, bid space, rod space, etc. These can be configured through package options, `suanpan` environment options, or `\suanpanset` macro.
@@ -19,9 +19,9 @@ Contributing
基于l3draw的中国传统7ç ç®—盘LaTeX排版å®åŒ…
=======
-`suanpan-l3`是一个基于l3draw绘图å®åŒ…,用Expl3å¼€å‘的中国传统7ç åœ†ç ç®—盘排版å®åŒ…,它能够实现普通上ç ã€ä¸‹ç å’Œä½¿ç”¨åº•ç ã€é¡¶ç å’Œæ‚¬ç çš„算盘排版。
+`suanpan-l3`是一个基于l3drawå’ŒTikZ绘图å®åŒ…,用Expl3å¼€å‘的中国传统7ç åœ†ç ç®—盘排版å®åŒ…,它能够实现普通上ç ã€ä¸‹ç å’Œä½¿ç”¨åº•ç ã€é¡¶ç å’Œæ‚¬ç çš„算盘排版。
-`suanpan-l3`å®åŒ…æ供了唯一的一个`suanpan`排版环境用于绘制需è¦æŽ’版的算盘,在该环境中使用专用命令`\rod`排版一个档ä½ï¼Œ`\rod*`命令排版带计ä½ç‚¹çš„æ¡£ä½ï¼Œ`\rods`命令排版一组档ä½ï¼Œ`\bid`命令为指定的算ç è¿›è¡Œç€è‰²ï¼Œ`\bids`命令为指定档ä½çš„内ç è¿›è¡Œç€è‰²ï¼Œ`\bids*`命令为指定的档ä½çš„外ç è¿›è¡Œç€è‰²ï¼Œ`\lrframe`命令排版算盘左å³è¾¹æ¡†ã€‚
+`suanpan-l3`å®åŒ…æ供了唯一的一个`suanpan`排版环境用于绘制需è¦æŽ’版的算盘,在该环境中使用专用命令`\rod`排版一个档ä½ï¼Œ`\rod*`命令排版带计ä½ç‚¹çš„æ¡£ä½ï¼Œ`\rods`命令排版一组档ä½ï¼Œ`\bid`命令为指定的算ç è¿›è¡Œç€è‰²ï¼Œ`\bids`命令为指定档ä½çš„内ç è¿›è¡Œç€è‰²ï¼Œ`\bids*`命令为指定的档ä½çš„外ç è¿›è¡Œç€è‰²ï¼Œ`\rodmark`命令用于为档ä½æ¨ªæ¢æ·»åŠ æ ‡è®°ï¼Œ`\mkframe`命令排版算盘边框。
åŒæ—¶ï¼Œ`suanpan-l3`å®åŒ…还为算盘排版æ供线宽ã€é¢œè‰²ã€é—´è·ç­‰**外观**设置选项,å¯ä»¥é€šè¿‡å®åŒ…选项ã€çŽ¯å¢ƒé€‰é¡¹å¯¹å…¶è¿›è¡Œè®¾ç½®ï¼Œä¹Ÿå¯ä»¥é€šè¿‡`\suanpanset`命令实现外观属性设置。
diff --git a/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.pdf b/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.pdf
index 339b329f0f3..f47e8edc2f9 100644
--- a/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.pdf
+++ b/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.tex b/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.tex
index e6cf62b1860..89cb17784df 100644
--- a/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.tex
+++ b/Master/texmf-dist/doc/latex/suanpan-l3/suanpan-l3.tex
@@ -124,7 +124,7 @@
{ \__codedoc_cmd:no {#1} { #2 } }
\ExplSyntaxOff
-\def\vers{\texttt{v1.1.1} }
+\def\vers{\texttt{v1.2.2} }
\changes{v1.0.0}{2024/08/20}{first version.}
@@ -145,13 +145,13 @@
\maketitle
\begin{abstract}
- \pkg{suanpan-l3}是一个基于\pkg{l3draw}绘图å®åŒ…,用\pkg{Expl3}%
+ \pkg{suanpan-l3}是一个基于\pkg{l3draw}å’Œ\pkg{TikZ}绘图å®åŒ…,用\pkg{Expl3}%
å¼€å‘的中国传统7ç åœ†ç ç®—盘排版å®åŒ…,它能够实现使用普通上ç ã€ä¸‹ç 
和底ç ã€é¡¶ç åŠæ‚¬ç çš„算盘排版。该å®åŒ…æ供了唯一的一个
\env{suanpan}算盘排版环境åŠä»…在该环境中使用的 \tn{rod}ã€
- \tn{rods}ã€\tn{bid}ã€\tn{bids}å’Œ\tn{lrframe}æ¡£æ†ã€ç®—ç ç€è‰²å’Œ
- 边框排版命令。åŒæ—¶ï¼Œè¯¥å®åŒ…还æ供了\tn{suanpanset}命令用于对算盘
- 外观进行设置。
+ \tn{rods}ã€\tn{bid}ã€\tn{bids}ã€\tn{rodmark}å’Œ\tn{mkframe}æ¡£æ†ã€ç®—ç 
+ ç€è‰²ã€æ¨ªæ¢æ ‡è®°å’Œè¾¹æ¡†æŽ’版命令。åŒæ—¶ï¼Œè¯¥å®åŒ…还æ供了\tn{suanpanset}%
+ 命令用于对算盘外观进行设置。
\begin{center}
\begin{suanpan}[framedraw = brown2, scale = 0.45, bidsep=1.5pt,
roddraw = brown3, rodfill = brown4]
@@ -161,22 +161,23 @@
\rod*{4}{3}
\rod*{18}{17}
% 使用顶ç 
- \bid{12}{9}{azure7}
- \bid{13}{9}{azure7}
- \bid{14}{9}{azure7}
- \bid{15}{9}{azure7}
- \bid{16}{9}{azure7}
+ \bid{12}{9}{azure5}
+ \bid{13}{9}{azure5}
+ \bid{14}{9}{azure5}
+ \bid{15}{9}{azure5}
+ \bid{16}{9}{azure5}
% 使用悬ç 
- \bid{17}{11}{red8}
- \bid{18}{11}{red8}
- \bid{19}{11}{red8}
- \bid{20}{11}{red8}
- \bid{21}{11}{red8}
+ \bid{17}{11}{red5}
+ \bid{18}{11}{red5}
+ \bid{19}{11}{red5}
+ \bid{20}{11}{red5}
+ \bid{21}{11}{red5}
% 使用底ç 
- \bid{11}{3}{olive7}
- \bid{16}{3}{olive7}
- \bid{21}{3}{olive7}
- \lrframe{1}{21}
+ \bid{11}{3}{olive5}
+ \bid{16}{3}{olive5}
+ \bid{21}{3}{olive5}
+ \rodmark{21,20,19,{},17,16,15,14,13,12,11,10,9,8,7,6,5,{},3,2,1}
+ \mkframe
\end{suanpan}
\end{center}
\end{abstract}
@@ -190,9 +191,10 @@
\section{引言}
-\pkg{suanpan-l3}å®åŒ…是一个基于\pkg{l3draw}绘图å®åŒ…,用\pkg{Expl3}%
-å¼€å‘的中国传统7ç åœ†ç ç®—盘排版å®åŒ…,它利用\pkg{l3draw}的绘图功能,
-利用简å•çº¿æ¡å®žçŽ°äº†ç®—盘的排版。
+\pkg{suanpan-l3}å®åŒ…是一个基于\pkg{l3draw}å’Œ\pkg{TikZ}绘图å®åŒ…,
+用\pkg{Expl3}å¼€å‘的中国传统7ç åœ†ç ç®—盘排版å®åŒ…,它利用\pkg{l3draw}%
+å®åŒ…,通过\env{l3coffin}容器的平移å˜æ¢ï¼Œå°†ä½¿ç”¨\pkg{TikZ}å®åŒ…绘制的
+ç®—ç ã€æ¡£æ†ã€è¾¹æ¡†ç­‰åŸºæœ¬å›¾å…ƒç»„装æˆç®—盘,从而实现算盘的排版。
由于圆ç æ˜¯é€šè¿‡åœ†è§’矩形实现的,因此当算ç æ•°é‡è¾ƒå¤šæ—¶ï¼Œç»˜åˆ¶è€—时较长,
其编译速度较慢。
@@ -213,7 +215,8 @@
在\env{suanpan}环境中,å¯ä»¥é€šè¿‡ä¸“用命令\tn{rod}%
(排版算盘的一个档ä½),\tn{rods}(排版一组档ä½),
- \tn{bid}(指定算ç é¢œè‰²),\tn{lrframe}(排版左å³è¾¹æ¡†)
+ \tn{bid}(指定算ç é¢œè‰²),\tn{bids}(指定内/外ç é¢œè‰²),
+ \tn{rodmark}(为档ä½æ·»åŠ æ ‡è®°),\tn{mkframe}(排版边框)
按需实现算盘排版。
在\oarg{外观选项}中å¯ä»¥é€šè¿‡key-valueçš„æ–¹å¼è®¾ç½®çº¿å®½ã€é¢œè‰²ã€
@@ -221,6 +224,10 @@
通过\oarg{外观选项}设置的外观å‚数仅对\env{suanpan}环境局部有效。
+ \begin{notezh}
+ \env{suanpan}环境中\textsf{ä¸å¯ä»¥å‡ºçŽ°ç©ºè¡Œ}。
+ \end{notezh}
+
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.48\linewidth,gobble=2]
\centering
@@ -235,6 +242,7 @@
\subsection{\env{suanpan}环境中的专用命令}
+\changes{v1.1.3}{2024/09/04}{add highlight to rod(s) and beam}
\subsubsection{\tn{rod}å•ä¸€æ¡£ä½æŽ’版命令}
\begin{function}{\rod}
@@ -254,10 +262,6 @@
å®åŒ…还为\tn{rod}命令åŒæ—¶æ供了\tn{rod*}星å·å‘½ä»¤ç”¨äºŽæŽ’版在
横æ¢ä¸Šå¸¦æœ‰è®¡ä½ç‚¹(圆点)çš„æ¡£ä½ã€‚
- \begin{notezh}
- 该命令åªèƒ½ç”¨äºŽ\env{suanpan}环境中。
- \end{notezh}
-
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.48\linewidth,gobble=2]
\centering
@@ -290,8 +294,6 @@
\begin{notezh}
å®åŒ…并没有为\tn{rods}命令æ供在横æ¢æŽ’版计ä½ç‚¹çš„æ¡£ä½çš„
æ“作。如果需è¦ï¼Œåˆ™å¯ä»¥ä½¿ç”¨\tn{rod*}命令对指定档ä½è¿›è¡Œè¦†ç›–绘制。
-
- åŒæ ·ï¼Œè¯¥å‘½ä»¤åªèƒ½ç”¨äºŽ\env{suanpan}环境中。
\end{notezh}
\begin{SideBySideExample}[frame=single,numbers=left,%
@@ -305,62 +307,67 @@
\end{SideBySideExample}
\changes{v1.0.1}{2024/08/26}{rename \tn{bidclr} to \tn{bid}.}
+\changes{v1.1.3}{2024/09/01}{add draw color option to \tn{bid},
+ change \texttt{pos} to clist and
+ set default bid draw color to \texttt{innerdrawcolor}.}
+\changes{v1.1.3}{2024/09/04}{add highlight to bid(s)}
+
\subsubsection{\tn{bid}ç®—ç ç€è‰²å‘½ä»¤}
\begin{function}{\bid}
\begin{syntax}
- \cs{bid} \marg{æ¡£ä½ç¼–å·}\marg{ç®—ç ä½ç½®}\marg{ç®—ç é¢œè‰²}
+ \cs{bid} \marg{æ¡£ä½ç¼–å·}\marg{ä½ç½®åˆ—表}\marg{填充颜色}\oarg{绘制颜色}
\end{syntax}
\end{function}
- 用于将\marg{æ¡£ä½ç¼–å·}指定的档ä½ä¸­ï¼Œç”¨\marg{ç®—ç ä½ç½®}指定的算ç 
- 设置为\marg{ç®—ç é¢œè‰²}指定的颜色。åŒæ—¶ï¼Œè¯¥å‘½ä»¤è¿˜å°†\marg{ç®—ç é¢œè‰²}%
- èžåˆ40\%黑色åŽç”¨äºŽç®—ç ç»˜åˆ¶é¢œè‰²ã€‚
+ 用于将\marg{æ¡£ä½ç¼–å·}指定的档ä½ä¸­ï¼Œç”¨é€—å·åˆ†éš”çš„\marg{ä½ç½®åˆ—表}中
+ 指定的所有算ç çš„填充色设置为\marg{填充颜色}指定的颜色,将其绘制
+ 颜色设置为å¯é€‰é¡¹\oarg{绘制颜色}(默认为内ç ç»˜åˆ¶é¢œè‰²)。
一个档ä½ä¸­çš„\marg{ç®—ç ä½ç½®}自下å‘上,按\enquote{$1, 2, \cdots, 11$}%
的顺åºè¿›è¡Œç¼–å·ã€‚其中下ç å \enquote{$1, 2, \cdots, 7$}çš„ä½ç½®ï¼Œä¸Šç å 
\enquote{$8, 9, 10$}çš„ä½ç½®ï¼Œæ‚¬ç å \enquote{$11$}çš„ä½ç½®ã€‚
- \begin{notezh}
- åŒæ ·ï¼Œè¯¥å‘½ä»¤åªèƒ½ç”¨äºŽ\env{suanpan}环境中。
- \end{notezh}
-
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.48\linewidth,gobble=2]
\centering
\suanpanset{scale = 0.65}
\begin{suanpan}
\rods{0, 0, 7, 11, 8, 19}
- \bid{1}{1}{gray7}
- \bid{2}{5}{gray7}
- \bid{3}{6}{red8}
- \bid{4}{7}{red8}
- \bid{4}{8}{azure6}
- \bid{4}{9}{yellow9}
+ \bid{1}{1}{brown5}
+ \bid{2}{5}{brown5}
+ \bid{3}{6}{red5}
+ \bid{4}{7}{red5}
+ \bid{4}{8}{azure5}
+ \bid{4}{9}{yellow5}
\bid{5}{10}{violet5}
- \bid{6}{11}{teal4}
+ \bid{6}{4,5,6,11}{teal4}[magenta5]
\end{suanpan}
\end{SideBySideExample}
\changes{v1.1.0}{2024/08/28}{adde \tn{bids} macro.}
+\changes{v1.1.3}{2024/09/01}{change \tn{bids} macro inner bids draw color to
+ \texttt{innerdrawcolor} and outter bids draw
+ color to \texttt{outerdrawcolor}.}
+
\subsubsection{\tn{bids}内ç æˆ–外ç ç€è‰²å‘½ä»¤}
\begin{function}{\bids}
\begin{syntax}
- \cs{bids} \marg{æ¡£ä½ç¼–å·}\marg{æ¡£ä½æ•°å­—}\marg{ç®—ç é¢œè‰²}
+ \cs{bids} \marg{æ¡£ä½ç¼–å·}\marg{æ¡£ä½æ•°å­—}\marg{填充颜色}
\end{syntax}
\end{function}
用于将\marg{æ¡£ä½ç¼–å·}指定的档ä½ä¸­ï¼Œæ‰€æœ‰\marg{æ¡£ä½æ•°å­—}的内ç 
- 设置为\marg{ç®—ç é¢œè‰²}指定的颜色。åŒæ—¶ï¼Œè¯¥å‘½ä»¤è¿˜å°†\marg{ç®—ç é¢œè‰²}%
- èžåˆ40\%黑色åŽç”¨äºŽç®—ç ç»˜åˆ¶é¢œè‰²ã€‚
+ 设置为\marg{填充颜色}指定的颜色。åŒæ—¶ï¼Œè¯¥å‘½ä»¤è¿˜å°†
+ ç®—ç ç»˜åˆ¶é¢œè‰²è®¾ç½®å†…ç ç»˜åˆ¶é¢œè‰²(\texttt{innerdrawcolor})。
å®åŒ…还为\tn{bids}命令åŒæ—¶æ供了\tn{bids*}星å·å‘½ä»¤ç”¨äºŽè®¾ç½®è¯¥æ¡£
- 所有外ç çš„颜色。
+ 所有外ç çš„颜色。此时,算ç ç»˜åˆ¶é¢œè‰²è®¾ç½®å¤–ç ç»˜åˆ¶é¢œè‰²
+ (\texttt{outerdrawcolor})。
\begin{notezh}
- åŒæ ·ï¼Œè¯¥å‘½ä»¤åªèƒ½ç”¨äºŽ\env{suanpan}环境中。该命令åªèƒ½é€‰æ‹©
- 内ç æˆ–外ç è¿›è¡Œç€è‰²ï¼Œä¸èƒ½åŒæ—¶é€‰æ‹©å†…ç å’Œå¤–ç ã€‚
+ 该命令åªèƒ½é€‰æ‹©å†…ç æˆ–外ç è¿›è¡Œç€è‰²ï¼Œä¸èƒ½åŒæ—¶é€‰æ‹©å†…ç å’Œå¤–ç ã€‚
\end{notezh}
\begin{SideBySideExample}[frame=single,numbers=left,%
@@ -370,25 +377,27 @@
\begin{suanpan}
\rods{0, 0, 7, 11, 8, 19}
\bids{3}{7}{teal4}
- \bids*{5}{8}{azure6}
+ \bids*{5}{8}{azure5}
\end{suanpan}
\end{SideBySideExample}
-\subsubsection{\tn{lrframe}å·¦å³è¾¹æ¡†æŽ’版命令}
+\changes{v1.2.0}{2024/09/04}{add \tn{rodmark} macro for marking rod(s) on beams.}
+
+\subsubsection{\tn{rodmark}横æ¢æ ‡è®°å‘½ä»¤}
-\begin{function}{\lrframe}
+\begin{function}{\rodmark}
\begin{syntax}
- \cs{lrframe} \marg{首档编å·}\marg{末档编å·}
+ \cs{rodmark} \oarg{起始档ä½}\marg{标记列表}
\end{syntax}
\end{function}
- 用于在\marg{首档编å·}指定的档ä½å·¦è¾¹å’Œ\marg{末档编å·}指定的档ä½
- å³è¾¹æŽ’版算盘的左å³è¾¹æ¡†ã€‚
+ 用于从\oarg{起始档ä½}å¯é€‰é¡¹æŒ‡å®šçš„æ¡£ä½å¼€å§‹ï¼Œç”¨\marg{标记列表}%
+ 中逗å·åˆ†éš”的标记在算盘横æ¢ä¸Šä¸ºå„æ¡£ä½æ·»åŠ æ ‡è®°ã€‚
\begin{notezh}
- åŒæ ·ï¼Œè¯¥å‘½ä»¤åªèƒ½ç”¨äºŽ\env{suanpan}环境中。å¦å¤–,其左å³è¾¹æ¡†åº”该
- åŒæ—¶æŒ‰æ­£ç¡®ç¬¬ä¸€æ¡£å’Œæœ€åŽä¸€æ¡£æ¡£ä½ç¼–å·ç»˜åˆ¶ï¼Œå¦åˆ™ä¼šé€ æˆç»“果容器(ç›’å­)
- 尺寸异常的问题。
+ 如果\marg{标记列表}中的标记数é‡è¶…出从\oarg{起始档ä½}开始的
+ æ¡£ä½æ•°ï¼Œå¤šä½™çš„标记将被忽略。在\marg{标记列表}中,å¯ä»¥ç”¨ä¸€
+ 对``\{\}''分组符å·è¡¨ç¤ºç©ºç™½æ ‡è®°ã€‚
\end{notezh}
\begin{SideBySideExample}[frame=single,numbers=left,%
@@ -396,8 +405,41 @@
\centering
\suanpanset{scale = 0.65}
\begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark{4,{},2,1,0,-1,-2}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.48\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark[2]{åƒ,百,å,个}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\changes{v1.1.3}{2024/09/04}{highlight all frame and remove arguments of \tn{lrframe},
+ at the same time change \tn{lrframe} to \tn{mkframe}.}
+
+\subsubsection{\tn{mkframe}边框排版命令}
+
+\begin{function}{\mkframe}
+ \begin{syntax}
+ \cs{mkframe}
+ \end{syntax}
+\end{function}
+
+ 用于排版算盘的边框。
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.48\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}
\rods{0, 6, 12, 18, 0}
- \lrframe{1}{5}
+ \mkframe
\end{suanpan}
\end{SideBySideExample}
@@ -416,13 +458,13 @@
通过\cs{suanpan}\marg{外观选项}设置的外观属性对åŽç»­æ‰€æœ‰ç®—盘排版
æ“作有效。
- \begin{notezh}
- 由于\pkg{suanpan-l3}å®åŒ…涉åŠå¤§é‡ç»˜å›¾æ“作,因此建议尽é‡å‡å°‘在æ¯ä¸ª
- \env{suanpan}排版环境的å¯é€‰é¡¹ä¸­ä½¿ç”¨\oarg{外观选项}设置,以
- 节约编译时间。如需è¦æ›´æ”¹ç®—盘外观,å¯ä»¥åœ¨å¼•ç”¨å®åŒ…时,通过为å®åŒ…
- 添加选项实现,也å¯ä»¥æ‰§è¡Œ\tn{suanpanset}命令进行必è¦çš„
- 全局设置或在一定范围内进行统一设置。
- \end{notezh}
+ % \begin{notezh}
+ % 由于\pkg{suanpan-l3}å®åŒ…涉åŠå¤§é‡ç»˜å›¾æ“作,因此建议尽é‡å‡å°‘在æ¯ä¸ª
+ % \env{suanpan}排版环境的å¯é€‰é¡¹ä¸­ä½¿ç”¨\oarg{外观选项}设置,以
+ % 节约编译时间。如需è¦æ›´æ”¹ç®—盘外观,å¯ä»¥åœ¨å¼•ç”¨å®åŒ…时,通过为å®åŒ…
+ % 添加选项实现,也å¯ä»¥æ‰§è¡Œ\tn{suanpanset}命令进行必è¦çš„
+ % 全局设置或在一定范围内进行统一设置。
+ % \end{notezh}
\section{å®åŒ…选项}
@@ -445,13 +487,20 @@
布尔型的å‚æ•°\marg{选项}|=true|中的``|=true|''å¯ä»¥çœç•¥ã€‚
-\subsection{è‰ç¨¿é€‰é¡¹}
+\changes{v1.2.1}{2024/09/05}{change bid(s) figure to a single
+ round cap line in draft and remove
+ all highlight of bid(s), rod(s) and
+ frame.}
-\begin{option}{ opt = draft, desc = {= \meta{è‰ç¨¿é€‰é¡¹}}, init=false }
- 设置è‰ç¨¿é€‰é¡¹ã€‚
+\subsection{è‰ç¨¿æ¨¡å¼}
+
+\begin{option}{ opt = draft, desc = {= \meta{è‰ç¨¿æ¨¡å¼}}, init=false }
+ 设置è‰ç¨¿æ¨¡å¼ã€‚
\end{option}
- \oarg{draft}选项会将算ç ç”¨çŸ©å½¢è¡¨ç¤ºï¼Œå–消其圆角效果,从而加快编译速度。
+ \oarg{draft}选项会将算ç ç”¨åœ†è§’线冒直线实现绘制,å–消所有高光效果,
+ 从而加快编译速度。åŒæ—¶ï¼Œ\oarg{draft}选项还会将空档算ç ç»˜åˆ¶é€‰é¡¹\oarg{empty}%
+ 设置为\texttt{false},也就是ä¸ç»˜åˆ¶ç©ºæ¡£ä¸Šçš„ç®—ç ã€‚
\begin{notezh}
在è‰ç¨¿æ¨¡å¼ä¸‹ç®—盘排版会与期望的排版结果有出入。
@@ -467,15 +516,40 @@
\end{suanpan}
\end{SideBySideExample}
-\subsection{线宽选项}
+\changes{v1.1.2}{2024/08/31}{add empty option to remove bids on empty rod.}
+
+\subsection{是å¦ç»˜åˆ¶ç©ºæ¡£ç®—ç }
+
+\begin{option}{ opt = empty, desc = {= \meta{空档}}, init=true }
+ 设置是å¦ç»˜åˆ¶ç©ºæ¡£ç®—ç ã€‚
+\end{option}
+
+ \oarg{empty}选项用于选择是å¦ç»˜åˆ¶ç©ºæ¡£ä¸Šçš„ç®—ç ï¼Œå¦‚æžœä¸ç»˜åˆ¶ï¼Œ
+ 在一定程度上å¯ä»¥åŠ å¿«ç¼–译速度。
+
+ \begin{notezh}
+ 如有需è¦ï¼Œå¯ä»¥ä½¿ç”¨\tn{bid}或\tn{bids*}命令为空档绘制算ç ã€‚
+ \end{notezh}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.53\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}[empty = false]
+ \rods{0, 6, 12, 18, 0}
+ \bids*{5}{0}{gray6}
+ \end{suanpan}
+\end{SideBySideExample}
-\begin{option}{ opt = linewd, desc = {= \meta{线宽选项}}, init=2pt }
+\subsection{线宽}
+
+\begin{option}{ opt = linewd, desc = {= \meta{线宽}}, init=2pt }
设置算盘绘制中的线宽。
\end{option}
\oarg{linewd}选项用于设置算盘边框内线线宽,åŒæ—¶ä¼šå°†
边框外线设置为linewdçš„7.00å€ï¼Œå°†æ¡£æ†å’Œç®—ç çº¿å®½
- 设置为linewdçš„1.00å€ã€‚
+ 设置为linewdçš„0.2å€ã€‚
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.40\linewidth,gobble=2]
@@ -486,6 +560,74 @@
\end{suanpan}
\end{SideBySideExample}
+\changes{v1.2.2}{2024/09/07}{add bidh, bidd, rodd and framew options
+ to set the base size of suanpan.}
+
+\subsection{ç®—ç é«˜åº¦}
+
+\begin{option}{ opt = bidh, desc = {= \meta{ç®—ç é«˜åº¦}}, init=12mm }
+ 设置算ç é«˜åº¦ã€‚
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, bidh = 18mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{ç®—ç ç›´å¾„}
+
+\begin{option}{ opt = bidd, desc = {= \meta{ç®—ç ç›´å¾„}}, init=23mm }
+ 设置算ç ç›´å¾„。
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, bidd = 36mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{æ¡£æ†ç›´å¾„}
+
+\begin{option}{ opt = rodd, desc = {= \meta{æ¡£æ†ç›´å¾„}}, init=7mm }
+ 设置档æ†ç›´å¾„。
+\end{option}
+
+\begin{noteen}
+ æ¡£æ†ç›´å¾„rodd应该å°äºŽç®—ç ç›´å¾„bidd。
+\end{noteen}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, rodd = 3mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{边框宽度}
+
+\begin{option}{ opt = framew, desc = {= \meta{边框宽度}}, init=13mm }
+ 设置边框宽度。
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, framew = 7mm}
+ \begin{suanpan}
+ \rods{0, 6, 12, 18, 0}
+ \mkframe
+ \end{suanpan}
+\end{SideBySideExample}
+
\subsection{æ¡£ä½é—´è·}
\begin{option}{ opt = rodsep, desc = {= \meta{æ¡£ä½é—´è·}}, init=3.0pt }
@@ -568,7 +710,7 @@
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, roddraw = brown4}
+ \suanpanset{scale = 0.65, roddraw = red8}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -598,7 +740,7 @@
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, outerdraw = yellow4}
+ \suanpanset{scale = 0.65, outerdraw = red8}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -606,14 +748,14 @@
\subsection{外ç å¡«å……颜色}
-\begin{option}{ opt = outerfill, desc = {= \meta{外ç å¡«å……颜色}}, init=white }
+\begin{option}{ opt = outerfill, desc = {= \meta{外ç å¡«å……颜色}}, init=black!40 }
设置外ç å¡«å……颜色。
\end{option}
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, outerfill = yellow9}
+ \suanpanset{scale = 0.65, outerfill = yellow6}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -643,12 +785,31 @@
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, innerfill = red9}
+ \suanpanset{scale = 0.65, innerfill = red5}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
\end{SideBySideExample}
+\changes{v1.2.2}{2024/09/07}{add font option
+ to set the font of mark.}
+\subsection{标记字体}
+
+\begin{option}{ opt = font, desc = {= \meta{标记字体}}, init=\tn{bfseries}\tn{Large} }
+ 设置标记字体。
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65,
+ font=\rmfamily\Huge}
+ \begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark{4,3,2,1,0,-1}
+ \end{suanpan}
+\end{SideBySideExample}
+
\bigskip
\changes{v1.1.1}{2024/08/30}{add English documentation.}
@@ -669,18 +830,19 @@
\section{Introduction}
\pkg{suanpan-l3} is a traditional Chinese 7-bids suanpan drawing package
-utilizes \pkg{l3draw} and is developed with \pkg{Expl3}. It can
-effectively manage both upper and lower bids, while also considering
+utilizes \pkg{l3draw} and \pkg{TikZ} and is developed with \pkg{Expl3}.
+It can effectively manage both upper and lower bids, while also considering
bottom bid, top bid, and hanging bid.
This package offers a unique environment for drawing suanpan,
-denoted as \env{suanpan}. Within this environment, 7 specialized macros
+denoted as \env{suanpan}. Within this environment, 8 specialized macros
are available for the creation of suanpan. The \tn{rod} macro is used
to lay out a single rod, while the \tn{rod*} macro draws a counting point
on this rod’s beam. The \tn{rods} macro is capable of laying out a set of rods.
The \tn{bid} macro colors the specified bid. The \tn{bids} macro colors
all inner bids that are near the beam, while the \tn{bids*} macro colors
-all outer bids that are far from the beam. Lastly, the \tn{lrframe} macro
+all outer bids that are far from the beam. The \tn{rodmark} macro mark all rods
+on beam. Lastly, the \tn{mkframe} macro
is used to lay out the left and right frames of an abacus.
At the same time, the package offers customization options for suanpan,
@@ -697,22 +859,23 @@ options, or the \tn{suanpanset} macro.
\rod*{4}{3}
\rod*{18}{17}
% top bid
- \bid{12}{9}{azure7}
- \bid{13}{9}{azure7}
- \bid{14}{9}{azure7}
- \bid{15}{9}{azure7}
- \bid{16}{9}{azure7}
+ \bid{12}{9}{azure5}
+ \bid{13}{9}{azure5}
+ \bid{14}{9}{azure5}
+ \bid{15}{9}{azure5}
+ \bid{16}{9}{azure5}
% hanging bid
- \bid{17}{11}{red8}
- \bid{18}{11}{red8}
- \bid{19}{11}{red8}
- \bid{20}{11}{red8}
- \bid{21}{11}{red8}
+ \bid{17}{11}{red5}
+ \bid{18}{11}{red5}
+ \bid{19}{11}{red5}
+ \bid{20}{11}{red5}
+ \bid{21}{11}{red5}
% bottom bid
- \bid{11}{3}{olive7}
- \bid{16}{3}{olive7}
- \bid{21}{3}{olive7}
- \lrframe{1}{21}
+ \bid{11}{3}{olive5}
+ \bid{16}{3}{olive5}
+ \bid{21}{3}{olive5}
+ \rodmark{21,20,19,{},17,16,15,14,13,12,11,10,9,8,7,6,5,{},3,2,1}
+ \mkframe
\end{suanpan}
\end{center}
@@ -731,7 +894,7 @@ options, or the \tn{suanpanset} macro.
Typesetting 7-bids Chinese suanpan with \oarg{options}.
Within the \env{suanpan} environment, \tn{rod}, \tn{rod*}, \tn{rods}, \tn{bid},
- \tn{bids}, \tn{bids*} and \tn{lrframe} 7 specialized macros
+ \tn{bids}, \tn{bids*}, \tn{rodmark} and \tn{mkframe} 8 specialized macros
are available for the creation of suanpan.
\oarg{options} is a key-value list for line width, draw color, fill color,
@@ -739,6 +902,10 @@ options, or the \tn{suanpanset} macro.
\oarg{options} is environment's local setting.
+ \begin{noteen}
+ You should remove all blank line in \env{suanpan} environment.
+ \end{noteen}
+
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.48\linewidth,gobble=2]
\centering
@@ -823,18 +990,16 @@ options, or the \tn{suanpanset} macro.
\begin{function}{\bid}
\begin{syntax}
- \cs{bid} \marg{num}\marg{pos}\marg{color}
+ \cs{bid} \marg{num}\marg{pos list}\marg{fill color}\oarg{draw color}
\end{syntax}
\end{function}
The \tn{bid} macro fills the specified bid.
- The \marg{num} is the same as for \tn{rod}; the \marg{color} argument
- defines the fill color and the \marg{pos} argument tells which bid has to
- be colored in \marg{num} rod.
-
- This macro also blends \marg{color} by 40\% black to be used for bid
- drawing color.
+ The \marg{num} is the same as for \tn{rod}; the \marg{fill color} argument
+ defines the fill color and the comma-seperated \marg{pos list} argument tells
+ which bid has to be colored in \marg{num} rod. The \oarg{draw color} option
+ gives the draw color(default is inner bid draw color) .
The \marg{pos} in a rod is numbered from the bottom up in the order
$1, 2, \cdots, 11$. The lower deck bids occupies position
@@ -847,14 +1012,14 @@ options, or the \tn{suanpanset} macro.
\suanpanset{scale = 0.65}
\begin{suanpan}
\rods{0, 0, 7, 11, 8, 19}
- \bid{1}{1}{gray7}
- \bid{2}{5}{gray7}
- \bid{3}{6}{red8}
- \bid{4}{7}{red8}
- \bid{4}{8}{azure6}
- \bid{4}{9}{yellow9}
+ \bid{1}{1}{brown5}
+ \bid{2}{5}{brown5}
+ \bid{3}{6}{red5}
+ \bid{4}{7}{red5}
+ \bid{4}{8}{azure5}
+ \bid{4}{9}{yellow5}
\bid{5}{10}{violet5}
- \bid{6}{11}{teal4}
+ \bid{6}{4,5,6,11}{teal4}[magenta5]
\end{suanpan}
\end{SideBySideExample}
@@ -871,10 +1036,11 @@ options, or the \tn{suanpanset} macro.
\marg{num} and \marg{color} are the same as for \tn{bid};
the \marg{val} argument is the same as for \tn{rod}.
- The \marg{color} is fill color for inner bids. it also blends
- \marg{color} by 40\% black to be used for inner bids drawing color.
+ The \marg{color} is fill color for inner bids. it also set
+ \texttt{innercolor} to be used for inner bids drawing color.
The starred version \tn{bids*} is used to color outer bids of \marg{num} rod.
+ it also set \texttt{outercolor} to be used for inner bids drawing color.
\begin{noteen}
This macro can only select the inner bids or the outer bids for coloring,
@@ -888,23 +1054,60 @@ options, or the \tn{suanpanset} macro.
\begin{suanpan}
\rods{0, 0, 7, 11, 8, 19}
\bids{3}{7}{teal4}
- \bids*{5}{8}{azure6}
+ \bids*{5}{8}{azure5}
\end{suanpan}
\end{SideBySideExample}
-\subsubsection{\tn{lrframe}---left and right frame}
+\subsubsection{\tn{rodmark} rod(s) marking on beam}
-\begin{function}{\lrframe}
+\begin{function}{\rodmark}
\begin{syntax}
- \cs{lrframe} \marg{first num}\marg{last num}
+ \cs{rodmark} \oarg{st}\marg{maker list}
\end{syntax}
\end{function}
- The \tn{lrframe} macro is used to lay out the left and right frames of
- a suanpan.
+ The \tn{rodmark} macro marks the rod(s) on the beam.
- The \marg{first num} argument tells which rod is the first rod and
- the \marg{last num} argument tells which rod is the last rod.
+ The \oarg{st} argument is the start rod and \marg{marker list}
+ is the marker list.
+
+ \begin{noteen}
+ If the number of \marg{marker List} exceeds the number of
+ rods from \oarg{st}, the excess markers will be ignored.
+ In the \marg{marker list}, it is possible to use a pair of
+ ``\{\}'' grouping to indicate blank marker.
+ \end{noteen}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.48\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark{4,{},2,1,0,-1,-2}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.48\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark[2]{Q,C,X,I}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsubsection{\tn{mkframe}---layout frame}
+
+\begin{function}{\mkframe}
+ \begin{syntax}
+ \cs{mkframe}
+ \end{syntax}
+\end{function}
+
+ The \tn{mkframe} macro is used to lay out the frames of
+ a suanpan.
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.48\linewidth,gobble=2]
@@ -912,7 +1115,7 @@ options, or the \tn{suanpanset} macro.
\suanpanset{scale = 0.65}
\begin{suanpan}
\rods{0, 6, 12, 18, 0}
- \lrframe{1}{5}
+ \mkframe
\end{suanpan}
\end{SideBySideExample}
@@ -961,8 +1164,12 @@ The ``|=true|'' in the \marg{option}|=true| for Boolean types can be omitted.
Draft mode.
\end{option}
-The \oarg{draft} option speeds up compilation by canceling
- bids rounded corner effect.
+ The \oarg{draft} option speeds up compilation by drawing
+ bids using round cap line, at same time it will remove all
+ highlight of bid(s), rod(s) and frame.
+
+ At the same time \oarg{draft} option will set the \oarg{empty} option
+ to \texttt{false} to remove all bids on empty rod.
\begin{noteen}
Suanpan layout in draft mode may differ from the desired layout.
@@ -978,6 +1185,29 @@ The \oarg{draft} option speeds up compilation by canceling
\end{suanpan}
\end{SideBySideExample}
+\subsection{empty}
+
+\begin{option}{ opt = empty, desc = {= \meta{empty}}, init=true }
+ Remove bids on empty rod or not.
+\end{option}
+
+ The \oarg{empty} option will remove all bids on empty rod.
+
+ \begin{noteen}
+ If necessary, you can use the \tn{bid} or \tn{bids*} macro to
+ draw bid(s) for the empty rod.
+ \end{noteen}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.53\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65}
+ \begin{suanpan}[empty=false]
+ \rods{0, 6, 12, 18, 0}
+ \bids*{5}{0}{gray6}
+ \end{suanpan}
+\end{SideBySideExample}
+
\subsection{line width}
\begin{option}{ opt = linewd, desc = {= \meta{linewd}}, init=2pt }
@@ -997,6 +1227,71 @@ The \oarg{draft} option speeds up compilation by canceling
\end{suanpan}
\end{SideBySideExample}
+\subsection{bid height}
+
+\begin{option}{ opt = bidh, desc = {= \meta{bidh}}, init=12mm }
+ The height of bid.
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, bidh = 18mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{bid diameter}
+
+\begin{option}{ opt = bidd, desc = {= \meta{bidd}}, init=23mm }
+ The diameter of bid.
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, bidd = 36mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{rod diameter}
+
+\begin{option}{ opt = rodd, desc = {= \meta{rodd}}, init=7mm }
+ The diameter of rod.
+\end{option}
+
+\begin{noteen}
+ The rodd should be smaller than the bidd.
+\end{noteen}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, rodd = 3mm}
+ \begin{suanpan}
+ \rods{0, 6, 0}
+ \end{suanpan}
+\end{SideBySideExample}
+
+\subsection{frame width}
+
+\begin{option}{ opt = framew, desc = {= \meta{framew}}, init=13mm }
+ The width of frame.
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65, framew = 7mm}
+ \begin{suanpan}
+ \rods{0, 6, 12, 18, 0}
+ \mkframe
+ \end{suanpan}
+\end{SideBySideExample}
+
\subsection{rod spacing}
\begin{option}{ opt = rodsep, desc = {= \meta{rodsep}}, init=3.0pt }
@@ -1081,7 +1376,7 @@ The \oarg{draft} option speeds up compilation by canceling
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, roddraw = brown4}
+ \suanpanset{scale = 0.65, roddraw = red8}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -1111,7 +1406,7 @@ The \oarg{draft} option speeds up compilation by canceling
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, outerdraw = yellow4}
+ \suanpanset{scale = 0.65, outerdraw = red8}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -1119,14 +1414,14 @@ The \oarg{draft} option speeds up compilation by canceling
\subsection{outer bids filling color}
-\begin{option}{ opt = outerfill, desc = {= \meta{outerfill}}, init=white }
+\begin{option}{ opt = outerfill, desc = {= \meta{outerfill}}, init=black!40 }
The outer bids filling color。
\end{option}
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, outerfill = yellow9}
+ \suanpanset{scale = 0.65, outerfill = yellow6}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
@@ -1156,12 +1451,29 @@ The \oarg{draft} option speeds up compilation by canceling
\begin{SideBySideExample}[frame=single,numbers=left,%
xrightmargin=.37\linewidth,gobble=2]
\centering
- \suanpanset{scale = 0.65, innerfill = red9}
+ \suanpanset{scale = 0.65, innerfill = red5}
\begin{suanpan}
\rods{0, 6, 0}
\end{suanpan}
\end{SideBySideExample}
+\subsection{mark font}
+
+\begin{option}{ opt = font, desc = {= \meta{font}}, init=\tn{bfseries}\tn{Large} }
+ The font of mark(s).
+\end{option}
+
+\begin{SideBySideExample}[frame=single,numbers=left,%
+ xrightmargin=.40\linewidth,gobble=2]
+ \centering
+ \suanpanset{scale = 0.65,
+ font=\rmfamily\Huge}
+ \begin{suanpan}
+ \rods{0, 2, 6, 6, 9, 0}
+ \rodmark{4,3,2,1,0,-1}
+ \end{suanpan}
+\end{SideBySideExample}
+
\end{documentation}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/tableof/README.md b/Master/texmf-dist/doc/latex/tableof/README.md
index fa5ea8d72ba..2f0b93dd0a9 100644
--- a/Master/texmf-dist/doc/latex/tableof/README.md
+++ b/Master/texmf-dist/doc/latex/tableof/README.md
@@ -2,9 +2,9 @@ tableof
=======
- Package: tableof (Tables of tagged contents)
-- Version: 1.4c (2021/07/05)
+- Version: 1.4d (2024/09/17)
- License: LPPL 1.3c
-- Copyright (C) 2012, 2013, 2015, 2018, 2021 Jean-Francois Burnol <jfbu at free dot fr>
+- Copyright (C) 2012, 2013, 2015, 2018, 2021, 2024 Jean-Francois Burnol <jfbu at free dot fr>
Provides `\toftagstart{}`, `\toftagstop{}`, `\toftagthis{}`, `\tofuntagthis{}`
to tag chapters, sections or any other sectioning units destined to end up in
@@ -31,6 +31,10 @@ usable only once, contrarily to the `\tableof{}` et al. package macros.
Change History
==============
+* v1.4d (2024/09/17) reestablishes compatibility with `hyperref`,
+ which got broken at the latter `v7.01c` release. The package now
+ requires LaTeX 2020-10-01. Thanks to Ekkart Kleinod for report.
+
* v1.4c (2021/07/05) additional efforts for `biblatex` compatibility.
Allow style file extraction via `etex`, reword the abstract. Use utf8
source encoding.
diff --git a/Master/texmf-dist/doc/latex/tableof/tableof.pdf b/Master/texmf-dist/doc/latex/tableof/tableof.pdf
index f04fc964a07..1c2d6ae655a 100644
--- a/Master/texmf-dist/doc/latex/tableof/tableof.pdf
+++ b/Master/texmf-dist/doc/latex/tableof/tableof.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tableof/tableoftest.tex b/Master/texmf-dist/doc/latex/tableof/tableoftest.tex
index f8ddc8a2420..127cb2d1ab4 100644
--- a/Master/texmf-dist/doc/latex/tableof/tableoftest.tex
+++ b/Master/texmf-dist/doc/latex/tableof/tableoftest.tex
@@ -22,9 +22,9 @@
%% in the same archive or directory.)
%%
%% Package: tableof
-%% Version: 1.4c (2021/07/05)
+%% Version: 1.4d (2024/09/17)
%% License: LPPL 1.3c
-%% Copyright (C) 2012, 2013, 2015, 2018, 2021 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2012, 2013, 2015, 2018, 2021, 2024 Jean-Francois Burnol <jfbu at free dot fr>
%%
%% This file `tableoftest.tex' serves to demontrate the use of the
%% commands from the package `tableof'.
diff --git a/Master/texmf-dist/doc/latex/tagpdf/README.md b/Master/texmf-dist/doc/latex/tagpdf/README.md
index edcdc6b5e6e..7ba67de333b 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/README.md
+++ b/Master/texmf-dist/doc/latex/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.99d
-Packagedate: 2024/08/02
+Packageversion: 0.99f
+Packagedate: 2024/09/16
Author: Ulrike Fischer, LaTeX Project Team
## License
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
index 9ba962e1e33..83a304a2016 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
@@ -1,11 +1,11 @@
%PDF-2.0
%ÌÕÁÔÅØÐÄÆ
22 0 obj
-<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20240802125547+02'00') /Size 151 /CheckSum (D4716966C44F441B4E4C1D2DD929683B) >> /Length 151 >>
+<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20240916231350+02'00') /Size 151 /CheckSum (F1F871442F296ACB6365DC9AC224F015) >> /Length 151 >>
stream
%% LaTeX2e file `example-input-file.tex'
%% generated by the `filecontents' environment
-%% from source `ex-AF-file' on 2024/08/02.
+%% from source `ex-AF-file' on 2024/09/16.
%%
Additional info!
@@ -15,7 +15,7 @@ endobj
<< /Type /Filespec /AFRelationship /Unspecified /F (example-input-file.tex) /UF <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /EF<</F 22 0 R/UF 22 0 R>> >>
endobj
25 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240802) >> /Length 19 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240916) >> /Length 19 >>
stream
Bär with teh shirt
endstream
@@ -24,7 +24,7 @@ endobj
<< /Type /Filespec /AFRelationship /Supplement /F (tag-AFfile1.txt) /UF <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /EF<</F 25 0 R/UF 25 0 R>> >>
endobj
28 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240802) >> /Length 4 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240916) >> /Length 4 >>
stream
Duck
endstream
@@ -33,7 +33,7 @@ endobj
<< /Type /Filespec /AFRelationship /Supplement /F (tag-AFfile2.txt) /UF <FEFF007400610067002D0041004600660069006C00650032002E007400780074> /EF<</F 28 0 R/UF 28 0 R>> >>
endobj
31 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11382 >>
+<< /Type /Metadata /Subtype /XML /Length 11713 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -88,6 +88,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -242,17 +248,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:56:09+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:14:06+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-AF-file.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:56:09+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:56:09+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:56:09+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:14:06+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:14:06+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:14:06+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:38d5a844-2217-4081-87cc-b2129dc357a6</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:3ff2b426-7c06-4861-8f14-4e8e04ac9b4c</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:f3e8d74f-e578-4148-81cf-4735ea173170</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -347,7 +353,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >>
endobj
19 0 obj
-<< /Type /Namespace /NS (data:,BBA64916-90D9-A0B9-F592-8E68FD20F532) >>
+<< /Type /Namespace /NS (data:,4A2CE27A-F4B-3881-D950-B43D7275F9F5) >>
endobj
8 0 obj
[ 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R ]
@@ -449,59 +455,59 @@ endobj
<< /Type /Catalog /Pages 36 0 R /MarkInfo 37 0 R/Lang (de-DE)/Metadata 31 0 R/StructTreeRoot 5 0 R >>
endobj
46 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125609+02'00')/ModDate (D:20240802125609+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231406+02'00')/ModDate (D:20240916231406+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 47
0000000002 65535 f
-0000013544 00000 n
+0000013875 00000 n
0000000003 00000 f
0000000004 00000 f
0000000010 00000 f
-0000016362 00000 n
-0000013627 00000 n
-0000013838 00000 n
-0000015792 00000 n
-0000014417 00000 n
+0000016692 00000 n
+0000013958 00000 n
+0000014169 00000 n
+0000016122 00000 n
+0000014748 00000 n
0000000012 00000 f
-0000014485 00000 n
+0000014816 00000 n
0000000014 00000 f
-0000014555 00000 n
+0000014886 00000 n
0000000020 00000 f
-0000015318 00000 n
-0000014636 00000 n
-0000015596 00000 n
-0000015425 00000 n
-0000015703 00000 n
+0000015649 00000 n
+0000014967 00000 n
+0000015927 00000 n
+0000015756 00000 n
+0000016034 00000 n
0000000000 00000 f
-0000015853 00000 n
+0000016183 00000 n
0000000020 00000 n
0000000382 00000 n
-0000015966 00000 n
+0000016296 00000 n
0000000603 00000 n
0000000758 00000 n
-0000016098 00000 n
+0000016428 00000 n
0000000943 00000 n
0000001083 00000 n
-0000016230 00000 n
+0000016560 00000 n
0000001268 00000 n
-0000013481 00000 n
-0000013346 00000 n
-0000012740 00000 n
-0000020115 00000 n
-0000020469 00000 n
-0000013591 00000 n
-0000013684 00000 n
-0000013801 00000 n
-0000016482 00000 n
-0000018931 00000 n
-0000016668 00000 n
-0000019152 00000 n
-0000020269 00000 n
-0000020531 00000 n
-0000020649 00000 n
+0000013812 00000 n
+0000013677 00000 n
+0000013071 00000 n
+0000020445 00000 n
+0000020799 00000 n
+0000013922 00000 n
+0000014015 00000 n
+0000014132 00000 n
+0000016812 00000 n
+0000019261 00000 n
+0000016998 00000 n
+0000019482 00000 n
+0000020599 00000 n
+0000020861 00000 n
+0000020979 00000 n
trailer
-<< /Size 47 /Root 45 0 R /Info 46 0 R /ID [ <E2F9D94DBDFC11D2EE5801BA51FD5C99> <E2F9D94DBDFC11D2EE5801BA51FD5C99> ] >>
+<< /Size 47 /Root 45 0 R /Info 46 0 R /ID [ <CAF46A2B1E52D3AE87EB05AABC0D2D7E> <CAF46A2B1E52D3AE87EB05AABC0D2D7E> ] >>
startxref
-20872
+21202
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
index f64d4e66bfe..b98f65296d3 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
index feda9e252ac..3690dceabff 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
@@ -7,7 +7,7 @@ endobj
<< <</O /Layout /Borderstyle /Dotted >> >>
endobj
21 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11384 >>
+<< /Type /Metadata /Subtype /XML /Length 11715 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -62,6 +62,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -216,17 +222,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:57:08+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:14:51+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-attribute.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:57:08+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:57:08+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:57:08+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:14:51+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:14:51+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:14:51+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:7a9cf910-1c19-429a-8f24-339c62d8a57f</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:b262e437-7e89-4c42-8e29-bedae4c498b6</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:cc63fc15-f109-4c23-87e0-ae054c5fc24a</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -450,51 +456,51 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de_DE)/Metadata 21 0 R/StructTreeRoot 5 0 R >>
endobj
38 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20240802125708+02'00')/ModDate (D:20240802125708+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20240916231451+02'00')/ModDate (D:20240916231451+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 39
0000000002 65535 f
-0000012845 00000 n
+0000013176 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000014965 00000 n
-0000012928 00000 n
-0000013247 00000 n
+0000015296 00000 n
+0000013259 00000 n
+0000013578 00000 n
0000000000 00000 f
-0000013953 00000 n
-0000014038 00000 n
-0000014130 00000 n
-0000014214 00000 n
-0000014304 00000 n
+0000014284 00000 n
+0000014369 00000 n
+0000014461 00000 n
+0000014545 00000 n
+0000014635 00000 n
0000000020 00000 n
0000000071 00000 n
-0000014433 00000 n
-0000014573 00000 n
-0000014657 00000 n
-0000014747 00000 n
-0000014856 00000 n
+0000014764 00000 n
+0000014904 00000 n
+0000014988 00000 n
+0000015078 00000 n
+0000015187 00000 n
0000000132 00000 n
-0000012758 00000 n
-0000012616 00000 n
-0000011606 00000 n
-0000017305 00000 n
-0000017659 00000 n
-0000012892 00000 n
-0000012992 00000 n
-0000013210 00000 n
-0000013826 00000 n
-0000015083 00000 n
-0000016261 00000 n
-0000015160 00000 n
-0000015234 00000 n
-0000016497 00000 n
-0000017459 00000 n
-0000017721 00000 n
-0000017839 00000 n
+0000013089 00000 n
+0000012947 00000 n
+0000011937 00000 n
+0000017636 00000 n
+0000017990 00000 n
+0000013223 00000 n
+0000013323 00000 n
+0000013541 00000 n
+0000014157 00000 n
+0000015414 00000 n
+0000016592 00000 n
+0000015491 00000 n
+0000015565 00000 n
+0000016828 00000 n
+0000017790 00000 n
+0000018052 00000 n
+0000018170 00000 n
trailer
-<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <2033D8BFB67E1F1EDFB190E1DEC10A2C> <2033D8BFB67E1F1EDFB190E1DEC10A2C> ] >>
+<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <D8FFE97D0CAF78CED294D3AF8DA45DD2> <D8FFE97D0CAF78CED294D3AF8DA45DD2> ] >>
startxref
-18076
+18407
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
index 637338d16f2..3be4493a87a 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
@@ -30,7 +30,7 @@ endobj
<< /ExtGState 1 0 R /Font << /F15 15 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
19 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11390 >>
+<< /Type /Metadata /Subtype /XML /Length 11721 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -85,6 +85,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -239,17 +245,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:57:37+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:15:14+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-formula-problem.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:57:37+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:57:37+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:57:37+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:15:14+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:15:14+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:15:14+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:8eb2ce1d-b2ec-440a-8bc2-73733eb3eeb0</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:8fbc3896-5f57-401a-81d8-1fdb02abac8a</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:07852560-d6c8-4db0-8dcb-56801fad3639</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -425,46 +431,46 @@ endobj
<< /Type /Catalog /Pages 16 0 R /MarkInfo 23 0 R/Lang (de-DE)/Metadata 19 0 R/StructTreeRoot 5 0 R >>
endobj
33 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125737+02'00')/ModDate (D:20240802125737+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231514+02'00')/ModDate (D:20240916231514+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 34
0000000002 65535 f
-0000012816 00000 n
+0000013147 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000014379 00000 n
-0000012899 00000 n
-0000013137 00000 n
+0000014710 00000 n
+0000013230 00000 n
+0000013468 00000 n
0000000000 00000 f
-0000013716 00000 n
-0000013823 00000 n
-0000013929 00000 n
+0000014047 00000 n
+0000014154 00000 n
+0000014260 00000 n
0000000637 00000 n
0000000502 00000 n
0000000020 00000 n
-0000018463 00000 n
-0000018817 00000 n
-0000014041 00000 n
-0000014147 00000 n
+0000018794 00000 n
+0000019148 00000 n
+0000014372 00000 n
+0000014478 00000 n
0000000724 00000 n
-0000012729 00000 n
-0000012594 00000 n
-0000012204 00000 n
-0000012863 00000 n
-0000012969 00000 n
-0000013100 00000 n
-0000014480 00000 n
-0000017236 00000 n
-0000014681 00000 n
-0000014757 00000 n
-0000017472 00000 n
-0000018617 00000 n
-0000018886 00000 n
-0000019004 00000 n
+0000013060 00000 n
+0000012925 00000 n
+0000012535 00000 n
+0000013194 00000 n
+0000013300 00000 n
+0000013431 00000 n
+0000014811 00000 n
+0000017567 00000 n
+0000015012 00000 n
+0000015088 00000 n
+0000017803 00000 n
+0000018948 00000 n
+0000019217 00000 n
+0000019335 00000 n
trailer
-<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <84EDE341B761805B059537E407E8C0CD> <84EDE341B761805B059537E407E8C0CD> ] >>
+<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <BE560A5AB892B55B8DEB50F7C89AA5EB> <BE560A5AB892B55B8DEB50F7C89AA5EB> ] >>
startxref
-19227
+19558
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
index 381477d8292..bff3e7f2665 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
@@ -1,7 +1,7 @@
%PDF-1.7
%ÌÕÁÔÅØÐÄÆ
48 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11376 >>
+<< /Type /Metadata /Subtype /XML /Length 11707 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -56,6 +56,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -210,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:58:08+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:15:40+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-list.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:58:08+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:58:08+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:58:08+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:15:40+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:15:40+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:15:40+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:4c749825-1de7-414c-879f-29e4d0bef66e</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:0803684d-fad7-4d08-8dc2-c5108f24d889</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:663679a3-cbaa-41c1-8541-e27efe5bf460</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -654,85 +660,85 @@ endobj
<< /Type /Catalog /Pages 54 0 R /MarkInfo 55 0 R/Lang (en)/Metadata 48 0 R/StructTreeRoot 5 0 R >>
endobj
72 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125808+02'00')/ModDate (D:20240802125808+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231540+02'00')/ModDate (D:20240916231540+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 73
0000000002 65535 f
-0000013509 00000 n
+0000013840 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000019047 00000 n
-0000013592 00000 n
-0000014431 00000 n
+0000019378 00000 n
+0000013923 00000 n
+0000014762 00000 n
0000000000 00000 f
-0000015228 00000 n
-0000015329 00000 n
-0000015405 00000 n
-0000015481 00000 n
-0000015568 00000 n
-0000015675 00000 n
-0000015765 00000 n
-0000015875 00000 n
-0000015959 00000 n
-0000016047 00000 n
-0000016170 00000 n
-0000016260 00000 n
-0000016370 00000 n
-0000016454 00000 n
-0000016542 00000 n
-0000016665 00000 n
-0000016752 00000 n
-0000016863 00000 n
-0000016953 00000 n
-0000017063 00000 n
-0000017147 00000 n
-0000017235 00000 n
-0000017358 00000 n
-0000017448 00000 n
-0000017558 00000 n
-0000017642 00000 n
-0000017730 00000 n
-0000017853 00000 n
-0000017940 00000 n
-0000018055 00000 n
-0000018145 00000 n
-0000018255 00000 n
-0000018339 00000 n
-0000018427 00000 n
-0000018550 00000 n
-0000018640 00000 n
-0000018751 00000 n
-0000018835 00000 n
-0000018923 00000 n
+0000015559 00000 n
+0000015660 00000 n
+0000015736 00000 n
+0000015812 00000 n
+0000015899 00000 n
+0000016006 00000 n
+0000016096 00000 n
+0000016206 00000 n
+0000016290 00000 n
+0000016378 00000 n
+0000016501 00000 n
+0000016591 00000 n
+0000016701 00000 n
+0000016785 00000 n
+0000016873 00000 n
+0000016996 00000 n
+0000017083 00000 n
+0000017194 00000 n
+0000017284 00000 n
+0000017394 00000 n
+0000017478 00000 n
+0000017566 00000 n
+0000017689 00000 n
+0000017779 00000 n
+0000017889 00000 n
+0000017973 00000 n
+0000018061 00000 n
+0000018184 00000 n
+0000018271 00000 n
+0000018386 00000 n
+0000018476 00000 n
+0000018586 00000 n
+0000018670 00000 n
+0000018758 00000 n
+0000018881 00000 n
+0000018971 00000 n
+0000019082 00000 n
+0000019166 00000 n
+0000019254 00000 n
0000000020 00000 n
-0000013410 00000 n
-0000013268 00000 n
-0000011486 00000 n
-0000029174 00000 n
-0000022222 00000 n
-0000029528 00000 n
-0000013556 00000 n
-0000013712 00000 n
-0000014394 00000 n
-0000015023 00000 n
-0000019165 00000 n
-0000021124 00000 n
-0000019297 00000 n
-0000019371 00000 n
-0000021358 00000 n
-0000022373 00000 n
-0000022570 00000 n
-0000027709 00000 n
-0000022906 00000 n
-0000023029 00000 n
-0000027945 00000 n
-0000029328 00000 n
-0000029590 00000 n
-0000029705 00000 n
+0000013741 00000 n
+0000013599 00000 n
+0000011817 00000 n
+0000029505 00000 n
+0000022553 00000 n
+0000029859 00000 n
+0000013887 00000 n
+0000014043 00000 n
+0000014725 00000 n
+0000015354 00000 n
+0000019496 00000 n
+0000021455 00000 n
+0000019628 00000 n
+0000019702 00000 n
+0000021689 00000 n
+0000022704 00000 n
+0000022901 00000 n
+0000028040 00000 n
+0000023237 00000 n
+0000023360 00000 n
+0000028276 00000 n
+0000029659 00000 n
+0000029921 00000 n
+0000030036 00000 n
trailer
-<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <0EE2DD31789AD5C7E80F8407D72CF075> <0EE2DD31789AD5C7E80F8407D72CF075> ] >>
+<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <47141410601154CA87EA5F9B05C19636> <47141410601154CA87EA5F9B05C19636> ] >>
startxref
-29928
+30259
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
index 6d60e107364..c4deafa33d1 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
@@ -34,7 +34,7 @@ endobj
<< /ExtGState 1 0 R /Font << /F15 13 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
15 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11401 >>
+<< /Type /Metadata /Subtype /XML /Length 11732 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -89,6 +89,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -243,17 +249,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:58:35+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:16:06+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-mc-manual-para-split-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:58:35+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:58:35+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:58:35+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:16:06+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:16:06+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:16:06+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:c33d64b4-96ec-4e48-8f27-0b3edc831547</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:075c36f4-757d-4e0f-8258-3c0a3e372d69</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:02d42fce-9fea-44e8-84cb-b67592a2a853</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -413,12 +419,12 @@ endobj
<< /Type /Catalog /Pages 14 0 R /Lang (de)/Metadata 15 0 R >>
endobj
25 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125835+02'00')/ModDate (D:20240802125835+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231606+02'00')/ModDate (D:20240916231606+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 26
0000000002 65535 f
-0000016851 00000 n
+0000017182 00000 n
0000000003 00000 f
0000000004 00000 f
0000000005 00000 f
@@ -427,24 +433,24 @@ xref
0000000008 00000 f
0000000000 00000 f
0000002976 00000 n
-0000016645 00000 n
+0000016976 00000 n
0000003094 00000 n
0000000020 00000 n
-0000023472 00000 n
-0000023826 00000 n
+0000023803 00000 n
+0000024157 00000 n
0000003181 00000 n
-0000016764 00000 n
-0000014672 00000 n
-0000016898 00000 n
-0000022021 00000 n
-0000017205 00000 n
-0000017280 00000 n
-0000022257 00000 n
-0000023626 00000 n
-0000023894 00000 n
-0000023972 00000 n
+0000017095 00000 n
+0000015003 00000 n
+0000017229 00000 n
+0000022352 00000 n
+0000017536 00000 n
+0000017611 00000 n
+0000022588 00000 n
+0000023957 00000 n
+0000024225 00000 n
+0000024303 00000 n
trailer
-<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <1A7EFBAD198841A82D20467F858B3B6C> <1A7EFBAD198841A82D20467F858B3B6C> ] >>
+<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <3C637231FF843589F1694979C9C8F1E9> <3C637231FF843589F1694979C9C8F1E9> ] >>
startxref
-24195
+24526
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
index 09a8d8aca07..5b157abef45 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
@@ -1,7 +1,7 @@
%PDF-1.7
%ÌÕÁÔÅØÐÄÆ
14 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11382 >>
+<< /Type /Metadata /Subtype /XML /Length 11713 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -56,6 +56,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -210,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:59:01+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:16:29+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-softhyphen.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:59:01+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:59:01+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:59:01+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:16:29+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:16:29+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:16:29+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:aa82e685-4098-469d-861c-3c45dfc700c7</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:994c7ab3-d509-4a5b-88b5-92bca5031c75</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:c1f8ee28-c74d-4fe3-859d-5667f036c14d</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -393,43 +399,43 @@ endobj
<< /Type /Catalog /Pages 19 0 R /MarkInfo 20 0 R/Lang (de)/Metadata 14 0 R/StructTreeRoot 5 0 R >>
endobj
30 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125901+02'00')/ModDate (D:20240802125901+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231629+02'00')/ModDate (D:20240916231629+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 31
0000000002 65535 f
-0000012360 00000 n
+0000012691 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000013738 00000 n
-0000012443 00000 n
-0000012661 00000 n
+0000014069 00000 n
+0000012774 00000 n
+0000012992 00000 n
0000000000 00000 f
-0000013253 00000 n
-0000013346 00000 n
-0000013432 00000 n
-0000013542 00000 n
-0000013628 00000 n
+0000013584 00000 n
+0000013677 00000 n
+0000013763 00000 n
+0000013873 00000 n
+0000013959 00000 n
0000000020 00000 n
-0000012273 00000 n
-0000012138 00000 n
-0000011492 00000 n
-0000017687 00000 n
-0000018051 00000 n
-0000012407 00000 n
-0000012493 00000 n
-0000012624 00000 n
-0000013839 00000 n
-0000016487 00000 n
-0000013993 00000 n
-0000014167 00000 n
-0000016727 00000 n
-0000017846 00000 n
-0000018113 00000 n
-0000018228 00000 n
+0000012604 00000 n
+0000012469 00000 n
+0000011823 00000 n
+0000018018 00000 n
+0000018382 00000 n
+0000012738 00000 n
+0000012824 00000 n
+0000012955 00000 n
+0000014170 00000 n
+0000016818 00000 n
+0000014324 00000 n
+0000014498 00000 n
+0000017058 00000 n
+0000018177 00000 n
+0000018444 00000 n
+0000018559 00000 n
trailer
-<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <EECF5F575625EC21F0BEE870E572FEB1> <EECF5F575625EC21F0BEE870E572FEB1> ] >>
+<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <DD4C19A30779C7C53A0E2F9F517D5100> <DD4C19A30779C7C53A0E2F9F517D5100> ] >>
startxref
-18451
+18782
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
index 35e1d0609af..fa6c7457d82 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
@@ -1,7 +1,7 @@
%PDF-1.5
%ÌÕÁÔÅØÐÄÆ
10 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11391 >>
+<< /Type /Metadata /Subtype /XML /Length 11722 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -56,6 +56,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -210,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:59:25+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:16:50+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-spaceglyph-listings.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:59:25+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:59:25+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:59:25+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:16:50+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:16:50+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:16:50+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:acdc2435-bf29-4e54-8d09-1c9b6dc32038</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:c59181fc-bb69-430b-8f90-90206d3ba579</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:22e6b54d-e349-4a3d-89ca-64190a29b6f8</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -354,39 +360,39 @@ endobj
<< /Type /Catalog /Pages 15 0 R /MarkInfo 16 0 R/Lang (de)/Metadata 10 0 R/StructTreeRoot 5 0 R >>
endobj
26 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125925+02'00')/ModDate (D:20240802125925+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231650+02'00')/ModDate (D:20240916231650+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 27
0000000002 65535 f
-0000012007 00000 n
+0000012338 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000012886 00000 n
-0000012090 00000 n
-0000012233 00000 n
+0000013217 00000 n
+0000012421 00000 n
+0000012564 00000 n
0000000000 00000 f
-0000012812 00000 n
+0000013143 00000 n
0000000020 00000 n
-0000011920 00000 n
-0000011785 00000 n
-0000011501 00000 n
-0000015069 00000 n
-0000015423 00000 n
-0000012054 00000 n
-0000012125 00000 n
-0000012196 00000 n
-0000012987 00000 n
-0000014053 00000 n
-0000013042 00000 n
-0000013117 00000 n
-0000014289 00000 n
-0000015223 00000 n
-0000015485 00000 n
-0000015600 00000 n
+0000012251 00000 n
+0000012116 00000 n
+0000011832 00000 n
+0000015400 00000 n
+0000015754 00000 n
+0000012385 00000 n
+0000012456 00000 n
+0000012527 00000 n
+0000013318 00000 n
+0000014384 00000 n
+0000013373 00000 n
+0000013448 00000 n
+0000014620 00000 n
+0000015554 00000 n
+0000015816 00000 n
+0000015931 00000 n
trailer
-<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <EC0A5DEABF5EE1A293FAD60891A0BF63> <EC0A5DEABF5EE1A293FAD60891A0BF63> ] >>
+<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <E53E29969037BD3F9F9BB1E9ADABB4FC> <E53E29969037BD3F9F9BB1E9ADABB4FC> ] >>
startxref
-15823
+16154
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
index 73ce1c06022..70b4e9922a6 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
@@ -1,7 +1,7 @@
%PDF-1.7
%ÌÕÁÔÅØÐÄÆ
20 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11390 >>
+<< /Type /Metadata /Subtype /XML /Length 11721 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -56,6 +56,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -210,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T12:59:50+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:17:11+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-structure-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T12:59:50+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T12:59:50+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T12:59:50+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:17:11+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:17:11+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:17:11+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:bf5e4a2b-cfa9-4fc5-878c-8f9d2ee95445</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:2ccba557-e5ae-4703-80db-28b73a88c1cd</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:5942b5fc-8732-48de-83f5-988ceab02c03</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -526,56 +532,56 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de)/Metadata 20 0 R/StructTreeRoot 5 0 R >>
endobj
43 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125950+02'00')/ModDate (D:20240802125950+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231711+02'00')/ModDate (D:20240916231711+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 44
0000000002 65535 f
-0000012794 00000 n
+0000013125 00000 n
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
-0000014930 00000 n
-0000012877 00000 n
-0000013226 00000 n
+0000015261 00000 n
+0000013208 00000 n
+0000013557 00000 n
0000000000 00000 f
-0000013818 00000 n
-0000013903 00000 n
-0000014001 00000 n
-0000014109 00000 n
-0000014217 00000 n
-0000014306 00000 n
-0000014396 00000 n
-0000014506 00000 n
-0000014618 00000 n
-0000014708 00000 n
-0000014818 00000 n
+0000014149 00000 n
+0000014234 00000 n
+0000014332 00000 n
+0000014440 00000 n
+0000014548 00000 n
+0000014637 00000 n
+0000014727 00000 n
+0000014837 00000 n
+0000014949 00000 n
+0000015039 00000 n
+0000015149 00000 n
0000000020 00000 n
-0000012695 00000 n
-0000012560 00000 n
-0000011500 00000 n
-0000023013 00000 n
-0000019779 00000 n
-0000023361 00000 n
-0000012841 00000 n
-0000012955 00000 n
-0000013189 00000 n
-0000015031 00000 n
-0000018510 00000 n
-0000015280 00000 n
-0000015355 00000 n
-0000018746 00000 n
-0000019933 00000 n
-0000020133 00000 n
-0000021901 00000 n
-0000020270 00000 n
-0000020346 00000 n
-0000022135 00000 n
-0000023164 00000 n
-0000023423 00000 n
-0000023538 00000 n
+0000013026 00000 n
+0000012891 00000 n
+0000011831 00000 n
+0000023344 00000 n
+0000020110 00000 n
+0000023692 00000 n
+0000013172 00000 n
+0000013286 00000 n
+0000013520 00000 n
+0000015362 00000 n
+0000018841 00000 n
+0000015611 00000 n
+0000015686 00000 n
+0000019077 00000 n
+0000020264 00000 n
+0000020464 00000 n
+0000022232 00000 n
+0000020601 00000 n
+0000020677 00000 n
+0000022466 00000 n
+0000023495 00000 n
+0000023754 00000 n
+0000023869 00000 n
trailer
-<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <AE5400E970AB8EBE6C04A229EBA70E89> <AE5400E970AB8EBE6C04A229EBA70E89> ] >>
+<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <315E3C9C805F4176C8EEA6E28B15D63A> <315E3C9C805F4176C8EEA6E28B15D63A> ] >>
startxref
-23761
+24092
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
index 7147cd1e913..dab28eb5be8 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
@@ -1,7 +1,7 @@
%PDF-2.0
%ÌÕÁÔÅØÐÄÆ
26 0 obj
-<< /Type /Metadata /Subtype /XML /Length 11387 >>
+<< /Type /Metadata /Subtype /XML /Length 11718 >>
stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -56,6 +56,12 @@ stream
<pdfaProperty:category>internal</pdfaProperty:category>
<pdfaProperty:description>Year of standard</pdfaProperty:description>
</rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:name>rev</pdfaProperty:name>
+ <pdfaProperty:valueType>Integer</pdfaProperty:valueType>
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Revision year of standard</pdfaProperty:description>
+ </rdf:li>
</rdf:Seq>
</pdfaSchema:property>
</rdf:li>
@@ -210,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-08-02T13:00:16+02:00</rdf:li>
+ <rdf:li>2024-09-16T23:17:32+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-tagpdf-template.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-08-02T13:00:16+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-08-02T13:00:16+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-08-02T13:00:16+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-09-16T23:17:32+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-09-16T23:17:32+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-09-16T23:17:32+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:f320abfc-f6ab-4d12-8719-d176f4d947cf</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:3b4409f1-f3e5-4c01-86c4-a0bcea68ea38</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:00659af0-3fb7-47ae-865d-6609c8c59fe3</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -307,7 +313,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >>
endobj
19 0 obj
-<< /Type /Namespace /NS (data:,25352333-84F8-941A-42AB-414B46468294) >>
+<< /Type /Namespace /NS (data:,C5949C29-1579-8EAA-5B48-21F381CD9140) >>
endobj
8 0 obj
[ 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R ]
@@ -399,55 +405,55 @@ endobj
<< /Type /Catalog /Pages 31 0 R /MarkInfo 32 0 R/Lang (en)/Metadata 26 0 R/StructTreeRoot 5 0 R >>
endobj
42 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802130016+02'00')/ModDate (D:20240802130016+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240916231732+02'00')/ModDate (D:20240916231732+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 43
0000000002 65535 f
-0000011929 00000 n
+0000012260 00000 n
0000000003 00000 f
0000000004 00000 f
0000000010 00000 f
-0000014805 00000 n
-0000012012 00000 n
-0000012222 00000 n
-0000014240 00000 n
-0000012865 00000 n
+0000015136 00000 n
+0000012343 00000 n
+0000012553 00000 n
+0000014571 00000 n
+0000013196 00000 n
0000000012 00000 f
-0000012933 00000 n
+0000013264 00000 n
0000000014 00000 f
-0000013003 00000 n
+0000013334 00000 n
0000000020 00000 f
-0000013766 00000 n
-0000013084 00000 n
-0000014044 00000 n
-0000013873 00000 n
-0000014151 00000 n
+0000014097 00000 n
+0000013415 00000 n
+0000014375 00000 n
+0000014204 00000 n
+0000014482 00000 n
0000000000 00000 f
-0000014301 00000 n
-0000014398 00000 n
-0000014485 00000 n
-0000014572 00000 n
-0000014671 00000 n
+0000014632 00000 n
+0000014729 00000 n
+0000014816 00000 n
+0000014903 00000 n
+0000015002 00000 n
0000000020 00000 n
-0000011866 00000 n
-0000011731 00000 n
-0000011497 00000 n
-0000017426 00000 n
-0000017780 00000 n
-0000011976 00000 n
-0000012053 00000 n
-0000012185 00000 n
-0000012801 00000 n
-0000014942 00000 n
-0000016383 00000 n
-0000015029 00000 n
-0000016604 00000 n
-0000017580 00000 n
-0000017842 00000 n
-0000017957 00000 n
+0000012197 00000 n
+0000012062 00000 n
+0000011828 00000 n
+0000017757 00000 n
+0000018111 00000 n
+0000012307 00000 n
+0000012384 00000 n
+0000012516 00000 n
+0000013132 00000 n
+0000015273 00000 n
+0000016714 00000 n
+0000015360 00000 n
+0000016935 00000 n
+0000017911 00000 n
+0000018173 00000 n
+0000018288 00000 n
trailer
-<< /Size 43 /Root 41 0 R /Info 42 0 R /ID [ <42D962292B4982520E998D32C837DE43> <42D962292B4982520E998D32C837DE43> ] >>
+<< /Size 43 /Root 41 0 R /Info 42 0 R /ID [ <0DBC95E2E8610D105A3F1B62C5D4C9B9> <0DBC95E2E8610D105A3F1B62C5D4C9B9> ] >>
startxref
-18180
+18511
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
index 76e839d0d50..5a5d60643a9 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.tex
index b483b96974b..df05b99a30a 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.tex
@@ -28,9 +28,18 @@
% The next line is needed so that \GetFileInfo will be able to pick up
% version data.
+\usepackage{iftex}
+%until l3doc is corrected
+\ifluatex
+\usepackage[TU]{fontenc}
+\ttfamily
+ \DeclareFontShape{TU}{lmtt}{m}{it}
+ {<-> \UnicodeFontFile{lmmonoslant10-regular}{}}{}
+\fi
\usepackage{longtable}
\usepackage{tagpdf}
-\makeatletter
+
+\input{tagpdf-docelements}
%\def\@setupverbvisiblespace{}
%\def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi
% \bgroup
@@ -38,13 +47,12 @@
% \verbatim@font\@noligs
% \language\l@nohyphenation
% \@ifstar\@verb\@verb}
-\makeatother
\begin{document}
\GetFileInfo{tagpdf.sty}
\title{%
- \pkg{tagpdf} -- A package to experiment with pdf tagging%
+ \pkg{tagpdf} -- \LaTeX{} kernel code for PDF tagging%
\thanks{This file describes \fileversion,
last revised \filedate.}%
}
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-docelements.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-docelements.tex
new file mode 100644
index 00000000000..c388889aa1c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-docelements.tex
@@ -0,0 +1,2 @@
+\ProvideDocElement[printtype=\textit{struct key},idxtype=key,idxgroup=Structure keys]{Structkeydecl}{structkeydecl}
+\ProvideDocElement[printtype=\textit{setup key},idxtype=key,idxgroup=Setup keys]{Setupkeydecl}{setupkeydecl}
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
index f7c6ea02a36..a6443d59a40 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
index 10d36d09a0d..9b0beb81014 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
@@ -16,8 +16,8 @@
}
\DebugBlocksOff
\makeatletter
-\def\UlrikeFischer@package@version{0.99d}
-\def\UlrikeFischer@package@date{2024-08-02}
+\def\UlrikeFischer@package@version{0.99f}
+\def\UlrikeFischer@package@date{2024-09-16}
\makeatother
\documentclass[bibliography=totoc,a4paper]{article}
@@ -99,7 +99,7 @@ in the \pkg{latex-lab} bundle for the Tagged PDF project (i.e., loaded by that c
The package is developed and improved in parallel with the code in the \pkg{latex-lab}
bundle (part of the core \LaTeX{} distribution), the \pkg{pdfmanagement-testphase}
-package (the \LaTeX{} PDF management bundle) and the L3 programming layer (part of of the \LaTeX{} format).
+package (the \LaTeX{} PDF management bundle) and the L3 programming layer (part of the \LaTeX{} format).
That means you must ensure that all these components are up-to-date and in
sync which each other.
@@ -1031,7 +1031,7 @@ The key-val list understands the following keys:
marked but not stored in the kid-key of the current structure.
\item[\PrintKeyName{label}] This key sets a label by which you can call
- the marked content later in another structure (if it has been stashed
+ the marked content \emph{later} in another structure (if it has been stashed
with the previous key). Internally the label name will start with
\texttt{tagpdf-}.
@@ -1175,10 +1175,10 @@ This (expandable) command returns the values of some variables. Currently, the w
\item \verb+struct_counter+: This returns a number and works also if
only \pkg{tagpdf-base} has been loaded. It gives back the state of
- the absolute structure counter and so number of the last structure
+ the absolute structure counter and so the number of the last structure
that has been created. This can be used to detect if in a piece of
code there are structure commands. Be aware that this is a \LaTeX{}
- counter and so reset in some places.
+ counter and so is reset in some places.
\item \verb+mc_counter+: This returns a number and works also if only
\pkg{tagpdf-base} has been loaded. It gives back the state of the
@@ -1699,22 +1699,27 @@ The key-val list understands the following keys:
content and structures.
\item[\PrintKeyName{label}] This key sets a label by which one can
- refer to the structure. It is e.g. used by
- \cs{tag\_struct\_use:n} (where a real label is actually not needed
- as you can only use structures already defined), and by the |ref|
- key (which can refer to future structures). Internally the label
- name will start with \texttt{tagpdfstruct-} and it stores the two
+ refer to the structure. Currently the key writes a property whose
+ name starts with \texttt{tagpdfstruct-} to the aux-file with the two
attributes \texttt{tagstruct} (the structure number) and
- \texttt{tagstructobj} (the object reference).
+ \texttt{tagstructobj} (the object reference) but also stores the
+ name and the structure number into a prop for use in the current compilation.
+ The label is e.g. used by \cs{tag\_struct\_use:n} and by the |ref|
+ key (which can refer to future structures).
\item[\PrintKeyName{parent}] With the parent key one can choose another
parent. The value is a structure number which must refer to an
already existing, previously created structure. Such a structure
number can have been stored previously with \cs{tag\_get:n}, but one
can also use a label on the parent structure and then use
- \cs{ref\_value:nn}\verb+{tagpdfstruct-label}{tagstruct}+ to retrieve
+ \cs{property\_ref:nn}\verb+{tagpdfstruct-label}{tagstruct}+ to retrieve
it.
+ \item[\PrintKeyName{firstkid}] If this key is used the structure is
+ added at the left of the kids of the parent structure (if the structure is not stashed). This means that it will be the first kid of the structure (unless some
+ later structure uses the key too). This can be needed e.g. for a caption as
+ the PDF reference requires it to be the first or last kid of its structure.
+
\item[\PrintKeyName{alt}] This key inserts an \texttt{/Alt} value in the
dictionary of structure object, see section~\ref{sec:alt}. The value
is handled as verbatim string and hex encoded. The value will be
@@ -1852,7 +1857,9 @@ The key-val list understands the following keys:
structure. The value should be a comma separated list of
structure labels set with the |label| key.
e.g. |ref={label1,label2}|. It can be used more than once in the
- key/value argument and combines the references.
+ key/value argument and combines the references. See below
+ in section~\ref{sec:Refkey} for an extended discussion about the |/Ref|
+ array.
\item[\PrintKeyName{E}] This key sets the |/E| key, the expanded
form of an abbreviation or an acronym (I couldn't think of a
@@ -1877,6 +1884,25 @@ These commands insert a structure previously stashed away as kid into the
currently active structure. A structure should be used only once, if the
structure already has a parent you will get a warning.
+\subsubsection{Updating the \texttt{Ref} key in structures}\label{sec:Refkey}
+
+Structures that cross reference other structures, e.g. citation commands, table of
+content entries, footnote require often a \texttt{Ref} key. \texttt{Ref}
+can be added with the |ref| key of \cs{tagstructbegin} described above
+but as it is a task that often has to be done automatically in code
+there exist also a command that allows to extend the \texttt{Ref} key (and perhaps in future also other keys) later.
+This command allows to add the value, the target structure of the \texttt{Ref} key,
+with four methods: directly as object reference, through a label name set with the |label| key, through a destination name if a \cs{MakeLinkTarget} has been used in
+the target structure---this also works if hyperref has not been loaded---and through
+the structure number, which has been stored e.g. in a label.
+
+\begin{docCommands}
+ {
+ {doc name=tag_struct_gput:nnn,doc parameter=\marg{structurenumber}\marg{keyword}\marg{value}},
+ }\end{docCommands}
+
+The allowed \meta{keywords} are \texttt{ref}, \texttt{ref\_label} \texttt{ref\_dest}
+and \texttt{ref\_num}.
\subsubsection{Root structure}
@@ -2038,36 +2064,49 @@ or the output routine is called.
\begin{docCommands}
{
- {doc name=tag_stop:},
- {doc name=tag_start:},
- {doc name=tagstop},
- {doc name=tagstart},
- {doc name=tag_stop:n,doc parameter=\marg{label}},
- {doc name=tag_start:n,doc parameter=\marg{label}}
+ {doc name=tag_suspend:n,doc parameter=\marg{label}},
+ {doc name=tag_resume:n,doc parameter=\marg{label}}
}
\end{docCommands}
-This commands stop and start tagging in the current group by switching
+These commands suspend and resume tagging in the current group by switching
\emph{local} booleans. They also stop the increasing of the counters which
keep track of paragraphs if the correct wrapper commands are used.
Restarting tagging is normally only needed if groups can't be used and then
-must be done with care: |\tagstart| should normally only restart tagging if
+must be done with care: |\tag_resume:n| should normally only restart tagging if
the corresponding stop command actually stopped tagging. This is implement
through a local counter which keeps track of the level.
-The \meta{label} can be used to identify the command in debugging message.
+The \meta{label} can be used to identify the command in debugging message. The label is not expanded and so can for example be a single command token.
+
+The commands are the L3-layer versions of |\SuspendTagging| and |\ResumeTagging|
+and will be available in the kernel with the 2024 november release.
\begin{taglstlisting}
-\tag_stop:n{outer}
+\tag_suspend:n{\outercommand}
...
- \tag_stop:n{inner}
+ \tag_suspend:n{\innercommand}
...
- \tag_start:n{inner}
+ \tag_resume:n{\innercommand}
...
-\tag_start:n{outer}
+\tag_resume:n{\outercommand}
\end{taglstlisting}
+\begin{docCommands}
+ {
+ {doc name=tag_stop:},
+ {doc name=tag_start:},
+ {doc name=tagstop},
+ {doc name=tagstart},
+ {doc name=tag_stop:n,doc parameter=\marg{label}},
+ {doc name=tag_start:n,doc parameter=\marg{label}}
+ }
+\end{docCommands}
+
+These commands are now deprecated in favor or |\tag_suspend:n| and |\tag_resume:n|
+but are still provided for some time.
+
\subsection{Lazy and automatic tagging}\label{sec:lazy}
@@ -3029,7 +3068,11 @@ cases building the structure should now need only two or three
compilations. The new code requires a current pdfmanagement-testphase and
is then used automatically if the new engines are detected.
-\subsection{}
+\subsection{Changes in version 0.99f}
+
+Deprecated |\tag_start:|, |\tag_stop:|, |\tag_stop:n| and
+|\tag_start:n| in favor of |\tag_suspend:n| and |\tag_resume:n|.
+
\printbibliography[heading=bibintoc]
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
index a0287ad4b2c..994c7ac4c14 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/tcolorbox/CHANGES.md
@@ -22,6 +22,25 @@ and this project adheres to
+## [6.4.0] - 2024-09-07
+
+### Added
+- Libary `documentation`:
+ - `\refPkg` for referring packages on CTAN (issue #290)
+
+### Changed
+- Precautions for tikz options with square brackets (issue #284)
+- Usage warnings added for deprecated options `before example`, `after example`, and `graphical environment` (issue #284)
+- Documenation for TikZ Picture Option Keys adapted (issue #285)
+- Label `tcolorbox` added to LaTeX hooks (issue #287)
+- Libary `minted`: Minted option `envname` now supported by package `minted` directly (issue #2)
+
+### Fixed
+- Libary `minted`: `minted Warning: Macro \minted@def@optcl is deprecated with minted v3` (issue #2)
+- `tcolorbox-tutorial-poster.tex`: minted v3 seems to need escaped comma `\,` instead of `,` inside `breakafter`
+
+
+
## [6.3.0] - 2024-07-10
### Added
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/README.md b/Master/texmf-dist/doc/latex/tcolorbox/README.md
index e90e2bec18d..261fa152a29 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/README.md
+++ b/Master/texmf-dist/doc/latex/tcolorbox/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
+# The LaTeX package tcolorbox - version 6.4.0 (2024/09/27)
> Copyright (c) 2006-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
index 1e380d5559a..9420a8f1538 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
index cb8586e6ec1..c2cbaa79d93 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example-poster.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
+%% The LaTeX package tcolorbox - version 6.4.0 (2024/09/27)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
index 2d332523c2d..b78d77393e7 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
index 6f878d2f1dd..322c46c38d0 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
+%% The LaTeX package tcolorbox - version 6.4.0 (2024/09/27)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
index f81aee07830..e37dceddf96 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
index 7c6c769d1d8..ebc9b4e772a 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
+%% The LaTeX package tcolorbox - version 6.4.0 (2024/09/27)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
@@ -1373,7 +1373,7 @@ Our poster is finished now. Just go to the next page to see the final result.
\tcbinputlisting{standard jigsaw,size=minimal,toprule=0.5mm,bottomrule=0.5mm,boxsep=2mm,
colback=white,opacityback=0.75,listing only,
enforce breakable,tcb@poster@boxheight,before skip=-\interlineskip,height fixed for=all,
- minted options={tabsize=2,fontsize=\small,breaklines,breakafter={,]-}},
+ minted options={tabsize=2,fontsize=\small,breaklines,breakafter={\,\]-}},
listing file=tcolorbox-example-poster.tex}%
}
\end{tcbposter}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
index 00dc2198b22..288354d6b58 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.breakable.tex
@@ -7,7 +7,7 @@ The library is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{breakable}
\end{dispListing}
-This also loads the package |pdfcol|.
+This also loads the package \refPkg{pdfcol}.
\subsection{Technical Overview}
The library \mylib{breakable} supports the automatic breaking of a |tcolorbox|.
@@ -114,7 +114,7 @@ parameters. The differences are:
color changing commands, your color may not survive the break to the next box.
See the documentation for \refKey{/tcb/use color stack} for more information.
\item\tcbdocmarginnote{\tcbdocnew{2014-10-30}}
- The |perpage| option of the |footmisc| package is deliberately deactivated
+ The |perpage| option of the \refPkg{footmisc} package is deliberately deactivated
inside a breakable box since all footnotes are placed at the end
of the box (possibly far away from the reference point).
\item\tcbdocmarginnote{\tcbdocnew{2016-02-15}}
@@ -127,7 +127,7 @@ parameters. The differences are:
Lua\TeX\ version 0.95 changes the behavior of the basic |\vsplit| (a bug?!)
resulting in badly broken boxes. Thanks to Jeremy Engel,
the \mylib{breakable} library contains a patch for this which
- also loads the the |ifluatex| package.
+ also loads the the \refPkg{ifluatex} package.
\end{itemize}
@@ -315,7 +315,7 @@ The |break at| option can be used to insert better break points by hand.
color changing commands, your color may not survive the break to the next box.
For some engines, there is support for additional color stacks which
allow colors to survive breaks. Such an color stack can be activated
- by \refKey{/tcb/use color stack} with help of the |pdfcol| package.
+ by \refKey{/tcb/use color stack} with help of the \refPkg{pdfcol} package.
This can be done globally or per box.
\begin{marker}
Note that activating \refKey{/tcb/use color stack} inserts a color command with a \emph{whatsit}
@@ -326,9 +326,9 @@ The |break at| option can be used to insert better break points by hand.
\begin{itemize}
\item pdf\TeX: color stacks supported.
\item Lua\TeX: color stacks supported, but you should consider loading the
- |luacolor| package \emph{instead} which avoids the spacing problem.
+ \refPkg{luacolor} package \emph{instead} which avoids the spacing problem.
\item Xe\TeX: color stacks not supported (yet?). From hearsay,
- with the |fontspec| package, you may use |\addfontfeatures{Color=mycolor}|
+ with the \refPkg{fontspec} package, you may use |\addfontfeatures{Color=mycolor}|
to add a font color which survives the break.
\end{itemize}
If |pdfcol| cannot initialize an additional color stack for the used engine,
@@ -682,7 +682,7 @@ code which \emph{may} have to be adapted.
\begin{tcolorbox}[enhanced jigsaw,size=small,breakable,colback=yellow!10!white,
colframe=red!50!white,break at=3cm,height fixed for=all]
Unbreakable |tcolorbox|es can be used without special care inside a
-|multicols| environment from the |multicol| package \cite{mittelbach:multicol}.
+|multicols| environment from the \refPkg{multicol} package \cite{mittelbach:multicol}.
Since version 3.10, a breakable |tcolorbox| detects, if it is used inside
a |multicols| environment. But choosing break points for a breakable box
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
index c41134a6c84..34d6769fa47 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coremacros.tex
@@ -465,7 +465,7 @@ done in the same way, e.\,g. \myverb{\textit}, \myverb{\itshape}\\
or \myverb[brown]{\texttt}, \myverb[brown]{\ttfamily}.
\end{dispExample}
-The next example uses |\lstinline| from the |listings| package to
+The next example uses |\lstinline| from the \refPkg{listings} package to
typeset the verbatim content.
\begin{dispExample}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
index 62f3fa3c019..1a9ea467255 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -2640,7 +2640,7 @@ Lower part.
\begin{docTcbKey}{varwidth upper}{\colOpt{=\meta{length}}}{style, default \refKey{/tcb/width}}
This style places the upper part content into a |varwidth| environment.
- This style needs the |varwidth| package \cite{arseneau:2011a} to be loaded manually.
+ This style needs the \refPkg{varwidth} package \cite{arseneau:2011a} to be loaded manually.
The resulting box has a maximal width of \meta{length}.
This option is only senseful for a \refCom{tcbox}.
\begin{exdispExample*}{varwidth_upper}{sbs,lefthand ratio=0.6}
@@ -3268,7 +3268,7 @@ text after
\refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
(see note on page~\pageref{subsec:surroundings}).\par
Sets the keys |before| and |after| to values which are
- recommended, if the package |parskip| \emph{is} used and there is no better
+ recommended, if the package \refPkg{parskip} \emph{is} used and there is no better
idea for |before| and |after|. This is similar to:
\begin{dispListing}
\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
@@ -3281,7 +3281,7 @@ text after
\refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
(see note on page~\pageref{subsec:surroundings}).\par
Sets the keys |before| and |after| to values which are
- recommended, if the package |parskip| is \emph{not} used and there is no better
+ recommended, if the package \refPkg{parskip} is \emph{not} used and there is no better
idea for |before| and |after|. This is similar to:
\begin{dispListing}
\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
@@ -3293,13 +3293,13 @@ text after
This options is considered to be superseded by
\refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
(see note on page~\pageref{subsec:surroundings}).\par
- Tries to detect the usage of the package |parskip| and sets
+ Tries to detect the usage of the package \refPkg{parskip} and sets
the keys |before| and |after| accordingly. Actually, the following is done:
\begin{itemize}
\item If the length of |\parskip| is greater than |0pt| at the beginning of the document,
- \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}.
+ \refKey{/tcb/parskip} is executed. Here, the usage of package \refPkg{parskip} is \emph{assumed}.
\item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document,
- \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}.
+ \refKey{/tcb/noparskip} is executed. Here, the absence of package \refPkg{parskip} is \emph{assumed}.
\end{itemize}
\end{docTcbKey}
@@ -4315,7 +4315,7 @@ related operations which do not produce visible text.
\item Labels are ensured to reference the correct page number.
\item The \meta{code} is executed only once even during fitting operations for
title and box content.
-\item In combination with the |hyperref| package, the hyper anchor is set
+\item In combination with the \refPkg{hyperref} package, the hyper anchor is set
to the upper left corner of the |tcolorbox|, i.\,e.\ links inside the pdf document
will jump to the box pleasantly.
\item Since the \meta{code} is executed inside a \TeX\ group, only global
@@ -4343,8 +4343,8 @@ Note that this option is not getting reset by \refKey{/tcb/reset}.
\begin{docTcbKey}[][doc new=2023-02-08]{label is zlabel}{}{no value, initially unset}
Sets |\zlabel| as labelling for |tcolorbox| (global or per box).
When \refKey{/tcb/label} and friends are used, the underlying labeling macro is |\zlabel|.
-This needs the |zref| package \cite{oberdiek:zref} or packages building upon |zref| to be loaded.
-References can be made by |\zref|. If the |zref-clever| package \cite{barros:zref-clever} is loaded,
+This needs the \refPkg{zref} package \cite{oberdiek:zref} or packages building upon \refPkg{zref} to be loaded.
+References can be made by |\zref|. If the \refPkg{zref-clever} package \cite{barros:zref-clever} is loaded,
|\zcref|, |\zcpageref|, and similar macros can be applied.
Note that this option is not getting reset by \refKey{/tcb/reset}.
\end{docTcbKey}
@@ -4362,7 +4362,7 @@ from page \pageref{sec:numberedboxes}, e.\,g.\ \refKey{/tcb/new/auto counter}.
\begin{docTcbKey}[][doc new=2014-11-28]{phantomlabel}{=\meta{marker}}{no default, initially unset}
Equivalent to \refKey{/tcb/label} for an \emph{unnumbered} box.
-A |\phantomsection| from the package |hyperref| \cite{rahtz:hyperref} is used to set a correct
+A |\phantomsection| from the package \refPkg{hyperref} \cite{rahtz:hyperref} is used to set a correct
hyperlink target.
This is not needed and should typically not be used for a numbered box.
\end{docTcbKey}
@@ -4389,7 +4389,7 @@ from page \pageref{sec:numberedboxes}.
This option has a different meaning based upon the chosen labeling mechanism.
\begin{itemize}
\item If \refKey{/tcb/label is label} is active:\par
- The option key \refKey{/tcb/label type} can be used only in conjunction with the |cleveref| package
+ The option key \refKey{/tcb/label type} can be used only in conjunction with the \refPkg{cleveref} package
\cite{cubitt:2018a} which has to be loaded separately.
\meta{type} has to be a cross-reference type \emph{known} to |cleveref|
like |theorem|, |algorithm|, |result|, etc. References made with |cleveref|
@@ -4397,7 +4397,7 @@ This option has a different meaning based upon the chosen labeling mechanism.
errors, if |cleveref| is not loaded.
For an example, see \Vref{theo:meanvaluetheorem}.
\item If \refKey{/tcb/label is zlabel} is active:\par
- The option key \refKey{/tcb/label type} can be used only in conjunction with the |zref-clever| package
+ The option key \refKey{/tcb/label type} can be used only in conjunction with the \refPkg{zref-clever} package
\cite{barros:zref-clever}
which has to be loaded separately.
\meta{type} has to be a cross-reference type \emph{known} to |zref-clever|.
@@ -4419,9 +4419,9 @@ Removes a \refKey{/tcb/label type}, if set before.
\clearpage
\begin{docTcbKey}[][doc new and updated={2016-06-22}{2023-02-08}]{nameref}{=\meta{text}}{no default, initially unset}
-If the |nameref| package is loaded, the given \meta{text} is used for
+If the \refPkg{nameref} package is loaded, the given \meta{text} is used for
corresponding |\nameref| macros.
-If the |zref-titleref| package is loaded, the given \meta{text} is used to
+If the \refPkg{zref-titleref} package is loaded, the given \meta{text} is used to
set the reference text for |\ztitleref|.
Typically, the \meta{text} will be chosen
to be identical or nearly identical to the one for \refKey{/tcb/title}.
@@ -4454,7 +4454,7 @@ The most likely use case is to set a \emph{short title} for the
\clearpage
\begin{docTcbKey}[][doc new=2017-02-03]{hypertarget}{=\meta{marker}}{no default, initially unset}
-A |\hypertarget| from the package |hyperref| \cite{rahtz:hyperref} is used to
+A |\hypertarget| from the package \refPkg{hyperref} \cite{rahtz:hyperref} is used to
create an internal link of an anchor \meta{marker}.
This \meta{marker} can be referenced by |\hyperlink| or
\refKey{/tcb/hyperlink}.
@@ -4473,7 +4473,7 @@ Click me to jump to Box B.
\begin{docTcbKey}[][doc new=2017-02-10]{bookmark}{=\meta{text}}{no default, initially unset}
- Sets a PDF bookmark with the given \meta{text}, if the package |bookmark| \cite{oberdiek:bookmark}
+ Sets a PDF bookmark with the given \meta{text}, if the package \refPkg{bookmark} \cite{oberdiek:bookmark}
is loaded. This bookmark is set with an automated destination (the current box)
and is set one level below the current bookmark level.
\begin{dispExample*}{sbs,lefthand ratio=0.7}
@@ -4490,7 +4490,7 @@ to see the bookmark.
\begin{docTcbKey}[][doc new=2017-02-10]{bookmark*}{=\marg{options}\marg{text}}{no default, initially unset}
Identical to \refKey{/tcb/bookmark}, but additional \meta{options}
- from the package |bookmark| \cite{oberdiek:bookmark} can be given.
+ from the package \refPkg{bookmark} \cite{oberdiek:bookmark} can be given.
\begin{dispExample*}{sbs,lefthand ratio=0.7}
% \usepackage{bookmark}%
\begin{tcolorbox}[colback=red!10,colframe=red!50!black,
@@ -4692,7 +4692,7 @@ It is precise only, if \refKey{/tcb/check odd page} was set.
See \Fullref{sec:external} for the \mylib{external} library of |tcolorbox|.
\end{marker}
-If the \emph{externalization} library of the \texttt{tikz} package is used,
+If the \emph{externalization} library of the \refPkg{tikz} package is used,
a |tcolorbox| could trigger the externalization process which will arise
a compilation error.
@@ -4734,7 +4734,7 @@ inside the current \TeX\ group and is not affected by \refKey{/tcb/reset}.
it may be used inside the option list of a |tcolorbox| to set the
externalization \meta{file name} for the first |tikzpicture| which is discovered
\emph{inside} the box content.
- The package |tikz| \cite{tantau:tikz_and_pgf} or the library \mylib{skins} has to be loaded to use this option.
+ The package \refPkg{tikz} \cite{tantau:tikz_and_pgf} or the library \mylib{skins} has to be loaded to use this option.
Additionally, |\usetikzlibrary{external}| has to be used.
\end{docTcbKey}
@@ -4742,7 +4742,7 @@ inside the current \TeX\ group and is not affected by \refKey{/tcb/reset}.
Convenience option which calls |/tikz/external/remake next|. Typically,
it may be used inside the option list of a |tcolorbox| to force the remake
of the first |tikzpicture| which is discovered \emph{inside} the box content.
- The package |tikz| \cite{tantau:tikz_and_pgf} or the library \mylib{skins} has to be loaded to use this option.
+ The package \refPkg{tikz} \cite{tantau:tikz_and_pgf} or the library \mylib{skins} has to be loaded to use this option.
Additionally, |\usetikzlibrary{external}| has to be used.
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
index 45282f3c468..939c5d4dbec 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
@@ -5,9 +5,9 @@
\tcbset{external/prefix=external/documentation_}%
This library has the single purpose to support \LaTeX\ package documentations
like this one. Actually, the visual nature follows the approach from
-Till Tantau's |pgf| \cite{tantau:tikz_and_pgf} documentation.
+Till Tantau's \refPkg{pgf} \cite{tantau:tikz_and_pgf} documentation.
Typically, this library is assumed to be used in conjunction with the
-class |ltxdoc| or alike.
+class \refPkg{ltxdoc} or alike.
Denis Bitouz\'e, Muzimuzhi, and many others provided very valuable input for this library.
The library is loaded by a package option or inside the preamble by:
@@ -19,17 +19,17 @@ the library \mylib{skins}, see \Vref{sec:skins},
the library \mylib{raster}, see \Vref{sec:raster},
the library \mylib{listings}, see \Vref{sec:listings},
and a bunch of packages, namely
-|makeidx|, |marginnote|, |refcount|, and |hyperref|.
-The packages |pifont| and |marvosym| should be installed for some symbols, but
+\refPkg{makeidx}, \refPkg{marginnote}, \refPkg{refcount}, and \refPkg{hyperref}.
+The packages \refPkg{pifont} and \refPkg{marvosym} should be installed for some symbols, but
need not to be loaded.
\begin{marker}
-The package |makeidx| is loaded only, if \docAuxCommand*{printindex} is
-\emph{not} already defined. Therefore, one can include an alternative to |makeidx| like
-|imakeidx| \emph{before} the library |documentation| is used.
+The package \refPkg{makeidx} is loaded only, if \docAuxCommand*{printindex} is
+\emph{not} already defined. Therefore, one can include an alternative to \refPkg{makeidx} like
+\refPkg{imakeidx} \emph{before} the library |documentation| is used.
\end{marker}
\begin{marker}
-The package |marginnote| is loaded only, if \docAuxCommand*{marginnote} is
+The package \refPkg{marginnote} is loaded only, if \docAuxCommand*{marginnote} is
\emph{not} already defined.
\end{marker}
\begin{marker}
@@ -47,7 +47,7 @@ For UTF-8 support load (ignore this when using Xe\LaTeX):
\tcbuselibrary{listingsutf8,documentation}
\end{dispListing}
-For |minted| \cite{poore:minted} support, load:
+For \refPkg{minted} \cite{poore:minted} support, load:
\begin{dispListing}
\tcbuselibrary{documentation,minted}
\tcbset{listing engine=minted}
@@ -704,6 +704,21 @@ Some pages back, one can see \refAuxcs{fooaux} as an example.
\end{docCommand}
+\begin{docCommand}[doc new=2024-09-18]{refPkg}{\oarg{ctanname}\marg{name}}
+ References a package \meta{name} on \href{https://ctan.org}{CTAN} with
+ hyperlink \mbox{|https://ctan.org/pkg/|\meta{name}}.
+ Using the option \meta{ctanname} creates the hyperlink
+ \mbox{|https://ctan.org/pkg/|\meta{ctanname}}.
+\begin{dispExample}
+Hyperlinks are created with help of the \refPkg{hyperref} package.\par
+The package \refPkg[frankenstein]{dialogue} is part of the
+\refPkg{frankenstein} bundle of packages.
+\end{dispExample}
+\end{docCommand}
+
+
+\clearpage
+
\begin{docCommand}{colDef}{\marg{text}}
Sets \meta{text} with the command color, see \refKey{/tcb/color command}.
\begin{dispExample}
@@ -718,8 +733,6 @@ This is my \colOpt{text}.
\end{dispExample}
\end{docCommand}
-\clearpage
-
\begin{docCommand}[doc new=2019-09-18]{colFade}{\marg{text}}
Sets \meta{text} with the fade color, see \refKey{/tcb/color fade}.
\begin{dispExample}
@@ -730,7 +743,7 @@ This is my \colFade{text}.
\begin{docCommand}[doc new=2014-09-19]{tcbdocmarginnote}{\oarg{options}\marg{text}}
Creates a |tcolorbox| note with the given \meta{text} inside the margin using
- the |marginnote| package. The style of the |tcolorbox| is predefined and can be
+ the \refPkg{marginnote} package. The style of the |tcolorbox| is predefined and can be
altered by \refKey{/tcb/doc marginnote} and the given \meta{options}.
\begin{dispExample}
Some text\tcbdocmarginnote{Note A}
@@ -1313,7 +1326,7 @@ keys to insert code before (or after) the description texts.
\end{docTcbKey}
\begin{docTcbKey}{documentation listing options}{=\meta{key list}}{no default,\\\hspace*{\fill} initially |style=tcbdocumentation|}
- Sets the options from the package |listings| \cite{hoffmann:listings}.
+ Sets the options from the package \refPkg{listings} \cite{hoffmann:listings}.
They are used inside \refEnv{dispExample} and \refEnv{dispListing} to typeset
the listings. Note that this is not identical to the key
\refKey{/tcb/listing options} which is used for \enquote{normal} listings.\\
@@ -1323,14 +1336,14 @@ keys to insert code before (or after) the description texts.
\begin{docTcbKey}{documentation listing style}{=\meta{listing style}}{no default, initially |tcbdocumentation|}
Abbreviation for |documentation listing options={style=...}|.
This key sets a \meta{style}
- for the |listings| package, see \cite{hoffmann:listings}.
+ for the \refPkg{listings} package, see \cite{hoffmann:listings}.
Note that this is not identical to the key
\refKey{/tcb/listing style} which is used for \enquote{normal} listings.\\
Used for \refKey{/tcb/listing engine}|=listings| only.
\end{docTcbKey}
\begin{docTcbKey}{documentation minted options}{=\meta{key list}}{no default,\\\hspace*{\fill} initially |tabsize=2,fontsize=\textbackslash small|}
- Sets the options from the package |minted| \cite{poore:minted}
+ Sets the options from the package \refPkg{minted} \cite{poore:minted}
which are used during typesetting of the listing, if used.
Note that this is not identical to the key
\refKey{/tcb/minted options} which is used for \enquote{normal} listings.\\
@@ -1339,7 +1352,7 @@ keys to insert code before (or after) the description texts.
\begin{docTcbKey}{documentation minted style}{=\meta{key list}}{no default, initially unset}
Sets a \meta{style} known to |Pygments| \cite{pygments:web} for
- the package |minted| \cite{poore:minted}, if used.
+ the package \refPkg{minted} \cite{poore:minted}, if used.
Note that this is not identical to the key
\refKey{/tcb/minted style} which is used for \enquote{normal} listings.\\
Used for \refKey{/tcb/listing engine}|=minted| only.
@@ -1347,7 +1360,7 @@ keys to insert code before (or after) the description texts.
\begin{docTcbKey}[][doc new=2017-04-24]{documentation minted language}{=\meta{programming language}}{no default, initially |latex|}
Sets a \meta{programming language} known to |Pygments| \cite{pygments:web}
- for the package |minted| \cite{poore:minted}, if used.
+ for the package \refPkg{minted} \cite{poore:minted}, if used.
Note that this is not identical to the key
\refKey{/tcb/minted language} which is used for \enquote{normal} listings.\\
Used for \refKey{/tcb/listing engine}|=minted| only.
@@ -1383,7 +1396,7 @@ Sets \meta{macro} as formatter for page references like the
reference to \refEnv{tcolorbox}.
The default setting puts the page reference in a |\textsuperscript|.
It may be changed to |\fakesuperscript| to cope with superiors problems
-in combination with the |realscripts| package or just otherwise for user customization.
+in combination with the \refPkg{realscripts} package or just otherwise for user customization.
\end{docTcbKeys}
@@ -1420,11 +1433,11 @@ in combination with the |realscripts| package or just otherwise for user customi
\item\docValue{pgfchapter}: The index is formatted like in the |pgf| documentation (as a chapter).
\item\docValue{pgf}: Alias for |pgfsection|.
\item\docValue{doc}: The index is assumed to be formatted by |doc| or |ltxdoc|. The usage of |makeindex|
- with |-s gind.ist| is assumed. The package |hypdoc| has to be loaded
+ with |-s gind.ist| is assumed. The package \refPkg{hypdoc} has to be loaded
\emph{before} |tcolorbox|. Only a limited set of customizations will
work! This option cannot be unset when used!
\item\docValue{off}: The index is not formatted by |tcolorbox|. Use this, if
- the index is formatted by other package like |imakeidx|.
+ the index is formatted by other package like \refPkg{imakeidx}.
\end{itemize}
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
index 62c982c2d3e..d60af1c9861 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.external.tex
@@ -16,7 +16,7 @@ The whole procedure saves compilation time, if such a snippet is costly to
compile but needs to compile just once or very seldom.
There are very good alternatives to this library. One should consider
-the |standalone| package or the \tikzname\ externalization library instead.
+the \refPkg{standalone} package or the \tikzname\ externalization library instead.
The \mylib{external} library is something in between and can be seen as
poor man variant of the \tikzname\ externalization library.
@@ -619,14 +619,14 @@ or
name points to another subdirectory than |external|, this has to be
adapted.
-\item\textbf{I use the |minted| package and I get a cache directory for
+\item\textbf{I use the \refPkg{minted} package and I get a cache directory for
every externalized snippet.}\\
To avoid this problem, there are several ways.
\begin{itemize}
\item If you do not need |minted| inside the snippet code, you may use
|\usepackage{minted}| \emph{after} \refCom{tcbEXTERNALIZE}
or use \refCom{tcbifexternal} to switch |minted| off for the external code.
- If |minted| is already included by another package, add the following to
+ If \refPkg{minted} is already included by another package, add the following to
your preamble:
\begin{dispListing}
\tcbset{external/PassOptionsToPackage={draft}{minted}}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
index 909f7f4ac0f..dfce46b546f 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.filling.tex
@@ -16,7 +16,7 @@ See \Vref{sec:skins} for the documentation of all other options of the \mylib{sk
\begin{marker}
Up to version 5.1.1 (2022/06/24) of |tcolorbox|, \tikzname\ image and picture fill extensions
were documented here. These extensions are now separate \tikzname\ libraries
-and part of the |tikzfill| package where they are documented now.
+and part of the \refPkg{tikzfill} package where they are documented now.
\end{marker}
@@ -107,7 +107,7 @@ The following auxiliary macro is defined by the \mylib{skins} library.
\begin{docCommand}[doc new and updated={2016-02-03}{2023-02-28}]{tcbhypernode}{\marg{macro}\marg{node}}
% Sets the east-to-west dimension of the given \meta{node}
% to the \TeX\ \meta{register}.
- Applies a hyperlink creating \meta{macro} from the package |hyperref| \cite{rahtz:hyperref}
+ Applies a hyperlink creating \meta{macro} from the package \refPkg{hyperref} \cite{rahtz:hyperref}
to an existing |tikz| \meta{node}. \refCom{tcbhypernode} can only
be used inside a |tikzpicture| environment.
The last argument of the \meta{macro} is to be omitted and should stand
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
index fe441d48213..a85091895ea 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.graphics.tex
@@ -132,7 +132,7 @@ specify a file system \meta{directory} where the image files are located.
\end{dispListing}
\smallskip
\begin{marker}
-The |\graphicspath| macro from the |graphics| package is superior to this option.
+The |\graphicspath| macro from the \refPkg{graphics} package is superior to this option.
\refKey{/tcb/graphics directory} may be used especially for
\refCom{tcbincludepdf}.
\end{marker}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
index b068d58eaf7..8d0c7459b26 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
@@ -173,7 +173,7 @@ need to be set inside the preamble.
\end{marker}
\begin{newTcbKey}[][doc updated=2014-12-01]{crefname}{=\marg{singular}\marg{plural}}{no default, initially unset}
- This option key can be used only in conjunction with the |cleveref| package
+ This option key can be used only in conjunction with the \refPkg{cleveref} package
\cite{cubitt:2018a} which has to be loaded separately.
It creates a cross-reference type for the new |tcolorbox|'es, where the
lowercase \meta{singular} and \meta{plural} forms of the cross-reference are given.
@@ -183,7 +183,7 @@ need to be set inside the preamble.
\begin{newTcbKey}[][doc updated=2014-12-01]{Crefname}{=\marg{singular}\marg{plural}}{no default, initially unset}
- This option key can be used only in conjunction with the |cleveref| package
+ This option key can be used only in conjunction with the \refPkg{cleveref} package
\cite{cubitt:2018a} which has to be loaded separately.
It creates a cross-reference type for the new |tcolorbox|'es, where the
uppercase \meta{singular} and \meta{plural} forms of the cross-reference are given.
@@ -224,7 +224,7 @@ Feasible values for \meta{name} are:
\item\docValue{figures}: blend into the standard |figure| environment.
\item\docValue{tables}: blend into the standard |table| environment.
\item\docValue{listings}: blend into the standard |lstlisting| environment
- of the package |listings| \cite{hoffmann:listings}.
+ of the package \refPkg{listings} \cite{hoffmann:listings}.
\begin{marker}
Note that |blend into=listings| can only be used in the document content
or, preferably, inside a |\AtBeginDocument| clause! Using it without
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
index 0d76c0afbb3..5f420895f94 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.intro.tex
@@ -81,7 +81,7 @@ The following keys are used inside |\tcbuselibrary| respectively
|\usepackage| without the key tree path |/tcb/library/|.
\begin{docTcbKey}[library]{skins}{}{\mylib{skins}}
- Loads the package |tikz| \cite{tantau:tikz_and_pgf} and provides additional
+ Loads the package \refPkg{tikz} \cite{tantau:tikz_and_pgf} and provides additional
styles (skins) for the appearance of the colored boxes; see
Section~\ref{sec:skins} from page~\pageref{sec:skins}.
\end{docTcbKey}
@@ -98,13 +98,13 @@ The following keys are used inside |\tcbuselibrary| respectively
\end{docTcbKey}
\begin{docTcbKey}[library]{listings}{}{\mylib{listings}}
- Loads the package |listings| \cite{hoffmann:listings} and provides additional
+ Loads the package \refPkg{listings} \cite{hoffmann:listings} and provides additional
macros for typesetting listings which are described in Section~\ref{sec:listings}
from page~\pageref{sec:listings}.
\end{docTcbKey}
\begin{docTcbKey}[library]{listingsutf8}{}{\mylib{listingsutf8}}
- Loads the packages |listings| \cite{hoffmann:listings} and
+ Loads the packages \refPkg{listings} \cite{hoffmann:listings} and
|listingsutf8| \cite{oberdiek:listingsutf8} for UTF-8 support.
This is a variant of the library \mylib{listings}
and is described in Section \ref{sec:listings}
@@ -112,7 +112,7 @@ The following keys are used inside |\tcbuselibrary| respectively
\end{docTcbKey}
\begin{docTcbKey}[library]{minted}{}{\mylib{minted}}
- Loads the package |minted| \cite{poore:minted} to
+ Loads the package \refPkg{minted} \cite{poore:minted} to
typeset listings with the |Pygments| \cite{pygments:web} tool,
also see \Vref{sec:listings}.
\end{docTcbKey}
@@ -151,7 +151,7 @@ The following keys are used inside |\tcbuselibrary| respectively
\clearpage
\begin{docTcbKey}[library]{xparse}{}{\mylib{xparse}}
- Loads the package |xparse| and is considered a legacy library kept for compatibility;
+ Loads the package \refPkg{xparse} and is considered a legacy library kept for compatibility;
see Section~\ref{sec:xparse} from page~\pageref{sec:xparse}.
\end{docTcbKey}
@@ -178,7 +178,7 @@ The following keys are used inside |\tcbuselibrary| respectively
\begin{docTcbKey}[library]{most}{}{style, no value}
Loads all libraries except \mylib{minted}, \mylib{documentation}, and \mylib{xparse}.
Use this shortcut, if you want to use all features of |tcolorbox|
- with exception of using the |minted| package and using
+ with exception of using the \refPkg{minted} package and using
the specialized \mylib{documentation} library.
\end{docTcbKey}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
index c6e56dcdfab..59fbe4390e9 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.listings.tex
@@ -27,12 +27,12 @@ the settings of a previous loaded library. A library is never loaded twice.
\subsubsection{Loading \mylib{listings}}
-This library uses the package |listings| \cite{hoffmann:listings} to typeset
+This library uses the package \refPkg{listings} \cite{hoffmann:listings} to typeset
listings. It is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{listings}
\end{dispListing}
-This also loads the package |listings| \cite{hoffmann:listings}.
+This also loads the package \refPkg{listings} \cite{hoffmann:listings}.
The \refKey{/tcb/listing engine} is set to |listings| by the library.
To reactivate this setting, if overwritten by other libraries, use
@@ -47,15 +47,15 @@ Therefore, loading this library is automatically replaced by loading
\mylib{listings} only, if pdf\LaTeX\ is \emph{not} used.
\end{marker}
To extend |listings| for UTF-8 encoded sources, you can use the support from
-the package |listingsutf8| \cite{oberdiek:listingsutf8} by loading the library
+the package \refPkg{listingsutf8} \cite{oberdiek:listingsutf8} by loading the library
variant \mylib{listingsutf8}.
\begin{dispListing}
\tcbuselibrary{listingsutf8}
\tcbset{listing utf8=latin1}% optional; `latin1' is the default.
\end{dispListing}
This also loads the library \mylib{listings}
-and the packages |listings| \cite{hoffmann:listings}
-and |listingsutf8| \cite{oberdiek:listingsutf8}.
+and the packages \refPkg{listings} \cite{hoffmann:listings}
+and \refPkg{listingsutf8} \cite{oberdiek:listingsutf8}.
The \refKey{/tcb/listing engine} is set to |listings| by the library.
To reactivate this setting, if overwritten by other libraries, use
@@ -66,19 +66,27 @@ To reactivate this setting, if overwritten by other libraries, use
\clearpage
\subsubsection{Loading \mylib{minted}}
-This library uses the package |minted| \cite{poore:minted} to typeset
+This library uses the package \refPkg{minted} \cite{poore:minted} to typeset
listings. It is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{minted}
\end{dispListing}
-This also loads the package |minted| \cite{poore:minted}.
+This also loads the package \refPkg{minted} \cite{poore:minted}.
\begin{marker}
-The |minted| package uses the external tool |Pygments| \cite{pygments:web}
+To use the legacy version v2.9 of \refPkg{minted}, write
+\begin{dispListing}
+\usepackage{minted2}
+\end{dispListing}
+\emph{before} loading the library!
+\end{marker}
+
+\begin{marker}
+The \refPkg{minted} package uses the external tool |Pygments| \cite{pygments:web}
to apply syntax highlighting. It has to be installed and set up, before the
library can be used, see \cite{poore:minted} and \cite{pygments:web}.
The \refEnv{tcolorbox} library \mylib{minted} does not work, if the package
-|minted| \cite{poore:minted} does not work.
+\refPkg{minted} \cite{poore:minted} does not work.
\end{marker}
The \refKey{/tcb/listing engine} is set to |minted| by the library.
@@ -340,7 +348,7 @@ This is my
\clearpage
\begin{marker}
-With date of 2018-05-12, the |xparse| \cite{latexproject:xparse} package
+With date of 2018-05-12, the \refPkg{xparse} \cite{latexproject:xparse} package
changed the argument collection process (now part of the \LaTeX\ kernel).
Spaces are ignored which leads to a serious change for listing environments
ending with an optional argument like \verb+O{}+.
@@ -471,7 +479,7 @@ Note that the following code uses \verb+!O{}+ now.
\subsection{Option Keys of the \mylib{listings} Library}\label{sec:speclistingkeys}
\begin{docTcbKey}{listing options}{=\meta{key list}}{no default, initially |style=tcblatex|}
- Sets the options from the package |listings| \cite{hoffmann:listings}
+ Sets the options from the package \refPkg{listings} \cite{hoffmann:listings}
which are used during typesetting of the listing.
For \LaTeX\ listings, there is a predefined |listings| style named |tcblatex|
which can be used.
@@ -487,7 +495,7 @@ and in compiled form. Additionally, we use line numbers here.
\begin{docTcbKey}{no listing options}{}{no value, initially unset}
Abbreviation for |listing options={}|.
- This removes all options for the |listings| package.
+ This removes all options for the \refPkg{listings} package.
This includes the \refEnv{tcblisting} standard style |tcblatex| and the encoding presets.
Use this option, if you want to set the |listings| options outside of \refEnv{tcblisting}, e.\,g.\ globally in
the preamble.
@@ -501,7 +509,7 @@ All \textit{listings} options removed.
\begin{docTcbKey}{listing style}{=\meta{style}}{no default, initially |tcblatex|}
Abbreviation for |listing options={style=...}|. This key sets a \meta{style}
- for the |listings| package, see \cite{hoffmann:listings}.
+ for the \refPkg{listings} package, see \cite{hoffmann:listings}.
For \LaTeX, there is a predefined style named |tcblatex|.
\begin{dispExample}
\begin{tcblisting}{colback=red!5!white,colframe=red!75!black,
@@ -515,14 +523,14 @@ Here, we use the predefined style.
\begin{docTcbKey}{listing inputencoding}{=\meta{encoding}}{no default, initially \texttt{\cs inputencodingname}}
Sets the input encoding value for the predefined listing style |tcblatex|
and |tcbdocumentation| from the library \mylib{documentation}.
- The initial value is derived from the package |inputenc| if used.
+ The initial value is derived from the package \refPkg{inputenc} if used.
\end{docTcbKey}
\begin{docTcbKey}{listing remove caption}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
-If set to |true|, some part of the caption building code of the |listings| package
-is silenced to prevent some unwanted interaction with the |hyperref| package resulting
+If set to |true|, some part of the caption building code of the \refPkg{listings} package
+is silenced to prevent some unwanted interaction with the \refPkg{hyperref} package resulting
in additional vertical space.
-If set to |false|, the |listings| package code is kept unchanged.
+If set to |false|, the \refPkg{listings} package code is kept unchanged.
Note that listings outside \refEnv{tcblisting} and
\refCom{tcbinputlisting} are always processed normally.
Typically, a user is not expected to use this key at all.
@@ -530,7 +538,7 @@ Typically, a user is not expected to use this key at all.
\begin{docTcbKey}{every listing line}{=\meta{text}}{no default, initially unset/empty}
Inserts some \meta{text} to the begin of every line of a listing.
-Note that this a hack of the |listings| package code. This may become unusable
+Note that this a hack of the \refPkg{listings} package code. This may become unusable
or superfluous in the future.
\begin{dispExample}
\newtcblisting{commandshell}{colback=black,colupper=white,colframe=yellow!75!black,
@@ -584,14 +592,14 @@ all options from \Vref{sec:speclistingkeys} are applicable.
\begin{docTcbKey}{listing utf8}{=\meta{one-byte-encoding}}{style, no default, initially |latin1|}
Abbreviation for using \refKey{/tcb/listing inputencoding}
- together with UTF-8 support from the package |listingsutf8| \cite{oberdiek:listingsutf8}.
+ together with UTF-8 support from the package \refPkg{listingsutf8} \cite{oberdiek:listingsutf8}.
This option is available only for the library variant \mylib{listingsutf8}.
The \meta{one-byte-encoding} is one of
the applicable encodings from \cite{oberdiek:listingsutf8}, e.\,g.\ |latin1|
which is the default.\par
Be aware that this means restriction to this specific \meta{one-byte-encoding}:
e.\,g.\ |latin1| comprises umlauts and other accented characters, but not
- the Euro sign. If you want to use the |listings| package \emph{and} \flqq real\frqq\
+ the Euro sign. If you want to use the \refPkg{listings} package \emph{and} \flqq real\frqq\
UTF-8 source code, then do \emph{not} use \mylib{listingsutf8} but \mylib{listings}
with
\refKey{/tcb/listing inputencoding}|=utf8|
@@ -623,7 +631,7 @@ Sets a \meta{programming language} known to |Pygments| \cite{pygments:web}.
\begin{docTcbKey}[][doc updated={2021-12-15}]{minted options}{=\meta{key list}}{no default, initially
\linebreak see \refKey{/tcb/default minted options}}
- Sets the options from the package |minted| \cite{poore:minted}
+ Sets the options from the package \refPkg{minted} \cite{poore:minted}
which are used during typesetting of the listing.
Also see \refKey{/tcb/minted options app} and \refKey{/tcb/minted options pre}.
\begin{dispExample}
@@ -652,7 +660,7 @@ Sets a \meta{programming language} known to |Pygments| \cite{pygments:web}.
\clearpage
\begin{docTcbKey}[][doc new={2021-12-15}]{default minted options}{=\meta{key list}}{no default, initially
|tabsize=2,fontsize=\textbackslash small,|\linebreak|breaklines,autogobble|}
- Sets the options from the package |minted| \cite{poore:minted}
+ Sets the options from the package \refPkg{minted} \cite{poore:minted}
which are used during typesetting of the listing, if
\refKey{/tcb/minted options} are \emph{not} used. The intended use is
inside the preamble to change the default behavior.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex
index 085d789a36a..be79860d6bd 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.poster.tex
@@ -9,7 +9,7 @@ with |tcolorbox|es.
A \refEnv{tcbposter} is a |tikzpicture| where |tcolorbox|es can be
placed in a column oriented manner using \refCom{posterbox} commands.
-This base concept is more or less copied from the great |baposter| package.
+This base concept is more or less copied from the great \refPkg{baposter} package.
The \mylib{raster} library, see \Fullref{sec:raster}, can produce
similar looking results and may be more appropriate
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
index 7bc44882c8e..df0d9002466 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
@@ -36,6 +36,7 @@
\tcbuselibrary{most,documentation}
\tcbifexternal{}{%
+ \IfFileExists{minted2.sty}{\RequirePackage{minted2}}{}% Avoid latexmk problems (endless loop)
\tcbuselibrary{minted}%
\tcbset{listing engine=listings,initialize@reset={listing engine=listings}}%
}
@@ -204,7 +205,7 @@
docCounter,docLength,
meta,marg,
oarg,
- refCom,refEnv,refKey,
+ refCom,refEnv,refKey,refPathOperation,refAux,refAuxcs,refPkg,
sarg,
tcbmakedocSubKey,tcbdocmarginnote,tcbdocnew,tcbdocupdated,
% skins
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
index bbf946c9fca..108e0245d75 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
@@ -7,7 +7,7 @@ The library is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{skins}
\end{dispListing}
-This also loads the package |tikzfill.image|.
+This also loads the package \refPkg[tikzfill]{tikzfill.image}.
In the following, general settings and options of the library are
documented.
@@ -1012,7 +1012,7 @@ The text is centered by default
\begin{docTcbKey}{varwidth boxed title}{\colOpt{=\meta{length}}}{initially unset}
The title text content is captured with a |varwidth| environment with a width of \meta{length}.
-This style needs the |varwidth| package \cite{arseneau:2011a} to be loaded manually.
+This style needs the \refPkg{varwidth} package \cite{arseneau:2011a} to be loaded manually.
By default, the resulting boxed title is somewhat smaller than the main box.
\begin{exdispExample*}{varwidth_boxed_title}{sbs,lefthand ratio=0.66}
% \usepackage{varwidth}
@@ -1035,7 +1035,7 @@ By default, the resulting boxed title is somewhat smaller than the main box.
\begin{docTcbKey}{varwidth boxed title*}{\colOpt{=\meta{length}}}{initially unset}
The title text content is captured with a |varwidth| environment with a width of main box width plus \meta{length}.
-This style needs the |varwidth| package \cite{arseneau:2011a} to be loaded manually.
+This style needs the \refPkg{varwidth} package \cite{arseneau:2011a} to be loaded manually.
By default, the resulting boxed title is somewhat smaller than the main box.
\begin{exdispExample*}{varwidth_boxed_title_star}{sbs,lefthand ratio=0.66}
% \usepackage{varwidth}
@@ -2285,9 +2285,6 @@ Such shadows can be added directly to the frame path using \refKey{/tcb/frame st
\clearpage
\subsection{\tikzname\ Picture Option Keys}\label{subsec:tikzpicture}
-The skin \refSkin{standard} does not support these options,
-but most other skins, e.\,g.\ \refSkin{enhanced}.
-
\begin{docTcbKey}{tikz}{=\meta{tikz option list}}{no default, initially empty}
Adds the given \meta{tikz option list} to the main |tikzpicture| environment
@@ -2721,12 +2718,12 @@ Finishes are intended for special effects like highlights or glosses or text ove
\clearpage
\subsection{Hyper Option Keys}\label{subsec:hyper}
-All options of this section need the package |hyperref| \cite{rahtz:hyperref}
+All options of this section need the package \refPkg{hyperref} \cite{rahtz:hyperref}
to be loaded separately. All these options are implemented as
\refKey{/tcb/finish} and can be disabled by \refKey{/tcb/no finish}.
\begin{marker}
-If the package |hyperref| \cite{rahtz:hyperref} is not loaded or if
+If the package \refPkg{hyperref} \cite{rahtz:hyperref} is not loaded or if
the \refSkin{standard} skin is used, all hyper option are silently ignored.
\end{marker}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
index f1a7be1ff41..fdb55644546 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
@@ -7,7 +7,7 @@ The library is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{theorems}
\end{dispListing}
-This also loads the package |amsmath|.
+This also loads the package \refPkg{amsmath}.
Denis Bitouz\'e, Muzimuzhi, and many others provided very valuable input for this library.
@@ -195,7 +195,7 @@ To switch off the \texttt{nameref} feature permanently, add
\end{dispExample}
\clearpage
-\refCom{tcbhighmath} can be used in symbiosis with the |empheq| package
+\refCom{tcbhighmath} can be used in symbiosis with the \refPkg{empheq} package
which allows to specify own boxing commands to mark multiline formulas.
\begin{dispExample}
@@ -900,8 +900,8 @@ New colored mathematical environments are easily created using
\clearpage
\begin{docTcbKey}{theorem style}{=\meta{name}}{no default, initially |standard|}
Applies a predefined style \meta{name} to the theorem environment. Some of
-the feasible \meta{name} values resemble style names from the packages |theorem|
-and |ntheorem| to give convenient access to known patterns.
+the feasible \meta{name} values resemble style names from the packages \refPkg{theorem}
+and \refPkg{ntheorem} to give convenient access to known patterns.
\begin{marker}
The styles alter \refKey{/tcb/separator sign}, \refKey{/tcb/description delimiters},
\refKey{/tcb/terminator sign}, and more. Therefore, one should apply such
@@ -1018,7 +1018,7 @@ identically colored.
All following environments are numbered with a common counter, but this
can be changed easily. Here, the counter output is supplemented by
the subsection number.
-Further, the |cleveref| package \cite{cubitt:2018a} is used for clever
+Further, the \refPkg{cleveref} package \cite{cubitt:2018a} is used for clever
references.
\inputpreamblelisting{G}
@@ -1208,8 +1208,8 @@ Let's try a more conservative approach:
Instead of creating theorem environments with the methods described before,
environments from other packages can be boxed with a |tcolorbox|.
-Environments may be created e.g. by methods from the |theorem| package or
-the |amsthm| package. \refCom{tcolorboxenvironment} can be used to put a box
+Environments may be created e.g. by methods from the \refPkg{theorem} package or
+the \refPkg{amsthm} package. \refCom{tcolorboxenvironment} can be used to put a box
around these environments.
\inputpreamblelisting{K}
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
index 280d91bd560..cbe8dbaba6b 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
@@ -7,14 +7,14 @@ The library is loaded by a package option or inside the preamble by:
\begin{dispListing}
\tcbuselibrary{xparse}
\end{dispListing}
-This loads the package |xparse| \cite{latexproject:xparse}.
+This loads the package \refPkg{xparse} \cite{latexproject:xparse}.
Note that up to version 5.0.2 this library contained code which
-needed the |xparse| package. Since nowadays this package has become
+needed the \refPkg{xparse} package. Since nowadays this package has become
basically a part of the \LaTeX\ kernel, the code of the library was
migrated to other parts of the |tcolorbox| package. So, the remaining
library is nearly a stub which only loads |xparse|.
Instead of including the |xparse| library, it is recommended to include the
-|xparse| package directly, \textbf{if really needed} (the \LaTeX\ kernel contains
+\refPkg{xparse} package directly, \textbf{if really needed} (the \LaTeX\ kernel contains
essentially everything needed). The library is kept for compatibility.
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
index 3054aff5913..54a761e49b2 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
index c60eb4acfa8..ae5352a384b 100644
--- a/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
+++ b/Master/texmf-dist/doc/latex/tcolorbox/tcolorbox.tex
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 6.3.0 (2024/07/10)
+%% The LaTeX package tcolorbox - version 6.4.0 (2024/09/27)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -63,8 +63,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{6.3.0}%
-\def\datum{2024/07/10}%
+\def\version{6.4.0}%
+\def\datum{2024/09/27}%
\makeindex
\hypersetup{
@@ -80,7 +80,7 @@
%\geometry{showframe}
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.coreoptions}
+%\includeonly{tcolorbox.doc.listings}
%\hypersetup{colorlinks=false}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdf b/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdf
index 68574d0bff2..e7652136806 100644
--- a/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdf
+++ b/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.tex b/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.tex
index 287d240690b..f45f5b8eb80 100644
--- a/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.tex
+++ b/Master/texmf-dist/doc/latex/tikz3d-fr/tikz3d-fr-doc.tex
@@ -4,8 +4,8 @@
\documentclass[french,a4paper,11pt]{article}
\usepackage[margin=2cm,includefoot]{geometry}
-\def\TPversion{0.1.2}
-\def\TPdate{22 juillet 2023}
+\def\TPversion{0.1.3}
+\def\TPdate{16 septembre 2024}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{amsmath,amssymb}
@@ -16,6 +16,7 @@
\makesavenoteenv{tabular}
\usepackage{enumitem}
\usepackage{tabularray}
+\UseTblrLibrary{diagbox}
\usepackage{fancyvrb}
\usepackage{fancyhdr}
\fancyhf{}
@@ -206,6 +207,7 @@
\vspace*{-2cm}
+ \def\listecouleursdes{red!25,blue!25,yellow!25,orange!25,green!25}\TirageAleaDesTriDim[EspaceH=-2mm]{5}
\hfill
\begin{EmpilementCubes}
\PlaquePetitsCubes[cyan/red/green/yellow]{ 3111-1-4 / 233123 / 2-1112 }
@@ -242,17 +244,19 @@
\tableofcontents
-\vfill
+\pagebreak
\part{Historique}
+\verb|v0.1.3|~:~~~~Affichage de dés en 3d (avec aléatoire possible)
+
\verb|v0.1.2|~:~~~~Option pour l'épaisseur des traits + \textsf{[line join=round]} pour les cubes
\verb|v0.1.1|~:~~~~Tracé des segments individuels avec l'option \textsf{[line cap=round]}
\verb|v0.1.0|~:~~~~Version initiale
-\newpage
+\pagebreak
\part{Introduction}
@@ -268,7 +272,8 @@ Le package propose des commandes basiques -- et francisées -- pour travailler s
\item une commande pour tracer et personnaliser un cube ;
\item des commandes pour créer/afficher/nommer des points de l'espace ;
\item des commandes pour tracer un ou plusieurs segments ;
- \item des commandes et un environnement pour travailler sur des \textit{empilements} de cubes.
+ \item des commandes et un environnement pour travailler sur des \textit{empilements} de cubes ;
+ \item des commandes pour représenter des dés en perspective (avec aléatoire possible).
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
\end{noteblock}
@@ -297,8 +302,8 @@ Il n'existe pas d'option pour le package, et \texttt{xcolor} n'est pas chargé.
\textsf{tikz3d-fr} charge les packages suivantes :
\begin{itemize}
- \item \texttt{tikz}, \texttt{xstring}, \texttt{xintexpr}, \texttt{simplekv} et \texttt{xinttools} et \texttt{listofitems} ;
- \item les librairies \texttt{\textit{tikz}.calc} et \texttt{\textit{tikz}.babel}.
+ \item \texttt{tikz}, \texttt{xstring}, \texttt{xintexpr}, \texttt{simplekv} et \texttt{xinttools} et \texttt{listofitems}, \texttt{tikz-3dplot} et \texttt{randomlist} ;
+ \item la librairie \texttt{\textit{tikz}.calc}.
\end{itemize}
Il est compatible avec les compilations usuelles en \textsf{latex}, \textsf{pdflatex}, \textsf{lualatex} ou \textsf{xelatex}.
@@ -758,4 +763,144 @@ Par exemple, la \textit{grille} associée à l'empilement précédent est :
\end{EmpilementCubes}
\end{PresCode}
+\newpage
+
+\part{Dés à jouer, en 3D}
+
+\section{Fonctionnement global}
+
+\begin{tipblock}
+L'idée est de proposer des commandes pour travailler avec des dés, en 3D, avec possibilité de les \textit{lancer} de manière aléatoire.
+
+\smallskip
+
+La commande peut être autonome pour afficher dé par dé, mais elle peut être également à intégrer dans un environnement \texttt{tikzpicture}.
+\end{tipblock}
+
+\begin{importantblock}
+Par défaut, les dés ont une hauteur proche de 1~cm (sans la perspective).
+
+\smallskip
+
+L'orientation est \textit{globalement} fixée, mais il est possible (dans une certaine mesure) de pivoter les dés (suivants les angles $\theta$ et $\phi$ des coordonnées sphériques).
+
+\smallskip
+
+Il est également possible de spécifier un \textit{angle de vue}, droite ou gauche.
+\end{importantblock}
+
+
+\begin{PresCodeTex}{listing only}
+%affichage indépendant
+\DeTriDim[clés]{numéro(s)}
+\end{PresCodeTex}
+
+\begin{PresCodeTex}{listing only}
+%affichage dans un environnement
+\begin{tikzpicture}
+ \DeTriDim*[clés]{numéro(s)}
+\end{tikzpicture}
+\end{PresCodeTex}
+
+\begin{PresCodeTex}{listing only}
+%tirages aléatoires
+\TirageAleaDesTriDim[clés]{tirages}
+\end{PresCodeTex}
+
+\begin{PresCode}{}
+\DeTriDim{6/2}~\DeTriDim{1/5}~\DeTriDim{6/4}~\DeTriDim{3/2}
+\end{PresCode}
+
+\begin{PresCode}{}
+\begin{tikzpicture}
+ %\tdplotsetmaincoords{70}{110}
+ \DeTriDim*[Echelle=2]{6/2}
+ \DeTriDim*[Echelle=2,Origine={(2,-0.2)}]{6/5}
+ \DeTriDim*[Echelle=2,Origine={(4,-0.4)},]{6/3}
+ \DeTriDim*[Echelle=2,Origine={(6,-0.6)},Hasard]{}
+\end{tikzpicture}
+\end{PresCode}
+
+\begin{PresCode}{}
+\TirageAleaDesTriDim[Vue=G,Yams,Echelle=3,Couleurs={red!25,blue!25,yellow!25}]{3}
+\end{PresCode}
+
+\section{Influence des paramètres}
+
+\subsection{Clés et options}
+
+\begin{tipblock}
+Quelques \Cle{clés} sont disponibles pour cette commande (elles ne sont pas toutes utilisées par les toutes les commandes) :
+
+\begin{itemize}
+ \item \Cle{Echelle} : échelle pour modifier la taille ;\hfill{}défaut \Cle{1}
+ \item \Cle{Couleur} : couleur (individuelle) ;\hfill{}défaut \Cle{lightgray!25}
+ \item \Cle{CouleurPoints} : couleurs des points ;\hfill{}défaut \Cle{black}
+ \item \Cle{Phi} : angle $\phi$ de la perpective ;\hfill{}défaut \Cle{110}
+ \item \Cle{Theta} : angle $\theta$ de la perpective ;\hfill{}défaut \Cle{70}
+ \item \Cle{Vue} : vue de la perspective (\texttt{D/G}) ;\hfill{}défaut \Cle{D}
+ \item \Cle{Hasard} : booléen pour un tirage aléatoire ;\hfill{}défaut \Cle{false}
+ \item \Cle{Origine} : origine du dé pour la version \texttt{tikzpicture} ;
+ \item en ce qui concerne les clés spécifiques au tirage :
+ \begin{itemize}
+ \item \Cle{EspaceH} : espace horizontal entre les dés ;\hfill{}défaut \Cle{0mm}
+ \item \Cle{Couleurs} : liste des couleurs pour les dés ;\hfill{}défaut \Cle{lightgray!25}
+ \item \Cle{Yams} : booléen pour forcer un affichage en ligne.\hfill{}défaut \Cle{false}
+ \end{itemize}
+\end{itemize}
+
+Hormis dans le cas où \texttt{Harsard=true}, l'argument obligatoire, pour l'affichage unique, est à donner sous la forme \texttt{face de devant/face du dessus} (l'autre face visible est déterminée automatiquement).
+\end{tipblock}
+
+\subsection{Exemples}
+
+\begin{PresCode}{}
+\TirageAleaDesTriDim[EspaceH=-2mm]{5}
+
+\TirageAleaDesTriDim[EspaceH=1mm,Echelle=2,Couleurs=darkgray,CouleurPoints=white]{5}
+\end{PresCode}
+
+\begin{PresCode}{}
+\def\listecouleursdes{red!25,blue!25,yellow!25,orange!25,green!25}
+
+\TirageAleaDesTriDim[Yams,Couleurs=brown!10]{10}
+
+\TirageAleaDesTriDim[Yams,Echelle=2,Couleurs=\listecouleursdes,CouleurPoints=magenta]{5}
+
+\TirageAleaDesTriDim[Vue=G,Yams,Echelle=3,Couleurs=\listecouleursdes]{3}
+\end{PresCode}
+
+\subsection{Angles de rotation}
+
+\begin{cautionblock}
+Les paramètres $\theta$ et $\phi$ peuvent être modifiés, en fonction du rendu souhaité.
+
+Mais comme toutes les faces ne sont pas traitées (du fait de la perspective), il est conseillé de rester dans une \textit{fenêtre classique}.
+\end{cautionblock}
+
+\begin{tipblock}
+Vue \texttt{D} :
+
+\begin{tblr}{hlines,vlines,colspec={*{5}{Q[m,c]}}}
+ \diagbox{$\phi$}{$\theta$} & 60 & \textbf{70} & 80 & 85 \\
+ 95 & \DeTriDim[Hasard,Theta=60,Phi=95]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=70,Phi=95]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=80,Phi=95]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=85,Phi=95]<baseline=0pt>{} \\
+ 100 & \DeTriDim[Hasard,Theta=60,Phi=100]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=70,Phi=100]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=80,Phi=100]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=85,Phi=100]<baseline=0pt>{} \\
+ \textbf{110} & \DeTriDim[Hasard,Theta=60,Phi=95]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=70,Phi=110,Couleur=red!25]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=80,Phi=110]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=85,Phi=110]<baseline=0pt>{} \\
+ 120 & \DeTriDim[Hasard,Theta=60,Phi=120]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=70,Phi=120]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=80,Phi=120]<baseline=0pt>{} & \DeTriDim[Hasard,Theta=85,Phi=120]<baseline=0pt>{} \\
+\end{tblr}
+\end{tipblock}
+
+\begin{tipblock}
+Vue \texttt{G} :
+
+\begin{tblr}{hlines,vlines,colspec={*{5}{Q[m,c]}}}
+ \diagbox{$\phi$}{$\theta$} & 60 & \textbf{70} & 80 & 85 \\
+ 95 & \DeTriDim[Vue=G,Hasard,Theta=60,Phi=95]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=70,Phi=95]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=80,Phi=95]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=85,Phi=95]<baseline=0pt>{} \\
+ 100 & \DeTriDim[Vue=G,Hasard,Theta=60,Phi=100]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=70,Phi=100]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=80,Phi=100]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=85,Phi=100]<baseline=0pt>{} \\
+ \textbf{110} & \DeTriDim[Vue=G,Hasard,Theta=60,Phi=95]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=70,Phi=110,Couleur=red!25]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=80,Phi=110]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=85,Phi=110]<baseline=0pt>{} \\
+ 120 & \DeTriDim[Vue=G,Hasard,Theta=60,Phi=120]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=70,Phi=120]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=80,Phi=120]<baseline=0pt>{} & \DeTriDim[Vue=G,Hasard,Theta=85,Phi=120]<baseline=0pt>{} \\
+\end{tblr}
+\end{tipblock}
+
+
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
index 029671719e9..3fabaece9ca 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
index d89c17bff4b..f9b63dcec69 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-en.tex
@@ -29,8 +29,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.6}
-\def\TPdate{13/07/2024}
+\def\TPversion{0.1.8}
+\def\TPdate{08/09/2024}
\usepackage{soul}
\usepackage{codehigh}
\usepackage{tabularray}
@@ -1684,6 +1684,7 @@ et $\frac{\pi}{4} \approx \RoundNb[4]{pi/4}$.
\begin{quote}
\begin{verbatim}
+0.1.8 : New commands [in french doc] (binomial, cabweb,\ldots)
0.1.6 : Vertical asymptote + [in french doc] commands for integrals
0.1.5 : Initial version [en]
\end{verbatim}
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
index ba330fa444a..bda1e6e0637 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
index 99d8414cd0f..14a4ada92df 100644
--- a/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
@@ -7,6 +7,7 @@
\usepackage[utf8]{inputenc}
\usepackage{tkz-grapheur}
\usepackage{amsmath}
+\usepackage{enumitem}
\usepackage{fancyvrb}
\usepackage{fancyhdr}
\usepackage{hyperref}
@@ -29,8 +30,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.6}
-\def\TPdate{13/07/2024}
+\def\TPversion{0.1.8}
+\def\TPdate{08/09/2024}
\usepackage{soul}
\usepackage{codehigh}
\usepackage{tabularray}
@@ -332,17 +333,24 @@ Concernant les styles des \textit{objets}, ils sont donnés ci-dessous.
\tikzset{pflgrillep/.style={thin,lightgray}}
\tikzset{pflgrilles/.style={very thin,lightgray}}
\tikzset{pflaxes/.style={line width=0.8pt,->,>=latex}}
+\end{tcblisting}
-%style des points (courbe / nuage /labels /montecarlo)
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%style des points (courbe / nuage /labels / montecarlo)
\tikzset{pflpoint/.style={line width=0.95pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
\tikzset{pflpointmc/.style={radius=0.875pt}}
\tikzset{pflnoeud/.style={}} %pour les inner sep par exemple :-)
+\tikzset{pflcourbediscont/.style={line width=1.1pt}}
+\end{tcblisting}
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
%style des courbes
\tikzset{pflcourbe/.style={line width=1.05pt}}
+\end{tcblisting}
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
%style des traits (normaux, antécédents, images)
\tikzset{pfltrait/.style={line width=0.8pt}}
\tikzset{pfltraitantec/.style={line width=0.95pt,densely dashed}}
@@ -354,6 +362,18 @@ Concernant les styles des \textit{objets}, ils sont donnés ci-dessous.
\tikzset{pflflechegd/.style={<->,>=latex}}
\end{tcblisting}
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%style des constructions ECC (courbe / paramètres)
+\tikzset{pfltraitsparamecc/.style={line width=0.9pt,densely dashed}}
+\tikzset{pflcourbeecc/.style={line width=1.05pt}}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%style des constructions récurrence
+\tikzset{pfltraitrec/.style={line width=0.8pt}}
+\tikzset{pfltraitrecpointill/.style={pfltraitrec,densely dashed}}
+\end{tcblisting}
+
L'idée est donc de pouvoir redéfinir globalement ou localement les styles, et éventuellement de rajouter des éléments, en utilisant \mintinline{latex}|monstyle/.append style={...}|.
\subsection{Création de l'environnement}\label{creaenvt}
@@ -829,6 +849,38 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\end{GraphiqueTikz}
\end{tcblisting}
+\subsection{Marquer des points de discontinuité}\label{ptsdiscont}
+
+Il est possible de marquer des points de discontinuité, mais c'est commande est \textit{déconnectée} des commandes de tracé de courbes/splines.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\AfficherPtsDiscont[clés]{liste}
+\end{tcblisting}
+
+Le premier argument, \textit{optionnel} et entre \MontreCode{[...]}, contient les \MontreCode{Clés} suivantes :
+
+\begin{itemize}
+ \item \MontreCode{Couleur=...} (\MontreCode{black} par défaut) ;
+ \item \MontreCode{Pos=...} (\MontreCode{D} par défaut) pour choisir la position de la discontinuité (parmi \MontreCode{G/D}) ;
+ \item \MontreCode{Echelle=...} (\MontreCode{1} par défaut) pour modifier l'échelle du symbole ;
+ \item \MontreCode{Type=...} (\MontreCode{par} par défaut) pour choisir le type de symbole, parmi \MontreCode{par/cro/rond/demirond}.
+\end{itemize}
+
+Le second argument, obligatoire et entre \MontreCode{\{...\}} permet de préciser la liste des points en lesquels le symbole de discontinuité sera positionné, sous la forme \MontreCode{x1/y1/d1 § x2/y2/d2 § ...} avec les points \MontreCode{(xi;yi)} et \MontreCode{f'(xi)=di}.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}[x=1cm,y=1cm,Xmin=0,Xmax=10,Ymin=0,Ymax=5]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirCourbeSpline[Trace,Couleur=red]{0/1/-1 § 4/4/0}
+ \AfficherPtsDiscont{4/4/0}
+ \AfficherPtsDiscont[Pos=G,Type=cro]{0/1/-1}
+ \DefinirCourbeSpline[Trace,Couleur=blue]{5/1/1.5 § 8/4/0.5}
+ \AfficherPtsDiscont[Couleur=blue,Type=rond]{8/4/0.5}
+ \AfficherPtsDiscont[Couleur=blue,Pos=G,Type=demirond,Echelle=2]{5/1/1.5}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
\subsection{Récupérer les coordonnées de nœuds}\label{recupcoordo}
Il est également possible, dans l'optique d'une réutilisation de coordonnées, de récupérer les coordonnées d'un nœud (défini ou déterminé).
@@ -1336,6 +1388,60 @@ Le dernier argument obligatoire est le point de travail (version abscisse ou nœ
\pagebreak
+\subsection{Suites récurrentes et toiles}\label{toilerecurr}
+
+L'idée est d'obtenir une commande pour tracer la \og toile \fg{} permettant d'obtenir -- graphiquement -- les termes d'une suite récurrente définie par une relation $u_{n+1}=f(u_n)$.
+
+La commande est compatible avec une fonction précédemment définie, mais également avec une courbe type \textit{spline} précédemment définie.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\TracerToileRecurrence[clés]{fct ou courbe}
+\end{tcblisting}
+
+Le premier argument, \textit{optionnel} et entre \MontreCode{[...]}, contient les \MontreCode{Clés} suivantes :
+
+\begin{itemize}
+ \item \MontreCode{Couleur=...} (\MontreCode{black} par défaut) ;
+ \item \MontreCode{Spline=...} (\MontreCode{false} par défaut) pour spécifier qu'une courbe \textit{spline} est utilisée ;
+ \item \MontreCode{No=...} (\MontreCode{0} par défaut) est l'indice initial ;
+ \item \MontreCode{Uno=...} est qui est la valeur du terme initial (à donner obligatoirement !) ;
+ \item \MontreCode{Nom=...} (\MontreCode{u} par défaut) est le nom de la suite ;
+ \item \MontreCode{Nb=...} (\MontreCode{5} par défaut) ;
+ \item \MontreCode{AffTermes=...} (\MontreCode{false} par défaut) qui est un booléen pour afficher les termes ;
+ \item \MontreCode{AffPointilles=...} (\MontreCode{true} par défaut) pour afficher les pointillés ;
+ \item \MontreCode{TailleLabel=...} (\MontreCode{\textbackslash small} par défaut) ;
+ \item \MontreCode{PosLabel=...} (\MontreCode{below} par défaut).
+\end{itemize}
+
+Le second argument, obligatoire et entre \MontreCode{\{...\}} permet de préciser l'objet avec lequel il faut effectuer les tracés (fonction ou nom\_courbe).
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}%
+ [x=0.75cm,y=0.75cm,Xmin=0,Xmax=10,Xgrille=1,Xgrilles=0.5,
+ Ymin=0,Ymax=8,Ygrille=1,Ygrilles=0.5]
+ \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto}
+ \DefinirCourbe[Couleur=red,Nom=cf,Debut=0,Fin=10,Trace]<f>{sqrt(5*x)+1}
+ \TracerCourbe[Couleur=blue]{x}
+ \TracerToileRecurrence[Couleur=orange,No=1,Uno=1]{f}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}[x=4cm,y=3cm,Xmin=0,Xmax=2.5,Xgrille=1,Xgrilles=0.25,
+ Ymin=0,Ymax=1.25,Ygrille=0.5,Ygrilles=0.25]
+ \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto}
+ \DefinirCourbeInterpo[Nom=interpotest,Couleur=blue,Trace]%
+ {(0,0)(0.5,0.75)(1,0.25)(2,1)(2.5,0.25)}
+ \TracerCourbe[Couleur=olive]{x}
+ \TracerToileRecurrence%
+ [AffTermes,Couleur=purple,Spline,No=0,Uno=2,PosLabel=above left]%
+ {interpotest}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\pagebreak
+
\section{Commandes spécifiques des fonctions de densité}
\subsection{Loi normale}\label{loinormale}
@@ -1419,6 +1525,52 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\end{GraphiqueTikz}
\end{tcblisting}
+\subsection{Histogramme pour une loi binomiale}\label{histobinom}
+
+Il est également possible (d'une manière moins explicite que dans \MontreCode{ProfLycee}) de représenter l'histogramme d'une loi binomiale (\MontreCode{ProfLycee} permet de déterminer les unités automatiquement, ici elles doivent être précisées et connues).
+
+Il est également possible de rajouter la loi normale \og associée \fg.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\TracerHistoBinomiale[clés]<nom fct normale>{n}{p}
+\end{tcblisting}
+
+Le premier argument, optionnel et entre \MontreCode{[...]} propose les clés suivantes :
+
+\begin{itemize}
+
+ \item \MontreCode{Plage} : plage, sous la forme \MontreCode{a-b} du coloriage éventuel ;
+ \item \MontreCode{CouleurPlage} : couleur de la plage éventuelle ;
+ \item \MontreCode{ClipX} : restriction de l'axe Ox, sous la forme \MontreCode{a-b} ;
+ \item \MontreCode{AffNormale} : booléen (\MontreCode{true} par défaut) pour rajouter la loi normale ;
+ \item \MontreCode{CouleurNormale} : couleur pour la loi normale.
+\end{itemize}
+
+Les arguments obligatoires et entre \MontreCode{\{...\}} permettent de spécifier les paramètres de la loi binomiale.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+%les unités ont été déterminées au préalable...
+\begin{GraphiqueTikz}[x=0.2cm,y=50cm,Origx=-0.5,Xmin=-0.5,Xmax=50.5,
+ Xgrille=5,Xgrilles=1,Ymin=0,Ymax=0.12,Ygrille=0.01,Ygrilles=0.001]
+ \TracerAxesGrilles[Elargir=2.5mm,Police=\small,Grille=false]%
+ {0,5,...,50}{auto}
+ \TracerHistoBinomiale{50}{0.4}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+%les unités ont été déterminées au préalable...
+\begin{GraphiqueTikz}[x=0.5cm,y=100cm,Origx=14.5,Xmin=14.5,Xmax=35.5,
+ Xgrille=5,Xgrilles=1,Ymin=0,Ymax=0.09,Ygrille=0.01,Ygrilles=0.001]
+ \TracerAxesGrilles[Elargir=2.5mm,Police=\small,Grille=false]%
+ {15,20,...,35}{auto}
+ \TracerHistoBinomiale%
+ [ClipX=15-35,Plage=18-25,CouleurPlage=teal,AffNormale,CouleurNormale=red]%
+ {1000}{0.02}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
\pagebreak
\section{Commandes spécifiques des méthodes intégrales}
@@ -1440,6 +1592,7 @@ L'idée est de proposer plusieurs méthodes graphiques pour illustrer graphiquem
Les \MontreCode{Clés} disponibles sont :
\begin{itemize}
+ \item \MontreCode{Spline} : booléen pour préciser qu'un spline est utilisé, \MontreCode{false} par défaut ;
\item \MontreCode{Couleur} : couleur des tracés, \MontreCode{red} par défaut ;
\item \MontreCode{NbSubDiv} : nombre de subdivisions, \MontreCode{10} par défaut ;
\item \MontreCode{Methode} : méthode géométrique utilisée, parmi parmi \MontreCode{RectanglesGauche / RectanglesDroite / RectanglesMilieu / Trapezes} pour spécifier la méthode utilisée, \MontreCode{RectanglesGauche} par défaut ;
@@ -1450,7 +1603,7 @@ Les \MontreCode{Clés} disponibles sont :
\smallskip
-Le deuxième argument, optionnel et entre \MontreCode{<...>}, correspond à la fonction \textbf{précédemment définie} !
+Le deuxième argument, optionnel et entre \MontreCode{<...>}, correspond à la fonction ou le spline \textbf{précédemment définie} !
\smallskip
@@ -1499,6 +1652,17 @@ Les deux derniers arguments, obligatoires, correspondent aux bornes de l'intégr
\end{GraphiqueTikz}
\end{tcblisting}
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}%
+ [x=0.8cm,y=1cm,Xmin=-7,Xmax=4,Ymin=0,Ymax=5]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \DefinirListeSpline{-6.5/0/2.5§-2/4/0§3.75/0/-1}[\lstsplineB]
+ \DefinirCourbeSpline[Nom=splinered]{\lstsplineB}
+ \TracerCourbeSpline[Couleur=red]{\lstsplineB}
+ \RepresenterMethodeIntegrale[Methode=RectanglesMilieu,Spline,Couleur=teal]<splinered>{-5}{1.25}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
\subsection{Méthode de Monte-Carlo}\label{montecarlo}
L'idée est de proposer une commande pour simuler un calcul intégral via la méthode de Monte-Carlo.
@@ -1547,9 +1711,54 @@ et $\frac{\pi}{4} \approx \ArrondirNum[4]{pi/4}$.
\pagebreak
-\section{Commandes spécifiques des statistiques à deux variables}
+\section{Commandes spécifiques des statistiques}
+
+\subsection{Courbe des ECC/FCC (1 variable)}\label{cbeECC}
+
+Il est possible de travailler sur une représentation de la courbe des ECC/FCC.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+\TracerCourbeECC[clés]{liste valeurs}{liste effectifs}
+\end{tcblisting}
+
+Le code se charge de déterminer une valeur des paramètres, pour utilisation ultérieure (avec arrondis éventuels car ils sont obtenus par \textit{conversions}) :
+
+\begin{itemize}
+ \item le premier quartile, $Q_1$, est stocké dans la macro \MontreCode{\textbackslash ValPremQuartile} ;
+ \item la médiane, méd, est stocké dans la macro \MontreCode{\textbackslash ValMed} ;
+ \item le troisième quartile, $Q_3$, est stocké dans la macro \MontreCode{\textbackslash ValTroisQuartile}.
+\end{itemize}
+
+Les \MontreCode{Clés} disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{Couleur=...} : couleur du tracé, \MontreCode{black} par défaut ;
+ \item \MontreCode{AffParams} : booléen, \MontreCode{true} par défaut, pour afficher les paramètres ;
+ \item \MontreCode{CouleursParams=...} : couleur des paramètres, \MontreCode{black} par défaut ;
+ \item \MontreCode{TraitsComplets} : booléen, \MontreCode{true} par défaut, pour afficher les pointillés en entier
+\end{itemize}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}[x=0.15cm,y=0.03cm,Xmin=0,Xmax=75,Xgrille=10,Xgrilles=5,
+ Ymin=0,Ymax=200,Ygrille=20,Ygrilles=10]
+ \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto}
+ \TracerCourbeECC%
+ [Couleur=blue,CouleursParams={lime!75!black/pink!75!black},
+ TraitsComplets=false]%
+ {0,15,25,35,40,45,55,65,75}%
+ {15,20,50,30,35,25,15,10}
+ %ajouts 'manuels'
+ \PlacerTexte[Couleur=lime!75!black,Police=\small,Position=below]%
+ {(\ValPremQuartile,0)}{\ArrondirNum[0]{\ValPremQuartile}}
+ \PlacerTexte[Couleur=lime!75!black,Police=\small,Position=below]%
+ {(\ValTroisQuartile,0)}{\ArrondirNum[0]{\ValTroisQuartile}}
+ \PlacerTexte[Couleur=pink!75!black,Police=\small,Position=below]%
+ {(\ValMed,0)}{\ArrondirNum[0]{\ValMed}}
+\end{GraphiqueTikz}
+
+\end{tcblisting}
-\subsection{Le nuage de points}\label{nuage}
+\subsection{Le nuage de points (2 variables)}\label{nuage}
En marge des commandes liées aux fonctions, il est également possible de représenter des séries statistiques doubles.
@@ -1592,7 +1801,7 @@ Les arguments, obligatoires, permettent de spécifier :
\end{GraphiqueTikz}
\end{tcblisting}
-\subsection{La droite de régression}\label{reglin}
+\subsection{La droite de régression (2 variables)}\label{reglin}
La droite de régression linéaire (obtenue par la méthode des moindres carrés) peut facilement être rajoutée, en utilisant la clé \MontreCode{TracerDroite}.
@@ -1626,7 +1835,7 @@ Dans ce cas, de nouvelles clés sont disponibles :
\end{GraphiqueTikz}
\end{tcblisting}
-\subsection{Autres régressions}\label{regressions}
+\subsection{Autres régressions (2 variables)}\label{regressions}
En partenariat avec le package \MontreCode{xint-regression}, chargé par le package (mais \textit{désactivable} via l'option \MontreCode{[nonxintreg]}), il est possible de travailler sur d'autres types de régression :
@@ -1884,10 +2093,10 @@ $\begin{cases}
Les commandes disponibles sont :
\NewDocumentCommand\lstcmd{ m m m }{%
- \item[\texttt{#1}] : \mintinline{latex}|#2|\hfill{}page \pageref{#3}
+ \item[\footnotesize\texttt{#1}]{\footnotesize : \mintinline{latex}|#2|\hfill{}page \pageref{#3}}
}
-\begin{description}
+\begin{description}[noitemsep]
\lstcmd{environnement~~}{\begin{GraphiqueTikz}...\end{GraphiqueTikz}}{creaenvt}
\lstcmd{axes et grilles}{\TracerAxesGrille}{creaaxesgr}
\lstcmd{aj val axes X~~}{\RajouterValeursAxeX}{ajoutvals}
@@ -1904,6 +2113,7 @@ Les commandes disponibles sont :
\lstcmd{def image~~~~~~}{\DefinirImage}{defpts}
\lstcmd{marq pts~~~~~~~}{\MarquerPts}{markpts}
\lstcmd{placer txt~~~~~}{\PlacerTexte}{placetxt}
+ \lstcmd{pts discont~~~~}{\AfficherPtsDiscont}{ptsdiscont}
\lstcmd{récup absc~~~~~}{\RecupererAbscisse}{recupcoordo}
\lstcmd{récup ordo~~~~~}{\RecupererOrdonnee}{recupcoordo}
\lstcmd{récup coordos~~}{\RecupererCoordonnees}{recupcoordo}
@@ -1917,10 +2127,13 @@ Les commandes disponibles sont :
\lstcmd{méthodes int~~~}{\RepresenterMethodeIntegrale}{methodesintergrales}
\lstcmd{Monte-Carlo~~~~}{\SimulerMonteCarlo}{montecarlo}
\lstcmd{tangente~~~~~~~}{\TracerTangente}{tgte}
+ \lstcmd{toile récurr~~~}{\TracerToileRecurrence}{toilerecurr}
\lstcmd{loi normale~~~~}{\DefinirLoiNormale}{loinormale}
\lstcmd{loi normale~~~~}{\TracerLoiNormale}{loinormale}
\lstcmd{loi khideux~~~~}{\DefinirLoiKhiDeux}{loikhideux}
\lstcmd{loi khideux~~~~}{\TracerLoiKhiDeux}{loikhideux}
+ \lstcmd{loi binom~~~~~~}{\TracerHistoBinomiale}{histobinom}
+ \lstcmd{courbe ECC~~~~~}{\TracerCourbeECC}{cbeECC}
\lstcmd{stats 2 var~~~~}{\TracerNuage}{nuage}
\lstcmd{regressions~~~~}{\TracerAjustement}{regressions}
\lstcmd{arrondi~~~~~~~~}{\ArrondirNum}{numarrond}
@@ -1931,8 +2144,10 @@ Les commandes disponibles sont :
\section{Historique}
-\begin{quote}
+{\footnotesize \begin{quote}
\begin{verbatim}
+0.1.8 : Courbes ECC/FCC + Toile récurrence + Points discontinuité + HistoBinom
+0.1.7 : Méthodes intégrales avec des splines
0.1.6 : Asymptote verticale + Méthodes intégrales (géom + Monte Carlo)
0.1.5 : Correction d'un bug sur les rajouts de valeurs + NÅ“ud pour une image + [en] version !
0.1.4 : Placement de texte
@@ -1941,6 +2156,6 @@ Les commandes disponibles sont :
0.1.1 : Densité loi normale et khi deux + Marquage points + Améliorations
0.1.0 : Version initiale
\end{verbatim}
-\end{quote}
+\end{quote}}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.pdf b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.pdf
index 506a75b5d27..2e6df04d3c9 100644
--- a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.pdf
+++ b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.tex b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.tex
index a66ebc0ea89..5a588de369d 100644
--- a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.tex
+++ b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-en.tex
@@ -1,34 +1,110 @@
+% ==================== %
+% == RESOURCES USED == %
+% ==================== %
-% -------------------- %
-% -- RESOURCES USED -- %
-% -------------------- %
+\begin{filecontents*}[overwrite]{examples-version-n-change-dating.tex}
+Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\begin{filecontents*}[overwrite]{examples-focus-exa.tex}
-Bla, bla, bla...
+\medskip % CAUTION! This prevents overlapping.
-\begin{tdocexa}
- Ble, ble, ble...
-\end{tdocexa}
+\tdocdate{2023-09-24}
-\begin{tdocexa}[Wonderful]
- Bli, bli, bli...
-\end{tdocexa}
+Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
-\begin{tdocexa}<nonb>
- Blo, blo, blo...
-\end{tdocexa}
+\medskip % CAUTION! This prevents overlapping.
-\begin{tdocexa}<nonb>[Superb]
- Blu, blu, blu...
-\end{tdocexa}
+\tdocdate[gray]{2020-05-08}
+
+Bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli...
+
+Blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo...
+
+Blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu...
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice-icon.tex}
+\begin{tdoctopic}{Don't look}[\faEyeSlash]
+% An icon from fontawesome5.
+ \item Info 1...
+ \item Info 2...
+\end{tdoctopic}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice.tex}
+\begin{tdoctopic}{End of icons}
+ \item Info 1...
+ \item Info 2...
+\end{tdoctopic}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-update.tex}
+\begin{tdocupdate}
+ \item Info 1...
+ \item Info 2...
+\end{tdocupdate}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-versioning.tex}
+\tdocversion[red]{10.2.0-beta}[2023-12-01]
+
+Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+
+\bigskip % CAUTION! This prevents overlapping.
+
+\tdocversion{10.2.0-alpha}
+
+Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-first.tex}
+\tdocstartproj{1st version of the project.}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-break.tex}
+\begin{tdocbreak}
+ \item Info 1...
+ \item Info 2...
+\end{tdocbreak}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-pb.tex}
+\begin{tdocprob}
+ \item Info 1...
+ \item Info 2...
+\end{tdocprob}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-new.tex}
+\begin{tdocnew}
+ \item Info 1...
+ \item Info 2...
+\end{tdocnew}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-fix.tex}
+\begin{tdocfix}
+ \item Info 1...
+ \item Info 2...
+\end{tdocfix}
\end{filecontents*}
\begin{filecontents*}[overwrite]{examples-focus-exa-leavevmode.tex}
\begin{tdocexa}
\leavevmode
-
\begin{enumerate}
\item Point 1.
@@ -38,25 +114,14 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-rmk.tex}
-\begin{tdocrem}
- Just one remark...
-\end{tdocrem}
-
-\begin{tdocrem}[Mini title]
- Useful?
-\end{tdocrem}
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-focus-tip.tex}
-\begin{tdoctip}
- A tip.
-\end{tdoctip}
+\begin{filecontents*}[overwrite]{examples-focus-important.tex}
+\begin{tdocimp}
+ Important and harmless.
+\end{tdocimp}
-\begin{tdoctip}[Mini title]
+\begin{tdocimp}[Mini title]
Useful?
-\end{tdoctip}
+\end{tdocimp}
\end{filecontents*}
@@ -71,25 +136,25 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-important.tex}
-\begin{tdocimportant}
- Important and harmless.
-\end{tdocimportant}
+\begin{filecontents*}[overwrite]{examples-focus-caution.tex}
+\begin{tdoccaut}
+ Caution, caution...
+\end{tdoccaut}
-\begin{tdocimportant}[Mini title]
+\begin{tdoccaut}[Mini title]
Useful?
-\end{tdocimportant}
+\end{tdoccaut}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-caution.tex}
-\begin{tdoccaution}
- Caution, caution...
-\end{tdoccaution}
+\begin{filecontents*}[overwrite]{examples-focus-tip.tex}
+\begin{tdoctip}
+ A tip.
+\end{tdoctip}
-\begin{tdoccaution}[Mini title]
+\begin{tdoctip}[Mini title]
Useful?
-\end{tdoccaution}
+\end{tdoctip}
\end{filecontents*}
@@ -104,52 +169,38 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-default.tex}
-\begin{tdocshowcase}
- \bfseries A bit of code \LaTeX.
-
- \bigskip
-
- \emph{\large End of the awful demo.}
-\end{tdocshowcase}
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-showcase-customized.tex}
-\begin{tdocshowcase}[before = My beginning,
- after = My end,
- color = red]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
-\end{filecontents*}
-
+\begin{filecontents*}[overwrite]{examples-focus-exa.tex}
+\begin{tdocexa}
+ An example...
+\end{tdocexa}
-\begin{filecontents*}[overwrite]{examples-showcase-hook.tex}
-\begin{tdocshowcase}
- \string[This works...]
-\end{tdocshowcase}
+\begin{tdocexa}[Mini title]
+ Useful?
+\end{tdocexa}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip.tex}
-\begin{tdocshowcase}[nostripe]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
-\end{filecontents*}
+\begin{filecontents*}[overwrite]{examples-focus-rmk.tex}
+\begin{tdocrem}
+ Just one remark...
+\end{tdocrem}
+\begin{tdocrem}
+ Another?
+\end{tdocrem}
-\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip-customized.tex}
-\begin{tdocshowcase}[nostripe,
- before = My beginning,
- after = My end,
- color = green]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
+\begin{tdocrem}[Mini title]
+ Useful?
+\end{tdocrem}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-external.tex}
-Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
+\begin{filecontents*}[overwrite]{examples-listing-latexshow-options.tex}
+\tdoclatexshow[explain = What comes next is colourful...,
+ before = Rendering below.,
+ after = Finished rendering.,
+ color = orange]
+ {examples-listing-xyz.tex}
\end{filecontents*}
@@ -160,6 +211,12 @@ Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
+\begin{filecontents*}[overwrite]{examples-listing-xyz.tex}
+% Just one demo.
+$x y z = 1$
+\end{filecontents*}
+
+
\begin{filecontents*}[overwrite]{examples-listing-strange.tex}
\begin{tdoclatex}[std]
[Strange... Or not!]
@@ -174,129 +231,101 @@ Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-listing-xyz.tex}
-% Just one demo.
-$x y z = 1$
+\begin{filecontents*}[overwrite]{examples-showcase-customized.tex}
+\begin{tdocshowcase}[before = My beginning,
+ after = My end,
+ color = red]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-listing-latexshow-options.tex}
-\tdoclatexshow[explain = What comes next is colourful...,
- before = Rendering below.,
- after = Finished rendering.,
- color = orange]
- {examples-listing-xyz.tex}
+\begin{filecontents*}[overwrite]{examples-showcase-hook.tex}
+\begin{tdocshowcase}
+ \string[This works...]
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-dating.tex}
-Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-
-\medskip % CAUTION! This prevents overlapping.
-
-\tdocdate{2023-09-24}
-
-Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
-
-\medskip % CAUTION! This prevents overlapping.
-
-\tdocdate[gray]{2020-05-08}
-
-Bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli...
-
-Blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo...
-
-Blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu...
+\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip-customized.tex}
+\begin{tdocshowcase}[nostripe,
+ before = My beginning,
+ after = My end,
+ color = green]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-versioning.tex}
-\tdocversion[red]{10.2.0-beta}[2023-12-01]
-
-Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-
-\bigskip % CAUTION! This prevents overlapping.
-
-\tdocversion{10.2.0-alpha}
-
-Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
+\begin{filecontents*}[overwrite]{examples-showcase-external.tex}
+Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-new.tex}
-\begin{tdocnew}
- \item Info 1...
- \item Info 2...
-\end{tdocnew}
-\end{filecontents*}
+\begin{filecontents*}[overwrite]{examples-showcase-default.tex}
+\begin{tdocshowcase}
+ \bfseries A bit of code \LaTeX.
+ \bigskip
-\begin{filecontents*}[overwrite]{examples-version-n-change-update.tex}
-\begin{tdocupdate}
- \item Info 1...
- \item Info 2...
-\end{tdocupdate}
+ \emph{\large End of the awful demo.}
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-break.tex}
-\begin{tdocbreak}
- \item Info 1...
- \item Info 2...
-\end{tdocbreak}
+\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip.tex}
+\begin{tdocshowcase}[nostripe]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-pb.tex}
-\begin{tdocprob}
- \item Info 1...
- \item Info 2...
-\end{tdocprob}
-\end{filecontents*}
-
+% ======================== %
+% == SOURCE FOR THE DOC == %
+% ======================== %
-\begin{filecontents*}[overwrite]{examples-version-n-change-fix.tex}
-\begin{tdocfix}
- \item Info 1...
- \item Info 2...
-\end{tdocfix}
-\end{filecontents*}
+\documentclass[10pt, a4paper]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
-\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice.tex}
-\begin{tdoctopic}{It's my choice}
-% This is where the point needs to be put.
- \item Info 1...
- \item Info 2...
-\end{tdoctopic}
-\end{filecontents*}
+\usepackage[english]{babel, varioref}
-% ------------------------ %
-% -- SOURCE FOR THE DOC -- %
-% ------------------------ %
-\documentclass[10pt, a4paper]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage[english]{babel, varioref}
\usepackage{enumitem}
-
-\usepackage{tabularray}
\usepackage{fmtcount}
+\usepackage{multicol}
\setlength{\parindent}{0em}
+\newcommand\thispack{\tdocpack{tutodoc}}
+
% Package documented.
\usepackage[lang = english]{tutodoc}
+% --------------- %
+% -- IMPORTANT -- %
+% --------------- %
+%
+% See the French version of this file for the text to be used
+% for languages other than English.
+
+
+% --------------- %
+% -- IMPORTANT -- %
+% --------------- %
+%
+% See the French version of this file for the text to be used
+% for languages other than English.
+
+
+% == FORDOC == %
+
% Source.
% * https://tex.stackexchange.com/a/604698/6880
@@ -311,6 +340,8 @@ ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
}
+% == FORDOC == %
+
% Source.
% * https://tex.stackexchange.com/a/604698/6880
@@ -340,36 +371,42 @@ ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
}
-
\begin{document}
-\title{The \texttt{tutodoc} package - Tutorial-type documentation}
+
+\title{The \texttt{tutodoc} package - Tutorial-style documentation}
\author{Christophe BAL}
-\date{23 Aug. 2024 - Version 1.2.0-a}
+\date{Sep 28, 2024 - Version 1.4.0}
\maketitle
\begin{abstract}
-The \tdocpack{tutodoc} package
-\footnote{
- The name comes from \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}}.
-}
-is used by its author to semantically produce documentation of \LaTeX\ packages and classes in a tutorial style
-\footnote{
- The idea is to produce an efficient \texttt{PDF} file that can be browsed for one-off needs. This is generally what is expected of coding documentation.
-},
-and with a sober rendering for reading on screen.
+ The \thispack{} package\,%
+ \footnote{
+ The name comes from \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}}.
+ }
+ is used by its author to semantically produce documentation of \LaTeX\ packages and classes in a tutorial style,%
+ \footnote{
+ The idea is to produce an efficient \texttt{PDF} file that can be browsed for one-off needs. This is generally what is expected of coding documentation.
+ }
+ and with a sober rendering for reading on screen.
+ \medskip
-\begin{tdocnote}
- This package imposes a formatting style. In the not-too-distant future, \tdocpack{tutodoc} will probably be split into a class and a package.
-\end{tdocnote}
+ Two important points to note.
+ \begin{itemize}
+ \item This package imposes a formatting style. In the not-too-distant future, \thispack{} will probably be split into a class and a package.
+
+ \item This documentation is also available in French.
+ \end{itemize}
\end{abstract}
\newpage
\tableofcontents
\newpage
+
+
\section{General formatting imposed}
\subsection{Page geometry}
@@ -458,7 +495,7 @@ The \tdocpack{hyperref} package is imported behind the scenes with the settings
\section{Select language when loading package}
-By default, \tdocpack{tutodoc} is set for English, but it is possible to change the language: for example, a French documentation will use \tdocinlatex|\usepackage[lang = french]{tutodoc}| .
+By default, \thispack{} is set for English, but it is possible to change the language: for example, a French documentation will use \tdocinlatex|\usepackage[lang = french]{tutodoc}| .
For the moment, we only have the following two choices.
\begin{enumerate}
@@ -487,7 +524,7 @@ The macro \tdocmacro{tdocinEN} and its starred version are based on \tdocmacro{t
\begin{tdocnote}
- As the text \tdocquote{in English} is translated into the language indicated when \tdocpack{tutodoc} is imported, the macro \tdocmacro{tdocinEN} and its starred version become useful for non-English speakers.
+ As the text \tdocquote{in English} is translated into the language indicated when \thispack{} is imported, the macro \tdocmacro{tdocinEN} and its starred version become useful for non-English speakers.
\end{tdocnote}
@@ -496,133 +533,165 @@ The macro \tdocmacro{tdocinEN} and its starred version are based on \tdocmacro{t
\begin{tdocnote}
The environments presented in this section
\footnote{
- The formatting comes from the \tdocpack{amsthm} package.
+ The formatting comes from the \tdocpack{keytheorems} package.
}
add a short title indicating the type of information provided.
- This short text will always be translated into the language indicated when the \tdocpack{tutodoc} package is loaded.
+ This short text will always be translated into the language indicated when the \thispack{} package is loaded.
\end{tdocnote}
+\subsection{Content in the reading flow}
+
+
% ------------------ %
-\subsection{Examples}
+\begin{tdocimp}
+ All the environments presented in this section share the same counter.
+\end{tdocimp}
-Numbered or unnumbered examples can be indicated using the \tdocenv{tdocexa} environment, which offers two optional arguments.
-\begin{enumerate}
- \item The \ordinalnum{1} argument between brackets \tdocinlatex#<...># can take the values \tdocinlatex#nb# to number, which is the default setting, and \tdocinlatex#nonb# to not number.
+% ------------------ %
- \item The \ordinalnum{2} argument in square brackets \tdocinlatex#[...]# is used to add a mini-title..
-\end{enumerate}
+\subsubsection{Examples}
-Here are some possible uses.
+Numbered examples, if required, are indicated via \tdocenv{tdocexa}, which offers an optional argument for adding a mini-title.
+Here are two possible uses.
\tdoclatexinput[sbs]{examples-focus-exa.tex}
+
% ------------------ %
-\begin{tdocimportant}
- The numbering of the examples is reset to zero as soon as a section with a level at least equal to a \tdocinlatex|\subsubsection| is opened.
-\end{tdocimportant}
+\begin{tdocimp}
+ The numbering of the examples is reset to zero as soon as a section with a level at least equal to a \tdocinlatex|\section| is opened.
+\end{tdocimp}
% ------------------ %
\begin{tdoctip}
- It can sometimes be useful to return to the line at the start of the content. Here's how to do it (this trick remains valid for the environments presented in the following sub-sections). Note in passing that the numbering follows that of the previous example as desired.
-
- \tdoclatexinput[sbs]{examples-focus-exa-leavevmode.tex}
+ It can sometimes be useful to return to the line at the start of the content. The code below shows how to proceed (this trick also applies to the \verb#tdocrem# environment presented next). Note in passing that the numbering follows that of the previous example as desired.
\end{tdoctip}
+\tdoclatexinput[sbs]{examples-focus-exa-leavevmode.tex}
+
+
-\subsection{Some remarks}
+% \subsection{Content in the reading flow}
-Everything happens via the \tdocenv{tdocrem} environment, as in the following example.
+\subsubsection{Some remarks}
+
+Everything happens via \tdocenv{tdocrem}, which works identically to the \tdocenv*{tdocexa} environment, as shown in the following example.
\tdoclatexinput[sbs]{examples-focus-rmk.tex}
-\subsection{A tip}
-The \tdocenv{tdoctip} environment is used to give tips. Here's how to use it.
+\subsection{Flashy content} \label{tdoc-colorful-focus}
+
+\begin{tdocnote}
+ Icons are obtained via the \tdocpack{fontawesome5} package, and text spacing is managed by the \tdocmacro{tdocicon} macro.
+ \footnote{
+ For example,
+ \tdocinlatex|\tdocicon{\faBed}{Tired}|
+ produces\,
+ \tdocicon{\faBed}{Tired}.
+ }
+\end{tdocnote}
+
+
+\subsubsection{A tip}
+
+The \tdocenv*{tdoctip} environment is used to give tips. Here's how to use it.
\tdoclatexinput[sbs]{examples-focus-tip.tex}
-\subsection{Informative note}
-The \tdocenv{tdocnote} environment is used to highlight useful information. Here's how to use it.
+\smallskip
+
+\begin{tdocnote}
+ Colors are obtained via the expandable macros \tdocmacro{tdocbackcolor} and \tdocmacro{tdocdarkcolor}.
+ For further information, please refer to the end of the section \ref{tdoc-color-macros} page \pageref{tdoc-color-macros}.
+\end{tdocnote}
+
+
+%\subsection{Flashy content}
+
+\subsubsection{Informative note}
+
+The \tdocenv*{tdocnote} environment is used to highlight useful information. Here's how to use it.
\tdoclatexinput[sbs]{examples-focus-note.tex}
-\subsection{Something important}
-The \tdocenv{tdocimportant} environment is used to indicate something important but harmless.
+%\subsection{Flashy content}
+
+\subsubsection{Something important}
+
+The \tdocenv*{tdocimp} environment is used to indicate something important but harmless.
\tdoclatexinput[sbs]{examples-focus-important.tex}
-\subsection{Caution about a delicate point}
-The \tdocenv{tdoccaution} environment is used to indicate a delicate point to the user. Here's how to use it.
+%\subsection{Flashy content}
-\tdoclatexinput[sbs]{examples-focus-caution.tex}
+\subsubsection{Caution about a delicate point}
+The \tdocenv*{tdoccaut} environment is used to indicate a delicate point to the user. Here's how to use it.
-\subsection{Warning of danger}
+\tdoclatexinput[sbs]{examples-focus-caution.tex}
-The \tdocenv{tdocwarn} environment is used to warn the user of a trap to avoid. Here's how to use it.
-\tdoclatexinput[sbs]{examples-focus-warn.tex}
+%\subsection{Flashy content}
-\section{Specify packages, classes, macros or environments}
+\subsubsection{Warning of danger}
-Here's what you can type semantically.
+The \tdocenv*{tdocwarn} environment is used to warn the user of a trap to avoid. Here's how to use it.
+\tdoclatexinput[sbs]{examples-focus-warn.tex}
-\begin{tdoclatex}[sbs]
-\tdoccls{myclass} is for...
-\tdocpack{mypackage} is for...
-\tdocmacro{onemacro} is for...
+\section{Specify packages, classes, macros or environments}
-\tdocenv{env} produces...
+Here's what you can type semantically.
-We also have :
-\tdocenv[{[opt1]<opt2>}]{env}
+\begin{tdoclatex}[sbs]
+\tdoccls{myclass} is for... \\
+\tdocpack{mypackage} is for... \\
+\tdocmacro{onemacro} is for... \\
+\tdocenv{env} produces... \\
+\tdocenv[{[opt1]<opt2>}]{env} \\
+Just \tdocenv*{env}... \\
+Finally \tdocenv*[{[opt1]<opt2>}]{env}...
\end{tdoclatex}
\begin{tdocrem}
- The advantage of the previous macros over the use of \tdocmacro{tdocinlatex}, see the section \ref{tdoc-listing-inline} page \pageref{tdoc-listing-inline}, is the absence of colouring.
- Furthermore, the \tdocmacro{tdocenv} macro simply asks you to type the name of the environment
- \footnote{
- In addition, \tdocinlatex{\tdocenv{monenv}} produces \tdocenv{monenv} with spaces to allow line breaks if necessary.
- }
- with any options by typing the correct delimiters
- \footnote{
- Remember that almost anything is possible from now on.
- }
- by hand.
+ Unlike \tdocmacro{tdocinlatex}, \tdocmacro{tdocenv} and \tdocmacro{tdocenv*} macros don't color the text they produce.
+ In addition, \tdocinlatex{\tdocenv{monenv}} produces \tdocenv{monenv} with spaces to allow line breaks if required.
\end{tdocrem}
\begin{tdocwarn}
- The optional argument to the \tdocmacro{tdocenv} macro is copied and pasted during rendering. This can sometimes require the use of protective braces, as in the previous example.
+ The optional argument of the \tdocmacro{tdocenv} macro is copied and pasted
+ \footnote{
+ Remember that almost anything is possible from now on.
+ }
+ when rendering. This may sometimes require the use of protective braces, as in the example above.
\end{tdocwarn}
-% -------------------- %
-
\section{Origin of a prefix or suffix}
@@ -630,10 +699,8 @@ To explain the names chosen, there is nothing like indicating and explaining the
\begin{tdoclatex}[sbs]
-\tdocpre{sup} relates to...
-
-\tdocprewhy{sup.erbe} means...
-
+\tdocpre{sup} relates to... \\
+\tdocprewhy{sup.erbe} means... \\
\emph{\tdocprewhy{sup.er} for...}
\end{tdoclatex}
@@ -648,30 +715,30 @@ To explain the names chosen, there is nothing like indicating and explaining the
It is sometimes useful to render code directly in the documentation. This type of rendering must be dissociable from the explanatory text.
-% ------------------ %
-
-\subsection{With a coloured stripe}
+\subsection{With a coloured stripe} \label{tdoc-color-macros}
\begin{tdocexa} [With default text]
- It can be useful to show a real rendering directly in a document
+ It can be useful to show a real rendering directly in a document.
\footnote{
Typically when making a demo.
- }.
+ }
This is done via \tdocenv{tdocshowcase} as follows.
\tdoclatexinput[code]{examples-showcase-default.tex}
- The result is the following rendering
+
+ The result is the following rendering.
\footnote{
Behind the scenes, the strip is created effortlessly using the \tdocpack{clrstrip} package.
- }.
+ }
+\end{tdocexa}
+
+\input{examples-showcase-default.tex}
- \medskip
- \input{examples-showcase-default.tex}
-\end{tdocexa}
+\smallskip
\begin{tdocrem}
See the section \ref{tdoc-latexshow} on page \pageref{tdoc-latexshow} to easily obtain code followed by its actual rendering as in the previous example.
@@ -679,7 +746,7 @@ It is sometimes useful to render code directly in the documentation. This type o
\begin{tdocnote}
- The explanatory texts adapt to the language chosen when \tdocpack{tutodoc} is loaded.
+ The explanatory texts adapt to the language chosen when \thispack{} is loaded.
\end{tdocnote}
@@ -691,21 +758,43 @@ It is sometimes useful to render code directly in the documentation. This type o
\tdoclatexinput[code]{examples-showcase-customized.tex}
+
This will produce the following.
\medskip
\input{examples-showcase-customized.tex}
+
\end{tdocexa}
\begin{tdocnote}
- You will have noticed that we don't obtain a pure red: behind the scenes, the expandable macros \tdocmacro{tdocbackcolor} and \tdocmacro{tdocdarkcolor} are used to create the background and title colours respectively from the ones proposed in \tdocenv{tdocshowcase}.
- These macros have a single argument, the chosen colour, and accept the following codes.
+ You've probably noticed that red is used as a base to obtain the colors used.
+
+ \begin{itemize}
+ \item The background color is provided by \tdocmacro{tdocbackcolor}.
+
+ \item The color of titles and lines is provided by \tdocmacro{tdocdarkcolor}.
+ \end{itemize}
+
+ These expandable macros accept the following codes.
\begin{tdoclatex}[code]
-\NewExpandableDocumentCommand{\tdocbackcolor}{m}{#1!5}
-\NewExpandableDocumentCommand{\tdocdarkcolor}{m}{#1!50!black}
+% Argument 1 : optionally, the amount of color relative to black can be specified.
+% In general, there's no need to change this setting!
+% Argument 2 : a color in xcolor format.
+\NewExpandableDocumentCommand{\tdocdarkcolor}{O{50}m}{#2!#1!black}
+
+% Argument 1 : optionally, the transparency rate can be specified.
+% In general, there's no need to change this setting!
+% Argument 2 : a color in xcolor format.
+\NewExpandableDocumentCommand{\tdoclightcolor}{O{5}m}{#2!#1}
+ \end{tdoclatex}
+
+ You also have to know that behind the scene, the \tdocmacro{tdocruler} macro is used.
+
+ \begin{tdoclatex}[std]
+ \tdocruler{A decorated pseudo-title}{red}
\end{tdoclatex}
\end{tdocnote}
@@ -718,21 +807,13 @@ It is sometimes useful to render code directly in the documentation. This type o
\tdoclatexinput[code]{examples-showcase-hook.tex}
- This will produce the following.
-
- \medskip
- \input{examples-showcase-hook.tex}
+ This will produce the following.
\end{tdocwarn}
-\begin{tdocnote}
- Behind the scenes, the \tdocmacro{tdocruler} macro is used.
+\input{examples-showcase-hook.tex}
- \begin{tdoclatex}[std]
- \tdocruler{Un pseudo-titre décoré}{red}
- \end{tdoclatex}
-\end{tdocnote}
\subsection{Without a colour strip}
@@ -747,11 +828,13 @@ It is possible not to use a coloured strip, as we will see straight away.
\tdoclatexinput[code]{examples-showcase-no-clrstrip.tex}
+
This will produce the following.
\medskip
\input{examples-showcase-no-clrstrip.tex}
+
\end{tdocexa}
@@ -763,11 +846,13 @@ It is possible not to use a coloured strip, as we will see straight away.
\tdoclatexinput[code]{examples-showcase-no-clrstrip-customized.tex}
+
This will produce the following.
\medskip
\input{examples-showcase-no-clrstrip-customized.tex}
+
\end{tdocexa}
@@ -776,13 +861,14 @@ It is possible not to use a coloured strip, as we will see straight away.
To obtain renderings by importing the code from an external file, instead of typing it, simply use the \tdocmacro{tdocshowcaseinput} macro whose option uses the syntax of that of \tdocenv{tdocshowcase} and the mandatory argument corresponds to the path of the file.
-\begin{tdocexa}<nonb>
+\begin{tdocexa}
The following was obtained via \tdocinlatex+\tdocshowcaseinput{external.tex}+.
\medskip
\tdocshowcaseinput{examples-showcase-external.tex}
+
\medskip
As for \tdocinlatex+\tdocshowcaseinput[color = orange]{external.tex}+\,, this will produce the colour change shown below.
@@ -790,15 +876,22 @@ To obtain renderings by importing the code from an external file, instead of typ
\medskip
\tdocshowcaseinput[color = orange]{examples-showcase-external.tex}
+
\end{tdocexa}
\section{Use cases in \LaTeX}
-Documenting a package or a class is done efficiently using use cases showing both the code and the corresponding result.
+Documenting a package or class is best done through use cases showing both the code and the corresponding result.
+\footnote{
+ Code is formatted using the \tdocpack{minted} package.
+}
-% ------------------ %
+\begin{tdoccaut}
+ Version 3 of \tdocpack{minted} cannot be used at the moment, as it contains bugs: see \url{https://github.com/gpoore/minted/issues/401}. We therefore force the use of version 2 of minted.
+
+\end{tdoccaut}
\subsection{\tdocquote{Inline} codes} \label{tdoc-listing-inline}
@@ -822,7 +915,7 @@ Here are some examples.
The \tdocmacro{tdocinlatex} macro can be used in a footnote: see below.
\footnote{
\tdocinlatex+$minted = TOP$+ has been typed \tdocinlatex|\tdocinlatex+$minted = TOP$+| in this footnote...
- }.
+ }
In addition, a background color is deliberately used to subtly highlight the codes \tdocinlatex#\LaTeX#\,.
\end{tdocnote}
@@ -835,6 +928,7 @@ Here are some examples.
\begin{tdocexa}[Side by side]
Using \tdocenv[{[sbs]}]{tdoclatex}, we can display a code and its rendering side by side.
\tdocdocbasicinput{examples-listing-ABC.tex}
+
\end{tdocexa}
@@ -842,10 +936,10 @@ Here are some examples.
\begin{tdocexa}[Following]
- \tdocenv{tdoclatex} produces the following result, which corresponds to the default option \tdocinlatex#std#
+ \tdocenv{tdoclatex} produces the following result, which corresponds to the default option \tdocinlatex#std#\,.
\footnote{
\tdocinlatex{std} refers to the \tdocquote{standard} behaviour of \tdocpack{tcolorbox} in relation to the \tdocpack{minted} library.
- }.
+ }
\begin{tdoclatex}
$A = B + C$
@@ -872,10 +966,12 @@ Here are some examples.
With default formatting, if the code begins with an opening bracket, the default option must be explicitly indicated.
\tdocdocbasicinput{examples-listing-strange.tex}
+
\smallskip
Another method is to use the \tdocmacro{string} primitive.
\tdocdocbasicinput{examples-listing-strange-bis.tex}
+
\end{tdocwarn}
@@ -885,9 +981,10 @@ For the following codes, consider a file with the relative path \verb+examples-l
\tdoclatexinput[code]{examples-listing-xyz.tex}
+
\medskip
-The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file and offers the same options as the \tdocenv{tdoclatex} environment.
+The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file and offers the same options as the \tdocenv*{tdoclatex} environment.
% ------------------ %
@@ -898,11 +995,13 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoclatex}[code]
\tdoclatexinput[sbs]{examples-listing-xyz.tex}
+
\end{tdoclatex}
This produces the following layout.
\tdoclatexinput[sbs]{examples-listing-xyz.tex}
+
\end{tdocexa}
@@ -914,11 +1013,13 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoclatex}[code]
\tdoclatexinput{examples-listing-xyz.tex}
+
\end{tdoclatex}
This produces the following formatting where the default option is \tdocinlatex#std#.
\tdoclatexinput{examples-listing-xyz.tex}
+
\end{tdocexa}
@@ -930,11 +1031,13 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoclatex}[code]
\tdoclatexinput[code]{examples-listing-xyz.tex}
+
\end{tdoclatex}
This produces the following layout.
\tdoclatexinput[code]{examples-listing-xyz.tex}
+
\end{tdocexa}
@@ -950,12 +1053,13 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoc-doc-showcase}
\tdoclatexshow{examples-listing-xyz.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
\begin{tdocnote}
- The default texts take into account the language chosen when loading the package \tdocpack{tutodoc}.
+ The default texts take into account the language chosen when loading the package \thispack{}.
\end{tdocnote}
@@ -969,6 +1073,7 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoc-doc-showcase}
\tdoclatexshow[explain = Here is the actual rendering.]{examples-listing-xyz.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
@@ -977,13 +1082,14 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdocexa}[The options available]
- In addition to the explanatory text, it is also possible to use all the options of \tdocenv{tdocshowcase}, see \ref{tdoc-showcase} page \pageref{tdoc-showcase}.
+ In addition to the explanatory text, it is also possible to use all the options of \tdocenv*{tdocshowcase} environment, see \ref{tdoc-showcase} page \pageref{tdoc-showcase}.
Here is an example to illustrate this.
\medskip
\tdoclatexinput[code]{examples-listing-latexshow-options.tex}
+
\medskip
This will produce the following.
@@ -992,6 +1098,7 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
\begin{tdoc-doc-showcase}
\input{examples-listing-latexshow-options.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
@@ -1001,8 +1108,6 @@ The \tdocmacro{tdoclatexinput} macro, shown below, expects the path of a file an
To make it easier to monitor a package, it is essential to provide a history indicating the changes made when a new version is published.
-% ------------------ %
-
\subsection{When?}
@@ -1016,6 +1121,7 @@ You can either date something, or version it, in which case the version number c
The \tdocmacro{tdocdate} macro is used to indicate a date in the margin, as in the following example.
\tdoclatexshow{examples-version-n-change-dating.tex}
+
\end{tdocexa}
@@ -1026,18 +1132,17 @@ You can either date something, or version it, in which case the version number c
Associating a version number with a new feature is done using the \tdocmacro{tdocversion} macro, with the colour and date being optional arguments.
\tdoclatexshow{examples-version-n-change-versioning.tex}
-\end{tdocexa}
+\end{tdocexa}
-\begin{tdocimportant}
- \leavevmode
+\begin{tdocimp}
\begin{enumerate}
\item The \tdocmacro{tdocdate} and \tdocmacro{tdocversion} macros require two compilations.
- \item The final rendering of the dates takes into account the language specified when loading the package \tdocpack{tutodoc}: for example, if French is selected, the dates will be displayed in the format \texttt{DD/MM/YYYY}.
+ \item The final rendering of the dates takes into account the language specified when loading the package \thispack{}: for example, if French is selected, the dates will be displayed in the format \texttt{DD/MM/YYYY}.
\end{enumerate}
-\end{tdocimportant}
+\end{tdocimp}
\begin{tdocwarn}
@@ -1051,17 +1156,36 @@ You can either date something, or version it, in which case the version number c
\subsection{What's new?}
-\tdocpack{tutodoc} offers different environments to indicate quickly and clearly what has been done
+\thispack{} offers the macro \tdocmacro{tdocstartproj} and different environments to indicate quickly and clearly what has been done during the latest changes.%
\footnote{
The user doesn't need all the technical details.
}
-during the latest changes.
+
+
+\begin{tdocnote}
+ For icons, see the note at the beginning of the section \ref{tdoc-colorful-focus} page \pageref{tdoc-colorful-focus}.
+\end{tdocnote}
+
+
+% ------------------ %
+
+
+\begin{tdocexa}[Just for the very first version]
+ \leavevmode
+
+ \tdoclatexinput[sbs]{examples-version-n-change-first.tex}
+
+\end{tdocexa}
+
+
+% ------------------ %
\begin{tdocexa}[For new features]
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-new.tex}
+
\end{tdocexa}
@@ -1072,6 +1196,7 @@ during the latest changes.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-update.tex}
+
\end{tdocexa}
@@ -1082,6 +1207,7 @@ during the latest changes.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-break.tex}
+
\end{tdocexa}
@@ -1092,6 +1218,7 @@ during the latest changes.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-pb.tex}
+
\end{tdocexa}
@@ -1102,22 +1229,35 @@ during the latest changes.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-fix.tex}
+
+\end{tdocexa}
+
+
+% ------------------ %
+
+
+\begin{tdocexa}[Selectable themes with an icon]
+ \leavevmode
+
+ \tdoclatexinput[sbs]{examples-version-n-change-user-choice-icon.tex}
+
\end{tdocexa}
% ------------------ %
-\begin{tdocexa}[Chosen topics]
+\begin{tdocexa}[Selectable themes without icons]
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-user-choice.tex}
+
\end{tdocexa}
\section{Ornaments}
-Let's finish this documentation with a few small formatting tools that can be very useful.
+Let's finish this documentation with a small formatting tool that is very useful.
\begin{tdoclatex}[sbs]
@@ -1129,72 +1269,161 @@ This works with enumerations.
\begin{itemize}
\item Underline.
-
- \item Something else useful.
\end{itemize}
\tdocsep % Uniform behaviour.
Ble, ble, ble...
+\end{tdoclatex}
-Bli, bli, bli...
-\tdocxspace % Subtle space
- % but useful.
+\section{History}
-Blo, blo, blo...
+\small
-Blu, blu, blu...
+\tdocversion{1.4.0}[2024-09-28]
+
+\begin{tdocbreak}
+ \item The \tdocenv*{tdoccaution} environment has been renamed \tdocenv*{tdoccaut} for simplified input.
+
+ \item Content highlighting: examples and remarks, indicated via the \tdocenv*{tdocexa} and \tdocenv*{tdocrem} environments, are always numbered, and share the same counter.
+
+ \item The unused macro \tdocmacro{tdocxspace} has been deleted.
+\end{tdocbreak}
+
+
+\begin{tdocnew}
+ \item Change log: the \tdocmacro{tdocstartproj} macro is used to manage the case of the first public version.
+
+ \item Code factorization: the \tdocmacro{tdocicon} macro is responsible for adding icons in front of text.
+\end{tdocnew}
+
+
+\begin{tdocupdate}
+ \item Colors: the \tdocmacro{tdocdarkcolor} and \tdocmacro{tdoclightcolor} macros offer an optional argument.
+ \begin{enumerate}
+ \item \tdocmacro{tdocdarkcolor} : the amount of color in relation to black can be optionally defined.
+
+ \item \tdocmacro{tdoclightcolor} : the transparency rate can be optionally defined.
+ \end{enumerate}
+
+ \item Content highlighting: reduced space around content in colored frames.
+
+ \item Versioning: better vertical spacing thanks to \tdocmacro{vphantom}.
+\end{tdocupdate}
+
+\tdocsep
+
+
+% ------------------ %
+
+
+\tdocversion{1.3.1}[2024-09-26]
+
+\begin{tdocnew}
+ \item Star version of \tdocmacro{tdocenv} to display only the environment name.
+\end{tdocnew}
+
+\tdocsep
+
+
+% ------------------ %
+
+
+\tdocversion{1.3.0}[2024-09-25]
+
+\begin{tdocprob}
+ \item Version 3 of \tdocpack{minted} cannot be used for the moment as it contains bugs: see \url{https://github.com/gpoore/minted/issues/401}. We therefore force the use of version 2 of \tdocpack{minted}.
+\end{tdocprob}
+
+
+\begin{tdocbreak}
+ \item The \tdocenv*{tdocimportant} environment has been renamed \tdocenv*{tdocimp} for simplified input.
+\end{tdocbreak}
+
+
+\begin{tdocnew}
+ \item Change log: proposed environments use icons.
+
+
+ \item Content highlighting: colored frames with icons are proposed for the following environments.
+ \bgroup
+ \setlength\multicolsep{5pt}
+ \begin{multicols}{3}
+ \begin{enumerate}[topsep=0pt]
+ \item \tdocenv*{tdoccaution}
+ \item \tdocenv*{tdocimp}
+ \item \tdocenv*{tdocnote}
+ \item \tdocenv*{tdoctip}
+ \item \tdocenv*{tdocwarn}
+ \end{enumerate}
+ \end{multicols}
+ \egroup
+\end{tdocnew}
+
+\tdocsep
+
+
+% ------------------ %
-\end{tdoclatex}
-\section{History}
\tdocversion{1.2.0-a}[2024-08-23]
\begin{tdocupdate}
- \item \tdocmacro{tdocversion}
+ \item \tdocmacro{tdocversion}
\begin{enumerate}
- \item The version number is above the date.
+ \item The version number is above the date.
- \item The spacing is better managed when the date is absent.
+ \item The spacing is better managed when the date is absent.
\end{enumerate}
\end{tdocupdate}
\begin{tdocfix}
- \item Content highlighting: the French translations of \tdocinEN*{caution} and \tdocinEN*{danger} were incorrect.
+ \item Content highlighting: the French translations of \tdocinEN*{caution} and \tdocinEN*{danger} were incorrect.
\end{tdocfix}
\tdocsep
+
+% ------------------ %
+
+
\tdocversion{1.1.0}[2024-01-06]
\begin{tdocnew}
- \item Change log : two new environments.
+ \item Change log : two new environments.
\begin{enumerate}
\item \tdocenv{tdocbreak} for breaking changes which are not backward compatible.
\item \tdocenv{tdocprob} for identified problems.
\end{enumerate}
- \item \tdocmacro{tdocinlatex}: a light yellow is used as the background color.
+ \item \tdocmacro{tdocinlatex}: a light yellow is used as the background color.
\end{tdocnew}
\tdocsep
+
+% ------------------ %
+
+
\tdocversion{1.0.1}[2023-12-08]
\begin{tdocfix}
- \item \tdocmacro{tdocenv}: spacing is now correct, even if the \tdocpack{babel} package is not loaded with the French language.
+ \item \tdocmacro{tdocenv}: spacing is now correct, even if the \tdocpack{babel} package is not loaded with the French language.
- \item \tdocenv[{[nostripe]}]{tdocshowcase}: page breaks around \tdocquote{framing} lines should be rare from now on.
+ \item \tdocenv[{[nostripe]}]{tdocshowcase}: page breaks around \tdocquote{framing} lines should be rare from now on.
\end{tdocfix}
\tdocsep
-\tdocversion{1.0.0}[2023-11-29]
-First public version of the project.
+% ------------------ %
+
+
+\tdocversion{1.0.0}[2023-11-29]
+\tdocstartproj{First public version of the project.}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.pdf b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.pdf
index 070a6b3f5a9..1ef6d23a798 100644
--- a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.tex b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.tex
index 011e390f258..a51fa2df4ba 100644
--- a/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.tex
+++ b/Master/texmf-dist/doc/latex/tutodoc/tutodoc-fr.tex
@@ -1,34 +1,110 @@
+% ==================== %
+% == RESOURCES USED == %
+% ==================== %
-% -------------------- %
-% -- RESOURCES USED -- %
-% -------------------- %
+\begin{filecontents*}[overwrite]{examples-version-n-change-dating.tex}
+Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\begin{filecontents*}[overwrite]{examples-focus-exa.tex}
-Bla, bla, bla...
+\medskip % ATTENTION ! Ceci évite le chevauchement.
-\begin{tdocexa}
- Ble, ble, ble...
-\end{tdocexa}
+\tdocdate{2023-09-24}
-\begin{tdocexa}[Magnifique]
- Bli, bli, bli...
-\end{tdocexa}
+Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
-\begin{tdocexa}<nonb>
- Blo, blo, blo...
-\end{tdocexa}
+\medskip % ATTENTION ! Ceci évite le chevauchement.
-\begin{tdocexa}<nonb>[Superbe]
- Blu, blu, blu...
-\end{tdocexa}
+\tdocdate[gray]{2020-05-08}
+
+Bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli...
+
+Blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo...
+
+Blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu...
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice-icon.tex}
+\begin{tdoctopic}{Ne pas regarder}[\faEyeSlash]
+% Une icône venant de fontawesome5.
+ \item Info 1...
+ \item Info 2...
+\end{tdoctopic}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice.tex}
+\begin{tdoctopic}{La fin des icônes}
+ \item Info 1...
+ \item Info 2...
+\end{tdoctopic}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-update.tex}
+\begin{tdocupdate}
+ \item Info 1...
+ \item Info 2...
+\end{tdocupdate}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-versioning.tex}
+\tdocversion[red]{10.2.0-beta}[2023-12-01]
+
+Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+
+\bigskip % ATTENTION ! Ceci évite le chevauchement.
+
+\tdocversion{10.2.0-alpha}
+
+Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
+ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-first.tex}
+\tdocstartproj{Première version du projet.}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-break.tex}
+\begin{tdocbreak}
+ \item Info 1...
+ \item Info 2...
+\end{tdocbreak}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-pb.tex}
+\begin{tdocprob}
+ \item Info 1...
+ \item Info 2...
+\end{tdocprob}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-new.tex}
+\begin{tdocnew}
+ \item Info 1...
+ \item Info 2...
+\end{tdocnew}
+\end{filecontents*}
+
+
+\begin{filecontents*}[overwrite]{examples-version-n-change-fix.tex}
+\begin{tdocfix}
+ \item Info 1...
+ \item Info 2...
+\end{tdocfix}
\end{filecontents*}
\begin{filecontents*}[overwrite]{examples-focus-exa-leavevmode.tex}
\begin{tdocexa}
\leavevmode
-
\begin{enumerate}
\item Point 1.
@@ -38,25 +114,14 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-rmk.tex}
-\begin{tdocrem}
- Juste une remarque...
-\end{tdocrem}
-
-\begin{tdocrem}[Mini titre]
- Utile ?
-\end{tdocrem}
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-focus-tip.tex}
-\begin{tdoctip}
- Une astuce.
-\end{tdoctip}
+\begin{filecontents*}[overwrite]{examples-focus-important.tex}
+\begin{tdocimp}
+ Un truc important sans danger.
+\end{tdocimp}
-\begin{tdoctip}[Mini titre]
+\begin{tdocimp}[Mini titre]
Utile ?
-\end{tdoctip}
+\end{tdocimp}
\end{filecontents*}
@@ -71,25 +136,25 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-important.tex}
-\begin{tdocimportant}
- Un truc important sans danger.
-\end{tdocimportant}
+\begin{filecontents*}[overwrite]{examples-focus-caution.tex}
+\begin{tdoccaut}
+ Prudence, prudence...
+\end{tdoccaut}
-\begin{tdocimportant}[Mini titre]
+\begin{tdoccaut}[Mini titre]
Utile ?
-\end{tdocimportant}
+\end{tdoccaut}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-focus-caution.tex}
-\begin{tdoccaution}
- Prudence, prudence...
-\end{tdoccaution}
+\begin{filecontents*}[overwrite]{examples-focus-tip.tex}
+\begin{tdoctip}
+ Une astuce.
+\end{tdoctip}
-\begin{tdoccaution}[Mini titre]
+\begin{tdoctip}[Mini titre]
Utile ?
-\end{tdoccaution}
+\end{tdoctip}
\end{filecontents*}
@@ -104,52 +169,34 @@ Bla, bla, bla...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-default.tex}
-\begin{tdocshowcase}
- \bfseries Un peu de code \LaTeX.
-
- \bigskip
-
- \emph{\large Fin de l'affreuse démo.}
-\end{tdocshowcase}
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-showcase-customized.tex}
-\begin{tdocshowcase}[before = Mon début,
- after = Ma fin à moi,
- color = red]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
-\end{filecontents*}
-
+\begin{filecontents*}[overwrite]{examples-focus-exa.tex}
+\begin{tdocexa}
+ Un exemple...
+\end{tdocexa}
-\begin{filecontents*}[overwrite]{examples-showcase-hook.tex}
-\begin{tdocshowcase}
- \string[Cela fonctionne...]
-\end{tdocshowcase}
+\begin{tdocexa}[Mini titre]
+ Utile ?
+\end{tdocexa}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip.tex}
-\begin{tdocshowcase}[nostripe]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
-\end{filecontents*}
-
+\begin{filecontents*}[overwrite]{examples-focus-rmk.tex}
+\begin{tdocrem}
+ Juste une remarque...
+\end{tdocrem}
-\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip-customized.tex}
-\begin{tdocshowcase}[nostripe,
- before = Mon début,
- after = Ma fin à moi,
- color = green]
- Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-\end{tdocshowcase}
+\begin{tdocrem}[Mini titre]
+ Utile ?
+\end{tdocrem}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-showcase-external.tex}
-Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
+\begin{filecontents*}[overwrite]{examples-listing-latexshow-options.tex}
+\tdoclatexshow[explain = Ce qui vient est coloré...,
+ before = Rendu ci-après.,
+ after = Rendu fini.,
+ color = orange]
+ {examples-listing-xyz.tex}
\end{filecontents*}
@@ -160,6 +207,12 @@ Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
+\begin{filecontents*}[overwrite]{examples-listing-xyz.tex}
+% Juste une démo.
+$x y z = 1$
+\end{filecontents*}
+
+
\begin{filecontents*}[overwrite]{examples-listing-strange.tex}
\begin{tdoclatex}[std]
[Étrange... Ou pas !]
@@ -174,110 +227,58 @@ Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-listing-xyz.tex}
-% Juste une démo.
-$x y z = 1$
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-listing-latexshow-options.tex}
-\tdoclatexshow[explain = Ce qui vient est coloré...,
- before = Rendu ci-après.,
- after = Rendu fini.,
- color = orange]
- {examples-listing-xyz.tex}
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-version-n-change-dating.tex}
-Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-
-\medskip % ATTENTION ! Ceci évite le chevauchement.
-
-\tdocdate{2023-09-24}
-
-Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
-
-\medskip % ATTENTION ! Ceci évite le chevauchement.
-
-\tdocdate[gray]{2020-05-08}
-
-Bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli, bli...
-
-Blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo, blo...
-
-Blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu, blu...
-\end{filecontents*}
-
-
-\begin{filecontents*}[overwrite]{examples-version-n-change-versioning.tex}
-\tdocversion[red]{10.2.0-beta}[2023-12-01]
-
-Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
-
-\bigskip % ATTENTION ! Ceci évite le chevauchement.
-
-\tdocversion{10.2.0-alpha}
-
-Ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble,
-ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
+\begin{filecontents*}[overwrite]{examples-showcase-customized.tex}
+\begin{tdocshowcase}[before = Mon début,
+ after = Ma fin à moi,
+ color = red]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-new.tex}
-\begin{tdocnew}
- \item Info 1...
- \item Info 2...
-\end{tdocnew}
+\begin{filecontents*}[overwrite]{examples-showcase-hook.tex}
+\begin{tdocshowcase}
+ \string[Cela fonctionne...]
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-update.tex}
-\begin{tdocupdate}
- \item Info 1...
- \item Info 2...
-\end{tdocupdate}
+\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip-customized.tex}
+\begin{tdocshowcase}[nostripe,
+ before = Mon début,
+ after = Ma fin à moi,
+ color = green]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-break.tex}
-\begin{tdocbreak}
- \item Info 1...
- \item Info 2...
-\end{tdocbreak}
+\begin{filecontents*}[overwrite]{examples-showcase-external.tex}
+Blablobli, blablobli, blablobli, blablobli, blablobli, blablobli...
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-pb.tex}
-\begin{tdocprob}
- \item Info 1...
- \item Info 2...
-\end{tdocprob}
-\end{filecontents*}
+\begin{filecontents*}[overwrite]{examples-showcase-default.tex}
+\begin{tdocshowcase}
+ \bfseries Un peu de code \LaTeX.
+ \bigskip
-\begin{filecontents*}[overwrite]{examples-version-n-change-fix.tex}
-\begin{tdocfix}
- \item Info 1...
- \item Info 2...
-\end{tdocfix}
+ \emph{\large Fin de l'affreuse démo.}
+\end{tdocshowcase}
\end{filecontents*}
-\begin{filecontents*}[overwrite]{examples-version-n-change-user-choice.tex}
-\begin{tdoctopic}{C'est mon choix}
-% Ici le point s'impose.
- \item Info 1...
- \item Info 2...
-\end{tdoctopic}
+\begin{filecontents*}[overwrite]{examples-showcase-no-clrstrip.tex}
+\begin{tdocshowcase}[nostripe]
+ Bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla, bla...
+\end{tdocshowcase}
\end{filecontents*}
-% ------------------------ %
-% -- SOURCE FOR THE DOC -- %
-% ------------------------ %
+% ======================== %
+% == SOURCE FOR THE DOC == %
+% ======================== %
\documentclass[10pt, a4paper]{article}
@@ -289,6 +290,10 @@ ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
\usepackage{enumitem}
\frenchsetup{StandardItemLabels=true}
+\usepackage{multicol}
+
+\newcommand\thispack{\tdocpack{tutodoc}}
+
% Package documented.
\usepackage[lang = french]{tutodoc}
@@ -336,57 +341,71 @@ ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble, ble...
}
-
\begin{document}
+
\title{Le package \texttt{tutodoc} - Documentation de type tutoriel}
\author{Christophe BAL}
-\date{23 Août 2024 - Version 1.2.0-a}
+\date{28 sept. 2024 - Version 1.4.0}
\maketitle
\begin{abstract}
-Le package \tdocpack{tutodoc}
-\footnote{
- Le nom vient de \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}} se traduit en \tdocquote{documentation de type tutoriel}.
-}
-est utilisé par son auteur pour produire de façon sémantique des documentations de packages et de classes \LaTeX\ dans un style de type tutoriel
-\footnote{
- L'idée est de produire un fichier \texttt{PDF} efficace à parcourir pour des besoins ponctuels. C'est généralement ce que l'on attend d'une documentation liée au codage.
-},
-et avec un rendu sobre pour une lecture sur écran.
-
-
-\begin{tdocnote}
- Ce package impose un style de mise en forme.
- Dans un avenir plus ou moins proche, \tdocpack{tutodoc} sera sûrement éclaté en une classe et un package.
-\end{tdocnote}
-
-\tdocsep
-
-{\small\itshape
-\textbf{Abstract.}
-The \tdocpack{tutodoc} package
-\footnote{
- The name comes from \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}}.
-}
-is used by its author to semantically produce documentation of \LaTeX\ packages and classes in a tutorial style
-\footnote{
- The idea is to produce an efficient \texttt{PDF} file that can be browsed for one-off needs. This is generally what is expected of coding documentation.
-},
-and with a sober rendering for reading on screen.
+ Le package \thispack{}\,%
+ \footnote{
+ Le nom vient de \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}} qui se traduit en \tdocquote{documentation de type tutoriel}.
+ }
+ est utilisé par son auteur pour produire de façon sémantique des documentations de packages et de classes \LaTeX\ dans un style de type tutoriel,%
+ \footnote{
+ L'idée est de produire un fichier \texttt{PDF} efficace à parcourir pour des besoins ponctuels. C'est généralement ce que l'on attend d'une documentation liée au codage.
+ }
+ et avec un rendu sobre pour une lecture sur écran.
+ \medskip
-\begin{tdocnote}
- This package imposes a formatting style. In the not-too-distant future, \tdocpack{tutodoc} will probably be split into a class and a package.
-\end{tdocnote}
-}
+ \noindent
+ Deux points importants à noter.
+ \begin{itemize}
+ \item Ce package impose un style de mise en forme. Dans un avenir plus ou moins proche, \thispack{} sera sûrement éclaté en une classe et un package.
+
+ \item Cette documentation est aussi disponible en anglais.
+ \end{itemize}
+
+ \tdocsep
+
+ {\small\itshape
+ \vspace{-5pt}
+ \begin{center}
+ \textbf{Abstract.}
+ \end{center}
+
+ The \thispack{} package\,%
+ \footnote{
+ The name comes from \tdocquote{\tdocprewhy{tuto.rial-type} \tdocprewhy{doc.umentation}}.
+ }
+ is used by its author to semantically produce documentation of \LaTeX\ packages and classes in a tutorial style,%
+ \footnote{
+ The idea is to produce an efficient \texttt{PDF} file that can be browsed for one-off needs. This is generally what is expected of coding documentation.
+ }
+ and with a sober rendering for reading on screen.
+
+ \medskip
+
+ Two important points to note.
+ \begin{itemize}
+ \item This package imposes a formatting style. In the not-too-distant future, \thispack{} will probably be split into a class and a package.
+
+ \item This documentation is also available in French.
+ \end{itemize}
+ }
\end{abstract}
\newpage
\tableofcontents
\newpage
+
+
\section{Mises en forme générales imposées}
\subsection{Géométrie de la page}
@@ -504,7 +523,7 @@ La macro \tdocmacro{tdocinEN} et sa version étoilée s'appuient sur \tdocmacro{
\begin{tdocnote}
- Le texte \tdocquote{en anglais} est traduit dans la langue indiquée lors de l'importation de \tdocpack{tutodoc}.
+ Le texte \tdocquote{en anglais} est traduit dans la langue indiquée lors de l'importation de \thispack{}.
\end{tdocnote}
@@ -513,133 +532,166 @@ La macro \tdocmacro{tdocinEN} et sa version étoilée s'appuient sur \tdocmacro{
\begin{tdocnote}
Les environnements présentés dans cette section
\footnote{
- La mise en forme provient du package \tdocpack{amsthm}.
+ La mise en forme provient du package \tdocpack{keytheorems}.
}
ajoutent un court titre indiquant le type d'informations fournies.
- Ce court texte sera toujours traduit dans la langue indiquée lors du chargement du package \tdocpack{tutodoc}.
+ Ce court texte sera toujours traduit dans la langue indiquée lors du chargement du package \thispack{}.
\end{tdocnote}
+
+\subsection{Du contenu dans le flot de la lecture}
+
+
% ------------------ %
-\subsection{Des exemples}
+\begin{tdocimp}
+ Tous les environnements présentés dans cette section partagent le même compteur.
+\end{tdocimp}
-Des exemples numérotés, ou non, s'indiquent via l'environnement \tdocenv{tdocexa} qui propose deux arguments optionnels.
-\begin{enumerate}
- \item Le 1\ier{} argument entre chevrons \tdocinlatex#<...># peut prendre au choix les valeurs \tdocinlatex#nb# pour numéroter, réglage par défaut, et \tdocinlatex#nonb# pour ne pas numéroter.
+% ------------------ %
- \item Le 2\ieme{} argument entre crochets \tdocinlatex#[...]# sert à ajouter un mini-titre.
-\end{enumerate}
+\subsubsection{Des exemples}
-Voici différents emplois possibles.
+Des exemples numérotés, si besoin, s'indiquent via \tdocenv{tdocexa} qui propose un argument optionnel pour ajouter un mini-titre.
+Voici deux usages possibles.
\tdoclatexinput[sbs]{examples-focus-exa.tex}
+
% ------------------ %
-\begin{tdocimportant}
- La numérotation des exemples est remise à zéro dès qu'une section de niveau au moins égale à une \tdocinlatex|\subsubsection| est ouverte.
-\end{tdocimportant}
+\begin{tdocimp}
+ La numérotation des exemples est remise à zéro dès qu'une section de niveau au moins égale à une \tdocinlatex|\section| est ouverte.
+\end{tdocimp}
% ------------------ %
\begin{tdoctip}
- Il peut parfois être utile de revenir à la ligne dès le début du contenu. Voici comment faire (ce tour de passe-passe reste valable pour les environnements présentés dans les sous-sections suivantes). Noter au passage que la numérotation suit celle de l'exemple précédent comme souhaité.
-
- \tdoclatexinput[sbs]{examples-focus-exa-leavevmode.tex}
+ Il peut parfois être utile de revenir à la ligne dès le début du contenu. Le code suivant montre comment faire (ce tour de passe-passe reste valable pour l'environnement \verb#tdocrem# présenté juste après). Noter au passage que la numérotation suit celle de l'exemple précédent comme souhaité.
\end{tdoctip}
+\tdoclatexinput[sbs]{examples-focus-exa-leavevmode.tex}
+
+
-\subsection{Des remarques}
+%\subsection{Du contenu dans le flot de la lecture}
-Tout se passe via l'environnement \tdocenv{tdocrem} comme dans l'exemple suivant.
+\subsubsection{Des remarques}
+
+Tout se passe via \tdocenv{tdocrem} avec un fonctionnement identique à l'environnement \tdocenv*{tdocexa} comme le montre l'exemple suivant.
\tdoclatexinput[sbs]{examples-focus-rmk.tex}
-\subsection{Une astuce}
-L'environnement \tdocenv{tdoctip} sert à donner des astuces. Voici comment l'employer.
+\subsection{Du contenu tape-à-l'oeil} \label{tdoc-colorful-focus}
+
+\begin{tdocnote}
+ Les icônes sont obtenues via le package \tdocpack{fontawesome5}, et la gestion de l'espacement avec le texte est faite par la macro \tdocmacro{tdocicon}.
+ \footnote{
+ Par exemple,
+ \tdocinlatex|\tdocicon{\faBed}{Fatigué}|
+ produit\,
+ \tdocicon{\faBed}{Fatigué}.
+ }
+\end{tdocnote}
+
+
+\subsubsection{Une astuce}
+
+L'environnement \tdocenv*{tdoctip} sert à donner des astuces. Voici comment l'employer.
\tdoclatexinput[sbs]{examples-focus-tip.tex}
-\subsection{Note informative}
-L'environnement \tdocenv{tdocnote} sert à mettre en avant des informations utiles. Voici comment l'utiliser.
+\smallskip
+
+\begin{tdocnote}
+ Les couleurs sont obtenues via les macros développables \tdocmacro{tdocbackcolor} et \tdocmacro{tdocdarkcolor}.
+ Pour des informations complémentaires à ce sujet, se reporter à la fin de la section \ref{tdoc-color-macros} page \pageref{tdoc-color-macros}.
+\end{tdocnote}
+
+
+%\subsection{Du contenu tape-à-l'oeil}
+
+\subsubsection{Note informative}
+
+L'environnement \tdocenv*{tdocnote} sert à mettre en avant des informations utiles. Voici comment l'utiliser.
\tdoclatexinput[sbs]{examples-focus-note.tex}
-\subsection{Un truc important}
-L'environnement \tdocenv{tdocimportant} permet d'indiquer quelque chose d'important mais sans danger.
+%\subsection{Du contenu tape-à-l'oeil}
+
+\subsubsection{Un truc important}
+
+L'environnement \tdocenv*{tdocimp} permet d'indiquer quelque chose d'important mais sans danger.
\tdoclatexinput[sbs]{examples-focus-important.tex}
-\subsection{Avertir d'un point très délicat}
-L'environnement \tdocenv{tdoccaution} sert à indiquer un point délicat à l'utilisateur. Voici comment l'employer.
+%\subsection{Du contenu tape-à-l'oeil}
-\tdoclatexinput[sbs]{examples-focus-caution.tex}
+\subsubsection{Avertir d'un point très délicat}
+L'environnement \tdocenv*{tdoccaut} sert à indiquer un point délicat à l'utilisateur. Voici comment l'employer.
-\subsection{Avertir d'un danger}
+\tdoclatexinput[sbs]{examples-focus-caution.tex}
-L'environnement \tdocenv{tdocwarn} sert à avertir l'utilisateur d'un piège à éviter. Voici comment l'employer.
-\tdoclatexinput[sbs]{examples-focus-warn.tex}
+%\subsection{Du contenu tape-à-l'oeil}
-\section{Indiquer des packages, des classes, des macros ou des environnements}
+\subsubsection{Avertir d'un danger}
-Voici ce qu'il est possible de taper de façon sémantique.
+L'environnement \tdocenv*{tdocwarn} sert à avertir l'utilisateur d'un piège à éviter. Voici comment l'employer.
+\tdoclatexinput[sbs]{examples-focus-warn.tex}
-\begin{tdoclatex}[sbs]
-\tdoccls{maclasse} sert à...
-\tdocpack{monpackage} est pour...
-\tdocmacro{unemacro} permet de...
+\section{Indiquer des packages, des classes, des macros ou des environnements}
-\tdocenv{env} produit...
+Voici ce qu'il est possible de taper de façon sémantique.
-On a aussi :
-\tdocenv[{[opt1]<opt2>}]{env}
+\begin{tdoclatex}[sbs]
+\tdoccls{maclasse} sert à... \\
+\tdocpack{monpackage} est pour... \\
+\tdocmacro{unemacro} permet de... \\
+\tdocenv{env} produit... \\
+\tdocenv[{[opt1]<opt2>}]{env} \\
+Juste \tdocenv*{env}... \\
+Enfin \tdocenv*[{[opt1]<opt2>}]{env}...
\end{tdoclatex}
\begin{tdocrem}
- L'intérêt des macros précédentes vis à vis de l'usage de \tdocmacro{tdocinlatex}, voir la section \ref{tdoc-listing-inline} page \pageref{tdoc-listing-inline}, est l'absence de coloration.
- De plus, la macro \tdocmacro{tdocenv} demande juste de taper le nom de l'environnement
- \footnote{
- De plus, \tdocinlatex{\tdocenv{monenv}} produit \tdocenv{monenv} avec des espaces afin d'autoriser des retours à la ligne si besoin.
- }
- avec des éventuelles options en tapant les bons délimiteurs
- \footnote{
- Se souvenir que tout est possible ou presque dorénavant.
- }
- à la main.
+ Contrairement à \tdocmacro{tdocinlatex}, les macros \tdocmacro{tdocenv} et \tdocmacro{tdocenv*} ne colorent pas le texte produit.
+ De plus, \tdocinlatex{\tdocenv{monenv}} produit \tdocenv{monenv} avec des espaces afin d'autoriser des retours à la ligne si besoin.
\end{tdocrem}
\begin{tdocwarn}
- L'argument optionnel de la macro \tdocmacro{tdocenv} est copié-collé lors du rendu. Ceci peut donc parfois nécessiter d'utiliser des accolades protectrices comme dans l'exemple précédent.
+ L'argument optionnel de la macro \tdocmacro{tdocenv} est copié-collé
+ \footnote{
+ Se souvenir que tout est possible ou presque dorénavant.
+ }
+ lors du rendu. Ceci peut donc parfois nécessiter d'utiliser des accolades protectrices comme dans l'exemple ci-dessus.
\end{tdocwarn}
-% -------------------- %
-
\section{Origine d'un préfixe ou d'un suffixe}
@@ -647,10 +699,8 @@ Pour expliquer les noms retenus, rien de tel que d'indiquer et expliciter les co
\begin{tdoclatex}[sbs]
-\tdocpre{sup} est relatif à...
-
-\tdocprewhy{sup.erbe} signifie...
-
+\tdocpre{sup} est relatif à... \\
+\tdocprewhy{sup.erbe} signifie... \\
\emph{\tdocprewhy{sup.er} pour...}
\end{tdoclatex}
@@ -665,10 +715,8 @@ Pour expliquer les noms retenus, rien de tel que d'indiquer et expliciter les co
Il est parfois utile d'obtenir directement le rendu d'un code dans la documentation. Ceci nécessite que ce type de rendu soit dissociable du texte donnant des explications.
-% ------------------ %
-
-\subsection{Avec une bande colorée}
+\subsection{Avec une bande colorée} \label{tdoc-color-macros}
\begin{tdocexa}[Avec les textes par défaut]
Il peut être utile de montrer un rendu réel directement dans un document.
@@ -679,6 +727,7 @@ Il est parfois utile d'obtenir directement le rendu d'un code dans la documentat
\tdoclatexinput[code]{examples-showcase-default.tex}
+
On obtient alors le rendu suivant.
\footnote{
En coulisse, la bande est créée sans effort grâce au package \tdocpack{clrstrip}.
@@ -687,6 +736,7 @@ Il est parfois utile d'obtenir directement le rendu d'un code dans la documentat
\medskip
\input{examples-showcase-default.tex}
+
\end{tdocexa}
@@ -696,7 +746,7 @@ Il est parfois utile d'obtenir directement le rendu d'un code dans la documentat
\begin{tdocnote}
- Les textes explicatifs s'adaptent à la langue choisie lors du chargement de \tdocpack{tutodoc}.
+ Les textes explicatifs s'adaptent à la langue choisie lors du chargement de \thispack{}.
\end{tdocnote}
@@ -708,21 +758,44 @@ Il est parfois utile d'obtenir directement le rendu d'un code dans la documentat
\tdoclatexinput[code]{examples-showcase-customized.tex}
+
Ceci produira ce qui suit.
\medskip
\input{examples-showcase-customized.tex}
+
\end{tdocexa}
\begin{tdocnote}
- Vous avez sûrement noté que l'on n'obtient pas un rouge pur : en coulisse les macros développables \tdocmacro{tdocbackcolor} et \tdocmacro{tdocdarkcolor} sont utilisées pour créer celles du fond et des titres respectivement à partir de la couleur proposée à \tdocenv{tdocshowcase}.
- Ces macros à un seul argument, la couleur choisie, admettent les codes suivants.
+ Vous avez sûrement remarqué que le rouge sert de base pour obtenir les couleurs utilisées.
+
+ \begin{itemize}
+ \item La couleur de fond est fournie par \tdocmacro{tdocbackcolor}.
+
+ \item La couleur des titres et des lignes est fournie par \tdocmacro{tdocdarkcolor}.
+ \end{itemize}
+
+ Ces macros développables admettent les codes suivants.
\begin{tdoclatex}[code]
-\NewExpandableDocumentCommand{\tdocbackcolor}{m}{#1!5}
-\NewExpandableDocumentCommand{\tdocdarkcolor}{m}{#1!50!black}
+% Argument 1 : de façon optionnelle, on peut indiquer la quantité de couleur
+% relativement au noir.
+% Il est en général inutile de modifier ce paramètre !
+% Argument 2 : une couleur au format xcolor.
+\NewExpandableDocumentCommand{\tdocdarkcolor}{O{50}m}{#2!#1!black}
+
+% Argument 1 : de façon optionnelle, on peut indiquer le taux de transparence.
+% Il est en général inutile de modifier ce paramètre !
+% Argument 2 : une couleur au format xcolor.
+\NewExpandableDocumentCommand{\tdoclightcolor}{O{5}m}{#2!#1}
+ \end{tdoclatex}
+
+ Il faut également savoir qu'en coulisse, la macro \tdocmacro{tdocruler} est utilisée.
+
+ \begin{tdoclatex}[std]
+ \tdocruler{Un pseudo-titre décoré}{red}
\end{tdoclatex}
\end{tdocnote}
@@ -735,21 +808,12 @@ Il est parfois utile d'obtenir directement le rendu d'un code dans la documentat
\tdoclatexinput[code]{examples-showcase-hook.tex}
- Ceci produira ce qui suit.
-
- \medskip
- \input{examples-showcase-hook.tex}
+ Ceci produira ce qui suit.
\end{tdocwarn}
+\input{examples-showcase-hook.tex}
-\begin{tdocnote}
- Il faut savoir qu'en coulisse la macro \tdocmacro{tdocruler} est utilisée.
-
- \begin{tdoclatex}[std]
- \tdocruler{Un pseudo-titre décoré}{red}
- \end{tdoclatex}
-\end{tdocnote}
\subsection{Sans bande colorée}
@@ -764,11 +828,13 @@ Il est possible de ne pas utiliser une bande colorée comme nous allons le voir
\tdoclatexinput[code]{examples-showcase-no-clrstrip.tex}
+
Ceci produira ce qui suit.
\medskip
\input{examples-showcase-no-clrstrip.tex}
+
\end{tdocexa}
@@ -780,11 +846,13 @@ Il est possible de ne pas utiliser une bande colorée comme nous allons le voir
\tdoclatexinput[code]{examples-showcase-no-clrstrip-customized.tex}
+
Ceci produira ce qui suit.
\medskip
\input{examples-showcase-no-clrstrip-customized.tex}
+
\end{tdocexa}
@@ -793,13 +861,14 @@ Il est possible de ne pas utiliser une bande colorée comme nous allons le voir
Pour obtenir des rendus en important le code depuis un fichier externe, au lieu de le taper, il suffit d'employer la macro \tdocmacro{tdocshowcaseinput} dont l'option reprend la syntaxe de celle de \tdocenv{tdocshowcase} et l'argument obligatoire correspond au chemin du fichier.
-\begin{tdocexa}<nonb>
+\begin{tdocexa}
Ce qui suit a été obtenu via \tdocinlatex+\tdocshowcaseinput{external.tex}+.
\medskip
\tdocshowcaseinput{examples-showcase-external.tex}
+
\medskip
Quant à \tdocinlatex+\tdocshowcaseinput[color = orange]{external.tex}+\,, ceci produira le changement de couleur observable ci-après.
@@ -807,15 +876,21 @@ Pour obtenir des rendus en important le code depuis un fichier externe, au lieu
\medskip
\tdocshowcaseinput[color = orange]{examples-showcase-external.tex}
+
\end{tdocexa}
\section{Cas d'utilisation en \LaTeX}
-Documenter un package ou une classe se fait efficacement via des cas d'utilisation montrant à la fois du code et le résultat correspondant.
+Documenter un package ou une classe se fait efficacement via des cas d'utilisation montrant à la fois du code et le résultat correspondant.%
+\footnote{
+ La mise en forme des codes se fait via le package \tdocpack{minted}.
+}
-% ------------------ %
+\begin{tdoccaut}
+ La version 3 de \tdocpack{minted} ne peut pas être prise en compte pour le moment car elle comporte des bugs : voir \url{https://github.com/gpoore/minted/issues/401}. On force donc l'usage de la version 2 de \tdocpack{minted}.
+\end{tdoccaut}
\subsection{Codes \tdocquote{en ligne}} \label{tdoc-listing-inline}
@@ -836,16 +911,14 @@ Voici des exemples d'utilisation.
\begin{tdocnote}
- La macro \tdocmacro{tdocinlatex} est utilisable dans une note de pied de page : voir plus bas
+ La macro \tdocmacro{tdocinlatex} est utilisable dans une note de pied de page : voir ci-dessous.
\footnote{
\tdocinlatex+$minted = TOP$+ a été tapé \tdocinlatex|\tdocinlatex+$minted = TOP$+| dans cette note de bas de page..
- }.
+ }
De plus, une couleur de fond est volontairement utilisée pour subtilement faire ressortir les codes \tdocinlatex#\LaTeX#\,.
\end{tdocnote}
-% ------------------ %
-
\subsection{Codes tapés directement}
@@ -853,6 +926,7 @@ Voici des exemples d'utilisation.
Via \tdocenv[{[sbs]}]{tdoclatex}, on affichera un code et son rendu côte à côte.
Indiquons que \tdocinlatex#sbs# est pour \tdocquote{\tdocprewhy{s.ide} \tdocprewhy{b.y} \tdocprewhy{s.ide}} soit \tdocinEN{côte à côte}.
\tdocdocbasicinput{examples-listing-ABC.tex}
+
\end{tdocexa}
@@ -860,10 +934,10 @@ Voici des exemples d'utilisation.
\begin{tdocexa}[À la suite]
- \tdocenv{tdoclatex} produit le résultat suivant qui correspond à l'option par défaut \tdocinlatex#std#
+ \tdocenv{tdoclatex} produit le résultat suivant qui correspond à l'option par défaut \tdocinlatex#std#\,.
\footnote{
\tdocinlatex{std} fait référence au comportement \tdocquote{standard} de \tdocpack{tcolorbox} vis à vis de la librairie \tdocpack{minted}.
- }.
+ }
\begin{tdoclatex}
$A = B + C$
@@ -890,10 +964,12 @@ Voici des exemples d'utilisation.
Avec la mise en forme par défaut, si le code commence par un crochet ouvrant, il faudra indiquer explicitement l'option par défaut.
\tdocdocbasicinput{examples-listing-strange.tex}
+
\smallskip
Une autre méthode consiste à utiliser la primitive \tdocmacro{string}.
\tdocdocbasicinput{examples-listing-strange-bis.tex}
+
\end{tdocwarn}
@@ -903,9 +979,10 @@ Pour les codes suivants, on considère un fichier de chemin relatif \verb+exampl
\tdoclatexinput[code]{examples-listing-xyz.tex}
+
\medskip
-La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'un fichier et propose les mêmes options que l'environnement \tdocenv{tdoclatex}.
+La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'un fichier et propose les mêmes options que l'environnement \tdocenv*{tdoclatex}.
% ------------------ %
@@ -916,11 +993,13 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdoclatex}[code]
\tdoclatexinput[sbs]{examples-listing-xyz.tex}
+
\end{tdoclatex}
Ceci produit la mise en forme suivante.
\tdoclatexinput[sbs]{examples-listing-xyz.tex}
+
\end{tdocexa}
@@ -932,11 +1011,13 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdoclatex}[code]
\tdoclatexinput{examples-listing-xyz.tex}
+
\end{tdoclatex}
Ceci produit la mise en forme suivante où l'option employée par défaut est \tdocinlatex#std#.
\tdoclatexinput{examples-listing-xyz.tex}
+
\end{tdocexa}
@@ -948,32 +1029,33 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdoclatex}[code]
\tdoclatexinput[code]{examples-listing-xyz.tex}
+
\end{tdoclatex}
Ceci produit la mise en forme suivante.
\tdoclatexinput[code]{examples-listing-xyz.tex}
-\end{tdocexa}
+\end{tdocexa}
-% ------------------ %
\subsection{Codes importés et mis en situation} \label{tdoc-latexshow}
-\begin{tdocexa}[Showcase]
+\begin{tdocexa}[Mise en situation]
Ce qui suit s'obtient via \tdocinlatex+\tdoclatexshow{examples-listing-xyz.tex}+.
\medskip
\begin{tdoc-doc-showcase}
\tdoclatexshow{examples-listing-xyz.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
\begin{tdocnote}
- Les textes par défaut tiennent compte de la langue choisie lors du chargement du package \tdocpack{tutodoc}.
+ Les textes par défaut tiennent compte de la langue choisie lors du chargement du package \thispack{}.
\end{tdocnote}
@@ -987,6 +1069,7 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdoc-doc-showcase}
\tdoclatexshow[explain = Voici le rendu réel.]{examples-listing-xyz.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
@@ -995,13 +1078,14 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdocexa}[Les options disponibles]
- En plus du texte explicatif, il est aussi possible d'utiliser toutes les options de \tdocenv{tdocshowcase}, voir \ref{tdoc-showcase} page \pageref{tdoc-showcase}.
+ En plus du texte explicatif, il est aussi possible d'utiliser toutes les options de l'environnement \tdocenv*{tdocshowcase}, voir \ref{tdoc-showcase} page \pageref{tdoc-showcase}.
Voici un exemple illustrant ceci.
\medskip
\tdoclatexinput[code]{examples-listing-latexshow-options.tex}
+
\medskip
Ceci va produire ce qui suit.
@@ -1010,6 +1094,7 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
\begin{tdoc-doc-showcase}
\input{examples-listing-latexshow-options.tex}
+
\end{tdoc-doc-showcase}
\end{tdocexa}
@@ -1019,8 +1104,6 @@ La macro \tdocmacro{tdoclatexinput}, présentée ci-dessous, attend le chemin d'
Afin de faciliter le suivi d'un package, il est indispensable de fournir un historique indiquant les changements effectués lors de la publication d'une nouvelle version.
-% ------------------ %
-
\subsection{À quel moment ?}
@@ -1034,6 +1117,7 @@ On peut au choix dater quelque chose, ou bien le versionner, dans ce second cas
La macro \tdocmacro{tdocdate} permet d'indiquer une date dans la marge comme dans l'exemple suivant.
\tdoclatexshow{examples-version-n-change-dating.tex}
+
\end{tdocexa}
@@ -1044,18 +1128,17 @@ On peut au choix dater quelque chose, ou bien le versionner, dans ce second cas
Associer un numéro de version à une nouveauté se fait via la macro \tdocmacro{tdocversion}, la couleur et la date étant des arguments optionnels.
\tdoclatexshow{examples-version-n-change-versioning.tex}
-\end{tdocexa}
+\end{tdocexa}
-\begin{tdocimportant}
- \leavevmode
+\begin{tdocimp}
\begin{enumerate}
\item Les macros \tdocmacro{tdocdate} et \tdocmacro{tdocversion} nécessitent deux compilations.
\item Comme la langue indiquée pour cette documentation est le français, la date dans le rendu final est au format \texttt{JJ/MM/AAAA} alors que dans le code celle-ci devra toujours être saisie au format anglais \texttt{AAAA-MM-JJ}.
\end{enumerate}
-\end{tdocimportant}
+\end{tdocimp}
\begin{tdocwarn}
@@ -1065,24 +1148,43 @@ On peut au choix dater quelque chose, ou bien le versionner, dans ce second cas
}
et ceci est un choix ! Pourquoi cela ? Tout simplement car dater et versionner des explications devrait se faire de façon semi-automatisée afin d'éviter tout bug humain.
% \footnote{
-% L'auteur de \tdocpack{tutodoc} est entrain de mettre en place un ensemble d'outils permettant une telle semi-automatisation.
+% L'auteur de \thispack{} est entrain de mettre en place un ensemble d'outils permettant une telle semi-automatisation.
% }.
\end{tdocwarn}
\subsection{Quoi de neuf ?}
-\tdocpack{tutodoc} propose différents environnements pour indiquer rapidement et clairement ce qui a été fait
+\thispack{} propose la macro \tdocmacro{tdocstartproj} et différents environnements pour indiquer rapidement et clairement ce qui a été fait lors des derniers changements.%
\footnote{
L'utilisateur n'a pas besoin de tous les détails techniques.
}
-lors des derniers changements.
+
+
+\begin{tdocnote}
+ Concernant les icônes, voir la note au début de la section \ref{tdoc-colorful-focus} page \pageref{tdoc-colorful-focus}.
+\end{tdocnote}
+
+
+% ------------------ %
+
+
+\begin{tdocexa}[Juste pour la toute première version]
+ \leavevmode
+
+ \tdoclatexinput[sbs]{examples-version-n-change-first.tex}
+
+\end{tdocexa}
+
+
+% ------------------ %
\begin{tdocexa}[Pour les nouveautés]
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-new.tex}
+
\end{tdocexa}
@@ -1093,6 +1195,7 @@ lors des derniers changements.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-update.tex}
+
\end{tdocexa}
@@ -1103,6 +1206,7 @@ lors des derniers changements.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-break.tex}
+
\end{tdocexa}
@@ -1113,6 +1217,7 @@ lors des derniers changements.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-pb.tex}
+
\end{tdocexa}
@@ -1123,22 +1228,35 @@ lors des derniers changements.
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-fix.tex}
+
+\end{tdocexa}
+
+
+% ------------------ %
+
+
+\begin{tdocexa}[Thématiques aux choix avec une icône]
+ \leavevmode
+
+ \tdoclatexinput[sbs]{examples-version-n-change-user-choice-icon.tex}
+
\end{tdocexa}
% ------------------ %
-\begin{tdocexa}[Thématiques aux choix]
+\begin{tdocexa}[Thématiques aux choix sans icône]
\leavevmode
\tdoclatexinput[sbs]{examples-version-n-change-user-choice.tex}
+
\end{tdocexa}
\section{Décorations}
-Finissons cette documentation avec de petites outils de mise en forme pouvant rendre de grands services.
+Finissons cette documentation avec un petit outil de mise en forme qui rend de grands services.
\begin{tdoclatex}[sbs]
@@ -1150,72 +1268,161 @@ Ceci fonctionne avec des énumérations.
\begin{itemize}
\item Point souligné.
-
- \item Autre chose utile.
\end{itemize}
\tdocsep % Un comportement uniforme.
Ble, ble, ble...
+\end{tdoclatex}
-Bli, bli, bli...
-\tdocxspace % Espace subtile
- % mais utile.
+\section{Historique}
-Blo, blo, blo...
+\small
-Blu, blu, blu...
+\tdocversion{1.4.0}[2024-09-28]
+
+\begin{tdocbreak}
+ \item L'environnement \tdocenv*{tdoccaution} a été renommé \tdocenv*{tdoccaut} pour une saisie simplifiée.
+
+ \item Mise en avant de contenus : les exemples et remarques, indiqués via les environnements \tdocenv*{tdocexa} et \tdocenv*{tdocrem}, sont toujours numérotés, et ils partagent le même compteur.
+
+ \item La macro inutilisée \tdocmacro{tdocxspace} a été supprimée.
+\end{tdocbreak}
+
+
+\begin{tdocnew}
+ \item Journal des changements : la macro \tdocmacro{tdocstartproj} permet de gérer le cas de la première version publique.
+
+ \item Factorisation du code : la macro \tdocmacro{tdocicon} est en charge de l'ajout d'icônes devant du texte.
+\end{tdocnew}
+
+
+\begin{tdocupdate}
+ \item Couleurs : les macros \tdocmacro{tdocdarkcolor} et \tdocmacro{tdoclightcolor} proposent un argument facultatif.
+ \begin{enumerate}
+ \item \tdocmacro{tdocdarkcolor} : la quantité de couleur par rapport au noir peut être définie de manière facultative.
+
+ \item \tdocmacro{tdoclightcolor} : le taux de transparence peut être défini de manière facultative.
+ \end{enumerate}
+
+ \item Mise en avant de contenus : réduction de l'espace autour du contenu dans les cadres colorés.
+
+ \item Gestion des versions: un meilleur espacement verticalement via \tdocmacro{vphantom}.
+\end{tdocupdate}
+
+\tdocsep
+
+
+% ------------------ %
+
+
+\tdocversion{1.3.1}[2024-09-26]
+
+\begin{tdocnew}
+ \item Version étoilée de \tdocmacro{tdocenv} pour n'avoir que le nom de l'environnement.
+\end{tdocnew}
+
+\tdocsep
+
+
+% ------------------ %
+
+
+\tdocversion{1.3.0}[2024-09-25]
+
+\begin{tdocprob}
+ \item La version 3 de \tdocpack{minted} ne peut pas être prise en compte pour le moment car elle comporte des bugs : voir \url{https://github.com/gpoore/minted/issues/401}. On force donc l'usage de la version 2 de \tdocpack{minted}.
+\end{tdocprob}
+
+
+\begin{tdocbreak}
+ \item L'environnement \tdocenv*{tdocimportant} a été renommé \tdocenv*{tdocimp} pour une saisie simplifiée.
+\end{tdocbreak}
+
+
+\begin{tdocnew}
+ \item Journal des changements : les environnements proposés utilisent des icônes.
+
+
+ \item Mise en avant de contenus : des cadres colorés avec des icônes sont proposés pour les environnements suivants.
+ \bgroup
+ \setlength\multicolsep{5pt}
+ \begin{multicols}{3}
+ \begin{enumerate}
+ \item \tdocenv*{tdoccaution}
+ \item \tdocenv*{tdocimp}
+ \item \tdocenv*{tdocnote}
+ \item \tdocenv*{tdoctip}
+ \item \tdocenv*{tdocwarn}
+ \end{enumerate}
+ \end{multicols}
+ \egroup
+\end{tdocnew}
+
+\tdocsep
+
+
+% ------------------ %
-\end{tdoclatex}
-\section{Historique}
\tdocversion{1.2.0-a}[2024-08-23]
\begin{tdocupdate}
- \item \tdocmacro{tdocversion}
+ \item \tdocmacro{tdocversion}
\begin{enumerate}
- \item Le numéro de version est au-dessus de la date.
+ \item Le numéro de version est au-dessus de la date.
- \item L'espacement est mieux géré lorsque la date est absente.
+ \item L'espacement est mieux géré lorsque la date est absente.
\end{enumerate}
\end{tdocupdate}
\begin{tdocfix}
- \item Mise en avant de contenus : les traductions françaises de \tdocinEN*{caution} et \tdocinEN*{danger} étaient erronées.
+ \item Mise en avant de contenus : les traductions françaises de \tdocinEN*{caution} et \tdocinEN*{danger} étaient erronées.
\end{tdocfix}
\tdocsep
+
+% ------------------ %
+
+
\tdocversion{1.1.0}[2024-01-06]
\begin{tdocnew}
- \item Journal des changements : deux nouveaux environnements.
+ \item Journal des changements : deux nouveaux environnements.
\begin{enumerate}
\item \tdocenv{tdocbreak} pour les \tdocquote{bifurcations}\,, soit les modifications non rétrocompatibles.
\item \tdocenv{tdocprob} pour les problèmes repérés.
\end{enumerate}
- \item \tdocmacro{tdocinlatex}: un jaune léger est utilisé comme couleur de fond.
+ \item \tdocmacro{tdocinlatex}: un jaune léger est utilisé comme couleur de fond.
\end{tdocnew}
\tdocsep
+
+% ------------------ %
+
+
\tdocversion{1.0.1}[2023-12-08]
\begin{tdocfix}
- \item \tdocmacro{tdocenv}: l'espacement est maintenant correct, même si le paquet \tdocpack{babel} n'est pas chargé avec la langue française.
+ \item \tdocmacro{tdocenv}: l'espacement est maintenant correct, même si le paquet \tdocpack{babel} n'est pas chargé avec la langue française.
- \item \tdocenv[{[nostripe]}]{tdocshowcase}: les sauts de page autour des lignes \tdocquote{cadrantes} devraient être rares dorénavant.
+ \item \tdocenv[{[nostripe]}]{tdocshowcase}: les sauts de page autour des lignes \tdocquote{cadrantes} devraient être rares dorénavant.
\end{tdocfix}
\tdocsep
-\tdocversion{1.0.0}[2023-11-29]
-Première version publique du projet.
+% ------------------ %
+
+
+\tdocversion{1.0.0}[2023-11-29]
+\tdocstartproj{Première version publique du projet.}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/Eksempel.tex b/Master/texmf-dist/doc/latex/ucph-revy/Eksempel.tex
index 193d39369ee..795888e0b2f 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/Eksempel.tex
+++ b/Master/texmf-dist/doc/latex/ucph-revy/Eksempel.tex
@@ -21,12 +21,13 @@
\documentclass{ucph-revy}
\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
+\usepackage[OT1]{fontenc}
\usepackage[danish]{babel}
\usepackage{hyperref}
\urlstyle{sf}
\version{1.0}
+%% følgende definitioner kan godt fjernes, hvis der ikke er brug for dem:
\revyname{FysikRevy\texttrademark}
\revyyear{2019}
\status{eksempel}
@@ -45,6 +46,7 @@
\role{I} Vred instruktør
\role{A9}[A--ni] Anine
\end{roles}
+%% props-miljøet kan fjernes, hvis der ikke er brug for det
\begin{props}
\prop{Hedegaard--hår}[Person, der skaffer]
\prop{Didgeridoo}[Anine]
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/Example.tex b/Master/texmf-dist/doc/latex/ucph-revy/Example.tex
index 047aa433577..1b3a21cddce 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/Example.tex
+++ b/Master/texmf-dist/doc/latex/ucph-revy/Example.tex
@@ -21,11 +21,12 @@
\documentclass{ucph-revy}
\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
+\usepackage[OT1]{fontenc}
\usepackage{hyperref}
\urlstyle{sf}
\version{1.0}
+%% The settings below may be omitted if their inclusion is undesired
\revyname{The Meaning of Liff}
\revyyear{3001}
\title{Example}
@@ -54,6 +55,7 @@
\role{CC}[Eric] Crucified Criminal
\role{B}[Graham] Brian
\end{roles}
+%% The props environment may be omitted if found to be superfluous
\propname{Props:}
\begin{props}
\prop{Large sign}
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/README.md b/Master/texmf-dist/doc/latex/ucph-revy/README.md
index 3b0e47a0a47..d2b6baed04b 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/README.md
+++ b/Master/texmf-dist/doc/latex/ucph-revy/README.md
@@ -1,6 +1,6 @@
Package ucph-revy
=================
-v1.0.1
+v1.0.2
A class for typesetting scripts, containing both lyrics and prose, in
the style used by the student revues (revy) at the Faculties of
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-doc.pdf b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-doc.pdf
index 5b9426a4f38..1080060964d 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-doc.pdf
+++ b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-man.pdf b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-man.pdf
index 8f252d20ff2..d040dacefe8 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-man.pdf
+++ b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-da-man.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-doc.pdf b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-doc.pdf
index 3d09e9a2be5..784e1235ca3 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-doc.pdf
+++ b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-man.pdf b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-man.pdf
index 68c51ca12d7..d2baff11116 100644
--- a/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-man.pdf
+++ b/Master/texmf-dist/doc/latex/ucph-revy/ucph-revy-en-man.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/udiss/README.txt b/Master/texmf-dist/doc/latex/udiss/README.txt
new file mode 100644
index 00000000000..6264a211a92
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/README.txt
@@ -0,0 +1,7 @@
+------------------------------------------------------------
+Class: udiss
+Author: TUGIndia
+Description: A LaTeX bundle for typesetting dissertations
+Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+Licenses: GPLv3+, GFDLv1.3+
+------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss-fonts-english.tex b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-english.tex
new file mode 100644
index 00000000000..0e0a084278c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-english.tex
@@ -0,0 +1,75 @@
+%%
+%% This is file `udiss-fonts-english.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% udiss.dtx (with options: `babel-en')
+%% ---------------------------------------------------------
+%% Bundle: udiss
+%% Version: v0.1 (October 1, 2024)
+%% Author: Indian TeX Users Group
+%% Description: A LaTeX bundle for typesetting dissertations
+%% Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+%% Licenses: GPLv3+, GFDLv1.3+
+%% ---------------------------------------------------------
+%%
+%% The LaTeX bundle udiss v0.1
+%% Copyright © 2024 Indian TeX Users Group
+%%
+%% This program is free software: you can redistribute it
+%% and/or modify it under the terms of the GNU General
+%% Public License as published by the Free Software
+%% Foundation, either version 3 of the License, or (at your
+%% option) any later version.
+%%
+%% This program is distributed in the hope that it will be
+%% useful, but WITHOUT ANY WARRANTY; without even the
+%% implied warranty of MERCHANTABILITY or FITNESS FOR A
+%% PARTICULAR PURPOSE. See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public
+%% License along with this program. If not, see
+%% <https://www.gnu.org/licenses/>.
+%% ---------------------------------------------------------
+\babelfont[english]{rm}[%
+ IgnoreFontspecFile,%
+ Extension = {.otf},%
+ ItalicFont = {NewCM10-BookItalic},%
+ BoldFont = {NewCM10-Bold},%
+ BoldItalicFont = {NewCM10-BoldItalic},%
+ SlantedFont = {NewCM10-Book},%
+ BoldSlantedFont = {NewCM10-Bold},%
+ Numbers = {OldStyle},%
+ CharacterVariant = {6},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+]{NewCM10-Book}
+\babelfont[english]{sf}[%
+ IgnoreFontspecFile,%
+ Extension = {.otf},%
+ ItalicFont = {NewCMSans10-BookOblique},%
+ BoldFont = {NewCMSans10-Bold},%
+ BoldItalicFont = {NewCMSans10-BoldOblique},%
+ SlantedFont = {NewCMSans10-Book},%
+ BoldSlantedFont = {NewCMSans10-Bold},%
+ Numbers = {OldStyle},%
+ CharacterVariant = {6},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+]{NewCMSans10-Book}
+\babelfont[english]{tt}[%
+ IgnoreFontspecFile,%
+ Extension = {.otf},%
+ BoldFont = {NewCMMono10-Bold},%
+ ItalicFont = {NewCMMono10-Italic},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+]{NewCMMono10-Book}
+\endinput
+%%
+%% End of file `udiss-fonts-english.tex'.
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss-fonts-hindi.tex b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-hindi.tex
new file mode 100644
index 00000000000..61caabaad8d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-hindi.tex
@@ -0,0 +1,100 @@
+%%
+%% This is file `udiss-fonts-hindi.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% udiss.dtx (with options: `babel-hi')
+%% ---------------------------------------------------------
+%% Bundle: udiss
+%% Version: v0.1 (October 1, 2024)
+%% Author: Indian TeX Users Group
+%% Description: A LaTeX bundle for typesetting dissertations
+%% Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+%% Licenses: GPLv3+, GFDLv1.3+
+%% ---------------------------------------------------------
+%%
+%% The LaTeX bundle udiss v0.1
+%% Copyright © 2024 Indian TeX Users Group
+%%
+%% This program is free software: you can redistribute it
+%% and/or modify it under the terms of the GNU General
+%% Public License as published by the Free Software
+%% Foundation, either version 3 of the License, or (at your
+%% option) any later version.
+%%
+%% This program is distributed in the hope that it will be
+%% useful, but WITHOUT ANY WARRANTY; without even the
+%% implied warranty of MERCHANTABILITY or FITNESS FOR A
+%% PARTICULAR PURPOSE. See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public
+%% License along with this program. If not, see
+%% <https://www.gnu.org/licenses/>.
+%% ---------------------------------------------------------
+\IfLanguageName{hindi}{%
+ \ekvset{udiss}{%
+ rmfont = {Mukta-Regular.ttf},%
+ rmitfont = {Mukta-Regular.ttf},%
+ rmbffont = {Mukta-Bold.ttf},%
+ rmbfitfont = {Mukta-Bold.ttf},%
+ rmfeatures = {%
+ Script = {Devanagari}%
+ },%
+ sffont = {Mukta-Regular.ttf},%
+ sfitfont = {Mukta-Regular.ttf},%
+ sfbffont = {Mukta-Bold.ttf},%
+ sfbfitfont = {Mukta-Bold.ttf},%
+ sffeatures = {%
+ Script = {Devanagari}%
+ },%
+ ttfont = {Mukta-Regular.ttf},%
+ ttitfont = {Mukta-Regular.ttf},%
+ ttbffont = {Mukta-Bold.ttf},%
+ ttbfitfont = {Mukta-Bold.ttf},%
+ sffeatures = {%
+ Script = {Devanagari}%
+ }%
+ }%
+}{%
+ \babelfont[hindi]{rm}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Hindi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}
+ \babelfont[hindi]{sf}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Hindi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}
+ \babelfont[hindi]{tt}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Hindi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}
+}
+\endinput
+%%
+%% End of file `udiss-fonts-hindi.tex'.
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss-fonts-malayalam.tex b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-malayalam.tex
new file mode 100644
index 00000000000..e16c181c0a8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-malayalam.tex
@@ -0,0 +1,94 @@
+%%
+%% This is file `udiss-fonts-malayalam.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% udiss.dtx (with options: `babel-ml')
+%% ---------------------------------------------------------
+%% Bundle: udiss
+%% Version: v0.1 (October 1, 2024)
+%% Author: Indian TeX Users Group
+%% Description: A LaTeX bundle for typesetting dissertations
+%% Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+%% Licenses: GPLv3+, GFDLv1.3+
+%% ---------------------------------------------------------
+%%
+%% The LaTeX bundle udiss v0.1
+%% Copyright © 2024 Indian TeX Users Group
+%%
+%% This program is free software: you can redistribute it
+%% and/or modify it under the terms of the GNU General
+%% Public License as published by the Free Software
+%% Foundation, either version 3 of the License, or (at your
+%% option) any later version.
+%%
+%% This program is distributed in the hope that it will be
+%% useful, but WITHOUT ANY WARRANTY; without even the
+%% implied warranty of MERCHANTABILITY or FITNESS FOR A
+%% PARTICULAR PURPOSE. See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public
+%% License along with this program. If not, see
+%% <https://www.gnu.org/licenses/>.
+%% ---------------------------------------------------------
+\IfLanguageName{malayalam}{%
+ \ekvset{udiss}{%
+ rmfont = {RIT-Rachana-Regular.ttf},%
+ rmitfont = {RIT-Rachana-Italic.ttf},%
+ rmbffont = {RIT-Rachana-Bold.ttf},%
+ rmbfitfont = {RIT-Rachana-BoldItalic.ttf},%
+ rmfeatures = {%
+ Script = {Malayalam}%
+ },%
+ sffont = {RIT-MeeraNew.ttf},%
+ sfitfont = {RIT-MeeraNew.ttf},%
+ sfbffont = {RIT-tnjoy-bold.ttf},%
+ sfbfitfont = {RIT-tnjoy-bold.ttf},%
+ sffeatures = {%
+ Script = {Malayalam}%
+ },%
+ ttfont = {RIT-MeeraNew.ttf},%
+ ttitfont = {RIT-MeeraNew.ttf},%
+ ttbffont = {RIT-tnjoy-bold.ttf},%
+ ttbfitfont = {RIT-tnjoy-bold.ttf},%
+ sffeatures = {%
+ Script = {Malayalam}%
+ }%
+ }%
+}{%
+ \babelfont[malayalam]{rm}[%
+ IgnoreFontspecFile,%
+ Script = {Malayalam},%
+ ItalicFont = {RIT-Rachana-Italic.ttf},%
+ BoldFont = {RIT-Rachana-Bold.ttf},%
+ BoldItalicFont = {RIT-Rachana-BoldItalic.ttf},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{RIT-Rachana-Regular.ttf}
+ \babelfont[malayalam]{sf}[%
+ IgnoreFontspecFile,%
+ Script = {Malayalam},%
+ ItalicFont = {RIT-tnjoy-regular.ttf},%
+ BoldFont = {RIT-tnjoy-bold.ttf},%
+ BoldItalicFont = {RIT-tnjoy-bold.ttf},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{RIT-tnjoy-regular.ttf}
+ \babelfont[malayalam]{tt}[%
+ IgnoreFontspecFile,%
+ Script = {Malayalam},%
+ ItalicFont = {RIT-tnjoy-regular.ttf},%
+ BoldFont = {RIT-tnjoy-bold.ttf},%
+ BoldItalicFont = {RIT-tnjoy-bold.ttf},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{RIT-tnjoy-regular.ttf}%
+}
+\endinput
+%%
+%% End of file `udiss-fonts-malayalam.tex'.
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss-fonts-marathi.tex b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-marathi.tex
new file mode 100644
index 00000000000..00e6f33dca8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss-fonts-marathi.tex
@@ -0,0 +1,126 @@
+%%
+%% This is file `udiss-fonts-marathi.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% udiss.dtx (with options: `babel-mr')
+%% ---------------------------------------------------------
+%% Bundle: udiss
+%% Version: v0.1 (October 1, 2024)
+%% Author: Indian TeX Users Group
+%% Description: A LaTeX bundle for typesetting dissertations
+%% Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+%% Licenses: GPLv3+, GFDLv1.3+
+%% ---------------------------------------------------------
+%%
+%% The LaTeX bundle udiss v0.1
+%% Copyright © 2024 Indian TeX Users Group
+%%
+%% This program is free software: you can redistribute it
+%% and/or modify it under the terms of the GNU General
+%% Public License as published by the Free Software
+%% Foundation, either version 3 of the License, or (at your
+%% option) any later version.
+%%
+%% This program is distributed in the hope that it will be
+%% useful, but WITHOUT ANY WARRANTY; without even the
+%% implied warranty of MERCHANTABILITY or FITNESS FOR A
+%% PARTICULAR PURPOSE. See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public
+%% License along with this program. If not, see
+%% <https://www.gnu.org/licenses/>.
+%% ---------------------------------------------------------
+\babelprovide[%
+ mapdigits,%
+ counters/सà¥à¤µà¤° = अ आ इ ई उ ऊ ठठओ औ अं अः ॲ ऋ ऌ ऑ,%
+ counters/अंक = à¤à¤• दोन तीन चार पाच सहा सात आठ नऊ दहा अकरा
+ बारा तेरा चौदा पंधरा सोळा सतरा अठरा à¤à¤•à¥‹à¤£à¥€à¤¸ वीस à¤à¤•à¤µà¥€à¤¸ बावीस
+ तेवीस चोवीस पंचवीस सवà¥à¤µà¥€à¤¸ सतà¥à¤¤à¤¾à¤µà¥€à¤¸ अठà¥à¤ à¤¾à¤µà¥€à¤¸ à¤à¤•à¥‹à¤£à¤¤à¥€à¤¸ तीस à¤à¤•à¤¤à¥€à¤¸
+ बतà¥à¤¤à¥€à¤¸ तेहतीस चौतीस पसà¥à¤¤à¥€à¤¸ छतà¥à¤¤à¥€à¤¸ सदतीस अडतीस à¤à¤•à¥‹à¤£à¤šà¤¾à¤³à¥€à¤¸ चाळीस
+ à¤à¤•à¥‡à¤šà¤¾à¤³à¥€à¤¸ बेचाळीस तà¥à¤°à¥‡à¤šà¤¾à¤³à¥€à¤¸ चवà¥à¤µà¥‡à¤šà¤¾à¤³à¥€à¤¸ पंचेचाळीस शेहेचाळीस सतà¥à¤¤à¥‡à¤šà¤¾à¤³à¥€à¤¸
+ अठà¥à¤ à¥‡à¤šà¤¾à¤³à¥€à¤¸ à¤à¤•à¥‹à¤£à¤ªà¤¨à¥à¤¨à¤¾à¤¸ पनà¥à¤¨à¤¾à¤¸ à¤à¤•à¤¾à¤µà¤¨à¥à¤¨ बावनà¥à¤¨ तà¥à¤°à¥‡à¤ªà¤¨à¥à¤¨ चौपनà¥à¤¨ पंचावनà¥à¤¨
+ छपà¥à¤ªà¤¨à¥à¤¨ सतà¥à¤¤à¤¾à¤µà¤¨à¥à¤¨ अठà¥à¤ à¤¾à¤µà¤¨à¥à¤¨ à¤à¤•à¥‹à¤£à¤¸à¤¾à¤  साठ à¤à¤•à¤¸à¤·à¥à¤Ÿ बासषà¥à¤Ÿ तà¥à¤°à¥‡à¤¸à¤·à¥à¤Ÿ चौसषà¥à¤Ÿ
+ पासषà¥à¤Ÿ सहासषà¥à¤Ÿ सदà¥à¤·à¥à¤Ÿ अडà¥à¤¸à¤·à¥à¤Ÿ à¤à¤•à¥‹à¤£à¤¸à¤¤à¥à¤¤à¤° सतà¥à¤¤à¤° à¤à¤•à¤¾à¤¹à¤¤à¥à¤¤à¤° बाहतà¥à¤¤à¤°
+ तà¥à¤°à¥à¤¯à¤¾à¤¹à¤¤à¥à¤¤à¤° चौऱà¥à¤¯à¤¾à¤¹à¤¤à¥à¤¤à¤° पंचाहतà¥à¤¤à¤° शाहतà¥à¤¤à¤° सतà¥à¤¤à¥à¤¯à¤¾à¤¹à¤¤à¥à¤¤à¤° अठà¥à¤ à¥à¤¯à¤¾à¤¹à¤¤à¥à¤¤à¤°
+ à¤à¤•à¥‹à¤£à¤à¤‚शी à¤à¤‚शी à¤à¤•à¥à¤¯à¤¾à¤à¤‚शी बà¥à¤¯à¤¾à¤à¤‚शी तà¥à¤°à¥à¤¯à¤¾à¤à¤‚शी चौऱà¥à¤¯à¤¾à¤à¤‚शी पंचà¥à¤¯à¤¾à¤à¤‚शी शà¥à¤¯à¤¾à¤à¤‚शी
+ सतà¥à¤¤à¥à¤¯à¤¾à¤à¤‚शी अठà¥à¤ à¥à¤¯à¤¾à¤à¤‚शी à¤à¤•à¥‹à¤£à¤¨à¤µà¥à¤µà¤¦ नवà¥à¤µà¤¦ à¤à¤•à¥à¤¯à¤¾à¤£à¥à¤£à¤µ बà¥à¤¯à¤¾à¤£à¥à¤£à¤µ तà¥à¤°à¥à¤¯à¤¾à¤£à¥à¤£à¤µ
+ चौऱà¥à¤¯à¤¾à¤£à¥à¤£à¤µ पंचाणà¥à¤£à¤µ शहाणà¥à¤£à¤µ सतà¥à¤¤à¥à¤¯à¤¾à¤£à¥à¤£à¤µ अठà¥à¤¯à¤¾à¤£à¥à¤£à¤µ नवà¥à¤¯à¤¾à¤£à¥à¤£à¤µ शंभर,%
+ counters/वà¥à¤¯à¤‚जन = क ख ग घ ङ%
+ च छ ज ठञ%
+ ट ठ ड ढ ण%
+ त थ द ध न%
+ प फ ब भ म%
+ य र ल व श ष स ह ळ,%
+ Alph = अंक,%
+ alph = सà¥à¤µà¤°%
+]{marathi}
+\def\theenumiii{\localecounter{वà¥à¤¯à¤‚जन}{enumiii}}
+\def\theenumiv{\localecounter{अंक}{enumiii}}
+\IfLanguageName{marathi}{%
+ \ekvset{udiss}{%
+ rmfont = {Mukta-Regular.ttf},%
+ rmitfont = {Mukta-Regular.ttf},%
+ rmbffont = {Mukta-Bold.ttf},%
+ rmbfitfont = {Mukta-Bold.ttf},%
+ rmfeatures = {%
+ Script = {Devanagari}%
+ },%
+ sffont = {Mukta-Regular.ttf},%
+ sfitfont = {Mukta-Regular.ttf},%
+ sfbffont = {Mukta-Bold.ttf},%
+ sfbfitfont = {Mukta-Bold.ttf},%
+ sffeatures = {%
+ Script = {Devanagari}%
+ },%
+ ttfont = {Mukta-Regular.ttf},%
+ ttitfont = {Mukta-Regular.ttf},%
+ ttbffont = {Mukta-Bold.ttf},%
+ ttbfitfont = {Mukta-Bold.ttf},%
+ sffeatures = {%
+ Script = {Devanagari}%
+ }%
+ }%
+}{%
+ \babelfont[marathi]{rm}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Marathi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}
+ \babelfont[marathi]{sf}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Marathi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}
+ \babelfont[marathi]{tt}[%
+ IgnoreFontspecFile,%
+ ItalicFont = {Mukta-Regular.ttf},%
+ BoldFont = {Mukta-Bold.ttf},%
+ BoldItalicFont = {Mukta-Bold.ttf},%
+ Language = {Marathi},%
+ Script = {Devanagari},%
+ Numbers = {OldStyle},%
+ \ifLuaTeX
+ Renderer = {HarfBuzz}%
+ \fi
+ ]{Mukta-Regular.ttf}%
+}
+\endinput
+%%
+%% End of file `udiss-fonts-marathi.tex'.
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss-style-ukerala.tex b/Master/texmf-dist/doc/latex/udiss/udiss-style-ukerala.tex
new file mode 100644
index 00000000000..bb9aa134ec6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss-style-ukerala.tex
@@ -0,0 +1,43 @@
+%%
+%% This is file `udiss-style-ukerala.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% udiss.dtx (with options: `ukerala')
+%% ---------------------------------------------------------
+%% Bundle: udiss
+%% Version: v0.1 (October 1, 2024)
+%% Author: Indian TeX Users Group
+%% Description: A LaTeX bundle for typesetting dissertations
+%% Bugs: puszcza.gnu.org.ua/bugs/?group=udiss
+%% Licenses: GPLv3+, GFDLv1.3+
+%% ---------------------------------------------------------
+%%
+%% The LaTeX bundle udiss v0.1
+%% Copyright © 2024 Indian TeX Users Group
+%%
+%% This program is free software: you can redistribute it
+%% and/or modify it under the terms of the GNU General
+%% Public License as published by the Free Software
+%% Foundation, either version 3 of the License, or (at your
+%% option) any later version.
+%%
+%% This program is distributed in the hope that it will be
+%% useful, but WITHOUT ANY WARRANTY; without even the
+%% implied warranty of MERCHANTABILITY or FITNESS FOR A
+%% PARTICULAR PURPOSE. See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public
+%% License along with this program. If not, see
+%% <https://www.gnu.org/licenses/>.
+%% ---------------------------------------------------------
+\ekvset{udiss}{%
+ university = {University of Kerala},%
+ logo = {udiss-logo-ukerala.png},%
+ logoheight = {0.11}%
+}
+\endinput
+%%
+%% End of file `udiss-style-ukerala.tex'.
diff --git a/Master/texmf-dist/doc/latex/udiss/udiss.pdf b/Master/texmf-dist/doc/latex/udiss/udiss.pdf
new file mode 100644
index 00000000000..7d616591ba2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/udiss/udiss.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README
index c73460f0b42..ff3aa6b5a94 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/README
+++ b/Master/texmf-dist/doc/latex/univie-ling/README
@@ -97,14 +97,41 @@ also have a look at the example files.
== CHANGES ==
+V. 2.9 (2024-09-28):
+ - univie-ling-wlg:
+ * Fix pagination with \frontmatter articles.
+ * Improve parts in TOC.
+ * Clear double page before parts.
+ - univie-ling.bbx:
+ * Add option "annotations" which, if true, will print out
+ the annotation field (useful for annotated bibliographies).
+ * Add manual.
+
+V. 2.8 (2024-09-20):
+ - univie-ling-thesis:
+ * Add class option titlepage.
+ * Adapt title page to recent design. This entails a change
+ of sans serif font from Arial to Source Sans Pro.
+ * Use TeX Gyre Pagella rather than Palatino with fonts=otf.
+ - univie-ling-wlg:
+ * Fix pagination issue with titlepage=specialprint.
+ * part pages are now empty (no pagination and heading).
+ - univie-ling-handout:
+ - univie-ling-expose:
+ - univie-ling-paper:
+ - univie-ling-poster:
+ - univie-ling-thesis:
+ - univie-ling-wlg:
+ * Add basic support for thebibliography environment.
+ * Update documentation on bibliography beyond biblatex.
+
V. 2.7 (2024-07-23):
- univie-ling-wlg: Use proper spacing with covington's
reflist environment.
- - univie-ling-poster: add smallmargins option.
- - univie-ling-thesis: fix running headers in twoside mode.
- univie-ling-handout:
- univie-ling-expose:
- univie-ling-paper:
+ - univie-ling-poster:
- univie-ling-thesis:
- univie-ling-wlg:
* Fix empty argument check in \weblink.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
index 8652b32a5b1..3c59d7fd22f 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
index a8ac59e821b..509f36d7bb6 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
index 48b41cac878..cdfb07eedff 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
index 608e203154b..bf1c1f9880f 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
index 5ac9aba1d19..4f94bbe2836 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
index 49efca45fac..c31d116e01e 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
index f2260ffeb4c..f360e7c0124 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
index b16ccfe334f..5bf3cd252de 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
index 9673abfdb0f..359b3b6f72b 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
index 0d550fa2862..1ce56a0d18d 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
index 8a1d9155c6a..b1e35c6bf28 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
index f811c049e47..182538d7791 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.pdf
new file mode 100644
index 00000000000..e5dabdf5871
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.tex
new file mode 100644
index 00000000000..42e2311377a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-bbx.tex
@@ -0,0 +1,238 @@
+% !TeX spellcheck = en_US
+\documentclass[english]{article}
+
+\usepackage[osf]{libertine}
+\usepackage[scaled=0.7]{beramono}
+\usepackage[T1]{fontenc}
+\usepackage[latin9]{inputenc}
+\usepackage[hyphens]{url}
+\usepackage{csquotes}
+\usepackage[pdfusetitle,
+ bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,
+ breaklinks=false,pdfborder={0 0 0},backref=false,colorlinks=false]
+ {hyperref}
+
+% Tweak the TOC (make it more compact)
+\usepackage{tocloft}
+\setlength{\cftaftertoctitleskip}{6pt}
+\setlength{\cftbeforesecskip}{0pt}
+\setlength{\cftbeforesubsecskip}{0pt}
+\renewcommand{\cfttoctitlefont}{\normalsize\bfseries}
+\renewcommand{\cftsecfont}{\small\bfseries}
+\renewcommand{\cftsecpagefont}{\small\bfseries}
+\renewcommand{\cftsubsecfont}{\small}
+\renewcommand{\cftsubsecpagefont}{\small}
+
+% markup
+\newcommand*\jmacro[1]{\textbf{\texttt{#1}}}
+\newcommand*\jcsmacro[1]{\jmacro{\textbackslash{#1}}}
+\newcommand*\joption[1]{\textbf{\texttt{#1}}}
+\newcommand*\jfmacro[1]{\texttt{#1}}
+\newcommand*\jfcsmacro[1]{\jfmacro{\textbackslash{#1}}}
+
+% macros
+\newcommand*\uvlt{\textsf{univie-ling biblatex}}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
+
+% improve layout
+\tolerance 1414
+\hbadness 1414
+\emergencystretch 1.5em
+\hfuzz 0.3pt
+\widowpenalty = 10000
+\vfuzz \hfuzz
+\raggedbottom
+
+% Conditional pagebreak
+\def\condbreak#1{%
+ \vskip 0pt plus #1\pagebreak[3]\vskip 0pt plus -#1\relax}
+
+\usepackage{microtype}
+
+\usepackage{babel}
+
+\usepackage{listings}
+\lstset{language={[LaTeX]TeX},
+ basicstyle={\small\ttfamily},
+ frame=single}
+
+\setcounter{tocdepth}{2}
+
+\begin{document}
+
+\title{The \uvlt\ styles}
+
+\author{\texorpdfstring{Jürgen Spitzmüller%
+\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
+
+\date{Version 2.9, 2024/09/28}
+
+\maketitle
+
+\begin{abstract}
+\noindent The \uvlt\ styles provide citation and bibliography styles that conform to the style guide of the Linguistic Department
+of Vienna University which itself follows the \emph{Unified Style Sheet for Linguistic Papers}.
+This manual documents the style.
+\end{abstract}
+
+\tableofcontents
+
+\section{Aims and scope}
+
+The \uvlt\ styles include a \textsf{biblatex} bibliography style (\texttt{univie-ling.bbx}) and a citation style
+(\texttt{univie-ling.cbx}) that implement the citation conventions common in Viennese (Applied) Linguistics.
+The styles draw on the \emph{Unified Style Sheet for Linguistic Papers}.%
+\footnote{See \url{https://www.linguisticsociety.org/sites/default/files/style-sheet_0.pdf}.}
+
+\section{Requirements of \uvlt}\label{sec:req-jslp}
+
+The following class and packages are required and loaded by \uvlt:
+\begin{itemize}
+ \setlength\itemsep{0pt}
+ \item \textsf{biblatex}: Contemporary bibliography support.
+ \item \textsf{biber}: Bibliography processor for biblatex.
+\end{itemize}
+
+\section{Use}\label{use}
+
+There is not much to say here. The styles are used as any other \textsf{biblatex} styles: You load them via the
+\joption{style} option of biblatex (\joption{style=univie-ling} in this case), pass additional options here as well
+and use the citation and bibliography commands documented in the \textsf{biblatex} manual \cite{bibltx}.
+
+\section{Style-specific Options}\label{options}
+
+On top of the options provided by the \textsf{biblatex} package itself (see \cite{bibltx}), the \uvlt\ styles provide
+a couple of specific options:
+\begin{description}
+ \setlength\itemsep{0pt}
+ \item{\joption{annotations=true|false}}: if \joption{true}, the contents of the \texttt{annotation} or \texttt{annot} field
+ of your Bib\TeX\ entry are output (in a separate indented paragraph that follows the entry). Use this to generate annotated
+ bibliographies. The options is \joption{false} by default.
+
+ Annotations might also be stored in separate files as documented in \cite[sec.~3.14.8]{bibltx}.
+ \item{\joption{issueeditor=true|false}}: if \joption{true}, editors of journal special issues are output.
+ The options is \joption{false} by default.
+\end{description}
+
+\section{Release History}
+
+\begin{description}
+ \item 2024/09/28 (v.\,2.9)
+ \begin{itemize}
+ \item Add option \joption{annotations} which, if \joption{true},
+ will print out the \texttt{annotation} field
+ (useful for annotated bibliographies).
+ \item Add this manual.
+ \end{itemize}
+ \item 2024/09/20 (v.\,2.8)
+ \item 2024/07/23 (v.\,2.7)
+ \item 2024/06/27 (v.\,2.6)
+ \item 2024/05/09 (v.\,2.5)
+ \item 2023/03/31 (v.\,2.4)
+ \item 2023/01/26 (v.\,2.3)
+ \item 2022/12/06 (v.\,2.2)
+ \item 2022/10/21 (v.\,2.1)
+ \item 2022/10/02 (v.\,2.0)
+ \item 2022/09/08 (v.\,1.20)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2022/06/18 (v.\,1.19)
+ \begin{itemize}
+ \item properly re-define a macro in the citations style.
+ \end{itemize}
+ \item 2022/05/11 (v.\,1.18)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2022/02/05 (v.\,1.17)
+ \begin{itemize}
+ \item Draw on authoryear-comp rather than uncompressed
+ version (in line with major journal's interpretation
+ of the unified style sheet)
+ \end{itemize}
+ \item 2021/11/03 (v.\,1.16)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2021/10/19 (v.\,1.15)
+ \begin{itemize}
+ \item Output url date only if url is given (not with DOI).
+ \item Fix emphasizing of journal title.
+ \end{itemize}
+ \item 2021/09/01 (v.\,1.14)
+ \begin{itemize}
+ \item Sentence-case journal issue title and online title.
+ \item Emphasize journal subtitle.
+ \end{itemize}
+ \item 2020/11/11 (v.\,1.13)
+ \begin{itemize}
+ \item Fix whitespace issue in thematic issue string.
+ \end{itemize}
+ \item 2020/06/25 (v.\,1.12)
+ \begin{itemize}
+ \item only output origyear if it differs from year.
+ \end{itemize}
+ \item 2020/05/05 (v.\,1.11)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2019/05/01 (v.\,1.10)
+ \begin{itemize}
+ \item only print origyear (not full origdate) in label.
+ \item fix title capitalization in inbook, mvbook and mvcollection types.
+ \end{itemize}
+ \item 2019/01/21 (v.\,1.9)
+ \begin{itemize}
+ \item correct fix of duplicate editorstrg parentheses.
+ \end{itemize}
+ \item 2019/01/15 (v.\,1.8)
+ \begin{itemize}
+ \item fix another whitespace issue.
+ \item fix duplicate editorstrg parentheses.
+ \end{itemize}
+ \item 2018/11/07 (v.\,1.7)
+ \begin{itemize}
+ \item fix some whitespace issues.
+ \end{itemize}
+ \item 2018/11/04 (v.\,1.6)
+ \begin{itemize}
+ \item univie-ling.bbx: fix bookauthor with inbook type.
+ \end{itemize}
+ \item 2018/09/03 (v.\,1.5)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2018/03/02 (v.\,1.4)
+ \begin{itemize}
+ \item Fix journal dates (if month and day is given).
+ \end{itemize}
+ \item 2018/03/02 (v.\,1.3)
+ \begin{itemize}
+ \item Fix whitespace issue in \texttt{@inproceedings} entry.
+ \item Specify date output details (era, uncertain etc.).
+ \end{itemize}
+ \item 2018/02/13 (v.\,1.2)
+ \begin{itemize}
+ \item No change to these styles.
+ \end{itemize}
+ \item 2018/02/11 (v.\,1.1)
+ \begin{itemize}
+ \item Fixed location list output wrt the Unfied Style Sheet.
+ \item Link DOIs to preferred resolver (thanks, Katrin Leinweber!)
+ \end{itemize}
+ \item 2018/02/08 (v.\,1.0)
+ \begin{itemize}
+ \item Initial release on CTAN.
+ \end{itemize}
+\end{description}
+
+\begin{thebibliography}{1}
+
+\bibitem{bibltx} Lehman, Philipp (with Audrey Boruvka, Philip Kime and Joseph Wright):
+\emph{The biblatex Package. Programmable Bibliographies and Citations}. March 3, 2016.
+\url{http://www.ctan.org/pkg/biblatex}.
+
+\end{thebibliography}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
index 7efd2c2f362..2ab3d7bf0de 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
index c3d1c668055..0322456eae1 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -336,13 +336,31 @@ If you want to use APA/DGPs style, consider the following caveats.
for details.
\end{itemize}
-\subsection{Using a different style}\label{sec:bib-different}
+\subsection{Using a different style or not using biblatex}\label{sec:bib-different}
If you do not want or are not supposed to use neither the default Unified nor the APA/DGPs style, you can disable automatic \textsf{biblatex} loading via the class option \joption{biblatex=false} (see sec.~\ref{packageloading}). In this case, you will need to load
your own style manually, by entering the respective \textsf{biblatex} or Bib\TeX\ commands.
One case where you need to do that is if you prefer classic Bib\TeX\ over \textsf{biblatex}.
-If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{\url{http://celxj.org/downloads/unified.bst}} Note, though, that this package does not have specific support for German, so it is only really suitable if you write in English. Thus, if you want to follow the Applied Linguistics conventions, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a (seemingly unmaintained) Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{A copy is at \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified.bst}.} This style produces English output, a localized version for German,
+\textsf{unified-de.bst}, is available as well.\footnote{See \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified-de.bst}.}
+Both styles require the \textsf{natbib} package to be loaded.
+Note, though, that both styles provide only very rudimentary support for the Unified Style Sheet. Thus, if you want to follow the Applied Linguistics conventions
+really strictly, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+
+It is also possible (though not recommended) to use the \texttt{thebibliography} environment if,
+for some reason, you do not want to use \textsf{biblatex} nor Bib\TeX. Of course, in this case you are all responsible for the
+proper formatting of the entries. If you decide for this, you must load the \textsf{natbib} package and use the
+syntax documented in the natbib manual (\cite[sec.~1]{natbib}) for the proper setup of bibitems, e.\,g.,\footnote{%
+ Note the missing space before and after the parentheses that mark the year!}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={bibitem}]
+\bibitem[Jones et al.(1990)Jones, Baker, & Williams]{jon90}
+ Jones, Baker, & Williams. 1990. ...
+\end{lstlisting}
+%
+(Only) if \textsf{natbib} is loaded, \uvlt\ will take care that the spacing with the \texttt{thebibliography} environment
+is correct.
\section{Further instructions}
@@ -370,6 +388,15 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/09/28 (v.\,2.9)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
+ \item 2024/09/20 (v.\,2.8)
+ \begin{itemize}
+ \item Add basic support for \texttt{thebibliography} environment.
+ \item Update documentation on bibliography beyond \textsf{biblatex}.
+ \end{itemize}
\item 2024/07/23 (v.\,2.7)
\begin{itemize}
\item Fix spacing after \jfcsmacro{weblink}.
@@ -474,6 +501,10 @@ Templates are provided as well:
\emph{The covington Package. Macros for Linguistics}. September 7, 2018.
\url{http://www.ctan.org/pkg/covington}.
+\bibitem{natbib} Daly, Patrick W.:
+\emph{Natural Sciences Citations and References}. September 13, 2010.
+\url{http://www.ctan.org/pkg/natbib}.
+
\bibitem{apabibltx} Kime, Philip:
\emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016.
\url{http://www.ctan.org/pkg/biblatex-apa}.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
index a253d4003ef..dfce2b438a3 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
index bdd72da44e1..52bca62e0f0 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -373,13 +373,31 @@ If you want to use APA/DGPs style, consider the following caveats.
for details.
\end{itemize}
-\subsection{Using a different style}\label{sec:bib-different}
+\subsection{Using a different style or not using biblatex}\label{sec:bib-different}
If you do not want or are not supposed to use neither the default Unified nor the APA/DGPs style, you can disable automatic \textsf{biblatex} loading via the class option \joption{biblatex=false} (see sec.~\ref{packageloading}). In this case, you will need to load
your own style manually, by entering the respective \textsf{biblatex} or Bib\TeX\ commands.
One case where you need to do that is if you prefer classic Bib\TeX\ over \textsf{biblatex}.
-If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{\url{http://celxj.org/downloads/unified.bst}} Note, though, that this package does not have specific support for German, so it is only really suitable if you write in English. Thus, if you want to follow the Applied Linguistics conventions, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a (seemingly unmaintained) Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{A copy is at \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified.bst}.} This style produces English output, a localized version for German,
+\textsf{unified-de.bst}, is available as well.\footnote{See \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified-de.bst}.}
+Both styles require the \textsf{natbib} package to be loaded.
+Note, though, that both styles provide only very rudimentary support for the Unified Style Sheet. Thus, if you want to follow the Applied Linguistics conventions
+really strictly, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+
+It is also possible (though not recommended) to use the \texttt{thebibliography} environment if,
+for some reason, you do not want to use \textsf{biblatex} nor Bib\TeX. Of course, in this case you are all responsible for the
+proper formatting of the entries. If you decide for this, you must load the \textsf{natbib} package and use the
+syntax documented in the natbib manual (\cite[sec.~1]{natbib}) for the proper setup of bibitems, e.\,g.,\footnote{%
+ Note the missing space before and after the parentheses that mark the year!}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={bibitem}]
+\bibitem[Jones et al.(1990)Jones, Baker, & Williams]{jon90}
+ Jones, Baker, & Williams. 1990. ...
+\end{lstlisting}
+%
+(Only) if \textsf{natbib} is loaded, \uvlt\ will take care that the spacing with the \texttt{thebibliography} environment
+is correct.
\subsection{Heading}
@@ -415,6 +433,11 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2024/09/20 (v.\,2.8)
+ \begin{itemize}
+ \item Add basic support for \texttt{thebibliography} environment.
+ \item Update documentation on bibliography beyond \textsf{biblatex}.
+ \end{itemize}
\item 2024/07/23 (v.\,2.7)
\begin{itemize}
\item Fix spacing after \jfcsmacro{weblink}.
@@ -467,6 +490,10 @@ Templates are provided as well:
\emph{The covington Package. Macros for Linguistics}. September 7, 2018.
\url{http://www.ctan.org/pkg/covington}.
+\bibitem{natbib} Daly, Patrick W.:
+\emph{Natural Sciences Citations and References}. September 13, 2010.
+\url{http://www.ctan.org/pkg/natbib}.
+
\bibitem{apabibltx} Kime, Philip:
\emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016.
\url{http://www.ctan.org/pkg/biblatex-apa}.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
index e04efcd52f7..c3db12b0256 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
index d6f5293a898..1bb8ca3cb59 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -376,13 +376,31 @@ If you want to use APA/DGPs style, consider the following caveats.
for details.
\end{itemize}
-\subsection{Using a different style}\label{sec:bib-different}
+\subsection{Using a different style or not using biblatex}\label{sec:bib-different}
If you do not want or are not supposed to use neither the default Unified nor the APA/DGPs style, you can disable automatic \textsf{biblatex} loading via the class option \joption{biblatex=false} (see sec.~\ref{packageloading}). In this case, you will need to load
your own style manually, by entering the respective \textsf{biblatex} or Bib\TeX\ commands.
One case where you need to do that is if you prefer classic Bib\TeX\ over \textsf{biblatex}.
-If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{\url{http://celxj.org/downloads/unified.bst}} Note, though, that this package does not have specific support for German, so it is only really suitable if you write in English. Thus, if you want to follow the Applied Linguistics conventions, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a (seemingly unmaintained) Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{A copy is at \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified.bst}.} This style produces English output, a localized version for German,
+\textsf{unified-de.bst}, is available as well.\footnote{See \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified-de.bst}.}
+Both styles require the \textsf{natbib} package to be loaded.
+Note, though, that both styles provide only very rudimentary support for the Unified Style Sheet. Thus, if you want to follow the Applied Linguistics conventions
+really strictly, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+
+It is also possible (though not recommended) to use the \texttt{thebibliography} environment if,
+for some reason, you do not want to use \textsf{biblatex} nor Bib\TeX. Of course, in this case you are all responsible for the
+proper formatting of the entries. If you decide for this, you must load the \textsf{natbib} package and use the
+syntax documented in the natbib manual (\cite[sec.~1]{natbib}) for the proper setup of bibitems, e.\,g.,\footnote{%
+ Note the missing space before and after the parentheses that mark the year!}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={bibitem}]
+\bibitem[Jones et al.(1990)Jones, Baker, & Williams]{jon90}
+ Jones, Baker, & Williams. 1990. ...
+\end{lstlisting}
+%
+(Only) if \textsf{natbib} is loaded, \uvlt\ will take care that the spacing with the \texttt{thebibliography} environment
+is correct.
\section{Further instructions}
@@ -411,6 +429,15 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/09/28 (v.\,2.9)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
+ \item 2024/09/20 (v.\,2.8)
+ \begin{itemize}
+ \item Add basic support for \texttt{thebibliography} environment.
+ \item Update documentation on bibliography beyond \textsf{biblatex}.
+ \end{itemize}
\item 2024/07/23 (v.\,2.7)
\begin{itemize}
\item Fix spacing after \jfcsmacro{weblink}.
@@ -520,6 +547,10 @@ Templates are provided as well:
\emph{The covington Package. Macros for Linguistics}. September 7, 2018.
\url{http://www.ctan.org/pkg/covington}.
+\bibitem{natbib} Daly, Patrick W.:
+\emph{Natural Sciences Citations and References}. September 13, 2010.
+\url{http://www.ctan.org/pkg/natbib}.
+
\bibitem{apabibltx} Kime, Philip:
\emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016.
\url{http://www.ctan.org/pkg/biblatex-apa}.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
index 06d64c7638a..a5648d95184 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
index 1985658b786..f95f7a3e8a9 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
@@ -65,7 +65,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
index b77ad97265c..e5c13243f99 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
index 2feb157bce8..ea85ab9bca6 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -107,7 +107,7 @@ The following packages are required for specific features and loaded by default.
\begin{itemize}
\setlength\itemsep{0pt}
\item \textsf{mathptmx}: Default serif font (\emph{Palatino}).
- \item \textsf{urw-arial} or \textsf{helvet}: Default sans serif font (\emph{Arial} or \emph{Helvetica}).
+ \item \textsf{sourcesanspro}: Default sans serif font (\emph{Source Sans Pro}).
\item \textsf{sourcecodepro}: Default monospaced font (\emph{Source Code Pro}).
\item \textsf{biblatex}: Contemporary bibliography support.
\item \textsf{caption}: Caption layout adjustments.
@@ -129,24 +129,18 @@ The following packages are required for optional features (not used by default):
\section{Fonts}\label{fonts}
-The class uses, by default, PostScript (a.\,k.\,a. Type\,1) fonts and thus requires classic (PDF)LaTeX. Optionally, however, you can also use OpenType fonts via the \textsf{fontspec}
-package and the XeTeX or LuaTeX engine instead. In order to do this, use the class option \joption{fonts=otf} (see sec.~\ref{coptions} for details).
+The class uses, by default, PostScript (a.\,k.\,a. Type\,1) fonts and thus requires classic (PDF)LaTeX. Optionally, however, you can also use OpenType fonts via the \textsf{fontspec} package and the XeTeX or LuaTeX engine instead. In order to do this, use the class option \joption{fonts=otf} (see sec.~\ref{coptions} for details).
-In both cases, the class uses by default \emph{Palatino} as a serif font, \emph{Arial} (or, alternatively, \emph{Helvetica}) as a sans serif font, and \emph{Source Code Pro}
-as a monospaced (typewriter) font. Note that \emph{Arial} (PostScript) font support is not
-included in most \LaTeX\ distributions by default, due to license reasons. You can install it easily via the \textsf{getnonfreefonts} script.\footnote{\url{https://www.tug.org/fonts/getnonfreefonts}
-<25.\,01.\,2017>.}
-If \emph{Arial} is not installed, however, \emph{Helvetica} (which is part of the \LaTeX\ core packages) is used as a fallback. This is usually a suitable alternative, since \emph{Arial} and
-\emph{Helvetica} only differ in subtle details. If you use \joption{fonts=otf}, you just have to make sure that you have the fonts \emph{Arial}, \emph{Palatino}
-and \emph{Source Code Pro} installed on your operating system (with exactly these names, i.\,e., fonts named \emph{Arial Unicode MS} or \emph{Linotype Palatino} will not be recognized!).
+In both cases, the class uses by default \emph{Palatino} as a serif font (or the clone \emph{TeX Gyre Pagella} with OpenType, for that matter),
+\emph{Source Sans Pro} as a sans serif font, and \emph{Source Code Pro} as a monospaced (typewriter) font.
-As to font selection: \emph{Arial} is used in the official title page template\footnote{See \url{https://ssc-philkultur.univie.ac.at/en/degree-programmes/doctoral-programme/doctoral-thesis/}.}, so I used that (with the mentioned fallback, \emph{Helvetica}).
+As to font selection: \emph{Source Sans Pro} is used in the official title page template which is nowadays auto-generated by the theses server,
+so I used that.
A serif font recommendation is not given. The corporate design manual of the university suggests \emph{Source Serif Pro}, but this font is
-too heavy for a thesis (and we cannot use the suggested sans, \emph{Source Sans Pro}, anyway). A somewhat standard for academic papers
-and theses is \emph{Times New Roman}, but I think this runs too small for the text block size we have (as the name suggests, this font
-has been developed for the small columns of newspapers), and it is also pretty overused. The selected font, \emph{Palatino}, in contrast,
-suits well to wider text lines, it is well supported in \LaTeX, and it fits with \emph{Helvetica}. The monospaced font, \emph{Source Code Pro},
-is a good companion to this pair.
+too heavy for a thesis. A somewhat standard for academic papers and theses is \emph{Times New Roman}, but I think this runs too small for
+the text block size we have (as the name suggests, this font has been developed for the small columns of newspapers), and it is also pretty overused.
+The selected font, \emph{Palatino}, in contrast, suits well to wider text lines, it is well supported in \LaTeX, and it fits with \emph{Source Sans Pro}.
+The monospaced font, \emph{Source Code Pro}, is a good companion to this pair.
If you (or your instructor) prefer(s) \emph{Times New Roman} over \emph{Palatino} nonetheless, write to your preamble
\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single]
@@ -190,7 +184,8 @@ The class provides the following option to set the font handling:
\setlength\itemsep{0pt}
\item{\joption{fonts=ps|otf|none}}: if \joption{ps} is selected, PostScript fonts are used (this is the default and
the correct choice if you use LaTeX or PDFLaTeX); if \joption{otf} is selected, OpenType fonts are used, the class
- loads the \textsf{fontspec} package, sets \emph{Palatino} as main font and \emph{Arial} as sans serif font (this is
+ loads the \textsf{fontspec} package, sets \emph{Palatino} as main font, \emph{Source Sans Pro} as sans serif font,
+ and \emph{Source Code Pro} as monospaced font (this is
the correct choice if you use XeTeX or LuaTeX; make sure you have the respective fonts installed on your system);
if \joption{none} is selected, finally, the class will not load any font package at all, and neither
\textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself).
@@ -239,6 +234,14 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages
The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with your supervisor.
With \joption{draftmark=true}, this mark is printed on top of each page. With \joption{draftmark=firstpage}, the draft mark appears on the title page only.
+
+\subsection{Title page}\label{titlepage}
+
+As of 2024, MA and PhD theses must be submitted to the \textsf{u:space} platform without a title page (the title page will then be generated by the platform from the data
+you fill in there).
+
+Use the option \joption{titlepage=false} to suppress the title page for this purpose. The pagination will remain the same as with titlepage (i.\,e., the document starts at page 2).
+
\subsection{Further options}
\begin{description}
@@ -378,13 +381,31 @@ If you want to use APA/DGPs style, consider the following caveats.
for details.
\end{itemize}
-\subsection{Using a different style}\label{sec:bib-different}
+\subsection{Using a different style or not using \textsf{biblatex}}\label{sec:bib-different}
If you do not want or are not supposed to use neither the default Unified nor the APA/DGPs style, you can disable automatic \textsf{biblatex} loading via the class option \joption{biblatex=false} (see sec.~\ref{packageloading}). In this case, you will need to load
your own style manually, by entering the respective \textsf{biblatex} or Bib\TeX\ commands.
One case where you need to do that is if you prefer classic Bib\TeX\ over \textsf{biblatex}.
-If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{\url{http://celxj.org/downloads/unified.bst}} Note, though, that this package does not have specific support for German, so it is only really suitable if you write in English. Thus, if you want to follow the Applied Linguistics conventions, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+If you want to follow the Applied Linguistics conventions, but prefer classic Bib\TeX\ over \textsf{biblatex}, a (seemingly unmaintained) Bib\TeX\ style file \textsf{unified.bst} that implements the \emph{Unified Style Sheet for Linguistics} is available on the Internet.\footnote{A copy is at \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified.bst}.} This style produces English output, a localized version for German,
+\textsf{unified-de.bst}, is available as well.\footnote{See \url{https://raw.githubusercontent.com/jspitz/univie-ling/master/3rdparty/unified-de.bst}.}
+Both styles require the \textsf{natbib} package to be loaded.
+Note, though, that both styles provide only very rudimentary support for the Unified Style Sheet. Thus, if you want to follow the Applied Linguistics conventions
+really strictly, it is strongly recommended that you use \textsf{biblatex} with the preloaded \textsf{univie-ling} style.
+
+It is also possible (though not recommended) to use the \texttt{thebibliography} environment if,
+for some reason, you do not want to use \textsf{biblatex} nor Bib\TeX. Of course, in this case you are all responsible for the
+proper formatting of the entries. If you decide for this, you must load the \textsf{natbib} package and use the
+syntax documented in the natbib manual (\cite[sec.~1]{natbib}) for the proper setup of bibitems, e.\,g.,\footnote{%
+ Note the missing space before and after the parentheses that mark the year!}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={bibitem}]
+\bibitem[Jones et al.(1990)Jones, Baker, & Williams]{jon90}
+ Jones, Baker, & Williams. 1990. ...
+\end{lstlisting}
+%
+(Only) if \textsf{natbib} is loaded, \uvlt\ will take care that the spacing with the \texttt{thebibliography} environment
+is correct.
\section{Further instructions}
@@ -433,6 +454,19 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/09/28 (v.\,2.9)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
+ \item 2024/09/20 (v.\,2.8)
+ \begin{itemize}
+ \item Add class option \joption{titlepage=true|false} (see sec.~\ref{titlepage}).
+ \item Adapt title page to recent design. This entails a change of sans serif font
+ from Arial to Source Sans Pro.
+ \item Use \emph{TeX Gyre Pagella} rather than \emph{Palatino} with \joption{fonts=otf}.
+ \item Add basic support for \texttt{thebibliography} environment.
+ \item Update documentation on bibliography beyond \textsf{biblatex}.
+ \end{itemize}
\item 2024/07/23 (v.\,2.7)
\begin{itemize}
\item Fix spacing after \jfcsmacro{weblink}.
@@ -555,6 +589,10 @@ Templates are provided as well:
\emph{The covington Package. Macros for Linguistics}. September 7, 2018.
\url{http://www.ctan.org/pkg/covington}.
+\bibitem{natbib} Daly, Patrick W.:
+\emph{Natural Sciences Citations and References}. September 13, 2010.
+\url{http://www.ctan.org/pkg/natbib}.
+
\bibitem{apabibltx} Kime, Philip:
\emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016.
\url{http://www.ctan.org/pkg/biblatex-apa}.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
index f2a5a48dc28..794ff256b03 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
index 6ca75cc0ed0..379ff0485d7 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -259,13 +259,33 @@ Please refer to the \textsf{covington} manual \cite{covington} for details.
\section{Bibliography}\label{bibliography}
-If the class option \joption{biblatex=true} is set, the \uvlt\ class loads a bibliography style which matches journal style sheet. These conventions draw on the
-\emph{Unified Style Sheet for Linguistics} of the LSA (\emph{Linguistic Society of America}).
-In order to conform to this style, the \uvlt\ class uses the \textsf{biblatex} package with the \textsf{univie-ling} style that is included in the \textsf{univie-ling} bundle.
+If the class option \joption{biblatex=true} is set, the \uvlt\ class loads a bibliography style which matches journal style sheet.
+These conventions draw on the \emph{Unified Style Sheet for Linguistics} of the LSA (\emph{Linguistic Society of America}).
+In order to conform to this style, the \uvlt\ class uses the \textsf{biblatex} package with the \textsf{univie-ling}
+style that is included in the \textsf{univie-ling} bundle.
-If, for some reason, you do not want to use \textsf{biblatex} and prefer to have a manually constituted bibliography\footnote{A reason might be that you transform
-a paper submitted in a an office file format to \LaTeX.}, use the \texttt{reflist} environment
-and separate each entry by a blank line. Since this environment is provided by \textsf{covington}, the \joption{covington} options must not be \joption{false}.
+Since there is no Bib\TeX\ style file available that completely matches the journal's style guide, you cannot use
+classic Bib\TeX\ for a paper in the WLG.
+
+It is also possible, however, (though not recommended) to use the \texttt{thebibliography} environment if,
+for some reason, you do not want to use \textsf{biblatex}. Of course, in this case you are all responsible for the
+proper formatting of the entries. If you decide for this, you must load the \textsf{natbib} package and use the
+syntax documented in the natbib manual (\cite[sec.~1]{natbib}) for the proper setup of bibitems, e.\,g.,\footnote{%
+ Note the missing space before and after the parentheses that mark the year!}
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={bibitem}]
+\bibitem[Jones et al.(1990)Jones, Baker, & Williams]{jon90}
+ Jones, Baker, & Williams. 1990. ...
+\end{lstlisting}
+%
+(Only) if \textsf{natbib} is loaded, \uvlt\ will take care that the spacing with the \texttt{thebibliography} environment
+is correct.
+
+Finally, if you prefer to have a completely manually constituted bibliography with manually inserted citations%
+\footnote{A reason might be that you transform a paper submitted in a an office file format to \LaTeX. In this case,
+\texttt{reflist} is often more convenient than \texttt{bibliography}.},
+use the \texttt{reflist} environment and separate each entry by a blank line (see \cite[sec.~9]{covington}).
+Since this environment is provided by \textsf{covington}, the \joption{covington} options must not be \joption{false}.
\section{\LyX\ layouts and templates}
@@ -278,6 +298,19 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2024/09/28 (v.\,2.9)
+ \begin{itemize}
+ \item Fix pagination with \jfcsmacro{frontmatter} articles.
+ \item Improve parts in TOC.
+ \item Clear double page before parts.
+ \end{itemize}
+ \item 2024/09/20 (v.\,2.8)
+ \begin{itemize}
+ \item Add basic support for \texttt{thebibliography} environment.
+ \item Update documentation on bibliography beyond \textsf{biblatex}.
+ \item Fix pagination issue with \joption{titlepage=specialprint}.
+ \item Part pages are now empty (no pagination and heading).
+ \end{itemize}
\item 2024/07/23 (v.\,2.7)
\begin{itemize}
\item Use proper spacing with \textsf{covington}'s \texttt{reflist} environment.
@@ -354,9 +387,12 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\begin{thebibliography}{1}
- \bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen:
+\bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen:
\emph{The covington Package. Macros for Linguistics}. September 7, 2018.
\url{http://www.ctan.org/pkg/covington}.
+\bibitem{natbib} Daly, Patrick W.:
+ \emph{Natural Sciences Citations and References}. September 13, 2010.
+ \url{http://www.ctan.org/pkg/natbib}.
\end{thebibliography}
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
index 394cddb6923..e9e852d10a8 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
index f88f1fcea48..2ba95602f59 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
@@ -42,7 +42,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.7, 2024/07/23}
+\date{Version 2.9, 2024/09/28}
\maketitle
@@ -100,7 +100,7 @@ The bundle also includes a \textsf{biblatex} bibliography style (\texttt{univie-
(\texttt{univie-ling.cbx}) that implement the citation conventions common in Viennese (Applied) Linguistics.
The style draws on the \emph{Unified Style Sheet for Linguistic Papers}.%
\footnote{See \url{https://www.linguisticsociety.org/sites/default/files/style-sheet_0.pdf}.}
-Documentation is included in the documentation of the classes above.
+\mlink{univie-ling-bbx.pdf}
\section{Release History}
diff --git a/Master/texmf-dist/doc/latex/useclass/README.md b/Master/texmf-dist/doc/latex/useclass/README.md
index d3bd24274d6..58dbbd65547 100644
--- a/Master/texmf-dist/doc/latex/useclass/README.md
+++ b/Master/texmf-dist/doc/latex/useclass/README.md
@@ -1,3 +1,8 @@
+[![Latest Document](https://img.shields.io/github/v/release/huangyxi/useclass?label=Docs)](https://github.com/huangyxi/useclass/releases/latest/download/useclass.pdf)
+[![GitHub Release](https://img.shields.io/github/v/release/huangyxi/useclass?label=Release)](https://github.com/huangyxi/useclass/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/useclass?label=CTAN)](https://www.ctan.org/pkg/useclass)
+
+
# The `useclass.sty` Package: Load Classes as Packages
## Introduction
diff --git a/Master/texmf-dist/doc/latex/useclass/useclass.pdf b/Master/texmf-dist/doc/latex/useclass/useclass.pdf
index 2623e72d2bd..e373f709ead 100644
--- a/Master/texmf-dist/doc/latex/useclass/useclass.pdf
+++ b/Master/texmf-dist/doc/latex/useclass/useclass.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/verifycommand/README.txt b/Master/texmf-dist/doc/latex/verifycommand/README.txt
index 4ee9666691c..bd4b7922681 100644
--- a/Master/texmf-dist/doc/latex/verifycommand/README.txt
+++ b/Master/texmf-dist/doc/latex/verifycommand/README.txt
@@ -1,5 +1,5 @@
-LaTeX verifycommand package v1.00 README.txt
+LaTeX verifycommand package v1.10 README.txt
Files included are:
diff --git a/Master/texmf-dist/doc/latex/verifycommand/verifycommand.pdf b/Master/texmf-dist/doc/latex/verifycommand/verifycommand.pdf
index b58e11c6c28..19accc8682d 100644
--- a/Master/texmf-dist/doc/latex/verifycommand/verifycommand.pdf
+++ b/Master/texmf-dist/doc/latex/verifycommand/verifycommand.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.pdf b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.pdf
new file mode 100644
index 00000000000..0d8a71a39a4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.tex b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.tex
new file mode 100644
index 00000000000..acb246e07c0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-5x5-A4.tex
@@ -0,0 +1,26 @@
+% !TeX TXS-program:compile = txs:///arara
+% arara: pdflatex: {shell: no, synctex: no, interaction: batchmode}
+
+\documentclass[a4paper,11pt]{article}
+\usepackage{WriteOnGrid}
+\usepackage{lipsum}
+\usepackage{frcursive}
+
+\begin{document}
+
+\thispagestyle{empty}
+
+\begin{PleinePageCinqCinq}[FormatPapier=A4,NumLignes,MargeG=0.7,MargeH=2.3]
+%entête
+\LignePapierCinqCinq[Echelle=1.25,Ligne=1]{C. PIERQUET \hfill \LaTeX}
+%titre
+\LignePapierCinqCinq[Echelle=1.25,Ligne=2,Couleur=red]<center>{\underline{\cursive\bfseries Devoir 1}}
+%cadre de notes
+\CadreNoteCinqCinq{3}
+%ligne pour un petit titre
+\LignePapierCinqCinq[Echelle=1.25,Ligne=8,Couleur=green!50!black]{\sffamily\underline{Exercice 1 :}}
+%%paragraphe lipsum avec une échelle de 1.15 := calcul de l'interligne
+\ParagraphePapierCinqCinq[Ligne=10,Echelle=1.15,Espacement=\fpeval{10/1.15}]{\cursive\lipsum[1][1-7]}
+\end{PleinePageCinqCinq}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.pdf b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.pdf
index 7bcc35aa1b2..7a2a6c5b982 100644
--- a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.tex b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.tex
index 070c88b7cdc..3608df559c7 100644
--- a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-en.tex
@@ -45,8 +45,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.6}
-\def\TPdate{12/04/2024}
+\def\TPversion{0.1.7}
+\def\TPdate{01/09/2024}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -525,6 +525,8 @@ To sum up, they create full paper grid (by preference for \texttt{\textbf{a4pape
\part*{History}
+\verb|v0.1.7|~:~~~~New feature for french paper \textsf{PleinePageCinqCinq}
+
\verb|v0.1.6|~:~~~~Possibility to automatically determine L\&C based on the remaining space.
\verb|v0.1.4|~:~~~~New \texttt{[keys]} + enhancements for paragraphs, for french version (for the moment\dots)
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.pdf b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.pdf
index 517ce5911d9..76850d725dd 100644
--- a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.tex b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.tex
index 1da2b2b0bc3..fb63ea44223 100644
--- a/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/writeongrid/WriteOnGrid-doc-fr.tex
@@ -48,8 +48,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.6}
-\def\TPdate{12 avril 2024}
+\def\TPversion{0.1.7}
+\def\TPdate{01 septembre 2024}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -763,6 +763,13 @@ Les commandes et environnements sont suffixées différemment, mais le reste est
\end{PleinePageSeyes}
\end{PresentationCode}
+{\small\faBomb} Pour les pages complètes 5x5, il est possible d'utiliser les clés \Cle{MargeG} et \Cle{MargeH} qui valent \Cle{auto} par défaut (adaptées au format du papier), mais elles peuvent être définies manuellement, avec les \textbf{contraintes} suivantes (pour un affichage correct sur les lignes, pour le moment\ldots) :
+
+\begin{itemize}
+ \item \Cle{MargeG} doit valoir $0.2$ ou $0.7$ ou $1.2$ ou $1.7$ etc
+ \item \Cle{MargeH} doit valoir $0.3$ ou $0.8$ ou $1.3$ ou $1.8$ etc
+\end{itemize}
+
\subsection{Exemples}
Les exemples des pages suivantes ont été obtenus de la même manière que celui de la pleine page Seyes, il \textit{suffit} d'adapter les commandes et environnements avec le bon suffixe.
@@ -770,7 +777,7 @@ Les exemples des pages suivantes ont été obtenus de la même manière que celu
\begin{PresentationCode}{listing only}
\pagestyle{empty}
-\begin{PleinePageCinqCinq}[NumLignes]
+\begin{PleinePageCinqCinq}[NumLignes,MargeG=2.7,MargeH=2.3]
\LignePapierCinqCinq[Echelle=1.25,Ligne=1]{C. PIERQUET \hfill LaTeX}
\LignePapierCinqCinq[Echelle=1.25,Ligne=3,Couleur=red]<center>{\underline{\cursive\bfseries Devoir 2}}
\CadreNoteCinqCinq{4}
@@ -807,7 +814,11 @@ Les exemples des pages suivantes ont été obtenus de la même manière que celu
\pagestyle{empty}
-\begin{PleinePageCinqCinq}[NumLignes]
+\begin{PleinePageCinqCinq}[NumLignes,MargeG=2.7,MargeH=2.3]
+ %marges pour illustrer
+ \draw[thick,teal,<->,>=latex] ([shift={(-2.7,1.5)}]CinqCinqOrigine) --++ (2.7,0) node[midway,below,font=\small\ttfamily] {MargeG} ;
+ \draw[thick,orange,<->,>=latex] ([shift={(-0.5,0)}]CinqCinqOrigine) --++ (0,2.3) node[midway,right,font=\small\ttfamily] {MargeH} ;
+ %back to normal
\LignePapierCinqCinq[Echelle=1.25,Ligne=1]{C. PIERQUET \hfill LaTeX}
\LignePapierCinqCinq[Echelle=1.25,Ligne=3,Couleur=red]<center>{\underline{\cursive\bfseries Devoir 2}}
\CadreNoteCinqCinq{4}
@@ -842,6 +853,8 @@ Les exemples des pages suivantes ont été obtenus de la même manière que celu
\section{Historique}
+\verb|v0.1.7|~:~~~~Option pour régler la marge pour les \textsf{PleinePageCinqCinq}
+
\verb|v0.1.6|~:~~~~Possibilité de déterminer automatiquement L\&C en fonction de la place restante.
\verb|v0.1.5|~:~~~~Possibilité de spécifier la réglure pour les quadrillages de type \textsf{Seyes} + meilleure gestion des paragraphes.
diff --git a/Master/texmf-dist/doc/latex/xcolor/ChangeLog b/Master/texmf-dist/doc/latex/xcolor/ChangeLog
index a85977fdd06..b366cd0e4bc 100644
--- a/Master/texmf-dist/doc/latex/xcolor/ChangeLog
+++ b/Master/texmf-dist/doc/latex/xcolor/ChangeLog
@@ -3,6 +3,15 @@ https://github.com/latex3/xcolor/issues
History
=======
+2024/09/29 v3.02
+* remove definitions of color groups as they are already in the kernel.
+
+2024/09/17
+* unknown model error handled (issue #1)
+
+2024/03/13
+* Add \relax after \ProcessKeyOptions to improve error context lines
+
2023/11/15 v3.01
* only warn and not error if obsolete option usenames is used, issue #31
diff --git a/Master/texmf-dist/doc/latex/xcolor/README.md b/Master/texmf-dist/doc/latex/xcolor/README.md
index 2e89dafed9f..66f53b32c77 100644
--- a/Master/texmf-dist/doc/latex/xcolor/README.md
+++ b/Master/texmf-dist/doc/latex/xcolor/README.md
@@ -1,6 +1,6 @@
## Package `xcolor` by Dr. Uwe Kern
-Version 2023-11-15 v3.01
+Version 2024-09-29 v3.02
Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
@@ -14,7 +14,7 @@ separation, and color wheel calculations.
## Copyright (C)
- 2003-2021 Dr. Uwe Kern
-- 2021-2023 The LaTeX Project
+- 2021-2024 The LaTeX Project
## License
LaTeX Project Public License, version 1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
index 07df7e6e0a9..557835429ff 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.lox
@@ -23,11 +23,11 @@
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\def\ukfile#1#2#3#4%
{\def\ukhead
{\ifnum#1>2 \perCent!^^J\fi
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
index c9ab96b507e..1988dfce2eb 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
index 35bb3b7e32f..2cb9021f83d 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor1.tex
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor1}
- [2023/11/15 v3.01 Color conversion test (UK)]
+ [2024/09/29 v3.02 Color conversion test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\documentclass[a4paper]{article}
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
index 07d228343cb..ae9d34157a8 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
index cdee1530938..6a319372dda 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor2.tex
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor2}
- [2023/11/15 v3.01 Pstricks color test (UK)]
+ [2024/09/29 v3.02 Pstricks color test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass{article}
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
index eac85e2d508..bbfb5f75bed 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor3.tex
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor3}
- [2023/11/15 v3.01 Color logging test (UK)]
+ [2024/09/29 v3.02 Color logging test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass[a4paper]{article}
diff --git a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
index aead5e61963..27c9cf3d595 100644
--- a/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
+++ b/Master/texmf-dist/doc/latex/xcolor/xcolor4.tex
@@ -22,15 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesFile{xcolor4}
- [2023/11/15 v3.01 Color driver test (UK)]
+ [2024/09/29 v3.02 Color driver test (UK)]
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2024 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
-\def\XCfileversion{v3.01}%
-\def\XCfiledate{2023/11/15}%
+\def\XCfileversion{v3.02}%
+\def\XCfiledate{2024/09/29}%
\listfiles
\documentclass[a4paper]{article}
diff --git a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
index 80b15591bed..9b2d8e2c2cf 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
@@ -1,6 +1,11 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.6...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.7...HEAD)
+
+## [v0.4.7](https://github.com/gusbrs/zref-clever/compare/v0.4.6...v0.4.7) (2024-09-30)
+
+### Changed
+- Inhibit missing name warning if `noname` option is in use.
## [v0.4.6](https://github.com/gusbrs/zref-clever/compare/v0.4.5...v0.4.6) (2024-08-23)
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
index 4dc41ff5a8a..a3885ad3d67 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
index e6c24bc4732..78cc9f7d601 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
index 7b8e27a15bb..b91cceb551d 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
@@ -2332,6 +2332,13 @@ handling. These are just the ones for which some special treatment was
required. Of course, this effort is bound to be incomplete (see
\zcref{sec:limitations}).
+Note that settings performed by the compatibility modules require special care
+if they are to be changed by users. Since the modules depend on what has been
+loaded or not in the document, the settings are done at
+\texttt{begindocument}. Hence, to override a setting performed by a
+compatibility module, the user must ensure their change comes after that,
+e.g.\ by adding their setting to the \texttt{begindocument} hook.
+
The purpose of outlining to some extend what the compatibility modules do is
twofold. First, some of them require usage adjustments for label setting,
which must be somehow conveyed in this documentation. Second, the kind and
diff --git a/Master/texmf-dist/doc/latex/zugferd/DEMO-rechnung-zugferd.tex b/Master/texmf-dist/doc/latex/zugferd/DEMO-rechnung-zugferd.tex
new file mode 100644
index 00000000000..1d38dcafb5c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zugferd/DEMO-rechnung-zugferd.tex
@@ -0,0 +1,95 @@
+% !TeX Program=lualatex
+%
+% Demo file for the LaTeX-ZUGFeRD project
+% This file corresponds to version 0.8 (2024-09-11)
+%
+% Copyright (C) 2024 Marei Peischl <marei@peitex.de>
+% ---------------------------------------------------------
+%
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008-05-04 or later.
+%
+\DocumentMetadata{
+ pdfstandard=a-3b,
+ lang=de,
+}
+\documentclass[parskip=half-,german]{scrartcl}
+
+\usepackage[
+ format=xrechnung3.0% 3.0 is the default anyway, but you can select the format to avoid automatic changes.
+]{zugferd-invoice}
+
+\setkomavar{invoice}{2024:1337}
+\setkomavar{date}{2024-01-04}
+\setkomavar{title}{Rechnung}
+
+\newkomafont{invoicetotal}{\bfseries}
+
+\SetZUGFeRDData{
+% document-type = commercial-invoice, % commented as this setting matches the initial value
+ id=komavar,
+% date=auto, % commented as this setting matches the initial value
+% delivery-date = auto, % commented as this setting matches the initial value
+ subject=komavar,
+ fromaddress=komavar,
+% tax/category=S,
+% tax/rate=19,
+ unit=hour,
+ seller/name = {peiTeX (Marei Peischl)},
+ seller/postcode = {20253},
+ seller/city ={Hamburg},
+ seller/country = DE,
+ seller/address = {Address 1},
+ seller/vatid = {DE123456789},
+ seller/contact= {Marei\\+4900000000\\marei@peitex.de},
+ seller/email = {kontakt@peitex.de},
+ buyer/reference = {buyer-reference}, %oder Leitweg-ID
+ buyer/name = {Käufer Name},
+ buyer/postcode = {20253},
+ buyer/city ={Hamburg},
+ buyer/country = DE,
+ buyer/address = {Address 1\\Address 2},
+ buyer/vatid = {DE123456789},
+ buyer/email = {invoice@example.org},
+ currency=€,
+ payment-terms={Zahlbar innerhalb von 14 Tagen},% entweder das oder das Datum (Zeile drunter) ist notwendig
+ due-date={20240118},
+ payment-means / type = 58, % SEPA Ãœbereisung,
+ payment-means / iban = DE68430609671013251700,
+ payment-means / account-holder = Marei Peischl,
+ payment-means / bic =GENODEM1GLS
+}
+
+
+
+\begin{document}
+
+
+\begin{letter}{Firma\\Vorname Nachname\\Rechnungsadresse\\PLZ Ort}
+
+\opening{Guten Tag,}
+
+hiermit stelle ich Ihnen meine Arbeit im Rahmen des Projektes XX in Rechnung. Die Leistung wurde im Januar 2024 erbracht.
+
+\AddInvoiceItem{3}{Weiterentwicklung/funktionale Erweiterung}{90}
+\AddInvoiceItem[7]{3}{Support}{90}
+\AddInvoiceItem{2}{Support an Feiertagen/Wochenende}{180}
+
+\PrintInvoiceTabular
+
+Ich bitte Sie oben genannte Betrag binnen 30 Tagen auf unten genanntes Konto zu überweisen.
+
+%Falls gewünscht
+\closing{Happy \TeX{}ing}
+
+
+\end{letter}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/zugferd/DEPENDS.txt b/Master/texmf-dist/doc/latex/zugferd/DEPENDS.txt
new file mode 100644
index 00000000000..9156e86f4c1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zugferd/DEPENDS.txt
@@ -0,0 +1,7 @@
+# Proudly generated by the Island of TeX's DEPendency Printer https://gitlab.com/islandoftex/texmf/depp
+soft babel# only zugferd-invoice.sty
+soft booktabs# only zugferd-invoice.sty
+soft koma-script# only zugferd-invoice.sty
+soft ragged2e# only zugferd-invoice.sty
+siunitx
+soft xltabular# only zugferd-invoice.sty
diff --git a/Master/texmf-dist/doc/latex/zugferd/README.md b/Master/texmf-dist/doc/latex/zugferd/README.md
new file mode 100644
index 00000000000..e6d85f137cc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zugferd/README.md
@@ -0,0 +1,27 @@
+# ZUGFeRD - Create ZUGFeRD and other kinds of E-invoices using LaTeX
+
+Copyright (C) 2023–2024 by Marei Peischl (peiTeX) <marei@peitex.de>
+
+zugferd version 0.8 (2024-09-11)
+
+***************************************************************************
+
+ This material is subject to the LaTeX Project Public License version 1.3c
+ or later. See http://www.latex-project.org/lppl.txt for details.
+
+***************************************************************************
+
+## Abstract
+
+This package provides an interface to make your LaTeX-based invoicing compatible to e-invoicing standards, such as they exist in the EU.
+
+The package includes a demo implementation, which can be used by template developers to create their own company specific variant. The included example file shows how to use it. This package is built so it also creates the XML file which will be directly attached to the PDF.
+
+There also exist interfaces to attach an XML file generated differently. Please have a look at the documentation.
+
+This package does not provide. Please be aware of you have to use valid input data for a valid ZUGFeRD output. The documentation suggests some options.
+
+
+# Version History
+
+ * 0.8 (2024-09-11) First version on CTAN
diff --git a/Master/texmf-dist/doc/latex/zugferd/zugferd.pdf b/Master/texmf-dist/doc/latex/zugferd/zugferd.pdf
new file mode 100644
index 00000000000..3d3801ab7b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/zugferd/zugferd.pdf
Binary files differ