diff options
| author | Norbert Preining <norbert@preining.info> | 2024-08-27 03:03:02 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2024-08-27 03:03:02 +0000 |
| commit | bc8c0d7f7bf2c4d067111b808f7c898d241039ee (patch) | |
| tree | ec8510d9edaf454a9cfe2805d78bcfc22a3fbeca | |
| parent | 41bf6381bd3789043c4d5f0190b3a2ff8720af2c (diff) | |
CTAN sync 202408270302
62 files changed, 1761 insertions, 660 deletions
diff --git a/FILES.byname b/FILES.byname index b7bf44d809..f8626fd1a6 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2077,12 +2077,12 @@ 2024/08/21 | 1837 | biblio/citation-style-language/README.md 2024/08/21 | 12878 | biblio/citation-style-language/vancouver.csl 2024/08/21 | 4573853 | biblio/citation-style-language.zip -2024/08/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2024/08/26 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2024/08/25 | 2882209 | biblio/ctan-bibdata/ctan.bib -2024/08/25 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/08/26 | 2882209 | biblio/ctan-bibdata/ctan.bib +2024/08/26 | 3708800 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2024/08/25 | 4124457 | biblio/ctan-bibdata.zip +2024/08/26 | 4124452 | biblio/ctan-bibdata.zip 2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk 2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh 2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst @@ -5444,7 +5444,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2024/08/25 | 59405 | FILES.last07days +2024/08/26 | 60576 | FILES.last07days 2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs 2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf 2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf @@ -224450,44 +224450,45 @@ 2024/01/30 | 464 | macros/latex/contrib/achemso/LICENSE.md 2024/01/30 | 1333 | macros/latex/contrib/achemso/README.md 2024/01/30 | 918111 | macros/latex/contrib/achemso.zip -2024/04/18 | 2773 | macros/latex/contrib/acmart/acmart.bib -2024/05/29 | 292974 | macros/latex/contrib/acmart/acmart.dtx -2023/03/26 | 1016 | macros/latex/contrib/acmart/acmart.ins -2024/06/02 | 949483 | macros/latex/contrib/acmart/acmart.pdf +2024/06/02 | 2773 | macros/latex/contrib/acmart/acmart.bib +2024/08/26 | 294632 | macros/latex/contrib/acmart/acmart.dtx +2024/08/25 | 1076 | macros/latex/contrib/acmart/acmart.ins +2024/08/26 | 943219 | macros/latex/contrib/acmart/acmart.pdf 2023/03/26 | 20721 | macros/latex/contrib/acmart/acmauthoryear.bbx 2023/03/26 | 6245 | macros/latex/contrib/acmart/acmauthoryear.cbx 2023/03/26 | 1093 | macros/latex/contrib/acmart/acmdatamodel.dbx -2024/06/02 | 439879 | macros/latex/contrib/acmart/acmguide.pdf +2024/08/26 | 441394 | macros/latex/contrib/acmart/acmguide.pdf 2023/06/12 | 19718 | macros/latex/contrib/acmart/acm-jdslogo.png 2023/03/26 | 19840 | macros/latex/contrib/acmart/acmnumeric.bbx 2023/03/26 | 90 | macros/latex/contrib/acmart/acmnumeric.cbx 2023/03/31 | 90332 | macros/latex/contrib/acmart/ACM-Reference-Format.bst -2024/04/18 | 5512 | macros/latex/contrib/acmart/Makefile -2024/05/29 | 13797 | macros/latex/contrib/acmart/README +2024/08/26 | 6145 | macros/latex/contrib/acmart/Makefile +2024/08/26 | 13934 | macros/latex/contrib/acmart/README 2023/03/26 | 4825 | macros/latex/contrib/acmart/samples/abbrev.bib 2024/02/06 | 12834 | macros/latex/contrib/acmart/samples/acmengage.dtx -2024/06/02 | 214844 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf -2024/06/02 | 399476 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf -2024/06/02 | 613884 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf -2024/06/02 | 636571 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf -2024/06/02 | 1059143 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf -2024/06/02 | 623848 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf -2024/06/02 | 626360 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf -2024/06/02 | 571812 | macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf -2024/06/02 | 571575 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf +2024/08/26 | 214844 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf +2024/08/26 | 399476 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf +2024/08/26 | 613884 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +2024/08/26 | 636571 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf +2024/08/26 | 1059177 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +2024/08/26 | 623848 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +2024/08/26 | 626360 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +2024/08/26 | 480489 | macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf +2024/08/26 | 571812 | macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf +2024/08/26 | 571575 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf 2023/03/26 | 53502 | macros/latex/contrib/acmart/samples/sample-base.bib 2023/03/26 | 95030 | macros/latex/contrib/acmart/samples/sample-franklin.png -2024/06/02 | 625334 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf -2024/04/18 | 39521 | macros/latex/contrib/acmart/samples/samples.dtx -2024/06/02 | 1051244 | macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf -2024/06/02 | 624415 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf -2024/06/02 | 1062362 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf -2024/06/02 | 1047421 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf -2024/06/02 | 1053423 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf -2024/04/18 | 1560 | macros/latex/contrib/acmart/samples/samples.ins +2024/08/26 | 625334 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf +2024/08/26 | 39918 | macros/latex/contrib/acmart/samples/samples.dtx +2024/08/26 | 1051239 | macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf +2024/08/26 | 624415 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf +2024/08/26 | 1062362 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf +2024/08/26 | 1047421 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf +2024/08/26 | 1053423 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf +2024/08/26 | 1645 | macros/latex/contrib/acmart/samples/samples.ins 2023/03/26 | 439021 | macros/latex/contrib/acmart/samples/sampleteaser.pdf 2023/03/26 | 5221 | macros/latex/contrib/acmart/samples/software.bib -2024/06/02 | 12388297 | macros/latex/contrib/acmart.zip +2024/08/26 | 12726541 | macros/latex/contrib/acmart.zip 2000/05/18 | 66049 | macros/latex/contrib/acmconf/acmconf.dtx 2000/05/18 | 4408 | macros/latex/contrib/acmconf/acmconf.ins 2008/05/14 | 96012 | macros/latex/contrib/acmconf/acmconf.pdf @@ -228045,15 +228046,15 @@ 2015/05/31 | 763 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle/makefile 2015/05/31 | 345 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle/README 2018/10/24 | 113539 | macros/latex/contrib/biblatex-contrib/biblatex-opcit-booktitle.zip -2023/11/23 | 4247 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile -2023/11/23 | 465495 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf -2023/11/23 | 473027 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf -2023/11/23 | 469483 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf -2023/11/23 | 511026 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx -2023/11/23 | 597953 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf -2023/11/23 | 469617 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf -2023/11/23 | 5456 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md -2023/11/23 | 2528569 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip +2024/08/26 | 4261 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile +2024/08/26 | 465824 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf +2024/08/26 | 473527 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf +2024/08/26 | 470053 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf +2024/08/26 | 533434 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx +2024/08/26 | 637441 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf +2024/08/26 | 469903 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf +2024/08/26 | 5495 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md +2024/08/26 | 2573109 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip 2022/09/16 | 225122 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.dtx 2022/09/16 | 544191 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.pdf 2022/09/16 | 9422 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/examples.zip @@ -231704,15 +231705,15 @@ 2008/08/25 | 8826 | macros/latex/contrib/custom-bib/suppjour.mbs 2008/08/25 | 7460 | macros/latex/contrib/custom-bib/svenska.mbs 2011/11/18 | 900708 | macros/latex/contrib/custom-bib.zip -2024/08/20 | 199070 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf -2024/08/20 | 21192 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex -2024/08/19 | 1503490 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf -2024/08/19 | 54295 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex -2024/03/30 | 177853 | macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf -2024/04/04 | 2033 | macros/latex/contrib/customenvs/doc/envtexo_exemples.tex +2024/08/26 | 210026 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf +2024/08/26 | 22255 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex +2024/08/26 | 1475123 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf +2024/08/26 | 56269 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex +2024/08/26 | 148026 | macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf +2024/08/26 | 2150 | macros/latex/contrib/customenvs/doc/envtexo_exemples.tex 2024/03/18 | 593 | macros/latex/contrib/customenvs/README.md -2024/08/19 | 95076 | macros/latex/contrib/customenvs/tex/customenvs.sty -2024/08/20 | 1898449 | macros/latex/contrib/customenvs.zip +2024/08/26 | 103823 | macros/latex/contrib/customenvs/tex/customenvs.sty +2024/08/26 | 1853525 | macros/latex/contrib/customenvs.zip 2021/10/30 | 33647 | macros/latex/contrib/cutwin/cutwin.dtx 2021/10/30 | 2844 | macros/latex/contrib/cutwin/cutwin.ins 2021/10/30 | 341874 | macros/latex/contrib/cutwin/cutwin.pdf @@ -261315,18 +261316,18 @@ 2021/12/14 | 113179 | macros/luatex/latex/datestamp/datestamp.pdf 2021/12/14 | 347 | macros/luatex/latex/datestamp/README.txt 2021/12/14 | 118827 | macros/luatex/latex/datestamp.zip -2024/08/22 | 187 | macros/luatex/latex/domaincoloring/Changes -2024/08/22 | 750 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib -2024/08/22 | 6845040 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf -2024/08/22 | 8695 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex -2024/08/22 | 533343 | macros/luatex/latex/domaincoloring/doc/hsv.png -2024/08/22 | 335225 | macros/luatex/latex/domaincoloring/doc/titleImg.pdf -2024/08/22 | 2786 | macros/luatex/latex/domaincoloring/latex/domaincoloring.sty -2024/08/22 | 8094 | macros/luatex/latex/domaincoloring/lua/domaincoloring-complex-numbers.lua -2024/08/22 | 1177 | macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua -2024/08/22 | 7600 | macros/luatex/latex/domaincoloring/lua/domaincoloring.lua -2024/08/22 | 418 | macros/luatex/latex/domaincoloring/README.md -2024/08/22 | 7402597 | macros/luatex/latex/domaincoloring.zip +2024/08/26 | 412 | macros/luatex/latex/domaincoloring/Changes +2024/08/26 | 1015 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib +2024/08/26 | 12831690 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf +2024/08/26 | 9403 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex +2024/08/26 | 533343 | macros/luatex/latex/domaincoloring/doc/hsv.png +2024/08/26 | 334858 | macros/luatex/latex/domaincoloring/doc/titleImg.pdf +2024/08/26 | 3453 | macros/luatex/latex/domaincoloring/latex/domaincoloring.sty +2024/08/26 | 8094 | macros/luatex/latex/domaincoloring/lua/domaincoloring-complex-numbers.lua +2024/08/26 | 1345 | macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua +2024/08/26 | 9392 | macros/luatex/latex/domaincoloring/lua/domaincoloring.lua +2024/08/26 | 418 | macros/luatex/latex/domaincoloring/README.md +2024/08/26 | 13321406 | macros/luatex/latex/domaincoloring.zip 2021/11/21 | 452991 | macros/luatex/latex/ekdosis/ekdosis.dtx 2021/11/21 | 12221 | macros/luatex/latex/ekdosis/ekdosis.el 2021/11/21 | 1874 | macros/luatex/latex/ekdosis/ekdosis.ins @@ -264388,7 +264389,7 @@ 2004/12/19 | 17114 | macros/texinfo/contrib/texinfo-hu/texinfo/util/texinfo.dtd 2004/04/10 | 4702 | macros/texinfo/contrib/texinfo-hu/texinfo/util/texinfo.xsl 2004/04/10 | 2052 | macros/texinfo/contrib/texinfo-hu/texinfo/util/txitextest -2024/08/22 | 24826 | macros/texinfo/latest/htmlxref.cnf +2024/08/25 | 24832 | macros/texinfo/latest/htmlxref.cnf 2023/11/10 | 56926 | macros/texinfo/latest/texi2dvi 2023/10/18 | 1163 | macros/texinfo/latest/texi2pdf 2024/02/09 | 381586 | macros/texinfo/latest/texinfo.tex @@ -300323,13 +300324,13 @@ 2021/05/22 | 283291 | support/ltximg.zip 1996/11/22 | 25535 | support/ltxinput/ltxinput.zip 1996/11/10 | 971 | support/ltxinput/readme.txt -2023/06/22 | 1402 | support/luafindfont/CHANGELOG -2023/06/24 | 98571 | support/luafindfont/doc/luafindfont-doc.pdf -2022/12/08 | 10802 | support/luafindfont/doc/luafindfont-doc.tex +2024/08/25 | 1450 | support/luafindfont/CHANGELOG +2024/08/25 | 98752 | support/luafindfont/doc/luafindfont-doc.pdf +2024/08/25 | 10802 | support/luafindfont/doc/luafindfont-doc.tex 2022/12/08 | 5441 | support/luafindfont/man/luafindfont.1 2023/06/21 | 971 | support/luafindfont/README.md -2023/06/22 | 19239 | support/luafindfont/scripts/luafindfont.lua -2023/06/24 | 109137 | support/luafindfont.zip +2024/08/25 | 20180 | support/luafindfont/scripts/luafindfont.lua +2024/08/26 | 109471 | support/luafindfont.zip 2010/03/15 | 4720 | support/lualibs/lua-alt-getopt/lua-alt-getopt-0.7.0.tar.gz 2009/01/11 | 1463 | support/lualibs/lua-alt-getopt/README 2024/05/09 | 826 | support/lualibs/lua-uca/CHANGELOG.md @@ -312793,8 +312794,8 @@ 2019/02/28 | 740556 | systems/texlive/tlnet/archive/interfaces.doc.r21474.tar.xz 2019/02/28 | 27932 | systems/texlive/tlnet/archive/interfaces.r21474.tar.xz 2019/02/28 | 67108 | systems/texlive/tlnet/archive/interfaces.source.r21474.tar.xz -2024/08/25 | 127344 | systems/texlive/tlnet/archive/interlinear.doc.r72101.tar.xz -2024/08/25 | 10148 | systems/texlive/tlnet/archive/interlinear.r72101.tar.xz +2024/08/26 | 127344 | systems/texlive/tlnet/archive/interlinear.doc.r72106.tar.xz +2024/08/26 | 10148 | systems/texlive/tlnet/archive/interlinear.r72106.tar.xz 2019/02/28 | 122152 | systems/texlive/tlnet/archive/interpreter.doc.r27232.tar.xz 2019/02/28 | 6224 | systems/texlive/tlnet/archive/interpreter.r27232.tar.xz 2023/11/26 | 13459132 | systems/texlive/tlnet/archive/inter.r68966.tar.xz @@ -315426,8 +315427,8 @@ 2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz 2019/02/28 | 1924 | systems/texlive/tlnet/archive/newspaper.r15878.tar.xz 2019/02/28 | 6804 | systems/texlive/tlnet/archive/newspaper.source.r15878.tar.xz -2024/07/24 | 975232 | systems/texlive/tlnet/archive/newtx.doc.r71883.tar.xz -2024/07/24 | 6064624 | systems/texlive/tlnet/archive/newtx.r71883.tar.xz +2024/08/26 | 975276 | systems/texlive/tlnet/archive/newtx.doc.r72105.tar.xz +2024/08/26 | 6064816 | systems/texlive/tlnet/archive/newtx.r72105.tar.xz 2024/01/27 | 263284 | systems/texlive/tlnet/archive/newtxsf.doc.r69597.tar.xz 2024/01/27 | 106028 | systems/texlive/tlnet/archive/newtxsf.r69597.tar.xz 2024/03/14 | 338392 | systems/texlive/tlnet/archive/newtxtt.doc.r70620.tar.xz @@ -318961,7 +318962,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2024/08/25 | 436392 | systems/texlive/tlnet/archive/texlive-scripts.doc.r72102.tar.xz +2024/08/26 | 436488 | systems/texlive/tlnet/archive/texlive-scripts.doc.r72107.tar.xz 2024/07/09 | 908 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r71749.tar.xz 2024/07/09 | 920 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r71749.tar.xz 2024/07/09 | 908 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r71749.tar.xz @@ -318983,7 +318984,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2024/08/25 | 114456 | systems/texlive/tlnet/archive/texlive-scripts.r72102.tar.xz +2024/08/26 | 114472 | systems/texlive/tlnet/archive/texlive-scripts.r72107.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2024/05/10 | 60592 | systems/texlive/tlnet/archive/texlive-scripts.windows.r71215.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -319756,8 +319757,8 @@ 2022/11/08 | 7888 | systems/texlive/tlnet/archive/turnstile.source.r64967.tar.xz 2019/02/28 | 78428 | systems/texlive/tlnet/archive/turnthepage.doc.r29803.tar.xz 2019/02/28 | 1664 | systems/texlive/tlnet/archive/turnthepage.r29803.tar.xz -2024/08/25 | 1318860 | systems/texlive/tlnet/archive/tutodoc.doc.r72100.tar.xz -2024/08/25 | 7500 | systems/texlive/tlnet/archive/tutodoc.r72100.tar.xz +2024/08/26 | 1319644 | systems/texlive/tlnet/archive/tutodoc.doc.r72104.tar.xz +2024/08/26 | 7508 | systems/texlive/tlnet/archive/tutodoc.r72104.tar.xz 2024/08/08 | 712 | systems/texlive/tlnet/archive/twemoji-colr.doc.r71991.tar.xz 2024/08/08 | 581212 | systems/texlive/tlnet/archive/twemoji-colr.r71991.tar.xz 2022/04/06 | 4751536 | systems/texlive/tlnet/archive/twemojis.doc.r62930.tar.xz @@ -320936,16 +320937,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2024/07/20 | 125851 | systems/texlive/tlnet/install-tl -2024/08/25 | 5753780 | systems/texlive/tlnet/install-tl-unx.tar.gz -2024/08/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/08/25 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/08/26 | 5753979 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/08/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/08/26 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2024/04/13 | 5743 | systems/texlive/tlnet/install-tl-windows.bat -2024/08/25 | 27718249 | systems/texlive/tlnet/install-tl-windows.exe -2024/08/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2024/08/25 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/08/25 | 34425922 | systems/texlive/tlnet/install-tl.zip -2024/08/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/08/25 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/08/26 | 27718494 | systems/texlive/tlnet/install-tl-windows.exe +2024/08/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/08/26 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/08/26 | 34425923 | systems/texlive/tlnet/install-tl.zip +2024/08/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/08/26 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2024/03/13 | 1229 | systems/texlive/tlnet/README.md 2024/03/13 | 0 | systems/texlive/tlnet/TEXLIVE_2024 2024/01/02 | 9011 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -320955,7 +320956,7 @@ 2024/01/02 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2024/07/29 | 50743 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2024/08/25 | 7678 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2024/08/26 | 7646 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2024/07/03 | 228633 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt @@ -320997,12 +320998,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2024/05/02 | 5898 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2024/08/25 | 19576490 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2024/08/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/08/26 | 19576492 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/08/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2024/06/22 | 87725 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2024/08/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2024/08/25 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/08/25 | 2590824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/08/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/08/26 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/08/26 | 2592192 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -332639,7 +332640,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2024/08/26 | 186 | timestamp +2024/08/27 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex f1f57ab482..618d5f76d8 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 6f1b5fbd52..8a84b7f565 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,34 +1,104 @@ +2024/08/26 | 975276 | systems/texlive/tlnet/archive/newtx.doc.r72105.tar.xz +2024/08/26 | 943219 | macros/latex/contrib/acmart/acmart.pdf +2024/08/26 | 9403 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex +2024/08/26 | 9392 | macros/luatex/latex/domaincoloring/lua/domaincoloring.lua +2024/08/26 | 8094 | macros/luatex/latex/domaincoloring/lua/domaincoloring-complex-numbers.lua 2024/08/26 | 7833 | macros/jptex/latex/pxjahyper/README-ja.md +2024/08/26 | 7646 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2024/08/26 | 7508 | systems/texlive/tlnet/archive/tutodoc.r72104.tar.xz +2024/08/26 | 637441 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf +2024/08/26 | 636571 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf 2024/08/26 | 63432 | macros/jptex/latex/pxjahyper/pxjahyper.sty +2024/08/26 | 626360 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +2024/08/26 | 625334 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf +2024/08/26 | 624415 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf +2024/08/26 | 623848 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +2024/08/26 | 6145 | macros/latex/contrib/acmart/Makefile +2024/08/26 | 613884 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +2024/08/26 | 6064816 | systems/texlive/tlnet/archive/newtx.r72105.tar.xz +2024/08/26 | 5753979 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/08/26 | 571812 | macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf +2024/08/26 | 571575 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf +2024/08/26 | 56269 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex +2024/08/26 | 5495 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md +2024/08/26 | 533434 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx +2024/08/26 | 533343 | macros/luatex/latex/domaincoloring/doc/hsv.png +2024/08/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/08/26 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/08/26 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/08/26 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/08/26 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/08/26 | 480489 | macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf +2024/08/26 | 473527 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf +2024/08/26 | 470053 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf +2024/08/26 | 469903 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf +2024/08/26 | 465824 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf +2024/08/26 | 441394 | macros/latex/contrib/acmart/acmguide.pdf +2024/08/26 | 436488 | systems/texlive/tlnet/archive/texlive-scripts.doc.r72107.tar.xz +2024/08/26 | 4261 | macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile +2024/08/26 | 418 | macros/luatex/latex/domaincoloring/README.md +2024/08/26 | 412 | macros/luatex/latex/domaincoloring/Changes +2024/08/26 | 4124452 | biblio/ctan-bibdata.zip +2024/08/26 | 399476 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf +2024/08/26 | 39918 | macros/latex/contrib/acmart/samples/samples.dtx +2024/08/26 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/08/26 | 3453 | macros/luatex/latex/domaincoloring/latex/domaincoloring.sty +2024/08/26 | 34425923 | systems/texlive/tlnet/install-tl.zip +2024/08/26 | 334858 | macros/luatex/latex/domaincoloring/doc/titleImg.pdf 2024/08/26 | 3306 | macros/jptex/latex/pxjahyper/pxjahyper-enc.sty +2024/08/26 | 294632 | macros/latex/contrib/acmart/acmart.dtx +2024/08/26 | 2882209 | biblio/ctan-bibdata/ctan.bib 2024/08/26 | 2847 | macros/jptex/latex/pxjahyper/pxjahyper-uni.def +2024/08/26 | 27718494 | systems/texlive/tlnet/install-tl-windows.exe 2024/08/26 | 26128 | macros/jptex/latex/pxjahyper/pxjahyper-ajm.def +2024/08/26 | 2592192 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/08/26 | 2573109 | macros/latex/contrib/biblatex-contrib/biblatex-oxref.zip 2024/08/26 | 2450 | macros/jptex/latex/pxjahyper/README.md 2024/08/26 | 23354 | macros/jptex/latex/pxjahyper/pxjahyper.tex +2024/08/26 | 22255 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex +2024/08/26 | 2150 | macros/latex/contrib/customenvs/doc/envtexo_exemples.tex +2024/08/26 | 214844 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf +2024/08/26 | 210026 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf +2024/08/26 | 19576492 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/08/26 | 1853525 | macros/latex/contrib/customenvs.zip +2024/08/26 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2024/08/26 | 166230 | macros/jptex/latex/pxjahyper/pxjahyper.pdf +2024/08/26 | 1645 | macros/latex/contrib/acmart/samples/samples.ins +2024/08/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/08/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/08/26 | 148026 | macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf +2024/08/26 | 1475123 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf +2024/08/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/08/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/08/26 | 13934 | macros/latex/contrib/acmart/README +2024/08/26 | 1345 | macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua +2024/08/26 | 13321406 | macros/luatex/latex/domaincoloring.zip +2024/08/26 | 1319644 | systems/texlive/tlnet/archive/tutodoc.doc.r72104.tar.xz +2024/08/26 | 12831690 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf +2024/08/26 | 127344 | systems/texlive/tlnet/archive/interlinear.doc.r72106.tar.xz +2024/08/26 | 12726541 | macros/latex/contrib/acmart.zip +2024/08/26 | 114472 | systems/texlive/tlnet/archive/texlive-scripts.r72107.tar.xz +2024/08/26 | 109471 | support/luafindfont.zip +2024/08/26 | 1062362 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf +2024/08/26 | 1059177 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +2024/08/26 | 1053423 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf +2024/08/26 | 1051239 | macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf +2024/08/26 | 1047421 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf +2024/08/26 | 103823 | macros/latex/contrib/customenvs/tex/customenvs.sty +2024/08/26 | 1015 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib +2024/08/26 | 10148 | systems/texlive/tlnet/archive/interlinear.r72106.tar.xz +2024/08/25 | 98752 | support/luafindfont/doc/luafindfont-doc.pdf 2024/08/25 | 9696140 | fonts/newtx.zip -2024/08/25 | 7678 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2024/08/25 | 76256 | systems/texlive/tlnet/archive/latexdiff.r72099.tar.xz -2024/08/25 | 7500 | systems/texlive/tlnet/archive/tutodoc.r72100.tar.xz 2024/08/25 | 620 | systems/texlive/tlnet/archive/collection-humanities.r72101.tar.xz -2024/08/25 | 5753780 | systems/texlive/tlnet/install-tl-unx.tar.gz 2024/08/25 | 50155 | fonts/newtx/README -2024/08/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2024/08/25 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/08/25 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2024/08/25 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/08/25 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2024/08/25 | 487204 | systems/texlive/tlnet/archive/latexdiff.doc.r72099.tar.xz -2024/08/25 | 436392 | systems/texlive/tlnet/archive/texlive-scripts.doc.r72102.tar.xz 2024/08/25 | 4184 | fonts/newtx/tfm/ntxbmi1.tfm 2024/08/25 | 4176 | fonts/newtx/tfm/ntxmi0.tfm 2024/08/25 | 4176 | fonts/newtx/tfm/ntxbmi0.tfm 2024/08/25 | 4172 | fonts/newtx/tfm/ntxmi.tfm 2024/08/25 | 4172 | fonts/newtx/tfm/ntxmi1.tfm 2024/08/25 | 4168 | fonts/newtx/tfm/ntxbmi.tfm -2024/08/25 | 4124457 | biblio/ctan-bibdata.zip -2024/08/25 | 3708800 | biblio/ctan-bibdata/ctan.pdf -2024/08/25 | 34425922 | systems/texlive/tlnet/install-tl.zip 2024/08/25 | 3380 | fonts/newtx/tfm/ntxbmi15.tfm 2024/08/25 | 3376 | fonts/newtx/tfm/ntxbmi5.tfm 2024/08/25 | 3340 | fonts/newtx/tfm/ntxmi17.tfm @@ -40,8 +110,6 @@ 2024/08/25 | 3320 | fonts/newtx/tfm/ntxmi15.tfm 2024/08/25 | 3312 | fonts/newtx/tfm/ntxmi05.tfm 2024/08/25 | 3308 | fonts/newtx/tfm/ntxmi5.tfm -2024/08/25 | 2882209 | biblio/ctan-bibdata/ctan.bib -2024/08/25 | 27718249 | systems/texlive/tlnet/install-tl-windows.exe 2024/08/25 | 2732 | fonts/newtx/vf/ntxbmi.vf 2024/08/25 | 2728 | fonts/newtx/vf/ntxbmi1.vf 2024/08/25 | 2728 | fonts/newtx/vf/ntxbmi0.vf @@ -53,26 +121,20 @@ 2024/08/25 | 2600 | fonts/newtx/vf/ntxmi.vf 2024/08/25 | 2592 | fonts/newtx/vf/ntxmi1.vf 2024/08/25 | 2592 | fonts/newtx/vf/ntxmi0.vf -2024/08/25 | 2590824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi7.vf 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi5.vf 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi17.vf 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi15.vf 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi07.vf 2024/08/25 | 2576 | fonts/newtx/vf/ntxmi05.vf +2024/08/25 | 24832 | macros/texinfo/latest/htmlxref.cnf 2024/08/25 | 202192 | macros/jptex/latex/pxjahyper.zip -2024/08/25 | 19576490 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/08/25 | 20180 | support/luafindfont/scripts/luafindfont.lua 2024/08/25 | 1904 | fonts/newtx/tfm/ntxbmi05.tfm 2024/08/25 | 1828 | fonts/newtx/vf/ntxbmi05.vf -2024/08/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx -2024/08/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2024/08/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/08/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/08/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2024/08/25 | 1318860 | systems/texlive/tlnet/archive/tutodoc.doc.r72100.tar.xz -2024/08/25 | 127344 | systems/texlive/tlnet/archive/interlinear.doc.r72101.tar.xz -2024/08/25 | 114456 | systems/texlive/tlnet/archive/texlive-scripts.r72102.tar.xz -2024/08/25 | 10148 | systems/texlive/tlnet/archive/interlinear.r72101.tar.xz +2024/08/25 | 1450 | support/luafindfont/CHANGELOG +2024/08/25 | 10802 | support/luafindfont/doc/luafindfont-doc.tex +2024/08/25 | 1076 | macros/latex/contrib/acmart/acmart.ins 2024/08/24 | 9869 | macros/latex/contrib/interlinear/interlinear-doc.tex 2024/08/24 | 908 | fonts/newtx/tfm/txbex-bar.tfm 2024/08/24 | 900 | fonts/newtx/tfm/txex-bar.tfm @@ -612,32 +674,19 @@ 2024/08/23 | 10072 | macros/latex-dev/base/format.ins 2024/08/22 | 924361 | macros/latex/contrib/nicematrix/nicematrix.pdf 2024/08/22 | 916949 | macros/latex/contrib/nicematrix/nicematrix-french.pdf -2024/08/22 | 8695 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex -2024/08/22 | 8094 | macros/luatex/latex/domaincoloring/lua/domaincoloring-complex-numbers.lua 2024/08/22 | 801848 | systems/texlive/tlnet/archive/isosafety.r72081.tar.xz -2024/08/22 | 7600 | macros/luatex/latex/domaincoloring/lua/domaincoloring.lua -2024/08/22 | 750 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib -2024/08/22 | 7402597 | macros/luatex/latex/domaincoloring.zip -2024/08/22 | 6845040 | macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf 2024/08/22 | 68164 | systems/texlive/tlnet/archive/siunitx.r72080.tar.xz 2024/08/22 | 607831 | macros/latex/contrib/nicematrix/nicematrix-code.dtx -2024/08/22 | 533343 | macros/luatex/latex/domaincoloring/doc/hsv.png 2024/08/22 | 449012 | systems/texlive/tlnet/archive/biblatex-publist.doc.r72079.tar.xz -2024/08/22 | 418 | macros/luatex/latex/domaincoloring/README.md -2024/08/22 | 335225 | macros/luatex/latex/domaincoloring/doc/titleImg.pdf 2024/08/22 | 3009312 | macros/latex/contrib/nicematrix.zip 2024/08/22 | 285062 | macros/jptex/latex/pxchfon/pxchfon.pdf 2024/08/22 | 2830300 | systems/texlive/tlnet/archive/citation-style-language.r72078.tar.xz -2024/08/22 | 2786 | macros/luatex/latex/domaincoloring/latex/domaincoloring.sty 2024/08/22 | 260340 | systems/texlive/tlnet/archive/citation-style-language.doc.r72078.tar.xz 2024/08/22 | 254230 | macros/latex/contrib/nicematrix/nicematrix.tex -2024/08/22 | 24826 | macros/texinfo/latest/htmlxref.cnf 2024/08/22 | 2372556 | macros/latex/contrib/nicematrix/nicematrix-code.pdf -2024/08/22 | 187 | macros/luatex/latex/domaincoloring/Changes 2024/08/22 | 15164 | systems/texlive/tlnet/archive/biblatex-publist.r72079.tar.xz 2024/08/22 | 1286484 | systems/texlive/tlnet/archive/siunitx.doc.r72080.tar.xz 2024/08/22 | 123744 | systems/texlive/tlnet/archive/siunitx.source.r72080.tar.xz -2024/08/22 | 1177 | macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua 2024/08/22 | 112972 | systems/texlive/tlnet/archive/isosafety.doc.r72081.tar.xz 2024/08/21 | 978880 | systems/texlive/tlnet/archive/moremath.doc.r72072.tar.xz 2024/08/21 | 9736 | biblio/citation-style-language/citeproc-context.lua @@ -811,11 +860,8 @@ 2024/08/20 | 2621 | macros/latex/contrib/siunitx/siunitx-code.tex 2024/08/20 | 22316 | macros/latex/contrib/siunitx/siunitx.dtx 2024/08/20 | 2216 | systems/texlive/tlnet/archive/lstaddons.r72068.tar.xz -2024/08/20 | 21192 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex -2024/08/20 | 199070 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf 2024/08/20 | 19830 | macros/latex/contrib/siunitx/siunitx-angle.dtx 2024/08/20 | 192664 | systems/texlive/tlnet/archive/innerscript.doc.r72066.tar.xz -2024/08/20 | 1898449 | macros/latex/contrib/customenvs.zip 2024/08/20 | 180938 | macros/latex/contrib/moremath/moremath.dtx 2024/08/20 | 1804 | macros/latex/contrib/moremath/moremath.ins 2024/08/20 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg @@ -839,25 +885,3 @@ 2024/08/20 | 104102 | macros/latex/contrib/siunitx/siunitx-unit.dtx 2024/08/20 | 10200 | macros/latex/contrib/edmaths/edmaths.sty 2024/08/20 | 1011257 | macros/latex/contrib/moremath.zip -2024/08/19 | 95076 | macros/latex/contrib/customenvs/tex/customenvs.sty -2024/08/19 | 92824 | macros/luatex/latex/innerscript/innerscript_code.pdf -2024/08/19 | 9108 | support/TeX4ht/source/mktex4ht-cnf.tex -2024/08/19 | 891492 | systems/texlive/tlnet/archive/babel.source.r72061.tar.xz -2024/08/19 | 72559 | macros/luatex/latex/innerscript/innerscript_code.dtx -2024/08/19 | 634655 | support/TeX4ht/source/tex4ht-html4.tex -2024/08/19 | 6104 | systems/texlive/tlnet/archive/catppuccinpalette.source.r72060.tar.xz -2024/08/19 | 5916 | systems/texlive/tlnet/archive/wordle.r72059.tar.xz -2024/08/19 | 54295 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex -2024/08/19 | 501336 | systems/texlive/tlnet/archive/wordle.doc.r72059.tar.xz -2024/08/19 | 4613 | macros/luatex/latex/innerscript/README.txt -2024/08/19 | 3520 | systems/texlive/tlnet/archive/catppuccinpalette.r72060.tar.xz -2024/08/19 | 258329 | support/TeX4ht/source/ChangeLog -2024/08/19 | 231584 | systems/texlive/tlnet/archive/babel.r72061.tar.xz -2024/08/19 | 218908 | systems/texlive/tlnet/archive/catppuccinpalette.doc.r72060.tar.xz -2024/08/19 | 213514 | macros/luatex/latex/innerscript.zip -2024/08/19 | 19056 | CTAN.sites -2024/08/19 | 167115 | support/TeX4ht/source/tex4ht-mathml.tex -2024/08/19 | 1503490 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf -2024/08/19 | 1203123 | support/TeX4ht/source/tex4ht-4ht.tex -2024/08/19 | 114356 | macros/luatex/latex/innerscript/innerscript_user_guide.pdf -2024/08/19 | 1057600 | systems/texlive/tlnet/archive/babel.doc.r72061.tar.xz diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index 043c7156b9..b3d44294a1 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 26-08-2024, 02:00:04 +%% created at 27-08-2024, 02:00:04 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -479,8 +479,8 @@ title = {The \texttt{acmart} package}, subtitle = {Class for typesetting publications of ACM}, author = {Boris Veytsman}, - date = {2024-06-02}, - version = {2.08}, + date = {2024-08-26}, + version = {2.09}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/acmart}, url = {https://ctan.org/pkg/acmart}, @@ -7836,8 +7836,8 @@ title = {The \texttt{biblatex-oxref} package}, subtitle = {BibLaTeX styles inspired by the Oxford Guide to Style}, author = {Alex Ball}, - date = {2023-11-23}, - version = {3.2}, + date = {2024-08-26}, + version = {3.3}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-oxref}, url = {https://ctan.org/pkg/biblatex-oxref}, @@ -17070,8 +17070,8 @@ title = {The \texttt{customenvs} package}, subtitle = {Custom environments (MCQ, list with picked items, ...)}, author = {Cédric Pierquet}, - date = {2024-08-20}, - version = {0.1.9}, + date = {2024-08-26}, + version = {0.2.0}, license = {lppl1.3c,cc-by-sa-4}, mirror = {https://mirror.ctan.org/macros/latex/contrib/customenvs}, url = {https://ctan.org/pkg/customenvs}, @@ -19495,8 +19495,8 @@ title = {The \texttt{domaincoloring} package}, subtitle = {Draw colored represenations of complex functions}, author = {Herbert Voß}, - date = {2024-08-24}, - version = {0.02}, + date = {2024-08-26}, + version = {0.03}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/macros/luatex/latex/domaincoloring}, url = {https://ctan.org/pkg/domaincoloring}, @@ -42521,8 +42521,8 @@ title = {The \texttt{luafindfont} package}, subtitle = {Search fonts in the LuaTeX font database}, author = {Herbert Voß}, - date = {2023-06-24}, - version = {0.13}, + date = {2024-08-26}, + version = {0.14}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/support/luafindfont}, url = {https://ctan.org/pkg/luafindfont}, diff --git a/macros/latex/contrib/acmart/Makefile b/macros/latex/contrib/acmart/Makefile index 545e505ed5..c81d355446 100644 --- a/macros/latex/contrib/acmart/Makefile +++ b/macros/latex/contrib/acmart/Makefile @@ -14,6 +14,7 @@ DEV=-dev # To switch dev on PDF = $(PACKAGE).pdf acmguide.pdf BIBLATEXFILES= $(wildcard *.bbx) $(wildcard *.cbx) $(wildcard *.dbx) $(wildcard *.lbx) + SAMPLEBIBLATEXFILES=$(patsubst %,samples/%,$(BIBLATEXFILES)) ACMCPSAMPLES= \ @@ -21,7 +22,7 @@ ACMCPSAMPLES= \ samples/sample-acmcp-Invited.pdf \ samples/sample-acmcp-Position.pdf \ samples/sample-acmcp-Research.pdf \ - samples/sample-acmcp-Review.pdf \ + samples/sample-acmcp-Review.pdf all: ${PDF} ALLSAMPLES @@ -46,6 +47,9 @@ acmguide.pdf: $(PACKAGE).dtx $(PACKAGE).cls %.cls: %.ins %.dtx pdflatex $< +%-tagged.cls: %.ins %.dtx + pdflatex $< + ALLSAMPLES: $(SAMPLEBIBLATEXFILES) cd samples; pdflatex samples.ins; cd .. @@ -59,6 +63,7 @@ samples/%: % samples/$(PACKAGE).cls: $(PACKAGE).cls +samples/$(PACKAGE)-tagged.cls: $(PACKAGE)-tagged.cls samples/ACM-Reference-Format.bst: ACM-Reference-Format.bst samples/abbrev.bib: ACM-Reference-Format.bst @@ -116,7 +121,18 @@ samples/sample-sigconf-lualatex.pdf: samples/sample-lualatex.tex samples/$(PA samples/sample-acmcp.pdf: samples/acm-jdslogo.png -.PRECIOUS: $(PACKAGE).cfg $(PACKAGE).cls + +samples/sample-acmsmall-tagged.pdf: samples/sample-acmsmall-tagged.tex samples/$(PACKAGE)-tagged.cls samples/ACM-Reference-Format.bst + cd $(dir $@) && lualatex-dev $(notdir $<) + - cd $(dir $@) && bibtex $(notdir $(basename $<)) + cd $(dir $@) && lualatex-dev $(notdir $<) + cd $(dir $@) && lualatex-dev $(notdir $<) + while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \ + do cd $(dir $@) && lualatex-dev $(notdir $<); done + + + +.PRECIOUS: $(PACKAGE).cfg $(PACKAGE).cls $(PACKAGE)-tagged.cls docclean: $(RM) *.log *.aux \ @@ -124,7 +140,9 @@ docclean: *.ilg *.ind *.out *.lof \ *.lot *.bbl *.blg *.gls *.cut *.hd \ *.dvi *.ps *.thm *.tgz *.zip *.rpi \ - samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst \ + samples/$(PACKAGE).cls \ + samples/$(PACKAGE)-tagged.cls \ + samples/ACM-Reference-Format.bst \ samples/*.log samples/*.aux samples/*.out \ samples/*.bbl samples/*.blg samples/*.cut \ samples/acm-jdslogo.png \ @@ -132,7 +150,7 @@ docclean: clean: docclean - $(RM) $(PACKAGE).cls \ + $(RM) $(PACKAGE).cls $(PACKAGE)-tagged.cls \ samples/*.tex distclean: clean diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 7d79e34935..b46a735447 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -12,6 +12,9 @@ The production version is the one on CTAN and ACM sites. Changes +Version 2.09. Experimental tagging code is now in the main branch. + Creative Commons license is now allowed for all materials. + Version 2.08. Section titles are in lowercase now. Documentation updates. diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index 0ff7a902b7..26e19fdcc6 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -998,13 +998,7 @@ % by IW3C2, when some authors are approved Google employees.\\ % \texttt{cc} & Creative Commons license. If this key is set, % \textsl{doclicense} images are used to typeset the license. See -% also \cs{setcctype} command. Note that at present this license -% can be used only either for \texttt{acmengage} format, or for -% \texttt{nonacm} publications, or for the authors that meet any -% of the following requirements: (a)~part of the ACM Open Program; -% (b)~publishing in a Gold Open Access publication; -% (c)~paying the Open Access APC; -% (d)~part of the Google publishing agreement.\\ +% also \cs{setcctype} command. \\ % \texttt{acmcopyright} & The authors transfer the copyright to the % ACM. This choice is no longer available for the % non-commissioned authors and will trigger a warning.\\ @@ -2239,6 +2233,24 @@ % \item |figure*|: \cs{fulltextwidth}. % \end{enumerate} % +%\subsection{Experiments with tagging} +%\label{sec:ug_tagged} +% +% ACM is firmly committed to produce fully tagged PDFs compliant with +% the accessibility standards. We use the developmental version of +% tagging code by \LaTeX3 team, see the details at +% \url{https://www.latex-project.org/publications/indexbytopic/pdf/} +% and \url{https://tug.org/twg/accessibility/overview.html}. +% +% At present this work is highly experimental. You may try the +% experiments by (1)~using the class |acmart-tagged| in the document +% class line, and (2)~adding the command +% \cs{DocumentMetadata}\oarg{options} in the preamble, see the file +% \path{sample-acmsmall-tagged.tex}. If you do this, please \emph{do +% not ask ACM for support}. On the other hand, bug reports at +% \url{https://github.com/borisveytsman/acmart/issues} will be +% appreciated. +% % % % \StopEventually{ @@ -2263,8 +2275,9 @@ %<*gobble> \ProvidesFile{acmart.dtx} %</gobble> -%<class>\ProvidesClass{acmart} -[2024/05/27 v2.08 Typesetting articles for the Association for Computing Machinery] +%<class&!tagged>\ProvidesClass{acmart} +%<tagged>\ProvidesClass{acmart-tagged} +[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -2401,7 +2414,8 @@ \end{document} %</gobble> %<*class> -\def\@classname{acmart} +%<!tagged>\def\@classname{acmart} +%<tagged>\def\@classname{acmart-tagged} % \end{macrocode} % % @@ -2442,13 +2456,13 @@ % \changes{1.87}{2022/08/13}{New format: acmcp} % The possible formats % \begin{macrocode} -\define@choicekey*+{acmart.cls}{format}[\ACM@format\ACM@format@nr]{% +\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{% manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph, sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{% \ClassError{\@classname}{The option format must be manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph, sigplan, sigchi or sigchi-a}} -\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{acmart.cls}{format=#1}}} +\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}} \@DeclareACMFormat{manuscript} \@DeclareACMFormat{acmsmall} \@DeclareACMFormat{acmlarge} @@ -2468,7 +2482,7 @@ % \begin{macro}{\if@ACM@screen} % Whether we use screen mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{screen}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{% \if@ACM@screen \PackageInfo{\@classname}{Using screen mode}% \else @@ -2483,7 +2497,7 @@ % \begin{macro}{\if@ACM@urlbreakonhyphens} % \changes{1.60}{2019/04/22}{introduced macro} % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{% \if@ACM@urlbreakonhyphens \PackageInfo{\@classname}{Using breaking urls on hyphens}% \else @@ -2499,7 +2513,7 @@ % \changes{v1.46}{2017/08/29}{Modified description} % Whether we define theorem-like environments. % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{% \if@ACM@acmthm \PackageInfo{\@classname}{Requiring acmthm}% \else @@ -2516,7 +2530,7 @@ % \changes{v1.48}{2017/09/09}{Review mode now switches on folios} % Whether we use review mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{review}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{% \if@ACM@review \PackageInfo{\@classname}{Using review mode}% \AtBeginDocument{\@ACM@printfoliostrue}% @@ -2533,7 +2547,7 @@ % \changes{v1.03}{2016/04/22}{Added macro} % Whether we use author's-version mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{% \if@ACM@authorversion \PackageInfo{\@classname}{Using authorversion mode}% \else @@ -2550,7 +2564,7 @@ % Special option for non-ACM publications % using the ACM typesetting options. % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{% \if@ACM@nonacm \PackageInfo{\@classname}{Using nonacm mode}% \AtBeginDocument{\@ACM@printacmreffalse}% @@ -2570,7 +2584,7 @@ % \changes{v1.57}{2018/12/16}{Added macro} % Whether to balance the last page % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{balance}[true]{}{% +\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{% \PackageError{\@classname}{The option balance can be either true or false}} \ExecuteOptionsX{balance} @@ -2583,7 +2597,7 @@ % \changes{v1.76}{2021/03/16}{Added macro} % Whether to balance the last page % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{% +\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{% \PackageError{\@classname}{The option pbalance can be either true or false}} \ExecuteOptionsX{pbalance=false} @@ -2601,7 +2615,7 @@ % \begin{macro}{\if@ACM@natbib} % Whether we use |natbib| mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{% \if@ACM@natbib \PackageInfo{\@classname}{Explicitly selecting natbib mode}% \else @@ -2617,7 +2631,7 @@ % \begin{macro}{\if@ACM@anonymous} % Whether we use anonymous mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{% \if@ACM@anonymous \PackageInfo{\@classname}{Using anonymous mode}% \else @@ -2634,7 +2648,7 @@ % \changes{v1.33}{2017/03/10}{Added macro (Michael D.~Adams)} % Whether we use timestamp mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{% \if@ACM@timestamp \PackageInfo{\@classname}{Using timestamp mode}% \else @@ -2652,7 +2666,7 @@ % \changes{v1.36}{2017/05/13}{Corrected typo, thanks to bargteil} % Whether we use author-draft mode % \begin{macrocode} -\define@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{% \if@ACM@authordraft \PackageInfo{\@classname}{Using authordraft mode}% \@ACM@timestamptrue @@ -2788,13 +2802,13 @@ \ClassWarning{\@classname}{% The format siggraph is now obsolete.\MessageBreak I am switching to sigconf.} - \setkeys{acmart.cls}{format=sigconf} + \setkeys{\@classname.cls}{format=sigconf} \fi \ifnum\ACM@format@nr=7\relax % sigchi \ClassWarning{\@classname}{% The format sigchi is now obsolete.\MessageBreak I am switching to sigconf.} - \setkeys{acmart.cls}{format=sigconf} + \setkeys{\@classname.cls}{format=sigconf} \fi \ifnum\ACM@format@nr=8\relax % sigchi \ClassWarning{\@classname}{% @@ -2861,6 +2875,42 @@ % \changes{v1.38}{2017/05/13}{Increase default font size for SIGPLAN} % \changes{v1.87}{2022/08/27}{Set font sizes for |acmengage| and |acmcp|} % +%<*tagged> +% \changes{v2.09}{2022/08/25}{Saved the old definitions (Ulrike's +% code} +% Before we load the base class we want to save the original +% definitions of sectioning commands since |acmart| redefines them, +% and we need the vanilla versions. +% \begin{macro}{\@startsection@kernel} +% \changes{v2.00}{2023/11/19}{Added macro} +% \begin{macrocode} +\let\@startsection@kernel\@startsection +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@xsect@kernel} +% \changes{v2.00}{2023/11/19}{Added macro} +% \begin{macrocode} +\let\@xsect@kernel\@xsect +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@sect@kernel} +% \changes{v2.00}{2023/11/19}{Added macro} +% \begin{macrocode} +\let\@sect@kernel\@sect +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@ssect@kernel} +% \changes{v2.00}{2023/11/19}{Added macro} +% \begin{macrocode} +\let\@ssect@kernel\@ssect +% \end{macrocode} +% \end{macro} +% +%</tagged> +% % % At this point we either have \cs{ACM@fontsize} or use defaults % \begin{macrocode} @@ -3258,6 +3308,14 @@ % We need to do this early since we want |hyperref| to have a chance % to redefine them again: % \begin{macrocode} +%</class> +%<*tagged> +\let\@startsection\@startsection@kernel +\let\@sect\@sect@kernel +\let\@ssect\@ssect@kernel +\let\@xsect\@xsect@kernel +%</tagged> +%<*class&!tagged> \def\@startsection#1#2#3#4#5#6{% \if@noskipsec \leavevmode \fi \par @@ -3337,7 +3395,6 @@ \fi}% \fi \ignorespaces} -\def\@seccntformat#1{\csname the#1\endcsname\quad} \def\@ssect#1#2#3#4#5{% \@tempskipa #3\relax \ifdim \@tempskipa>\z@ @@ -3350,11 +3407,14 @@ \def\@svsechd{#4{\hskip #1\relax #5}}% \fi \@xsect{#3}} +%</class&!tagged> +%<*class> +\def\@seccntformat#1{\csname the#1\endcsname\quad} % \end{macrocode} % % \end{macro} % -% \begin{macro}{\@startsection} +% \begin{macro}{\@starttoc} % \changes{v1.31}{2017/03/04}{Redefined macro} % \changes{v1.43}{2017/07/09}{Added \cs{makeatletter}} % The |amsart| package redefines \cs{startsection}. Here we redefine @@ -3365,7 +3425,9 @@ \par\removelastskip\vskip\z@skip \@startsection{section}\@M\z@{\linespacing\@plus\linespacing}% {.5\linespacing}{\centering\contentsnamefont}{#2}% +%<tagged>\@starttoc@cfgpoint@before{#1}%NEW<<<<<<<<<< (name will change) \@input{\jobname.#1}% +%<tagged>\@starttoc@cfgpoint@after{#1}%NEW<<<<<<<<<<<< (name will change) \if@filesw \@xp\newwrite\csname tf@#1\endcsname \immediate\@xp\openout\csname tf@#1\endcsname \jobname.#1\relax @@ -5974,29 +6036,9 @@ % % \begin{macro}{\@ACM@copyright@check@cc} % \changes{v1.87}{2022/07/30}{Added macro} -% At present cC licenses can be used only for acmengage format or for -% non-acm stuff. This macro checks whether the CC license is -% applicable and generates an error if not. % \changes{v2.00}{2023/10/22}{Moved to warning} -% \begin{macrocode} -\def\@ACM@copyright@check@cc{% - \if@ACM@nonacm - \ClassInfo{\@classname}{Using CC license with a non-acm - material}% - \else - \if@ACM@engage - \ClassInfo{\@classname}{Using CC license with ACM Enage - material}% - \else - \ClassWarning{\@classname}{% - Sorry, Creative Commons licenses are\MessageBreak - currently not used with ACM publications\MessageBreak - typeset by the authors}{Please use nonacm - option or ACM Engage class to enable CC licenses}% - \fi - \fi} -% \end{macrocode} -% +% \changes{v2.09}{2024/08/25}{Deleted macro} +% This macro is no longer needed due to the change in ACM policy. % \end{macro} % % \begin{macro}{\@copyrightpermission} @@ -6007,8 +6049,8 @@ % \changes{v1.85}{2022/05/08}{Added CC licenses} % \changes{v1.87}{2022/07/30}{CC licenses now are allowed only for % non-acm or ACM engage publications} -% \changes{v2.00}{2023/10/24}{Rewrote wording} -% \changes{v2.00}{2023/10/24}{Rewrote wording} +% \changes{v2.09}{2024/08/25}{Deleted checking whether CC licenses are +% allowed} % The canned permission block. % \begin{macrocode} \def\@copyrightpermission{% @@ -6139,7 +6181,6 @@ disseminate the work on their personal and corporate Web sites with the appropriate attribution. \or % CC - \@ACM@copyright@check@cc \IfEq{\ACM@cc@type}{zero}{% \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{% \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}% @@ -6471,7 +6512,7 @@ pdfsubject={\@concepts}, pdfkeywords={\@keywords}, pdfcreator={LaTeX with acmart - \csname ver@acmart.cls\endcsname\space + \csname ver@\@classname.cls\endcsname\space and hyperref \csname ver@hyperref.sty\endcsname}}% \andify\authors @@ -7588,6 +7629,18 @@ % % \end{macro} % +%<*tagged> +% We stop tagging inside maketitle for now. Ulrike's code again. +% \begin{macrocode} +\ExplSyntaxOn +\AddToHook{cmd/maketitle/before} + {\tagstructbegin{tag=Title}\tagmcbegin{} \tag_stop:} +\AddToHook{cmd/maketitle/after} + {\tag_start:\tagmcend\tagstructend } +\ExplSyntaxOff +% \end{macrocode} +%</tagged> +% %\subsection{Headers and Footers} %\label{sec:head_foot} % @@ -8129,28 +8182,33 @@ % \changes{v1.69}{2020/02/02}{No dots for unindented paragraphs} % Sectioning is different for different levels % \begin{macrocode} -\renewcommand\section{\@startsection{section}{1}{\z@}% +\renewcommand\section{\def\@toclevel{1}% + \@startsection{section}{1}{\z@}% {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% {.25\baselineskip}% {\ACM@NRadjust\@secfont}} -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% +\renewcommand\subsection{\def\@toclevel{2}% + \@startsection{subsection}{2}{\z@}% {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% {.25\baselineskip}% {\ACM@NRadjust\@subsecfont}} -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% +\renewcommand\subsubsection{\def\@toclevel{3}% + \@startsection{subsubsection}{3}{\z@}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}} -\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}% +\renewcommand\paragraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\parindent}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont\@adddotafter}}} -\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}% +\newcommand\noindentparagraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\z@}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont}}} - -\renewcommand\part{\@startsection{part}{9}{\z@}% +\renewcommand\part{\def\@toclevel{9}% + \@startsection{part}{9}{\z@}% {-10\p@ \@plus -4\p@ \@minus -2\p@}% {4\p@}% {\ACM@NRadjust\@parfont}} diff --git a/macros/latex/contrib/acmart/acmart.ins b/macros/latex/contrib/acmart/acmart.ins index d17dc066fd..95c1596220 100644 --- a/macros/latex/contrib/acmart/acmart.ins +++ b/macros/latex/contrib/acmart/acmart.ins @@ -13,6 +13,7 @@ \generate{% \file{acmart.cls}{\from{acmart.dtx}{class}} + \file{acmart-tagged.cls}{\from{acmart.dtx}{class,tagged}} } \obeyspaces diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 9a91d07bf7..1bcb0df6ad 100644 --- a/macros/latex/contrib/acmart/acmart.pdf +++ b/macros/latex/contrib/acmart/acmart.pdf diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf Binary files differindex 927dd7c750..5e90dfb3a5 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf Binary files differindex c57d1898d1..47892feee6 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf Binary files differindex 366843b28e..d4cd824cf2 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex 25a90ec394..65c836673e 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf Binary files differindex d644e32874..4fe535b32c 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex 6e1488235e..17cb0fe359 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf Binary files differindex e0471c8a27..81006c5a71 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf Binary files differnew file mode 100644 index 0000000000..87bd3e53d1 --- /dev/null +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-tagged.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex 17c719abda..fa3a710f0f 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf Binary files differindex 71e87b73b1..3518df9fdd 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex 1e39a159d3..681d94fbc7 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex 301caf80cb..2b02e5a7ab 100644 --- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf +++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf Binary files differindex a465c8463e..be82dbf5ab 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf Binary files differindex b4052f9363..e2548408a0 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf Binary files differindex dc0e0fe12e..f89bc4b108 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex ab5954e602..dd0252c1d5 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf Binary files differindex 534e00da12..6f0cccd362 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf diff --git a/macros/latex/contrib/acmart/samples/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx index 37e7a0abfd..b2d75d2a83 100644 --- a/macros/latex/contrib/acmart/samples/samples.dtx +++ b/macros/latex/contrib/acmart/samples/samples.dtx @@ -14,7 +14,19 @@ %TC:envir comment 0 0 %TCMACROS %% -%% +%</all> +%<*tagged> +%% The tagged file should start with the metadata commands. +%% We also need currently use lualatex-dev for compilation! +\ifx\HCode\Undef +\DocumentMetadata{ + pdfversion=2.0,pdfstandard=ua-2, + testphase={phase-III,firstaid,math,title}} +\else +\DocumentMetadata{} +\fi +%</tagged> +%<*all> %% The first command in your LaTeX source must be the \documentclass %% command. %% @@ -27,7 +39,8 @@ %% %% %<manuscript>\documentclass[manuscript,screen,review]{acmart} -%<acmsmall|acmsmall-conf>\documentclass[acmsmall]{acmart} +%<acmsmall&!tagged>\documentclass[acmsmall]{acmart} +%<acmsmall-conf>\documentclass[acmsmall]{acmart} %<acmsmall-biblatex>\documentclass[acmsmall,natbib=false]{acmart} %<acmsmall-submission>\documentclass[acmsmall,screen,review]{acmart} %<acmlarge>\documentclass[acmlarge]{acmart} @@ -41,7 +54,7 @@ %<sigconf-i13n>\documentclass[sigconf, language=french, %<sigconf-i13n>language=german, language=spanish, language=english]{acmart} %<acmcp>\documentclass[acmcp]{acmart} - +%<acmsmall&tagged>\documentclass[acmsmall]{acmart-tagged} %% %% \BibTeX command to typeset BibTeX logo in the docs \AtBeginDocument{% @@ -58,7 +71,6 @@ \copyrightyear{2018} \acmYear{2018} \acmDOI{XXXXXXX.XXXXXXX} - %</all> %<*proceedings> %% These commands are for a PROCEEDINGS abstract or paper. diff --git a/macros/latex/contrib/acmart/samples/samples.ins b/macros/latex/contrib/acmart/samples/samples.ins index 2636f5899b..a525d48b55 100644 --- a/macros/latex/contrib/acmart/samples/samples.ins +++ b/macros/latex/contrib/acmart/samples/samples.ins @@ -24,5 +24,6 @@ \file{sample-acmtog-conf.tex}{\from{samples.dtx}{all,journal,proceedings,bibtex,acmtog-conf}} \file{sample-acmcp.tex}{\from{samples.dtx}{all,journal,acmcp}} \file{sample-acmengage.tex}{\from{acmengage.dtx}{acmengage}} + \file{sample-acmsmall-tagged.tex}{\from{samples.dtx}{all,journal,acmsmall,tagged}} } diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile index c51927feb8..c3e48e3484 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile @@ -3,8 +3,8 @@ PFX = biblatex- STY1 = oxnotes STYS = oxnotes oxyear oxnum oxalph VARS = ibid note inote trad1 trad2 trad3 -LANGS = american british english spanish -LANGX = spanish +LANGS = american british english spanish polish +LANGX = spanish polish TESTS = $(STYS) $(foreach sty, $(STYS), $(LANGX:%=%-$(sty))) AUX = aux,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb SHELL = bash diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md index c8b147bc81..a6d358af66 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md +++ b/macros/latex/contrib/biblatex-contrib/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/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf Binary files differindex 0ce372ce9b..464db54ffe 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf Binary files differindex 649083bbef..4ce50328b3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf Binary files differindex 7c8b8360de..cde0ea096b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx index 8c8c94d432..18bf56b898 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -87,6 +87,10 @@ \ProvidesFile{spanish-oxref.lbx} [\Version\space Spanish conventions required by the biblatex-oxref styles] %</lbx&es> +%<*lbx&pl> +\ProvidesFile{polish-oxref.lbx} + [\Version\space Polish conventions required by the biblatex-oxref styles] +%</lbx&pl> %<*doc&n> \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] @@ -220,6 +224,7 @@ Copyright (C) 2016–2023 Alex Ball \file{british-\jobname.lbx}{\from{\jobname.dtx}{lbx,gb}} \file{english-\jobname.lbx}{\from{\jobname.dtx}{lbx,en}} \file{spanish-\jobname.lbx}{\from{\jobname.dtx}{lbx,es}} + \file{polish-\jobname.lbx}{\from{\jobname.dtx}{lbx,pl}} \file{oxnotes-doc.tex}{\from{\jobname.dtx}{doc,n}} \file{oxnum-doc.tex}{\from{\jobname.dtx}{doc,m}} \file{oxalph-doc.tex}{\from{\jobname.dtx}{doc,a}} @@ -659,18 +664,24 @@ Copyright (C) 2016–2023 Alex Ball \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}% }% @@ -678,6 +689,7 @@ Copyright (C) 2016–2023 Alex Ball \author{Alex Ball} \listadd\thetranslators{Bruno Maltras} +\listadd\thetranslators{Sebastian Wasiuta} \date{\printdateTeX{\filedate}} \begin{document} \thispagestyle{empty} @@ -799,7 +811,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 @@ -842,7 +854,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, @@ -1663,9 +1676,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} %<n|m><NHR \S18.2.5*> @@ -1691,7 +1707,8 @@ If you used a foreign language work, you might want to recommend a good translat \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} %<n|m><NHR \S18.2.14> @@ -7770,6 +7787,7 @@ rather than \pkg[biblatex]{oxref}.} \newcommand*{\uscasetitlepunct}{\addcomma\space} \renewcommand*{\relateddelim}{\addsemicolon\space} \DeclareDelimFormat{revsdnamedelim}{\addcomma} +\DeclareDelimFormat[pair]{revsdnamedelim}{} \DeclareDelimFormat{authortypedelim}{\addspace} \DeclareDelimFormat{editortypedelim}{\addspace} \DeclareDelimFormat{translatortypedelim}{\addspace} @@ -7846,7 +7864,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#2}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% }{% @@ -7861,7 +7879,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#3}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} @@ -7871,9 +7889,22 @@ rather than \pkg[biblatex]{oxref}.} % the bibliography, but in natural order in citations. We implement this, along % with the case changing option, in the following name format. We also add a % second hash for checking if names (e.g.\@ |author| and |authoraddon|) are the -% same. +% same. We only need |name:revsdelim| on the first item, and only if it will be +% followed by something else. % % \begin{macrocode} +\renewbibmacro*{name:revsdelim}{% + \ifboolexpr{ + ( + test {\ifnumequal{\value{liststop}}{1}} + and + test \ifmorenames + ) + or + test {\ifnumequal{\value{liststop}}{2}} + } + {\printdelim{revsdnamedelim}} + {}} \def\blx@ox@lasthash{} \DeclareNameFormat{bib-family-given/cite-given-family}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% @@ -7918,13 +7949,22 @@ rather than \pkg[biblatex]{oxref}.} \renewcommand*{\mkbibnametitle}[1]{##1}% }{}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + test {\ifnumequal{\value{listcount}}{\@ne}} + and + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% }{% % \end{macrocode} % @@ -7967,6 +8007,10 @@ rather than \pkg[biblatex]{oxref}.} \savefield{hash}{\blx@ox@lasthash}% }% \ifitemannotation{inferred}{\bibclosebracket}{}% + \ifitemannotation{variant}{% + \global\settoggle{blx@ox@variantname}{true}% + }{% + \global\settoggle{blx@ox@variantname}{false}}% \usebibmacro{name:andothers}% \iffieldannotation{inferred}{% \ifboolexpr{ @@ -8012,7 +8056,9 @@ rather than \pkg[biblatex]{oxref}.} \usebibmacro{name:andothers}} % \end{macrocode} % -% We do likewise for the regular |family-given| format. +% We do likewise for the regular |family-given| format. Also, we only want to +% use the |name:revsdelim| on the last name in the list if it will be followed +% by \enquote{et al.}. % % \begin{macrocode} \DeclareNameFormat{family-given}{% @@ -8035,13 +8081,20 @@ rather than \pkg[biblatex]{oxref}.} }{% \global\settoggle{blx@ox@variantname}{false}}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% \usebibmacro{name:andothers}} % \end{macrocode} % @@ -8068,21 +8121,46 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}} % \end{macrocode} % -% We provide an alternative method that uses new name fields |authoraddon| and -% |editoraddon|. To do this, we define a bibmacro that reimplements the loopcode -% logic of \cs{printnames}, but operates on two name lists simultaneously; we use -% saveboxes to extract the hashes, and only print the alternative name if it has -% a different hash. The same technique is used by \textsf{oxyear} below to pair -% up names with the short form used in references, so this bibmacro is written -% to handle both cases. +% We have two use cases for a bibmacro that reimplements the loopcode logic of +% \cs{printnames}, but operates on two name lists simultaneously. One is to +% support the new name fields |authoraddon| and |editoraddon|; the other is to +% pair up names with the short form used in references, as required by +% \textsf{oxyear} below. +% +% We need to do this in a way that doesn't break the patterns used for +% configuring and adapting the punctuation that delimits the list items, so the +% |namepair:delim| macro does the same as |name:delim| but instead of reading +% the current counters, takes two extra arguments (in addition to the current name): +% the number of the current name pair and the total number of name pairs. +% The regular |finallistdelim| delimiter format looks up the value of the +% |liststop| counter, so we need to give it the right value. +% +% \begin{macrocode} +\newbibmacro*{namepair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multinamedelim}% + }{% + \ifnumgreater{#3}{\c@maxnames}{% + \c@liststop\c@minnames + }{% + \c@liststop#3}% + \lbx@finalnamedelim{#1}}% + }{}} +% \end{macrocode} % % The |namepairs| bibmacro takes two arguments: the data fields holding the main -% name and alternative name respectively. +% name and alternative name respectively. When rendering the names, we use +% saveboxes to extract the hashes, and only print the alternative name if it has +% a different hash. In this case, we also switch to the \enquote{pair} +% delimiter context, where the |revsdnamedelim| (if any) is suppressed. % % \begin{macrocode} +\DeclareFieldFormat{expanded}{\mkbibparens{#1}} \newcounter{namepairs} \newsavebox{\blx@ox@namebox} \newsavebox{\blx@ox@altnamebox} +\newtoggle{blx@ox@thispairvariant}% \newbibmacro*{namepairs}[2]{% \setcounter{namepairs}{0}% \savebibmacro{name:andothers}% @@ -8106,21 +8184,19 @@ rather than \pkg[biblatex]{oxref}.} ) }{% \stepcounter{namepairs}% - \ifnumgreater{\value{namepairs}}{1}{% - \ifnumequal{\value{#1}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{namepairs}}{\value{#1}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% \savebox{\blx@ox@namebox}{% \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% }% \let\blx@ox@firsthash=\blx@ox@lasthash + \savebox{\blx@ox@altnamebox}{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% + \let\blx@ox@secondhash=\blx@ox@lasthash + \iftoggle{blx@ox@variantname}{% + \toggletrue{blx@ox@thispairvariant}% + }{% + \togglefalse{blx@ox@thispairvariant}% + }% % \end{macrocode} % % This is the part intended for |authoraddon| and |editoraddon|. Note that it @@ -8128,20 +8204,28 @@ rather than \pkg[biblatex]{oxref}.} % % \begin{macrocode} \IfEndWith{#2}{addon}{% - \savebox{\blx@ox@altnamebox}{% - \printnames[by#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@namebox\addspace - \iftoggle{blx@ox@variantname}{% + \iftoggle{blx@ox@thispairvariant}{% \ifbibliography{% - \printtext[namevariant]{\printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% - }{}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[namevariant]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% + }{% + \hbox{}\unhbox\blx@ox@namebox + }% }{% - \printtext[nameaddon]{\unhbox\blx@ox@altnamebox}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[nameaddon]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% }% }% % \end{macrocode} @@ -8152,15 +8236,19 @@ rather than \pkg[biblatex]{oxref}.} % % \begin{macrocode} }{% - \savebox{\blx@ox@altnamebox}{% - \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@altnamebox - \addspace\mkbibparens{\unhbox\blx@ox@namebox}% + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@altnamebox}{\value{namepairs}}{\value{#1}}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + \setunit{\addspace}% + \printtext[expanded]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + }% }% }% }% @@ -8725,7 +8813,7 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}% + {\mkpageprefix[bookpagination][\mkcomprange]{#1}}% } % \end{macrocode} % @@ -8735,7 +8823,7 @@ rather than \pkg[biblatex]{oxref}.} \DeclareFieldFormat{postnote}{% \iffieldundef{pagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix}]{#1}}% + {\mkpageprefix[pagination][\mkcomprange]{#1}}% } % \end{macrocode} @@ -9299,6 +9387,7 @@ rather than \pkg[biblatex]{oxref}.} % considered on request. % % \begin{macrocode} +\newcommand*{\mkvolroman}[1]{\Rn{#1}} \DeclareFieldFormat[book,mvbook,bookinbook,inbook,suppbook,% collection,mvcollection,incollection,suppcollection,% proceedings,mvproceedings,inproceedings,% @@ -9306,11 +9395,11 @@ reference,mvreference,inreference]{volume}{% \IfSubStr{#1}{-}{% \StrCount{#1}{-}[\blx@ox@dashnum]% \StrBefore{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash \StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}% + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}% }{% - \ifinteger{#1}{\Rn{#1}}{#1}}} + \ifinteger{#1}{\mkvolroman{#1}}{#1}}} % \end{macrocode} % % Where a multi-volume work is more like a series, the volume number and @@ -9377,6 +9466,37 @@ reference,mvreference,inreference]{volume}{% {Valid values are 'in' and 'out'.}}}} % \end{macrocode} % +% If there are the same number of locations and publishers, and there are more +% than one pair, we print them pairwaise rather than in two separate lists. In +% order to do this while retaining the normal mechanisms for punctuating the +% list, we need a |listpair:delim| macro similar to |namepair:delim| (above) +% that uses the generic list punctuation. Again, the three arguments are the +% item being printed, the number of the current item pair and the total number +% of item pairs. +% +% \begin{macrocode} +\newbibmacro*{listpair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multilistdelim}% + }{% + \c@liststop#3% + \lbx@finallistdelim{#1}}% + }{}} +% \end{macrocode} +% +% We use this as the basis of a list format that will be applied to the location +% element of a location--publisher pair. +% +% \begin{macrocode} +\newcounter{locpubpairs} +\DeclareListFormat{locpub}{% + \usebibmacro{listpair:delim}% + {#1}{\value{locpubpairs}}{\value{location}}% + #1\isdot +} +% \end{macrocode} +% % When citing both the first and a later edition, the first one comes % first, and the later one comes after a semicolon. As per standard % \pkg{biblatex}, the elements of a single edition are separated by commas @@ -9385,7 +9505,7 @@ reference,mvreference,inreference]{volume}{% % origpublisher is also specified. % % \begin{macrocode} -\newcounter{locpubpairs} +\newsavebox{\blx@ox@locbox} \newbibmacro*{edition+publisher+location+date}{% \printlist{origlocation}% \iflistundef{origpublisher}% @@ -9406,10 +9526,11 @@ reference,mvreference,inreference]{volume}{% \setunit*{\addcomma\space}% % \end{macrocode} % -% If there are the same number of locations and publishers, and there -% are more than one pair, we print them pairwaise rather than in two +% As mentioned, if there are the same number of locations and publishers, and +% there are more than one pair, we print them pairwaise rather than in two % separate lists. This uses the same principle as the |namepairs| bibmacro, -% but does not have the list truncation apparatus. +% but does not have the list truncation apparatus. This time we use a savebox +% just for efficiency. % % \begin{macrocode} \ifboolexpr{% @@ -9424,19 +9545,8 @@ reference,mvreference,inreference]{volume}{% test {\ifnumcomp{\value{locpubpairs}}{<}{\value{publisher}}} }{% \stepcounter{locpubpairs}% - \ifnumcomp{\value{locpubpairs}}{>}{1}{% - \ifnumequal{\value{publisher}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{locpubpairs}}{\value{publisher}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% - \printlist[][\value{locpubpairs}-\value{locpubpairs}]{location}% - \setunit*{\addcolon\space}% + \printlist[locpub][\value{locpubpairs}-\value{locpubpairs}]{location}% + \setunit{\addcolon\space}% \printlist[][\value{locpubpairs}-\value{locpubpairs}]{publisher}% }% \restorebibmacro{list:andothers}% @@ -11383,7 +11493,11 @@ reference,mvreference,inreference]{volume}{% \setcounter{blx@tmpcnt}{\value{listcount}}% \addtocounter{blx@tmpcnt}{1}% \ifnumequal{\value{blx@tmpcnt}}{\value{listtotal}}{% - #1\space\bibstring{and}\addspace + \ifnumgreater{\value{listtotal}}{2}{% + #1\finalandcomma\space\bibstring{and}\addspace + }{% + #1\space\bibstring{and}\addspace + } }{% #1\addcomma\space}}}% @@ -14256,11 +14370,6 @@ reference,mvreference,inreference]{volume}{% % \code{authoraddon} has not been provided. % % \begin{macrocode} -\xpatchbibmacro{namepairs}{% - \printnames[by#1]% -}{% - \printnames[#1]% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% @@ -15085,7 +15194,7 @@ reference,mvreference,inreference]{volume}{% \InheritBibliographyExtras{english} \DeclareBibliographyExtras{% \def\finalandcomma{\addcomma}% - \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}% + \def\blx@ox@langbibstring#1#2{#1\setunit*{\addspace}\bibstring{#2}}% } \UndeclareBibliographyExtras{% \def\blx@ox@langbibstring#1#2{\bibstring{#2}}% @@ -15296,11 +15405,11 @@ reference,mvreference,inreference]{volume}{% byreviser = {{revised by}{rev\adddot}}, byreviewer = {{reviewed by}{rev\adddot}}, bycollaborator = {{in collaboration with}{in collab\adddotspace with}}, - bytranslator = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang}}, + bytranslator = {{translated by}{trans\adddot}}, bycommentator = {{commented by}{comm\adddot}}, byannotator = {{annotated by}{annot\adddot}}, - byeditortr = {{edited and translated \lbx@lfromlang\ by}% - {ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortr = {{edited and translated by}% + {ed\adddotspace and trans\adddot}}, byeditorco = {{edited and commented by}% {ed\adddotspace and comm\adddot}}, byeditoran = {{edited and annotated by}% @@ -15311,16 +15420,16 @@ reference,mvreference,inreference]{volume}{% {ed.\adddotspace with foreword}}, byeditoraf = {{edited, with an afterword, by}% {ed.\adddotspace with afterword}}, - byeditortrco = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}% - {with introduction, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}% - {with foreword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}% - {with afterword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortrco = {{edited, translated\finalandcomma\ and commented by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortran = {{edited, translated\finalandcomma\ and annotated by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortrin = {{edited and translated, with an introduction, by}% + {with introduction, ed\adddotspace and trans\adddot}}, + byeditortrfo = {{edited and translated, with a foreword, by}% + {with foreword, ed\adddotspace and trans\adddot}}, + byeditortraf = {{edited and translated, with an afterword, by}% + {with afterword, ed\adddotspace and trans\adddot}}, byeditorcoin = {{edited and commented, with an introduction, by}% {with introduction, ed\adddotspace and comm\adddot}}, byeditorcofo = {{edited and commented, with a foreword, by}% @@ -15333,47 +15442,46 @@ reference,mvreference,inreference]{volume}{% {with foreword, ed\adddotspace and annot\adddot}}, byeditoranaf = {{edited and annotated, with an afterword, by}% {with afterword, ed\adddotspace and annot\adddot}}, - byeditortrcoin = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - bytranslatorco = {{translated \lbx@lfromlang\ and commented by}% - {trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}% - {trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}% - {trans\adddot\ \lbx@sfromlang\ with introduction}}, - bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}% - {trans\adddot\ \lbx@sfromlang\ with foreword}}, - bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}% - {trans\adddot\ \lbx@sfromlang\ with afterword}}, - bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, + byeditortrcoin = {{edited, translated\finalandcomma\ and commented, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcofo = {{edited, translated\finalandcomma\ and commented, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcoaf = {{edited, translated\finalandcomma\ and commented, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortranin = {{edited, translated\finalandcomma\ and annotated, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranfo = {{edited, translated\finalandcomma\ and annotated, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranaf = {{edited, translated\finalandcomma\ and annotated, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + bytranslatorco = {{translated and commented by}% + {trans\adddotspace and comm\adddot}}, + bytranslatoran = {{translated and annotated by}% + {trans\adddotspace and annot\adddot}}, + bytranslatorin = {{translated, with an introduction, by}% + {trans\adddotspace with introduction}}, + bytranslatorfo = {{translated, with a foreword, by}% + {trans\adddotspace with foreword}}, + bytranslatoraf = {{translated, with an afterword, by}% + {trans\adddotspace with afterword}}, + bytranslatorcoin = {{translated and commented, with an introduction, by}% + {with introduction, trans\adddotspace and comm\adddot}}, + bytranslatorcofo = {{translated and commented, with a foreword, by}% + {with foreword, trans\adddotspace and comm\adddot}}, + bytranslatorcoaf = {{translated and commented, with an afterword, by}% + {with afterword, trans\adddotspace and comm\adddot}}, + bytranslatoranin = {{translated and annotated, with an introduction, by}% + {with introduction, trans\adddotspace and annot\adddot}}, + bytranslatoranfo = {{translated and annotated, with a foreword, by}% + {with foreword, trans\adddotspace and annot\adddot}}, + bytranslatoranaf = {{translated and annotated, with an afterword, by}% + {with afterword, trans\adddotspace and annot\adddot}}, % \end{macrocode} % % The roles expressed as objects and terms for supplementary material % are not abbreviated. % % \begin{macrocode} - withintroduction = {{with an introduction by}{with an introduction by}}, withcommentator = {{with a commentary by}{with a commentary by}}, withannotator = {{with annotations by}{with annotations by}}, withintroduction = {{with an introduction by}{with an introduction by}}, @@ -15428,8 +15536,10 @@ reference,mvreference,inreference]{volume}{% % Languages are abbreviated. % % \begin{macrocode} - langamerican = {{English}{Eng\adddot}}, - langbrazilian = {{Brazilian}{Braz\adddot}}, + langamerican = {{American English}{Amer\adddotspace Eng\adddot}}, + langbasque = {{Basque}{Basq\adddot}}, + langbrazilian = {{Brazilian Portuguese}{Braz\adddotspace Port\adddot}}, + langbulgarian = {{Bulgarian}{Bulg\adddot}}, langcatalan = {{Catalan}{Catal\adddot}}, langcroatian = {{Croatian}{Croat\adddot}}, langczech = {{Czech}{Czech}}, @@ -15439,17 +15549,28 @@ reference,mvreference,inreference]{volume}{% langestonian = {{Estonian}{Eston\adddot}}, langfinnish = {{Finnish}{Finn\adddot}}, langfrench = {{French}{Fr\adddot}}, + langgalician = {{Galician}{Galic\adddot}}, langgerman = {{German}{Ger\adddot}}, langgreek = {{Greek}{Gr\adddot}}, + langhungarian = {{Hungarian}{Hung\adddot}}, langitalian = {{Italian}{It\adddot}}, + langjapanese = {{Japanese}{Jap\adddot}}, langlatin = {{Latin}{Lat\adddot}}, + langlatvian = {{Latvian}{Latv\adddot}}, + langlithuanian = {{Lithuanian}{Lith\adddot}}, + langmarathi = {{Marathi}{Mar\adddot}}, langnorwegian = {{Norwegian}{Norw\adddot}}, langpolish = {{Polish}{Pol\adddot}}, langportuguese = {{Portuguese}{Port\adddot}}, + langromanian = {{Romanian}{Rom\adddot}}, langrussian = {{Russian}{Russ\adddot}}, + langserbian = {{Serbian}{Serb\adddot}}, + langslovak = {{Slovak}{Slovak}}, langslovene = {{Slovene}{Slov\adddot}}, langspanish = {{Spanish}{Sp\adddot}}, langswedish = {{Swedish}{Swed\adddot}}, + langturkish = {{Turkish}{Turk\adddot}}, + langukrainian = {{Ukrainian}{Ukr\adddot}}, } % \end{macrocode} % @@ -15742,11 +15863,11 @@ reference,mvreference,inreference]{volume}{% byfounder = {{fundado por}{fund\adddotspace}}, bycontinuator = {{continuado por}{cont\adddotspace}}, bycollaborator = {{colaboraci\'on de}{col\adddotspace de}}, - bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang}}, + bytranslator = {{traducido por}{trad\adddotspace}}, bycommentator = {{comentado por}{com\adddotspace}}, byannotator = {{anotado por}{anot\adddotspace}}, - byeditortr = {{editado y traducido \lbx@lfromlang\ por}% - {ed\adddotspace y trad\adddotspace \lbx@sfromlang}}, + byeditortr = {{editado y traducido por}% + {ed\adddotspace y trad\adddotspace}}, byeditorco = {{editado y comentado por}% {ed\adddotspace y com\adddotspace }}, byeditoran = {{edici\'on y notas de}% @@ -15757,16 +15878,16 @@ reference,mvreference,inreference]{volume}{% {ed\adddotspace y pr\'ol\adddotspace}}, byeditoraf = {{edici\'on y ep\'ilogo de}% {ed\adddotspace y ep\'il\adddotspace}}, - byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - byeditortran = {{edici\'on, traducci\'on \lbx@lfromlang\ y notas de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - byeditortrin = {{edici\'on, traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace}}, - byeditortrfo = {{edici\'on, traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, + byeditortrco = {{editado, traducido y comentado por}% + {ed.,\addabbrvspace trad\adddotspace y com\adddotspace}}, + byeditortran = {{edici\'on, traducci\'on y notas de}% + {ed.,\addabbrvspace trad\adddotspace y not\adddotspace}}, + byeditortrin = {{edici\'on, traducci\'on e introducci\'on de}% + {ed.,\addabbrvspace trad\adddotspace e intr\adddotspace}}, + byeditortrfo = {{edici\'on, traducci\'on y pr\'ologo de}% + {ed.,\addabbrvspace trad\adddotspace y pr\'ol\adddotspace}}, + byeditortraf = {{editado, traducido y epilogado}% + {ed.,\addabbrvspace trad\adddotspace y ep\'il\adddotspace}}, byeditorcoin = {{editado, comentado e introducido}% {ed.,\addabbrvspace com\adddotspace e intr\adddotspace}}, byeditorcofo = {{edici\'on, comentarios y pr\'ologo de}% @@ -15779,40 +15900,40 @@ reference,mvreference,inreference]{volume}{% {ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, byeditoranaf = {{edici\'on, notas y ep\'ilogo de}% {ed.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, - byeditortrcoin = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - byeditortrcofo = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - byeditortrcoaf = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - byeditortranin = {{edici\'on, traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - byeditortranfo = {{edici\'on, traducci\'on \lbx@lfromlang, notas y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - byeditortranaf = {{edici\'on, traducci\'on \lbx@lfromlang, notas y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, - bytranslatorco = {{traducci\'on \lbx@lfromlang\ y comentarios de}% - {trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - bytranslatoran = {{traducci\'on \lbx@lfromlang\ y notas de}% - {trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - bytranslatorin = {{traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang\ e introd\adddotspace}}, - bytranslatorfo = {{traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - bytranslatoraf = {{traducci\'on \lbx@lfromlang\ y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, - bytranslatorcoin = {{traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - bytranslatorcofo = {{traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - bytranslatorcoaf = {{traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - bytranslatoranin = {{traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - bytranslatoranfo = {{traducci\'on \lbx@lfromlang, notas y pr\'ologo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - bytranslatoranaf = {{traducci\'on \lbx@lfromlang, notas y ep\'ilogo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, + byeditortrcoin = {{edici\'on, traducci\'on, comentarios e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + byeditortrcofo = {{edici\'on, traducci\'on, comentarios y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + byeditortrcoaf = {{edici\'on, traducci\'on, comentarios y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + byeditortranin = {{edici\'on, traducci\'on, notas e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + byeditortranfo = {{edici\'on, traducci\'on, notas y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + byeditortranaf = {{edici\'on, traducci\'on, notas y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, + bytranslatorco = {{traducci\'on y comentarios de}% + {trad\adddotspace y com\adddotspace}}, + bytranslatoran = {{traducci\'on y notas de}% + {trad\adddotspace y not\adddotspace}}, + bytranslatorin = {{traducci\'on e introducci\'on de}% + {trad\adddotspace e introd\adddotspace}}, + bytranslatorfo = {{traducci\'on y pr\'ologo de}% + {trad\adddotspace y pr\'ol\adddotspace}}, + bytranslatoraf = {{traducci\'on y ep\'ilogo de}% + {trad\adddotspace y ep\'il\adddotspace}}, + bytranslatorcoin = {{traducci\'on, comentarios e introducci\'on de}% + {trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + bytranslatorcofo = {{traducci\'on, comentarios y pr\'ologo de}% + {trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + bytranslatorcoaf = {{traducci\'on, comentarios y ep\'ilogo de}% + {trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + bytranslatoranin = {{traducci\'on, notas e introducci\'on de}% + {trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + bytranslatoranfo = {{traducci\'on, notas y pr\'ologo}% + {trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + bytranslatoranaf = {{traducci\'on, notas y ep\'ilogo}% + {trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, % \end{macrocode} % % The roles expressed as objects and terms for supplementary material @@ -15848,6 +15969,14 @@ reference,mvreference,inreference]{volume}{% % for shorthands and \enquote{at} to cite a page within a range. % % \begin{macrocode} + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, citedas = {{en adelante}{en adelante}}, thiscite = {{en}{en}}, % \end{macrocode} @@ -15855,50 +15984,510 @@ reference,mvreference,inreference]{volume}{% % Languages are abbreviated. % % \begin{macrocode} - langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddotspace}}, - langbrazilian = {{brasile\~no}{por\adddotspace bras\adddotspace}}, - langbulgarian = {{b\'ulgaro}{bul\adddotspace}}, - langcatalan = {{catal\'an}{cat\adddotspace}}, - langcroatian = {{croata}{hrv\adddotspace}}, - langczech = {{checo}{ces\adddotspace}}, - langdanish = {{dan\'es}{dan\adddotspace}}, - langdutch = {{neerland\'es}{nld\adddotspace}}, - langenglish = {{ingl\'es}{ing\adddotspace}}, - langestonian = {{estonio}{est\adddotspace}}, - langfinnish = {{fin\'es}{fin\adddotspace}}, - langfrench = {{franc\'es}{fra\adddotspace}}, - langgalician = {{gallego}{glg\adddotspace}}, - langgerman = {{alem\'an}{ale\adddotspace}}, - langgreek = {{griego}{gr\adddotspace}}, - langhungarian = {{h\'ungaro}{hun\adddotspace}}, - langitalian = {{italiano}{ita\adddotspace}}, - langjapanese = {{japon\'es}{jap\adddotspace}}, - langlatin = {{lat\'in}{lat\adddotspace}}, - langlatvian = {{lituano}{lit\adddotspace}}, - langnorwegian = {{noruego}{nor\adddotspace}}, - langpolish = {{polaco}{pol\adddotspace}}, - langportuguese = {{portugu\'es}{port\adddotspace}}, - langrussian = {{ruso}{rus\adddotspace}}, - langserbian = {{serbio}{srp\adddotspace}}, - langslovak = {{eslovaco}{slk\adddotspace}}, - langslovene = {{esloveno}{slv\adddotspace}}, - langspanish = {{espa\~nol}{esp\adddotspace}}, + langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddot}}, + langbasque = {{vasco}{vasc\adddot}}, + langbrazilian = {{portugu\'es brasile\~no}{por\adddotspace bras\adddot}}, + langbulgarian = {{b\'ulgaro}{bul\adddot}}, + langcatalan = {{catal\'an}{cat\adddot}}, + langcroatian = {{croata}{hrv\adddot}}, + langczech = {{checo}{ces\adddot}}, + langdanish = {{dan\'es}{dan\adddot}}, + langdutch = {{neerland\'es}{nld\adddot}}, + langenglish = {{ingl\'es}{ing\adddot}}, + langestonian = {{estonio}{est\adddot}}, + langfinnish = {{fin\'es}{fin\adddot}}, + langfrench = {{franc\'es}{fra\adddot}}, + langgalician = {{gallego}{glg\adddot}}, + langgerman = {{alem\'an}{ale\adddot}}, + langgreek = {{griego}{gr\adddot}}, + langhungarian = {{h\'ungaro}{hun\adddot}}, + langitalian = {{italiano}{ita\adddot}}, + langjapanese = {{japon\'es}{jap\adddot}}, + langlatin = {{lat\'in}{lat\adddot}}, + langlatvian = {{let\'on}{let\adddot}}, + langlithuanian = {{lituano}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{noruego}{nor\adddot}}, + langpolish = {{polaco}{pol\adddot}}, + langportuguese = {{portugu\'es}{port\adddot}}, + langrussian = {{ruso}{rus\adddot}}, + langserbian = {{serbio}{srp\adddot}}, + langslovak = {{eslovaco}{slk\adddot}}, + langslovene = {{esloveno}{slv\adddot}}, + langspanish = {{espa\~nol}{esp\adddot}}, langswedish = {{sueco}{sueco}}, - langukrainian = {{ucraniano}{ucr\adddotspace}}, + langturkish = {{turco}{turco}}, + langukrainian = {{ucraniano}{ucr\adddot}}, } % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %</es> +%<*pl> +% \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{Polish: polish-oxref.lbx} +% +% \setcounter{FancyVerbLine}{19} +% +% Thanks to Sebastian Wasiuta for contributing these translations and extras. +% +% We load the standard language-specific punctuation and date formatting. +% +% \begin{macrocode} +\InheritBibliographyExtras{polish} +% \end{macrocode} +% +% Here are some additional specific settings we need. +% +% There is no comma after forenames in the inverted position. +% +% \begin{macrocode} +\DeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{}% +% \end{macrocode} +% +% We need to use the right case for month names in treaty execution dates. +% +% \begin{macrocode} + \savecommand\makebbx@dateii + \def\makebbx@dateii#1#2#3{% + \blx@imc@stripzeros{#3}~\lbx@pl@mkbibmonth{#2}% + \space + #1}% +% \end{macrocode} +% +% Volume numbers are expressed in uppercase Roman numerals. +% +% \begin{macrocode} + \savecommand\mkvolroman + \renewcommand*{\mkvolroman}[1]{\RN{#1}}% +% \end{macrocode} +% +% There is no compression of years. +% +% \begin{macrocode} + \savecommand\blx@ox@compyear + \renewcommand*{\blx@ox@compyear}[2]{#2}% +% \end{macrocode} +% +% There is no compression of pagination ranges. +% +% \begin{macrocode} + \savefieldformat{pages}% + \DeclareFieldFormat{pages}{% + \iffieldundef{bookpagination}% + {\mknormrange{#1}}% + {\mkpageprefix[bookpagination][\mknormrange]{#1}}% + }% + \savefieldformat{postnote}% + \DeclareFieldFormat{postnote}{% + \iffieldundef{pagination}% + {\mknormrange{#1}}% + {\mkpageprefix[pagination][\mknormrange]{#1}}% + }% +% \end{macrocode} +% +% We flip the word order when specifying the edition. +% +% \begin{macrocode} + \savefieldformat{edition}% + \DeclareFieldFormat{edition}{% + \ifinteger{#1} + {\bibstring{edition}~\mkbibordedition{#1}} + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}}% +} +% \end{macrocode} +% +% Lastly we add code to undo these changes before switching to another language. +% +% \begin{macrocode} +\UndeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{\addcomma}% + \restorecommand\makebbx@dateii + \restorecommand\mkvolroman + \restorecommand\blx@ox@compyear + \restorefieldformat{pages}% + \restorefieldformat{postnote}% + \restorefieldformat{edition}% +} +% \end{macrocode} +% +% We load the standard set of localization strings, then add our +% adjustments. +% +% \begin{macrocode} +\DeclareBibliographyStrings{% + inherit = {polish}, +% \end{macrocode} +% +% These are new strings defined by \pkg[biblatex]{oxref}: +% +% \begin{itemize} +% \item Roles expressed as functions +% \end{itemize} +% +% \begin{macrocode} + director = {{re\.{z}yser}{re\.{z}\adddot}}, + directors = {{re\.{z}yserzy}{re\.{z}\adddot}}, + performer = {{wykonawca}{wyk\adddot}}, + performers = {{wykonawcy}{wyk\adddot}}, + reader = {{czytelnik}{czytelnik}}, + readers = {{czytelnicy}{czytelnicy}}, + conductor = {{dyrygent}{dyr\adddot}}, + conductors = {{dyrygenci}{dyr\adddot}}, + serieseditor = {{redaktor serii}{red\adddotspace serii}}, + serieseditors = {{redaktor serii}{red\adddotspace serii}}, + holder = {{w\l a\'{s}ciciel}{w\l a\'{s}ciciel}}, + holders = {{w\l a\'{s}ciciele}{w\l a\'{s}ciciele}}, + editorcm = {{redaktor i~kompilator}{red\adddotspace i~kompilator}}, + editorcms = {{redaktorzy i~kompilatorzy}{red\adddotspace i~kompilatorzy}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Roles expressed as actions +% \end{itemize} +% +% \begin{macrocode} + byperformer = {{wykonawca}{wyk\adddot}}, + bydirector = {{re\.{z}yseria}{re\.{z}\adddot}}, + byreader = {{czyta}{czyta}}, + byconductor = {{kieruje}{kier\adddot}}, + byserieseditor = {{redakcja}{red\adddot}}, + byholder = {{w~posiadaniu}{w~posiadaniu}}, + byeditorcm = {{redakcja i~opracowanie}{red\adddotspace i~oprac\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Publication details +% \end{itemize} +% +% \begin{macrocode} + facsimile = {{wydanie faksymile}{wyd\adddotspace faksymile}}, + revised = {{wydanie poprawione}{wyd\adddotspace popr\adddot}}, + revisedenlarged = {{wydanie poprawione i~rozszerzone}{wyd\adddotspace popr\addotspace i~rozszerz\adddot}}, + revisedreprint = {{przedruk poprawiony}{przedr\adddotspace popr\adddot}}, + suppto = {{dodatek do}{dod\adddotspace do}}, + equals = {{=}{=}}, + original = {{oryginalny}{oryg\adddot}}, + amendedby = {{zmienione przez}{zmien\adddotspace przez}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Publication state +% \end{itemize} +% +% \begin{macrocode} + inpressin = {{z\l o\.{z}one do}{z\l o\.{z}one do}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Pagination +% \end{itemize} +% +% \begin{macrocode} + book = {{ksi\k{e}ga}{ks\adddot}}, + books = {{ksi\k{e}gi}{ks\adddot}}, + canto = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantos = {{pie\'{s}ni}{pie\'{s}ni}}, + stanza = {{zwrotka}{zwr\adddot}}, + stanzas = {{zwrotki}{zwr\adddot}}, + act = {{akt}{a\adddot}}, + acts = {{akty}{aa\adddot}}, + scene = {{scena}{sc\adddot}}, + scenes = {{sceny}{sc\adddot}}, + folio = {{karta}{k\adddot}}, + folios = {{karty}{kk\adddot}}, + article = {{artyku\l }{art\adddot}}, + articles = {{artyku\l y}{art\adddot}}, + clause = {{klauzula}{klauz\adddot}}, + clauses = {{klauzule}{klauz\adddot}}, + regulation = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulations = {{rozporz\k{a}dzenia}{rozp\adddot}}, + rule = {{przepis}{przep\adddot}}, + rules = {{przepisy}{przep\adddot}}, + booktotal = {{ksi\k{e}ga}{ks\adddot}}, + booktotals = {{ksi\k{e}gi}{ks\adddot}}, + cantototal = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantototals = {{pie\'{s}ni}{pie\'{s}ni}}, + stanzatotal = {{zwrotka}{zwr\adddot}}, + stanzatotals = {{zwrotki}{zwr\adddot}}, + acttotal = {{akt}{a\adddot}}, + acttotals = {{akty}{aa\adddot}}, + scenetotal = {{scena}{sc\adddot}}, + scenetotals = {{sceny}{sc\adddot}}, + foliototal = {{karta}{k\adddot}}, + foliototals = {{karty}{kk\adddot}}, + articletotal = {{artyku\l }{art\adddot}}, + articletotals = {{artyku\l y}{art\adddot}}, + clausetotal = {{klauzula}{klauz\adddot}}, + clausetotals = {{klauzule}{klauz\adddot}}, + regulationtotal = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulationtotals = {{rozporz\k{a}dzenia}{rozp\adddot}}, + ruletotal = {{przepis}{przep\adddot}}, + ruletotals = {{przepisy}{przep\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Types +% \end{itemize} +% +% \begin{macrocode} + facebook = {{wpis na Facebooku}{wpis na Facebooku}}, + tweet = {{wpis na Twitterze}{wpis na Twitterze}}, + podcast = {{podcast}{podcast}}, + clip = {{wideo}{wideo}}, + webcast = {{webcast}{webcast}}, + poster = {{plakat}{plakat}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Miscellaneous +% \end{itemize} +% +% \begin{macrocode} + nolocation = {{bez miejsca}{b\adddot m\adddot}}, + modified = {{ostatnio zmodyfikowany}{ostatnio zmodyf\adddot}}, + recorded = {{nagrane}{nagr\adddot}}, + uploaded = {{za\l adowane}{za\l ad\adddot}}, + filed = {{wniesione}{wniesione}}, + issued = {{wydany}{wyd\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Labels +% \end{itemize} +% +% \begin{macrocode} + anon = {{Anonim}{Anon\adddot}}, + pseudo = {{Pseudo-}{Ps\adddot-}}, + urldown = {{pobrane}{pobrane}}, +% \end{macrocode} +% +% \begin{itemize} +% \item Country names, patents, and patent requests, +% \end{itemize} +% +% \begin{macrocode} + countryjp = {{Japonia}{JP}}, + patentjp = {{japo\'{n}ski patent}{jap\adddotspace pat\adddot}}, + patreqjp = {{japo\'{n}ski wniosek patentowy}{jap\adddotspace wniosek pat\adddot}}, +% \end{macrocode} +% +% \begin{itemize} +% \item These are borrowed from other styles. +% \end{itemize} +% +% \begin{macrocode} + 1column = {{jedna kolumna}{1\addnbspace kol\adddot}}, + 2column = {{dwie kolumny}{2\addnbspace kol\adddot}}, + inflayer = {{warstwa ni\.{z}sza}{warstwa ni\.{z}sza}}, + suplayer = {{warstwa wy\.{z}sza}{warstwa wy\.{z}sza}}, + paper = {{gazeta}{gazeta}}, + papyrus = {{papirus}{papirus}}, + parchment = {{pergamin}{pergamin}}, + eucase = {{sprawa}{sprawa}}, + eujoinedcases = {{po\l \k{a}czone sprawy}{po\l \k{a}czone sprawy}}, + commissiondecision = {{decyzja komisji}{decyzja komisji}}, + application = {{wniosek}{wniosek}}, + order = {{polecenie}{polecenie}}, + bill = {{rachunek}{rachunek}}, + draft = {{projekt}{proj\adddot}}, + opened = {{przed\l o\.{z}one do podpisu}{przed\l\adddotspace do podp\adddot}}, + signed = {{podpisane}{podpisane}}, + adopted = {{przyj\k{e}te}{przyj\k{e}te}}, + inforce = {{wesz\l o w~\.{z}ycie}{wesz\l o w~\.{z}ycie}}, +% \end{macrocode} +% +% The rest of these strings are overrides for the standard ones. +% +% \begin{macrocode} + byeditor = {{redakcja}{red\adddot}}, + bycompiler = {{opracowanie}{oprac\adddot}}, + byfounder = {{za\l o\.{z}one przez}{za\l o\.{z}\adddotspace przez}}, + bycontinuator = {{kontynuowane przez}{kont\adddotspace przez}}, + byredactor = {{redakcja}{red\adddot}}, + byreviser = {{poprawki}{popr\adddot}}, + byreviewer = {{recenzja}{rec\adddot}}, + bycollaborator = {{we wsp\'{o}\l pracy z}{we wsp\'{o}\l pr\adddotspace z}}, + bytranslator = {{t\l umaczenie}{t\l um\adddot}}, + bycommentator = {{komentarz}{kom\adddot}}, + byannotator = {{obja\'{s}nienia}{obja\'{s}n\adddot}}, + byeditortr = {{redakcja i~t\l umaczenie}% + {red\adddotspace i~t\l um\adddot}}, + byeditorco = {{redakcja i~komentarz}% + {red\adddotspace i~kom\adddot}}, + byeditoran = {{redakcja i~obja\'{s}nienia}% + {red\adddotspace i~obja\'{s}n\adddot}}, + byeditorin = {{redakcja i~wst\k{e}p}% + {red\adddotspace i~wst\k{e}p}}, + byeditorfo = {{redakcja i~przedmowa}% + {red\adddotspace i~przedm\adddot}}, + byeditoraf = {{redakcja i~pos\l owie}% + {red\adddotspace i~pos\l \adddot}}, + byeditortrco = {{redakcja, t\l umaczenie i~komentarz}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom\adddot}}, + byeditortran = {{redakcja, t\l umaczenie i~obja\'{s}nienia}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n\adddot}}, + byeditortrin = {{redakcja, t\l umaczenie, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace wst\k{e}p}}, + byeditortrfo = {{redakcja, t\l umaczenie, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace przedm\adddot}}, + byeditortraf = {{redakcja, t\l umaczenie, pos\l \adddot}% + {red.,\addabbrvspace t\l um.,\addabbrvspace pos\l \adddot}}, + byeditorcoin = {{redakcja, komentarz, wst\k{e}p}% + {red.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditorcofo = {{redakcja, komentarz i~przedmowa}% + {red.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditorcoaf = {{redakcja, komentarz, pos\l owie}% + {red.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditoranin = {{redakcja, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditoranfo = {{redakcja, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditoranaf = {{redakcja, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + byeditortrcoin = {{redakcja, t\l umaczenie, komentarz, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditortrcofo = {{redakcja, t\l umaczenie, komentarz, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditortrcoaf = {{redakcja, t\l umaczenie, komentarz, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditortranin = {{redakcja, t\l umaczenie, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditortranfo = {{redakcja, t\l umaczenie, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditortranaf = {{redakcja, t\l umaczenie, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + bytranslatorco = {{t\l umaczenie i~komentarz}% + {t\l um\adddotspace i~kom\adddot}}, + bytranslatoran = {{t\l umaczenie i~obja\'{s}nienia}% + {t\l um\adddotspace i~obja\'{s}n\adddot}}, + bytranslatorin = {{t\l umaczenie i~wst\k{e}p}% + {t\l um.,\addabbrvspace wst\k{e}p}}, + bytranslatorfo = {{t\l umaczenie i~przedmowa}% + {t\l um.,\addabbrvspace przedm\adddot}}, + bytranslatoraf = {{t\l umaczenie i~pos\l owie}% + {t\l um.,\addabbrvspace pos\l \adddot}}, + bytranslatorcoin = {{t\l umaczenie, komentarz i~wst\k{e}p}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + bytranslatorcofo = {{t\l umaczenie, komentarz i~przedmowa}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + bytranslatorcoaf = {{t\l umaczenie, komentarz i~pos\l owie}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + bytranslatoranin = {{t\l umaczenie, obja\'{s}nienia i~wst\k{e}p}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + bytranslatoranfo = {{t\l umaczenie, obja\'{s}nienia i~przedmowa}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + bytranslatoranaf = {{t\l umaczenie, obja\'{s}nienia i~pos\l owie}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, +% \end{macrocode} +% +% The roles expressed as objects and terms for supplementary material +% are not abbreviated. +% +% \begin{macrocode} + withcommentator = {{komentarz}{komentarz}}, + withannotator = {{obja\'{s}nienia}{obja\'{s}nienia}}, + withintroduction = {{wst\k{e}p}{wst\k{e}p}}, + withforeword = {{przedmowa}{przedmowa}}, + withafterword = {{pos\l owie}{pos\l owie}}, + introduction = {{wst\k{e}p}{wst\k{e}p}}, +% \end{macrocode} +% +% The translations and abbreviations for some publication details are different. +% +% \begin{macrocode} + newseries = {{nowa seria}{nowa seria}}, + oldseries = {{dawna seria}{dawna seria}}, + edition = {{wydanie}{wyd\adddot}}, + reviewof = {{recenzja}{rec\adddot}}, + reprintfrom = {{przedruk z}{przedr\adddotspace z}}, + translationas = {{t\l umaczenie polskie}{t\l um\adddotspace pol\adddotspace}}, + origpubin = {{pierwodruk w}{pierwodr\adddotspace w}}, +% \end{macrocode} +% +% We use a different translation for \enquote{paragraph}. +% +% \begin{macrocode} + paragraph = {{ust\k{e}p}{ust\adddot}}, + paragraphs = {{ust\k{e}py}{ust\adddot}}, +% \end{macrocode} +% +% \emph{New Hart's Rules} uses \enquote{accessed} for URL dates. +% +% \begin{macrocode} + urlseen = {{dost\k{e}p}{dost\k{e}p}}, +% \end{macrocode} +% +% Scholarly citation terms are abbreviated. Oxford style is to use \enquote{henceforth} +% for shorthands and \enquote{at} to cite a page within a range. +% +% \begin{macrocode} + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, + citedas = {{dalej}{dalej}}, + thiscite = {{na}{na}}, +% \end{macrocode} +% +% Languages are abbreviated. +% +% \begin{macrocode} + langamerican = {{ameryka\'{n}ski angielski}{amer\adddotspace ang\adddot}}, + langbasque = {{baskijski}{bask\adddot}}, + langbrazilian = {{brazylijski portugalski}{braz\adddot port\adddot}}, + langbulgarian = {{bu\l garski}{bu\l g\adddot}}, + langcatalan = {{katalo\'{n}ski}{katal\adddot}}, + langcroatian = {{chorwacki}{chorw\adddot}}, + langczech = {{czeski}{czeski}}, + langdanish = {{du\'{n}ski}{du\'{n}\adddot}}, + langdutch = {{holenderski}{holend\adddot}}, + langenglish = {{angielski}{ang\adddot}}, + langestonian = {{esto\'{n}ski}{est\adddot}}, + langfinnish = {{fi\'{n}ski}{fi\'{n}\adddot}}, + langfrench = {{francuski}{fr\adddot}}, + langgalician = {{galicyjski}{galic\adddot}}, + langgerman = {{niemiecki}{niem\adddot}}, + langgreek = {{grecki}{gr\adddot}}, + langhungarian = {{w\k{e}gierski}{w\k{e}g\adddot}}, + langitalian = {{w\l oski}{w\l \adddot}}, + langjapanese = {{japo\'{n}ski}{jap\adddot}}, + langlatin = {{\l aci\'{n}ski}{\l ac\adddot}}, + langlatvian = {{\l otewski}{\l ot\adddot}}, + langlithuanian = {{litewski}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{norweski}{norw\adddot}}, + langpolish = {{polski}{pol\adddot}}, + langportuguese = {{portugalski}{port\adddot}}, + langromanian = {{rumu\'{n}ski}{rum\adddot}}, + langrussian = {{rosyjski}{ros\adddot}}, + langserbian = {{serbski}{serb\adddot}}, + langslovak = {{s\l owacki}{s\l c\adddot}}, + langslovene = {{s\l owe\'{n}ski}{s\l owe\'{n}\adddot}}, + langspanish = {{hiszpa\'{n}ski}{hiszp\adddot}}, + langswedish = {{szwedzki}{szw\adddot}}, + langturkish = {{turecki}{tur\adddot}}, + langukrainian = {{ukrai\'{n}ski}{ukr\adddot}}, +} +% \end{macrocode} +% +% \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%</pl> % \fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{Other languages} % -% Currently \pkg[biblatex]{oxref} only supports English (British and American) -% and Spanish explicitly, but if there is demand more languages may be added. If -% you would like to contribute support for your language, a list of the -% non-standard bibliography strings requiring definition may be found in -% section~\ref{sec:setup}. +% Currently \pkg[biblatex]{oxref} only supports English (British and American), +% Spanish, and Polish explicitly, +% but if there is demand more languages may be added. If you would like to +% contribute support for your language, a list of the non-standard bibliography +% strings requiring definition may be found in section~\ref{sec:setup}. % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %</lbx> diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf Binary files differindex 08147694cc..5834fb1590 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf Binary files differindex 89a6515237..61c1abb84e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf Binary files differindex adbd84e2f6..cc05bf618a 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex index 9d38bb03ee..6c09fb0f57 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex @@ -34,8 +34,8 @@ \usepackage[margin=1.5cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.1.9} -\def\TPdate{20/08/2024} +\def\TPversion{0.2.0} +\def\TPdate{26/08/2024} \usepackage{tcolorbox} \sethlcolor{lightgray!25} \NewDocumentCommand\MontreCode{ m }{% @@ -111,6 +111,8 @@ \section{History} +\verb|v0.1.9|~:~~~~Skills with stars (\textsf{fontawesome5} or \TikZ) + \verb|v0.1.9|~:~~~~Title banner \verb|v0.1.8|~:~~~~Score banner @@ -633,5 +635,34 @@ Available \MontreCode{keys} are : It's possible to redefine \MontreCode{\textbackslash part} (for example). +\pagebreak + +\section{Various commands} + +\subsection{Difficulty levels with stars (fontawesome5)} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\DiffLevelStars[max level (3)]{level} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\DiffLevelStars{0}\par +\DiffLevelStars{2.5}\par +\textcolor{teal}{\LARGE\DiffLevelStars[5]{4}}\par +\DiffLevelStars[5]{1.5}\par +\end{demohigh} + +\subsection{Difficulty levels with stars (tikz)} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\tkzLevelStars[colframe=...,colback=...,offset=...,maxlevel=...,valign=...]{level} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\tkzLevelStars{2.5}\par +{\LARGE We ty inline \tkzLevelStars{2.25} with score 2.25}\par +{\LARGE We ty inline \tkzLevelStars[valign=false]{1.75} with score 1.75}\par +\tkzLevelStars[colframe=red,colback=yellow,maxlevel=5]{3} +\end{demohigh} \end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf Binary files differindex 5f86baf5c9..4059d5dfa2 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex index 1d9576f944..13058113c2 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex @@ -39,8 +39,8 @@ \usepackage[margin=1.5cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.1.9} -\def\TPdate{20 août 2024} +\def\TPversion{0.2.0} +\def\TPdate{26 août 2024} \usepackage{tcolorbox} \tcbuselibrary{listingsutf8} \newtcblisting{DemoCode}[1]{% @@ -66,10 +66,10 @@ 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},% + 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},% 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},% + 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},% keywordstyle={\color{orange}} },% #1 @@ -149,6 +149,8 @@ \section{Historique} +\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 \verb|v0.1.8|~:~~~Nutriscore @@ -956,6 +958,8 @@ Les éléments personnalisables sont : \begin{itemize} \item le libellé via la clé \MontreCode{[Libelle]}, qui vaut \MontreCode{Exercice~} par défaut ; \item la couleur via la clé \MontreCode{[Couleur]}, qui vaut \MontreCode{blue!50!black} par défaut ; + \item la couleur de la décoration (si textuelle) via la clé \MontreCode{[CouleurDeco]}, qui vaut \MontreCode{blue!50!black} par défaut ; + \item la couleur de fond la décoration (si il existe) via la clé \MontreCode{[CouleurFondDeco]}, qui vaut 50\,\% de \MontreCode{blue!50!black} par défaut ; \item la police via la clé \MontreCode{[Police]}, qui vaut \MontreCode{\textbackslash bfseries\textbackslash LARGE\textbackslash sffamily} par défaut ; \item l'épaisseur du trait (éventuel) via la clé \MontreCode{[EpTrait]}, qui vaut \MontreCode{1.1pt} par défaut. \end{itemize} @@ -1003,14 +1007,13 @@ Hormis le style global, il est possible de modifier/ajouter certains éléments \item des points, sous la forme \texttt{(xx points)} ; \item une image, via \texttt{graphicx}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item une icône, via \texttt{fontawesome5}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; + \item des étoiles, via \texttt{fontawesome5} ou \TikZ, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item un petit chronomètre, via \texttt{pictochrono}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item une ceinture colorée, via \texttt{coloredbelts}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \end{itemize} \item le compteur (nommé \MontreCode{numeroexo}) peut être désactivé et \textit{adpaté} via les commandes classiques de compteurs. \end{itemize} -\pagebreak - Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont : \begin{itemize} @@ -1026,6 +1029,8 @@ Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont : \item \MontreCode{Ceinture/...} := afficher la ceinture couleur \MontreCode{...} à la fin de la ligne ; \item \MontreCode{Chrono/...} := afficher le chrono de durée \MontreCode{...} à la fin de la ligne ; \item \MontreCode{Points/...} := afficher les points \MontreCode{(... points)} à la fin de la ligne ; + \item \MontreCode{faEtoiles/...} := afficher des étoiles de difficultés à la fin de la ligne ; + \item \MontreCode{tkzEtoiles/...} := afficher des étoiles de difficultés à la fin de la ligne ; \end{itemize} \item \MontreCode{Trait} : choix du trait parmi : \begin{itemize} @@ -1036,6 +1041,34 @@ Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont : \end{itemize} \end{itemize} +La commande d'affichage des étoiles de difficultés est indépendante de l'environnement \MontreCode{EnvtExo}, la clé \MontreCode{Decoration=xxxEtoiles/niv} ou \MontreCode{Decoration=xxxEtoiles/niv§max} permet de l'y intégrer. + +\begin{DemoCode}{listing only} +%commande d'étoiles (max=3 par défaut) avec fontawesome5 +\NiveauDiffExos[max]{nb} + +%commande d'étoiles (max=3 par défaut) avec tikz +\tkzEtoiles[Couleur=...,CouleurFond=...,Offset=...,NiveauMax=...,AlignV=...]{nb} +\end{DemoCode} + +\begin{DemoCode}{} +%des demies étoiles sont possibles +\NiveauDiffExos{0}\par +\NiveauDiffExos{2.5}\par +\textcolor{teal}{\LARGE\NiveauDiffExos[5]{4}}\par +\NiveauDiffExos[5]{1.5}\par +\end{DemoCode} + +\begin{DemoCode}{} +%des portions d'étoiles sont possibles +%Offset=... permet de gérer l'espacement horizontal +%AlignV est un booléen pour décaler verticalement les étoiles (inline) +\tkzEtoiles{2.5}\par +{\LARGE On essaye en ligne \tkzEtoiles{2.5} avec une note de 2.5}\par +{\LARGE On essaye en ligne \tkzEtoiles[AlignV=false]{2.5} avec une note de 2.5}\par +\tkzEtoiles[Couleur=red,CouleurFond=yellow,NiveauMax=5]{3.5} +\end{DemoCode} + \subsection{Exemples} Les exemples suivants ont été obtenus via un document externe (fourni avec le package), du fait du chargement de packages spécifiques. @@ -1063,65 +1096,46 @@ Le code proposé utilise l'environnement, mais la commande simple est complètem \pagebreak \begin{DemoCode}{listing only} -\begin{EnvtExo}%exo1 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo1 -\begin{EnvtExo}[Trait=pointilles]%exo2 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Trait=pointilles]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo2 -\begin{EnvtExo}[Trait=dashilles]%exo3 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Trait=dashilles]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo3 -\begin{EnvtExo}[Decoration=Icone/\faPython]%exo4 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=Icone/\faPython]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo4 -\begin{EnvtExo}[Decoration=Ceinture/rouge]%exo5 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=Ceinture/rouge]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo5 -\begin{EnvtExo}[Decoration=Chrono/20]%exo6 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=Chrono/20]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo6 -\begin{EnvtExo}[Decoration=Image/goku_ssj4]%exo7 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=Image/goku_ssj4]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo7 -\begin{EnvtExo}[Decoration=Image/sseiya_shura]%exo8 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=faEtoiles/1.5§4]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo8 -\begin{EnvtExo}[Decoration=Points/7]%exo9 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=tkzEtoiles/3.5§5]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo8 -\begin{EnvtExo}[Type=Perso/{Titre perso }]%exo10 -\ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\begin{EnvtExo}[Decoration=Points/7]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo9 + +\begin{EnvtExo}[Type=Perso/{Titre perso }]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo10 -\StyleEnvtExo[Couleur=red,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] \ipsum<Lang=FR,Type=sent> -\end{EnvtExo} +\end{EnvtExo}%exo11 + -\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Couleur=red,Trait=dashilles]%exo12 +\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles]%exo12 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} \StyleEnvtExoDefaut - \begin{EnvtExo}% [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo13 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} \TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo14 - \ipsum<Lang=FR,Type=sent> \end{DemoCode} diff --git a/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf b/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf Binary files differindex 717f3a12c9..16a8d7d3e6 100644 --- a/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf +++ b/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf diff --git a/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex b/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex index 2daa195179..a91733525b 100644 --- a/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex +++ b/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex @@ -15,6 +15,8 @@ \setlength{\parindent}{0pt} \begin{document} + +\pagestyle{empty} \begin{EnvtExo}%exo1 \ipsum<Lang=FR,Type=sent> @@ -44,7 +46,11 @@ \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\begin{EnvtExo}[Decoration=Image/sseiya_shura]%exo8 +\begin{EnvtExo}[Decoration=faEtoiles/1.5§4]%exo8 + \ipsum<Lang=FR,Type=sent> +\end{EnvtExo} + +\begin{EnvtExo}[Decoration=tkzEtoiles/3.5§5]%exo8 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} @@ -56,13 +62,13 @@ \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\StyleEnvtExo[Couleur=red,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 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Couleur=red,Trait=dashilles]%exo12 +\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles]%exo12 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} diff --git a/macros/latex/contrib/customenvs/tex/customenvs.sty b/macros/latex/contrib/customenvs/tex/customenvs.sty index 535baa0f18..4c90d39b3d 100644 --- a/macros/latex/contrib/customenvs/tex/customenvs.sty +++ b/macros/latex/contrib/customenvs/tex/customenvs.sty @@ -3,9 +3,10 @@ % source pencil...: CC-BY-SA 4.0 https://tex.stackexchange.com/questions/504092/replicating-a-fancy-bordered-text-style-in-latex/504145#504145 \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{customenvs}[2024/08/20 0.1.9 Custom classic environments] +\ProvidesPackage{customenvs}[2024/08/26 0.2.0 Custom classic environments] %====HISTORIQUE +% v 0.2.0 Ajout d'étoiles pour les difficultés d'exercices (2 versions) % v 0.1.9 tkzBanner + tkzBannerTri + includegraphicsfill % v 0.1.8 Nutriscore % v 0.1.7 Style perso pour les vignettes @@ -678,7 +679,153 @@ } %====EXERCICE PERSO +\newlength{\largstarsempty} +\newlength{\largstarsmid} +\newlength{\largstarfull} +\newlength{\largmaxstars} + +%commande annexe tkzlevelstars [en] + [fr] +\usetikzlibrary{shapes.geometric} + +\newlength{\tmphauteuretoiles} +\newlength{\tmpprofondeuretoiles} +\newlength{\tmpoffsetetoiles}\setlength{\tmpoffsetetoiles}{0.25pt} + +\defKV[levelstars]{% + colframe=\def\tkzLevelStarsColor{#1}, + colback=\def\tkzLevelStarsColorBg{#1}, + offset=\setlength{\tmpoffsetetoiles}{#1}, + maxlevel=\def\tkzLevelStarsMaxLevel{#1} +} + +\setKVdefault[levelstars]{% + colframe=black, + colback=gray, + offset={0.025em}, + maxlevel=3, + valign=true +} + +\NewDocumentCommand{\tkzLevelStars}{ O{} m }{% + %lectures des clés + \restoreKV[levelstars]% + \setKV[levelstars]{#1}% + %dimensions + \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \ifboolKV[levelstars]{valign}% + {% + \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \begin{tikzpicture}[baseline={-\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + {% + \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{% + \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}% + %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))} + \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{}; + } + \end{tikzpicture}% +} + +\defKV[tkznivetoiles]{% + Couleur=\def\tkzLevelStarsColor{#1}, + CouleurFond=\def\tkzLevelStarsColorBg{#1}, + Offset=\setlength{\tmpoffsetetoiles}{#1}, + NiveauMax=\def\tkzLevelStarsMaxLevel{#1} +} + +\setKVdefault[tkznivetoiles]{% + Couleur=black, + CouleurFond=gray, + Offset={0.025em}, + NiveauMax=3, + AlignV=true +} + +\NewDocumentCommand{\tkzEtoiles}{ O{} m }{% + %lectures des clés + \restoreKV[tkznivetoiles]% + \setKV[tkznivetoiles]{#1}% + %dimensions + \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \ifboolKV[tkznivetoiles]{AlignV}% + {% + \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \begin{tikzpicture}[baseline={-\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + {% + \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{% + \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}% + %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))} + \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{}; + } + \end{tikzpicture}% +} + +%commande annexe ;-) +\NewDocumentCommand\NiveauDiffExos{ O{3} m }{%avec des demis ?? + %les tailles de boîtes + \settowidth{\largstarsempty}{{\faStar[regular]}}% + \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}% + \settowidth{\largstarfull}{{\faStar}}% + \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}% + %les calculs intermédiaires + \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide + \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide + % + \xintifboolexpr{isint(\tmpstars) == 1}% + {% + \xdef\tmpstarsexosfull{\tmpstars}% + \xdef\tmpstarsexosmid{0}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}% + }% + {% + \xdef\tmpstarsexosmid{1}% + \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}% + }% + %affichage des full + \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}% + %affichage des mid + \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}% + %affichage des vides + \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}% +} + +%commande annexe [en] ;-) +\NewDocumentCommand\DiffLevelStars{ O{3} m }{%avec des demis ?? + %les tailles de boîtes + \settowidth{\largstarsempty}{{\faStar[regular]}}% + \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}% + \settowidth{\largstarfull}{{\faStar}}% + \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}% + %les calculs intermédiaires + \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide + \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide + % + \xintifboolexpr{isint(\tmpstars) == 1}% + {% + \xdef\tmpstarsexosfull{\tmpstars}% + \xdef\tmpstarsexosmid{0}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}% + }% + {% + \xdef\tmpstarsexosmid{1}% + \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}% + }% + %affichage des full + \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}% + %affichage des mid + \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}% + %affichage des vides + \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}% +} +%code ppal \newcounter{numeroexo} \setcounter{numeroexo}{0} \newlength{\eptraitexo} @@ -689,6 +836,8 @@ \newlength{\tmp@image@profondeur} \colorlet{macouleurexo}{blue!50!black} +\colorlet{macouleurexodeco}{blue!50!black} +\colorlet{macouleurexodecofond}{blue!50!black} \newcommand\tmpstyleexo{\bfseries\LARGE\sffamily}% \newcommand\tmplabelexo{Exercice~}% @@ -696,15 +845,21 @@ \defKV[globalstyleexo]{% Libelle=\renewcommand\tmplabelexo{#1},% Couleur=\colorlet{macouleurexo}{#1},% + CouleurDeco=\colorlet{macouleurexodeco}{#1},% + CouleurFondDeco=\colorlet{macouleurexodecofond}{#1},% Police=\renewcommand\tmpstyleexo{#1},% - EpTrait=\setlength{\eptraitexo}{#1} + EpTrait=\setlength{\eptraitexo}{#1},% + EchelleEtoiles=\def\tmpscalestarsexos{#1} } \setKVdefault[globalstyleexo]{% Libelle={Exercice~},% Couleur={blue!50!black},% + CouleurDeco={blue!50!black},% + CouleurFondDeco={macouleurexodeco!50},% Police={\bfseries\LARGE\sffamily},% - EpTrait={1.1pt} + EpTrait={1.1pt},% + EchelleEtoiles=0.85 } \NewDocumentCommand\StyleEnvtExo{ O{} }{% @@ -719,7 +874,6 @@ Type=\def\EnvtExoType{#1},% ComplementTitre=\def\EnvtExoCpltTitre{#1},% CodeDebut=\def\EnvtExoCodeAvant{#1},% - %Couleur=\def\EnvtExoCouleur{#1},% EchelleImage=\def\EnvtExoScaleImg{#1},% Decoration=\def\EnvtExoDeco{#1},% Trait=\def\EnvtExoTrait{#1} @@ -728,7 +882,6 @@ Type=Classique,% ComplementTitre={},% CodeDebut={},% - %Couleur=macouleurexo,% EchelleImage=1.15,% Compteur=true,% Decoration={},% @@ -753,12 +906,13 @@ {pointilles}{\,\dotfill}% {dashilles}{\,\hdashrule{\fill}{\eptraitexo}{\eptraitexospace}}% {non}{\hfill}% + {aucun}{~}% }% %décoration éventuelle \IfSubStr{\EnvtExoDeco}{Icone}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]% - \,\scalebox{0.85}[0.85]{\EnvtExoIcon}% + \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}% }{}% \IfSubStr{\EnvtExoDeco}{Ceinture}% {% @@ -768,13 +922,13 @@ \IfSubStr{\EnvtExoDeco}{Chrono}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]% - \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}% + \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}% }{}% \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -782,6 +936,30 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \IfSubStr{\EnvtExoType}{Perso}%OK perso____déco {% @@ -799,7 +977,7 @@ \IfSubStr{\EnvtExoDeco}{Icone}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]% - \,\scalebox{0.85}[0.85]{\EnvtExoIcon}% + \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}% }{}% \IfSubStr{\EnvtExoDeco}{Ceinture}% {% @@ -809,13 +987,13 @@ \IfSubStr{\EnvtExoDeco}{Chrono}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]% - \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}% + \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}% }{}% \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -823,6 +1001,30 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSuStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \endgroup% \def\hrulefill{\leavevmode\leaders\hrule height 0.4pt\hfill\kern\z@}% @@ -2237,7 +2439,7 @@ \setKVdefault[tkzBannerpartKeys]{% height=2.5em,% - width=\linewidth,% + width={\linewidth-0.5pt},% blockwidth=2.75em,% collight=darkgray!25,% colmedium=darkgray!50,% @@ -2260,10 +2462,10 @@ \noindent% \restoreKV[tkzBannerpartKeys]% \setKV[tkzBannerpartKeys]{#1}% - \pgfmathsetmacro{\tkzBannertriscale}{0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}% - \pgfmathsetmacro{\scaletypedoctribanner}{1.05*0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}% - \pgfmathsetmacro{\scaletypedoctribannernum}{2.5*0.75*\useKV[tkzBannerpartKeys]{height}/1.25cm}% - \pgfmathsetmacro{\tkzBannertriangle}{0.10*\useKV[tkzBannerpartKeys]{height}/\useKV[tkzBannerpartKeys]{width}}% + \pgfmathsetmacro{\tkzBannertriscale}{0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\scaletypedoctribanner}{1.05*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\scaletypedoctribannernum}{2.5*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\tkzBannertriangle}{0.10*(\useKV[tkzBannerpartKeys]{height})/(\useKV[tkzBannerpartKeys]{width})}% \IfEq{\tkzBannermaintriblockwidth}{auto}% {% \settowidth{\tmp@tkzbanner@autowidthtype}{\scalebox{\scaletypedoctribanner}[\scaletypedoctribanner]{\sffamily\bfseries\vphantom{qÉ}\tkzBannermaintritype}}% @@ -2309,34 +2511,34 @@ \begin{scope} \clip ($(tkzBannerTri-SW)!0.0375!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1375!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; %light - \fill[tkzbannertrilight] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; + \fill[tkzbannertrilight] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; \end{scope} \begin{scope} \clip ($(tkzBannerTri-SW)!0.025!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; %medium - \fill[tkzbannertrimedium] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; + \fill[tkzbannertrimedium] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; \end{scope} \begin{scope} \clip ($(tkzBannerTri-SW)!0.0125!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; %dark - \fill[tkzbannertridark] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth},0) -- ({\tmp@tkzbanner@autowidth+1em},{0.5*\useKV[tkzBannerpartKeys]{height}}) -- ({\tmp@tkzbanner@autowidth},0) -- (tkzBannerTri-SW) -- cycle ; + \fill[tkzbannertridark] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth},0) -- ({\tmp@tkzbanner@autowidth+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth},0) -- (tkzBannerTri-SW) -- cycle ; \IfEq{\tkzBannermaintritypelibre}{}% {% \ifboolKV[tkzBannerpartKeys]{num}% {% \IfEq{\tkzBannermaintritype}{}% {% - \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#2}; + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2}; }% {% \node[inner sep=2pt,below=1pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={1.05*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintritype}; - \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.425*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#2}; + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.425*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2}; }% }% {}% }% {% - \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintritypelibre}; + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintritypelibre}; }% \end{scope} }% @@ -2346,21 +2548,21 @@ \clip (tkzBannerTri-SWd) -- (tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ; \ifboolKV[tkzBannerpartKeys]{swap}% {% - \node[inner sep=2pt,right,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#3}; + \node[inner sep=2pt,right,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3}; %logo \IfEq{\tkzBannermaintrilogo}{}% {}% {% - \node[inner sep=2pt,left,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintrilogo}; + \node[inner sep=2pt,left,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo}; }% }% {% - \node[inner sep=2pt,right,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}#3}; + \node[inner sep=2pt,right,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3}; %logo \IfEq{\tkzBannermaintrilogo}{}% {}% {% - \node[inner sep=2pt,left,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintrilogo}; + \node[inner sep=2pt,left,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo}; }% }% \end{scope} diff --git a/macros/luatex/latex/domaincoloring/Changes b/macros/luatex/latex/domaincoloring/Changes index e49a69aac3..725f4399fb 100644 --- a/macros/luatex/latex/domaincoloring/Changes +++ b/macros/luatex/latex/domaincoloring/Changes @@ -1,3 +1,7 @@ +0.03 2024-08-26 - use \jobname for temporary file + - added option force for not creating already existing pdf's + - allow different x|y resolutions + - updated documentation 0.02 2024-08-22 - edit option bgcolor - reduced header for the intermediate eps - renamed complex-numbers.lua diff --git a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib index d109070c92..5529a63a48 100644 --- a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib +++ b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.bib @@ -25,3 +25,14 @@ date = {2024-08-18}, } +@online{dm, + author = {Juan Carlos Ponce Campuzano}, + title = {Dynamic Mathematics}, + subtitle = {Domain Coloring -- Visualizing Complex Functions}, + date = {2018-07-15}, + urldate = {2024-08-23}, + url ={https://www.dynamicmath.xyz/domain-coloring/}, +} + + +
\ No newline at end of file diff --git a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf Binary files differindex 8a8b79e4d9..bf0e31988e 100644 --- a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf +++ b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.pdf diff --git a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex index 63c33ec368..cedf037ab1 100644 --- a/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex +++ b/macros/luatex/latex/domaincoloring/doc/domaincoloring-doc.tex @@ -1,7 +1,9 @@ -%% $Id: domaincoloring-doc.tex 952 2024-08-22 15:40:35Z herbert $ +%% $Id: domaincoloring-doc.tex 966 2024-08-26 19:55:11Z herbert $ % \listfiles +\def\header{Complex Functions} + \DocumentMetadata{} \documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} @@ -15,15 +17,19 @@ \usepackage{enumitem} \setlist{noitemsep,nosep} +\usepackage{makeidx} +\makeindex + \usepackage{domaincoloring} \let\DColFV\fileversion +\setDColkeys{force=false}% only for this documentation relevant \usepackage{hvlogos} \usepackage{listings} \lstset{columns=fixed,basicstyle=\ttfamily\small} -\def\bgImage{\includegraphics[width=7cm]{titleImg}} +\def\bgImage{\hspace{-2cm}*\includegraphics[width=14cm]{titleImg.png}} \title{Domain Coloring of complex functions\\version \DColFV} \author{Herbert Voß} @@ -34,7 +40,9 @@ \section{Introduction} -This package works only with \texttt{lualatex}! +This package works only with \texttt{lualatex} and the option \Loption{shell-escape}! +It creates an intermediate external EPS-file, which is automatically converted with +\LFile{epstopdf}. The pdf is in the end imported by the macro \Lcs{includegraphics}. \subsection{Loading the package} The package \texttt{domaincoloring} creates acolored interpretation of the @@ -76,16 +84,17 @@ Every math function has to be preceeded by \texttt{cmath} if it has a complex ar \noindent \begin{xltabular}{\linewidth}{@{} >{\ttfamily}l l X @{}}\\\toprule \emph{name} & \emph{value} &\emph{meaning}\\\midrule -domain & {-2,2,-2,2} & the (re,im)-coordinates for the complex system\\ -resolution & 500 & the number of steps for the re,im interval. At the moment only -for both coordinates the same. Will be in future -versions different for the both axes. \\ -filename & \Lcs{jobname-tmp} & name of the created external file, must be unique\\ -grfOptions &scale=0.5 & optional arguments for \Lcs{includegraphics}\\ -hsvrgb & {phi,1,r} & for the conversion into rgb\\ -funcName & & corresponding to external file\\ -bgcolor & 0 & change color to white as background for all values $r+g+b\le\text{bgcolor}$\\ -invers & false & inverted colors with $color=|color-255|$\\ +\Lkeyword{domain} & {-2,2,-2,2} & the (re,im)-coordinates for the complex system\\ +\Lkeyword{resolution} & 500 & the number of steps for the re,im interval. One value will be for +both axes. Two values like \verb|{500,600}| for real axis and imaginary axis,\\ +\Lkeyword{filename} & \Lcs{jobname-tmp} & name of the created external file, must be unique\\ +\Lkeyword{funcName} & \texttt{\{\}} & corresponding to external file\\ +\Lkeyword{grfOptions} &scale=0.5 & optional arguments for \Lcs{includegraphics}\\ +\Lkeyword{hsvrgb} & {phi+pi,1,r} & for the conversion into rgb\\ +\Lkeyword{bgcolor} & -1 & change color to white as background for all values $-1\le r+g+b\le\text{bgcolor}$\\ +\Lkeyword{invers} & false & inverted colors with $color=|color-255|$\\ +\Lkeyword{force} & true & With \texttt{force=false} an existing pdf file will be used +without calculating a new one.\\ \bottomrule \end{xltabular} @@ -96,7 +105,7 @@ invers & false & inverted colors with $color=|color-255|$\\ \subsection{The default with function $f(z)=z$} \begin{lstlisting} -\DomainColoring{z}\qquad % default filename \jobname-tmp.png +\DomainColoring{z} % default filename \jobname-tmp.png \end{lstlisting} \noindent @@ -111,7 +120,9 @@ invers & false & inverted colors with $color=|color-255|$\\ f(z) &= \cos(z)/\sin(z^4-1) \end{align} -in Lua-notation: \verb|cmath.cos(z)/cmath.sin(z^4-1)|. +in Lua-notation: \verb|cmath.cos(z)/cmath.sin(z^4-1)|. All complex functions +must be preceeded by \texttt{cmath.}. For real functions the prefix \texttt{math.} +can be omitted. \begin{lstlisting} \DomainColoring[domain={-2.5,2.5,-2.5,2.5},resolution=500, @@ -138,7 +149,7 @@ in Lua-notation: \verb|cmath.cos(z)/cmath.sin(z^4-1)|. filename=\jobname-tmp1c]{cmath.cos(z)/cmath.sin(z^4-1)}} -With \Lcs{bgcolor}\texttt{=<int>} all RGB-combinations with a sum $R+G+B <= \text{int}$ are set to +With \Lkeyword{bgcolor}\texttt{=<int>} all RGB-combinations with a sum $R+G+B <= \text{int}$ are set to the color white. \subsection{Option for \Lcs{includegraphics}} @@ -159,9 +170,9 @@ With \Lkeyword{grfOptions} one can define optional arguments for \Lcs{includegra \subsection{Higher resolution} The resolution is more or less the number of pixels for the given domain. -In later versions of this package it may be possible to have different values -for the two coordinates. By now the one value for \Lkeyword{resolution} is for -both axes. +It is possible to have different values +for the two coordinates. Is only one value for \Lkeyword{resolution} given, then it is +for both axes. \begin{lstlisting} @@ -182,7 +193,7 @@ both axes. \subsection{hsv to rgb conversion} -The color model (Wikipedia) +The color model (Wikipedia): \begin{center} \includegraphics[width=0.5\linewidth]{hsv} @@ -222,27 +233,28 @@ e.g. \texttt{hsvrgb=\{phi+2,0.5,2/r\}} \subsection{External function definition} The already existing file \LFile{domaincoloring-functions.lua} collects sone definitions of complex functions $f(z)$, which can be used from inside \LaTeX\ -with the optional argument \Lkeyword{funcName}. In this case the mandatory argument +with the optional argument \Lkeyword{funcName}\texttt{<Lua function name>}. +In this case the mandatory argument of \Lcs{DomainColoring} has no meaning and can be empty. \begin{lstlisting} \DomainColoring[filename=\jobname-tmp6a,resolution=1000, domain={-1.5,1.5,-1.5,1.5}, grfOptions={width=0.49\linewidth}, - hsvrgb={phi+2*pi,1,1/r}, funcName=f12]{}% using predefined function + hsvrgb={phi+pi,1,2/r}, funcName=f12]{}% using predefined function \hfill \DomainColoring[filename=\jobname-tmp6b,resolution=2000, domain={-2.3,0.7,-1.5,1.5}, grfOptions={width=0.49\linewidth}, - hsvrgb={phi+2*pi,1,1/r},funcName=f13]{} + hsvrgb={phi+pi,1,2/r},funcName=f13]{} \end{lstlisting} \noindent \DomainColoring[filename=\jobname-tmp6a,resolution=1000, domain={-1.5,1.5,-1.5,1.5}, grfOptions={width=0.49\linewidth}, - hsvrgb={phi+2*pi,1,1/r}, funcName=f12]{}% using predefined function + hsvrgb={phi+pi,1,2/r}, funcName=f12]{}% using predefined function \hfill \DomainColoring[filename=\jobname-tmp6b,resolution=2000, domain={-2.3,0.7,-1.5,1.5}, grfOptions={width=0.49\linewidth}, - hsvrgb={phi+2*pi,1,1/r},funcName=f13]{} + hsvrgb={phi+pi,1,2/r},funcName=f13]{} The contents of the function file of the current version of \LPack{domaincoloring} is:: @@ -254,4 +266,5 @@ The contents of the function file of the current version of \LPack{domaincolorin \nocite{*} \printbibliography +\printindex \end{document} diff --git a/macros/luatex/latex/domaincoloring/doc/titleImg.pdf b/macros/luatex/latex/domaincoloring/doc/titleImg.pdf Binary files differindex e68120b481..decae34f42 100644 --- a/macros/luatex/latex/domaincoloring/doc/titleImg.pdf +++ b/macros/luatex/latex/domaincoloring/doc/titleImg.pdf diff --git a/macros/luatex/latex/domaincoloring/latex/domaincoloring.sty b/macros/luatex/latex/domaincoloring/latex/domaincoloring.sty index d668d057f0..170e1897f0 100644 --- a/macros/luatex/latex/domaincoloring/latex/domaincoloring.sty +++ b/macros/luatex/latex/domaincoloring/latex/domaincoloring.sty @@ -1,4 +1,4 @@ -%% $Id: domaincoloring.sty 952 2024-08-22 15:40:35Z herbert $ +%% $Id: domaincoloring.sty 966 2024-08-26 19:55:11Z herbert $ %% This is file `domaincoloring.sty', %% %% Copyright (C) 2024- Herbert Voss @@ -14,13 +14,13 @@ \RequirePackage{graphicx} \RequirePackage{shellesc} -\def\fileversion{0.02} -\def\filedate{2024/08/22} +\def\fileversion{0.03} +\def\filedate{2024/08/26} \message{`DCol' v\fileversion, \filedate} \ProvidesPackage{domaincoloring} - [\filedate\ \fileversion\ 0.02 package for domain coloring of complex functions] + [\filedate\ \fileversion\ package for domain coloring of complex functions] -\ifnum\ShellEscapeStatus < 1 +\ifnum\ShellEscapeStatus < 1 \PackageError{shellesc}{ShellEscape not enabled! Use --shell-escape}% \fi @@ -28,25 +28,35 @@ \catcode`\^=11\relax % for power symbol in Lua \define@key{DCol}{domain}{\def\@domaincoloring@domain{#1}} -\define@key{DCol}{resolution}{\def\@domaincoloring@res{#1,#1}} +\define@key{DCol}{resolution}{\@domaincoloring@res@i#1,\@nil} +\def\@domaincoloring@res@i#1,#2\@nil{% + \ifx\relax#2\relax % only one value + \def\@domaincoloring@res{#1,#1}% + \else + \def\@domaincoloring@res{#1,#2}% + \fi} \define@key{DCol}{bgcolor}{\def\@domaincoloring@bgcolor{#1}} \define@key{DCol}{filename}{\def\@domaincoloring@filename{#1}} \define@key{DCol}{hsvrgb}{\def\@domaincoloring@hsvrgb{#1}} \define@key{DCol}{funcName}{\def\@domaincoloring@funcName{#1}} \define@key{DCol}{invers}{\def\@domaincoloring@invers{#1}} \define@key{DCol}{grfOptions}{\def\@domaincoloring@grf{#1}} +\define@boolkey{DCol}[DCol@]{force}[true]{} +\define@boolkey{DCol}[DCol@]{grid}[true]{} \def\setDColkeys#1{\edef\x{\noexpand\setkeys{DCol}{#1}}\x} \setDColkeys{ funcName={}, % corresponding to external file - hsvrgb={phi+3.14,1,r}, % given (r,phi) of the complex value + hsvrgb={phi+pi,1,r}, % given (r,phi) of the complex value filename=\jobname-tmp, % the external image filename resolution=500, % pixel per (x|y) interval domain={-2,2,-2,2}, % x|y domain - bgcolor=0, % R+G+B value, changes only 0,0,0 -> 255,255,255 + bgcolor=-1, % R+G+B value, changes only 0,0,0 -> 255,255,255 invers=false, % 0 or 1 vor inverted colors grfOptions={scale=0.5}, % LaTeX options for the included image + force=true, % only valid for the documentation + grid=false, % draw a grid into the image }% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -55,14 +65,22 @@ \def\DomainColoring@i[#1]#2{% \begingroup \setDColkeys{#1}% - \directlua{ - require("domaincoloring-complex-numbers") - require ("domaincoloring") - createData("#2",{\@domaincoloring@domain},{\@domaincoloring@res}, - "\@domaincoloring@funcName","\@domaincoloring@hsvrgb", - \@domaincoloring@bgcolor,"\@domaincoloring@invers")}% - \typeout{Convert domain.eps file to \@domaincoloring@filename.pdf}% - \ShellEscape{epstopdf domain.eps \@domaincoloring@filename.pdf}% + \ifDCol@force\else + \IfFileExists{\@domaincoloring@filename.pdf}{}{\DCol@forcetrue}% + \fi + \ifDCol@force + \directlua{% + require("domaincoloring-complex-numbers") + require ("domaincoloring") + createData("\jobname", + "#2","\@domaincoloring@funcName", % user defined, function no from -functions.lua + {\@domaincoloring@domain},{\@domaincoloring@res}, + "\@domaincoloring@hsvrgb", + \@domaincoloring@bgcolor,"\@domaincoloring@invers", + \ifDCol@grid "true" \else "false" \fi)}% + \typeout{Convert \jobname-domain.eps file to \@domaincoloring@filename.pdf}% + \ShellEscape{epstopdf \jobname-domain.eps \@domaincoloring@filename.pdf}% + \fi % \expandafter\includegraphics\expandafter[\@domaincoloring@grf]{\@domaincoloring@filename.pdf}% \endgroup diff --git a/macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua b/macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua index 84cfd65d7c..bd71f282ce 100644 --- a/macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua +++ b/macros/luatex/latex/domaincoloring/lua/domaincoloring-functions.lua @@ -1,4 +1,4 @@ --- $Id: domaincoloring-functions.lua 946 2024-08-21 19:32:10Z herbert $ +-- $Id: domaincoloring-functions.lua 965 2024-08-26 17:50:33Z herbert $ kpse.set_program_name("luatex") @@ -72,3 +72,13 @@ function f13(z) -- mandelbrot return z end +function f14(z) + local iterateNo = 5 +-- local c = z +-- z = complex(0,0) + for n=1,iterateNo do + z = cmath.sin(z)*cmath.sin(0.8*z) -- + c + end + return z +end + diff --git a/macros/luatex/latex/domaincoloring/lua/domaincoloring.lua b/macros/luatex/latex/domaincoloring/lua/domaincoloring.lua index 2b2ae177ea..872acc762f 100644 --- a/macros/luatex/latex/domaincoloring/lua/domaincoloring.lua +++ b/macros/luatex/latex/domaincoloring/lua/domaincoloring.lua @@ -1,4 +1,4 @@ --- $Id: domaincoloring.lua 952 2024-08-22 15:40:35Z herbert $ +-- $Id: domaincoloring.lua 965 2024-08-26 17:50:33Z herbert $ ----------------------------------------------------------------------- -- FILE: domaincoloring.lua @@ -9,7 +9,7 @@ -- ----------------------------------------------------------------------- -local version = 0.02 +local version = 0.03 kpse.set_program_name("luatex") @@ -65,7 +65,7 @@ A row of an image is horizontal. A column is vertical. The pixels in the image are square and contiguous. ]] -function write_eps_data(name,data,res) +function write_eps_data(name,data,domain,res,grid) print("Lua: writing data file "..name.." ...") -- print(data) outFile = io.open(name,"w+") -- Dateiname @@ -159,17 +159,72 @@ DisplayImage end end outFile:write("\n") -- neue Zeile - outFile:write([[end % of userdict + if grid == "true" then + outFile:write("gsave \n /xMin "..domain[1].." def\n") + outFile:write("/xMax "..domain[2].." def\n") + outFile:write("/yMin "..domain[3].." def\n") + outFile:write("/yMax "..domain[4].." def\n") + outFile:write(res[1].." xMax xMin sub div dup /xScale exch def \n") + outFile:write(res[2].." yMax yMin sub div dup /yScale exch def \n") + outFile:write("scale\n") + outFile:write([[ +xMin neg yMin neg translate % the new origin\n" +gsave +xMin floor 0.5 yScale div sub + 0.5 xMax 0.5 add round { % loop variable on stack\n" + dup yMin moveto yMax lineto +} for +2 ]]) + outFile:write(res[2]) + outFile:write([[ div setlinewidth 0.4 setgray [5 5 ] { ]]) + outFile:write(res[2]..[[ div } forall 2 array astore 0 setdash +stroke +grestore +gsave +yMin floor 0.5 yScale div add % startValue + % with shift 0.5 to be in the middle of the pixel + 0.5 % step + yMax 0.5 add round { % loop variable on stack + dup xMin exch moveto xMax exch lineto +} for +2 ]]) + outFile:write(res[1]) + outFile:write([[ div setlinewidth 0.4 setgray [5 5 ] { ]]) + outFile:write(res[1]..[[ div } forall 2 array astore 0 setdash +stroke +grestore +gsave +xMin floor 0.5 yScale div sub + 1 xMax 0.5 add round { % loop variable on stack\n" + dup yMin moveto yMax lineto +} for +2 ]]) + outFile:write(res[2]) + outFile:write([[ div setlinewidth 0.3 setgray stroke +grestore +gsave +yMin floor 0.5 yScale div add + 1 yMax 0.5 add round { % loop variable on stack + dup xMin exch moveto xMax exch lineto +} for +2 ]]) + outFile:write(res[1]) + outFile:write([[ div setlinewidth 0.3 setgray stroke +grestore +]]) + end + outFile:write([[ +end % of userdict %%PageTrailer %%Trailer %%EOF -]]) + ]]) outFile:close() -- Datei schließen --os.execute("pnmtopng apfel.ppm >"..fileName..".png") -- ppm -> png Format end -function write_data(name,data,res) -- only valid for writing ppm files - print("\nLua: writing data file "..name.." ...") +function write_data(name,data,domain,res) -- only valid for writing ppm files + print("Lua: writing data to file "..name.." ...") -- print(data) outFile = io.open(name,"w+") -- Dateiname outFile:write("P3 ") -- Grafictype R G B @@ -192,6 +247,7 @@ function write_data(name,data,res) -- only valid for writing ppm files end function plot(fString, domain, res, funcName, hsvrgb, bgColor, invers) + print("\nLua: calculating data with "..tostring(fString).." ... ") local left = domain[1] local right = domain[2] local bottom = domain[3] @@ -222,7 +278,7 @@ function plot(fString, domain, res, funcName, hsvrgb, bgColor, invers) color[c] = math.abs(color[c]-255) end end - if bgColor > 0 then + if bgColor > -1 then if color[1] + color[2] + color[3] <= bgColor then color = { 255, 255, 255 } end @@ -241,13 +297,13 @@ end Resolution: (points per Interval) xRes,yRes funcName: true/false (see f) ]] -function createData(f,Domain,Resolution,funcName,hsvrgb,bgColor,invers) - if funcName == "" then - img = plot(f,Domain,Resolution,false,hsvrgb,bgColor,invers) - else - img = plot(load("return "..funcName)(),Domain,Resolution,true,hsvrgb,bgColor,invers) - end +function createData(jobname,f,funcName,Domain,Resolution,hsvrgb,bgColor,invers,grid) + if funcName == "" then + img = plot(f,Domain,Resolution,false,hsvrgb,bgColor,invers) + else + img = plot(load("return "..funcName)(),Domain,Resolution,true,hsvrgb,bgColor,invers) + end -- write_data("domain.ppm",img,Resolution) - write_eps_data("domain.eps",img,Resolution) + write_eps_data(jobname.."-domain.eps",img,Domain,Resolution,grid) end diff --git a/support/luafindfont/CHANGELOG b/support/luafindfont/CHANGELOG index 783f804f29..a629f6617a 100644 --- a/support/luafindfont/CHANGELOG +++ b/support/luafindfont/CHANGELOG @@ -1,3 +1,4 @@ +0.14 2024-08-25 - small changes to the output 0.13 2023-06-23 - add exrun:close() for every kpsewhich test 0.12 2023-06-21 - bugfix for undefined exrun (l. 251) - check for empty font list and given font number diff --git a/support/luafindfont/doc/luafindfont-doc.pdf b/support/luafindfont/doc/luafindfont-doc.pdf Binary files differindex 65be6ced10..f51c3478b8 100644 --- a/support/luafindfont/doc/luafindfont-doc.pdf +++ b/support/luafindfont/doc/luafindfont-doc.pdf diff --git a/support/luafindfont/doc/luafindfont-doc.tex b/support/luafindfont/doc/luafindfont-doc.tex index c10483ce5a..818cd16fbb 100644 --- a/support/luafindfont/doc/luafindfont-doc.tex +++ b/support/luafindfont/doc/luafindfont-doc.tex @@ -1,4 +1,4 @@ - %% $Id: luafindfont-doc.tex 648 2022-11-03 19:58:48Z herbert $ + %% $Id: luafindfont-doc.tex 962 2024-08-25 16:50:54Z herbert $ % \listfiles\setcounter{errorcontextlines}{100} \documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-, @@ -81,7 +81,7 @@ \def\setVersion#1{\setVVersion#1!!} \def\setVVersion#1=#2!!{\def\luafindfontVersion{#2}} -\setVersion{version = 0.11}% can be automatically changed by perl +\setVersion{version = 0.14}% can be automatically changed by perl \setkeys{hv}{cleanup={},force} diff --git a/support/luafindfont/scripts/luafindfont.lua b/support/luafindfont/scripts/luafindfont.lua index a1d554b5ae..f77f913a7d 100755 --- a/support/luafindfont/scripts/luafindfont.lua +++ b/support/luafindfont/scripts/luafindfont.lua @@ -1,6 +1,6 @@ #!/usr/bin/env texlua -- --- $Id: luafindfont.lua 735 2023-06-22 19:12:29Z herbert $ +-- $Id: luafindfont.lua 961 2024-08-25 16:47:59Z herbert $ ----------------------------------------------------------------------- -- FILE: luafindfont.lua -- DESCRIPTION: search for fonts in the database @@ -8,7 +8,7 @@ -- AUTHOR: Herbert Voß (C) 2023-06-21 ----------------------------------------------------------------------- luafindfont = luafindfont or { } - local version = 0.13 + local version = 0.14 luafindfont.version = version --[[ @@ -31,6 +31,7 @@ Report bugs to hvoss@tug.org ]] +-- equivilant with ConTeXt, e.g. times -- mtxrun --script font --list --name --all --pattern=times kpse.set_program_name("luatex") @@ -38,8 +39,6 @@ local f = kpse.find_file("lualibs.lua") require("lualibs") -- all part of LuaTeX ---require("luafindfont-utflib") - if #arg == 0 then print("I need at least one argument or option! Will exit ...") os.exit() @@ -282,6 +281,13 @@ function compareEntries(f1, f2) end end +function centerText(text, width) + if text == nil then return "" end + local spaces = math.floor((width-string.len(text))/2) + local len = string.len(text) + return ((" "):rep(spaces)..text..(" "):rep(spaces)) +end + local fontData = {} local fontListFile = getFileLocation() if fontListFile == "" then @@ -375,20 +381,38 @@ if l_max[3] > maxStrLength then l_max[3] = maxStrLength end local minChars = 26 local Fontname = "Filename" local Path = "Path" -local SymbolicName = "Symbolic name" +local SymbolicName = "Symbolic" local lfdNr = "No." if (font_str ~= "*") and not noSymbolicNames then if args_xetex > 0 then - print(string.format("%5s %"..l_max[1].."s %"..l_max[2].."s %"..l_max[3].."s".."%4s",lfdNr,Fontname,SymbolicName,Path,"X")) +-- print(string.format("%5s %"..l_max[1].."s %"..l_max[2].."s %"..l_max[3].."s".."%4s",lfdNr,Fontname,SymbolicName,Path,"X")) + io.write(string.format("%5s",lfdNr)) + io.write(centerText(Fontname,l_max[1])) + io.write(centerText(SymbolicName,l_max[2])) + io.write(centerText(Path,l_max[3])) + print("X") else - print(string.format("%5s %"..l_max[1].."s %"..l_max[2].."s %"..l_max[3].."s",lfdNr,Fontname,SymbolicName,Path)) +-- print(string.format("%5s %"..l_max[1].."s %"..l_max[2].."s %"..l_max[3].."s",lfdNr,Fontname,SymbolicName,Path)) + io.write(string.format("%5s",lfdNr)) + io.write(centerText(Fontname,l_max[1])) + io.write(centerText(SymbolicName,l_max[2])) + print(centerText(Path,l_max[3])) end else if args_xetex > 0 then - print(string.format("%5s %"..l_max[1].."s %"..l_max[3].."s".."%4s",lfdNr,Fontname,Path,"X")) +-- print(string.format("%5s %"..l_max[1].."s %"..l_max[3].."s".."%4s",lfdNr,Fontname,Path,"X")) + io.write(string.format("%5s",lfdNr)) + io.write(centerText(Fontname,l_max[1])) + io.write(centerText(SymbolicName,l_max[2])) + io.write(centerText(Path,l_max[3])) + print("X") else - print(string.format("%5s %"..l_max[1].."s %"..l_max[3].."s",lfdNr,Fontname,Path)) +-- print(string.format("%5s %"..l_max[1].."s %"..l_max[3].."s",lfdNr,Fontname,Path)) + io.write(string.format("%5s",lfdNr)) + io.write(centerText(Fontname,l_max[1])) + io.write(centerText(SymbolicName,l_max[2])) + print(centerText(Path,l_max[3])) end end diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 582e09e550..6e4dd34abc 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -51,7 +51,6 @@ $mirrors = { 'http://ftp.ktug.org/tex-archive/' => 1, 'https://ftp.kaist.ac.kr/tex-archive/' => 1, 'https://kr.mirrors.cicku.me/ctan/' => 1, - 'https://lab.uklee.pe.kr/tex-archive/' => 1, 'https://mirror.kakao.com/CTAN/' => 1, 'https://mirror.navercorp.com/CTAN/' => 1, }, @@ -144,6 +143,7 @@ $mirrors = { 'Poland' => { 'https://ctan.gust.org.pl/tex-archive/' => 1, 'https://polish-mirror.evolution-host.com/ctan/' => 1, + 'https://sunsite.icm.edu.pl/pub/CTAN/' => 1, }, 'Portugal' => { 'https://ftp.eq.uc.pt/software/TeX/' => 1, @@ -153,7 +153,6 @@ $mirrors = { 'https://mirrors.nxthost.com/ctan/' => 1, }, 'Russia' => { - 'https://ctan.altspu.ru/' => 1, 'https://mirror.macomnet.net/pub/CTAN/' => 1, 'https://mirror.truenetwork.ru/CTAN/' => 1, }, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 088157cf09..54e7747621 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2024 -depend revision/72107 +depend revision/72115 name 00texlive.image category TLCore -revision 72106 +revision 72110 shortdesc TeX Live files only in the source repository longdesc The files here are not copied by the installer and containers longdesc are not built for them; they exist only in the source @@ -4935,7 +4935,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 72107 +revision 72115 shortdesc TeX Live standalone installer package longdesc This package defines the files to go into the installer longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the @@ -9222,16 +9222,16 @@ catalogue-version 3.13g name acmart category Package -revision 71406 +revision 72113 shortdesc Class for typesetting publications of ACM relocated 1 longdesc This package provides a class for typesetting publications of longdesc the Association for Computing Machinery (ACM). -containersize 43140 -containerchecksum eb5aaa275860424db7a34744164e694f216baf5d948550bd74c37775db74e75d90b1d98aec6df274fa95ac85146455058bcbb0a82b6c3481a1242e2f7c45d4ef -doccontainersize 4596520 -doccontainerchecksum 63b4de2cb7d393f8c01db8ef6436994ef09abd737c663f3df49ca9630b5d8a5721185b8d029775a91db57ed0396e68f3d14e2325f279ebc839b36bc6aa68a5b8 -docfiles size=3281 +containersize 43404 +containerchecksum 5e9daf0cf8ab3682f72ad86be920ed786a8dba9a26ead414a1f2f3be0fcf22edac81e04b6e57e866ae7194e4d762029d81b02b72eabd41388860b1d06236a322 +doccontainersize 4835128 +doccontainerchecksum dcef7ac44f6a4a8a23c1f5b02675894ca5a99a63010f4e7b5047d8ba6b2dd97c72cf9cecb1cf7b1be994bf1213a9ae432b6b29c77e12b29271fdecf8830e63ca +docfiles size=3406 RELOC/doc/latex/acmart/README details="Readme" RELOC/doc/latex/acmart/acm-jdslogo.png RELOC/doc/latex/acmart/acmart.bib @@ -9251,6 +9251,8 @@ docfiles size=3281 RELOC/doc/latex/acmart/samples/sample-acmsmall-conf.tex RELOC/doc/latex/acmart/samples/sample-acmsmall-submission.pdf RELOC/doc/latex/acmart/samples/sample-acmsmall-submission.tex + RELOC/doc/latex/acmart/samples/sample-acmsmall-tagged.pdf + RELOC/doc/latex/acmart/samples/sample-acmsmall-tagged.tex RELOC/doc/latex/acmart/samples/sample-acmsmall.pdf RELOC/doc/latex/acmart/samples/sample-acmsmall.tex RELOC/doc/latex/acmart/samples/sample-acmtog-conf.pdf @@ -9277,14 +9279,15 @@ docfiles size=3281 RELOC/doc/latex/acmart/samples/samples.ins RELOC/doc/latex/acmart/samples/sampleteaser.pdf RELOC/doc/latex/acmart/samples/software.bib -srccontainersize 62868 -srccontainerchecksum e4417e81b1b993198d9a3c7f3017de0e8c089d0e381bd200c40cbfbacfa888281bd552216ec553c73007197772751031ac051f4970fa2fe42c6e457cd79a07eb +srccontainersize 63324 +srccontainerchecksum 755477b663beb126038c04530e684c9a5550f938bde07c4f572d04789a1fc813712c660bb5f77408dacaca08b663788c7aeb52c5239efe06d05f9d16431b253e srcfiles size=75 RELOC/source/latex/acmart/Makefile RELOC/source/latex/acmart/acmart.dtx RELOC/source/latex/acmart/acmart.ins -runfiles size=68 +runfiles size=97 RELOC/bibtex/bst/acmart/ACM-Reference-Format.bst + RELOC/tex/latex/acmart/acmart-tagged.cls RELOC/tex/latex/acmart/acmart.cls RELOC/tex/latex/acmart/acmauthoryear.bbx RELOC/tex/latex/acmart/acmauthoryear.cbx @@ -9297,7 +9300,7 @@ catalogue-contact-repository https://github.com/borisveytsman/acmart/ catalogue-ctan /macros/latex/contrib/acmart catalogue-license lppl1.3 catalogue-topics class comp-sci comp-theory engineering journalpub -catalogue-version 2.08 +catalogue-version 2.09 name acmconf category Package @@ -91785,16 +91788,16 @@ catalogue-version 1.1 name customenvs category Package -revision 72073 +revision 72112 shortdesc Custom environments (MCQ, list with picked items, ...) relocated 1 longdesc The package provides some custom environments (Multiple Choice, longdesc list with chosen items, ...) based on existing environments. -containersize 14872 -containerchecksum a5eb7a73a8264b9729c6d52d26694ffe1af9cf991a8ff3af1035ef62eb45884a9f27d519fbb008477b63409ff55437d071d57a8d8e3889129f67f8301a6a8e8b -doccontainersize 1728756 -doccontainerchecksum 60e9d4cf6e6dc48ce6b0f5783ee3278dc874384cc285ec89a92723045387d5ee6ab02a1fa9e62bfbc3f91a25dd788c63f22bf5697fa939dc2876a2913446646a -docfiles size=483 +containersize 15996 +containerchecksum 8afdd76e89c65898a77f5414613c1b7589cde87668acf6f110a9bdb02ac654df8e8474cef1755a530eba5f900ff6cc8dbcabb590b9466ebaa338a34950875ce5 +doccontainersize 1717412 +doccontainerchecksum bee8f6365b13a7f7eff10acd3385d28c81076b14b27229e4cbc66a2d15dec4d3e7d964d1e2d70123050092f79588eb0ab27a9be7cb6ee24b9051bc799b686b6c +docfiles size=472 RELOC/doc/latex/customenvs/README.md details="Readme" RELOC/doc/latex/customenvs/customenvs-doc-en.pdf details="Package documentation (English)" RELOC/doc/latex/customenvs/customenvs-doc-en.tex @@ -91802,14 +91805,14 @@ docfiles size=483 RELOC/doc/latex/customenvs/customenvs-doc-fr.tex RELOC/doc/latex/customenvs/envtexo_exemples.pdf RELOC/doc/latex/customenvs/envtexo_exemples.tex -runfiles size=24 +runfiles size=26 RELOC/tex/latex/customenvs/customenvs.sty catalogue-contact-bugs https://github.com/cpierquet/customenvs/issues catalogue-contact-repository https://github.com/cpierquet/customenvs catalogue-ctan /macros/latex/contrib/customenvs catalogue-license lppl1.3c cc-by-sa-4 catalogue-topics list table -catalogue-version 0.1.9 +catalogue-version 0.2.0 name cutwin category Package @@ -98964,7 +98967,7 @@ catalogue-version 1.01 name domaincoloring category Package -revision 72095 +revision 72110 shortdesc Draw colored represenations of complex functions relocated 1 longdesc Domain coloring is a technique to visualize complex functions @@ -98974,22 +98977,23 @@ longdesc function to visualize its behaviour. The value of the complex longdesc function(z) can be described by radius and angle which can be longdesc two values of the hsv-color model, which then defines the color longdesc of each point in the complex plane z=x+iy. -containersize 596 -containerchecksum 22450b8508c45f7fb698c9337fd31846c65761673325590299082015d502ec2fed9ad42e20300f495dde3cbfe9b4010098c7866375236d97af4c7972b9552cd4 -doccontainersize 6885376 -doccontainerchecksum 12282e502fcf8528be194ede4c378ffdfb6fb5eaeb830f1358a6626b905bbc6fcd8af75bed0258af18c9e5f6ca32bf979fe1f8d4399e442ee594516c527e64c1 -docfiles size=1897 +containersize 7192 +containerchecksum 31933c52b4912d450ee09de61f086ec62d8efcc1491c26a4f5bc7d7e78dd09e846bef83acf7e93d0900458a679a870ae1b63ce8c0d80ba2d724f7d559147427d +doccontainersize 6878588 +doccontainerchecksum 10b1c93589a167e5069d53c741412cfee4dc4ca39954bdd5ff691a27567f77dbdaec6518625f270ab6030683f168cf834b9494eebedb21c75353a08d5e676869 +docfiles size=1891 RELOC/doc/lualatex/domaincoloring/Changes RELOC/doc/lualatex/domaincoloring/README.md details="Readme" - RELOC/doc/lualatex/domaincoloring/doc/domaincoloring-doc.bib - RELOC/doc/lualatex/domaincoloring/doc/domaincoloring-doc.pdf details="Example of use" language="de" - RELOC/doc/lualatex/domaincoloring/doc/domaincoloring-doc.tex - RELOC/doc/lualatex/domaincoloring/doc/hsv.png - RELOC/doc/lualatex/domaincoloring/doc/titleImg.pdf - RELOC/doc/lualatex/domaincoloring/latex/domaincoloring.sty - RELOC/doc/lualatex/domaincoloring/lua/domaincoloring-complex-numbers.lua - RELOC/doc/lualatex/domaincoloring/lua/domaincoloring-functions.lua - RELOC/doc/lualatex/domaincoloring/lua/domaincoloring.lua + RELOC/doc/lualatex/domaincoloring/domaincoloring-doc.bib + RELOC/doc/lualatex/domaincoloring/domaincoloring-doc.pdf details="Example of use" language="de" + RELOC/doc/lualatex/domaincoloring/domaincoloring-doc.tex + RELOC/doc/lualatex/domaincoloring/hsv.png + RELOC/doc/lualatex/domaincoloring/titleImg.pdf +runfiles size=6 + RELOC/tex/lualatex/domaincoloring/domaincoloring-complex-numbers.lua + RELOC/tex/lualatex/domaincoloring/domaincoloring-functions.lua + RELOC/tex/lualatex/domaincoloring/domaincoloring.lua + RELOC/tex/lualatex/domaincoloring/domaincoloring.sty catalogue-ctan /macros/luatex/latex/domaincoloring catalogue-license lppl1.3 catalogue-topics maths graphics colour luatex graphics-epspdf graphics-incl graphics-plot graphics-plotfn @@ -205123,14 +205127,14 @@ catalogue-version 1.4 name luafindfont category Package -revision 67468 +revision 72111 shortdesc Search fonts in the LuaTeX font database longdesc This Lua script searches for fonts in the font database. depend luafindfont.ARCH -containersize 5724 -containerchecksum 0d02fd925b33616d3f23df0609ea6fc1595b830cff8a712f6f93414cf80b51b2b1dde2b29e71084aad89377084b606ee7eeebcc2b5e8342b74fab23d8c97aa82 -doccontainersize 122708 -doccontainerchecksum fd16f72bba665cffaad3102d6573117300c7df4ea7b4a3104be3de7c26c9f127fccdb54e373cf47220df2652fd405c6dd3f956d2278ec9339e70ea390333af75 +containersize 5872 +containerchecksum f3455d48010e701df7777c57ba9b765ee03d7be8ae934a075ed8b14e9ae9c439698cf5d6f77fa54e790157d20e945c03b9acb49ded46abed6bbda639a68c9585 +doccontainersize 122892 +doccontainerchecksum 0fd1953372b4e2247a93c0b5023890e9361838ac87ff4378bbacc4f4def74e4918c1d48e79310f110e8249ea33c019a421b9b6077660d1f71f97a4cc584dbf4d docfiles size=38 texmf-dist/doc/man/man1/luafindfont.1 texmf-dist/doc/man/man1/luafindfont.man1.pdf @@ -205144,7 +205148,7 @@ catalogue-alias findfont catalogue-ctan /support/luafindfont catalogue-license lppl1.3c catalogue-topics font-sel -catalogue-version 0.13 +catalogue-version 0.14 name luafindfont.aarch64-linux category Package @@ -278557,23 +278561,23 @@ catalogue-version 1.0 name pxjahyper category Package -revision 72031 +revision 72114 shortdesc Hyperref support for pLaTeX relocated 1 longdesc This package adjusts the behavior of hyperref on (u)pLaTeX so longdesc that authors can properly create PDF documents that contain longdesc document information in Japanese. -containersize 20436 -containerchecksum f91afbb3abb8c1b3729fc35b331e0fb99901f7814f2b323408b06fc9d1b46497f9d1484a27daf42aabcc46e113c861523d13dae08d0f8c9e478301a60b76f169 -doccontainersize 175328 -doccontainerchecksum 92f6ed1f97af6f0da7385eff60ddfae6c9f5c1caa93d428ab778e52b2e2147d17d0861ebd7637660d63fb718418e82ab322fa9fb4e2b80025c450d5801b11b5e +containersize 21248 +containerchecksum 56d40a085e2960cb0f0a4f4bdc2b8fbec7460e02abb0960ad4e0f565e9605abb6ed77c54b207ea3ccfb27c252d0d426d1274b10b230433faa37bff319e0bcad3 +doccontainersize 175884 +doccontainerchecksum 8b1c79c97a047433866833bdd8eac54edca46e4eac16db73f7808353d9855feb5acba4c3e39bfb6294e25c282ebc5109ff456398e1ebdbb326b5d9627bdfab0f docfiles size=51 RELOC/doc/platex/pxjahyper/LICENSE RELOC/doc/platex/pxjahyper/README-ja.md details="Readme (Japanese)" language="ja" RELOC/doc/platex/pxjahyper/README.md details="Readme" RELOC/doc/platex/pxjahyper/pxjahyper.pdf details="Package documentation (Japanese)" language="ja" RELOC/doc/platex/pxjahyper/pxjahyper.tex -runfiles size=24 +runfiles size=25 RELOC/tex/platex/pxjahyper/pxjahyper-ajm.def RELOC/tex/platex/pxjahyper/pxjahyper-enc.sty RELOC/tex/platex/pxjahyper/pxjahyper-uni.def @@ -278582,7 +278586,7 @@ catalogue-contact-repository https://github.com/zr-tex8r/PXjahyper catalogue-ctan /macros/jptex/latex/pxjahyper catalogue-license mit catalogue-topics japanese hyper -catalogue-version 1.4 +catalogue-version 1.5 name pxjodel category Package @@ -329008,7 +329012,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 72107 +revision 72115 shortdesc TeX Live infrastructure programs longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for longdesc tlmgr to run but still ours. Not included in tlcritical. @@ -329016,10 +329020,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 114472 -containerchecksum e245c144a682c59feeed6be5a908e05b320f0d2c485abd771d508b7a749d95636766a71ef6e60938c52025f40e9b18518c7d7ae9ede06914ecf4e67e3ad0453b +containersize 114460 +containerchecksum e47f60459c9430fc8e2bc1c30b6c72a48098027a43927ced2beb3dc59be1df5593f67aaaf5251c42b4e49099b453711da7dc3e60404fc8df3f94f12b8106b123 doccontainersize 436488 -doccontainerchecksum 34aaa7810aa177a918b9a4898c0ba59966af71caac1139c7258da9fc4686ef2a914266139e73e25ce3feb964e6e5a6d3226717877958ce016d50765090a7875d +doccontainerchecksum 4c6ff783838aed650ece0fb8fd9f9bcde5b277aae23179bf0a38ccdc44725f325d314540d4ddf619c285bc3be7b06ba2b9a2a13af32499b679a37390f5eae1ce docfiles size=565 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index dc94c126a6..1cb8f37378 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -6aaa1b07a7669de1ab1e4aa4c6931bd2 texlive.tlpdb +45cb55ad8755341fec81f8b1d0224eaf texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index c78d5c461b..4bf667ccae 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -0365cfb88668da3f6deb9848e87414938c00de62cfa13e727d57469f97501810bf5b0722a001573730578a1da30ab464c0c5665022090ab3d91e1590b32e9a2a texlive.tlpdb +a8128c829ddcc2551843bc0ac68be4eb311ad7be7e802b2920eddd0091964642c54759d99413e2681757d78d606ef2fb61515c5c1f2f246d4de4e78b713a58c9 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 79eb7700b5..8bb589ef11 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmbLwowACgkQTOGHfhlD -jHATUQgAhJaCSXZh8UasWXwDJqtQLFj8XGPE+c706Hed6JnqoGiIWpnYDYYuqr3b -KEe4Cpq4otYr+soPMcDkUA/UQBaXkGBjUAlGwV5ZVVTfeEQETKFknc1Xh3ZSXgCH -s47EfdFKYbNCWJmnG/QvKzpjNP/ReMO74bezK+l6/0oemVO7UXVryiP74/0GoY38 -rbhSjWTV53lEr2l3knsyHVz3FVwfyMTteJrxrjVlkybFPDocFVtDAc1MzYx8BH5u -FgJ3zpXFvYDTrC12ueNcgeSnVwuwAAXZOUfHrh9xw6v31JAI1gUUUOuXUB1FrexG -Rce15dn+e7ba9hcbr5Dwth84O8qROw== -=aRSd +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmbNFCUACgkQTOGHfhlD +jHBmtwgAgy+ak1c0SCNZ1qYFb2Te5liO2I5NFu09FE0TkaEJrxobb8jY2E3xNuxu +RPgVv/5MNa/MZEFPHrgwxZYsXOmCZF9gQMFNAQ/NJeBrhR7z3LVQp57mLGnobatd +ly485G+3teF3ep9T+LPh6xmXxglTxzdyqvupfvV3nopQOUbLADo5EStXyCvBpfrF +Q5r7OOXiou08qCMmv4dMj9EiJ8iD6omYV0meafL8FAnpoH7AsR5zRRIh0pcJF5mz +DTwHYGOfCLM7UEC3xvsRIcGxJgE9WKSjhTkHyFTuB6JBzWL0bKUzO3sLxsCWvSfs +A2kcDSqpb7h2A/4rixLf2ig88KYaRw== +=1Gdw -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 0bb6ebaeab..6cc8216331 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2024-08-26-02-02 +2024-08-27-02-02 |