From 01b69c78ff33854f7f28149e8167cb4219fcb416 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 14 Feb 2022 03:01:43 +0000 Subject: CTAN sync 202202140301 --- FILES.byname | 685 ++++++------ FILES.byname.gz | Bin 2422789 -> 2422856 bytes FILES.last07days | 652 ++++++------ indexing/xindex/CHANGELOG | 4 + indexing/xindex/README.md | 2 + indexing/xindex/doc/tests/HADW.pdf | Bin 18342 -> 18342 bytes indexing/xindex/doc/tests/Umlaute.pdf | Bin 15194 -> 15194 bytes indexing/xindex/doc/tests/Umlaute2.pdf | Bin 18884 -> 18884 bytes indexing/xindex/doc/tests/buch.pdf | Bin 39021 -> 39021 bytes indexing/xindex/doc/tests/demo-hyperref.pdf | Bin 28624 -> 28624 bytes indexing/xindex/doc/tests/demo.pdf | Bin 34606 -> 34606 bytes indexing/xindex/doc/tests/demo2.ind | 2 +- indexing/xindex/doc/tests/demo3.pdf | Bin 9216 -> 9216 bytes indexing/xindex/doc/tests/demo4.pdf | Bin 11883 -> 11883 bytes indexing/xindex/doc/xindex-doc.pdf | Bin 412615 -> 451406 bytes indexing/xindex/doc/xindex-doc.tex | 499 +++++---- indexing/xindex/latex/xindex.sty | 2 +- indexing/xindex/lualatex/xindex-AU.lua | 2 +- indexing/xindex/lualatex/xindex-DIN2.lua | 2 +- indexing/xindex/lualatex/xindex-HAdW-eKO.lua | 4 +- indexing/xindex/lualatex/xindex-base.lua | 6 +- indexing/xindex/lualatex/xindex-baselib.lua | 28 +- indexing/xindex/lualatex/xindex-cfg-common.lua | 72 +- indexing/xindex/lualatex/xindex-cfg-uca.lua | 4 +- indexing/xindex/lualatex/xindex-cfg.lua | 4 +- indexing/xindex/lualatex/xindex-danteedition.lua | 2 +- indexing/xindex/lualatex/xindex-dtk.lua | 4 +- indexing/xindex/lualatex/xindex-lib.lua | 32 +- indexing/xindex/lualatex/xindex-norsk.lua | 4 +- indexing/xindex/lualatex/xindex-pretty.lua | 4 +- indexing/xindex/lualatex/xindex-yannis.lua | 4 +- indexing/xindex/scripts/xindex.lua | 76 +- macros/generic/expkv-cs/README.md | 4 +- macros/generic/expkv-cs/expkv-cs.dtx | 186 +++- macros/generic/expkv-cs/expkv-cs.pdf | Bin 458679 -> 470406 bytes macros/latex/contrib/chemmacros/HISTORY | 448 ++++++++ macros/latex/contrib/chemmacros/README | 12 +- .../latex/contrib/chemmacros/chemmacros-manual.pdf | Bin 998610 -> 1017922 bytes .../latex/contrib/chemmacros/chemmacros-manual.tex | 327 +++--- macros/latex/contrib/chemmacros/chemmacros.sty | 1104 +++++++++++--------- macros/latex/contrib/easybook/easybook.dtx | 138 +-- macros/latex/contrib/easybook/easybook.pdf | Bin 576202 -> 578140 bytes macros/latex/contrib/easybook/easybook.tex | 53 +- macros/latex/contrib/ninecolors/README | 4 - macros/latex/contrib/ninecolors/README.txt | 4 + macros/latex/contrib/ninecolors/ninecolors.pdf | Bin 32344 -> 49039 bytes macros/latex/contrib/ninecolors/ninecolors.sty | 741 ++++++------- macros/latex/contrib/ninecolors/ninecolors.tex | 200 +++- macros/latex/required/babel/base/README.md | 20 +- macros/latex/required/babel/base/babel.dtx | 389 +++---- macros/latex/required/babel/base/babel.ins | 2 +- macros/latex/required/babel/base/babel.pdf | Bin 853492 -> 853443 bytes macros/latex/required/babel/base/bbcompat.dtx | 2 +- macros/luatex/latex/pyluatex/pyluatex.lua | 26 +- macros/luatex/latex/pyluatex/pyluatex.pdf | Bin 84163 -> 84169 bytes macros/luatex/latex/pyluatex/pyluatex.sty | 2 +- macros/luatex/latex/pyluatex/pyluatex.tex | 4 +- macros/xetex/latex/bidi-atbegshi/README | 13 +- .../latex/bidi-atbegshi/bidi-atbegshi-doc.pdf | Bin 24475 -> 108284 bytes .../latex/bidi-atbegshi/bidi-atbegshi-doc.tex | 8 +- macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty | 176 ++-- macros/xetex/latex/bidi-atbegshi/test-LTR.pdf | Bin 11292 -> 13648 bytes macros/xetex/latex/bidi-atbegshi/test-LTR.tex | 8 +- macros/xetex/latex/bidi-atbegshi/test-RTL.pdf | Bin 11299 -> 29260 bytes macros/xetex/latex/bidi-atbegshi/test-RTL.tex | 23 +- .../latex/bidi-atbegshi/test-foreground-LTR.pdf | Bin 11289 -> 13623 bytes .../latex/bidi-atbegshi/test-foreground-LTR.tex | 8 +- .../latex/bidi-atbegshi/test-foreground-RTL.pdf | Bin 11314 -> 29249 bytes .../latex/bidi-atbegshi/test-foreground-RTL.tex | 23 +- macros/xetex/latex/bidi/README | 4 +- macros/xetex/latex/bidi/bidi-doc-intro.ltx | 2 +- macros/xetex/latex/bidi/bidi-doc-title.ltx | 4 +- macros/xetex/latex/bidi/bidi-doc.ltx | 2 +- macros/xetex/latex/bidi/bidi-doc.pdf | Bin 180744 -> 180631 bytes macros/xetex/latex/bidi/bidi.dtx | 48 +- macros/xetex/latex/bidi/bidi.pdf | Bin 3120474 -> 3116802 bytes systems/mac/mactex/ExtrasFolder.pdf | Bin 38201 -> 38199 bytes systems/mac/mactex/Licenses.txt | 4 +- systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm | 6 +- .../texlive/tlnet/tlpkg/installer/ctan-mirrors.pl | 4 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb | 169 +-- systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 +- .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 14 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | Bin 2351184 -> 2348516 bytes systems/win32/miktex/tm/packages/next/pr.ini | 8 +- systems/win32/miktex/tm/packages/pr.ini | 8 +- timestamp | 2 +- 88 files changed, 3741 insertions(+), 2557 deletions(-) create mode 100644 macros/latex/contrib/chemmacros/HISTORY delete mode 100644 macros/latex/contrib/ninecolors/README create mode 100644 macros/latex/contrib/ninecolors/README.txt diff --git a/FILES.byname b/FILES.byname index 30b95fa7fb..304e168bff 100644 --- a/FILES.byname +++ b/FILES.byname @@ -5210,7 +5210,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 -2022/02/12 | 347269 | FILES.last07days +2022/02/13 | 161270 | 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 @@ -160692,67 +160692,67 @@ 2021/11/21 | 2311 | indexing/upmendex/source/var.h 2021/11/21 | 98 | indexing/upmendex/source/version.h 2021/11/21 | 473691 | indexing/upmendex.zip -2022/02/07 | 2574 | indexing/xindex/CHANGELOG +2022/02/12 | 2793 | indexing/xindex/CHANGELOG 2021/07/06 | 1231 | indexing/xindex/doc/Makefile 2021/07/06 | 32092 | indexing/xindex/doc/tests/buch.idx -2022/01/22 | 15380 | indexing/xindex/doc/tests/buch.ind -2022/01/22 | 39021 | indexing/xindex/doc/tests/buch.pdf +2022/02/13 | 15380 | indexing/xindex/doc/tests/buch.ind +2022/02/13 | 39021 | indexing/xindex/doc/tests/buch.pdf 2021/08/13 | 415 | indexing/xindex/doc/tests/buch.tex 2021/07/06 | 123 | indexing/xindex/doc/tests/demo2.idx -2022/01/22 | 1005 | indexing/xindex/doc/tests/demo2.ind -2022/01/22 | 114 | indexing/xindex/doc/tests/demo3.idx -2022/01/22 | 138 | indexing/xindex/doc/tests/demo3.ind -2022/01/22 | 9216 | indexing/xindex/doc/tests/demo3.pdf +2022/02/13 | 996 | indexing/xindex/doc/tests/demo2.ind +2022/02/13 | 114 | indexing/xindex/doc/tests/demo3.idx +2022/02/13 | 138 | indexing/xindex/doc/tests/demo3.ind +2022/02/13 | 9216 | indexing/xindex/doc/tests/demo3.pdf 2021/07/06 | 582 | indexing/xindex/doc/tests/demo3.tex 2021/08/12 | 613 | indexing/xindex/doc/tests/demo4.idx 2021/08/15 | 880 | indexing/xindex/doc/tests/demo4.ind -2022/01/22 | 11883 | indexing/xindex/doc/tests/demo4.pdf +2022/02/13 | 11883 | indexing/xindex/doc/tests/demo4.pdf 2021/08/12 | 195 | indexing/xindex/doc/tests/demo4.tex 2021/07/06 | 6411 | indexing/xindex/doc/tests/demo-hyperref.idx -2022/01/22 | 6404 | indexing/xindex/doc/tests/demo-hyperref.ind -2022/01/22 | 28624 | indexing/xindex/doc/tests/demo-hyperref.pdf +2022/02/13 | 6404 | indexing/xindex/doc/tests/demo-hyperref.ind +2022/02/13 | 28624 | indexing/xindex/doc/tests/demo-hyperref.pdf 2021/07/06 | 257 | indexing/xindex/doc/tests/demo-hyperref.tex -2022/01/22 | 5102 | indexing/xindex/doc/tests/demo.idx -2022/01/22 | 5210 | indexing/xindex/doc/tests/demo.ind -2022/01/22 | 34606 | indexing/xindex/doc/tests/demo.pdf +2022/02/13 | 5102 | indexing/xindex/doc/tests/demo.idx +2022/02/13 | 5210 | indexing/xindex/doc/tests/demo.ind +2022/02/13 | 34606 | indexing/xindex/doc/tests/demo.pdf 2021/07/06 | 4049 | indexing/xindex/doc/tests/demo.tex 2021/07/06 | 2023 | indexing/xindex/doc/tests/HADW2.idx 2021/07/06 | 1653 | indexing/xindex/doc/tests/HADW2.ind 2021/07/06 | 1200 | indexing/xindex/doc/tests/HADW.idx -2022/01/22 | 1264 | indexing/xindex/doc/tests/HADW.ind -2022/01/22 | 18342 | indexing/xindex/doc/tests/HADW.pdf +2022/02/13 | 1264 | indexing/xindex/doc/tests/HADW.ind +2022/02/13 | 18342 | indexing/xindex/doc/tests/HADW.pdf 2021/08/13 | 480 | indexing/xindex/doc/tests/HADW.tex 2021/08/15 | 783 | indexing/xindex/doc/tests/runTests.sh 2021/07/06 | 584 | indexing/xindex/doc/tests/Umlaute2.idx -2022/01/22 | 630 | indexing/xindex/doc/tests/Umlaute2.ind -2022/01/22 | 18884 | indexing/xindex/doc/tests/Umlaute2.pdf +2022/02/13 | 630 | indexing/xindex/doc/tests/Umlaute2.ind +2022/02/13 | 18884 | indexing/xindex/doc/tests/Umlaute2.pdf 2021/07/06 | 526 | indexing/xindex/doc/tests/Umlaute2.tex 2021/07/06 | 584 | indexing/xindex/doc/tests/Umlaute.idx -2022/01/22 | 630 | indexing/xindex/doc/tests/Umlaute.ind -2022/01/22 | 15194 | indexing/xindex/doc/tests/Umlaute.pdf +2022/02/13 | 630 | indexing/xindex/doc/tests/Umlaute.ind +2022/02/13 | 15194 | indexing/xindex/doc/tests/Umlaute.pdf 2021/07/06 | 485 | indexing/xindex/doc/tests/Umlaute.tex -2022/02/07 | 412615 | indexing/xindex/doc/xindex-doc.pdf -2022/02/07 | 53954 | indexing/xindex/doc/xindex-doc.tex -2019/03/06 | 2247 | indexing/xindex/latex/xindex.sty -2022/01/22 | 2734 | indexing/xindex/lualatex/xindex-AU.lua -2022/01/22 | 3897 | indexing/xindex/lualatex/xindex-baselib.lua -2022/01/22 | 10419 | indexing/xindex/lualatex/xindex-base.lua -2022/01/22 | 2999 | indexing/xindex/lualatex/xindex-cfg-common.lua -2022/01/22 | 2699 | indexing/xindex/lualatex/xindex-cfg.lua -2022/01/22 | 2385 | indexing/xindex/lualatex/xindex-cfg-uca.lua -2022/02/07 | 2716 | indexing/xindex/lualatex/xindex-danteedition.lua -2022/01/22 | 2767 | indexing/xindex/lualatex/xindex-DIN2.lua -2022/01/22 | 4835 | indexing/xindex/lualatex/xindex-dtk.lua -2022/01/22 | 11085 | indexing/xindex/lualatex/xindex-HAdW-eKO.lua -2022/01/22 | 10136 | indexing/xindex/lualatex/xindex-lapp.lua -2022/01/22 | 32657 | indexing/xindex/lualatex/xindex-lib.lua -2022/01/22 | 6099 | indexing/xindex/lualatex/xindex-norsk.lua -2022/01/22 | 8493 | indexing/xindex/lualatex/xindex-pretty.lua -2022/01/22 | 80454 | indexing/xindex/lualatex/xindex-unicode.lua -2022/01/22 | 7821 | indexing/xindex/lualatex/xindex-yannis.lua -2021/08/15 | 1283 | indexing/xindex/README.md -2022/02/07 | 8001 | indexing/xindex/scripts/xindex.lua -2022/02/07 | 583510 | indexing/xindex.zip +2022/02/12 | 451406 | indexing/xindex/doc/xindex-doc.pdf +2022/02/12 | 57642 | indexing/xindex/doc/xindex-doc.tex +2021/11/07 | 2251 | indexing/xindex/latex/xindex.sty +2022/02/12 | 2734 | indexing/xindex/lualatex/xindex-AU.lua +2022/02/12 | 4577 | indexing/xindex/lualatex/xindex-baselib.lua +2022/02/12 | 10439 | indexing/xindex/lualatex/xindex-base.lua +2022/02/12 | 3955 | indexing/xindex/lualatex/xindex-cfg-common.lua +2022/02/12 | 2699 | indexing/xindex/lualatex/xindex-cfg.lua +2022/02/12 | 2385 | indexing/xindex/lualatex/xindex-cfg-uca.lua +2022/02/12 | 2716 | indexing/xindex/lualatex/xindex-danteedition.lua +2022/02/11 | 2767 | indexing/xindex/lualatex/xindex-DIN2.lua +2022/02/12 | 4835 | indexing/xindex/lualatex/xindex-dtk.lua +2021/11/07 | 11085 | indexing/xindex/lualatex/xindex-HAdW-eKO.lua +2022/02/11 | 10136 | indexing/xindex/lualatex/xindex-lapp.lua +2022/02/12 | 32847 | indexing/xindex/lualatex/xindex-lib.lua +2022/02/12 | 6099 | indexing/xindex/lualatex/xindex-norsk.lua +2022/02/12 | 8493 | indexing/xindex/lualatex/xindex-pretty.lua +2022/02/11 | 80454 | indexing/xindex/lualatex/xindex-unicode.lua +2022/02/12 | 7821 | indexing/xindex/lualatex/xindex-yannis.lua +2022/02/13 | 1371 | indexing/xindex/README.md +2022/02/12 | 9704 | indexing/xindex/scripts/xindex.lua +2022/02/13 | 612027 | indexing/xindex.zip 2010/05/11 | 498024 | indexing/xindy/base/xindy-2.4.tar.gz 2014/04/20 | 599578 | indexing/xindy/base/xindy-2.5.0.tar.gz 2014/09/15 | 517641 | indexing/xindy/base/xindy-2.5.1.tar.gz @@ -184727,7 +184727,7 @@ 2015/11/14 | 558928 | install/macros/generic/catcodes.tds.zip 2015/11/16 | 603358 | install/macros/generic/commado.tds.zip 2015/11/14 | 1248858 | install/macros/generic/dowith.tds.zip -2021/11/21 | 479668 | install/macros/generic/expkv-cs.tds.zip +2022/02/13 | 492371 | install/macros/generic/expkv-cs.tds.zip 2022/01/29 | 438480 | install/macros/generic/expkv-def.tds.zip 2021/09/21 | 514924 | install/macros/generic/expkv.tds.zip 2022/02/04 | 232668 | install/macros/generic/iftex.tds.zip @@ -185060,7 +185060,7 @@ 2022/01/12 | 7322212 | install/macros/latex-dev/required/latex-tools-dev.tds.zip 2021/12/06 | 35260885 | install/macros/latex/latex-base.tds.zip 2020/06/01 | 1578753 | install/macros/latex/required/amscls.tds.zip -2022/01/26 | 2875027 | install/macros/latex/required/babel-base.tds.zip +2022/02/13 | 2878348 | install/macros/latex/required/babel-base.tds.zip 2021/11/12 | 2766926 | install/macros/latex/required/latex-amsmath.tds.zip 2021/09/25 | 223228 | install/macros/latex/required/latexbug.tds.zip 2018/04/06 | 1324669 | install/macros/latex/required/latex-cyrillic.tds.zip @@ -185093,7 +185093,7 @@ 2020/01/31 | 1873940 | install/macros/unicodetex/latex/unicode-math.tds.zip 2016/05/14 | 185871 | install/macros/xetex/generic/zhspacing.tds.zip 2015/09/04 | 718623 | install/macros/xetex/latex/arabxetex.tds.zip -2022/02/04 | 4309687 | install/macros/xetex/latex/bidi.tds.zip +2022/02/13 | 4305838 | install/macros/xetex/latex/bidi.tds.zip 2015/02/17 | 92757 | install/macros/xetex/latex/interchar.tds.zip 2021/08/19 | 464024 | install/macros/xetex/latex/mynsfc.tds.zip 2021/12/12 | 1924110 | install/macros/xetex/latex/xecjk.tds.zip @@ -198836,10 +198836,10 @@ 2017/05/25 | 50653 | macros/generic/expex/expex.tex 2017/05/25 | 1673 | macros/generic/expex/README 2017/05/26 | 498764 | macros/generic/expex.zip -2021/11/21 | 117711 | macros/generic/expkv-cs/expkv-cs.dtx -2021/11/21 | 458679 | macros/generic/expkv-cs/expkv-cs.pdf -2021/11/21 | 1297 | macros/generic/expkv-cs/README.md -2021/11/21 | 472422 | macros/generic/expkv-cs.zip +2022/02/13 | 123427 | macros/generic/expkv-cs/expkv-cs.dtx +2022/02/13 | 470406 | macros/generic/expkv-cs/expkv-cs.pdf +2022/02/13 | 1296 | macros/generic/expkv-cs/README.md +2022/02/13 | 484706 | macros/generic/expkv-cs.zip 2022/01/29 | 86723 | macros/generic/expkv-def/expkv-def.dtx 2022/01/29 | 424547 | macros/generic/expkv-def/expkv-def.pdf 2022/01/29 | 1268 | macros/generic/expkv-def/README.md @@ -206780,11 +206780,12 @@ 2020/01/16 | 47530 | macros/latex/contrib/chemgreek/chemgreek.sty 2020/01/16 | 1374 | macros/latex/contrib/chemgreek/README 2020/01/16 | 721642 | macros/latex/contrib/chemgreek.zip -2022/01/18 | 998610 | macros/latex/contrib/chemmacros/chemmacros-manual.pdf -2022/01/18 | 155016 | macros/latex/contrib/chemmacros/chemmacros-manual.tex -2022/01/18 | 223041 | macros/latex/contrib/chemmacros/chemmacros.sty -2022/01/18 | 1483 | macros/latex/contrib/chemmacros/README -2022/01/18 | 1056391 | macros/latex/contrib/chemmacros.zip +2022/02/13 | 1017922 | macros/latex/contrib/chemmacros/chemmacros-manual.pdf +2022/02/13 | 156338 | macros/latex/contrib/chemmacros/chemmacros-manual.tex +2022/02/13 | 229642 | macros/latex/contrib/chemmacros/chemmacros.sty +2022/02/13 | 28440 | macros/latex/contrib/chemmacros/HISTORY +2022/02/13 | 1523 | macros/latex/contrib/chemmacros/README +2022/02/13 | 1084433 | macros/latex/contrib/chemmacros.zip 2021/01/21 | 592375 | macros/latex/contrib/chemnum/chemnum_en.pdf 2021/01/21 | 53463 | macros/latex/contrib/chemnum/chemnum_en.tex 2021/01/21 | 74927 | macros/latex/contrib/chemnum/chemnum.sty @@ -209446,12 +209447,12 @@ 2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt 2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README 2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip -2022/02/12 | 74902 | macros/latex/contrib/easybook/easybook.dtx +2022/02/13 | 73407 | macros/latex/contrib/easybook/easybook.dtx 2022/01/02 | 2085 | macros/latex/contrib/easybook/easybook.ins -2022/02/12 | 576202 | macros/latex/contrib/easybook/easybook.pdf -2022/02/12 | 80545 | macros/latex/contrib/easybook/easybook.tex +2022/02/13 | 578140 | macros/latex/contrib/easybook/easybook.pdf +2022/02/13 | 80671 | macros/latex/contrib/easybook/easybook.tex 2022/02/11 | 787 | macros/latex/contrib/easybook/README.md -2022/02/12 | 616703 | macros/latex/contrib/easybook.zip +2022/02/13 | 618538 | macros/latex/contrib/easybook.zip 2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf 2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf 2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf @@ -219200,11 +219201,11 @@ 2006/09/17 | 4458 | macros/latex/contrib/nih/nih.cls 2006/09/17 | 696 | macros/latex/contrib/nih/README 2006/09/29 | 38647 | macros/latex/contrib/nih.zip -2021/05/24 | 32344 | macros/latex/contrib/ninecolors/ninecolors.pdf -2021/05/24 | 16547 | macros/latex/contrib/ninecolors/ninecolors.sty -2021/05/24 | 4921 | macros/latex/contrib/ninecolors/ninecolors.tex -2021/04/11 | 195 | macros/latex/contrib/ninecolors/README -2021/05/24 | 35632 | macros/latex/contrib/ninecolors.zip +2022/02/13 | 49039 | macros/latex/contrib/ninecolors/ninecolors.pdf +2022/02/13 | 24994 | macros/latex/contrib/ninecolors/ninecolors.sty +2022/02/11 | 6883 | macros/latex/contrib/ninecolors/ninecolors.tex +2022/02/10 | 231 | macros/latex/contrib/ninecolors/README.txt +2022/02/13 | 52616 | macros/latex/contrib/ninecolors.zip 2019/03/20 | 653207 | macros/latex/contrib/njurepo/example.pdf 2019/03/20 | 73574 | macros/latex/contrib/njurepo/njurepo.dtx 2019/01/27 | 2147 | macros/latex/contrib/njurepo/njurepo.ins @@ -234871,14 +234872,14 @@ 2021/11/12 | 454662 | macros/latex/required/amsmath/testmath.pdf 2021/11/12 | 82371 | macros/latex/required/amsmath/testmath.tex 2021/11/12 | 2734832 | macros/latex/required/amsmath.zip -2022/01/26 | 721772 | macros/latex/required/babel/base/babel.dtx -2022/01/26 | 7461 | macros/latex/required/babel/base/babel.ins -2022/01/26 | 853492 | macros/latex/required/babel/base/babel.pdf -2022/01/26 | 21890 | macros/latex/required/babel/base/bbcompat.dtx -2022/01/26 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx -2022/01/26 | 794551 | macros/latex/required/babel/base/locale.zip -2022/01/26 | 2032 | macros/latex/required/babel/base/README.md -2022/01/26 | 1838951 | macros/latex/required/babel/base.zip +2022/02/13 | 721997 | macros/latex/required/babel/base/babel.dtx +2022/02/13 | 7461 | macros/latex/required/babel/base/babel.ins +2022/02/13 | 853443 | macros/latex/required/babel/base/babel.pdf +2022/02/13 | 21890 | macros/latex/required/babel/base/bbcompat.dtx +2022/02/13 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx +2022/02/13 | 796174 | macros/latex/required/babel/base/locale.zip +2022/02/13 | 2113 | macros/latex/required/babel/base/README.md +2022/02/13 | 1840419 | macros/latex/required/babel/base.zip 2018/04/06 | 5462 | macros/latex/required/cyrillic/changes.txt 2018/04/06 | 57716 | macros/latex/required/cyrillic/cyinpenc.dtx 2018/04/06 | 206017 | macros/latex/required/cyrillic/cyinpenc.pdf @@ -236114,14 +236115,14 @@ 2020/05/19 | 3051 | macros/luatex/latex/plantuml/README.md 2020/05/19 | 396 | macros/luatex/latex/plantuml/release.sh 2020/05/19 | 70541 | macros/luatex/latex/plantuml.zip -2022/02/04 | 4170 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py -2022/02/04 | 9638 | macros/luatex/latex/pyluatex/pyluatex-json.lua -2022/02/04 | 6577 | macros/luatex/latex/pyluatex/pyluatex.lua -2022/02/04 | 84163 | macros/luatex/latex/pyluatex/pyluatex.pdf -2022/02/04 | 2976 | macros/luatex/latex/pyluatex/pyluatex.sty -2022/02/04 | 14191 | macros/luatex/latex/pyluatex/pyluatex.tex -2022/02/04 | 1801 | macros/luatex/latex/pyluatex/README.md -2022/02/05 | 96724 | macros/luatex/latex/pyluatex.zip +2022/02/13 | 4170 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py +2022/02/13 | 9638 | macros/luatex/latex/pyluatex/pyluatex-json.lua +2022/02/13 | 6777 | macros/luatex/latex/pyluatex/pyluatex.lua +2022/02/13 | 84169 | macros/luatex/latex/pyluatex/pyluatex.pdf +2022/02/13 | 2976 | macros/luatex/latex/pyluatex/pyluatex.sty +2022/02/13 | 14200 | macros/luatex/latex/pyluatex/pyluatex.tex +2022/02/13 | 1801 | macros/luatex/latex/pyluatex/README.md +2022/02/13 | 96780 | macros/luatex/latex/pyluatex.zip 2013/07/31 | 697 | macros/luatex/latex/selnolig/gpp-ft.fea 2015/10/12 | 1376 | macros/luatex/latex/selnolig/README 2015/10/26 | 989 | macros/luatex/latex/selnolig/selnolig-bugreport.tex @@ -244723,33 +244724,33 @@ 2011/08/19 | 579 | macros/xetex/latex/babyloniannum/babylonian.tex 2011/08/19 | 163 | macros/xetex/latex/babyloniannum/README 2011/08/21 | 95443 | macros/xetex/latex/babyloniannum.zip -2014/09/11 | 24475 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf -2014/09/11 | 2317 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex -2014/09/11 | 3334 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty -2014/09/11 | 801 | macros/xetex/latex/bidi-atbegshi/README -2014/09/11 | 11289 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf -2014/09/11 | 660 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex -2014/09/11 | 11314 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf -2014/09/11 | 677 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex -2014/09/11 | 11292 | macros/xetex/latex/bidi-atbegshi/test-LTR.pdf -2014/09/11 | 620 | macros/xetex/latex/bidi-atbegshi/test-LTR.tex -2014/09/11 | 11299 | macros/xetex/latex/bidi-atbegshi/test-RTL.pdf -2014/09/11 | 637 | macros/xetex/latex/bidi-atbegshi/test-RTL.tex -2014/09/11 | 72238 | macros/xetex/latex/bidi-atbegshi.zip -2022/02/04 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf -2022/02/04 | 1448 | macros/xetex/latex/bidi/bidi-doc-intro.ltx -2022/02/04 | 23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx -2022/02/04 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx -2022/02/04 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx -2022/02/04 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx -2022/02/04 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx -2022/02/04 | 180744 | macros/xetex/latex/bidi/bidi-doc.pdf -2022/02/04 | 5939 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx -2022/02/04 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx -2022/02/04 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx -2022/02/04 | 2150 | macros/xetex/latex/bidi/bidi-doc-title.ltx -2022/02/04 | 896771 | macros/xetex/latex/bidi/bidi.dtx -2022/02/04 | 3120474 | macros/xetex/latex/bidi/bidi.pdf +2022/02/13 | 108284 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf +2022/02/13 | 2005 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex +2022/02/13 | 3991 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty +2022/02/13 | 722 | macros/xetex/latex/bidi-atbegshi/README +2022/02/13 | 13623 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf +2022/02/13 | 570 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex +2022/02/13 | 29249 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf +2022/02/13 | 623 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex +2022/02/13 | 13648 | macros/xetex/latex/bidi-atbegshi/test-LTR.pdf +2022/02/13 | 530 | macros/xetex/latex/bidi-atbegshi/test-LTR.tex +2022/02/13 | 29260 | macros/xetex/latex/bidi-atbegshi/test-RTL.pdf +2022/02/13 | 586 | macros/xetex/latex/bidi-atbegshi/test-RTL.tex +2022/02/13 | 192092 | macros/xetex/latex/bidi-atbegshi.zip +2022/02/13 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf +2022/02/13 | 1448 | macros/xetex/latex/bidi/bidi-doc-intro.ltx +2022/02/13 | 23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx +2022/02/13 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx +2022/02/13 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx +2022/02/13 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx +2022/02/13 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx +2022/02/13 | 180631 | macros/xetex/latex/bidi/bidi-doc.pdf +2022/02/13 | 5939 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx +2022/02/13 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx +2022/02/13 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx +2022/02/13 | 2150 | macros/xetex/latex/bidi/bidi-doc-title.ltx +2022/02/13 | 896085 | macros/xetex/latex/bidi/bidi.dtx +2022/02/13 | 3116802 | macros/xetex/latex/bidi/bidi.pdf 2014/07/16 | 22035 | macros/xetex/latex/bidicontour/bidicontour-doc.pdf 2014/07/15 | 1803 | macros/xetex/latex/bidicontour/bidicontour-doc.tex 2014/07/15 | 7167 | macros/xetex/latex/bidicontour/bidicontour-example-copies.pdf @@ -244759,7 +244760,7 @@ 2014/07/15 | 4087 | macros/xetex/latex/bidicontour/bidicontour.sty 2014/07/15 | 1071 | macros/xetex/latex/bidicontour/README 2014/07/16 | 38915 | macros/xetex/latex/bidicontour.zip -2022/02/04 | 761651 | macros/xetex/latex/bidi/gull.jpg +2022/02/13 | 761651 | macros/xetex/latex/bidi/gull.jpg 2015/07/07 | 24129 | macros/xetex/latex/bidihl/bidihl-doc.pdf 2015/07/06 | 1029 | macros/xetex/latex/bidihl/bidihl-doc.tex 2015/07/06 | 7245 | macros/xetex/latex/bidihl/bidihl.sty @@ -244772,7 +244773,7 @@ 2014/07/15 | 13019 | macros/xetex/latex/bidipagegrid/bidipagegrid.sty 2014/07/15 | 1068 | macros/xetex/latex/bidipagegrid/README 2014/07/16 | 29164 | macros/xetex/latex/bidipagegrid.zip -2022/02/04 | 1693 | macros/xetex/latex/bidi/picture.jpg +2022/02/13 | 1693 | macros/xetex/latex/bidi/picture.jpg 2014/09/25 | 25208 | macros/xetex/latex/bidipresentation/bidiprescolors.cfg 2014/09/25 | 159986 | macros/xetex/latex/bidipresentation/bidipresentation.cls 2014/09/25 | 2479 | macros/xetex/latex/bidipresentation/fig-1.pdf @@ -244780,14 +244781,14 @@ 2014/09/26 | 75608 | macros/xetex/latex/bidipresentation/sample.pdf 2014/09/25 | 12758 | macros/xetex/latex/bidipresentation/sample.tex 2014/09/26 | 107612 | macros/xetex/latex/bidipresentation.zip -2022/02/04 | 1354 | macros/xetex/latex/bidi/README +2022/02/13 | 1354 | macros/xetex/latex/bidi/README 2014/07/16 | 18289 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.pdf 2014/07/16 | 1203 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.tex 2014/07/16 | 101629 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.pdf 2014/07/16 | 1667 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.tex 2014/07/16 | 2436 | macros/xetex/latex/bidishadowtext/bidishadowtext.sty 2014/07/16 | 120948 | macros/xetex/latex/bidishadowtext.zip -2022/02/04 | 3952375 | macros/xetex/latex/bidi.zip +2022/02/13 | 3948780 | macros/xetex/latex/bidi.zip 2021/06/27 | 95265 | macros/xetex/latex/book-of-common-prayer/book-of-common-prayer.pdf 2021/06/27 | 6011 | macros/xetex/latex/book-of-common-prayer/book-of-common-prayer.sty 2021/06/27 | 15511 | macros/xetex/latex/book-of-common-prayer/book-of-common-prayer.tex @@ -277389,9 +277390,9 @@ 1994/02/22 | 94984 | systems/mac/macmakeindex2.12.sea.hqx 1993/07/19 | 61321 | systems/mac/macmakeindex.sit.hqx 2021/04/01 | 47 | systems/mac/mactex/BasicTeX.pkg.md5 -2022/01/18 | 38201 | systems/mac/mactex/ExtrasFolder.pdf +2022/02/12 | 38199 | systems/mac/mactex/ExtrasFolder.pdf 2021/04/01 | 50 | systems/mac/mactex/Ghostscript.pkg.md5 -2022/01/18 | 1711 | systems/mac/mactex/Licenses.txt +2022/02/12 | 1711 | systems/mac/mactex/Licenses.txt 2021/03/29 | 4701496188 | systems/mac/mactex/mactex-20210328.pkg 2021/03/29 | 54 | systems/mac/mactex/mactex-20210328.pkg.md5 2021/03/25 | 97330890 | systems/mac/mactex/mactex-basictex-20210325.pkg @@ -277401,8 +277402,8 @@ 2021/04/01 | 45 | systems/mac/mactex/MacTeX.pkg.md5 2021/02/26 | 77461 | systems/mac/mactex/mactex-texdist-20210226.pkg 2021/02/26 | 58 | systems/mac/mactex/mactex-texdist-20210226.pkg.md5 -2022/01/18 | 452748184 | systems/mac/mactex/MacTeXtras-20220118.zip -2022/01/18 | 58 | systems/mac/mactex/MacTeXtras-20220118.zip.md5 +2022/02/12 | 486130359 | systems/mac/mactex/MacTeXtras-20220212.zip +2022/02/12 | 58 | systems/mac/mactex/MacTeXtras-20220212.zip.md5 2021/04/01 | 179 | systems/mac/mactex/README 1995/08/15 | 308344 | systems/mac/MakeIndex-Fat-1.0-sit.hqx 1994/04/20 | 2925109 | systems/mac/metafont/bluesky/MAC_MF_0.66.sit.hqx @@ -280337,8 +280338,8 @@ 2019/02/28 | 7136 | systems/texlive/tlnet/archive/bxeepic.r30559.tar.xz 2019/02/28 | 1856 | systems/texlive/tlnet/archive/bxenclose.doc.r40213.tar.xz 2019/02/28 | 1764 | systems/texlive/tlnet/archive/bxenclose.r40213.tar.xz -2020/01/31 | 1792 | systems/texlive/tlnet/archive/bxghost.doc.r53606.tar.xz -2020/01/31 | 1648 | systems/texlive/tlnet/archive/bxghost.r53606.tar.xz +2022/02/13 | 1828 | systems/texlive/tlnet/archive/bxghost.doc.r61989.tar.xz +2022/02/13 | 1972 | systems/texlive/tlnet/archive/bxghost.r61989.tar.xz 2021/09/29 | 210340 | systems/texlive/tlnet/archive/bxjaholiday.doc.r60636.tar.xz 2021/09/29 | 5600 | systems/texlive/tlnet/archive/bxjaholiday.r60636.tar.xz 2019/02/28 | 2896 | systems/texlive/tlnet/archive/bxjalipsum.doc.r43369.tar.xz @@ -280743,8 +280744,8 @@ 2019/02/28 | 38440 | systems/texlive/tlnet/archive/circ.source.r15878.tar.xz 2022/02/05 | 1598224 | systems/texlive/tlnet/archive/circuitikz.doc.r61873.tar.xz 2022/02/05 | 156436 | systems/texlive/tlnet/archive/circuitikz.r61873.tar.xz -2021/10/04 | 2943952 | systems/texlive/tlnet/archive/circuit-macros.doc.r60690.tar.xz -2021/10/04 | 1496 | systems/texlive/tlnet/archive/circuit-macros.r60690.tar.xz +2022/02/13 | 2327636 | systems/texlive/tlnet/archive/circuit-macros.doc.r61987.tar.xz +2022/02/13 | 1496 | systems/texlive/tlnet/archive/circuit-macros.r61987.tar.xz 2022/01/22 | 356 | systems/texlive/tlnet/archive/citation-style-language.aarch64-linux.r61687.tar.xz 2022/01/22 | 360 | systems/texlive/tlnet/archive/citation-style-language.amd64-freebsd.r61687.tar.xz 2022/01/22 | 360 | systems/texlive/tlnet/archive/citation-style-language.amd64-netbsd.r61687.tar.xz @@ -282355,9 +282356,9 @@ 2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz 2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz 2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz -2022/02/12 | 597968 | systems/texlive/tlnet/archive/easybook.doc.r61980.tar.xz -2022/02/12 | 16580 | systems/texlive/tlnet/archive/easybook.r61980.tar.xz -2022/02/12 | 16496 | systems/texlive/tlnet/archive/easybook.source.r61980.tar.xz +2022/02/13 | 597408 | systems/texlive/tlnet/archive/easybook.doc.r61990.tar.xz +2022/02/13 | 16532 | systems/texlive/tlnet/archive/easybook.r61990.tar.xz +2022/02/13 | 16412 | systems/texlive/tlnet/archive/easybook.source.r61990.tar.xz 2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz 2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz 2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz @@ -284708,9 +284709,9 @@ 2019/02/28 | 136792 | systems/texlive/tlnet/archive/knittingpattern.doc.r17205.tar.xz 2019/02/28 | 1540 | systems/texlive/tlnet/archive/knittingpattern.r17205.tar.xz 2019/04/06 | 578004 | systems/texlive/tlnet/archive/knitting.r50782.tar.xz -2022/01/13 | 812476 | systems/texlive/tlnet/archive/knowledge.doc.r61583.tar.xz -2022/01/13 | 22636 | systems/texlive/tlnet/archive/knowledge.r61583.tar.xz -2022/01/13 | 42284 | systems/texlive/tlnet/archive/knowledge.source.r61583.tar.xz +2022/02/13 | 812816 | systems/texlive/tlnet/archive/knowledge.doc.r61991.tar.xz +2022/02/13 | 22776 | systems/texlive/tlnet/archive/knowledge.r61991.tar.xz +2022/02/13 | 42572 | systems/texlive/tlnet/archive/knowledge.source.r61991.tar.xz 2021/03/24 | 266192 | systems/texlive/tlnet/archive/knuth-errata.doc.r58682.tar.xz 2021/03/24 | 444 | systems/texlive/tlnet/archive/knuth-errata.r58682.tar.xz 2021/02/27 | 30508 | systems/texlive/tlnet/archive/knuth-lib.r57963.tar.xz @@ -289346,8 +289347,8 @@ 2020/10/23 | 14884 | systems/texlive/tlnet/archive/snapshot.source.r56735.tar.xz 2021/11/26 | 213112 | systems/texlive/tlnet/archive/snaptodo.doc.r61155.tar.xz 2021/11/26 | 1932 | systems/texlive/tlnet/archive/snaptodo.r61155.tar.xz -2022/02/11 | 460432 | systems/texlive/tlnet/archive/snotez.doc.r61968.tar.xz -2022/02/11 | 3184 | systems/texlive/tlnet/archive/snotez.r61968.tar.xz +2022/02/13 | 481648 | systems/texlive/tlnet/archive/snotez.doc.r61992.tar.xz +2022/02/13 | 3216 | systems/texlive/tlnet/archive/snotez.r61992.tar.xz 2019/02/28 | 1248060 | systems/texlive/tlnet/archive/songbook.doc.r18136.tar.xz 2019/02/28 | 9680 | systems/texlive/tlnet/archive/songbook.r18136.tar.xz 2019/02/28 | 43224 | systems/texlive/tlnet/archive/songbook.source.r18136.tar.xz @@ -289388,8 +289389,8 @@ 2021/02/23 | 1371428 | systems/texlive/tlnet/archive/spath3.doc.r57842.tar.xz 2021/02/23 | 21472 | systems/texlive/tlnet/archive/spath3.r57842.tar.xz 2021/02/23 | 31740 | systems/texlive/tlnet/archive/spath3.source.r57842.tar.xz -2022/02/09 | 77860 | systems/texlive/tlnet/archive/spbmark.doc.r61946.tar.xz -2022/02/09 | 3160 | systems/texlive/tlnet/archive/spbmark.r61946.tar.xz +2022/02/13 | 77688 | systems/texlive/tlnet/archive/spbmark.doc.r61993.tar.xz +2022/02/13 | 3160 | systems/texlive/tlnet/archive/spbmark.r61993.tar.xz 2021/01/03 | 80960 | systems/texlive/tlnet/archive/spectral.doc.r57296.tar.xz 2021/01/03 | 3545232 | systems/texlive/tlnet/archive/spectral.r57296.tar.xz 2022/01/07 | 1808292 | systems/texlive/tlnet/archive/spectralsequences.doc.r61510.tar.xz @@ -290173,7 +290174,7 @@ 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz -2022/02/12 | 403352 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61977.tar.xz +2022/02/13 | 403280 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61985.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -290197,7 +290198,7 @@ 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz -2022/02/12 | 108376 | systems/texlive/tlnet/archive/texlive-scripts.r61977.tar.xz +2022/02/13 | 108364 | systems/texlive/tlnet/archive/texlive-scripts.r61985.tar.xz 2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz 2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz @@ -291840,8 +291841,8 @@ 2020/03/05 | 368976 | systems/texlive/tlnet/archive/xsavebox.doc.r54097.tar.xz 2020/03/05 | 4244 | systems/texlive/tlnet/archive/xsavebox.r54097.tar.xz 2020/03/05 | 4180 | systems/texlive/tlnet/archive/xsavebox.source.r54097.tar.xz -2021/02/05 | 2998504 | systems/texlive/tlnet/archive/xsim.doc.r57619.tar.xz -2021/02/05 | 32212 | systems/texlive/tlnet/archive/xsim.r57619.tar.xz +2022/02/13 | 3026636 | systems/texlive/tlnet/archive/xsim.doc.r61988.tar.xz +2022/02/13 | 32648 | systems/texlive/tlnet/archive/xsim.r61988.tar.xz 2019/06/24 | 789680 | systems/texlive/tlnet/archive/xskak.doc.r51432.tar.xz 2019/06/24 | 14052 | systems/texlive/tlnet/archive/xskak.r51432.tar.xz 2019/06/24 | 14172 | systems/texlive/tlnet/archive/xskak.source.r51432.tar.xz @@ -291970,15 +291971,15 @@ 2022/02/09 | 1057412 | systems/texlive/tlnet/archive/zref-check.doc.r61950.tar.xz 2022/02/09 | 5592 | systems/texlive/tlnet/archive/zref-check.r61950.tar.xz 2022/02/09 | 19100 | systems/texlive/tlnet/archive/zref-check.source.r61950.tar.xz -2022/02/08 | 1514828 | systems/texlive/tlnet/archive/zref-clever.doc.r61937.tar.xz -2022/02/08 | 22964 | systems/texlive/tlnet/archive/zref-clever.r61937.tar.xz -2022/02/08 | 49888 | systems/texlive/tlnet/archive/zref-clever.source.r61937.tar.xz +2022/02/13 | 1519464 | systems/texlive/tlnet/archive/zref-clever.doc.r61994.tar.xz +2022/02/13 | 23100 | systems/texlive/tlnet/archive/zref-clever.r61994.tar.xz +2022/02/13 | 50504 | systems/texlive/tlnet/archive/zref-clever.source.r61994.tar.xz 2020/10/10 | 651440 | systems/texlive/tlnet/archive/zref.doc.r56611.tar.xz 2020/10/10 | 14364 | systems/texlive/tlnet/archive/zref.r56611.tar.xz 2020/10/10 | 36852 | systems/texlive/tlnet/archive/zref.source.r56611.tar.xz -2022/02/09 | 699556 | systems/texlive/tlnet/archive/zref-vario.doc.r61951.tar.xz -2022/02/09 | 4016 | systems/texlive/tlnet/archive/zref-vario.r61951.tar.xz -2022/02/09 | 6388 | systems/texlive/tlnet/archive/zref-vario.source.r61951.tar.xz +2022/02/13 | 700632 | systems/texlive/tlnet/archive/zref-vario.doc.r61995.tar.xz +2022/02/13 | 4040 | systems/texlive/tlnet/archive/zref-vario.r61995.tar.xz +2022/02/13 | 6424 | systems/texlive/tlnet/archive/zref-vario.source.r61995.tar.xz 2019/02/28 | 246032 | systems/texlive/tlnet/archive/zwgetfdate.doc.r15878.tar.xz 2019/02/28 | 1384 | systems/texlive/tlnet/archive/zwgetfdate.r15878.tar.xz 2020/02/29 | 635808 | systems/texlive/tlnet/archive/zwpagelayout.doc.r53965.tar.xz @@ -291994,16 +291995,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 2021/12/06 | 105168 | systems/texlive/tlnet/install-tl -2022/02/12 | 6807947 | systems/texlive/tlnet/install-tl-unx.tar.gz -2022/02/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2022/02/12 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2022/02/13 | 6808098 | systems/texlive/tlnet/install-tl-unx.tar.gz +2022/02/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2022/02/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat -2022/02/12 | 20874897 | systems/texlive/tlnet/install-tl-windows.exe -2022/02/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2022/02/12 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2022/02/12 | 25627668 | systems/texlive/tlnet/install-tl.zip -2022/02/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2022/02/12 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2022/02/13 | 20870833 | systems/texlive/tlnet/install-tl-windows.exe +2022/02/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2022/02/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2022/02/13 | 25627652 | systems/texlive/tlnet/install-tl.zip +2022/02/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2022/02/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2021/04/01 | 1229 | systems/texlive/tlnet/README.md 2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021 2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -292013,7 +292014,7 @@ 2021/07/03 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2022/01/12 | 49482 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2022/02/11 | 7268 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2022/02/12 | 7172 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2022/02/05 | 213092 | 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 @@ -292055,16 +292056,16 @@ 2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2022/02/12 | 17109816 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2022/02/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2022/02/13 | 17109824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2022/02/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2021/12/21 | 86654 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2022/02/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2022/02/12 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2022/02/12 | 2351184 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2022/02/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2022/02/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2022/02/13 | 2348516 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2021/12/21 | 42112 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm -2022/02/09 | 151957 | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +2022/02/12 | 151959 | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm 2021/12/21 | 38003 | systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm 2021/05/20 | 6032 | systems/texlive/tlnet/tlpkg/TeXLive/trans.pl 2020/03/07 | 116238 | systems/texlive/tlnet/tlpkg/tlperl/bin/libgcc_s_dw2-1.dll @@ -297187,7 +297188,7 @@ 2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma 2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma 2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma -2022/02/12 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma +2022/02/13 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma 2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma 2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma 2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma @@ -298713,9 +298714,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2022/01/29 | 39717 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2022/01/29 | 43173 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2022/02/12 | 265615 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2022/02/12 | 1416708 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2022/02/12 | 1309763 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2022/02/13 | 265603 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2022/02/13 | 1416005 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2022/02/13 | 1309791 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2022/01/29 | 13505 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2022/01/29 | 14408 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma @@ -298939,189 +298940,189 @@ 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2022/02/12 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2022/02/12 | 51548 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2022/02/12 | 57356 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2022/02/12 | 960373 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2022/02/12 | 1086643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2022/02/12 | 28769 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2022/02/12 | 31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2022/02/12 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2022/02/12 | 35236 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2022/02/12 | 56851 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2022/02/12 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2022/02/12 | 86493 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2022/02/12 | 95212 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2022/02/12 | 68737 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2022/02/12 | 77069 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2022/02/12 | 27252 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2022/02/12 | 31334 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2022/02/12 | 332531 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2022/02/12 | 393910 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2022/02/12 | 32964 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2022/02/12 | 37114 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2022/02/12 | 51414 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2022/02/12 | 57209 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2022/02/12 | 256592 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2022/02/12 | 281919 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2022/02/12 | 179946 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2022/02/12 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2022/02/12 | 54997 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2022/02/12 | 62445 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2022/02/12 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2022/02/12 | 24078 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2022/02/12 | 478895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2022/02/12 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2022/02/12 | 52004 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2022/02/12 | 285553 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2022/02/12 | 326180 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2022/02/12 | 41389 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2022/02/12 | 45736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2022/02/12 | 120227 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2022/02/12 | 134991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2022/02/12 | 1300069 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2022/02/12 | 1452957 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2022/02/12 | 99694 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2022/02/12 | 113013 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2022/02/12 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2022/02/12 | 48819 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2022/02/12 | 25128 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2022/02/12 | 28584 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2022/02/12 | 57011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2022/02/12 | 63365 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2022/02/12 | 135905 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2022/02/12 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2022/02/12 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2022/02/12 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2022/02/12 | 72004 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2022/02/12 | 81507 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2022/02/12 | 259150 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2022/02/12 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2022/02/12 | 22156 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2022/02/12 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2022/02/12 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2022/02/12 | 112668 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2022/02/12 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2022/02/12 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2022/02/12 | 96822 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2022/02/12 | 115636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2022/02/12 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2022/02/12 | 43813 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2022/02/12 | 484673 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2022/02/12 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2022/02/12 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2022/02/12 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2022/02/12 | 95476 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2022/02/12 | 109549 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2022/02/12 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2022/02/12 | 18377 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2022/02/12 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2022/02/12 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2022/02/12 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2022/02/12 | 682183 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2022/02/12 | 532417 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2022/02/12 | 598776 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2022/02/12 | 477701 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2022/02/12 | 528104 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2022/02/12 | 94014 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2022/02/12 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2022/02/12 | 1732207 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2022/02/12 | 2006599 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2022/02/12 | 68021 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2022/02/12 | 74118 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2022/02/12 | 27787 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2022/02/12 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2022/02/12 | 7758 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2022/02/12 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2022/02/12 | 199420 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2022/02/12 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2022/02/12 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2022/02/12 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2022/02/12 | 99227 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2022/02/12 | 104697 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2022/02/12 | 126864 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2022/02/12 | 139186 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2022/02/12 | 254845 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2022/02/12 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2022/02/12 | 199790 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2022/02/12 | 181557 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2022/02/12 | 68531 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2022/02/12 | 76201 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2022/02/12 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2022/02/12 | 35180 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2022/02/12 | 38567 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2022/02/12 | 43947 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2022/02/12 | 43428 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2022/02/12 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2022/02/12 | 45928 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2022/02/12 | 52325 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2022/02/12 | 199168 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma -2022/02/12 | 213132 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma -2022/02/12 | 36059 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma -2022/02/12 | 41239 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2022/02/12 | 753734 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2022/02/12 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2022/02/12 | 200153 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2022/02/12 | 203064 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2022/02/12 | 209861 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2022/02/12 | 244999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2022/02/12 | 78982 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2022/02/12 | 88150 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2022/02/12 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2022/02/12 | 1322848 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2022/02/12 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2022/02/12 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2022/02/12 | 31574 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2022/02/12 | 37377 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2022/02/12 | 64693 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2022/02/12 | 72891 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2022/02/12 | 50822 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2022/02/12 | 58644 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2022/02/12 | 691859 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma -2022/02/12 | 752442 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma -2022/02/12 | 1355173 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2022/02/12 | 1499492 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2022/02/12 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2022/02/12 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2022/02/12 | 57563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma -2022/02/12 | 63749 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma -2022/02/12 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2022/02/12 | 27461 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2022/02/12 | 16569 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2022/02/12 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2022/02/12 | 64505 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2022/02/12 | 70973 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2022/02/12 | 157568 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2022/02/12 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2022/02/12 | 58728 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2022/02/12 | 67222 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2022/02/12 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2022/02/12 | 109307 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2022/02/12 | 2674147 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2022/02/12 | 2799002 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2022/02/12 | 55202 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2022/02/12 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2022/02/12 | 37132 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma -2022/02/12 | 41214 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma -2022/02/12 | 28702 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2022/02/12 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2022/02/12 | 67891 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2022/02/12 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2022/02/12 | 317513 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2022/02/12 | 355067 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2022/02/12 | 55752 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma -2022/02/12 | 57423 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma -2022/02/12 | 591258 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2022/02/12 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2022/02/12 | 39324 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2022/02/12 | 43568 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2022/02/12 | 265659 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2022/02/12 | 1417350 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2022/02/12 | 1310513 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2022/02/12 | 13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2022/02/12 | 14407 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2022/02/13 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2022/02/13 | 51549 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2022/02/13 | 57355 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2022/02/13 | 960373 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2022/02/13 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2022/02/13 | 28768 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2022/02/13 | 31540 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2022/02/13 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2022/02/13 | 35238 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2022/02/13 | 56849 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2022/02/13 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2022/02/13 | 86494 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2022/02/13 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2022/02/13 | 68735 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2022/02/13 | 77070 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2022/02/13 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2022/02/13 | 31335 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2022/02/13 | 332532 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2022/02/13 | 393909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2022/02/13 | 32964 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2022/02/13 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2022/02/13 | 51412 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2022/02/13 | 57209 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2022/02/13 | 256597 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2022/02/13 | 281920 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2022/02/13 | 179948 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2022/02/13 | 196135 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2022/02/13 | 54998 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2022/02/13 | 62445 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2022/02/13 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2022/02/13 | 24078 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2022/02/13 | 478897 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2022/02/13 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2022/02/13 | 52004 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2022/02/13 | 285553 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2022/02/13 | 326181 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2022/02/13 | 41390 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2022/02/13 | 45736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2022/02/13 | 120229 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2022/02/13 | 134991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2022/02/13 | 1300070 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2022/02/13 | 1452956 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2022/02/13 | 99695 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2022/02/13 | 113011 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2022/02/13 | 43653 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2022/02/13 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2022/02/13 | 25130 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2022/02/13 | 28584 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2022/02/13 | 57012 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2022/02/13 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2022/02/13 | 135906 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2022/02/13 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2022/02/13 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2022/02/13 | 79059 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2022/02/13 | 72005 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2022/02/13 | 81506 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2022/02/13 | 259152 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2022/02/13 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2022/02/13 | 22158 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2022/02/13 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2022/02/13 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2022/02/13 | 112669 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2022/02/13 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2022/02/13 | 73205 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2022/02/13 | 96822 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2022/02/13 | 115635 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2022/02/13 | 38478 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2022/02/13 | 43812 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2022/02/13 | 484672 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2022/02/13 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2022/02/13 | 152022 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2022/02/13 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2022/02/13 | 95477 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2022/02/13 | 109550 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2022/02/13 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2022/02/13 | 18375 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2022/02/13 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2022/02/13 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2022/02/13 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2022/02/13 | 682181 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2022/02/13 | 532415 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2022/02/13 | 598773 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2022/02/13 | 477703 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2022/02/13 | 528104 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2022/02/13 | 94012 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2022/02/13 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2022/02/13 | 1732210 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2022/02/13 | 2006600 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2022/02/13 | 68019 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2022/02/13 | 74117 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2022/02/13 | 27786 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2022/02/13 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2022/02/13 | 7758 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2022/02/13 | 8782 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2022/02/13 | 199421 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2022/02/13 | 216596 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2022/02/13 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2022/02/13 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2022/02/13 | 99226 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2022/02/13 | 104698 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2022/02/13 | 126864 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2022/02/13 | 139186 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2022/02/13 | 254845 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2022/02/13 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2022/02/13 | 199791 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2022/02/13 | 181555 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2022/02/13 | 68531 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2022/02/13 | 76200 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2022/02/13 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2022/02/13 | 35179 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2022/02/13 | 38566 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2022/02/13 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2022/02/13 | 43427 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2022/02/13 | 47984 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2022/02/13 | 45929 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2022/02/13 | 52324 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2022/02/13 | 199171 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2022/02/13 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2022/02/13 | 36061 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2022/02/13 | 41240 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2022/02/13 | 753734 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2022/02/13 | 824421 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2022/02/13 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2022/02/13 | 203064 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2022/02/13 | 209863 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2022/02/13 | 244998 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2022/02/13 | 78983 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2022/02/13 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2022/02/13 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2022/02/13 | 1322845 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2022/02/13 | 20188 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2022/02/13 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2022/02/13 | 31573 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2022/02/13 | 37376 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2022/02/13 | 64692 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2022/02/13 | 72889 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2022/02/13 | 50821 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2022/02/13 | 58643 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2022/02/13 | 691859 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma +2022/02/13 | 752442 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma +2022/02/13 | 1355173 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2022/02/13 | 1499490 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2022/02/13 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2022/02/13 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2022/02/13 | 57562 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2022/02/13 | 63749 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2022/02/13 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2022/02/13 | 27460 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2022/02/13 | 16571 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2022/02/13 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2022/02/13 | 64506 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2022/02/13 | 70974 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2022/02/13 | 157565 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2022/02/13 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2022/02/13 | 58727 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2022/02/13 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2022/02/13 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2022/02/13 | 109309 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2022/02/13 | 2674148 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2022/02/13 | 2799002 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2022/02/13 | 55202 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2022/02/13 | 62353 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2022/02/13 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2022/02/13 | 41214 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2022/02/13 | 28703 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2022/02/13 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2022/02/13 | 67890 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2022/02/13 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2022/02/13 | 317513 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2022/02/13 | 355066 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2022/02/13 | 55753 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma +2022/02/13 | 57424 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma +2022/02/13 | 591259 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2022/02/13 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2022/02/13 | 39323 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2022/02/13 | 43566 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2022/02/13 | 265586 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2022/02/13 | 1416602 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2022/02/13 | 1309880 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2022/02/13 | 13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2022/02/13 | 14407 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma -2022/02/12 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2022/02/13 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini 2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma 2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma 2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma @@ -299573,7 +299574,7 @@ 2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma 2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma -2022/02/12 | 964 | systems/win32/miktex/tm/packages/pr.ini +2022/02/13 | 964 | systems/win32/miktex/tm/packages/pr.ini 2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma 2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma 2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma @@ -301339,7 +301340,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2022/02/13 | 186 | timestamp +2022/02/14 | 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 index ddb820cac5..12765f696b 100644 Binary files a/FILES.byname.gz and b/FILES.byname.gz differ diff --git a/FILES.last07days b/FILES.last07days index 5b31946595..0ba83b0dd7 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,338 +1,462 @@ -2022/02/12 | 99694 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2022/02/12 | 99227 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2022/02/12 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2022/02/12 | 96822 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2022/02/12 | 964 | systems/win32/miktex/tm/packages/pr.ini -2022/02/12 | 960373 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2022/02/12 | 95476 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2022/02/12 | 95212 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2022/02/12 | 94014 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2022/02/13 | 996 | indexing/xindex/doc/tests/demo2.ind +2022/02/13 | 99695 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2022/02/13 | 99226 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2022/02/13 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2022/02/13 | 96822 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2022/02/13 | 96780 | macros/luatex/latex/pyluatex.zip +2022/02/13 | 964 | systems/win32/miktex/tm/packages/pr.ini +2022/02/13 | 9638 | macros/luatex/latex/pyluatex/pyluatex-json.lua +2022/02/13 | 960373 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2022/02/13 | 95477 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2022/02/13 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2022/02/13 | 94012 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2022/02/13 | 9216 | indexing/xindex/doc/tests/demo3.pdf +2022/02/13 | 896085 | macros/xetex/latex/bidi/bidi.dtx +2022/02/13 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2022/02/13 | 8782 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2022/02/13 | 86494 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2022/02/13 | 853443 | macros/latex/required/babel/base/babel.pdf +2022/02/13 | 84169 | macros/luatex/latex/pyluatex/pyluatex.pdf +2022/02/13 | 824421 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2022/02/13 | 81506 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2022/02/13 | 812816 | systems/texlive/tlnet/archive/knowledge.doc.r61991.tar.xz +2022/02/13 | 80671 | macros/latex/contrib/easybook/easybook.tex +2022/02/13 | 796174 | macros/latex/required/babel/base/locale.zip +2022/02/13 | 79059 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2022/02/13 | 78983 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2022/02/13 | 77688 | systems/texlive/tlnet/archive/spbmark.doc.r61993.tar.xz +2022/02/13 | 7758 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2022/02/13 | 77070 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2022/02/13 | 76200 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2022/02/13 | 761651 | macros/xetex/latex/bidi/gull.jpg +2022/02/13 | 753734 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2022/02/13 | 752442 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma +2022/02/13 | 7461 | macros/latex/required/babel/base/babel.ins +2022/02/13 | 74117 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2022/02/13 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2022/02/13 | 73407 | macros/latex/contrib/easybook/easybook.dtx +2022/02/13 | 73205 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2022/02/13 | 72889 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2022/02/13 | 722 | macros/xetex/latex/bidi-atbegshi/README +2022/02/13 | 721997 | macros/latex/required/babel/base/babel.dtx +2022/02/13 | 72005 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2022/02/13 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2022/02/13 | 70974 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2022/02/13 | 700632 | systems/texlive/tlnet/archive/zref-vario.doc.r61995.tar.xz +2022/02/13 | 691859 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma +2022/02/13 | 68735 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2022/02/13 | 68531 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2022/02/13 | 682181 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2022/02/13 | 6808098 | systems/texlive/tlnet/install-tl-unx.tar.gz +2022/02/13 | 68019 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2022/02/13 | 67890 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2022/02/13 | 6777 | macros/luatex/latex/pyluatex/pyluatex.lua +2022/02/13 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2022/02/13 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2022/02/13 | 64692 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2022/02/13 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2022/02/13 | 64506 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2022/02/13 | 6424 | systems/texlive/tlnet/archive/zref-vario.source.r61995.tar.xz +2022/02/13 | 6404 | indexing/xindex/doc/tests/demo-hyperref.ind +2022/02/13 | 63749 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma +2022/02/13 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2022/02/13 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma +2022/02/13 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2022/02/13 | 630 | indexing/xindex/doc/tests/Umlaute.ind +2022/02/13 | 630 | indexing/xindex/doc/tests/Umlaute2.ind +2022/02/13 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2022/02/13 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2022/02/13 | 62445 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2022/02/13 | 623 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex +2022/02/13 | 62353 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2022/02/13 | 618538 | macros/latex/contrib/easybook.zip +2022/02/13 | 612027 | indexing/xindex.zip +2022/02/13 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx +2022/02/13 | 598773 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2022/02/13 | 597408 | systems/texlive/tlnet/archive/easybook.doc.r61990.tar.xz +2022/02/13 | 5939 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx +2022/02/13 | 591259 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2022/02/13 | 58727 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2022/02/13 | 586 | macros/xetex/latex/bidi-atbegshi/test-RTL.tex +2022/02/13 | 58643 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2022/02/13 | 578140 | macros/latex/contrib/easybook/easybook.pdf +2022/02/13 | 57562 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma +2022/02/13 | 57424 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma +2022/02/13 | 57355 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2022/02/13 | 57209 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2022/02/13 | 570 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex +2022/02/13 | 57012 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2022/02/13 | 56849 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2022/02/13 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2022/02/13 | 55753 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma +2022/02/13 | 55202 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2022/02/13 | 54998 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2022/02/13 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx +2022/02/13 | 532415 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2022/02/13 | 530 | macros/xetex/latex/bidi-atbegshi/test-LTR.tex +2022/02/13 | 528104 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2022/02/13 | 52616 | macros/latex/contrib/ninecolors.zip +2022/02/13 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2022/02/13 | 52324 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2022/02/13 | 5210 | indexing/xindex/doc/tests/demo.ind +2022/02/13 | 52004 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2022/02/13 | 51549 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2022/02/13 | 51412 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2022/02/13 | 5102 | indexing/xindex/doc/tests/demo.idx +2022/02/13 | 50821 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2022/02/13 | 50504 | systems/texlive/tlnet/archive/zref-clever.source.r61994.tar.xz +2022/02/13 | 492371 | install/macros/generic/expkv-cs.tds.zip +2022/02/13 | 49039 | macros/latex/contrib/ninecolors/ninecolors.pdf +2022/02/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2022/02/13 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2022/02/13 | 484706 | macros/generic/expkv-cs.zip +2022/02/13 | 484672 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2022/02/13 | 481648 | systems/texlive/tlnet/archive/snotez.doc.r61992.tar.xz +2022/02/13 | 47984 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2022/02/13 | 478897 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma +2022/02/13 | 477703 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2022/02/13 | 470406 | macros/generic/expkv-cs/expkv-cs.pdf +2022/02/13 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2022/02/13 | 45929 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2022/02/13 | 45736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2022/02/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2022/02/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2022/02/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2022/02/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2022/02/13 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx +2022/02/13 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx +2022/02/13 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2022/02/13 | 43812 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2022/02/13 | 43653 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2022/02/13 | 43566 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2022/02/13 | 43427 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2022/02/13 | 4305838 | install/macros/xetex/latex/bidi.tds.zip +2022/02/13 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2022/02/13 | 42572 | systems/texlive/tlnet/archive/knowledge.source.r61991.tar.xz +2022/02/13 | 4170 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py +2022/02/13 | 41390 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2022/02/13 | 41240 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma +2022/02/13 | 41214 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma +2022/02/13 | 4040 | systems/texlive/tlnet/archive/zref-vario.r61995.tar.xz +2022/02/13 | 403280 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61985.tar.xz +2022/02/13 | 3991 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty +2022/02/13 | 3948780 | macros/xetex/latex/bidi.zip +2022/02/13 | 393909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2022/02/13 | 39323 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2022/02/13 | 39021 | indexing/xindex/doc/tests/buch.pdf +2022/02/13 | 38566 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2022/02/13 | 38478 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2022/02/13 | 37376 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2022/02/13 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma +2022/02/13 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2022/02/13 | 36061 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma +2022/02/13 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx +2022/02/13 | 355066 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2022/02/13 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx +2022/02/13 | 35238 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2022/02/13 | 35179 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2022/02/13 | 34606 | indexing/xindex/doc/tests/demo.pdf +2022/02/13 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2022/02/13 | 332532 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2022/02/13 | 32964 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2022/02/13 | 32648 | systems/texlive/tlnet/archive/xsim.r61988.tar.xz +2022/02/13 | 326181 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2022/02/13 | 3216 | systems/texlive/tlnet/archive/snotez.r61992.tar.xz +2022/02/13 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2022/02/13 | 317513 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2022/02/13 | 3160 | systems/texlive/tlnet/archive/spbmark.r61993.tar.xz +2022/02/13 | 31573 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2022/02/13 | 31540 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2022/02/13 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2022/02/13 | 31335 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2022/02/13 | 3116802 | macros/xetex/latex/bidi/bidi.pdf +2022/02/13 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2022/02/13 | 3026636 | systems/texlive/tlnet/archive/xsim.doc.r61988.tar.xz +2022/02/13 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2022/02/13 | 2976 | macros/luatex/latex/pyluatex/pyluatex.sty +2022/02/13 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2022/02/13 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf +2022/02/13 | 29260 | macros/xetex/latex/bidi-atbegshi/test-RTL.pdf +2022/02/13 | 29249 | macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf +2022/02/13 | 2878348 | install/macros/latex/required/babel-base.tds.zip +2022/02/13 | 28768 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2022/02/13 | 28703 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2022/02/13 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2022/02/13 | 28624 | indexing/xindex/doc/tests/demo-hyperref.pdf +2022/02/13 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2022/02/13 | 28584 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2022/02/13 | 285553 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2022/02/13 | 28440 | macros/latex/contrib/chemmacros/HISTORY +2022/02/13 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2022/02/13 | 281920 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2022/02/13 | 2799002 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2022/02/13 | 27786 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2022/02/13 | 27460 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2022/02/13 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2022/02/13 | 2674148 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2022/02/13 | 265603 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2022/02/13 | 265586 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2022/02/13 | 259152 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2022/02/13 | 256597 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2022/02/13 | 25627652 | systems/texlive/tlnet/install-tl.zip +2022/02/13 | 254845 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2022/02/13 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2022/02/13 | 25130 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2022/02/13 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2022/02/13 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2022/02/13 | 24994 | macros/latex/contrib/ninecolors/ninecolors.sty +2022/02/13 | 244998 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2022/02/13 | 24078 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2022/02/13 | 23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx +2022/02/13 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2022/02/13 | 2348516 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2022/02/13 | 2327636 | systems/texlive/tlnet/archive/circuit-macros.doc.r61987.tar.xz +2022/02/13 | 23100 | systems/texlive/tlnet/archive/zref-clever.r61994.tar.xz +2022/02/13 | 229642 | macros/latex/contrib/chemmacros/chemmacros.sty +2022/02/13 | 22776 | systems/texlive/tlnet/archive/knowledge.r61991.tar.xz +2022/02/13 | 22158 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2022/02/13 | 21890 | macros/latex/required/babel/base/bbcompat.dtx +2022/02/13 | 216596 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2022/02/13 | 2150 | macros/xetex/latex/bidi/bidi-doc-title.ltx +2022/02/13 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma +2022/02/13 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2022/02/13 | 2113 | macros/latex/required/babel/base/README.md +2022/02/13 | 209863 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2022/02/13 | 20870833 | systems/texlive/tlnet/install-tl-windows.exe +2022/02/13 | 203064 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2022/02/13 | 20188 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2022/02/13 | 2006600 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2022/02/13 | 2005 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex +2022/02/13 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2022/02/13 | 199791 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2022/02/13 | 199421 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2022/02/13 | 199171 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma +2022/02/13 | 1972 | systems/texlive/tlnet/archive/bxghost.r61989.tar.xz +2022/02/13 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx +2022/02/13 | 196135 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2022/02/13 | 192092 | macros/xetex/latex/bidi-atbegshi.zip +2022/02/13 | 18884 | indexing/xindex/doc/tests/Umlaute2.pdf +2022/02/13 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2022/02/13 | 1840419 | macros/latex/required/babel/base.zip +2022/02/13 | 18375 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2022/02/13 | 18342 | indexing/xindex/doc/tests/HADW.pdf +2022/02/13 | 1828 | systems/texlive/tlnet/archive/bxghost.doc.r61989.tar.xz +2022/02/13 | 181555 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2022/02/13 | 180631 | macros/xetex/latex/bidi/bidi-doc.pdf +2022/02/13 | 1801 | macros/luatex/latex/pyluatex/README.md +2022/02/13 | 179948 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2022/02/13 | 1732210 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2022/02/13 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2022/02/13 | 17109824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2022/02/13 | 1693 | macros/xetex/latex/bidi/picture.jpg +2022/02/13 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2022/02/13 | 16571 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2022/02/13 | 16532 | systems/texlive/tlnet/archive/easybook.r61990.tar.xz +2022/02/13 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2022/02/13 | 16412 | systems/texlive/tlnet/archive/easybook.source.r61990.tar.xz +2022/02/13 | 157565 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2022/02/13 | 156338 | macros/latex/contrib/chemmacros/chemmacros-manual.tex +2022/02/13 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2022/02/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2022/02/13 | 15380 | indexing/xindex/doc/tests/buch.ind +2022/02/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2022/02/13 | 1523 | macros/latex/contrib/chemmacros/README +2022/02/13 | 152022 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2022/02/13 | 15194 | indexing/xindex/doc/tests/Umlaute.pdf +2022/02/13 | 1519464 | systems/texlive/tlnet/archive/zref-clever.doc.r61994.tar.xz +2022/02/13 | 1499490 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2022/02/13 | 1496 | systems/texlive/tlnet/archive/circuit-macros.r61987.tar.xz +2022/02/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2022/02/13 | 1452956 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2022/02/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2022/02/13 | 1448 | macros/xetex/latex/bidi/bidi-doc-intro.ltx +2022/02/13 | 14407 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2022/02/13 | 14200 | macros/luatex/latex/pyluatex/pyluatex.tex +2022/02/13 | 1416602 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2022/02/13 | 1416005 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2022/02/13 | 139186 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2022/02/13 | 138 | indexing/xindex/doc/tests/demo3.ind +2022/02/13 | 1371 | indexing/xindex/README.md +2022/02/13 | 13648 | macros/xetex/latex/bidi-atbegshi/test-LTR.pdf +2022/02/13 | 13623 | macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf +2022/02/13 | 135906 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2022/02/13 | 1355173 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2022/02/13 | 1354 | macros/xetex/latex/bidi/README +2022/02/13 | 13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2022/02/13 | 134991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2022/02/13 | 1322845 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2022/02/13 | 1309880 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2022/02/13 | 1309791 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2022/02/13 | 1300070 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2022/02/13 | 1296 | macros/generic/expkv-cs/README.md +2022/02/13 | 126864 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2022/02/13 | 1264 | indexing/xindex/doc/tests/HADW.ind +2022/02/13 | 123427 | macros/generic/expkv-cs/expkv-cs.dtx +2022/02/13 | 120229 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2022/02/13 | 11883 | indexing/xindex/doc/tests/demo4.pdf +2022/02/13 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2022/02/13 | 115635 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2022/02/13 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2022/02/13 | 114 | indexing/xindex/doc/tests/demo3.idx +2022/02/13 | 113011 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2022/02/13 | 112669 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2022/02/13 | 109550 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2022/02/13 | 109309 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2022/02/13 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2022/02/13 | 1084433 | macros/latex/contrib/chemmacros.zip +2022/02/13 | 108364 | systems/texlive/tlnet/archive/texlive-scripts.r61985.tar.xz +2022/02/13 | 108284 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf +2022/02/13 | 104698 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2022/02/13 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2022/02/13 | 1017922 | macros/latex/contrib/chemmacros/chemmacros-manual.pdf +2022/02/13 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2022/02/12 | 9704 | indexing/xindex/scripts/xindex.lua 2022/02/12 | 91296 | macros/latex/contrib/xsim/examples/xsim.texsx-369636.pdf 2022/02/12 | 894 | macros/latex/contrib/xsim/examples/xsim.grade-distribution.tex -2022/02/12 | 88150 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2022/02/12 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma 2022/02/12 | 871 | macros/latex/contrib/xsim/examples/xsim.texsx-369636.tex 2022/02/12 | 867125 | macros/latex/contrib/knowledge.zip 2022/02/12 | 86588 | macros/latex/contrib/xsim/examples/xsim.various.pdf -2022/02/12 | 86493 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma 2022/02/12 | 86049 | macros/latex/contrib/xsim/examples/xsim.texsx-13635.pdf +2022/02/12 | 8493 | indexing/xindex/lualatex/xindex-pretty.lua 2022/02/12 | 840 | macros/latex/contrib/xsim/examples/xsim.collections.tex 2022/02/12 | 83312 | systems/texlive/tlnet/archive/luatexja.source.r61981.tar.xz 2022/02/12 | 832 | macros/latex/contrib/xsim/examples/xsim.listings.tex -2022/02/12 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2022/02/12 | 81507 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2022/02/12 | 80545 | macros/latex/contrib/easybook/easybook.tex 2022/02/12 | 80252 | macros/latex/contrib/spbmark.zip 2022/02/12 | 7936 | macros/latex/contrib/knowledge/knowledge-configuration.dtx -2022/02/12 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2022/02/12 | 78982 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2022/02/12 | 7821 | indexing/xindex/lualatex/xindex-yannis.lua 2022/02/12 | 776 | macros/latex/contrib/xsim/examples/xsim.description-list.tex -2022/02/12 | 7758 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma 2022/02/12 | 774 | macros/latex/contrib/xsim/examples/xsim.randomexercises.tex 2022/02/12 | 771140 | macros/latex/contrib/knowledge/knowledge.pdf -2022/02/12 | 77069 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2022/02/12 | 76201 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2022/02/12 | 753734 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2022/02/12 | 752442 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma 2022/02/12 | 75046 | macros/latex/contrib/spbmark/spbmark.pdf 2022/02/12 | 7496 | systems/texlive/tlnet/archive/footmisc.r61979.tar.xz -2022/02/12 | 74902 | macros/latex/contrib/easybook/easybook.dtx -2022/02/12 | 74118 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2022/02/12 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2022/02/12 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma 2022/02/12 | 7298 | macros/latex/contrib/knowledge/knowledge-example.tex -2022/02/12 | 72891 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2022/02/12 | 72004 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2022/02/12 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2022/02/12 | 70973 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2022/02/12 | 7172 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2022/02/12 | 708045 | macros/latex/contrib/zref-vario.zip -2022/02/12 | 691859 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma -2022/02/12 | 68737 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2022/02/12 | 68531 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2022/02/12 | 682183 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2022/02/12 | 6807947 | systems/texlive/tlnet/install-tl-unx.tar.gz -2022/02/12 | 68021 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2022/02/12 | 67891 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2022/02/12 | 67222 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma 2022/02/12 | 65714 | macros/latex/contrib/xsim/examples/xsim.texsx-369065.pdf 2022/02/12 | 653 | macros/latex/contrib/xsim/examples/xsim.pointsums.tex -2022/02/12 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma 2022/02/12 | 64956 | macros/latex/contrib/xsim/examples/xsim.golatex-91339.pdf -2022/02/12 | 64693 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2022/02/12 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2022/02/12 | 64505 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2022/02/12 | 63749 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma -2022/02/12 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2022/02/12 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma -2022/02/12 | 63365 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2022/02/12 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2022/02/12 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma 2022/02/12 | 624 | macros/latex/contrib/xsim/examples/xsim.texsx-299534.tex -2022/02/12 | 62445 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2022/02/12 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2022/02/12 | 616703 | macros/latex/contrib/easybook.zip +2022/02/12 | 6099 | indexing/xindex/lualatex/xindex-norsk.lua 2022/02/12 | 60853 | macros/latex/contrib/xsim/examples/xsim.texsx-549540.pdf 2022/02/12 | 60453 | macros/latex/contrib/xsim/examples/xsim.texsx-466584.pdf -2022/02/12 | 598776 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2022/02/12 | 597968 | systems/texlive/tlnet/archive/easybook.doc.r61980.tar.xz -2022/02/12 | 591258 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2022/02/12 | 58728 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2022/02/12 | 58 | systems/mac/mactex/MacTeXtras-20220212.zip.md5 2022/02/12 | 5868 | macros/latex/contrib/xsim/examples/xsim.various.tex -2022/02/12 | 58644 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2022/02/12 | 576202 | macros/latex/contrib/easybook/easybook.pdf -2022/02/12 | 57563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma -2022/02/12 | 57423 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma -2022/02/12 | 57356 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2022/02/12 | 57642 | indexing/xindex/doc/xindex-doc.tex 2022/02/12 | 57220 | macros/latex/contrib/xsim/examples/xsim.listofexercises.pdf -2022/02/12 | 57209 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma 2022/02/12 | 570 | macros/latex/contrib/xsim/examples/xsim.boxed-headings.tex -2022/02/12 | 57011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma 2022/02/12 | 56911 | macros/latex/contrib/xsim/examples/xsim.texsx-338165.pdf -2022/02/12 | 56851 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2022/02/12 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma 2022/02/12 | 56106 | macros/latex/contrib/xsim/examples/xsim.texsx-199360.pdf -2022/02/12 | 55752 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma -2022/02/12 | 55202 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma 2022/02/12 | 55077 | macros/latex/contrib/xsim/examples/xsim.texsx-369803.pdf -2022/02/12 | 54997 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma 2022/02/12 | 542 | macros/latex/contrib/xsim/examples/xsim.texsx-370642.tex -2022/02/12 | 532417 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2022/02/12 | 528104 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2022/02/12 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2022/02/12 | 52325 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2022/02/12 | 52004 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma 2022/02/12 | 51800 | macros/latex/contrib/xsim/examples/xsim.texsx-580636.pdf -2022/02/12 | 51548 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2022/02/12 | 51414 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2022/02/12 | 50822 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma 2022/02/12 | 50575 | macros/latex/contrib/xsim/examples/xsim.texsx-395273.pdf 2022/02/12 | 500956 | systems/texlive/tlnet/archive/footmisc.doc.r61979.tar.xz 2022/02/12 | 49333 | macros/latex/contrib/xsim/examples/xsim.texsx-576998.pdf -2022/02/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2022/02/12 | 48819 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2022/02/12 | 484673 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2022/02/12 | 486130359 | systems/mac/mactex/MacTeXtras-20220212.zip 2022/02/12 | 484271 | macros/latex/contrib/snotez.zip +2022/02/12 | 4835 | indexing/xindex/lualatex/xindex-dtk.lua 2022/02/12 | 48095 | macros/latex/contrib/xsim/examples/xsim.texsx-299534.pdf 2022/02/12 | 480373 | macros/latex/contrib/snotez/snotez-manual.pdf -2022/02/12 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2022/02/12 | 478895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma -2022/02/12 | 477701 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma 2022/02/12 | 46317 | macros/latex/contrib/xsim/examples/xsim.golatex-80640.pdf -2022/02/12 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma 2022/02/12 | 46009 | macros/latex/contrib/xsim/examples/xsim.texwelt-23968.pdf -2022/02/12 | 45928 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2022/02/12 | 4577 | indexing/xindex/lualatex/xindex-baselib.lua 2022/02/12 | 45747 | macros/latex/contrib/xsim/examples/xsim.listings.pdf -2022/02/12 | 45736 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2022/02/12 | 45722 | macros/latex/contrib/xsim/examples/xsim.hints.pdf -2022/02/12 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2022/02/12 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2022/02/12 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2022/02/12 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2022/02/12 | 451406 | indexing/xindex/doc/xindex-doc.pdf 2022/02/12 | 44697 | macros/latex/contrib/knowledge/knowledge-utils.dtx 2022/02/12 | 441 | macros/latex/contrib/xsim/examples/xsim.blanks.tex -2022/02/12 | 43947 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma 2022/02/12 | 43907 | macros/latex/contrib/xsim/examples/xsim.texwelt-6698.pdf -2022/02/12 | 43813 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2022/02/12 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2022/02/12 | 43568 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2022/02/12 | 43428 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2022/02/12 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma 2022/02/12 | 42514 | macros/latex/contrib/xsim/examples/xsim.texsx-498299.pdf 2022/02/12 | 4222 | language/japanese/BX/bxghost/bxghost.sty 2022/02/12 | 42156 | macros/latex/contrib/xsim/examples/xsim.different-point-types.pdf 2022/02/12 | 413 | macros/latex/contrib/xsim/examples/xsim.texsx-155630.tex -2022/02/12 | 41389 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2022/02/12 | 41239 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2022/02/12 | 41214 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma 2022/02/12 | 41171 | macros/latex/contrib/xsim/examples/xsim.description-list.pdf -2022/02/12 | 403352 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61977.tar.xz -2022/02/12 | 393910 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2022/02/12 | 39324 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2022/02/12 | 3955 | indexing/xindex/lualatex/xindex-cfg-common.lua 2022/02/12 | 3900 | macros/latex/contrib/xsim/xsim.style.layouts.code.tex 2022/02/12 | 38748 | macros/latex/contrib/xsim/examples/xsim.crossref.pdf -2022/02/12 | 38567 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma 2022/02/12 | 3855 | macros/latex/contrib/xsim/examples/xsim.texsx-549540.tex -2022/02/12 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma 2022/02/12 | 38372 | macros/latex/contrib/xsim/examples/xsim.boxed-headings.pdf 2022/02/12 | 38256 | macros/latex/contrib/xsim/examples/xsim.blanks.pdf +2022/02/12 | 38199 | systems/mac/mactex/ExtrasFolder.pdf 2022/02/12 | 37717 | macros/latex/contrib/xsim/examples/xsim.floating.pdf -2022/02/12 | 37377 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2022/02/12 | 37132 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma -2022/02/12 | 37114 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma 2022/02/12 | 36974 | macros/latex/contrib/xsim/examples/xsim.texsx-305110.pdf 2022/02/12 | 3670 | macros/latex/contrib/xsim/README 2022/02/12 | 36259 | macros/latex/contrib/xsim/examples/xsim.texwelt-15093.pdf -2022/02/12 | 36059 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma -2022/02/12 | 355067 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma 2022/02/12 | 3528 | language/japanese/BX/bxghost.zip -2022/02/12 | 35236 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2022/02/12 | 35180 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma 2022/02/12 | 3462775 | macros/latex/contrib/xsim.zip 2022/02/12 | 3443 | macros/latex/contrib/xsim/examples/xsim.texsx-350028.tex 2022/02/12 | 3414 | macros/latex/contrib/xsim/examples/xsim.golatex-80640.tex -2022/02/12 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2022/02/12 | 332531 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2022/02/12 | 32964 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2022/02/12 | 326180 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2022/02/12 | 32847 | indexing/xindex/lualatex/xindex-lib.lua 2022/02/12 | 3243960 | systems/texlive/tlnet/archive/luatexja.doc.r61981.tar.xz -2022/02/12 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma 2022/02/12 | 31763 | macros/latex/contrib/xsim/examples/xsim.difficulties.pdf -2022/02/12 | 317513 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2022/02/12 | 31574 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2022/02/12 | 31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2022/02/12 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2022/02/12 | 31334 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma 2022/02/12 | 3114 | macros/latex/contrib/xsim/examples/xsim.texwelt-15093.tex 2022/02/12 | 31019 | macros/latex/contrib/xsim/examples/xsim.multiplechoice.pdf 2022/02/12 | 30939 | macros/latex/contrib/xsim/examples/xsim.code-and-output.pdf -2022/02/12 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma 2022/02/12 | 30490 | macros/latex/contrib/xsim/xsim-manual.cls 2022/02/12 | 30259 | macros/latex/contrib/xsim/examples/xsim.collections.pdf -2022/02/12 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2022/02/12 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2022/02/12 | 28769 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2022/02/12 | 28702 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2022/02/12 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2022/02/12 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2022/02/12 | 28584 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2022/02/12 | 285553 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma 2022/02/12 | 28428 | macros/latex/contrib/xsim/examples/xsim.texsx-370642.pdf -2022/02/12 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2022/02/12 | 281919 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma 2022/02/12 | 28126 | macros/latex/contrib/xsim/examples/xsim.pointsums.pdf -2022/02/12 | 2799002 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2022/02/12 | 2793 | indexing/xindex/CHANGELOG 2022/02/12 | 2790 | macros/latex/contrib/xsim/examples/xsim.texsx-576998.tex -2022/02/12 | 27787 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma 2022/02/12 | 2762 | macros/latex/contrib/xsim/examples/xsim.issues-49.tex -2022/02/12 | 27461 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2022/02/12 | 27252 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2022/02/12 | 2734 | indexing/xindex/lualatex/xindex-AU.lua +2022/02/12 | 2716 | indexing/xindex/lualatex/xindex-danteedition.lua 2022/02/12 | 27157 | macros/latex/contrib/xsim/examples/xsim.texsx-308883.pdf -2022/02/12 | 2674147 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2022/02/12 | 265659 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2022/02/12 | 265615 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2022/02/12 | 2699 | indexing/xindex/lualatex/xindex-cfg.lua 2022/02/12 | 2614 | macros/latex/contrib/knowledge/makefile 2022/02/12 | 26102 | macros/latex/contrib/xsim/examples/xsim.texsx-391530.pdf -2022/02/12 | 259150 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2022/02/12 | 256592 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2022/02/12 | 25627668 | systems/texlive/tlnet/install-tl.zip -2022/02/12 | 254845 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2022/02/12 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2022/02/12 | 25128 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2022/02/12 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2022/02/12 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma 2022/02/12 | 247 | macros/latex/contrib/xsim/examples/xsim.texsx-308883.tex -2022/02/12 | 244999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma 2022/02/12 | 241568 | systems/texlive/tlnet/archive/avantgar.r61983.tar.xz -2022/02/12 | 24078 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2022/02/12 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2022/02/12 | 2351184 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2022/02/12 | 2385 | indexing/xindex/lualatex/xindex-cfg-uca.lua 2022/02/12 | 23204 | macros/latex/contrib/xsim/examples/xsim.grade-distribution.pdf 2022/02/12 | 23048 | macros/latex/contrib/xsim/examples/xsim.randomexercises.pdf 2022/02/12 | 2292 | macros/latex/contrib/xsim/examples/xsim.texsx-580636.tex 2022/02/12 | 2226 | macros/latex/contrib/xsim/examples/xsim.golatex-91339.tex -2022/02/12 | 22156 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2022/02/12 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2022/02/12 | 213132 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma -2022/02/12 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma 2022/02/12 | 21220 | systems/texlive/tlnet/archive/footmisc.source.r61979.tar.xz -2022/02/12 | 209861 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2022/02/12 | 20874897 | systems/texlive/tlnet/install-tl-windows.exe 2022/02/12 | 2038 | macros/latex/contrib/knowledge/README.md -2022/02/12 | 203064 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2022/02/12 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2022/02/12 | 2006599 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma 2022/02/12 | 20048 | macros/latex/contrib/xsim/examples/xsim.texsx-155630.pdf -2022/02/12 | 200153 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2022/02/12 | 199790 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2022/02/12 | 199420 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2022/02/12 | 199168 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma 2022/02/12 | 1961 | language/japanese/BX/bxghost/README.md -2022/02/12 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma 2022/02/12 | 1934 | macros/latex/contrib/xsim/examples/xsim.texsx-13635.tex 2022/02/12 | 1923 | macros/latex/contrib/xsim/examples/xsim.texsx-395273.tex 2022/02/12 | 191520 | systems/texlive/tlnet/archive/luatexja.r61981.tar.xz -2022/02/12 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2022/02/12 | 18377 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma 2022/02/12 | 1820 | macros/latex/contrib/xsim/examples/xsim.texsx-369065.tex -2022/02/12 | 181557 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma 2022/02/12 | 180997 | macros/latex/contrib/xsim/xsim.sty 2022/02/12 | 180842 | macros/latex/contrib/knowledge/knowledge.tex -2022/02/12 | 179946 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma 2022/02/12 | 1792 | macros/latex/contrib/xsim/examples/xsim.listofexercises.tex 2022/02/12 | 1788 | macros/latex/contrib/xsim/examples/xsim.texsx-338165.tex 2022/02/12 | 1759 | macros/latex/contrib/knowledge/knowledge.ins 2022/02/12 | 1749 | macros/latex/contrib/xsim/examples/xsim.texwelt-6698.tex 2022/02/12 | 174327 | macros/latex/contrib/knowledge/knowledge-code.dtx -2022/02/12 | 1732207 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2022/02/12 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2022/02/12 | 17109816 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2022/02/12 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2022/02/12 | 16580 | systems/texlive/tlnet/archive/easybook.r61980.tar.xz -2022/02/12 | 16569 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2022/02/12 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2022/02/12 | 16496 | systems/texlive/tlnet/archive/easybook.source.r61980.tar.xz +2022/02/12 | 1711 | systems/mac/mactex/Licenses.txt 2022/02/12 | 1586903 | macros/latex/contrib/zref-clever.zip -2022/02/12 | 157568 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2022/02/12 | 1566 | macros/latex/contrib/xsim/examples/xsim.texwelt-23968.tex -2022/02/12 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2022/02/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 2022/02/12 | 1537 | macros/latex/contrib/xsim/examples/xsim.texsx-498299.tex -2022/02/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2022/02/12 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2022/02/12 | 1499492 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2022/02/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2022/02/12 | 1452957 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2022/02/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2022/02/12 | 14407 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2022/02/12 | 151959 | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm 2022/02/12 | 1425 | macros/latex/contrib/xsim/examples/xsim.multiplechoice.tex -2022/02/12 | 1417350 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2022/02/12 | 1416708 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma 2022/02/12 | 13975 | macros/latex/contrib/snotez/snotez-manual.tex -2022/02/12 | 139186 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma 2022/02/12 | 1386 | macros/latex/contrib/xsim/examples/xsim.texsx-466584.tex 2022/02/12 | 1372251 | macros/latex/contrib/xsim/xsim-manual.pdf 2022/02/12 | 1368 | macros/latex/contrib/xsim/examples/xsim.crossref.tex -2022/02/12 | 135905 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2022/02/12 | 1355173 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma 2022/02/12 | 13535 | macros/latex/contrib/spbmark/spbmark.sty -2022/02/12 | 13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2022/02/12 | 134991 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma 2022/02/12 | 1345 | macros/latex/contrib/xsim/examples/xsim.difficulties.tex 2022/02/12 | 1337 | macros/latex/contrib/xsim/examples/xsim.different-point-types.tex -2022/02/12 | 1322848 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma 2022/02/12 | 1317 | macros/latex/contrib/xsim/examples/xsim.texsx-369803.tex -2022/02/12 | 1310513 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2022/02/12 | 1309763 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2022/02/12 | 1305 | macros/latex/contrib/snotez/README 2022/02/12 | 130588 | macros/latex/contrib/xsim/examples/xsim.texsx-350028.pdf -2022/02/12 | 1300069 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2022/02/12 | 126864 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma 2022/02/12 | 1260 | macros/latex/contrib/xsim/examples/xsim.texsx-391530.tex 2022/02/12 | 1221 | macros/latex/contrib/xsim/examples/xsim.hints.tex -2022/02/12 | 120227 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma 2022/02/12 | 11986 | macros/latex/contrib/spbmark/spbmark.tex 2022/02/12 | 1183 | macros/latex/contrib/xsim/examples/xsim.texsx-199360.tex 2022/02/12 | 1182548 | macros/latex/contrib/zref-check.zip -2022/02/12 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2022/02/12 | 115636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2022/02/12 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini -2022/02/12 | 113013 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma 2022/02/12 | 11274 | macros/latex/contrib/xsim/HISTORY -2022/02/12 | 112668 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2022/02/12 | 109549 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2022/02/12 | 109307 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma 2022/02/12 | 109265 | macros/latex/contrib/xsim/xsim-manual.tex 2022/02/12 | 1091 | language/japanese/BX/bxghost/LICENSE -2022/02/12 | 1086643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2022/02/12 | 108376 | systems/texlive/tlnet/archive/texlive-scripts.r61977.tar.xz 2022/02/12 | 1072 | macros/latex/contrib/xsim/examples/xsim.texsx-305110.tex 2022/02/12 | 1067 | macros/latex/contrib/xsim/examples/xsim.code-and-output.tex -2022/02/12 | 104697 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2022/02/12 | 10439 | indexing/xindex/lualatex/xindex-base.lua 2022/02/12 | 103971 | macros/latex/contrib/xsim/examples/xsim.issues-49.pdf -2022/02/12 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma 2022/02/12 | 10308 | macros/latex/contrib/xsim/xsimverb.sty 2022/02/12 | 10220 | macros/latex/contrib/snotez/snotez.sty -2022/02/12 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma 2022/02/12 | 1013 | macros/latex/contrib/xsim/examples/xsim.floating.tex 2022/02/11 | 999 | graphics/circuit_macros/examples/Fuses.m4 2022/02/11 | 999 | graphics/circuit_macros/doc/FusesMan.m4 @@ -373,6 +497,7 @@ 2022/02/11 | 828 | graphics/circuit_macros/examples/Grounds.m4 2022/02/11 | 824 | macros/latex/contrib/zref-clever/README.md 2022/02/11 | 810 | graphics/circuit_macros/examples/svg/GroundsSVG.m4 +2022/02/11 | 80454 | indexing/xindex/lualatex/xindex-unicode.lua 2022/02/11 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 2022/02/11 | 8006 | graphics/circuit_macros/examples/svg/controlSVG.m4 2022/02/11 | 793 | graphics/circuit_macros/examples/svg/CountingSVG.m4 @@ -399,7 +524,6 @@ 2022/02/11 | 741661 | macros/latex/contrib/zref-check/zref-check-code.pdf 2022/02/11 | 740 | graphics/circuit_macros/examples/SampleFlow.m4 2022/02/11 | 7316 | graphics/circuit_macros/doc/Relay.tex -2022/02/11 | 7268 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2022/02/11 | 7203 | graphics/circuit_macros/examples/svg/lcctSVG.m4 2022/02/11 | 715 | graphics/circuit_macros/examples/svg/ConnectorsSVG.m4 2022/02/11 | 715 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex @@ -412,6 +536,7 @@ 2022/02/11 | 703 | graphics/circuit_macros/examples/mpost/README-mpost 2022/02/11 | 7006 | graphics/circuit_macros/examples/Rectifiers.m4 2022/02/11 | 700432 | systems/texlive/tlnet/archive/verifiche.doc.r61973.tar.xz +2022/02/11 | 6883 | macros/latex/contrib/ninecolors/ninecolors.tex 2022/02/11 | 685 | graphics/circuit_macros/examples/mpost/mptest 2022/02/11 | 6854 | graphics/circuit_macros/examples/svg/DiniSVG.m4 2022/02/11 | 6854 | graphics/circuit_macros/examples/Dini.m4 @@ -493,7 +618,6 @@ 2022/02/11 | 462 | graphics/circuit_macros/Copying 2022/02/11 | 4615 | graphics/circuit_macros/examples/mf/font.m4 2022/02/11 | 460 | graphics/circuit_macros/examples/debug1.tex -2022/02/11 | 460432 | systems/texlive/tlnet/archive/snotez.doc.r61968.tar.xz 2022/02/11 | 4569 | graphics/circuit_macros/examples/rose.m4 2022/02/11 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz 2022/02/11 | 451832 | macros/latex/contrib/zref-check/zref-check.pdf @@ -566,7 +690,6 @@ 2022/02/11 | 3290 | graphics/circuit_macros/examples/svg/sfgSVG.m4 2022/02/11 | 32529 | graphics/circuit_macros/libSLD.m4 2022/02/11 | 31 | macros/latex/contrib/zref-vario/DEPENDS.txt -2022/02/11 | 3184 | systems/texlive/tlnet/archive/snotez.r61968.tar.xz 2022/02/11 | 3183 | graphics/circuit_macros/doc/NLG.tex 2022/02/11 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt 2022/02/11 | 3175 | graphics/circuit_macros/examples/Blogix.m4 @@ -588,6 +711,7 @@ 2022/02/11 | 2834 | graphics/circuit_macros/postscript.m4 2022/02/11 | 2801 | graphics/circuit_macros/examples/worm.m4 2022/02/11 | 2792 | graphics/circuit_macros/examples/OpAmpFilter.m4 +2022/02/11 | 2767 | indexing/xindex/lualatex/xindex-DIN2.lua 2022/02/11 | 2761 | macros/latex/contrib/zref-check/CHANGELOG.md 2022/02/11 | 2761 | graphics/circuit_macros/examples/sfg.m4 2022/02/11 | 2720 | graphics/circuit_macros/examples/svg/AudioSVG.m4 @@ -858,6 +982,7 @@ 2022/02/11 | 10193 | graphics/circuit_macros/examples/svg/paletteSVG.m4 2022/02/11 | 1017 | graphics/circuit_macros/doc/arrowex.m4 2022/02/11 | 10164 | graphics/circuit_macros/doc/Audio.tex +2022/02/11 | 10136 | indexing/xindex/lualatex/xindex-lapp.lua 2022/02/11 | 1003 | graphics/circuit_macros/examples/ex15.m4 2022/02/11 | 1002 | macros/latex/contrib/zref-check/README.md 2022/02/10 | 9765 | macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty @@ -986,6 +1111,7 @@ 2022/02/10 | 2374 | macros/luatex/generic/luatexja/src/patches/lltjp-unicode-math.sty 2022/02/10 | 235904 | systems/texlive/tlnet/archive/formal-grammar.doc.r61955.tar.xz 2022/02/10 | 2342 | macros/luatex/generic/luatexja/src/jfm-jis.lua +2022/02/10 | 231 | macros/latex/contrib/ninecolors/README.txt 2022/02/10 | 2294 | macros/latex/contrib/upmethodology/src/upmethodology-backpage.sty 2022/02/10 | 22294 | macros/luatex/generic/luatexja/src/luatexja.lua 2022/02/10 | 2207 | macros/luatex/generic/luatexja/src/jfm-CCT.lua @@ -1062,16 +1188,13 @@ 2022/02/09 | 83001 | systems/win32/miktex/tm/packages/luafindfont__doc.tar.lzma 2022/02/09 | 8082 | macros/latex/contrib/jmlr/CHANGES 2022/02/09 | 77938 | systems/win32/miktex/tm/packages/tkz-euclide__source.tar.lzma -2022/02/09 | 77860 | systems/texlive/tlnet/archive/spbmark.doc.r61946.tar.xz 2022/02/09 | 74974 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma 2022/02/09 | 749696 | systems/texlive/tlnet/archive/tkz-fct.doc.r61949.tar.xz 2022/02/09 | 722683 | systems/win32/miktex/tm/packages/tkz-fct__doc.tar.lzma -2022/02/09 | 699556 | systems/texlive/tlnet/archive/zref-vario.doc.r61951.tar.xz 2022/02/09 | 697475 | systems/win32/miktex/tm/packages/zref-vario__doc.tar.lzma 2022/02/09 | 6884 | systems/win32/miktex/tm/packages/tikz-karnaugh.tar.lzma 2022/02/09 | 6696 | systems/texlive/tlnet/archive/tikz-karnaugh.r61945.tar.xz 2022/02/09 | 6504 | macros/latex/contrib/censor/censor.sty -2022/02/09 | 6388 | systems/texlive/tlnet/archive/zref-vario.source.r61951.tar.xz 2022/02/09 | 633284 | macros/latex/contrib/jmlr/jmlr.pdf 2022/02/09 | 5906 | systems/win32/miktex/tm/packages/luafindfont__source.tar.lzma 2022/02/09 | 5788 | systems/win32/miktex/tm/packages/zref-check.tar.lzma @@ -1086,7 +1209,6 @@ 2022/02/09 | 43483 | systems/win32/miktex/tm/packages/tuda-ci.tar.lzma 2022/02/09 | 4210 | systems/win32/miktex/tm/packages/zref-vario.tar.lzma 2022/02/09 | 4075 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma -2022/02/09 | 4016 | systems/texlive/tlnet/archive/zref-vario.r61951.tar.xz 2022/02/09 | 3916 | info/biblio/texbook3.ltx 2022/02/09 | 38644 | systems/texlive/tlnet/archive/tkz-euclide.r61948.tar.xz 2022/02/09 | 38280 | systems/win32/miktex/tm/packages/tkz-euclide.tar.lzma @@ -1100,7 +1222,6 @@ 2022/02/09 | 33373 | macros/latex/contrib/handoutwithnotes/handoutWithNotes.dtx 2022/02/09 | 324066 | macros/latex/contrib/handoutwithnotes.zip 2022/02/09 | 322975 | macros/latex/contrib/handoutwithnotes/handoutWithNotes.pdf -2022/02/09 | 3160 | systems/texlive/tlnet/archive/spbmark.r61946.tar.xz 2022/02/09 | 2883 | info/biblio/texbook2.ltx 2022/02/09 | 2852 | info/biblio/typeset.ltx 2022/02/09 | 28126 | systems/win32/miktex/tm/packages/tkz-fct__source.tar.lzma @@ -1135,7 +1256,6 @@ 2022/02/09 | 16236 | systems/win32/miktex/tm/packages/hamnosys__source.tar.lzma 2022/02/09 | 15888 | systems/texlive/tlnet/archive/hamnosys.source.r61941.tar.xz 2022/02/09 | 15324 | systems/texlive/tlnet/archive/tkz-base.r61947.tar.xz -2022/02/09 | 151957 | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm 2022/02/09 | 1504 | systems/texlive/tlnet/archive/collection-pictures.r61943.tar.xz 2022/02/09 | 1446 | macros/latex/contrib/formal-grammar/formal-grammar.ins 2022/02/09 | 13141 | systems/win32/miktex/tm/packages/erewhon-math__source.tar.lzma @@ -1279,7 +1399,6 @@ 2022/02/08 | 5044 | systems/texlive/tlnet/archive/foilhtml.doc.r61937.tar.xz 2022/02/08 | 501 | macros/latex/contrib/beamer/base/themes/theme/beamerthemeIlmenau.sty 2022/02/08 | 50013 | systems/win32/miktex/tm/packages/zref-clever__source.tar.lzma -2022/02/08 | 49888 | systems/texlive/tlnet/archive/zref-clever.source.r61937.tar.xz 2022/02/08 | 49156 | systems/texlive/tlnet/archive/amsfonts.source.r61937.tar.xz 2022/02/08 | 490 | macros/latex/contrib/beamer/doc/beamerfontthemeexample.tex 2022/02/08 | 486 | macros/latex/contrib/beamer/doc/beamerthemeexample.tex @@ -1409,7 +1528,6 @@ 2022/02/08 | 2342372 | systems/texlive/tlnet/archive/asymptote.doc.r61937.tar.xz 2022/02/08 | 2322 | macros/latex/contrib/beamer/base/themes/color/beamercolorthememonarca.sty 2022/02/08 | 23162 | systems/win32/miktex/tm/packages/proof-at-the-end__source.tar.lzma -2022/02/08 | 22964 | systems/texlive/tlnet/archive/zref-clever.r61937.tar.xz 2022/02/08 | 22964 | macros/latex/contrib/beamer/doc/licenses/fdl.txt 2022/02/08 | 22867 | systems/win32/miktex/tm/packages/fiziko.tar.lzma 2022/02/08 | 22737 | systems/win32/miktex/tm/packages/zref-clever.tar.lzma @@ -1480,7 +1598,6 @@ 2022/02/08 | 15373 | systems/win32/miktex/tm/packages/tkz-base.tar.lzma 2022/02/08 | 153511 | systems/win32/miktex/tm/packages/byrne__doc.tar.lzma 2022/02/08 | 1517946 | systems/win32/miktex/tm/packages/zref-clever__doc.tar.lzma -2022/02/08 | 1514828 | systems/texlive/tlnet/archive/zref-clever.doc.r61937.tar.xz 2022/02/08 | 15132 | systems/win32/miktex/tm/packages/l3backend.tar.lzma 2022/02/08 | 15132 | systems/texlive/tlnet/archive/oup-authoring-template.r61937.tar.xz 2022/02/08 | 14984 | systems/texlive/tlnet/archive/l3backend.r61931.tar.xz @@ -1577,7 +1694,6 @@ 2022/02/07 | 84168 | macros/latex/contrib/proof-at-the-end/proof-at-the-end.dtx 2022/02/07 | 841476 | systems/win32/miktex/tm/packages/babel__doc.tar.lzma 2022/02/07 | 80496 | systems/win32/miktex/tm/packages/l3experimental__source.tar.lzma -2022/02/07 | 8001 | indexing/xindex/scripts/xindex.lua 2022/02/07 | 7712 | systems/win32/miktex/tm/packages/scholax__source.tar.lzma 2022/02/07 | 755978 | systems/win32/miktex/tm/packages/yquant__doc.tar.lzma 2022/02/07 | 749425 | systems/win32/miktex/tm/packages/wrapfig2__doc.tar.lzma @@ -1618,7 +1734,6 @@ 2022/02/07 | 59514 | systems/win32/miktex/tm/packages/xepersian.tar.lzma 2022/02/07 | 5892 | systems/win32/miktex/tm/packages/dtxdescribe.tar.lzma 2022/02/07 | 585343 | systems/win32/miktex/tm/packages/l3kernel__source.tar.lzma -2022/02/07 | 583510 | indexing/xindex.zip 2022/02/07 | 5812 | systems/win32/miktex/tm/packages/expkv-def.tar.lzma 2022/02/07 | 580 | systems/texlive/tlnet/archive/collection-langcjk.r61912.tar.xz 2022/02/07 | 578771 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma @@ -1633,7 +1748,6 @@ 2022/02/07 | 549130 | systems/win32/miktex/tm/packages/librebodoni.tar.lzma 2022/02/07 | 544 | systems/texlive/tlnet/archive/collection-langchinese.r61913.tar.xz 2022/02/07 | 5426 | macros/latex/contrib/tkz/tkz-euclide/README.md -2022/02/07 | 53954 | indexing/xindex/doc/xindex-doc.tex 2022/02/07 | 53719 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-examples.tex 2022/02/07 | 5349 | systems/win32/miktex/tm/packages/fontsetup__source.tar.lzma 2022/02/07 | 5343 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex @@ -1691,7 +1805,6 @@ 2022/02/07 | 4250 | systems/win32/miktex/tm/packages/crefthe__source.tar.lzma 2022/02/07 | 414404 | systems/win32/miktex/tm/packages/elements__doc.tar.lzma 2022/02/07 | 414361 | systems/win32/miktex/tm/packages/expkv-def__doc.tar.lzma -2022/02/07 | 412615 | indexing/xindex/doc/xindex-doc.pdf 2022/02/07 | 41194 | systems/win32/miktex/tm/packages/markdown.tar.lzma 2022/02/07 | 4108 | systems/win32/miktex/tm/packages/erw-l3.tar.lzma 2022/02/07 | 4087 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex @@ -1778,7 +1891,6 @@ 2022/02/07 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty 2022/02/07 | 2726 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex 2022/02/07 | 27220 | systems/win32/miktex/tm/packages/pst-node__source.tar.lzma -2022/02/07 | 2716 | indexing/xindex/lualatex/xindex-danteedition.lua 2022/02/07 | 2710 | macros/latex/contrib/tkz/tkz-base/README.md 2022/02/07 | 2707 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex 2022/02/07 | 26887 | systems/win32/miktex/tm/packages/dccpaper__source.tar.lzma @@ -1786,7 +1898,6 @@ 2022/02/07 | 25900642 | systems/win32/miktex/tm/packages/haranoaji.tar.lzma 2022/02/07 | 257908 | systems/win32/miktex/tm/packages/biblatex.tar.lzma 2022/02/07 | 25752265 | systems/win32/miktex/tm/packages/haranoaji-extra.tar.lzma -2022/02/07 | 2574 | indexing/xindex/CHANGELOG 2022/02/07 | 257200 | systems/win32/miktex/tm/packages/reledmac__source.tar.lzma 2022/02/07 | 2565010 | systems/win32/miktex/tm/packages/erewhon.tar.lzma 2022/02/07 | 25576 | systems/win32/miktex/tm/packages/pst-node.tar.lzma @@ -1937,88 +2048,3 @@ 2022/02/07 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx 2022/02/07 | 10077 | systems/win32/miktex/tm/packages/sankey.tar.lzma 2022/02/07 | 1004586 | systems/win32/miktex/tm/packages/xepersian__doc.tar.lzma -2022/02/06 | 951818 | biblio/pbibtex/pbibtex-manual.zip -2022/02/06 | 942 | biblio/pbibtex/pbibtex-manual/README.md -2022/02/06 | 88104 | systems/texlive/tlnet/archive/pyluatex.doc.r61901.tar.xz -2022/02/06 | 85939 | biblio/pbibtex/pbibtex-base.zip -2022/02/06 | 836085 | graphics/pstricks/contrib/pst-optexp/pst-optexp.dtx -2022/02/06 | 823616 | systems/texlive/tlnet/archive/yquant.doc.r61897.tar.xz -2022/02/06 | 79956 | systems/texlive/tlnet/archive/l3experimental.source.r61903.tar.xz -2022/02/06 | 760 | graphics/pgf/contrib/causets/causet_tikz_example1.tex -2022/02/06 | 697140 | systems/texlive/tlnet/archive/latex-base-dev.source.r61902.tar.xz -2022/02/06 | 6904 | systems/texlive/tlnet/archive/pyluatex.r61901.tar.xz -2022/02/06 | 684 | macros/latex/contrib/scratch3/README -2022/02/06 | 664 | systems/texlive/tlnet/archive/collection-xetex.r61886.tar.xz -2022/02/06 | 61993 | graphics/pstricks/contrib/pst-optexp/pst-optexp-quickref.pdf -2022/02/06 | 610614 | support/TeX4ht/source/tex4ht-html4.tex -2022/02/06 | 604 | systems/texlive/tlnet/archive/graphics-def.doc.r61899.tar.xz -2022/02/06 | 587508 | systems/texlive/tlnet/archive/l3kernel.source.r61903.tar.xz -2022/02/06 | 579770 | web/c_cpp/cweb.zip -2022/02/06 | 56396 | systems/texlive/tlnet/archive/yquant.r61897.tar.xz -2022/02/06 | 537241 | macros/latex/contrib/scratch3.zip -2022/02/06 | 53326 | biblio/pbibtex/pbibtex-manual/jbtxdoc.tex -2022/02/06 | 520325 | macros/latex/contrib/scratch3/scratch3-fr.pdf -2022/02/06 | 518100 | systems/texlive/tlnet/archive/translations.doc.r61896.tar.xz -2022/02/06 | 5008 | web/pwebmac/index.md -2022/02/06 | 486618 | graphics/pgf/contrib/causets.zip -2022/02/06 | 47689 | macros/latex/contrib/scratch3/scratch3.sty -2022/02/06 | 435576 | graphics/pgf/contrib/causets/causets.pdf -2022/02/06 | 38536 | biblio/pbibtex/pbibtex-manual/jbtxhak.tex -2022/02/06 | 3766 | graphics/pstricks/contrib/pst-optexp/pst-optexp.ins -2022/02/06 | 3750885 | graphics/pstricks/contrib/pst-optexp.zip -2022/02/06 | 3507648 | systems/texlive/tlnet/archive/l3experimental.doc.r61903.tar.xz -2022/02/06 | 3502 | biblio/pbibtex/pbibtex-base/jbtxdoc.bib -2022/02/06 | 346104 | web/c_cpp/cweb/cwebman.pdf -2022/02/06 | 34466 | graphics/pgf/contrib/causets/causets.tex -2022/02/06 | 3369 | graphics/pgf/contrib/causets/causet_tikz_example2.tex -2022/02/06 | 336643 | support/TeX4ht/source/tex4ht-ooffice.tex -2022/02/06 | 3311941 | graphics/pstricks/contrib/pst-optexp/pst-optexp-DE.pdf -2022/02/06 | 32810 | macros/latex/contrib/scratch3/scratch3-fr.tex -2022/02/06 | 3266542 | graphics/pstricks/contrib/pst-optexp/pst-optexp.pdf -2022/02/06 | 3122422 | info/latex-for-undergraduates.zip -2022/02/06 | 3110 | biblio/pbibtex/pbibtex-base/cpp.awk -2022/02/06 | 30811 | biblio/pbibtex/pbibtex-manual/jbibtex.tex -2022/02/06 | 29400040 | systems/texlive/tlnet/archive/latex-base-dev.doc.r61902.tar.xz -2022/02/06 | 289185 | biblio/pbibtex/pbibtex-manual/jbtxdoc.pdf -2022/02/06 | 2723 | graphics/pstricks/contrib/pst-optexp/Makefile -2022/02/06 | 26075 | biblio/pbibtex/pbibtex-base/jalpha.bst -2022/02/06 | 25829 | biblio/pbibtex/pbibtex-base/jname.bst -2022/02/06 | 257313 | biblio/pbibtex/pbibtex-manual/jbibtex.pdf -2022/02/06 | 247228 | biblio/pbibtex/pbibtex-manual/jbtxhak.pdf -2022/02/06 | 23980 | biblio/pbibtex/pbibtex-base/jxampl.bib -2022/02/06 | 233 | web/pwebmac/trapman.ch -2022/02/06 | 23196 | systems/texlive/tlnet/archive/l3experimental.r61903.tar.xz -2022/02/06 | 22890 | biblio/pbibtex/pbibtex-base/jplain.bst -2022/02/06 | 22636 | web/pwebmac/pwebmac.tex -2022/02/06 | 22624 | biblio/pbibtex/pbibtex-base/jorsj.bst -2022/02/06 | 22547 | biblio/pbibtex/pbibtex-base/jipsj.bst -2022/02/06 | 22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst -2022/02/06 | 223192 | systems/texlive/tlnet/archive/latex-base-dev.r61902.tar.xz -2022/02/06 | 2220 | web/pwebmac/README.md -2022/02/06 | 2152860 | systems/texlive/tlnet/archive/univie-ling.doc.r61900.tar.xz -2022/02/06 | 20984 | biblio/pbibtex/pbibtex-base/tieice.bst -2022/02/06 | 20777 | web/pwebmac.zip -2022/02/06 | 20673 | biblio/pbibtex/pbibtex-base/tipsj.bst -2022/02/06 | 2064 | graphics/pgf/contrib/causets/README.md -2022/02/06 | 20459 | biblio/pbibtex/pbibtex-base/junsrt.bst -2022/02/06 | 19614 | graphics/pgf/contrib/causets/causets.sty -2022/02/06 | 17434 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-styles.tex -2022/02/06 | 170460 | systems/texlive/tlnet/archive/l3kernel.r61903.tar.xz -2022/02/06 | 1554 | biblio/pbibtex/pbibtex-manual/LICENSE -2022/02/06 | 1554 | biblio/pbibtex/pbibtex-base/LICENSE -2022/02/06 | 1514 | web/pwebmac/Xerrorlog.tex -2022/02/06 | 13476 | systems/texlive/tlnet/archive/translations.r61896.tar.xz -2022/02/06 | 13420 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex -2022/02/06 | 1339 | graphics/pstricks/contrib/pst-optexp/README -2022/02/06 | 132324 | systems/texlive/tlnet/archive/univie-ling.r61900.tar.xz -2022/02/06 | 12307 | web/pwebmac/makeall -2022/02/06 | 118781 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf -2022/02/06 | 11595 | web/pwebmac/webman.ch -2022/02/06 | 11571472 | systems/texlive/tlnet/archive/l3kernel.doc.r61903.tar.xz -2022/02/06 | 10988 | systems/texlive/tlnet/archive/graphics-def.r61899.tar.xz -2022/02/06 | 1090 | biblio/pbibtex/pbibtex-base/jbibtex.bib -2022/02/06 | 10831 | graphics/pstricks/contrib/pst-optexp/Changes -2022/02/06 | 1022 | biblio/pbibtex/pbibtex-base/README.md -2022/02/06 | 101714 | biblio/pbibtex/pbibtex-base/jbtxbst.doc -2022/02/06 | 10152128 | macros/latex/contrib/acmart.zip -2022/02/06 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh diff --git a/indexing/xindex/CHANGELOG b/indexing/xindex/CHANGELOG index 70cae1d354..ed1039f89a 100644 --- a/indexing/xindex/CHANGELOG +++ b/indexing/xindex/CHANGELOG @@ -1,3 +1,7 @@ +0.40 2022-02-12 - added -i,--ignoreSpace for sorting +0.39 2022-02-12 - detect language in aux file +0.38 2022-02-11 - modified setVersion.sh +0.37 2022-02-08 - fix for doubled see entries if roman pagenumbers are set 0.36 2022-02-07 - fix for introduced bug 0.35 2022-01-22 - fix for escape character - added language spain for folium pages and header diff --git a/indexing/xindex/README.md b/indexing/xindex/README.md index 6ddb92f832..e9710684d0 100644 --- a/indexing/xindex/README.md +++ b/indexing/xindex/README.md @@ -12,6 +12,7 @@ will be included in at least LuaTeX 1.09 (TeXLive 2019) * xindex-baselib.lua -- base file * xindex-lib.lua -- functions module * xindex-lapp.lua -- read parameter +* xindex-pretty.lua -- pretty printing of tables for debugging * xindex-unicode.lua -- list of Unicode categories The syntax of `xindex` @@ -32,6 +33,7 @@ possible options are (short,long): -n,--noheadings -a,--no_casesensitive -b,--no_labels + -i,--ignoreSpace -o,--output (default "") -l,--language (default en) -p,--prefix (default L) diff --git a/indexing/xindex/doc/tests/HADW.pdf b/indexing/xindex/doc/tests/HADW.pdf index 43e7014edc..c1ddc640f5 100644 Binary files a/indexing/xindex/doc/tests/HADW.pdf and b/indexing/xindex/doc/tests/HADW.pdf differ diff --git a/indexing/xindex/doc/tests/Umlaute.pdf b/indexing/xindex/doc/tests/Umlaute.pdf index 83a38ef56d..671b16dba8 100644 Binary files a/indexing/xindex/doc/tests/Umlaute.pdf and b/indexing/xindex/doc/tests/Umlaute.pdf differ diff --git a/indexing/xindex/doc/tests/Umlaute2.pdf b/indexing/xindex/doc/tests/Umlaute2.pdf index 1ae2761ab5..2b37bbd889 100644 Binary files a/indexing/xindex/doc/tests/Umlaute2.pdf and b/indexing/xindex/doc/tests/Umlaute2.pdf differ diff --git a/indexing/xindex/doc/tests/buch.pdf b/indexing/xindex/doc/tests/buch.pdf index 8f7695f803..90ce8da0a7 100644 Binary files a/indexing/xindex/doc/tests/buch.pdf and b/indexing/xindex/doc/tests/buch.pdf differ diff --git a/indexing/xindex/doc/tests/demo-hyperref.pdf b/indexing/xindex/doc/tests/demo-hyperref.pdf index 07b47f5c4b..5cc9900662 100644 Binary files a/indexing/xindex/doc/tests/demo-hyperref.pdf and b/indexing/xindex/doc/tests/demo-hyperref.pdf differ diff --git a/indexing/xindex/doc/tests/demo.pdf b/indexing/xindex/doc/tests/demo.pdf index bd5bd8371c..8ee6506f67 100644 Binary files a/indexing/xindex/doc/tests/demo.pdf and b/indexing/xindex/doc/tests/demo.pdf differ diff --git a/indexing/xindex/doc/tests/demo2.ind b/indexing/xindex/doc/tests/demo2.ind index 6bd956f8c6..a2bfb309fc 100644 --- a/indexing/xindex/doc/tests/demo2.ind +++ b/indexing/xindex/doc/tests/demo2.ind @@ -9,7 +9,7 @@ \indexspace \textbf{D}\label{L-xindex-D} \nopagebreak[4] - \item {Downes}, Michael, {xxxvi}, {xxxvii} + \item {Downes}, Michael, {xxxvif} \indexspace \textbf{F}\label{L-xindex-F} diff --git a/indexing/xindex/doc/tests/demo3.pdf b/indexing/xindex/doc/tests/demo3.pdf index 28ac172fd1..2d72ee52eb 100644 Binary files a/indexing/xindex/doc/tests/demo3.pdf and b/indexing/xindex/doc/tests/demo3.pdf differ diff --git a/indexing/xindex/doc/tests/demo4.pdf b/indexing/xindex/doc/tests/demo4.pdf index 06202ce455..7db4dc7fd2 100644 Binary files a/indexing/xindex/doc/tests/demo4.pdf and b/indexing/xindex/doc/tests/demo4.pdf differ diff --git a/indexing/xindex/doc/xindex-doc.pdf b/indexing/xindex/doc/xindex-doc.pdf index 882997ed02..4ade479cc9 100644 Binary files a/indexing/xindex/doc/xindex-doc.pdf and b/indexing/xindex/doc/xindex-doc.pdf differ diff --git a/indexing/xindex/doc/xindex-doc.tex b/indexing/xindex/doc/xindex-doc.tex index 683a906425..dec79692e7 100644 --- a/indexing/xindex/doc/xindex-doc.tex +++ b/indexing/xindex/doc/xindex-doc.tex @@ -1,4 +1,4 @@ -%% $Id: xindex-doc.tex 20 2022-01-22 10:37:29Z hvoss $ +%% $Id: xindex-doc.tex 22 2022-02-07 12:18:15Z hvoss $ % \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\xIndexVersion{#2}} -\setVersion{version = 0.36}% can be automatically changed by perl +\setVersion{version = 0.40}% can be automatically changed by perl \setkeys{dtk}{cleanup=true,force} @@ -92,7 +92,7 @@ \begin{document} \maketitle \thispagestyle{empty} -\enlargethispage{1cm} +%\enlargethispage{1cm} \tableofcontents \vfill @@ -102,6 +102,7 @@ Denis Bitouzé; Brian Dunn; Gonzalo Pesquero Serrano; Michal Hoftich; +Mykel Kochenderfer; Frank Mittelbach; Heiko Oberdiek; Matteo Paolini; @@ -109,7 +110,6 @@ Stefan Pinnow; Florent Rougon; Martin Sievers; Simon Spiegel - \clearpage \section{Introduction} @@ -173,7 +173,9 @@ xindex [-a, --no_casesensitive ] default is false [-b,--no_labels ] default is false [-n,--noheadings ] default is false + [-i,--ignoreSpace ] default is false [-o,--output ] default is .ind + [-k,--checklang ] default ist false [-l,--language ] default is en [-p,--prefix] default L [-u,--use_UCA ] default is false @@ -369,19 +371,20 @@ Run \texttt{xindex} with \texttt{xindex -e ">"}\index{}\index{123} The \Index{language} is only important for the first two headers in the output of the index data. They are by default \emph{Symbols} followed by \emph{Numbers}. In a new version of \Lprog{xindex} it will be customizable. -The predefined language is »en« and currently the following languages are possible: +The predefined language is »en« and currently the following languages which its alias are possible: \begin{Verbatim}[commandchars=\\<>] indexheader = { - cs = {"Symboly", "Čísla"}, - da = {"Symboler", "Tal"}, - de = {"Symbole", "Zahlen"}, - en = {"Symbols", "Numbers"}, - es = {"Símbolos", "Números"}, - fr = {"Symboles","Nombres"}, - it = {"Simboli", "Numeri"}, - \Japanese jp = {"シンボル","番号"}, - \DejaVuMono no = {"Symboler","Tall"}, + cs = {"Symboly", "Čísla", "czech"}, + da = {"Symboler", "Tal", "danish"}, + de = {"Symbole", "Zahlen", "austrian", "german", "germanb", "ngerman", "naustrian"}, + en = {"Symbols", "Numbers", "english", "USenglish", "american", "UKenglish", "british", "canadian", "australian", "newzealand"}, + es = {"Símbolos", "Números", "spanish"}, + fr = {"Symboles","Nombres", "french", "francais", "canadien", "acadian"}, + it = {"Simboli", "Numeri", "italian"}, + \Japanese jp = {"シンボル","番号","japanese"}, + \DejaVuMono nl = {"Symbolen", "Nummers", "dutch"}, + no = {"Symboler","Tall", "norsk", "nynorsk"}, } \end{Verbatim} @@ -402,6 +405,7 @@ The following example was run with \verb|xindex -l it .idx|: lstOptions={columns=fixed}]{xindex} %! lualatex \documentclass{scrartcl} +\usepackage[italian]{babel} \makeatletter \def\theindex{% only for demonstration \section*{\indexname} @@ -428,6 +432,55 @@ Run \texttt{xindex} with \texttt{xindex -l it -e ">"}\index{123} \end{externalDocument} +The following example was run with \verb|xindex -l "*" .idx|. Then the language is detected from +the \Lfile{aux} file. This is only possible if package \Lpack{babel} or \Lpack{polyglossia} are used. + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + pages={1,2}, + frame, + compiler=lualatex, + crop, + xindex, + xindexOptions=-l "*" -e "?", + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex +\documentclass{scrartcl} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +%StartVisiblePreamble +\usepackage[canadien]{babel} +\usepackage{makeidx}\makeindex +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +\section{Escaping characters with ?} +\begin{itemize} +\item Exclamation mark ! \index{exclaim (?!)} +\item Vertical bar| \index{Vertical bar (?|)} +\item Doublequote \verb|"| \index{?"} +\item Double doublequote \verb|""| \index{?"?"} +\item At character @ \index{At (?@)} +\end{itemize} +Run \texttt{xindex} with \texttt{xindex -l "*" -e "?"}\index{123} +\newpage +\printindex +\end{document} +\end{externalDocument} + +Instead of using \verb|-l *| one can also use the parameter \verb|-k| or \verb|--checklang|. + + + + \section{Sorting} \subsection{Default sorting by a character table} The default sorting is unicode aware and uses a translation table for accented characters: @@ -747,11 +800,205 @@ UCA should be don't in the file \Lfile{xindex-cfg-uca.lua}, which will automatic by \Lprog{xindex}. +\subsection{Case sensitive index entries} +By default \textsf{foo} and \textsf{Foo} are two different entries and will handled differently +by \Lprog{xindex}: \textsf{Foo} will be as an own entry \emph{before} \textsf{foo}. Let's see +a more complex example. In the index the entry \verb|xindex-DIN2.lua| is the first one of +the \verb|xindex-???| series because uppercase letters are sorted before lowercase letters. + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + mpwidth=0.55\linewidth, + pages={2}, + frame=false, + compiler=lualatex --shell-escape, + crop, + xindex, +% xindexOptions=, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex --shell-escape +\documentclass{scrartcl} +\usepackage{libertinus-otf} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +\begin{filecontents}[force,noheader]{\jobname.idx} +\indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} +\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} +\indexentry{xindex-newfile.lua file@\texttt {xindex-newfile.lua} file|hyperpage}{6} +\indexentry{xindex-DIN2.lua file@\texttt {xindex-DIN2.lua} file|hyperpage}{6} +\indexentry{xindex-cfg-common.cfg file@\texttt {xindex-cfg-common.cfg} file|hyperpage}{9} +\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{10} +\indexentry{xindex-HAdW-eKO.lua file@\texttt {xindex-HAdW-eKO.lua} file|hyperpage}{10} +\indexentry{xindex-dtk.lua file@\texttt {xindex-dtk.lua} file|hyperpage}{12} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{13} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} +\indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} +\indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} +\end{filecontents} +%StartVisiblePreamble +\usepackage{makeidx} +\usepackage{hyperref} +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +foo\newpage +\printindex +\end{document} +\end{externalDocument} + + + +The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has another output: now +\verb|xindex-cfg-common.lua| is the first one of the \verb|xindex-???| series. + + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + mpwidth=0.55\linewidth, + pages={2}, + frame=false, + compiler=lualatex --shell-escape, + crop, + xindex, + xindexOptions=-a, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex --shell-escape +\documentclass{scrartcl} +\usepackage{libertinus-otf} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +\begin{filecontents}[force,noheader]{\jobname.idx} +\indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} +\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} +\indexentry{xindex-newfile.lua file@\texttt {xindex-newfile.lua} file|hyperpage}{6} +\indexentry{xindex-DIN2.lua file@\texttt {xindex-DIN2.lua} file|hyperpage}{6} +\indexentry{xindex-cfg-common.cfg file@\texttt {xindex-cfg-common.cfg} file|hyperpage}{9} +\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{10} +\indexentry{xindex-HAdW-eKO.lua file@\texttt {xindex-HAdW-eKO.lua} file|hyperpage}{10} +\indexentry{xindex-dtk.lua file@\texttt {xindex-dtk.lua} file|hyperpage}{12} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{13} +\indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} +\indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} +\indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} +\end{filecontents} +%StartVisiblePreamble +\usepackage{makeidx} +\usepackage{hyperref} +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +foo\newpage +\printindex +\end{document} +\end{externalDocument} + + + + + + + +\subsection{Ignore space for sorting} +By default \textsf{alpha sort} will be sorted \emph{before} \textsf{alphaA}: + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + mpwidth=0.55\linewidth, + pages={2}, + frame=false, + compiler=lualatex --shell-escape, + crop, + xindex, +% xindexOptions=, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex --shell-escape +\documentclass{scrartcl} +\usepackage{libertinus-otf} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +%StartVisiblePreamble +\usepackage{makeidx}\makeindex +% default sorting +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +Test +\index{alpha sort}\index{alphaA} +\newpage +\printindex +\end{document} +\end{externalDocument} + + +This can be changed with the optional argument \verb|-i| or \verb|--ignoreSpace|: + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + mpwidth=0.55\linewidth, + pages={2}, + frame=false, + compiler=lualatex --shell-escape, + crop, + xindex, + xindexOptions=-i, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex --shell-escape +\documentclass{scrartcl} +\usepackage{libertinus-otf} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\makeatother +%StartVisiblePreamble +\usepackage{makeidx}\makeindex +% sort with xindex -i +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +Test +\index{alpha sort}\index{alphaA} +\newpage +\printindex +\end{document} +\end{externalDocument} + %\clearpage -\section{Compressing pagenumbers}\label{Compressing} +\subsection{Compressing pagenumber series}\label{Compressing} By default page sequences of an entry are compressed to \begin{description} \item[8f] page 8 and 9 @@ -820,62 +1067,7 @@ foo\index{foo}foobar\index{foobar|)} \end{externalDocument} - -\section{\texttt{hyperref}} - -Using the package \Lpack{hyperref} is no problem: - -\enlargethispage{2.5\normalbaselineskip} - -\begin{externalDocument}[ -% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, - mpwidth=0.55\linewidth, - pages={3}, - frame=false, - compiler=lualatex, - crop, - xindex, - xindexOptions=-l de, - force=true, - runs=2,code,docType=latex, - showFilename, - align=\centering, - lstOptions={columns=fixed}]{xindex} -%! lualatex -\documentclass[paper=a6]{scrartcl} -\usepackage{multicol} -\makeatletter -\def\theindex{% only for demonstration - \section*{\indexname} - \begin{multicols}{2} - \parskip\z@ \@plus .3\p@\relax \parindent\z@ - \let\item\@idxitem} -\def\endtheindex{\end{multicols}} -\makeatother -%StartVisiblePreamble -\usepackage{makeidx}\makeindex -\usepackage{hvindex}% for \Index -\usepackage[colorlinks]{hyperref} -%StopVisiblePreamble -\pagestyle{empty} -\begin{document} -Sorted with \verb|-l DE| -\Index{Österreich} \Index{Öresund} -\Index{Ostern} \Index{Ober} \Index{Oberin} -\Index{Österreich} \index{Öresund|textbf} -\Index{Ostern} \Index{Ober} \Index{Oberin} -\Index{Obstler} \Index{Öl} \Index{ölen} -\Index{Ödem} \Index{Oligarch} \Index{Oder} -\Index{oder} \index{Fluss!Oder|textit} -\Index{Oder|seealso{Fluss}} \Index{Göbel} -\Index{Goethe} \Index{Göthe} \Index{Götz} -\newpage\Index{Goldmann} \Index{Goethe} -\newpage \printindex -\end{document} -\end{externalDocument} - - -\section{Page argument} +\subsection{Modify Pagenumber} Every page can be combined with an additional macro, like \verb=\index{foo|fbox}=, the page number will be set into a framebox. If we have on the same page the two commands: @@ -930,6 +1122,8 @@ und foo\index{foo|fbox} + + \section{The config file} The main config file is \Lfile{xindex-cfg.lua} is used by default and loading it by the @@ -1245,6 +1439,59 @@ baz\index{foo!bar!baz} foobar% +\section{\texttt{hyperref}} + +Using the package \Lpack{hyperref} is no problem: + +\enlargethispage{2.5\normalbaselineskip} + +\begin{externalDocument}[ +% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, + mpwidth=0.55\linewidth, + pages={3}, + frame=false, + compiler=lualatex, + crop, + xindex, + xindexOptions=-l de, + force=true, + runs=2,code,docType=latex, + showFilename, + align=\centering, + lstOptions={columns=fixed}]{xindex} +%! lualatex +\documentclass[paper=a6]{scrartcl} +\usepackage{multicol} +\makeatletter +\def\theindex{% only for demonstration + \section*{\indexname} + \begin{multicols}{2} + \parskip\z@ \@plus .3\p@\relax \parindent\z@ + \let\item\@idxitem} +\def\endtheindex{\end{multicols}} +\makeatother +%StartVisiblePreamble +\usepackage{makeidx}\makeindex +\usepackage{hvindex}% for \Index +\usepackage[colorlinks]{hyperref} +%StopVisiblePreamble +\pagestyle{empty} +\begin{document} +Sorted with \verb|-l DE| +\Index{Österreich} \Index{Öresund} +\Index{Ostern} \Index{Ober} \Index{Oberin} +\Index{Österreich} \index{Öresund|textbf} +\Index{Ostern} \Index{Ober} \Index{Oberin} +\Index{Obstler} \Index{Öl} \Index{ölen} +\Index{Ödem} \Index{Oligarch} \Index{Oder} +\Index{oder} \index{Fluss!Oder|textit} +\Index{Oder|seealso{Fluss}} \Index{Göbel} +\Index{Goethe} \Index{Göthe} \Index{Götz} +\newpage\Index{Goldmann} \Index{Goethe} +\newpage \printindex +\end{document} +\end{externalDocument} + @@ -1514,116 +1761,6 @@ run \verb|xindex -c header | -\section{Case sensitive index entries} -By default \textsf{foo} and \textsf{Foo} are two different entries and will handled differently -by \Lprog{xindex}: \textsf{Foo} will be as an own entry \emph{before} \textsf{foo}. Let's see -a more complex example. In the index the entry \verb|xindex-DIN2.lua| is the first one of -the \verb|xindex-???| series because uppercase letters are sorted before lowercase letters. - -\begin{externalDocument}[ -% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, - mpwidth=0.55\linewidth, - pages={2}, - frame=false, - compiler=lualatex --shell-escape, - crop, - xindex, -% xindexOptions=, - force=true, - runs=2,code,docType=latex, - showFilename, - align=\centering, - lstOptions={columns=fixed}]{xindex} -%! lualatex --shell-escape -\documentclass{scrartcl} -\usepackage{libertinus-otf} -\makeatletter -\def\theindex{% only for demonstration - \section*{\indexname} - \parskip\z@ \@plus .3\p@\relax \parindent\z@ - \let\item\@idxitem} -\makeatother -\begin{filecontents}[force,noheader]{\jobname.idx} -\indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} -\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} -\indexentry{xindex-newfile.lua file@\texttt {xindex-newfile.lua} file|hyperpage}{6} -\indexentry{xindex-DIN2.lua file@\texttt {xindex-DIN2.lua} file|hyperpage}{6} -\indexentry{xindex-cfg-common.cfg file@\texttt {xindex-cfg-common.cfg} file|hyperpage}{9} -\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{10} -\indexentry{xindex-HAdW-eKO.lua file@\texttt {xindex-HAdW-eKO.lua} file|hyperpage}{10} -\indexentry{xindex-dtk.lua file@\texttt {xindex-dtk.lua} file|hyperpage}{12} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{13} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} -\indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} -\indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} -\end{filecontents} -%StartVisiblePreamble -\usepackage{makeidx} -\usepackage{hyperref} -%StopVisiblePreamble -\pagestyle{empty} -\begin{document} -foo\newpage -\printindex -\end{document} -\end{externalDocument} - - -The same example sorted with the \verb|-a| or \verb|--nocasesensitive| has another output: now -\verb|xindex-cfg-common.lua| is the first one of the \verb|xindex-???| series. - - -\begin{externalDocument}[ -% grfOptions={width=\dimexpr\linewidth-2\fboxsep-2\fboxrule}, - mpwidth=0.55\linewidth, - pages={2}, - frame=false, - compiler=lualatex --shell-escape, - crop, - xindex, - xindexOptions=-a, - force=true, - runs=2,code,docType=latex, - showFilename, - align=\centering, - lstOptions={columns=fixed}]{xindex} -%! lualatex --shell-escape -\documentclass{scrartcl} -\usepackage{libertinus-otf} -\makeatletter -\def\theindex{% only for demonstration - \section*{\indexname} - \parskip\z@ \@plus .3\p@\relax \parindent\z@ - \let\item\@idxitem} -\makeatother -\begin{filecontents}[force,noheader]{\jobname.idx} -\indexentry{xindex package@\texttt {xindex} package|hyperpage}{2} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{4} -\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{6} -\indexentry{xindex-newfile.lua file@\texttt {xindex-newfile.lua} file|hyperpage}{6} -\indexentry{xindex-DIN2.lua file@\texttt {xindex-DIN2.lua} file|hyperpage}{6} -\indexentry{xindex-cfg-common.cfg file@\texttt {xindex-cfg-common.cfg} file|hyperpage}{9} -\indexentry{xindex-cfg.lua file@\texttt {xindex-cfg.lua} file|hyperpage}{10} -\indexentry{xindex-HAdW-eKO.lua file@\texttt {xindex-HAdW-eKO.lua} file|hyperpage}{10} -\indexentry{xindex-dtk.lua file@\texttt {xindex-dtk.lua} file|hyperpage}{12} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{13} -\indexentry{xindex program@\texttt {xindex} program|hyperpage}{14} -\indexentry{xindex-cfg-common.lua file@\texttt {xindex-cfg-common.lua} file|hyperpage}{14} -\indexentry{xindex package@\texttt {xindex} package|hyperpage}{15} -\end{filecontents} -%StartVisiblePreamble -\usepackage{makeidx} -\usepackage{hyperref} -%StopVisiblePreamble -\pagestyle{empty} -\begin{document} -foo\newpage -\printindex -\end{document} -\end{externalDocument} - - \section{Automatic index creation} diff --git a/indexing/xindex/latex/xindex.sty b/indexing/xindex/latex/xindex.sty index 65799577dc..0330eee8e3 100644 --- a/indexing/xindex/latex/xindex.sty +++ b/indexing/xindex/latex/xindex.sty @@ -1,6 +1,6 @@ %% This is file `xindex.sty', %% -%% Copyright (C) 2019- +%% Copyright (C) 2018-2021 %% Herbert Voss %% %% It may be distributed and/or modified under the diff --git a/indexing/xindex/lualatex/xindex-AU.lua b/indexing/xindex/lualatex/xindex-AU.lua index b1adc53813..fd484a7d60 100644 --- a/indexing/xindex/lualatex/xindex-AU.lua +++ b/indexing/xindex/lualatex/xindex-AU.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-AU'] = { - version = 0.33, + version = 0.40, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-DIN2.lua b/indexing/xindex/lualatex/xindex-DIN2.lua index 35ec8ab462..a619a74969 100644 --- a/indexing/xindex/lualatex/xindex-DIN2.lua +++ b/indexing/xindex/lualatex/xindex-DIN2.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-DIN2'] = { - version = 0.33, + version = 0.35, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua index 2244992db4..ac152ba7f9 100644 --- a/indexing/xindex/lualatex/xindex-HAdW-eKO.lua +++ b/indexing/xindex/lualatex/xindex-HAdW-eKO.lua @@ -5,13 +5,13 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-HAdW-eKO.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-HAdW-eKO.lua 13 2021-08-15 10:49:40Z hvoss $ ----------------------------------------------------------------------- -- -- configuration for index files of the Heidelberger Akademie der Wissenschaften if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = { - version = 0.35, + version = 0.34, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-base.lua b/indexing/xindex/lualatex/xindex-base.lua index 20fa9a494d..e7c16becf1 100644 --- a/indexing/xindex/lualatex/xindex-base.lua +++ b/indexing/xindex/lualatex/xindex-base.lua @@ -5,10 +5,10 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-base.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-base.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- -local info = { version = 0.35 } +local info = { version = 0.40 } -- check config if pageNoPrefixDel ~= "" then @@ -293,7 +293,7 @@ for k=1,#NewIndex do end indLines = indLines + 1 end - end + end -- not no_headings oldChar = currentChar end if specialItemOutput then diff --git a/indexing/xindex/lualatex/xindex-baselib.lua b/indexing/xindex/lualatex/xindex-baselib.lua index 0ff33a591e..4e5c09a87d 100644 --- a/indexing/xindex/lualatex/xindex-baselib.lua +++ b/indexing/xindex/lualatex/xindex-baselib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-baselib.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-baselib.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-baselib'] = { - version = 0.35, + version = 0.40, comment = "base library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -128,12 +128,36 @@ function romanToNumber(s) return ret end +function toNumber(s) -- number as string or a roman number to arabic number + if s == nil then return s end + if type(s) == "number" then return s end -- it is already a number + local rnum = romanToNumber(s) -- check if roman + if rnum then return rnum end -- if yes, return converted roman + return tonumber(s) -- return string to number +end + +--[[ function string:split() local sep, fields = " ", {} local pattern = string.format("([^%s]+)", sep) self:gsub(pattern, function(c) fields[#fields+1] = c end) return fields end +]] + +function string:split(s) + local D + if not s then + D = '%s' + else + D = tostring(s) + end + local sep, fields = " ", {} + local pattern = string.format("([^"..D.."]+)", sep) + self:gsub(pattern, function(c) fields[#fields+1] = c end) + return fields +end + function shellsort(a) local inc = math.ceil( #a / 2 ) diff --git a/indexing/xindex/lualatex/xindex-cfg-common.lua b/indexing/xindex/lualatex/xindex-cfg-common.lua index 21267039d5..270d5d5c3c 100644 --- a/indexing/xindex/lualatex/xindex-cfg-common.lua +++ b/indexing/xindex/lualatex/xindex-cfg-common.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-common.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-cfg-common.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-common'] = { - version = 0.35, + version = 0.40, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -17,17 +17,66 @@ if not modules then modules = { } end modules ['xindex-cfg-common'] = { } indexheader = { - cs = {"Symboly", "Čísla"}, - da = {"Symboler", "Tal"}, - de = {"Symbole", "Zahlen"}, - en = {"Symbols", "Numbers"}, - es = {"Símbolos", "Números"}, - fr = {"Symboles","Nombres"}, - it = {"Simboli", "Numeri"}, - jp = {"シンボル","番号"}, - no = {"Symboler","Tall"}, + cs = {"Symboly", "Čísla", "czech"}, + da = {"Symboler", "Tal", "danish"}, + de = {"Symbole", "Zahlen", "austrian", "german", "germanb", "ngerman", "naustrian"}, + en = {"Symbols", "Numbers", "english", "USenglish", "american", "UKenglish", "british", "canadian", "australian", "newzealand"}, + es = {"Símbolos", "Números", "spanish"}, + fr = {"Symboles","Nombres", "french", "francais", "canadien", "acadian"}, + it = {"Simboli", "Numeri", "italian"}, + jp = {"シンボル","番号", "japanese"}, + nl = {"Symbolen", "Nummers", "dutch"}, + no = {"Symboler","Tall", "norsk", "nynorsk"}, } +--[[ babel +afrikaans +azerbaijani +basque +breton +bulgarian +catalan +croatian +czech +danish +dutch +english, USenglish, american, UKenglish, british, canadian, australian, newzealand +esperanto +estonian +finnish +french, francais, canadien, acadian +galician +austrian, german, germanb, ngerman, naustrian +greek, polutonikogreek +hebrew +icelandic +indonesian (bahasa, indon, bahasai) +interlingua +irish +italian +latin +lowersorbian +malay, melayu (bahasam) +samin +norsk, nynorsk +polish +portuguese +brazilian (portuges, brazil) +romanian +russian +scottish +spanish +slovak +slovene +swedish +serbian +turkish +ukrainian +uppersorbian +welsh +]] + + folium = { cs = {"f.", "ff."}, da = {"f", "ff"}, @@ -37,6 +86,7 @@ folium = { fr = {"\\,sq.","\\,sqq."}, it = {"f", "ff"}, jp = {"シンボル","番号"}, + nl = {"f.", "ff."}, no = {"\\,f.","\\,ff."}, } diff --git a/indexing/xindex/lualatex/xindex-cfg-uca.lua b/indexing/xindex/lualatex/xindex-cfg-uca.lua index 098e314e3e..cd5b5dbb12 100644 --- a/indexing/xindex/lualatex/xindex-cfg-uca.lua +++ b/indexing/xindex/lualatex/xindex-cfg-uca.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg-uca.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-cfg-uca.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg-lua'] = { - version = 0.35, + version = 0.40, comment = "configuration to xindex-cfg-uca.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-cfg.lua b/indexing/xindex/lualatex/xindex-cfg.lua index 0adba23737..1ee09e57dc 100644 --- a/indexing/xindex/lualatex/xindex-cfg.lua +++ b/indexing/xindex/lualatex/xindex-cfg.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-cfg.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-cfg.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.35, + version = 0.40, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-danteedition.lua b/indexing/xindex/lualatex/xindex-danteedition.lua index c39f92d652..246f877623 100644 --- a/indexing/xindex/lualatex/xindex-danteedition.lua +++ b/indexing/xindex/lualatex/xindex-danteedition.lua @@ -9,7 +9,7 @@ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.36, + version = 0.40, comment = "configuration file for the DANTE Edition", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-dtk.lua b/indexing/xindex/lualatex/xindex-dtk.lua index 945094663f..d4e10b75da 100644 --- a/indexing/xindex/lualatex/xindex-dtk.lua +++ b/indexing/xindex/lualatex/xindex-dtk.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-dtk.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-dtk.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-cfg'] = { - version = 0.35, + version = 0.40, comment = "DTK configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-lib.lua b/indexing/xindex/lualatex/xindex-lib.lua index dedf476ac2..61c4f90d9d 100644 --- a/indexing/xindex/lualatex/xindex-lib.lua +++ b/indexing/xindex/lualatex/xindex-lib.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-lib.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-lib.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-lib'] = { - version = 0.35, + version = 0.40, comment = "main library to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", @@ -311,8 +311,8 @@ function compressEntryList(EntryList) end end -- last data line - newList[#newList]["pages"] = deletePageDups(newList[#newList]["pages"]) -- require 'xindex-pretty'.dump(newList) -- only for internal dump + newList[#newList]["pages"] = deletePageDups(newList[#newList]["pages"]) return newList end @@ -354,14 +354,14 @@ end function compressPageList(pages) -- called with (v["pages"]) writeLog(1,"compressPageList: we have "..#pages.." pages for this entry\n",2) -- require 'xindex-pretty'.dump(pages) -- only for internal dump - pages = deletePageDups(pages) -- delete duplicate page numners with same special + pages = deletePageDups(pages) -- delete duplicate page numbers with same special local str if #pages == 1 then -- only one pageno return pages end -- only one pageno if #pages == 2 then -- only two pages - if tonumber(pages[1]["number"]) and tonumber(pages[2]["number"]) then - if ((tonumber(pages[2]["number"]) - tonumber(pages[1]["number"])) == 1) and (pages[1]["special"] == pages[2]["special"]) then + if toNumber(pages[1]["number"]) and toNumber(pages[2]["number"]) then + if ((toNumber(pages[2]["number"]) - toNumber(pages[1]["number"])) == 1) and (pages[1]["special"] == pages[2]["special"]) then if fCompress then pages[1]["number"] = pages[1]["number"]..page_folium[1] pages[2] = nil @@ -392,8 +392,8 @@ function compressPageList(pages) -- called with (v["pages"]) end if args_v then print ("compressPageList: more than two pages for the entry\n") end for i=startIndex,#pages do - if tonumber(pages[i-1]["number"]) and tonumber(pages[i]["number"]) then -- de we have something like 17--31 in the current list - if ((tonumber(pages[i]["number"])-tonumber(pages[i-1]["number"])) == 1) and + if (toNumber(pages[i-1]["number"]) and toNumber(pages[i]["number"])) then -- do we have two arabic or two roman numbers? + if ((toNumber(pages[i]["number"])-toNumber(pages[i-1]["number"])) == 1) and (pages[i]["special"] == pages[i-1]["special"]) then -- something like 12, 13 with identical |\special series[#series+1] = pages[i]-- page difference is 1, add page to series elseif (#series == 1) then -- no -f page -> only one page -> output @@ -529,10 +529,18 @@ function GenerateSortKey(a) end if no_caseSensitive then A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty - a["SortKey"] = A + if ignoreSpace then + a["SortKey"] = A:gsub("%s+", "") -- remove spaces + else + a["SortKey"] = A + end else A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty - a["SortKey"] = A + if ignoreSpace then + a["SortKey"] = A:gsub("%s+", "")-- remove spaces + else + a["SortKey"] = A + end end -- return A end @@ -754,12 +762,12 @@ end function itemOutput(last, v, hyperpage) local lastItems = last --- print (tostring("test: "),v["Entry"],lastItems[1],lastItems[2],lastItems[3],type(lastItems[1]),#lastItems) + --print (tostring("test: "),v["Entry"],lastItems[1],lastItems[2],lastItems[3],type(lastItems[1]),#lastItems) local currentItems = {} local Entry = v["Entry"] local mainEntry = getItem(Entry,0) -- save current main letter local lastmainEntry = last[1] -- save last main letter --- require 'xindex-pretty'.dump(v) -- only for internal dump + --require 'xindex-pretty'.dump(v) -- only for internal dump local str local excl = select(2,string.gsub(Entry,"!","!")) -- Number of ! writeLog(1,"itemOutput(): We have entry "..Entry.."\n",2) diff --git a/indexing/xindex/lualatex/xindex-norsk.lua b/indexing/xindex/lualatex/xindex-norsk.lua index 6d6853dd03..9e02d3018c 100644 --- a/indexing/xindex/lualatex/xindex-norsk.lua +++ b/indexing/xindex/lualatex/xindex-norsk.lua @@ -6,11 +6,11 @@ -- MODIFIED: Sveinung Heggen (2020-01-02) -- LICENSE: LPPL1.3 -- --- $Id: xindex-norsk.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-norsk.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-no'] = { - version = 0.35, + version = 0.40, comment = "configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/lualatex/xindex-pretty.lua b/indexing/xindex/lualatex/xindex-pretty.lua index 80699a0313..e626c1225b 100644 --- a/indexing/xindex/lualatex/xindex-pretty.lua +++ b/indexing/xindex/lualatex/xindex-pretty.lua @@ -3,11 +3,11 @@ -- Also provides a sandboxed Lua table reader and -- a function to present large numbers in human-friendly format. -- --- $Id: xindex-pretty.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-pretty.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-pretty'] = { - version = 0.35, + version = 0.40, comment = "dump a Lua table for debugging", author = "Steve Donovan", copyright = "Steve Donovan", diff --git a/indexing/xindex/lualatex/xindex-yannis.lua b/indexing/xindex/lualatex/xindex-yannis.lua index 93757ea413..dceb9bf3cd 100644 --- a/indexing/xindex/lualatex/xindex-yannis.lua +++ b/indexing/xindex/lualatex/xindex-yannis.lua @@ -5,11 +5,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL1.3 -- --- $Id: xindex-yannis.lua 19 2022-01-22 09:59:15Z hvoss $ +-- $Id: xindex-yannis.lua 22 2022-02-07 12:18:15Z hvoss $ ----------------------------------------------------------------------- if not modules then modules = { } end modules ['xindex-yannis'] = { - version = 0.35, + version = 0.40, comment = "main configuration to xindex.lua", author = "Herbert Voss", copyright = "Herbert Voss", diff --git a/indexing/xindex/scripts/xindex.lua b/indexing/xindex/scripts/xindex.lua index 984187bf38..72ee4a48e1 100755 --- a/indexing/xindex/scripts/xindex.lua +++ b/indexing/xindex/scripts/xindex.lua @@ -6,11 +6,11 @@ -- AUTHOR: Herbert Voß -- LICENSE: LPPL 1.3 -- --- $Id: xindex.lua 21 2022-01-27 17:45:10Z hvoss $ +-- $Id: xindex.lua 22 2022-02-11 12:18:15Z hvoss $ ----------------------------------------------------------------------- xindex = xindex or { } - local version = 0.36 + local version = 0.40 xindex.version = version --xindex.self = "xindex" @@ -49,8 +49,10 @@ local args = require ('xindex-lapp') [[ -n,--noheadings -a,--no_casesensitive -b,--no_labels + -i,--ignoreSpace -o,--output (default "") - -l,--language (default en) + -k --checklang same as * star for checking aux file + -l,--language (default en) or * for detecting the language from the aux file -p,--prefix (default L) -u,--use_UCA -s,--use_stdin @@ -97,7 +99,9 @@ require('xindex-baselib') local nInFiles = #args.files if not useStdInput then - --print(tostring(nInFiles).." input files are given!") + if vlevel == 3 then + print(tostring(nInFiles).." input file(s): ") + end inFiles = {} --args.files as strings for i = 1,nInFiles do local file = args.files_name[i] @@ -108,6 +112,9 @@ if not useStdInput then else inFiles[#inFiles+1] = file end + if vlevel == 3 then + print(file) + end end end @@ -153,7 +160,7 @@ require('xindex-lib') writeLog(2,"xindex v."..version.." (c) Herbert Voß\n",-1) writeLog(1,"Verbose level = "..vlevel.."\n",1) -writeLog(2,"Logfile:"..logfilename,1) +writeLog(2,"Logfile:"..logfilename.."\n",1) writeLog(2,"Open outputfile "..outfilename,0) outFile = io.open(outfilename,"w+") @@ -172,6 +179,13 @@ end -- writeLog(2,"Using input file: "..inFile.."\n",0) +if args["ignoreSpace"] then + ignoreSpace = args["ignoreSpace"] +else + ignoreSpace = false +end +writeLog(2,"ignore space for sorting: "..tostring(ignoreSpace).."\n",-1) + labelPrefix = args.prefix writeLog(2,"Label prefix: "..labelPrefix.."\n",-1) @@ -208,9 +222,57 @@ escape_chars = { -- by default " is the escape char -- esc_char..'%( is not needed because it can only appear after | -language = "en" -- default language +outFile = io.open(outfilename,"w+") + +local aux_language = "" + +if args["checklang"] or (args["language"] == "*") then + writeLog(2,'Check language in aux file\n',0) + -- \babel@aux{german}{} package babel + -- \selectlanguage *[variant=german,spelling=new,]{german} package polyglossia + local auxfile = inFiles[1]:split(".")[1]..".aux" + writeLog(2,auxfile.."\n",0) + local auxlines = read_lines_from(auxfile) + for line = 1,#auxlines do + local str = auxlines[line] + if string.find(str, "selectlanguage") then + str = str:match("{..+}$") -- get last word {language} + aux_language = str:sub(2,(#str-1)) + break + else + if string.find(str, "babel@aux{") then + -- print("Babel defunden: "..str) + str = str:match("{..+}$") -- get last word {language} + -- print("Babel: "..str) + aux_language = str:sub(2,(#str-3)) + break + end + end + end +-- print(aux_language) + if #aux_language > 0 then +-- print("find language") + for i,lang in pairs(indexheader) do + for j = 3,#lang do + if lang[j] == aux_language then + language = i + end + end + end + else + language = "en" + end + print("Detected language: "..language) +else + if args["language"] then + language = string.lower(args["language"]):sub(1, 2) + else + language = "en" + end +end + +--print("Sprache:"..language) -language = string.lower(args["language"]):sub(1, 2) writeLog(2,"Language = "..language.."\n",1) if (indexheader[language] == nil) then writeLog(2,'Corrected the unknown language "'..language..'" to "en"'.."\n",0) diff --git a/macros/generic/expkv-cs/README.md b/macros/generic/expkv-cs/README.md index a04a4c4220..481d94ba34 100644 --- a/macros/generic/expkv-cs/README.md +++ b/macros/generic/expkv-cs/README.md @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- # expkv-cs -- define expandable key=val macros using expkv -Version 2021-11-21 v1.1b +Version 2022-02-13 v1.2 Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt @@ -10,7 +10,7 @@ Hosted at https://github.com/Skillmon/tex_expkv-cs ------------------------------------------------------------------------------- -Copyright (C) 2020-2021 Jonathan P. Spratte +Copyright (C) 2020-2022 Jonathan P. Spratte This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this license or diff --git a/macros/generic/expkv-cs/expkv-cs.dtx b/macros/generic/expkv-cs/expkv-cs.dtx index c975e4931c..561dec7af9 100644 --- a/macros/generic/expkv-cs/expkv-cs.dtx +++ b/macros/generic/expkv-cs/expkv-cs.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% File: expkv-cs.dtx Copyright (C) 2020-2021 Jonathan P. Spratte +% File: expkv-cs.dtx Copyright (C) 2020-2022 Jonathan P. Spratte % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this license or @@ -27,7 +27,7 @@ Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt -------------------------------------------------------------- -Copyright (C) 2020-2021 Jonathan P. Spratte +Copyright (C) 2020-2022 Jonathan P. Spratte This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this license or @@ -729,7 +729,7 @@ and the derived files expkv-cs.pdf % % \begin{function}{alias} % \begin{syntax} -% alias \key\ = \meta{key_2} \prefixes3 +% alias \key\ = \marg{key_2} \prefixes3 % \end{syntax} % This assigns the definition of \meta{key_2} to \key. As a result \key\ is an % alias for \meta{key_2} behaving just the same. Both the value taking and the @@ -749,6 +749,74 @@ and the derived files expkv-cs.pdf % \autoref{sec:change} for this). \key\ can be a primary or secondary key. % \end{function} % +% \begin{function}{enum} +% \begin{syntax} +% enum \key\ = \marg{key_2}\{\val, \ldots\} \prefixes2 +% \end{syntax} +% This defines \key\ to only accept the values given in the list of the second +% argument of its definition. It forwards the position of \val\ in that list +% to \meta{key_2} (zero-based). The \meta{key_2} has to already be defined +% by the time an |enum| key is set up. Each \val\ in the list (and at use +% time) is treated as a string, so no expansion takes place here. +% +% If you use |enum| twice on the same \key\ the new values will again start at +% zero (so it is possible to define multiple values with the same outcome), +% however since you can't skip values you'll have to use the same as in the +% first call for values with just a single variant. There is no interface to +% delete existing values. +% \end{function} +% \example First a small example that might give you an idea of what the +% description above could mean:\\ +% \begin{minipage}[c]{.75\linewidth} +% \begin{lstlisting} +% \ekvcSplit\foo{k-internal=-1}{#1} +% \ekvcSecondaryKeys\foo +% {enum k = {k-internal}{a,b,c}} +% \foo{}\foo{k=a}\foo{k=b}\foo{k=c} +% \end{lstlisting} +% \end{minipage}^^A +% \begin{exresult}[nobeforeafter,box align=center]{.25\linewidth} +% \ekvcSplit\foo{k-internal=-1}{#1} +% \ekvcSecondaryKeys\foo +% {enum k = {k-internal}{a,b,c}} +% \foo{}\foo{k=a}\foo{k=b}\foo{k=c} +% \end{exresult} +% \example We can define a choice setup that might do different things based on +% the choice encountered, and the numeric value is easy to parse using +% |\ifcase|:\\ +% \begin{minipage}[c]{.75\linewidth} +% \begin{lstlisting} +% \ekvcSplit\foo{k-internal=-1} +% {% +% \ifcase#1 +% is\or +% This\or +% easy% +% \else +% .% +% \fi +% } +% \ekvcSecondaryKeys\foo +% {enum k = {k-internal}{a,b,c}} +% \foo{k=b} \foo{k=a} \foo{k=c}\foo{} +% \end{lstlisting} +% \end{minipage}^^A +% \begin{exresult}[nobeforeafter,box align=center]{.25\linewidth} +% \ekvcSplit\foo{k-internal=-1} +% {^^A +% \ifcase#1 +% is\or +% This\or +% easy^^A +% \else +% .^^A +% \fi +% } +% \ekvcSecondaryKeys\foo +% {enum k = {k-internal}{a,b,c}} +% \foo{k=b} \foo{k=a} \foo{k=c}\foo{} +% \end{exresult} +% % \begin{function}{aggregate} % \begin{syntax} % aggregate \key\ = \marg{primary}\marg{definition} \prefixes3 @@ -1568,8 +1636,8 @@ and the derived files expkv-cs.pdf % \begin{macro}{\ekvcVersion,\ekvcDate} % We're on our first input, so lets store the version and date in a macro. % \begin{macrocode} -\def\ekvcVersion{1.1b} -\def\ekvcDate{2021-11-21} +\def\ekvcVersion{1.2} +\def\ekvcDate{2022-02-13} % \end{macrocode} % \end{macro} % @@ -2656,6 +2724,110 @@ and the derived files expkv-cs.pdf % \end{macrocode} % \end{macro} % +% \begin{macro}[internal]{\ekvc@t@enum} +% \begin{macro}[internal] +% {\ekvc@type@enum,\ekvc@h@enum,\ekvc@h@enum@,\ekvc@enum@name} +% Enums don't need to apply special trickery to make the parts of the names +% retrievable, so unlike in \expkvd\ we don't need catcode juggling. +% The setup of an |enum| requires unpacking the value in two different +% arguments so we need an auxiliary here. +% \begin{macrocode} +\def\ekvc@enum@name#1#2#3{ekvc#1(#2)#3} +\protected\long\def\ekvc@t@enum#1#2% + {\ekvc@assert@twoargs{#2}{enum #1}{\ekvc@type@enum{#1}#2}} +\protected\long\def\ekvc@type@enum#1#2% + {% + \ekvifdefined\ekvc@set{#2}% + {% +% \end{macrocode} +% At run time we need another helper and we need to expand the current +% |\ekvc@set| now. The helper will build a control sequence from each given +% value, those will be set up in the |\ekvcsvloop|. +% \begin{macrocode} + \ekvc@long\edef\ekvc@tmp##1% + {% + \ekv@unexpanded{\expandafter\ekvc@h@enum\detokenize}{##1}% + \ekv@unexpanded{\ekvc@stop}% + {\ekvc@set}{#1}% + }% + \ekvlet\ekvc@set{#1}\ekvc@tmp + \def\ekvc@tmp{0}% + \expandafter\ekvcsvloop\expandafter + {% + \expandafter\ekvc@type@enum@ + \csname\ekv@name\ekvc@set{#2}\endcsname + {#1}% + }% + }% + {% + \ekvc@err@unknown@key{#2}% + \@gobble + }% + } +% \end{macrocode} +% Here |#1| will be the key-macro of the underlying primary or secondary key, +% |#2| is the |enum| key's name, and |#3| will be the choice. The rest is +% pretty obvious. +% \begin{macrocode} +\ekv@exparg{\protected\long\def\ekvc@type@enum@#1#2#3}% + {% + \expandafter\expandafter\expandafter\edef\expandafter + \csname\ekvc@enum@name\ekvc@set{#2}{\detokenize{#3}}\endcsname + {\ekv@unexpanded{#1}{\ekvc@tmp}}% + \edef\ekvc@tmp{\the\numexpr\ekvc@tmp+1\relax}% + } +% \end{macrocode} +% The use-time helper will check if the macro for the passed in choice exists, +% if it doesn't throws an error, else calls that macro which will set the +% correct value. +% \begin{macrocode} +\ekv@if@lastnamedcs + {% + \ekv@exparg{\def\ekvc@h@enum#1\ekvc@stop#2#3}% + {% + \expandafter\ifcsname\ekvc@enum@name{#2}{#3}{#1}\endcsname + \expandafter\ekvc@h@enum@\lastnamedcs + \fi + \ekvc@err@unknown@enum{#2}{#3}{#1}% + } + \def\ekvc@h@enum@#1\fi\ekvc@err@unknown@enum#2#3#4% + {% + \fi + \ifx#1\relax + \ekvc@err@unknown@enum{#2}{#3}{#4}% + \expandafter\@gobble + \fi + #1% + } + } + {% + \def\ekvc@h@enum#1% + {% + \def\ekvc@h@enum##1\ekvc@stop##2##3% + {% + \expandafter\ekvc@h@enum@ + \csname\ifcsname#1\endcsname#1\else relax\fi\endcsname + {##2}{##3}{##1}% + }% + } + \expandafter\ekvc@h@enum\expandafter{\ekvc@enum@name{#2}{#3}{#1}} + \def\ekvc@h@enum@#1#2#3#4% + {% + \ifx#1\relax + \ekvc@err@unknown@enum{#2}{#3}{#4}% + \expandafter\@gobble + \fi + #1% + } + } +% \end{macrocode} +% We don't need |\ekvc@enum@name| anymore, so let's undefine it. +% \begin{macrocode} +\let\ekvc@enum@name\ekvc@undefined +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}[internal]{\ekvc@t@aggregate} % Aggregating isn't easy to define. We'll have to extract the correct mark for % the specified key, branch correctly for short and long keys, and use a small @@ -3222,7 +3394,7 @@ and the derived files expkv-cs.pdf % \begin{macro}[internal] % { % \ekvc@err@unknown@hash,\ekvc@err@empty@hash,\ekvc@err@missing@hash, -% \ekvc@err@invalid@bool +% \ekvc@err@invalid@bool,\ekvc@err@unknown@enum % } % And here are the expandable error messages. % \begin{macrocode} @@ -3232,6 +3404,8 @@ and the derived files expkv-cs.pdf \def\ekvc@err@invalid@bool#1{\ekvc@err{invalid boolean value `#1'}} \long\def\ekvc@err@unknown@key@or@macro#1#2% {\ekvc@err{unknown key `#2' for macro #1}} +\def\ekvc@err@unknown@enum#1#2#3% + {\ekvc@err{unknown value `#3' for enum `#2' in macro #1}} % \end{macrocode} % \end{macro} % diff --git a/macros/generic/expkv-cs/expkv-cs.pdf b/macros/generic/expkv-cs/expkv-cs.pdf index 24c83fda2c..0c37223ebf 100644 Binary files a/macros/generic/expkv-cs/expkv-cs.pdf and b/macros/generic/expkv-cs/expkv-cs.pdf differ diff --git a/macros/latex/contrib/chemmacros/HISTORY b/macros/latex/contrib/chemmacros/HISTORY new file mode 100644 index 0000000000..bad8cce61a --- /dev/null +++ b/macros/latex/contrib/chemmacros/HISTORY @@ -0,0 +1,448 @@ +-------------------------------------------------------------------------- +the CHEMMACROS package + + comprehensive support for typesetting chemistry documents + +-------------------------------------------------------------------------- +Web: https://github.org/cgnieder/chemmacros/ +E-Mail: clemens@cnltx.de +-------------------------------------------------------------------------- +If you have any ideas, questions, suggestions or bugs to report, please +feel free to contact us. +-------------------------------------------------------------------------- +Copyright 2011--2021 Clemens Niederberger + 2022-- Clemens Niederberger & Sonja K. + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2008/05/04 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainers of this work are Clemens Niederberger and Sonja K. +-------------------------------------------------------------------------- +Version history +2011/05/15 - version 1.0 - CTAN release +2011/06/22 - version 1.1 - "LaTeXified" whole package for safer usage + - less user work required (like loading package + after another) + - more particle macros + - latin phrases + - extra units + - acid/base commands + - \mech + - \NMR + - \mhName, \setmhName, \newreaction, phases + - \renewstate, \setstatesubscript + - improved orbitals + - simpler package options, option german, bpchem + - bug fixes +2011/10/28 - version 2.0 - rewritten in expl3 + - customization via \chemsetup + - new commands \p, \fplus, \fminus, \fpch, \fmch, + \fscrp, \fsrcm, \fdelp, \fdelm, \orbital, \chemsetup + - various commands have a new syntax + - removed: \setmhName, \setredoxdist, + \setstatesubscript, \porb, \phorb, \pxorb, \pyorb, + \pzorb, \setorbheight, \solid, \liquid + - reaction environments work with hyperref and + varioref +2011/11/03 - version 2.0a - minor bug fixes + - new feature for \Nu + - new command \ba +2012/01/28 - version 3.0 - bundled with packages `formula' and `ghs' + - new commands \Ka, \Kb, \Kw + - commands can detect if font series is bold + - new package option "detect-bold" + - new package option "method" => choose between + `mhchem' and `formula' for internal uses. + - new package option "ghs" => load `ghs' or don't + - new package option "synchronize" + - new package option "strict" + - new command \iupac + - new command \listofreactions, reaction environments + with optional argument + - \cis, \trans, \tert without \xspace +2012/01/30 - version 3.0a - bugfix in formula.sty + - renamed formula => chemformula + and ghs => ghsystem to make the names unique + (following a request by Karl Berry for TeXlive) +2012/02/03 - version 3.0b - new command \DeclareChemParticle, updated + documentation +2012/02/05 - version 3.0c - renamed pictogram files (following a request by + Karl Berry for TeXlive) + - new package option "Nu" +2012/02/10 - version 3.0d - several bugfixes in chemformula + - bugfixes with \DeclareChemParticle + - new command \RenewChemParticle + - new option phases / pos + - new commands \DeclareChemPhase, \RenewChemPhase, + \phase + - changed default behaviour of phases + - removed optional argument from \sld and \lqd + - new arrow type <> +2012/02/19 - version 3.1 - new commands \DeclareChemIUPAC and \RenewChemIUPAC + - new option "option/iupac" + - deprecated option: "option/EZ" + - deprecated commands: + \newreaction => \DeclareChemReaction + \setnewstate => \DeclareChemState + \renewstate => \RenewChemState + \Rcip => \R + \Scip => \S + \Dfi => \D + \Lfi => \L + - new arrow types -/>, + - new commands \DeclareChemArrow, \RenewChemArrow and + \ShowChemArrow +2012/02/26 - version 3.1a - "operator" p rewritten to follow IUPAC + recommendations + - new option "acid-base/p-style" + - deprecated option: "option/detect-bold" +2012/03/03 - version 3.1b - arrow types are stored in a sequence to automate the + search and replace in the right order + - new arrow type == + - IUPAC compliance for stoichiometric factors + - new handling of super- and subscripts to correct + various flaws: clear distinction between isotope and + formula + - new option charge-vshift + - IUPAC compliance for \Delta and \ox +2012/03/14 - version 3.1c - compatibility with KOMA's global option + "version = " + - bugfix in the list of reactions + - improved arrow labels +2012/03/20 - version 3.2 - new: option input via @{} + - improved list of reactions: resetting the "reaction" + counter now doesn't cause errors any more + - \AddRxnDesc added which allows to add descriptions + to each reaction in the "reactions" environment +2012/05/07 - version 3.3 - new environment `experimental' that allows some + formatting for the for displaying of measurement + results + - more greek letters for the \iupac command + - \ch now bypasses \ref{}, \label{}, and \intertext{} + - small adjustments of the iupac commands \| and \- + - bug fix: option `upgreek' is now working and was + renamed to `greek' + - proper language support +2012/05/13 - version 3.3a - Italian translations of the H, EUH and P statements + - \hapto and \bridge +2012/05/18 - version 3.3b - compatibility with MiKTeX +2012/05/18 - version 3.3c - fix in the `ghsystem/language' option +2012/07/24 - version 3.3d - additional picture file type `pdf' + - default bond length set to 1.1667ex + - bug fix in the bonds + - added kerning to cip commands, new option + `iupac/cip-kern' + - bug fix: messages needed to be defined before the + options +2012/08/21 - version 3.3e - new option ox/align=center|right + - a new option to \NMR and to \J +2012/09/11 - version 3.4 - cleaned a little, minor bug fixes + - switched to internal scratch variables + - new command \bond, more bond types + - new commands \DeclareChemBond, \DeclareChemBondAlias, + \RenewChemBond and \ShowChemBond + - radical point thicker, new options `radical-style' + and `radical-radius' +2012/10/03 - version 3.4a - bug fix in coupling constant \J +2013/01/04 - version 3.4b - bug fix in the sub- and superscript handling +2013/01/28 - version 3.5 - disallow breaks at bonds + - allow breaks after arrows + - made some spaces in chemformulas stretch- and + shrinkable + - various internal code improvements + - changed defaults for horizontal spaces that have in + set in ex into corresponding values in em. + - improvements to the placement of sub- and superscripts +2013/02/19 - version 3.5a - bug fix: `ghsystem' recognizes language again +2013/02/26 - version 3.6 - support for use with the `breqn' package + - chemformula: math escaping also via \(\) + - chemformula internal: clearer escaping macros + - new options: `radical-vshift', `radical-hshift' + and `radical-space' + - bug fix: `radical-...' options are now correctly set + - stoichiometric factors: add leading 0 if missing + - new option: `stoich-paren-parse' + - internal changes: be way more rigid about protected + and expandable macros + - internal changes: clearer distinction between + private macros and accessable module macros + - internal changes: clearer distinction between + document commands and module level commands + - chemformula's !()() syntax now also works with babel's + French +2013/02/27 - version 3.6a - bug fix: escaped text and math stays escaped, i.e. + also arrow code like `<=>' +2013/04/19 - version 3.6b - chemformula: new key `arrow-min-length' + - bug fix: stoichiometric fractions correctly displayed + - changed appearance of \cip to use upright parentheses +2013/07/06 - version 4.0 - `chemformula' doesn't automatically load + `chemmacros' any more but can be used stand-alone + - option `bpchem' has been dropped + - improved detection of bold font series + - changed wrongly used \mbox in definition of \Ka, + \Kb and \Kw into \ensuremath + - adapt \mch and \pch to match `chemformula's + charges + - dropped option `method=mhchem' + - support for `kpfonts' and `newtxmath' upright + greek letters added, greek alphabet complete both + for uppercase and lowercase; this is handled by + the new package in the family: `chemgreek' + - \OX and \redox now work in `amsmath's environment + by ignoring the measuring phase + - language management with the help of the + `translations' package => + recognize document language automatically and use + it if it a) is known to `chemmacros' and b) has + not been overwritten by the `language' option; + this also made minor changes to `ghsystem' + necessary; additionally this lead to changes in + the way phases are defined + - status of \Dfi and \Lfi changed from `deprecated' + to `dropped' + - new option `charges/partial-format' + - fixed wrongly written contents to the lor when + used together with `hyperref' + - new option `reaction/list-heading' + - option `charges/append' deprecated +2013/08/07 - version 4.0a - extra pair of braces in definition of + \standardstate + - added missing \exp_not:n to the definitions of + \chemmacros_declare_phase:Nn and kin +2013/08/24 - version 4.1 - changed `0' values in TikZ coordinates into `0pt' + see http://tex.stackexchange.com/q/128792/5049 and + http://tex.stackexchange.com/q/118467/5049 for + reference +2013/10/28 - version 4.2 - changed particles with electron pairs to use + \chlewis + - changed \Delta in thermodynamic state variables + into \ChemDelta for IUPAC compliance and defined + it as an operator + - change in the syntax of \DeclareChemState and + \RenewChemState and improved both internal + definition and user interface +2013/10/31 - version 4.2a - bug bix in \hapto and \bridge +2013/11/04 - version 4.2b - new IUPAC commands: \fac/\mer +2013/11/20 - version 4.2c - step bundle version due to changes in `chemgreek' +2013/12/15 - version 4.2d - small changes to the translating mechansim which + now seems to be more logical: `language=auto' + detects the current `babel' language and + `language=' overwrites to the chosen + language + - new options `acid-base/K-acid', `acid-base/K-base' + and `acid-base/K-water' + - adapt \ox to updates in `l3fp' +2014/01/09 - version 4.2e - step bundle version due to changes in `ghsystem' +2014/01/24 - version 4.3 - \NewChemIUPAC, \LetChemIUPAC + - \NewChemParticle + - \NewChemNMR + - \NewChemPhase + - \NewChemReaction, \RenewChemReaction + - \NewChemState + - added macro names with more meaningfule names to + each of the one-letter name commands + - changed behaviour of \DeclareChem to match + \DeclareRobustCommand, i.e., no check if command + is defined; added a \NewChem variant to each that + /does/ check; use \NewChem instead of \DeclareChem + for definitions + - new iupac command \dento + - new option choice `nmr/pos=super' + - bug fix in appearance of coupling nuclei + - new possibilities for formatting the output of the + NMR coupling constants output with \J: + `coupling-pos=side/sub', `coupling-nuclei-pre', + coupling-nuclei-post', `coupling-bonds-pre', + coupling-bonds-post', `coupling-symbol' + - internal changes to the greek letter mapping + selection mechanism + - deprecate package option `strict' + - deprecate package option `cmversion': also all + backwards compatibility for version 1 has been + dropped + - drop command \mhName +2014/01/29 - version 4.4 - bug fix in the display of the coupling constant + - bug fix in phase definitions (need to adapt to + changes in `translations' + - new option `nmr/atom-number-cs' + - new option `nmr/coupling-pos-cs' +2014/04/08 - version 4.5 - new option `acid-base/subscript' + - added Dutch translations +2014/06/30 - version 4.5a - adapt to deprecated expl3 functions +2014/08/08 - version 4.6 - from bundle to packages: packages `chemformula', + `ghsystem' and `chemgreek' no longer belong to the + bundle but now are packages of their own. +2015/02/08 - version 4.7 - fix \iupac so active letters like | still work + inside other macros (\section, ...) + - Change the default subscripts of the equilibrium + constants to match the usage in the IUPAC Green + Book + - allow \NewChemPhase and friends after \begin{document} + - new optional argument to phase commands + - new options `nmr/method' and `nmr/connector' +2015/09/11 - version 5.0 - the former chemmacros.sty is now chemmacros4.sty + and can be loaded through the `compatibility' + option + - chemmacros is now organized in separate modules + which either are preloaded or can be loaded by the + user with \usechemmodule + - various changes, see + http://www.mychemistry.eu/2015/06/chemmacros-development/ + and the manual section 3.4. Upgrading from version + < 5.0 for details +2015/09/23 - version 5.1 - add option `method' to `chemformula' module + - make module `scheme' compatible with `floatrow' + - add module hooks `before' and `after' +2015/10/14 - version 5.2 - warn if compatibility version requested is higher + than the current version number + - enable to specify a minimal compatibility version + for a module + - add info message to `all' module + - add values `newest' and `latest' to the + compatibility option + - check for mhchem and chemformula and choose the + formula method accordingly + - fixes in the module hook mechanism + - fix in \chemmacros_if_module_loaded:n + - new internal module `errorcheck' +2016/01/13 - version 5.3 - removed options `german' and `ngerman' (lang) + - remove deprecated pre-v5 macros (several modules) + - new option `atom-number-space' (spectroscopy) + - add \chemprime and ' shorthand (nomenclature) + - new option `space' (particles) + - TikZ decoration `wave' (tikz) +2016/01/23 - version 5.3a - compatibility with chemscheme package (scheme) + - IUPAC shorthands only defined within \iupac + (nomenclature) +2016/02/10 - version 5.4 - \NewChemEqConstant and family, new option + `eq-constant' (acid-base) + - added \ignorespacesafterend to environments + (reactions) + - fixed erroneous definition of \NewChemMacroset + (base) + - new option `explicit-zero-sign' (redox) +2016/03/08 - version 5.5 - new module `polymers' +2016/05/02 - version 5.6 - generalization of the formula method concept, new + methods `chemist' and `chemfig' (chemformula) + - use `tocbasic' for the list of reactions if + available (reactions) + - fix reaction environments to obey \thereaction + (reactions) + - add cleveref and fancyref support (reactions) + - add cleveref and fancyref support (scheme) + - \DeclareChemTranslation and + \DeclareChemTranslations + - moved translations from lang module to the + corresponding modules they belong to +2016/05/04 - version 5.6a - fix small but annoying bugs (base and chemformula) +2016/06/07 - version 5.7 - \iupac gets an optional argument for setting + options (nomenclature) + - \latin always defined by chemmacros (nomenclature) + - fix conflict with `achemso' (nomenclature) + - allow `chemscheme'/`chemstyle' to be loaded after + chemmacros (errorcheck) + - translation keys get internal prefix (translations) +2016/06/08 - version 5.7a - rename functions which erroneously were assigned + to the `chemformula' module + - correct wrong dates in module files +2016/10/05 - version 5.7b - small improvement of the errorcheck module +2016/12/28 - version 5.7c - bug fix: typo in \chemmacros_tex_if:nnTF usage + (scheme) +2017/04/17 - version 5.8 - new option `nmr-base-format' (spectroscopy) + - change \hapto and \dento to follow iupacs rules + according to IUPAC Red Book 2005. IR-10.2.5.2 The + eta convention (p.216) and IR-9.2.4.2 The + kappa convention (p.155f) (nomenclature) + - fix error in \chemmacros_allow_hyphens: definition + (nomenclature) + - new options `cip-inner-format', `cip-outer-format' + and `cip-number-format' (nomenclature) +2017/06/13 - version 5.8a - changes to compatibility test: it now works also + for subreleases + - change behaviour of \ChemCompatibilityTo and + \ChemCompatibilityBetween in order to cope with + the changed compatibility test; adapt all files + reflecting those changes + - change behaviour of + \__chemmacros_break_point_insert:nnn so it does + nothing as last token in \iupac (nomenclature) +2017/08/28 - version 5.8b - fix missing hyperref check +2018/03/02 - version 5.8c - fix bug in \chemmacros_p:n (acid/base) + - smash sub- and superscripts of polymer delimiters + (polymers) +2019/09/23 - version 5.8d - add some Norwegian translations (reactions, scheme) +2019/09/27 - version 5.8e - change `O{}' argument of reactions into `!O{}' + (reactions) +2019/09/30 - version 5.8f - fix bug introduced in the last version +2019/11/17 - version 5.9 - correction: torr -> Torr (units) + - define latin phrases on the go instead of at begin + document +2020/01/16 - version 5.9a - adapt to renaming of string case changing functions +2020/02/03 - version 5.10 - define \torr as well as \Torr (units) + - prefer lazy boolean evaluation + - prefer the kernel commands to + \chemmacros_leave_vmode: and \chemmacros_tex_if: +2020/03/07 - version 5.11 - let \chemmacros_iupac:nn think we're in the + document – fixes issue #30 (nomenclature) + - add option redox/format (redox) +2020/03/07 - version 5.11a - fix issue #34 (spectroscopy) + - fix issue #41 (scheme) +2022/01/16 - version 6.0 - merge modules into on file + - drop compatibility mode + - add reactants module and welcome Sonja K. to the + maintenance team + - fix issue #42 + - use LaTeX's new hook mechanism + - get rid of scrlfile dependency + - update to l3text + - rename \Torr -> \torr (units) + - new iupac command \normal + - resolve issue #45 + - adapt to siunitx 3.0, implement units that have + been removed from siunitx (units) + - Danish translations + - new `translations' module, move all translation + declarations there +2022/01/18 - version 6.0a - fix issue #46 + - fix bug related to package option `modules=' +2022/02/13 - version 6.1 - extend syntax of \state command (thermodynamics) + - add `reactants' module to the `errorcheck' module + - fix bug in Danish translation + - rename module `chemformula' > `formula' + - put reactions in the `chemfig' method in between + \schemestart and \schemestop (formula) + - replace deprecated \Lewis with \Charge in method + `chemfig' (formula) + - choose the formula method if either `mhchem' or + `chemformula' are loaded; choose `chemformula' if + there is a conflict (formula) + - use last instead of first found method for + defining floats (scheme) + - new option `scheme/float-method' (schemes} + - new option `reactions/own-counter' (reactions) + - new oprion `reactions/autoref-name' (reactions) + - deprecate option `reactions/tocbasic' (reactions) + - make \autoref work with reaction environments + through some possibly dangerous patches + (reactions) + - fix support for cleveref and fancyref with + reactions (reactions) + - reorganization of deprecation, removal, and + patching + - rename `nomenclature/format' into + `nomenclature/latin-format' (nomenclature) + - new option `nomenclature/iupac-format' + (nomenclature) + - properly implement and document user modules + (i.e., styles) as opposed to chemmacros' own + modules; since v6 \ChemModule has a new function + which is why \ChemStyle is introduced + - add load-time option `stop' which can prevent + modules and styles from being loaded diff --git a/macros/latex/contrib/chemmacros/README b/macros/latex/contrib/chemmacros/README index fa7047a4a3..6434c4135a 100644 --- a/macros/latex/contrib/chemmacros/README +++ b/macros/latex/contrib/chemmacros/README @@ -1,26 +1,26 @@ -------------------------------------------------------------------------- -the CHEMMACROS package v6.0a 2022/01/18 +the CHEMMACROS package v6.1 2022/02/13 comprehensive support for typesetting chemistry documents -------------------------------------------------------------------------- -Clemens Niederberger Web: https://github.com/cgnieder/chemmacros/ -E-Mail: contact@mychemistry.eu +E-Mail: clemens@cnltx.de -------------------------------------------------------------------------- -Copyright 2011--2022 Clemens Niederberger +Copyright 2011--2021 Clemens Niederberger + 2022-- Clemens Niederberger & Sonja K. This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2008/05/04 or later. This work has the LPPL maintenance status `maintained'. -The Current Maintainer of this work is Clemens Niederberger. +The Current Maintainers of this work are Clemens Niederberger and Sonja K. -------------------------------------------------------------------------- The chemmacros package consists of the following files == STYLE FILES == diff --git a/macros/latex/contrib/chemmacros/chemmacros-manual.pdf b/macros/latex/contrib/chemmacros/chemmacros-manual.pdf index 516e7cf6f2..b23770c818 100644 Binary files a/macros/latex/contrib/chemmacros/chemmacros-manual.pdf and b/macros/latex/contrib/chemmacros/chemmacros-manual.pdf differ diff --git a/macros/latex/contrib/chemmacros/chemmacros-manual.tex b/macros/latex/contrib/chemmacros/chemmacros-manual.tex index 3504f8cfa8..c099679864 100644 --- a/macros/latex/contrib/chemmacros/chemmacros-manual.tex +++ b/macros/latex/contrib/chemmacros/chemmacros-manual.tex @@ -1,35 +1,34 @@ -% arara: pdflatex: { interaction: nonstopmode } -% arara: biber -% arara: pdflatex: { interaction: nonstopmode } -% arara: pdflatex: { interaction: nonstopmode } % -------------------------------------------------------------------------- -% the CHEMMACROS package +% the CHEMMACROS package v6.1 2022/02/13 % % comprehensive support for typesetting chemistry documents % % -------------------------------------------------------------------------- -% Clemens Niederberger -% -------------------------------------------------------------------------- -% https://github.com/cgnieder/chemmacros/ -% contact@mychemistry.eu +% Web: https://github.org/cgnieder/chemmacros/ +% E-Mail: chemmacros@cnltx.de % -------------------------------------------------------------------------- % If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. +% feel free to contact us. % -------------------------------------------------------------------------- -% Copyright 2011--2022 Clemens Niederberger +% Copyright 2011--2021 Clemens Niederberger +% 2022-- Clemens Niederberger & Sonja K. % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2008/05/04 or later. % % This work has the LPPL maintenance status `maintained'. % -% The Current Maintainer of this work is Clemens Niederberger. +% The Current Maintainers of this work are Clemens Niederberger and Sonja K. % -------------------------------------------------------------------------- +% arara: pdflatex: { interaction: nonstopmode } +% arara: biber +% arara: pdflatex: { interaction: nonstopmode } +% arara: pdflatex: { interaction: nonstopmode } \documentclass{chemmacros-manual} \usepackage[T1]{fontenc} @@ -95,24 +94,24 @@ urldate = {2012-03-20} , date = {2012-03-20} } -@online{mychemistry:chemmacros-dev, +@online{cnltx:chemmacros-dev, author = {Clemens Niederberger} , title = {chemmacros development} , - url = {http://www.mychemistry.eu/2015/06/chemmacros-development/} , + url = {http://www.cnltx.de/2015/06/chemmacros-development/} , urldate = {2015-07-16} , date = {2015-06-14} } -@online{mychemistry:modular-chemmacros, +@online{cnltx:modular-chemmacros, author = {Clemens Niederberger} , title = {modular chemmacros} , - url = {http://www.mychemistry.eu/2015/06/modular-chemmacros/} , + url = {http://www.cnltx.de/2015/06/modular-chemmacros/} , urldate = {2015-07-16} , date = {2015-06-08} } -@online{mychemistry:chemmacros-update-how, +@online{cnltx:chemmacros-update-how, author = {Clemens Niederberger} , title = {a new chemmacros -- but how?} , - url = {http://www.mychemistry.eu/2015/07/a-new-chemmacros-but-how/} , + url = {http://www.cnltx.de/2015/07/a-new-chemmacros-but-how/} , urldate = {2015-07-16} , date = {2015-07-15} } @@ -196,18 +195,21 @@ Since version~6.0 the different modules of \chemmacros\ are divided into three groups: \begin{enumerate} \item Core modules which provide underlying functionality or basic - functionality which is not of direct interest from a user perspective but - might be if you plan to write a module yourself (see - section~\ref{sec:own-modules} for details). + functionality and which are not of direct interest from a user perspective + but might be if you plan to write a module yourself (see + section~\ref{sec:own-modules} for details). These modules are described in + part~\ref{part:core-modules} of this manual. \item Main modules which provide all the stuff for typesetting and which are - always loaded. + always loaded. These modules are described in + part~\ref{part:main-modules} of this manual. \item Additional modules which are also loaded in the default setup. They are not loaded if \chemmacros\ is loaded with the minimal setup: - \cs*{usepackage}\Oarg{minimal}\Marg{chemmacros}. + \cs*{usepackage}\Oarg{minimal}\Marg{chemmacros}. These modules are described in + part~\ref{part:additional-modules} of this manual. \end{enumerate} \subsection{\chemmacros' Options}\label{sec:using-chemm-opti} -Prior to v5.0 \chemmacros\ had quite a number of package options. +Prior to v5.0 \chemmacros\ had quite a number of load-time options. \chemmacros\ v6.0 has only two: \begin{options} \keybool{minimal}\Default{false} @@ -216,7 +218,7 @@ Prior to v5.0 \chemmacros\ had quite a number of package options. When \option{minimal} is used this option allows to load additional modules. \end{options} -These are load-time option that only can be used in the optional argument of +These options only can be used in the optional argument of \cs*{usepackage}. \emph{All} other of \chemmacros' options are set using the command \begin{commands} @@ -275,7 +277,7 @@ descriptions and are also set without specifying a module: Some internal modules may also define core options, \eg, the \chemmodule{lang} module, see section~\vref{sec:lang-module}. -\subsection{Support Package \chemformula} +\subsection{Support Package \chemformula}\label{sec:supp-pack-chemf} \chemformula\ provides means of typesetting chemical formulas and reactions. You will see its macros \cs{ch} and \cs{chcpd} every now and then in this manual. When using \chemmacros\ you can consider the \chemformula\ @@ -283,8 +285,7 @@ package~\cite{pkg:chemformula} to be loaded as \chemmacros\ makes use of it in various places. \chemmacros\ and \chemformula\ are tightly intertwined. Nevertheless you should be able to use the \pkg{mhchem}~\cite{pkg:mhchem} package with \chemmacros\ without problems. Please see -section~\vref{sec:using-mhchem} for details and \latin{caveat}s. \emph{The - recommendation is to use \chemformula.} +section~\vref{sec:using-mhchem} for details and \latin{caveat}s. A historical note: \chemformula\ started as a part of \chemmacros\ in January~2012. Since July~2013 it is a completely independent package -- from @@ -398,7 +399,7 @@ This is how \cs{Ka} is defined: \section{The \chemmodule*{charges} Module}\label{sec:charges-module} -The \chemmodule{charges} module loads the module \chemmodule{chemformula}. +The \chemmodule{charges} module loads the module \chemmodule{formula}. \subsection{Charge Symbols} \begin{commands} @@ -934,7 +935,7 @@ You can change the appearance with this option: \section{The \chemmodule*{particles} Module}\label{sec:particles-module} The \chemmodule{particles} module loads the modules \chemmodule{charges} and -\chemmodule{chemformula}. +\chemmodule{formula}. \subsection{Provided Particle Macros} The \chemmodule{particles} defines a number of macros which can be used for @@ -975,22 +976,22 @@ nucleophiles. \command{NewChemParticle}[\marg{cs}\marg{formula}] Defines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ input (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Raises an error if \meta{cs} already + see~\vref{sec:formula-module}). Raises an error if \meta{cs} already exists. \command{RenewChemParticle}[\marg{cs}\marg{formula}] Redefines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ input (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Raises an error if \meta{cs} doesn't + see~\vref{sec:formula-module}). Raises an error if \meta{cs} doesn't exist. \command{DeclareChemParticle}[\marg{cs}\marg{formula}] Defines a macro \meta{cs}. \meta{formula} is any valid \chemformula\ input (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Silently overwrites \meta{cs} if it + see~\vref{sec:formula-module}). Silently overwrites \meta{cs} if it exists. \command{ProvideChemParticle}[\marg{cs}\marg{formula}] Defines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ input (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Does nothing if \meta{cs} already + see~\vref{sec:formula-module}). Does nothing if \meta{cs} already exists. \end{commands} An example of usage is the definition of the existing particle macros: @@ -1005,22 +1006,22 @@ The following set defines macros like \cs{Nuc} \command{NewChemNucleophile}[\marg{cs}\marg{formula}] Defines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ input (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Note that \meta{formula} will get a + see~\vref{sec:formula-module}). Note that \meta{formula} will get a trailing negative charge! Raises an error if \meta{cs} already exists. \command{RenewChemNucleophile}[\marg{cs}\marg{formula}] Redefines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Note that \meta{formula} will get a + see~\vref{sec:formula-module}). Note that \meta{formula} will get a trailing negative charge! Raises an error if \meta{cs} doesn't exist. \command{DeclareChemNucleophile}[\marg{cs}\marg{formula}] Defines a macro \meta{cs}. \meta{formula} is any valid \chemformula\ (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Note that \meta{formula} will get a + see~\vref{sec:formula-module}). Note that \meta{formula} will get a trailing negative charge! Silently overwrites \meta{cs} if it exists. \command{ProvideChemNucleophile}[\marg{cs}\marg{formula}] Defines a new macro \meta{cs}. \meta{formula} is any valid \chemformula\ (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). Note that \meta{formula} will get a + see~\vref{sec:formula-module}). Note that \meta{formula} will get a trailing negative charge! Does nothing if \meta{cs} already exists. \end{commands} An example of usage is the definition of the existing nucleophile macros: @@ -1033,7 +1034,7 @@ A macro defined this way will have an optional argument for the \section{The \chemmodule*{phases} Module}\label{sec:phases-module} -The \chemmodule{phases} module loads the \chemmodule{chemformula} modul. +The \chemmodule{phases} module loads the \chemmodule{formula} modul. \subsection{Basics} @@ -1145,20 +1146,21 @@ then. It loads the package \pkg{amstext}~\cite{pkg:amstext}. \command{standardstate} Again self-explaining: \standardstate \command{changestate} - The uppercase delta used in \state[superscript=]{H} for example. + The uppercase delta used in \state^{}{H} for example. \end{commands} -\section{The \chemmodule*{chemformula} Module}\label{sec:chemformula-module} +\section{The \chemmodule*{formula} Module}\label{sec:formula-module} -The \chemmodule{chemformula} module loads the \pkg{amstext} +The \chemmodule{formula} module loads the \pkg{amstext} package~\cite{pkg:amstext} and the \chemmodule{charges} module. \subsection{For Users} There are different packages which provide means for typesetting chemical formulas: \begin{itemize} - \item \pkg{chemformula}~\cite{pkg:chemformula}. This is probably well known - to users of \chemmacros. + \item \pkg{chemformula}~\cite{pkg:chemformula}. This package started as a + part of \chemmacros\ and thus goes naturally together with \chemmacros, + see also \vref{sec:supp-pack-chemf}. \item \pkg{mhchem}~\cite{pkg:mhchem}. This is the \enquote{older brother} of \chemformula. \item \pkg{chemfig}~\cite{pkg:chemfig}. The easiest and most complete of the @@ -1197,9 +1199,9 @@ you'll have to choose manually. \emph{All automatic choices only happen at the end of the preamble}. \subsection{Using the \pkg*{chemformula} Package} -If you set \keyis{formula}{chemformula} the \chemmodule{chemformula} module +If you set \keyis{formula}{chemformula} the \chemmodule{formula} module makes it possible that you can set all \chemformula\ options via the -\cs{chemsetup} command using the module \module{chemformula}, for example: +\cs{chemsetup} command using the module \module{formula}, for example: \begin{sourcecode} \chemsetup[chemformula]{format=\sffamily} \end{sourcecode} @@ -1211,7 +1213,7 @@ provided by the \chemmodule{reactions} module. \emph{This method is the recommended choice!} \subsection{Using the \pkg*{mhchem} Package}\sinceversion{5.1}\label{sec:using-mhchem} -If you set \keyis{formula}{mhchem} the \chemmodule{chemformula} module makes +If you set \keyis{formula}{mhchem} the \chemmodule{formula} module makes it possible that you can set all of \pkg{mhchem}'s options via the \cs{chemsetup} command using the module \module{mhchem}, for example: \begin{sourcecode} @@ -1632,7 +1634,7 @@ implements the following macro based on the same idea: \end{example} \section{The \chemmodule*{reactions} Module}\label{sec:reactions-module} -The \chemmodule{reactions} module loads the \chemmodule{chemformula} module +The \chemmodule{reactions} module loads the \chemmodule{formula} module and the \pkg{mathtools} package~\cite{pkg:mathtools}. \subsection{Predefined Environments} @@ -1644,12 +1646,12 @@ You can use these environments for numbered\ldots environment body. A wrapper around the \env*{equation} environment. The environment body is parsed with \cs{ch} or \cs{ce} depending on the value of the \option{formula} option, see - section~\vref{sec:chemformula-module}. + section~\vref{sec:formula-module}. \environment{reactions} Several aligned reactions. A wrapper around \pkg{amsmath}'s \env*{align} environment. The environment body is parsed with \cs{ch} or \cs{ce} depending on the value of the \option{formula} option, see - section~\vref{sec:chemformula-module}. + section~\vref{sec:formula-module}. \end{environments} \ldots and their starred versions for unnumbered reactions. @@ -1657,12 +1659,12 @@ You can use these environments for numbered\ldots \environment{reaction*} A wrapper around the \env*{equation*} environment. The environment body is parsed with \cs{ch} or \cs{ce} depending on the value of the - \option{formula} option, see section~\vref{sec:chemformula-module}. + \option{formula} option, see section~\vref{sec:formula-module}. \environment{reactions*} A wrapper around \pkg{amsmath}'s \env*{align*} environment. The environment body is parsed with \cs{ch} or \cs{ce} depending on the value of the \option{formula} option, see - section~\vref{sec:chemformula-module}. + section~\vref{sec:formula-module}. \end{environments} With those environments you can create (un)numbered reaction equations similar @@ -1729,6 +1731,14 @@ or use the following options: \end{reaction} \end{example} +You\sinceversion{6.1} can also make reactions share a counter with math +equations (by using the \code{equation} counter). +\begin{options} + \keybool{own-counter}\Module{reactions}\Default{true} + If set to false the reaction environments will use the \code{equation} + counter instead of the \code{reaction} counter. +\end{options} + The use of \AmS math's \cs{intertext} is possible: \begin{example} \begin{reactions} @@ -1739,9 +1749,22 @@ The use of \AmS math's \cs{intertext} is possible: See reaction~\ref{rxn:test}. \end{example} -If\sinceversion{5.6} you are using either \pkg{cleveref} or \pkg{fancyref} the -\env{reaction} counter is supported already. For \pkg{fancyref} use the -prefix \code{rct}. +\subsection{Cross-Referencing} +If\sinceversion{5.6} you are using either \pkg{cleveref}~\cite{pkg:cleveref} +or \pkg{fancyref}~\cite{pkg:fancyref} and have set \keyis{own-counter}{true} +the \env{reaction} counter is supported by both packages and already set up by +\chemmacros. + +For \pkg{fancyref} use the prefix \code{rct} by defining the following: +\begin{sourcecode} + \newcommand*\fancyrefrctlabelprefix{rct} +\end{sourcecode} + +Also \pkg{hyperref}'s \cs*{autoref} is supported. +\begin{options} + \keyval{autoref-name}{name}\Module{reactions}\Default{\cs*{ChemTranslate}\Marg{reaction}} + \sinceversion{6.1}Change the name used by \pkg{hyperref}'s \cs*{autoref}. +\end{options} \subsection{Own Reactions} You can create new types of reactions with the command: @@ -1816,14 +1839,10 @@ The output of this list can be modified by two options: The\sinceversion{5.2} macro that is called at the beginning of the list. Inside of \meta{code} \code{\#1} refers to the actual heading of the list. The default setting is not entirely true: if a macro \cs*{chapter} is - defined \code{\cs*{chapter}\sarg\Marg{\#1}} is used. - \keybool{tocbasic}\Module{reactions}\Default{false} - \sinceversion{5.6}If you use a \KOMAScript\ class \emph{or} if you load - the \pkg{tocbasic} package \emph{or} if you set this option to \code{true} - the list of reactions will be set up using the \pkg{tocbasic} package. - This \emph{disables} the \option{list-heading-cmd} option. For a - \KOMAScript\ class this means that the list of reactions obeys - \KOMAScript's \option*{listof} option. + defined \code{\cs*{chapter}\sarg\Marg{\#1}} is used. \par + This command has no effect if a \KOMAScript\ class or the package + \pkg{tocbasic} is used. The list of reactions then obeys \KOMAScript's + \option*{listof} option. \end{options} Instead of using the option \option{list-name} you also could redefine \cs{reactionlistname}. @@ -1865,13 +1884,14 @@ names are declared in the preamble removing the need to repeat the same module options the output style (order of name number and data) can be altered globally (or locally) to suit your needs, while the data itself is input using an easy to use key-value approach and processed by the \pkg{siunitx} -package. The \module{reactants} module responds to the language declared with -the \pkg{babel} package and also offers methods to integrate the acronyms of -used reactants or solvents into the list of acronyms. +package~\cite{pkg:siunitx}. The \module{reactants} module responds to the +language declared with the \pkg{babel} package and also offers methods to +integrate the acronyms of used reactants or solvents into the list of +acronyms. The module requires and loads the packages \pkg{chemnum}~\cite{pkg:chemnum} -and \pkg{siunitx}~\cite{pkg:siunitx}. Depending on the selected options the -packages \pkg{acro}~\cite{pkg:acro}, +and \pkg{siunitx}. Depending on the selected options the packages +\pkg{acro}~\cite{pkg:acro}, \pkg{glossaries-extra}~\cite{pkg:glossaries-extra}, \pkg{hyperref}~\cite{pkg:hyperref}, \pkg{longtable}~\cite{pkg:longtable} and/or \pkg{xltabular}~\cite{pkg:xltabular} might be needed for this module @@ -1928,8 +1948,8 @@ Common declarations will look like this: \cs{Reactant} can be used in order to start a sentence with an upper case version of a compound's name. The corresponding text must be defined through \cs{DeclareChemReactant}'s \option{upper-name} option. Further - variants of \cs{reactant} with different suffixes, such as \code{*}, - \code{+}, \code{l}, \code{s} or \code{plain} will be described later. + variants of \cs{reactant} with different suffixes, such as \sarg, + \parg, \code{l}, \code{s} or \code{plain} will be described later. \command{solvent}[\oarg{data and units}\marg{ID}] Analogous to \cs{reactants}. Can be used to insert solvent names and corresponding data in the text. Format and order depend on the on the @@ -1979,9 +1999,9 @@ Typical uses will look like this: which they were declared in the preamble or in an external document. \keybool{switch}\Module{reactants}\Default{false} While \cs{reactants} will output name and number of a reactant, its - starred variant \cs{reactant*}, will by default result in the name without - the corresponding number. Setting \keyis{switch}{true}, globally or - locally, reverses this behavior and outputs a reactant's number without + starred variant \cs{reactant}\sarg, will by default result in the name + without the corresponding number. Setting \keyis{switch}{true}, globally + or locally, reverses this behavior and outputs a reactant's number without its name. \end{options} Other options are described at later places when the corresponding behavior is @@ -1997,7 +2017,9 @@ argument that can be used to easily input this data: \begin{commands} \command{reactant}[\oarg{data and units}\marg{ID}] + \phantom{X}\vspace*{-\baselineskip} \command{solvent}[\oarg{data and units}\marg{ID}] + \phantom{X}\vspace*{-\baselineskip} \end{commands} \begin{table}[bp] @@ -2011,16 +2033,16 @@ argument that can be used to easily input this data: \toprule \tablehead{Key} & \tablehead{default unit} & \tablehead{option} \\ \midrule - mass & \unit{\gram} & mass-unit \\ - volume & \unit{\milli\liter} & volume-unit \\ - fraction & w/w\% & fraction-unit \\ - amount & \unit{\milli\mole} & amount-unit \\ - equiv & eq & equiv-unit \\ - purity & \% & purity-unit \\ - concentration & \unit{\Molar} & concentration-unit \\ - solvent & n.a. & \\ + mass & \unit{\gram} & mass-unit \\ + volume & \unit{\milli\liter} & volume-unit \\ + fraction & w/w\% & fraction-unit \\ + amount & \unit{\milli\mole} & amount-unit \\ + equiv & eq & equiv-unit \\ + purity & \% & purity-unit \\ + concentration & \unit{\Molar} & concentration-unit \\ + solvent & n.a. & \\ \midrule - solution-name & solution in & solution \\ + solution-name & solution in & solution \\ \bottomrule \end{tabular} \end{table} @@ -2044,7 +2066,7 @@ solvent. This text automatically adapts to the document language set via the German translation are included in the package. If you write in a different language (or just don't like the predefined text), you can use the command \cs{DeclareChemTranslation}\marg{key}\marg{language}\marg{translation} -(with \keyis{\meta{key}}{solution}) as described in +(with \keyis*{\meta{key}}{solution}) as described in section~\vref{sec:lang-module} in order to supply your own translation. \begin{example} @@ -2159,11 +2181,11 @@ contents of the categories are typeset. Using the \cs{reactants} command inside of section headings or captions can mess up the order in which the molecules are numbered, especially when also using a table of contents and/or a list of figures/tables. To prevent this, -the \module{reactants} module offers the \code{+} suffixed variant of -\cs{reactants}, comparable to \pkg{chemnum}'s \cs{cmpd+} command. +the \module{reactants} module offers the \parg\ suffixed variant of +\cs{reactants}, comparable to \pkg{chemnum}'s \cs{cmpd}\parg\ command. \begin{commands} - \command{reactant+}[\oarg{data and units}\marg{ID}] + \command{reactant}[\parg\oarg{data and units}\marg{ID}] This command is used to insert name, number, and, if present, data of a predefined reactant with the \meta{ID} in a section heading or caption. \end{commands} @@ -2241,7 +2263,7 @@ uses either \pkg{longtable} or \pkg{xltabular} to typeset this list: are responsible for formatting the list of reactants. Be aware that with \code{longtable}, the column widths are hard coded, thus you could experience overfull box warnings if you use exceptionally long \meta{ID}s - in combination with the starred variant \cs{printreactants*}, which is + in combination with the starred variant \cs{printreactants}\sarg, which is responsible for adding the \meta{ID} in resulting list, as well. \end{options} @@ -2269,7 +2291,7 @@ The following command is provided to set oxidation numbers: Places \meta{number} as right superscript to \meta{atom}; \meta{number} has to be a (rational) number! \meta{atom} is treated as a \chemformula\ formula, like it would be in \cs{chcpd} (this depends on the setting of - the \option{formula} option, see~\vref{sec:chemformula-module}). + the \option{formula} option, see~\vref{sec:formula-module}). \end{commands} \begin{example} @@ -2476,7 +2498,7 @@ The \chemmodule{scheme} module loads the \pkg{chemnum} package~\cite{pkg:chemnum} and defines a floating environment \showenv{scheme}. That is, it \emph{only} defines this float if no environment \env{scheme} exists at the end of the preamble. The module checks -for different available float defining methods, in \emph{this} order: +for different available float defining methods: \begin{itemize} \item If the current class is a \KOMAScript\ class \cs*{DeclareNewTOC} will be used. @@ -2491,9 +2513,19 @@ for different available float defining methods, in \emph{this} order: \item If neither of the above the \enquote{manual} method is used. This means the environment is defined the same way like \env*{figure} is defined in the \cls*{article} class or the \cls*{book} class, depending if - \cs*{chapter} is defined or not. + \cs*{chapter} is defined or not (the \enquote{traditional} way). + \item \sinceversion{6.1}If no unique choice is possible the \emph{last} of + the detected methods will be used. For example, if you use the + \cls{memoir} class \emph{and} load the \pkg{float} then the method of + \pkg{float} will be used. \end{itemize} +\begin{options} + \keychoice{float-method}{KOMA,memoir,tocbasic,newfloat,floatrow,float,traditional}\Module{scheme} + \sinceversion{6.1}You can also decide for yourself which method you want + \chemmacros\ to use by setting this option accordingly. +\end{options} + The list name and the caption name both are translated to the language specified according to the \option{lang} option and the provided translations, see section~\vref{sec:lang-module} for details. If you want to manually change @@ -2509,13 +2541,18 @@ The list of schemes is printed as expected with \command{listofschemes} \end{commands} -If\sinceversion{5.6} you are using either \pkg{cleveref} or \pkg{fancyref} the -\env{scheme} environment (or rather its captions) are supported already. For -\pkg{fancyref} use the prefix \code{sch}. +If\sinceversion{5.6} you are using either \pkg{cleveref}~\cite{pkg:cleveref} +or \pkg{fancyref}~\cite{pkg:fancyref} the \env{scheme} counter is supported by +both packages and already set up by \chemmacros. + +For \pkg{fancyref} use the prefix \code{sch} by defining the following: +\begin{sourcecode} + \newcommand*\fancyrefschlabelprefix{sch} +\end{sourcecode} \section{The \chemmodule*{spectroscopy} Module}\label{sec:spectroscopy-module} -The \chemmodule{spectroscopy} module loads the \chemmodule{chemformula} module +The \chemmodule{spectroscopy} module loads the \chemmodule{formula} module and the \pkg{siunitx} package~\cite{pkg:siunitx}. \subsection{The \cs*{NMR} Command} @@ -2535,7 +2572,7 @@ input. \pkg{siunitx} number input, \meta{unit} is a valid \pkg{siunitx} unit input. \meta{solvent} is any valid \chemformula\ input as in \cs{chcpd} (this depends on the setting of the \option{formula} option, - see~\vref{sec:chemformula-module}). + see~\vref{sec:formula-module}). \end{commands} \emph{All} Argument are optional! Without arguments we get: @@ -2682,7 +2719,7 @@ number of options. (printed by \cs{\#}). \keybool{parse}\Module{spectroscopy}\Default{true} Treat the solvent as \chemformula\ formula (this depends on the setting of - the \option{formula} option, see~\vref{sec:chemformula-module}) or not. + the \option{formula} option, see~\vref{sec:formula-module}) or not. \keyval{delta}{tokens}\Module{spectroscopy}\Default The \meta{tokens} are added after $\delta$. \keybool{list}\Module{spectroscopy}\Default{false} @@ -2932,9 +2969,9 @@ package~\cite{pkg:siunitx}. This macro can be used to write the thermodynamic state variables. \begin{example} - \state{A}, \state[subscript-left=f]{G} , - \state[subscript-right=\ch{Na}]{E}, - \state[superscript-right=\qty{1000}{\celsius}]{H} + \state{A}, \state_f{G} , + \state{E}_{\ch{Na}}, + \state{H}^{\qty{1000}{\celsius}} \end{example} These options are available: @@ -2957,6 +2994,13 @@ These options are available: An alias of \option{subscript-left}. \end{options} +Since version~6.1\sinceversion{6.1} you can input the sub- and superscripts in +a more intuitive way instead of using the options -- the latter are still +available, though: +\begin{example} + \state_a^b{X}_c^d +\end{example} + \subsection{Thermodynamic Variables} The \chemmodule{thermodynamics} module provides a few commands for specific @@ -3123,11 +3167,11 @@ units. Like all \pkg{siunitx} units they're only valid inside \command{Molar} \unit{\Molar} \command{MolMass} \unit{\MolMass} \command{normal} \unit{\normal} - \command{torr} \unit{\torr} - \par -\sinceversion{6.0} Since some units still frequently used in chemistry were removed from version 3 of \pkg{siunitx}, - \chemmacros\ also defines these in the same way, older versions of \pkg{siunitx} used to do. - These units are: + \command{torr} \unit{\torr}\par + %%% + \sinceversion{6.0}Since some units still frequently used in chemistry were + removed from version 3 of \pkg{siunitx} \chemmacros\ also defines these in + the same way, older versions of \pkg{siunitx} used to do. These units are: \command{angstrom} \unit{\angstrom} \command{atomicmassunit} \unit{\atomicmassunit} \command{bar} \unit{\bar} @@ -3136,8 +3180,7 @@ units. Like all \pkg{siunitx} units they're only valid inside \end{commands} -\part{Core Modules} - +\part{Core Modules}\label{part:core-modules} The modules described in this part are always loaded and mainly concern module writers. @@ -3175,7 +3218,7 @@ modules. In the macro descriptions below \TF\ denotes that a \code{T}, an \explcommand{chemmacros_allow_break:} Inserts a penalty of \num{0}. \explcommand{chemmacros_skip_nobreak:N}[ \meta{skip/length variable}] - Insert a horizontal skip where a linebreak is disallowed. + Inserts a horizontal skip where a linebreak is disallowed. \expandable\explcommand{chemmacros_if_is_int:n}[\TF\ \marg{input} \marg{true} \marg{false}] Checks if \meta{input} is an integer or something else. @@ -3183,7 +3226,7 @@ modules. In the macro descriptions below \TF\ denotes that a \code{T}, an Checks if the current font weight is one of \chemboldchecks{or}. \explcommand{chemmacros_bold:n}[ \marg{text}] Checks if the current font weight is bold and if yes places \meta{text} in - \cs*{textbf} if in text mode or in \cs*{bm} if in math mode. If no + \cs*{textbf} if in text mode or in \cs*{bm} if in math mode. If no, \meta{text} simply is placed in the input stream as is. \explcommand{chemmacros_text:n}[ \marg{text}] Ensures that \meta{text} is placed in text mode. @@ -3240,24 +3283,22 @@ This is how the macros \cs{NewChemParticle}, \cs{RenewChemParticle}, The following macros strictly speaking are not provided by the \chemmodule{base} module but this place fits best for their description. \begin{commands} - \expandable\explcommand{chemmacros_if_module_exist:n}[\TF\ \marg{module} + \expandable\explcommand{chemmacros_module_if_exist:n}[\TF\ \marg{module} \marg{true} \marg{false}] Checks if a file with the correct name for a module \meta{module} can be found. - \expandable\explcommand{chemmacros_if_module_loaded:n}[\TF\ \marg{module} + \expandable\explcommand{chemmacros_module_if_loaded:n}[\TF\ \marg{module} \marg{true} \marg{false}] Checks if the module \meta{module} has already been loaded or not. - \explcommand{chemmacros_load_module:n}[ \marg{module}] - Loads module \meta{module} if it hasn't been loaded, yet. - \explcommand{chemmacros_load_modules:n}[ \marg{csv list of modules}] - Loads every module in \meta{csv list of modules} if they haven't been - loaded, yet. This is the code level variant of \cs{usechemmodule}. - \explcommand{chemmacros_before_module:nn}[ \marg{module} \marg{code}] + \explcommand{chemmacros_module_load:n}[ \marg{module}] + Loads module \meta{module} if it hasn't been loaded, yet. The module must + exist as a separate file as described in section~\ref{sec:own-modules}. + \explcommand{chemmacros_module_before:nn}[ \marg{module} \marg{code}] Saves\sinceversion{5.1} \meta{code} and inserts it right before \meta{module} is loaded. If \meta{module} is never loaded then \meta{code} is never inserted. If \meta{module} already is loaded when the command is used then \meta{code} also is never inserted. - \explcommand{chemmacros_after_module:nn}[ \marg{module} \marg{code}] + \explcommand{chemmacros_module_after:nn}[ \marg{module} \marg{code}] Saves\sinceversion{5.1} \meta{code} and inserts it right after \meta{module} is loaded. If \meta{module} is never loaded then \meta{code} is never inserted. If \meta{module} already is loaded when @@ -3371,13 +3412,13 @@ following macros are available: A token list variable that holds the language which is used by \explcs{chemmacros_translate:n} for translation, \emph{after begin document}. - \command{ChemTranslate}[\marg{translation key}] + \expandable\command{ChemTranslate}[\marg{translation key}] A version of \explcs{chemmacros_translate:n} for those who prefer traditional \LaTeXe\ programming over expl3. - \explcommand{chemmacros_declare_translation:nnn}[\marg{language}\marg{key}% + \explcommand{chemmacros_declare_translation:nnn}[ \marg{language} \marg{key} \marg{translation}] The expl3 version of \cs{DeclareChemTranslation}. - \explcommand{chemmacros_declare_translations:nn}[\marg{key}\Marg{\meta{language} + \explcommand{chemmacros_declare_translations:nn}[ \marg{key} \Marg{\meta{language} = \meta{translation}}] The expl3 version of \cs{DeclareChemTranslations}. \end{commands} @@ -3507,47 +3548,42 @@ me (see section~\vref{sec:submitting-module}) so they can be added to the \appendix \part{Appendix} -\section{Own Modules}\label{sec:own-modules} +\section{Own Modules Called Styles}\label{sec:own-modules} \subsection{How To} If you have additional functionality which you think might be useful as a \chemmacros\ module then you can easily write one yourself. The module must be a file in a path where \TeX\ can find it following a certain naming scheme. The file for a module \chemmodule*{foo} \emph{must be named} -\code{chemmacros.module.foo.code.tex}. +\code{chemmacros.style.foo.code.tex}. \begin{commands} - \command{ChemModule}[\sarg\marg{name}\marg{description}\oarg{minimal - compatibility version}] - Register module \meta{name}. The optional argument \meta{minimal - compatibility version} ensures that this module is only loaded if the - option \option{compatibility} has a high enough version number. If it is - omitted the module can be loaded in each version~5.0 or higher. + \command{ChemStyle}[\sarg\marg{name}\oarg{version description}] + Register module \meta{name} where the optional argument is passed to the + optional argument of \cs*{ProvidesFile}. \end{commands} The first line in the file then should look similar to this: \begin{sourcecode} - \ChemModule{foo}{2015/07/14 description of foo} + \ChemStyle{foo}[2022-02-07 description of foo] \end{sourcecode} -This registers module \chemmodule*{foo} which means \chemmacros\ will accept -this file as a valid module. +This registers the style \chemmodule*{foo} which means \chemmacros\ will +accept this file as a valid style. + +Such a style can then be loaded to your document via +\begin{commands} + \command{usechemstyle}[\marg{csv list of style names}] + which should be used in the preamble of your document. +\end{commands} Since \chemmacros\ is written using expl3 \cs{ChemModule} starts an expl3 programming environment. If you don't want that but rather want to write your module using traditional \LaTeXe\ methods then use the starred variant: \begin{sourcecode} - \ChemModule*{foo}{2015/07/14 description of foo} + \ChemStyle*{foo}[2022-02-07 description of foo] \end{sourcecode} In both variants \code{@} has category code~11 (letter). -Since new modules very likely might rely on code provided first in a certain -version of \chemmacros\ you might want to make sure that your module only is -loaded when the compatibility mode is high enough to provide the features you -want: -\begin{sourcecode} - \ChemModule{foo}{2015/10/14 description of foo}[5.2] -\end{sourcecode} - If you decide to write your module \chemmodule*{foo} using expl3 and add options you want to be able to set using \cs{chemsetup}\Oarg{foo}\marg{options} please make sure you define (and set) @@ -3608,8 +3644,9 @@ the usual support forums \end{itemize} You can also open an issue on \url{https://github.com/cgnieder/chemmacros/issues/} possibly adding the label -\emph{support}. - +\emph{support} or write an email to +\href{mailto:chemmacros@cnltx.de}{chemmacros@cnltx.de}. + \subsection{Suggestions} If you have any suggestions on how \chemmacros\ could be improved then please go to \url{https://github.com/cgnieder/chemmacros/issues/} and open a new @@ -3619,8 +3656,8 @@ issue possibly adding the label \emph{suggestion}. If you find any bugs, \ie, errors (something not working as described, conflicts with other packages, \ldots) then please go to \url{https://github.com/cgnieder/chemmacros/issues/} and open a new issue -describing the error including a minimal working example and possibly adding -the label \emph{bug}. +describing the error including a \emph{minimal working example} and possibly +adding the label \emph{bug}. \printbibliography diff --git a/macros/latex/contrib/chemmacros/chemmacros.sty b/macros/latex/contrib/chemmacros/chemmacros.sty index c9a913e922..649aed58b6 100644 --- a/macros/latex/contrib/chemmacros/chemmacros.sty +++ b/macros/latex/contrib/chemmacros/chemmacros.sty @@ -1,40 +1,39 @@ % -------------------------------------------------------------------------- -% the CHEMMACROS package +% the CHEMMACROS package v6.1 2022/02/13 % % comprehensive support for typesetting chemistry documents % % -------------------------------------------------------------------------- -% Clemens Niederberger -% -------------------------------------------------------------------------- -% https://github.org/cgnieder/chemmacros/ -% contact@mychemistry.eu +% Web: https://github.org/cgnieder/chemmacros/ +% E-Mail: chemmacros@cnltx.de % -------------------------------------------------------------------------- % If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. +% feel free to contact us. % -------------------------------------------------------------------------- -% Copyright 2011--2022 Clemens Niederberger +% Copyright 2011--2021 Clemens Niederberger +% 2022-- Clemens Niederberger & Sonja K. % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 +% conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008/05/04 or later. % % This work has the LPPL maintenance status `maintained'. % -% The Current Maintainer of this work is Clemens Niederberger. +% The Current Maintainers of this work are Clemens Niederberger and Sonja K. % -------------------------------------------------------------------------- -\RequirePackage{l3keys2e} +\RequirePackage {l3keys2e} \ExplSyntaxOn % -------------------------------------------------------------------------- % package information: -\tl_const:Nn \c_chemmacros_date_tl {2022/01/18} +\tl_const:Nn \c_chemmacros_date_tl {2022/02/13} \tl_const:Nn \c_chemmacros_version_major_number_tl {6} -\tl_const:Nn \c_chemmacros_version_minor_number_tl {0} -\tl_const:Nn \c_chemmacros_version_subrelease_tl {a} +\tl_const:Nn \c_chemmacros_version_minor_number_tl {1} +\tl_const:Nn \c_chemmacros_version_subrelease_tl {} \tl_const:Nx \c_chemmacros_version_number_tl { \c_chemmacros_version_major_number_tl . @@ -52,7 +51,7 @@ {chemmacros} {\c_chemmacros_date_tl} {\c_chemmacros_version_tl} - {\c_chemmacros_info_tl \c_space_tl (CN)} + {\c_chemmacros_info_tl \c_space_tl (CN~ &~ SK)} % -------------------------------------------------------------------------- % variants of kernel functions: @@ -69,7 +68,7 @@ \cs_generate_variant:Nn \int_to_arabic:n {V} -\cs_generate_variant:Nn \msg_error:nnnnn {nnnx} +\cs_generate_variant:Nn \msg_error:nnnnn {nnnx,nnnxx} \cs_generate_variant:Nn \msg_error:nnnn {nnnx} \cs_generate_variant:Nn \msg_error:nnn {nnV} \cs_generate_variant:Nn \msg_warning:nnn {nnV} @@ -122,29 +121,36 @@ \clist_new:N \l_chemmacros_modules_clist \clist_set:Nn \l_chemmacros_modules_clist { - base, errorcheck, lang, greek, chemformula, charges, acid-base, symbols, + base, errorcheck, lang, greek, formula, charges, acid-base, symbols, particles, phases, nomenclature, tikz, xfrac, translations } \clist_const:Nn \c_chemmacros_all_modules_clist { - base, errorcheck, lang, greek, chemformula, charges, acid-base, symbols, + base, errorcheck, lang, greek, formula, charges, acid-base, symbols, particles, phases, nomenclature, tikz, isotopes, mechanisms, newman, orbital, polymers, reactions, redox, xfrac, scheme, spectroscopy, thermodynamics, units, reactants, translations } -\keys_define:nn {chemmacros/package-options} +\tl_new:N \g__chemmacros_module_stop_tl + +\cs_new_protected:Npn \chemmacros_stop_module:n #1 + { \tl_gput_right:Nn \g__chemmacros_module_stop_tl {{#1}} } + +\keys_define:nn {chemmacros/load-time} { minimal .bool_set:N = \l__chemmacros_minimal_bool , minimal .initial:n = false , modules .code:n = \clist_if_in:NnF \l_chemmacros_modules_clist {#1} { \clist_put_right:Nn \l_chemmacros_modules_clist {#1} } , + stop .code:n = + \clist_map_inline:nn {#1} { \chemmacros_stop_module:n {##1} } , unknown .code:n = \__chemmacros_loadtime_warning:n {unknown-option} } -\ProcessKeysPackageOptions {chemmacros/package-options} +\ProcessKeysPackageOptions {chemmacros/load-time} \keys_define:nn {chemmacros} { @@ -152,8 +158,8 @@ modules .code:n = \msg_warning:nn {chemmacros} {module-mechanism} \__chemmacros_loadtime_warning:n {load-time-option} , - package-options / minimal .meta:nn = {chemmacros} {minimal} , - package-options / modules .meta:nn = {chemmacros} {modules} + load-time / minimal .meta:nn = {chemmacros} {minimal} , + load-time / modules .meta:nn = {chemmacros} {modules} } \NewDocumentCommand \usechemmodule {m} @@ -219,8 +225,14 @@ \msg_new:nnn {chemmacros} {forbidden-module} { You've~ requested~ the~ chemmacros~ module~ `modules'~ \msg_line_context: .~ - This~ module~ is~ a~ pseudo~ module~ which~ may~ not~ be~ loaded~ through~ - the~ module~ loading~ mechansim. + This~ module~ is~ a~ pseudo~ module~ which~ may~ not~ be~ loaded~ through~ + the~ module~ loading~ mechansim. + } + +\msg_new:nnn {chemmacros} {before-module} + { + The~ module~ `#1'~ has~ already~ been~ loaded.~ The~ code~ cannot~ be~ + inserted~ before~ it~ \msg_line_context: } % ---------------------------------------------------------------------------- @@ -231,10 +243,88 @@ { \prg_return_false: } } +% ---------------------------------------------------------------------------- +% deprecation & removal +\msg_new:nnn {chemmacros} {deprecated} + { + On~ line~ \msg_line_number: : \\ + The~ #1~ `#2'~ is~ deprecated.~ Use~ #1~ `#3'~ instead . + } + +\msg_new:nnn {chemmacros} {deprecated-function} + { The~ command~ #1~ is~ deprecated.~ Use~ #2 instead . } + +\msg_new:nnn {chemmacros} {removed-function} + { The~ command~ #1~ has~ been~ removed. } + +\msg_new:nnn {chemmacros} {removed} + { + On~ line~ \msg_line_number: : \\ + The~ #1~ `#2'~ has~ been~ removed~ from~ chemmacros. \\ + If~ you~ need~ it~ back~ please~ open~ an~ issue~ on~ \\ + https://github.com/cgnieder/chemmacros/issues + \tl_if_blank:nF {#3} { \\ #3 } + } + +% #1: type +% #2: old +% #3: new +\cs_new_protected:Npn \__chemmacros_deprecation_warning:nnn #1#2#3 + { \msg_warning:nnnnn {chemmacros} {deprecated} {#1} {#2} {#3} } +\cs_generate_variant:Nn \__chemmacros_deprecation_warning:nnn {nne,nV} + +% #1: type +% #2: old +% #3: additional text +\cs_new_protected:Npn \chemmacros_removal_warning:nnn #1#2#3 + { \msg_warning:nnnnn {chemmacros} {removed} {#1} {#2} {#3} } +\cs_generate_variant:Nn \chemmacros_removal_warning:nnn {nV} + +% #1: type +% #2: old +\cs_new_protected:Npn \chemmacros_removal_warning:nn #1#2 + { \msg_warning:nnnn {chemmacros} {removed} {#1} {#2} } +\cs_generate_variant:Nn \chemmacros_removal_warning:nn {nV} + +% #1: new +\cs_new_protected:Npn \chemmacros_deprecate_option:n #1 + { \__chemmacros_deprecation_warning:nVn {option} \l_keys_key_str {#1} } + +\cs_new_protected:Npn \chemmacros_deprecate_option: + { \__chemmacros_deprecation_warning:nV {option} \l_keys_key_str } + +% #1: additional text +\cs_new_protected:Npn \chemmacros_remove_option:n #1 + { \chemmacros_removal_warning:nVn {option} \l_keys_key_str {#1} } + +\cs_new_protected:Npn \chemmacros_remove_option: + { \chemmacros_removal_warning:nV {option} \l_keys_key_str } + +% #1: old +% #2: new +\cs_new_protected:Npn \chemmacros_deprecate_function:NN #1#2 + { + \cs_set_protected:Npn #1 + { + \msg_error:nnnn {chemmacros} {deprecated-function} {#1} {#2} + #2 + } + } + +% #1: old +\cs_new_protected:Npn \chemmacros_remove_function:N #1 + { + \cs_set_protected:Npn #1 + { \msg_error:nnn {chemmacros} {removed-function} {#1} } + } + +\NewDocumentCommand \DeclareChemDeprecated {mm} + { \chemmacros_deprecate_function:NN #1 #2 } + % ---------------------------------------------------------------------------- % this is for external file modules called "styles": \tl_const:Nn \c__chemmacros_module_extension_tl {code.tex} -\tl_const:Nn \c__chemmacros_module_prefix_tl {chemmacros} +\tl_const:Nn \c__chemmacros_module_prefix_tl {chemmacros.style} \tl_new:N \g__chemmacros_modules_loaded_tl @@ -256,7 +346,8 @@ \chemmacros_module_if_exist:nTF {#1} { \__chemmacros_module_hook_use:nn {#1} {before} - \msg_info:nnn {chemmacros} {loading-module} {#1} + \msg_log:nnn {chemmacros} {loading-module} {#1} + \msg_term:nnn {chemmacros} {loading-module} {#1} \@onefilewithoptions {\c__chemmacros_module_prefix_tl.#1}[][] \c__chemmacros_module_extension_tl @@ -297,8 +388,8 @@ % #2: code \cs_new_protected:Npn \chemmacros_module_before:nn #1#2 { - % TODO: error in T case? - \chemmacros_module_if_loaded:nF {#1} + \chemmacros_module_if_loaded:nTF {#1} + { \msg_error:nnn {chemmacros} {before-module} {#1} } { \__chemmacros_add_to_module_hook:nnn {#1} {before} {#2} } } @@ -328,14 +419,9 @@ \cs_generate_variant:Nn \__chemmacros_module_hook_use:nn {V} % -------------------------------------------------------------------------- -\tl_new:N \l__chemmacros_module_date_tl -\tl_new:N \l__chemmacros_module_version_tl - -\tl_set_eq:NN \l__chemmacros_module_date_tl \c_chemmacros_date_tl -\tl_set_eq:NN \l__chemmacros_module_version_tl \c_chemmacros_version_tl - \cs_new_protected:Npn \__chemmacros_module:nn #1#2 { + \str_if_in:NnT \g__chemmacros_module_stop_tl {{#1}} { \file_input_stop: } \tl_gput_right:Nn \g__chemmacros_modules_loaded_tl {{#1}} \str_if_eq:xxF {\c__chemmacros_module_prefix_tl.#1.\c__chemmacros_module_extension_tl} @@ -345,24 +431,38 @@ {#1} {\@currname.\@currext} } - \ProvidesFile - {\c__chemmacros_module_prefix_tl.#1.\c__chemmacros_module_extension_tl} - [ - \l__chemmacros_module_date_tl - \c_space_tl - v \l__chemmacros_module_version_tl - \c_space_tl - chemmacros~ style~ file~ `#1'~ (#2) - ] + \tl_if_blank:nTF {#2} + { + \ProvidesFile + {\c__chemmacros_module_prefix_tl.#1.\c__chemmacros_module_extension_tl} + } + { + \ProvidesFile + {\c__chemmacros_module_prefix_tl.#1.\c__chemmacros_module_extension_tl} + [#2] + } } +% define a chemmacros style: +% standard modules are written in the expl3 programming environment, the +% starred version only uses a 2e programming environment, i.e., with @ as a +% letter +% #1: name +% #2: description +\NewDocumentCommand \ChemStyle {smo} + { + \IfNoValueTF {#3} + { \__chemmacros_module:nn {#2} {#3} } + { \__chemmacros_module:nn {#2} {} } + \bool_if:nF {#1} { \ExplSyntaxOn } + } + +% command for loading styles: +\NewDocumentCommand \usechemstyle {m} { \chemmacros_modules_load:n {#1} } + % -------------------------------------------------------------------------- % define internal chemmacros modules: \tl_new:N \g_chemmacros_module_tl -\tl_new:N \g__chemmacros_module_stop_tl - -\cs_new_protected:Npn \chemmacros_stop_module:n #1 - { \tl_gput_right:Nn \g__chemmacros_module_stop_tl {{#1}} } % #1: name % #2: description @@ -370,8 +470,8 @@ { \str_if_in:NnT \g__chemmacros_module_stop_tl {{#1}} { \__chemmacros_gobble_module:w } - \msg_log:nnnn {chemmacros} {loading-module} {#1} {#2} - \msg_term:nnnn {chemmacros} {loading-module} {#1} {#2} + \msg_log:nnn {chemmacros} {loading-module} {#1} + \msg_term:nnn {chemmacros} {loading-module} {#1} \tl_gput_right:Nn \g__chemmacros_modules_loaded_tl {{#1}} \tl_gset:Nn \g_chemmacros_module_tl {#1} \__chemmacros_module_hook_use:nn {#1} {before} @@ -392,22 +492,12 @@ \ChemModule{base}{2022/01/10 basic chemmacros module} % -------------------------------------------------------------------------- -\msg_new:nnn {chemmacros} {command-deprecated} - { - The~ command~ \token_to_str:N #1 \c_space_tl is~ deprecated.~ Use~ - \token_to_str:N #2 \c_space_tl instead. - } - -% define a deprecated command with hints to the corresponding new one: -\cs_new_protected:Npn \chemmacros_define_deprecated:NN #1#2 +\msg_new:nnn {chemmacros} {patch-failed} { - \cs_set_protected:Npn #1 - { \msg_warning:nnnn {chemmacros} {command-deprecated} {#1} {#2} #2 } + I~ failed~ to~ patch~ \token_to_str:N #1 .~ Please~ contact~ the~ package~ + author. } -\NewDocumentCommand \DeclareChemDeprecated {mm} - { \chemmacros_define_deprecated:NN #1 #2 } - % -------------------------------------------------------------------------- % define a macro set: % \NewChem... \RenewChem... \DeclareChem... \ProvideChem... @@ -519,7 +609,7 @@ \cs_new_protected:Npn \chemmacros_set_keys:nn #1#2 { \keys_set:nn {chemmacros/#1} {#2} } -\cs_generate_variant:Nn \chemmacros_set_keys:nn {x,nx} +\cs_generate_variant:Nn \chemmacros_set_keys:nn {e,ne} \cs_new_protected:Npn \chemmacros_set_keys_groups:nnn #1#2#3 { \keys_set_groups:nnn {chemmacros/#1} {#2} {#3} } @@ -595,6 +685,8 @@ { \prg_return_true: } { \prg_return_false: } } + +% -------------------------------------------------------------------------- \cs_new_protected:Npn \chemmacros_cs_if_free_new:Npn #1 { \cs_if_exist:NF #1 @@ -609,6 +701,15 @@ } \cs_generate_variant:Nn \chemmacros_cs_if_free_new_protected:Npn {c} +% -------------------------------------------------------------------------- +\cs_new_protected:Npn \chemmacros_patch_cmd:Nnn #1#2#3 + { + \patchcmd #1 {#2} {#3} + {} + { \msg_warning:nnn {chemmacros} {patch-failed} {#1} } + } + +% -------------------------------------------------------------------------- % #1: counter % #2: singular % #3: plural @@ -729,7 +830,7 @@ \seq_new:N \l__chemmacros_if_bf_seq -\seq_set_split:Nnn \l__chemmacros_if_bf_seq { , } +\seq_set_split:Nnn \l__chemmacros_if_bf_seq {,} { b , bc , bm , bx , bux , eb , ebc , ebx , mb , @@ -748,9 +849,6 @@ {#1} } -\cs_new_protected:Npn \chemmacros_detect_bold:n - { \error \chemmacros_bold:n } - % -------------------------------------------------------------------------- \RequirePackage{amstext} @@ -808,7 +906,7 @@ } \ChemModuleEnd -\ChemModule{errorcheck}{2022/01/16 error checking for unloaded modules} +\ChemModule{errorcheck}{2022/01/23 error checking for unloaded modules} \msg_new:nnn {chemmacros} {undefined} { @@ -881,6 +979,24 @@ \chemmacros_command_requires_module:Nn \listofreactions {reactions} \chemmacros_command_requires_module:Nn \AddRxnDesc {reactions} +% reactants module +\chemmacros_command_requires_module:Nn \DeclareChemReactant {reactants} +\chemmacros_command_requires_module:Nn \reactant {reactants} +\chemmacros_command_requires_module:Nn \reactants {reactants} +\chemmacros_command_requires_module:Nn \reactantl {reactants} +\chemmacros_command_requires_module:Nn \Reactant {reactants} +\chemmacros_command_requires_module:Nn \solvent {reactants} +\chemmacros_command_requires_module:Nn \solvents {reactants} +\chemmacros_command_requires_module:Nn \solventl {reactants} +\chemmacros_command_requires_module:Nn \Solvent {reactants} +\chemmacros_command_requires_module:Nn \reactantplain {reactants} +\chemmacros_command_requires_module:Nn \Reactantplain {reactants} +\chemmacros_command_requires_module:Nn \submainreactantplain {reactants} +\chemmacros_command_requires_module:Nn \Submainreactantplain {reactants} +\chemmacros_command_requires_module:Nn \solventplain {reactants} +\chemmacros_command_requires_module:Nn \Solventplain {reactants} +\chemmacros_command_requires_module:Nn \printreactants {reactants} + % redox module \chemmacros_command_requires_module:Nn \ox {redox} \chemmacros_command_requires_module:Nn \OX {redox} @@ -1092,7 +1208,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{chemformula}{2020/11/29 integration of chemical formulas} +\ChemModule{formula}{2022/01/29 integration of chemical formulas} \RequirePackage{amstext} @@ -1108,10 +1224,14 @@ method~ `chemformula'. } +\msg_new:nnn {chemmacros} {formula-method} + { Using~ the~ formula~ method~ `#1'. } + \msg_new:nnn {chemmacros} {formula-conflict} { - You~ have~ loaded~ multiple~ formula~ method~ packages~ but~ haven't~ - chosen~ which~ method~ to~ use!~ I~ will~ use~ `chemformula'. \\ + You~ have~ loaded~ both~ `chemformula'~ and~ `mhchem'~ as~ formula~ + package~ but~ haven't~ chosen~ which~ formula~ method~ to~ use! \\ + I~ will~ use~ `chemformula'. \\ You~ should~ decide~ for~ only~ one~ of~ the~ packages~ for~ having~ a~ consistent~ layout. } @@ -1120,10 +1240,12 @@ % generic functions for usage in other packages; those are to be set in each % method setup: \cs_new_protected:Npn \chemmacros_reaction:n #1 {#1} -\cs_new_protected:Npn \chemmacros_chemformula:n #1 {#1} -\cs_generate_variant:Nn \chemmacros_chemformula:n { x,V } +\cs_new_protected:Npn \chemmacros_formula:n #1 {#1} +\cs_generate_variant:Nn \chemmacros_formula:n { x,V,e } + +\chemmacros_deprecate_function:NN \chemmacros_chemformula:n \chemmacros_formula:n -\cs_new_protected:Npn \chemmacros@formula #1 { \chemmacros_chemformula:n {#1} } +\cs_new_protected:Npn \chemmacros@formula #1 { \chemmacros_formula:n {#1} } \cs_new_protected:Npn \chemmacros@reaction #1 { \chemmacros_reaction:n {#1} } % -------------------------------------------------------------------------- @@ -1133,22 +1255,22 @@ \tl_new:N \g_chemmacros_formula_method_tl \tl_gset:Nn \g_chemmacros_formula_method_tl {chemformula} -\prop_new:N \l__chemmacros_method_packages_prop +\prop_new:N \l__chemmacros_formula_methods_prop % #1: package/method name % #2: preparations -\cs_new_protected:Npn \chemmacros_add_method_package:nn #1#2 - { \prop_put:Nnn \l__chemmacros_method_packages_prop {#1} {#2} } +\cs_new_protected:Npn \chemmacros_add_formula_method:nn #1#2 + { \prop_put:Nnn \l__chemmacros_formula_methods_prop {#1} {#2} } -\cs_new_protected:Npn \chemmacros_setup_method_package:n #1 +\cs_new_protected:Npn \chemmacros_setup_formula_method:n #1 { - \prop_item:Nn \l__chemmacros_method_packages_prop {#1} + \prop_item:Nn \l__chemmacros_formula_methods_prop {#1} \tl_gset:Nn \g_chemmacros_formula_method_tl {#1} } -\prg_new_conditional:Npnn \chemmacros_if_method_package:n #1 {p,T,F,TF} +\prg_new_conditional:Npnn \chemmacros_if_formula_method:n #1 {p,T,F,TF} { - \prop_if_in:NnTF \l__chemmacros_method_packages_prop {#1} + \prop_if_in:NnTF \l__chemmacros_formula_methods_prop {#1} { \prg_return_true: } { \prg_return_false: } } @@ -1158,7 +1280,7 @@ \bool_if:NF \l__chemmacros_formula_method_set_bool { \bool_set_false:N \l__chemmacros_tmpa_bool - \prop_map_inline:Nn \l__chemmacros_method_packages_prop + \clist_map_inline:nn {chemformula,mhchem} { \chemmacros_if_package_loaded:nT {##1} { @@ -1181,11 +1303,11 @@ \cs_new_protected:Npn \chemmacros_set_formula_method:n #1 { - \chemmacros_if_method_package:nTF {#1} - { \chemmacros_setup_method_package:n {#1} } + \chemmacros_if_formula_method:nTF {#1} + { \chemmacros_setup_formula_method:n {#1} } { \msg_warning:nnn {chemmacros} {unknown-formula-method} {#1} - \chemmacros_setup_method_package:n {chemformula} + \chemmacros_setup_formula_method:n {chemformula} } \bool_set_true:N \l__chemmacros_formula_method_set_bool } @@ -1193,19 +1315,19 @@ % -------------------------------------------------------------------------- % add formula methods: -\chemmacros_add_method_package:nn {chemformula} +\chemmacros_add_formula_method:nn {chemformula} { - \chemmacros_integrate_package:nnn {} {chemformula} {2015/09/08} - \cs_set_protected:Npn \chemmacros_chemformula:n #1 + \chemmacros_integrate_package:nnn {} {chemformula} {2022/01/23} + \cs_set_protected:Npn \chemmacros_formula:n #1 { \chemformula_chcpd:nn {} {#1} } \cs_set_protected:Npn \chemmacros_reaction:n #1 { \chemformula_ch:nn {} {#1} } } -\chemmacros_add_method_package:nn {mhchem} +\chemmacros_add_formula_method:nn {mhchem} { \chemmacros_integrate_package:nnn {version=4} {mhchem} {} - \cs_set_protected:Npn \chemmacros_chemformula:n #1 { \ce {#1} } + \cs_set_protected:Npn \chemmacros_formula:n #1 { \ce {#1} } \cs_set_protected:Npn \chemmacros_reaction:n #1 { \ce {#1} } \chemmacros_module_after:nn {charges} { @@ -1219,10 +1341,10 @@ } } -\chemmacros_add_method_package:nn {chemist} +\chemmacros_add_formula_method:nn {chemist} { \RequirePackage {chemist} - \cs_set_protected:Npn \chemmacros_chemformula:n #1 + \cs_set_protected:Npn \chemmacros_formula:n #1 { \chemmacros_text:n { \ChemForm {#1} } } \cs_set_protected:Npn \chemmacros_reaction:n #1 { \chemmacros_text:n { \ChemForm {#1} } } @@ -1239,17 +1361,16 @@ } } -\chemmacros_add_method_package:nn {chemfig} +\chemmacros_add_formula_method:nn {chemfig} { \RequirePackage {chemfig} - \cs_set_protected:Npn \chemmacros_chemformula:n #1 - { \printatom {#1} } + \cs_set_protected:Npn \chemmacros_formula:n #1 { \printatom {#1} } \cs_set_protected:Npn \chemmacros_reaction:n #1 - { \printatom {#1} } + { \schemestart #1 \schemestop } \chemmacros_module_after:nn {charges} { \cs_set_protected:Npn \chemmacros_elpair:n #1 - { \Lewis { 0: , \printatom {#1} } } + { \Charge { 0=\: } {#1} } \cs_set_protected:Npn \chemmacros_plus: { + } \cs_set_protected:Npn \chemmacros_minus: { - } \cs_set_protected:Npn \chemmacros_formal_plus: { \ensuremath{\oplus} } @@ -1264,17 +1385,11 @@ { formula .code:n = \chemmacros_set_formula_method:n {#1} } \hook_gput_code:nnn {begindocument/before} {chemmacros} - { - \bool_if:NF \l__chemmacros_formula_method_set_bool - { - \msg_info:nn {chemmacros} {default-formula-method} - \chemmacros_set_formula_method:n {chemformula} - } - } + { \chemmacros_check_formula_method: } % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{charges}{2020/11/29 charges} +\ChemModule{charges}{2022/01/29 charges} % -------------------------------------------------------------------------- % circled charge signs: they are defined in the `chemformula' package: @@ -1339,7 +1454,7 @@ \cs_new_protected:Npn \chemmacros_formal_minus: { \chemformula_formal_minus: } \cs_new_protected:Npn \chemmacros_charge:n #1 - { \chemmacros_chemformula:n { {}^{#1} } } + { \chemmacros_formula:n { {}^{#1} } } \cs_new_protected:Npn \chemmacros_new_charge_command:Nn #1#2 { @@ -1403,7 +1518,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{acid-base}{2022/01/13 acid/base} +\ChemModule{acid-base}{2022/01/29 acid/base} % -------------------------------------------------------------------------- % equilibrium constants: @@ -1487,8 +1602,8 @@ } \NewDocumentCommand \p {m} { \chemmacros_p:n {#1} } -\NewDocumentCommand \pH {} { \chemmacros_p:n { \chemmacros_chemformula:n {H} } } -\NewDocumentCommand \pOH {} { \chemmacros_p:n { \chemmacros_chemformula:n {OH} } } +\NewDocumentCommand \pH {} { \chemmacros_p:n { \chemmacros_formula:n {H} } } +\NewDocumentCommand \pOH {} { \chemmacros_p:n { \chemmacros_formula:n {OH} } } \NewDocumentCommand \pKa {o} { @@ -1573,7 +1688,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{particles}{2020/11/29 particles} +\ChemModule{particles}{2022/01/29 particles} % -------------------------------------------------------------------------- % particles @@ -1583,7 +1698,7 @@ \use:x { \cs_set_protected:Npn \exp_not:N #1 - { \chemmacros_chemformula:n { \exp_not:V \l__chemmacros_tmpa_tl } } + { \chemmacros_formula:n { \exp_not:V \l__chemmacros_tmpa_tl } } } } @@ -1634,9 +1749,9 @@ { \chemmacros_elpair:n { #2 } \skip_horizontal:N \l__chemmacros_nucleophile_dim - \chemmacros_chemformula:n { {}^{-} } + \chemmacros_formula:n { {}^{-} } } - { \chemmacros_chemformula:n { #2^{-} } } + { \chemmacros_formula:n { #2^{-} } } } \DeclareDocumentCommand #1 {o} { @@ -1713,7 +1828,7 @@ { \mode_leave_vertical: \bool_if:NTF \l__chemmacros_phases_sub_bool - { \chemformula_subscript:n { (#1) } } + { \chemmacros_formula:n { {}_{(#1)} } } { \skip_horizontal:N \l__chemmacros_phases_space_dim \chemmacros_text:n { (#1) } @@ -1730,7 +1845,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{nomenclature}{2022/01/10 chemical names} +\ChemModule{nomenclature}{2022/01/29 chemical names} \bool_new:N \l__chemmacros_iupac_restricted_bool \bool_new:N \l__chemmacros_iupac_strict_bool @@ -1899,44 +2014,15 @@ \NewDocumentCommand \LetChemIUPAC {mm} { \chemmacros_let_iupac:NN #1 #2 } -% -------------------------------------------------------------------------- -\chemmacros_define_keys:nn {nomenclature} - { - iupac .choice: , - iupac / restricted .code:n = - \bool_set_true:N \l__chemmacros_iupac_restricted_bool - \bool_set_false:N \l__chemmacros_iupac_strict_bool , - iupac / auto .code:n = - \bool_set_false:N \l__chemmacros_iupac_restricted_bool - \bool_set_false:N \l__chemmacros_iupac_strict_bool , - iupac / strict .code:n = - \bool_set_false:N \l__chemmacros_iupac_restricted_bool - \bool_set_true:N \l__chemmacros_iupac_strict_bool , - iupac .initial:n = auto - } - % -------------------------------------------------------------------------- % stereo descriptors and other nomenclature commands % Cahn-Ingold-Prelog \dim_new:N \l__chemmacros_cip_kern_dim \dim_set:Nn \l__chemmacros_cip_kern_dim {.075em} -\chemmacros_define_keys:nn {nomenclature} - { cip-kern .dim_set:N = \l__chemmacros_cip_kern_dim } - \tl_new:N \l__chemmacros_cip_inner_tl \tl_new:N \l__chemmacros_cip_outer_tl \tl_new:N \l__chemmacros_cip_number_tl - -\chemmacros_define_keys:nn {nomenclature} - { - cip-inner-format .tl_set:N = \l__chemmacros_cip_inner_tl , - cip-inner-format .initial:n = \itshape , - cip-outer-format .tl_set:N = \l__chemmacros_cip_outer_tl , - cip-outer-format .initial:n = \upshape , - cip-number-format .tl_set:N = \l__chemmacros_cip_number_tl , - cip-number-format .initial:n = \upshape - } \cs_new_protected:Npn \__chemmacros_cip:n #1 { @@ -2005,29 +2091,18 @@ % coordination chemistry \bool_new:N \l__chemmacros_bridge_super_bool -\chemmacros_define_keys:nn {nomenclature} - { - bridge-number .choice: , - bridge-number / sub .code:n = - \bool_set_false:N \l__chemmacros_bridge_super_bool , - bridge-number / super .code:n = - \bool_set_true:N \l__chemmacros_bridge_super_bool , - coord-use-hyphen .bool_set:N = \l__chemmacros_coord_use_hyphen_bool , - coord-use-hyphen .initial:n = true - } - % #1: boolean - if true hyphen is turned on % #2: boolean - if true superscript will be used % #3: symbol % #4: sub-/superscript \cs_new_protected:Npn \chemmacros_coordination_symbol:nnnn #1#2#3#4 { - \chemmacros_chemformula:n {#3} + \chemmacros_formula:n {#3} \tl_if_blank:nF {#4} { \bool_if:nTF {#2} - { \chemmacros_chemformula:n { {}^{#4} } } - { \chemmacros_chemformula:n { {}_{#4} } } + { \chemmacros_formula:n { {}^{#4} } } + { \chemmacros_formula:n { {}_{#4} } } } \bool_if:nT {#1} @@ -2127,13 +2202,6 @@ \skip_new:N \l__chemmacros_iupac_break_skip \skip_set:Nn \l__chemmacros_iupac_break_skip { .03em plus .07em } -\chemmacros_define_keys:nn {nomenclature} - { - hyphen-pre-space .dim_set:N = \l__chemmacros_iupac_hyphen_pre_dim , - hyphen-post-space .dim_set:N = \l__chemmacros_iupac_hyphen_post_dim , - break-space .skip_set:N = \l__chemmacros_iupac_break_skip - } - \cs_new_protected:Npn \chemmacros_break_point_hyphen: { \__chemmacros_break_point_insert:nnn @@ -2255,17 +2323,8 @@ \NewDocumentCommand \RemoveChemIUPACShorthand {m} { \chemmacros_remove_shorthand:N #1 } -\NewChemIUPACShorthand ^ \chemmacros_superscript:n -\NewChemIUPACShorthand | \chemmacros_break_point: -\NewChemIUPACShorthand - \chemmacros_break_point_hyphen: -\NewChemIUPACShorthand ( \chemmacros_break_point_opening_paren: -\NewChemIUPACShorthand ) \chemmacros_break_point_closing_paren: -\NewChemIUPACShorthand [ \chemmacros_break_point_opening_bracket: -\NewChemIUPACShorthand ] \chemmacros_break_point_closing_bracket: -\NewChemIUPAC \chemprime { \ensuremath {{}^{\prime}} } -\NewChemIUPACShorthand ' \chemprime -\NewChemIUPAC \nonbreakinghyphen { \mbox{-} \nobreak \hspace{0pt} } -\NewChemIUPACShorthand = \nonbreakinghyphen +% -------------------------------------------------------------------------- +\tl_new:N \l__chemmacros_iupac_format_tl \cs_new_protected:Npn \chemmacros_iupac:nn #1#2 { @@ -2278,7 +2337,7 @@ \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl { \chemmacros_activate_all_iupac_shorthands: } {#2} - \l__chemmacros_tmpa_tl + \l__chemmacros_iupac_format_tl { \l__chemmacros_tmpa_tl } \group_end: } @@ -2288,6 +2347,18 @@ \NewDocumentCommand \iupac {O{}m} { \chemmacros_iupac:nn {#1} {#2} } % -------------------------------------------------------------------------- +\NewChemIUPACShorthand ^ \chemmacros_superscript:n +\NewChemIUPACShorthand | \chemmacros_break_point: +\NewChemIUPACShorthand - \chemmacros_break_point_hyphen: +\NewChemIUPACShorthand ( \chemmacros_break_point_opening_paren: +\NewChemIUPACShorthand ) \chemmacros_break_point_closing_paren: +\NewChemIUPACShorthand [ \chemmacros_break_point_opening_bracket: +\NewChemIUPACShorthand ] \chemmacros_break_point_closing_bracket: +\NewChemIUPAC \chemprime { \ensuremath {{}^{\prime}} } +\NewChemIUPACShorthand ' \chemprime +\NewChemIUPAC \nonbreakinghyphen { \mbox{-} \nobreak \hspace{0pt} } +\NewChemIUPACShorthand = \nonbreakinghyphen + % R(ectus)/S(inister): \NewChemIUPAC \rectus { \cip {R} } \NewChemIUPAC \sinister { \cip {S} } @@ -2371,12 +2442,6 @@ \NewChemMacroset {Latin} {mm} { \chemmacros_define_latin:Nn #1 {#2} } - -\chemmacros_define_keys:nn {nomenclature} - { - format .tl_set:N = \l__chemmacros_latin_format_tl , - format .initial:n = \emph , - } \cs_new_protected:Npn \chemmacros_write_latin:n #1 { @@ -2404,6 +2469,43 @@ \NewChemLatin \abinitio {ab~initio} \NewChemLatin \insitu {in~situ} +% -------------------------------------------------------------------------- +\chemmacros_define_keys:nn {nomenclature} + { + iupac .choice: , + iupac / restricted .code:n = + \bool_set_true:N \l__chemmacros_iupac_restricted_bool + \bool_set_false:N \l__chemmacros_iupac_strict_bool , + iupac / auto .code:n = + \bool_set_false:N \l__chemmacros_iupac_restricted_bool + \bool_set_false:N \l__chemmacros_iupac_strict_bool , + iupac / strict .code:n = + \bool_set_false:N \l__chemmacros_iupac_restricted_bool + \bool_set_true:N \l__chemmacros_iupac_strict_bool , + iupac .initial:n = auto , + iupac-format .tl_set:N = \l__chemmacros_iupac_format_tl , + cip-kern .dim_set:N = \l__chemmacros_cip_kern_dim , + cip-inner-format .tl_set:N = \l__chemmacros_cip_inner_tl , + cip-inner-format .initial:n = \itshape , + cip-outer-format .tl_set:N = \l__chemmacros_cip_outer_tl , + cip-outer-format .initial:n = \upshape , + cip-number-format .tl_set:N = \l__chemmacros_cip_number_tl , + cip-number-format .initial:n = \upshape , + bridge-number .choice: , + bridge-number / sub .code:n = + \bool_set_false:N \l__chemmacros_bridge_super_bool , + bridge-number / super .code:n = + \bool_set_true:N \l__chemmacros_bridge_super_bool , + coord-use-hyphen .bool_set:N = \l__chemmacros_coord_use_hyphen_bool , + coord-use-hyphen .initial:n = true , + hyphen-pre-space .dim_set:N = \l__chemmacros_iupac_hyphen_pre_dim , + hyphen-post-space .dim_set:N = \l__chemmacros_iupac_hyphen_post_dim , + break-space .skip_set:N = \l__chemmacros_iupac_break_skip , + latin-format .tl_set:N = \l__chemmacros_latin_format_tl , + latin-format .initial:n = \emph , + format .code:n = \chemmacros_deprecate_option:n {latin-format} + } + % -------------------------------------------------------------------------- % hyperref support % ?? unsure about adding IUPAC commands @@ -2453,7 +2555,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{tikz}{2020/11/29 upright greek symbols} +\ChemModule{tikz}{2020/11/29 ease usage of TikZ in chemmacros} \ExplSyntaxOff \RequirePackage{tikz} @@ -2485,7 +2587,7 @@ \dim_new:N \l__chemmacros_el_length_dim % full tip for pairs -\pgfarrowsdeclare { el } { el } +\pgfarrowsdeclare {el} {el} { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } @@ -2495,10 +2597,10 @@ { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } + \pgfsetdash {} {0pt} \pgfsetroundjoin \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathmoveto { \pgfpoint {0pt} {0pt} } \pgfpathlineto { \pgfpoint @@ -2506,19 +2608,19 @@ { .3\l__chemmacros_el_length_dim } } \pgfpathlineto - { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } } + { \pgfpoint { -.5\l__chemmacros_el_length_dim } {0pt} } \pgfpathlineto { \pgfpoint { -\l__chemmacros_el_length_dim } { -.3\l__chemmacros_el_length_dim } } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto { \pgfpoint {0pt} {0pt} } \pgfusepathqfillstroke } % half tip on the left -\pgfarrowsdeclare { left~el } { left~el } +\pgfarrowsdeclare {left~ el} {left~ el} { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } @@ -2528,23 +2630,23 @@ { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } + \pgfsetdash {} {0pt} \pgfsetroundjoin \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathmoveto { \pgfpoint {0pt} {0pt} } \pgfpathlineto { \pgfpoint { -\l__chemmacros_el_length_dim } { .3\l__chemmacros_el_length_dim } } - \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } {0pt} } + \pgfpathlineto { \pgfpoint {0pt} {0pt} } \pgfusepathqfillstroke } % half tip in the right -\pgfarrowsdeclare { right~el } { right~el } +\pgfarrowsdeclare {right~ el} {right~ el} { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } @@ -2554,18 +2656,18 @@ { \dim_set:Nn \l__chemmacros_el_length_dim { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } + \pgfsetdash {} {0pt} \pgfsetroundjoin \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathmoveto { \pgfpoint {0pt} {0pt} } \pgfpathlineto { \pgfpoint { -\l__chemmacros_el_length_dim } { -.3\l__chemmacros_el_length_dim } } - \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } {0pt} } + \pgfpathlineto { \pgfpoint {0pt} {0pt} } \pgfusepathqfillstroke } % -------------------------------------------------------------------------- @@ -2609,7 +2711,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{isotopes}{2020/11/29 a macro to easily print element isotopes} +\ChemModule{isotopes}{2022/01/29 a macro to easily print element isotopes} \RequirePackage{elements} @@ -2802,9 +2904,9 @@ \cs_new_protected:Npn \chemmacros_isotope_write:nnn #1#2#3 { \bool_if:NTF \l__chemmacros_isotope_super_bool - { \chemmacros_chemformula:n { ^{#1}_{#2}#3 } } + { \chemmacros_formula:n { ^{#1}_{#2}#3 } } { - \chemmacros_chemformula:n {#3} + \chemmacros_formula:n {#3} \tl_use:N \l__chemmacros_isotope_side_connect_tl #1 } @@ -3818,11 +3920,38 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{reactions}{2022/01/13 reaction environments} +\ChemModule{reactions}{2022/02/05 reaction environments} -\RequirePackage{mathtools} +\newcounter {reaction} +\hook_gput_code:nnn {package/hyperref/after} {chemmacros} + { + \cs_if_exist:NTF \chapter + { \cs_set:Npn \theHreaction { \theHchapter . \thereaction } } + { \cs_set:Npn \theHreaction { \theHsection . \thereaction } } + } + +\bool_new:N \l__chemmacros_reactions_counter_bool +\bool_new:N \l__chemmacros_reactions_tocbasic_bool + +\cs_new_eq:NN \l@reaction \l@figure +\cs_if_exist:NT \KOMAClassName + { \bool_set_true:N \l__chemmacros_reactions_tocbasic_bool } + +\tl_new:N \g__chemmacros_reaction_description_tl +\tl_new:N \l__chemmacros_reactions_tag_open_tl +\tl_new:N \l__chemmacros_reactions_tag_close_tl +\tl_new:N \l__chemmacros_reactions_before_tag_tl +\tl_new:N \l__chemmacros_reaction_lorname_tl +\tl_new:N \reactionlistname +\tl_new:N \reactionautorefname +\tl_new:N \l__chemmacros_reactions_args_tl % -------------------------------------------------------------------------- +\RequirePackage{mathtools} +% redefine mathtools' command \MT_define_tagform:nwnn to ensure we add an +% entry to the list of reactions even if the user redefines the reaction tag +% this should probably be done via patching... + \cs_new_protected:Npn \__chemmacros_record_for_lor:nnnnn #1#2#3#4#5 { \tl_if_eq:nnT {#1} {reaction} @@ -3844,9 +3973,6 @@ } } -% redefine mathtools' command \MT_define_tagform:nwnn to ensure we add an -% entry to the list of reactions even if the user redefines the reaction tag -% this should probably be done via patching... \hook_gput_code:nnn {package/mathtools/after} {chemmacros} { \cs_set_protected:Npn \MT_define_tagform:nwnn #1[#2]#3#4 @@ -3855,15 +3981,21 @@ { % this is the original part: \maketag@@@{#3\ignorespaces#2{##1}\unskip\@@italiccorr#4} - % this is added => this disturbs hyperref: + % this is added (but disturbs hyperref): \__chemmacros_record_for_lor:nnnnn {#1} {#3} {#2} {##1} {#4} } } } -\tl_new:N \g__chemmacros_reaction_description_tl +% -------------------------------------------------------------------------- +% create new tagform +\newtagform {reaction} + [\l__chemmacros_reactions_before_tag_tl] + {\l__chemmacros_reactions_tag_open_tl} + {\l__chemmacros_reactions_tag_close_tl} +% -------------------------------------------------------------------------- \cs_new_protected:Npn \chemmacros_add_reaction_description:n #1 { \tl_if_blank:nF {#1} @@ -3873,31 +4005,10 @@ \NewDocumentCommand \AddRxnDesc {m} { \chemmacros_add_reaction_description:n {#1} } +% -------------------------------------------------------------------------- % define \listofreactions -\tl_new:N \l__chemmacros_reaction_lorname_tl -\tl_new:N \reactionlistname -\tl_new:N \l__chemmacros_reaction_heading_tl - -\cs_new:Npn \__chemmacros_reaction_heading:n #1 - { \l__chemmacros_reaction_heading_tl {#1} } -\cs_generate_variant:Nn \__chemmacros_reaction_heading:n { V } - -\tl_set:Nn \l__chemmacros_reaction_lorname_tl - { \chemmacros_translate:n {Reaction} } - -\tl_set:Nn \reactionlistname { \chemmacros_translate:n {list-of-reactions} } - -\chemmacros_define_keys:nn {reactions} - { - list-name .tl_set:N = \reactionlistname , - list-entry .tl_set:N = \l__chemmacros_reaction_lorname_tl , - list-heading-cmd .code:n = - \cs_set_protected:Npn \__chemmacros_reaction_heading:n ##1 {#1} - } - -\cs_if_exist:NTF \chapter - { \chemmacros_set_keys:nn {reactions} { list-heading-cmd = \chapter* {#1} } } - { \chemmacros_set_keys:nn {reactions} { list-heading-cmd = \section* {#1} } } +\cs_new_protected:Npn \__chemmacros_reaction_heading:n #1 {#1} +\cs_generate_variant:Nn \__chemmacros_reaction_heading:n {V} \cs_new_protected:Npn \listofreactions { @@ -3905,39 +4016,15 @@ \@starttoc {lor} } -\cs_new_eq:NN \l@reaction \l@figure - -\bool_new:N \l__chemmacros_reactions_tocbasic_bool -\cs_if_exist:NT \KOMAClassName - { \bool_set_true:N \l__chemmacros_reactions_tocbasic_bool } - -\tl_new:N \l__chemmacros_reactions_tag_open_tl -\tl_new:N \l__chemmacros_reactions_tag_close_tl -\tl_new:N \l__chemmacros_reactions_before_tag_tl - -\chemmacros_define_keys:nn {reactions} - { - tocbasic .bool_set:N = \l__chemmacros_reactions_tocbasic_bool , - tag-open .tl_set:N = \l__chemmacros_reactions_tag_open_tl , - tag-open .initial:n = \{ , - tag-close .tl_set:N = \l__chemmacros_reactions_tag_close_tl , - tag-close .initial:n = \} , - before-tag .tl_set:N = \l__chemmacros_reactions_before_tag_tl - } - \hook_gput_code:nnn {package/tocbasic/after} {chemmacros} { - \bool_lazy_or:nnT - { \chemmacros_if_package_loaded_p:n {tocbasic} } - { \l__chemmacros_reactions_tocbasic_bool } - { - \RequirePackage {tocbasic} - \addtotoclist [float] {lor} - \cs_set_protected:Npn \listofreactions { \listoftoc {lor} } - \cs_new:Npn \listoflorname { \reactionlistname } - } + \addtotoclist [float] {lor} + \cs_set_protected:Npn \listofreactions { \listoftoc {lor} } + \cs_new:Npn \listoflorname { \reactionlistname } } +% -------------------------------------------------------------------------- +% cleveref: \ChemCleverefSupport {reaction} { \chemmacros_translate:n {reaction} } [ \chemmacros_translate:n {Reaction} ] @@ -3948,84 +4035,106 @@ { \creflabelformat {reaction} { - #2 \l__chemmacros_reactions_tag_open_tl - #1 + #2 #1 #3 \l__chemmacros_reactions_tag_close_tl - #3 } } -\ChemFancyrefSupport {rct} - { \chemmacros_translate:n {reaction} } - [ \chemmacros_translate:n {Reaction} ] - -% create new tagform -\newtagform {reaction} - [\l__chemmacros_reactions_before_tag_tl] - {\l__chemmacros_reactions_tag_open_tl} - {\l__chemmacros_reactions_tag_close_tl} - -\newcounter {chemmacros_save_reaction} -\newcounter {reaction} - -\cs_new_protected:Npn \__chemmacros_begin_reaction: +% fancyref: +\hook_gput_code:nnn {package/fancyref/after} {chemmacros} { - \patchcmd \thereaction {reaction} {equation} {} {} - \cs_set_eq:NN \theequation \thereaction - \cs_set_eq:NN \r@equation \r@reaction - \cs_set_eq:NN \p@equation \p@reaction - \cs_set:Npn \theHequation { R . \theHsection . \theequation } - \setcounter {chemmacros_save_reaction} { \value {equation} } - \setcounter {equation} { \value {reaction} } - \chemmacros_if_package_loaded:nT {cleveref} - { \crefalias {equation} {reaction} } - \usetagform {reaction} + \cs_set:Npn \fancyrefrctlabelprefix {rct} + \cs_set:Npn \frefrctname { \chemmacros_translate:n {reaction} } + \cs_set:Npn \Frefrctname { \chemmacros_translate:n {Reaction} } + \frefformat {vario} { \fancyrefrctlabelprefix } + { + \frefrctname \fancyrefdefaultspacing + \textup { + \l__chemmacros_reactions_tag_open_tl + #1 + \l__chemmacros_reactions_tag_close_tl + } + #3 + } + \Frefformat {vario} { \fancyrefrctlabelprefix } + { + \Frefrctname \fancyrefdefaultspacing + \textup { + \l__chemmacros_reactions_tag_open_tl + #1 + \l__chemmacros_reactions_tag_close_tl + } + #3 + } + \frefformat {plain} { \fancyrefrctlabelprefix } + { \frefrctname \fancyrefdefaultspacing #1 } + \Frefformat {plain} { \fancyrefrctlabelprefix } + { \Frefrctname \fancyrefdefaultspacing #1 } } -% switch back to equation tags -\cs_new_protected:Npn \__chemmacros_end_reaction: +% -------------------------------------------------------------------------- +% begin and end reaction environments: switch to reaction counter: +\cs_new_protected:Npn \__chemmacros_begin_reaction: { - \setcounter {reaction} { \value {equation} } - \setcounter {equation} { \value {chemmacros_save_reaction} } + \bool_if:NT \l__chemmacros_reactions_counter_bool + { + \cs_set_eq:NN \r@equation \r@reaction + \cs_set_eq:NN \p@equation \p@reaction + \cs_set_eq:NN \c@equation \c@reaction + \chemmacros_patch_cmd:Nnn \thereaction {reaction} {equation} + \chemmacros_if_package_loaded:nT {cleveref} + { \crefalias {equation} {reaction} } + % this only works if nobody steps counters inside reactions: + \bool_if:NT \l__chemmacros_hyperref_bool + { + \chemmacros_patch_cmd:Nnn \hyper@refstepcounter + { \This@name } + { \This@name {reaction} \@gobble } + \chemmacros_patch_cmd:Nnn \hyper@refstepcounter + { \hyper@makecurrent } + { \hyper@makecurrent {reaction} \@gobble } + } + \usetagform {reaction} + } } -\tl_new:N \l__chemmacros_reactions_args_tl +\cs_new_protected:Npn \__chemmacros_end_reaction: + { } +% -------------------------------------------------------------------------- \cs_new_protected:Npn \__chemmacros_reactions_build_args:n #1 { \tl_put_right:Nn \l__chemmacros_reactions_args_tl { {## #1} } } \cs_new_protected:Npn \chemmacros_define_reaction:nnn #1#2#3 { + \tl_clear:N \l__chemmacros_reactions_args_tl \int_compare:nNnT {#3+0} > {0} - { - \tl_clear:N \l__chemmacros_reactions_args_tl - \int_step_function:nnnN {2} {1} {#3+1} \__chemmacros_reactions_build_args:n - } - \chemmacros_declare_reaction_env:nnnV {#1} {#2} {#3} \l__chemmacros_reactions_args_tl + { \int_step_function:nnnN {2} {1} {#3+1} \__chemmacros_reactions_build_args:n } + \__chemmacros_declare_reaction_env:nnnV {#1} {#2} {#3} \l__chemmacros_reactions_args_tl } % #1: chem % #2: math % #3: args number % #4: argument list ({#2}{#3}...) -\cs_new_protected:Npn \chemmacros_declare_reaction_env:nnnn #1#2#3#4 +\cs_new_protected:Npn \__chemmacros_declare_reaction_env:nnnn #1#2#3#4 { \exp_args:Nnx \DeclareDocumentEnvironment {#1} { \int_compare:nT { #3+0 = 0 } {!} O{} \prg_replicate:nn {#3+0} {m} } { \chemmacros_add_reaction_description:n {##1} \__chemmacros_begin_reaction: - \chemmacros_reaction_read:nnw {#2} {#4} + \__chemmacros_reaction_read:nnw {#2} {#4} } { \__chemmacros_end_reaction: \ignorespacesafterend } } -\cs_generate_variant:Nn \chemmacros_declare_reaction_env:nnnn {nnnV} +\cs_generate_variant:Nn \__chemmacros_declare_reaction_env:nnnn {nnnV} -\cs_new_protected:Npn \chemmacros_reaction_read:nnw #1#2#3 \end +\cs_new_protected:Npn \__chemmacros_reaction_read:nnw #1#2#3 \end { \tl_clear:N \l__chemmacros_tmpa_tl \seq_clear:N \l__chemmacros_tmpc_seq @@ -4049,17 +4158,40 @@ { \l__chemmacros_tmpa_int = \l__chemmacros_tmpb_int } { \tl_put_right:Nn \l__chemmacros_tmpa_tl {\\} } } - \chemmacros_reaction_write:nnV {#1} {#2} \l__chemmacros_tmpa_tl + \__chemmacros_reaction_write:nnV {#1} {#2} \l__chemmacros_tmpa_tl \end } -\cs_new_protected:Npn \chemmacros_reaction_write:nnn #1#2#3 +\cs_new_protected:Npn \__chemmacros_reaction_write:nnn #1#2#3 { \begin{#1}#2 #3 \end{#1} } -\cs_generate_variant:Nn \chemmacros_reaction_write:nnn { nnV } +\cs_generate_variant:Nn \__chemmacros_reaction_write:nnn { nnV } + +\chemmacros_define_keys:nn {reactions} + { + list-name .tl_set:N = \reactionlistname , + list-name .initial:n = \chemmacros_translate:n {list-of-reactions} , + autoref-name .tl_set:N = \reactionautorefname , + autoref-name .initial:n = \chemmacros_translate:n {Reaction} , + list-entry .tl_set:N = \l__chemmacros_reaction_lorname_tl , + list-entry .initial:n = \chemmacros_translate:n {Reaction} , + list-heading-cmd .cs_set:Np = \__chemmacros_reaction_heading:n #1 , + tocbasic .code:n = \chemmacros_deprecate_option: , + own-counter .bool_set:N = \l__chemmacros_reactions_counter_bool , + own-counter .initial:n = true , + tag-open .tl_set:N = \l__chemmacros_reactions_tag_open_tl , + tag-open .initial:n = \{ , + tag-close .tl_set:N = \l__chemmacros_reactions_tag_close_tl , + tag-close .initial:n = \} , + before-tag .tl_set:N = \l__chemmacros_reactions_before_tag_tl + } + +\cs_if_exist:NTF \chapter + { \chemmacros_set_keys:nn {reactions} { list-heading-cmd = \chapter* {#1} } } + { \chemmacros_set_keys:nn {reactions} { list-heading-cmd = \section* {#1} } } \NewChemMacroset* {Reaction} {mO{}m} { \chemmacros_define_reaction:nnn {#1} {#3} {#2} } @@ -4068,10 +4200,10 @@ \NewChemReaction {reaction*} {equation*} \NewChemReaction {reactions} {align} \NewChemReaction {reactions*} {align*} - + % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{redox}{2020/11/29 oxidation numbers, redox reactions} +\ChemModule{redox}{2022/01/29 oxidation numbers, redox reactions} \RequirePackage{mathtools,relsize} @@ -4215,7 +4347,7 @@ { \relsize {-3} \__chemmacros_ox_process_number:n {#1} } } } - \hbox_set:Nn \l__chemmacros_tmpb_box { \chemmacros_chemformula:n {#2} } + \hbox_set:Nn \l__chemmacros_tmpb_box { \chemmacros_formula:n {#2} } \chemmacros_math:n { \bool_if:NT \l__chemmacros_ox_super_bool @@ -4573,17 +4705,11 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{scheme}{2022/01/13 a scheme floating environment} +\ChemModule{scheme}{2022/02/05 a scheme floating environment} \RequirePackage {chemnum} \RequirePackage {etoolbox} -\msg_new:nnn {chemmacros} {patch-failed} - { - Patching~ \token_to_str:N #1 \c_space_tl failed.~ - Please~ inform~ the~ chemmacros~ package~ authors. - } - \bool_new:N \l__chemmacros_float_def_bool \tl_new:N \l__chemmacros_float_method_tl \seq_new:N \l__chemmacros_float_methods_seq @@ -4591,17 +4717,27 @@ \prop_new:N \l__chemmacros_float_definitions_prop \msg_new:nnn {chemmacros} {float-method} - { Detected~ float~ defining~ method~ `#1'. } + { Using~ float~ defining~ method~ `#1'. } + +\msg_new:nnn {chemmacros} {unknown-method} + { + The~ float~ method~ `#1'~ is~ not~ known~ \msg_line_contect: .~ Ckeck~ + for~ a~ typo. + } % -------------------------------------------------------------------------- % #1: name % #2: check +% #3: code \cs_new_protected:Npn \chemmacros_define_float_method:nnn #1#2#3 { \seq_put_right:Nn \l__chemmacros_float_methods_seq {#1} \prop_put:Nnn \l__chemmacros_float_methods_prop {#1} {#2} \prop_put:Nnn \l__chemmacros_float_definitions_prop {#1} - { \cs_set_protected:Npn \__chemmacros_define_float:nn ##1##2 {#3} } + { + \cs_set_protected:Npn \__chemmacros_define_float:nn ##1##2 + { \msg_info:nnn {chemmacros} {float-method} {#1} #3 } + } } % the order in which the methods are defined determines in which order the @@ -4692,30 +4828,111 @@ { \listof {#1} {\chemmacros_translate:n {#1-list}} } } +\chemmacros_define_float_method:nnn {traditional} + { \c_false_bool } + { + \bool_lazy_or:nnTF + { \chemmacros_if_class_loaded_p:n {book} } + { \chemmacros_if_class_loaded_p:n {report} } + { + \newcounter {#1} [chapter] + \cs_set:cpn {the#1} + { \ifnum \c@chapter>\z@ \thechapter.\fi \arabic {#1} } + } + { + \newcounter {#1} + \cs_set:cpn {the#1} { \arabic {#1} } + } + \cs_new:cpn {fps@#1} {tbp} + \cs_new:cpn {ftype@#1} {8} + \cs_new:cpn {ext@#1} {#2} + \cs_new:cpx {fnum@#1} { + \exp_not:c {#1name} + \exp_not:N \nobreakspace + \exp_not:c {the#1}} + \cs_new:cpn {#1name} {\chemmacros_translate:n {#1-name}} + \cs_new:cpn {list#1name} {\chemmacros_translate:n {#1-list}} + \newenvironment {#1} + {\@float{#1}} + {\end@float} + \newenvironment {#1*} + {\@dblfloat{#1}} + {\end@dblfloat} + \bool_lazy_or:nnTF + { \chemmacros_if_class_loaded_p:n {book} } + { \chemmacros_if_class_loaded_p:n {report} } + { + \cs_new_protected:cpn {listof#1s} + { + \legacy_if:nTF {@twocolumn} + { \@restonecoltrue\onecolumn } + { \@restonecolfalse } + \chapter* { \use:c {list#1name} } + \use:x + { + \exp_not:N \@mkboth + { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } + { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } + } + \@starttoc {#2} + \legacy_if:nT {@restonecol} { \twocolumn } + } + \chemmacros_patch_cmd:Nnn \@chapter + { \addtocontents } + { \addtocontents {#2} { \protect \addvspace {10\p@} } \addtocontents } + } + { + \cs_new_protected:cpn {listof#1s} + { + \section* {\use:c {list#1name}} + \use:x + { + \exp_not:N \@mkboth + { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } + { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } + } + \@starttoc {#2} + } + } + \cs_new_eq:cN {l@#1} \l@figure + } + +% -------------------------------------------------------------------------- +\chemmacros_define_keys:nn {scheme} + { + float-method .code:n = + \seq_if_in:NnTF \l__chemmacros_float_methods_seq {#1} + { + \bool_set_true:N \l__chemmacros_float_def_bool + \tl_set:Nn \l__chemmacros_float_method_tl {#1} + } + { \msg_error:nnn {chemmacros} {unknown-method} {#1} } + } + % -------------------------------------------------------------------------- % checks if one of the above defined methods is active. The first one found -% will be used. +% will be used. \cs_new_protected:Npn \chemmacros_check_float_method:n #1 { \prop_get:NnNT \l__chemmacros_float_methods_prop {#1} \l__chemmacros_tmpa_tl { - \bool_lazy_and:nnT - { !\l__chemmacros_float_def_bool } - { \l__chemmacros_tmpa_tl } + \bool_if:nT { \l__chemmacros_tmpa_tl } { \bool_set_true:N \l__chemmacros_float_def_bool \tl_set:Nn \l__chemmacros_float_method_tl {#1} - \msg_info:nnn {chemmacros} {float-method} {#1} } } } \cs_new_protected:Npn \chemmacros_check_float_methods: { - \seq_map_function:NN - \l__chemmacros_float_methods_seq - \chemmacros_check_float_method:n + \bool_if:NF \l__chemmacros_float_def_bool + { + \seq_map_function:NN + \l__chemmacros_float_methods_seq + \chemmacros_check_float_method:n + } } \hook_gput_code:nnn {begindocument/before} {chemmacros} @@ -4727,19 +4944,8 @@ } } -% -------------------------------------------------------------------------- -\ChemCleverefSupport {scheme} - { \chemmacros_translate:n {scheme} } - [ \chemmacros_translate:n {Scheme} ] - { \chemmacros_translate:n {schemes} } - [ \chemmacros_translate:n {Schemes} ] - -\ChemFancyrefSupport {sch} - { \chemmacros_translate:n {scheme} } - [ \chemmacros_translate:n {Scheme} ] - -% -------------------------------------------------------------------------- % #1: env name +% #2: file ending \cs_new_protected:Npn \chemmacros_define_float:nn #1#2 { \bool_lazy_and:nnT @@ -4755,81 +4961,31 @@ \__chemmacros_define_float:nn {#1} {#2} } { - \bool_lazy_or:nnTF - { \chemmacros_if_class_loaded_p:n {book} } - { \chemmacros_if_class_loaded_p:n {report} } - { - \newcounter {#1} [chapter] - \cs_set:cpn {the#1} - { \ifnum \c@chapter>\z@ \thechapter.\fi \arabic {#1} } - } - { - \newcounter {#1} - \cs_set:cpn {the#1} { \arabic {#1} } - } - \cs_new:cpn {fps@#1} {tbp} - \cs_new:cpn {ftype@#1} {8} - \cs_new:cpn {ext@#1} {#2} - \cs_new:cpx {fnum@#1} { - \exp_not:c {#1name} - \exp_not:N \nobreakspace - \exp_not:c {the#1}} - \cs_new:cpn {#1name} {\chemmacros_translate:n {#1-name}} - \cs_new:cpn {list#1name} {\chemmacros_translate:n {#1-list}} - \newenvironment {#1} - {\@float{#1}} - {\end@float} - \newenvironment {#1*} - {\@dblfloat{#1}} - {\end@dblfloat} - \bool_lazy_or:nnTF - { \chemmacros_if_class_loaded_p:n {book} } - { \chemmacros_if_class_loaded_p:n {report} } - { - \cs_new_protected:cpn {listof#1s} - { - \legacy_if:nTF {@twocolumn} - { \@restonecoltrue\onecolumn } - { \@restonecolfalse } - \chapter* { \use:c {list#1name} } - \use:x - { - \exp_not:N \@mkboth - { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } - { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } - } - \@starttoc {#2} - \legacy_if:nT {@restonecol} { \twocolumn } - } - \patchcmd \@chapter - { \addtocontents } - { \addtocontents {#2} { \protect \addvspace {10\p@} } \addtocontents } - {} - { \msg_warning:nnn {chemmacros} {patch-failed} { \@chapter } } - } - { - \cs_new_protected:cpn {listof#1s} - { - \section* {\use:c {list#1name}} - \use:x - { - \exp_not:N \@mkboth - { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } - { \exp_not:N \MakeUppercase \exp_not:c {list#1name} } - } - \@starttoc {#2} - } - } - \cs_new_eq:cN {l@#1} \l@figure + \prop_get:NnN \l__chemmacros_float_definitions_prop + {traditional} + \l__chemmacros_tmpa_tl + \tl_use:N \l__chemmacros_tmpa_tl + \__chemmacros_define_float:nn {#1} {#2} } + \cs_set:cpn {#1name} {\chemmacros_translate:n {#1-name}} + \cs_set:cpn {list#1name} {\chemmacros_translate:n {#1-list}} } - \cs_set:cpn {#1name} {\chemmacros_translate:n {#1-name}} - \cs_set:cpn {list#1name} {\chemmacros_translate:n {#1-list}} } + +% -------------------------------------------------------------------------- +\ChemCleverefSupport {scheme} + { \chemmacros_translate:n {scheme} } + [ \chemmacros_translate:n {Scheme} ] + { \chemmacros_translate:n {schemes} } + [ \chemmacros_translate:n {Schemes} ] + +\ChemFancyrefSupport {sch} + { \chemmacros_translate:n {scheme} } + [ \chemmacros_translate:n {Scheme} ] % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{spectroscopy}{2021/07/24 environment for spectroscopic data} +\ChemModule{spectroscopy}{2022/01/29 environment for spectroscopic data} \RequirePackage{siunitx} @@ -4939,11 +5095,11 @@ \tl_put_right:Nn \g__chemmacros_nmr_element_coupled_tl { \} } } \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl {#2} - \chemmacros_chemformula:n { ^{#1} } + \chemmacros_formula:n { ^{#1} } \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl } + { \chemmacros_formula:V \g__chemmacros_nmr_element_coupled_tl } { \g__chemmacros_nmr_element_coupled_tl } } \tl_use:N \l__chemmacros_nmr_element_method_connector_tl @@ -5090,7 +5246,7 @@ \bool_if:NT \l__chemmacros_nmr_comma_bool { , ~ } \bool_if:NT \l__chemmacros_nmr_solvent_bool - { \chemmacros_chemformula:n {#4} } + { \chemmacros_formula:n {#4} } \bool_if:NT \l__chemmacros_nmr_delimiters_bool { ) } \tl_if_blank:nT {#1} {:~} @@ -5118,7 +5274,7 @@ \bool_if:NT \l__chemmacros_nmr_solvent_bool { \bool_if:NTF \l__chemmacros_nmr_parse_bool - { \chemmacros_chemformula:n {#4} } + { \chemmacros_formula:n {#4} } {#4} } \bool_if:NT \l__chemmacros_nmr_delimiters_bool @@ -5184,12 +5340,12 @@ { \__chemmacros_nmr_number:n {#1} \chemmacros_skip_nobreak:N \l__chemmacros_nmr_space_skip - \chemmacros_chemformula:V \g__chemmacros_nmr_element_tl + \chemmacros_formula:V \g__chemmacros_nmr_element_tl } \cs_new_protected:Npn \chemmacros_nmr_position:n #1 { - \chemmacros_chemformula:x + \chemmacros_formula:e { \exp_not:V \g__chemmacros_nmr_element_tl \bool_if:NF \l__chemmacros_nmr_position_side_bool @@ -5229,7 +5385,7 @@ \c_math_subscript_token { \l__chemmacros_nmr_coupling_nuclei_pre_tl - \chemmacros_chemformula:n {#2} + \chemmacros_formula:n {#2} \l__chemmacros_nmr_coupling_nuclei_post_tl } } @@ -5238,7 +5394,7 @@ \tl_set:Nn \l__chemmacros_nmr_coupling_nuclei_tl { \l__chemmacros_nmr_coupling_nuclei_pre_tl - \chemmacros_chemformula:n {#2} + \chemmacros_formula:n {#2} \l__chemmacros_nmr_coupling_nuclei_post_tl } } @@ -5321,16 +5477,17 @@ unit .groups:n = {variables} } -\cs_new_protected:Npn \chemmacros_state:nn #1#2 +\cs_new_protected:Npn \chemmacros_state:nnnnnn #1#2#3#4#5#6 { - % pre (\Delta) - % post - % superscript-left - % superscript-right (\standardstate) - % subscript-left - % subscript-right \group_begin: - \chemmacros_set_keys:nn {thermodynamics} {#1} + \chemmacros_set_keys:ne {thermodynamics} + { + \exp_not:n {#1} , + \tl_if_novalue:nF {#2} { subscript-left = \exp_not:n {#2} , } + \tl_if_novalue:nF {#3} { superscript-left = \exp_not:n {#3} , } + \tl_if_novalue:nF {#5} { subscript-right = \exp_not:n {#5} , } + \tl_if_novalue:nF {#6} { superscript-right = \exp_not:n {#6} } + } \ensuremath { \chemmacros_text:V \l__chemmacros_state_pre_tl @@ -5338,7 +5495,7 @@ { \chemmacros_text:V \l__chemmacros_state_sp_left_tl } \c_math_subscript_token { \chemmacros_text:V \l__chemmacros_state_sb_left_tl } - #2 + #4 \c_math_superscript_token { \chemmacros_text:V \l__chemmacros_state_sp_right_tl } \c_math_subscript_token @@ -5347,10 +5504,11 @@ } \group_end: } -\cs_generate_variant:Nn \chemmacros_state:nn { nV } +\cs_generate_variant:Nn \chemmacros_state:nnnnnn { nVVVVV } -\DeclareDocumentCommand \state { O{}m } - { \chemmacros_state:nn {#1} {#2} } +\exp_args:NNe +\NewDocumentCommand \state { O{}e{\char_generate:nn {`_}{8}^}me{\char_generate:nn {`_}{8}^} } + { \use:c {chemmacros_state:nnnnnn} {#1} {#2} {#3} {#4} {#5} {#6} } \cs_new_protected:Npn \chemmacros_declare_state:Nn #1#2 { @@ -5374,17 +5532,23 @@ \DeclareDocumentCommand #1 { sO{}D(){}m } { \group_begin: - \chemmacros_set_keys:xn + \chemmacros_set_keys:en {thermodynamics/\chemmacros_remove_backslash:N #1} {#2} \tl_if_blank:nF {##3} { - \chemmacros_set_keys:nx {thermodynamics} + \chemmacros_set_keys:ne {thermodynamics} { subscript-\l__chemmacros_state_sb_pos_tl = \exp_not:n {##3} } } \ensuremath { - \chemmacros_state:nV {##2} \l__chemmacros_state_symbol_tl + \chemmacros_state:nVVVVV + {##2} + \c_novalue_tl + \c_novalue_tl + \l__chemmacros_state_symbol_tl + \c_novalue_tl + \c_novalue_tl \chemmacros_set_keys_groups:nnn {thermodynamics} {variables} {##2} \IfBooleanF {##1} { = \qty {##4} { \l__chemmacros_state_unit_tl } } } @@ -6452,8 +6616,8 @@ % #1: star: include ID in table \NewDocumentCommand \printreactants {s} { - \group_begin: - \chemmacros_set_keys:nn {reactants} { switch = false } + \group_begin: + \chemmacros_set_keys:nn {reactants} { switch = false } \int_step_variable:nNn { \seq_count:N \g_chemnum_initiated_compounds_seq } \l__chemmacros_reactants_tmpa_tl @@ -6509,60 +6673,54 @@ \chemmacros_if_package_loaded:nTF {xltabular} { \bool_if:nTF {#1} - { - \begin - {xltabular} - { \textwidth } - { @{}ll>{\raggedright\arraybackslash}X@{} } - } - { - \begin - {xltabular} - { \textwidth } - { @{}l>{\raggedright\arraybackslash}X@{} } - } - \seq_use:Nn \l__chemmacros_reactants_tmpa_seq { } - \end{xltabular} - } - { + { + \begin {xltabular} + { \textwidth } + { @{}ll>{\raggedright\arraybackslash}X@{} } + } + { + \begin {xltabular} + { \textwidth } + { @{}l>{\raggedright\arraybackslash}X@{} } + } + \seq_use:Nn \l__chemmacros_reactants_tmpa_seq { } + \end{xltabular} + } + { \msg_expandable_error:nnnn {chemmacros} {package-not-loaded} { \printreactants } {xltabular} - } - } + } + } {longtable} { \chemmacros_if_package_loaded:nTF {longtable} { \bool_if:nTF {#1} - { - \begin - {longtable}[l] - { @{}ll>{\raggedright\arraybackslash}p{0.6\textwidth}@{} } - } - { - \begin - {longtable}[l] + { + \begin {longtable}[l] + { @{}ll>{\raggedright\arraybackslash}p{0.6\textwidth}@{} } + } + { + \begin {longtable}[l] { @{}l>{\raggedright\arraybackslash}p{0.9\textwidth}@{} } - } - \seq_use:Nn \l__chemmacros_reactants_tmpa_seq { } - \end{longtable} - } - { + } + \seq_use:Nn \l__chemmacros_reactants_tmpa_seq { } + \end{longtable} + } + { \msg_expandable_error:nnnn {chemmacros} {package-not-loaded} { \printreactants } {longtable} - } - } - } - } - { - \msg_warning:nn {chemmacros} {missing-printreactants-style} - } + } + } + } + } + { \msg_warning:nn {chemmacros} {missing-printreactants-style} } \group_end: } @@ -6615,7 +6773,7 @@ % -------------------------------------------------------------------------- \ChemModuleEnd -\ChemModule{translations}{2022/01/16 translations for defined keys at one place} +\ChemModule{translations}{2022/01/26 translations for defined keys at one place} % -------------------------------------------------------------------------- \chemmacros_declare_translations:nn {K-acid} @@ -6625,7 +6783,7 @@ Dutch = \mathrm {z} } -\chemmacros_declare_translations:nn {K-acid} +\chemmacros_declare_translations:nn {K-water} { Danish = \mathrm {v} } % -------------------------------------------------------------------------- diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index d242a6773b..0e348a84ed 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/02/12}{1.624} +\ProvidesExplClass{easybook}{2022/02/13}{1.625} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -48,8 +48,6 @@ \bool_set_false:N \l__eb_class_mode_book_bool \eb_put_ctexbook:n { oneside } }, - book .meta:n = { class = book }, - article .meta:n = { class = article }, config .clist_gset:N = \g__eb_config_file_clist, floatpage .bool_set:N = \l__eb_float_page_bool, theorem .bool_set:N = \l__eb_theorem_support_bool, @@ -305,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/02/12}{1.624} +\ProvidesExplPackage{easybase}{2022/02/13}{1.625} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -384,13 +382,13 @@ \msg_new:nnn { easybase } { package-repeat-load-ii } { The~macro~package~'#1'~has~been~loaded~repeatedly. } \cs_set_eq:NN \eb@usepackage@save \usepackage -\RenewDocumentCommand{\usepackage}{O{}m} +\RenewDocumentCommand{\usepackage}{O{}mO{}} { \PassOptionsToPackage{#1}{#2} \eb_seq_map_inline:nn {#2} { \eb_if_package_loaded:nnF {##1} {#1} - { \eb@usepackage@save{##1} } + { \eb@usepackage@save{##1}[#3] } } } \NewDocumentCommand{\LoadPackage}{O{}m} @@ -492,7 +490,7 @@ \msg_new:nnn { easybase } { no-chapter } { Your~document~class~is~in~'article'~mode. \\ - The~\string\chapter\ command~will~not~be~used. + The~'\string\chapter'\ command~will~not~be~used. } \LoadPackage @@ -1425,12 +1423,7 @@ \CTEX@addtocline{#1}{##2} \tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} } \tl_set:Nn \l__eb__bitoc_mark_title_level_tl {#1} - \str_case:nn {#1} - { - { chapter } { \chaptermark{##2} } - { section } { \sectionmark{##2} } - { subsection } { \subsectionmark{##2} } - } + \use:c { #1mark }{##2} }{ \stepcounter{bi#1} \use:c {#1}[##2]{##3} @@ -1472,16 +1465,19 @@ } } -\tl_set:Nx \l__eb_toc_title_level_tl - { \bool_if:NTF \l__eb_class_mode_book_bool { chapter } { section } } \tl_new:N \eb@bitoc@title \keys_define:nn { eb/listoc } { - section .code:n = \tl_set:Nn \l__eb_toc_title_level_tl { section }, - chapter .code:n = \tl_set:Nn \l__eb_toc_title_level_tl { chapter }, - none .code:n = \tl_set:Nn \l__eb_toc_title_level_tl { none }, - article .meta:n = section, - book .meta:n = chapter, + level .tl_set:N = \eb@toc@title@level, + level .initial:n = + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \bichapter* } + { \bisection* } + }, + section .meta:n = { level = \bisection* }, + chapter .meta:n = { level = \bichapter* }, + none .code:n = { }, multoc .int_set:N = \l__eb_toc_columns_int, multoc .default:n = 2, multoc .initial:n = 1, @@ -1502,48 +1498,7 @@ { \tl_clear:N \eb@bitoc@title } { \tl_set:Nn \eb@bitoc@title {#2} } } - -\cs_new_protected:Npn \eb_toc_title_level_initial: - { - \bool_if:NF \l__eb_class_mode_book_bool - { - \tl_if_eq:NnT \l__eb_toc_title_level_tl { chapter } - { \tl_set:Nn \l__eb_toc_title_level_tl { section } } - } - } -\cs_new_protected:Npn \eb_title_mark_intoc:n #1 - { - \str_case:Vn \l__eb_toc_title_level_tl - { - { chapter } { \bichapter*{#1}{\eb@bitoc@title} } - { section } { \bisection*{#1}{\eb@bitoc@title} } - } - } -\cs_new_protected:Npn \eb_title_mark_notoc:n #1 - { - \str_case:Vn \l__eb_toc_title_level_tl - { - { chapter } { \chapter*{\phantomsection #1}\chaptermark{#1} } - { section } { \section*{\phantomsection #1}\sectionmark{#1} } - } - } -\cs_new_protected:Npn \eb_title_number_intoc_spec:nn #1#2 - { - \eb_toc_title_level_initial: - \IfBooleanTF{#1} - { - \str_case:Vn \l__eb_toc_title_level_tl - { - { chapter } { \bichapter{\eb@toc@title}{\eb@bitoc@title} } - { section } { \bisection{\eb@toc@title}{\eb@bitoc@title} } - } - }{ - \IfBooleanTF{#2} - {\eb_title_mark_notoc:n { \eb@toc@title }} - {\eb_title_mark_intoc:n { \eb@toc@title }} - } - } -\cs_new_protected:Npn \eb_biber_title_level_spec:n #1 +\cs_new_protected:Npn \eb_biber_toc_title:n #1 { \bool_if:NTF \l__eb_class_mode_book_bool { \bichapter*{#1}{\eb@bib@bitoc@title} } @@ -1560,18 +1515,23 @@ } { \@starttoc{#1} } } -\cs_new_protected:Npn \eb_toc_if_title_between_hook:n #1 +\cs_new_protected:Npn \eb_toc_if_title_between_hook:nn #1#2 + { + \IfBooleanF{#1} + {\tl_use:c { l__eb_toc_#2_between_hook_tl }} + } +\cs_new_protected:Npn \eb_toc_title_level_cmd:n #1 { - \tl_if_eq:NnF \l__eb_toc_title_level_tl { none } - { \tl_use:c { l__eb_toc_#1_between_hook_tl } } + \IfBooleanF{#1} + {\eb@toc@title@level{\eb@toc@title}{\eb@bitoc@title}} } \cs_new_protected:Npn \eb_toc_list_parse:nnnnn #1#2#3#4#5 { \group_begin: \tl_set_eq:Nc \eb@toc@title { list#4name } \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} - \eb_title_number_intoc_spec:nn {#2} {#1} - \eb_toc_if_title_between_hook:n {#4} + \eb_toc_title_level_cmd:n {#1} + \eb_toc_if_title_between_hook:nn {#1} {#4} \eb_toc_start_multi_column_ext:n {#5} \group_end: } @@ -1588,20 +1548,25 @@ } { \eb_list_content_cmd_set:nn #1 } \cs_set_eq:NN \listoflistings \listoflstlistings -\RenewDocumentCommand{\tableofcontents}{t+oD(){}} +\RenewDocumentCommand{\tableofcontents}{st+oD(){}} { \group_begin: \tl_set_eq:NN \eb@toc@title \contentsname \tl_set:Nn \eb@bitoc@title { Contents } - \IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}} - \eb_toc_title_level_initial: - \eb_title_mark_notoc:n { \eb@toc@title } - \eb_toc_if_title_between_hook:n { main } - \eb_toc_start_multi_column_ext:n { toc }#3 - \IfBooleanT{#1} - { - \eb_title_mark_notoc:n { \eb@bitoc@title } - \eb_toc_if_title_between_hook:n { main } + \tl_set:Nn \eb@toc@title@level + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \chapter* } + { \section* } + } + \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} + \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}} + \eb_toc_if_title_between_hook:nn {#1} { main } + \eb_toc_start_multi_column_ext:n { toc }#4 + \IfBooleanT{#2} + { + \IfBooleanF{#1}{\eb@toc@title@level{\eb@bitoc@title}{}} + \eb_toc_if_title_between_hook:nn {#1} { main } \eb_toc_start_multi_column_ext:n { tec } } \group_end: @@ -1619,7 +1584,7 @@ \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} \cs_set_protected:Npn \imki@indexheaders { - \eb_title_number_intoc_spec:nn {#2} {#1} + \eb_toc_title_level_cmd:n {#1} \cs_set_eq:NN \thispagestyle \use_none:n \cs_undefine:N \imki@firstpagestyle } @@ -1727,7 +1692,7 @@ caption-listing = #1 }, caption-every .initial:n = 1.2, - every .meta:n = + every .meta:n = { line = #1,table = #1,math = #1, caption-every = #1,footnote = #1 @@ -2025,7 +1990,7 @@ \IfValueT{##3}{ \keys_set:nn { eb/listoc } {##3} } \cs_set_protected:Npn \bibsection { - \eb_title_number_intoc_spec:nn {##2} {##1} + \eb_toc_title_level_cmd:n {##1} \int_compare:nNnT { \l__eb_toc_columns_int } > { 1 } { \begin{multicols}{\int_use:N \l__eb_toc_columns_int} } } @@ -2054,7 +2019,7 @@ \LoadPackage[backend = biber]{biblatex} \clist_map_function:NN \l__eb_bib_datafile_clist \addbibresource \tl_gset:Nn \blx@default@theheading { bibintoc } - \defbibheading{bibintoc}[\bibname]{\eb_biber_title_level_spec:n {##1}} + \defbibheading{bibintoc}[\bibname]{\eb_biber_toc_title:n {##1}} \skip_zero:N \bibitemsep } \eb_at_end_preamble:n @@ -2281,25 +2246,22 @@ \keys_set_known:nn { ctex } { contentsname = 目\hspace{1em}录, - indexname = 索\hspace{1em}引, - abstractname = 摘\hspace{1em}要, - listfigurename = 图片索引, - listtablename = 表格索引, - lstlistlistingname = 代码索引, + listfigurename = 插图清单, + listtablename = 附表清单, + lstlistlistingname = 代码清单, lstlistingname = 代码 } } { \keys_set_known:nn { ctex } { - abstractname = Abstract, lstlistlistingname = List~of~Codes, lstlistingname = Code } } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/12}{1.624} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/13}{1.625} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 2afdd2a192..a1d8867b06 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index c007570fa9..55f6bfda13 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.624, - date = 2022/02/12, + version = v1.625, + date = 2022/02/13, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -331,24 +331,24 @@ \subsection{目录命令} \begin{commands} - \command{tableofcontents}[\parg\oarg{键值列表}\darg{附加代码}] - 文档主目录命令。带有 \parg{} 号参数的命令输出双语目录,需要与双语目录标题命令 \cs{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入目录样式和换页等命令。 - \command{listoffigures}[\sarg\parg\oarg{键值列表}] - 输出图片目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。 - \command{listoftables}[\sarg\parg\oarg{键值列表}] - 输出表格目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。 - \command{listoflstlistings}[\sarg\parg\oarg{键值列表}] - 输出代码目录命令。带有星号的目录命令不将目录标题添加进文档主目录,带有 \parg{} 号的目录命令可以使当前标题编号。 + \command{tableofcontents}[\sarg\oarg{键值列表}\darg{附加代码}] + 文档主目录命令。带有星号参数的命令不输出目录标题。带有 \parg{} 号参数的命令输出双语目录,需要与双语目录标题命令 \cs{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用。附加代码是中文与英文主目录之间的代码,可以插入目录样式和换页等命令。 + \command{listoffigures}[\sarg\oarg{键值列表}] + 输出图片目录命令。带有星号参数的命令不输出目录标题。 + \command{listoftables}[\sarg\oarg{键值列表}] + 输出表格目录命令。带有星号参数的命令不输出目录标题。 + \command{listoflstlistings}[\sarg\oarg{键值列表}] + 输出代码目录命令。带有星号参数的命令不输出目录标题。 \end{commands} -上面目录命令的可选参数改进了原本单一的功能,其中 \meta{键值列表} 的选项如下: +如果需要部分而不是全文的目录或其它类型的目录,可以查看 \pkg*{titletoc} 宏包的相关命令。上面目录命令的可选参数改进了原本单一的功能,其中 \meta{键值列表} 的选项如下: \begin{options} - \opt{chapter} - 使当前目录标题按照 \code{chapter} 章级别输出。 - \opt{section} - 使当前目录标题按照 \code{section} 节级别输出。 - \opt{none} - 使当前目录没有 \code{chapter} 或 \code{section} 级别的标题,仅输出目录原始内容。 + \keyval{level}{标题命令}\newtag + 设定输出目录标题的命令。如果使用 \option{title} 选项设置了双语标题则需要配合双语标题命令。 + \begin{ctexexam} + \tableofcontents[level = \chapter*] + \listoffigures[level = \bichapter,title = {图片索引,List of Figures}] + \end{ctexexam} \keyval{multoc}{整数}\Default{2} 与 \module*{style} 模块的 \option{multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同类型目录的排版栏数。\meta{整数} 为目录栏数,不指定栏数值则默认为双栏。 \kvsplit{title}{中文目录标题,英文目录标题} @@ -356,10 +356,10 @@ \keychoice{bilist}{mix,new}\Default{new} 确定文档主目录中双语标题列表的输出排列方式。选项 \code{mix} 使每个英文标题条目在中文目录中跟随对应的中文标题输出,\code{new} 则新建一个英文目录输出英文标题。 \keyval{format}{目录标题格式} - 在 \cls*{book} 模式且 \option{chapter} 选项开启或者 \cls*{article} 模式的情况下,\option{format} 用于设置目录标题的格式。 - \keyval{aftertitle}{目录标题格式} - 目录标题文本之后插入的代码。 - \keyval{pagestyle}{标题页的页面格式}\Default{empty} + 设置目录标题的格式,在标题级别为 \code{chapter} 或者 \cls*{article} 模式且标题级别为 \code{section} 时有效。 + \keyval{aftertitle}{标题后代码} + 目录标题文本之后插入的代码,生效情形同上。 + \keyval{pagestyle}{页面风格}\Default{empty} 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。除了上述选项还支持 C\TeX 键值列表路径 \module*{chapter} 或 \module*{section} 所有的章节标题样式选项。 \end{options} @@ -937,7 +937,7 @@ \keyval{lolskip}{弹性长度}\Default{10pt} 代码目录中每章第一个条目上方增加的垂直距离。与 C\TeX 的表格和图片目录中每章间的条目距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。 \keyval{between}{代码钩子} - 目录标题与内容间的钩子,一般插入负的垂直距离代码用于抵消目录首行额外的垂直间距。一级路径此选项对应文档主目录的钩子,二级路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用位于 \module*{list} 路径的此选项统一设置相应类型目录的钩子。 + 目录标题与内容间的钩子(作用于标题下方间距之后),一般插入负的垂直距离代码用于抵消目录首行额外的垂直间距。一级路径此选项对应文档主目录的钩子,二级路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用位于 \module*{list} 路径的此选项统一设置相应类型目录的钩子。 \keybool{dotalign}\Default{true} 引导线选项 \option{dotalign} 可以使目录引导线右端对齐并与页码保持一定间距,否则会与页码相连。 \keyval{pagenumwd}{刚性长度}\Default{1.55em} @@ -1231,7 +1231,7 @@ 索引标签命令 \cs*{index} 的 \meta{索引名} 与索引打印命令 \cs{printindex} 一致,可以存在多个索引表。 \command*{makeindex}[\oarg{键值列表}] 使用 \cs*{makeindex} 命令开启索引收集。这个命令可以重复使用打印多个索引表,以不同的 \meta{索引名} 作为区分,如果仅打印一个索引表就没必要再使用。 - \command{printindex}[\sarg\parg\oarg{键值列表}\darg{索引名}] + \command{printindex}[\sarg\oarg{键值列表}\darg{索引名}] 现在索引表生成命令 \cs{printindex} 被重新定义,\meta{键值列表} 中的选项与\ref{sec:document command} 其它目录命令相同,但是原本接口命令 \cs*{indexsetup} 的部分选项失效。 \end{commands} @@ -1277,7 +1277,12 @@ \item 文档类移除预置的定理环境,改为由用户自行定义环境。 \item 考虑到功能性和实用性不强弃用摘要环境 \env*{outline} 和习题环境 \env*{exercise}。 \end{version} - \shortversion{v = 1.624,date = 2022/02/12,changes = 增加目录条目下方执行的代码选项 \option{tocbelow}。} + \begin{version}[v = 1.625,date = 2022/02/13] + \added + \item 增加目录条目下方执行的代码选项 \option{tocbelow}。 + \changed + \item 目录改用标题级别选项 \option{level} 设定标题命令,不输出标题则使用星号参数。 + \end{version} \end{changelog} \nocite{*} diff --git a/macros/latex/contrib/ninecolors/README b/macros/latex/contrib/ninecolors/README deleted file mode 100644 index 94934f0087..0000000000 --- a/macros/latex/contrib/ninecolors/README +++ /dev/null @@ -1,4 +0,0 @@ -Ninecolors: Select colors with proper WCAG color contrast -Author : Jianrui Lyu -Repository: https://github.com/lvjr/ninecolors -License : The LaTeX Project Public License 1.3 diff --git a/macros/latex/contrib/ninecolors/README.txt b/macros/latex/contrib/ninecolors/README.txt new file mode 100644 index 0000000000..489711d012 --- /dev/null +++ b/macros/latex/contrib/ninecolors/README.txt @@ -0,0 +1,4 @@ +Ninecolors: Select Colors with Proper WCAG Color Contrast +Author : Jianrui Lyu and Nan Geng +Repository: https://github.com/lvjr/ninecolors +License : The LaTeX Project Public License 1.3 diff --git a/macros/latex/contrib/ninecolors/ninecolors.pdf b/macros/latex/contrib/ninecolors/ninecolors.pdf index 99648b72b1..9e4093584e 100644 Binary files a/macros/latex/contrib/ninecolors/ninecolors.pdf and b/macros/latex/contrib/ninecolors/ninecolors.pdf differ diff --git a/macros/latex/contrib/ninecolors/ninecolors.sty b/macros/latex/contrib/ninecolors/ninecolors.sty index 012310dfe2..e7ac2d7352 100644 --- a/macros/latex/contrib/ninecolors/ninecolors.sty +++ b/macros/latex/contrib/ninecolors/ninecolors.sty @@ -1,379 +1,412 @@ %%% -*- coding: utf-8 -*- %%% ---------------------------------------------------------------------------- %%% Ninecolors: Select colors with proper WCAG color contrast -%%% Author : Jianrui Lyu +%%% Author : Jianrui Lyu and Nan Geng %%% Repository: https://github.com/lvjr/ninecolors %%% License : The LaTeX Project Public License 1.3 %%% ---------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{ninecolors}[2021/05/24 v2021C Select colors with proper color contrast] +\ProvidesExplPackage{ninecolors}{2022-02-13}{v2022D} + {Select colors with proper color contrast} + +%% We have to make ninecolors package support TeX Live 2020, +%% because tabularray still supports TeX Live 2020 and it depends on this package. +%% Therefore we need to load xparse package first. + \RequirePackage{xcolor} \RequirePackage{xparse} -\ExplSyntaxOn +%% Old versions of l3color don't work if color model contains a colon. +%% This bug has been fixed in LaTeX3 release 2021-07-12. +%% See https://github.com/latex3/latex3/issues/962 +%% and https://github.com/lvjr/ninecolors/issues/1 +%% Therefore we only define latex3 colors in newer LaTeX3 releases. +%% Note that l3color was moved from l3experimental to l3kernel on 2021-02-18, +%% hence we don't need to load l3color package first. -\tl_new:N \l__ninecolors_sat_tl +\bool_new:N \l__ninecolors_define_latex_three_bool -\keys_define:nn {ninecolors} +\@ifpackagelater{expl3}{2021-07-12} % need expl3 which is loaded by xparse + { \bool_set_true:N \l__ninecolors_define_latex_three_bool } { } + +\cs_new_protected_nopar:Npn \__ninecolors_define_colors_mono: { - saturation .tl_set:N = \l__ninecolors_sat_tl, - saturation .initial:n = medium, + \__ninecolors_define_one:nnn {gray1} {gray} {0.14} + \__ninecolors_define_one:nnn {gray2} {gray} {0.23} + \__ninecolors_define_one:nnn {gray3} {gray} {0.30} + \__ninecolors_define_one:nnn {gray4} {gray} {0.38} + \__ninecolors_define_one:nnn {gray5} {gray} {0.46} + \__ninecolors_define_one:nnn {gray6} {gray} {0.55} + \__ninecolors_define_one:nnn {gray7} {gray} {0.64} + \__ninecolors_define_one:nnn {gray8} {gray} {0.75} + \__ninecolors_define_one:nnn {gray9} {gray} {0.87} } -\NewDocumentCommand \NineColors {m} +\cs_new_protected_nopar:Npn \__ninecolors_define_colors_low: { - \keys_set:nn {ninecolors} {#1} - \cs:w ninecolors@define@color@ \l__ninecolors_sat_tl \cs_end: + \__ninecolors_define_one:nnn {red1} {rgb:Hsb} {0,0.67,0.26} + \__ninecolors_define_one:nnn {red2} {rgb:Hsb} {0,0.67,0.41} + \__ninecolors_define_one:nnn {red3} {rgb:Hsb} {0,0.67,0.54} + \__ninecolors_define_one:nnn {red4} {rgb:Hsb} {0,0.67,0.67} + \__ninecolors_define_one:nnn {red5} {rgb:Hsb} {0,0.60,0.77} + \__ninecolors_define_one:nnn {red6} {rgb:Hsb} {0,0.46,0.81} + \__ninecolors_define_one:nnn {red7} {rgb:Hsb} {0,0.34,0.86} + \__ninecolors_define_one:nnn {red8} {rgb:Hsb} {0,0.22,0.90} + \__ninecolors_define_one:nnn {red9} {rgb:Hsb} {0,0.11,0.95} + \__ninecolors_define_one:nnn {brown1} {rgb:Hsb} {30,0.67,0.19} + \__ninecolors_define_one:nnn {brown2} {rgb:Hsb} {30,0.67,0.31} + \__ninecolors_define_one:nnn {brown3} {rgb:Hsb} {30,0.67,0.41} + \__ninecolors_define_one:nnn {brown4} {rgb:Hsb} {30,0.67,0.51} + \__ninecolors_define_one:nnn {brown5} {rgb:Hsb} {30,0.67,0.62} + \__ninecolors_define_one:nnn {brown6} {rgb:Hsb} {30,0.67,0.74} + \__ninecolors_define_one:nnn {brown7} {rgb:Hsb} {30,0.49,0.80} + \__ninecolors_define_one:nnn {brown8} {rgb:Hsb} {30,0.32,0.86} + \__ninecolors_define_one:nnn {brown9} {rgb:Hsb} {30,0.15,0.93} + \__ninecolors_define_one:nnn {yellow1} {rgb:Hsb} {60,0.67,0.15} + \__ninecolors_define_one:nnn {yellow2} {rgb:Hsb} {60,0.67,0.23} + \__ninecolors_define_one:nnn {yellow3} {rgb:Hsb} {60,0.67,0.31} + \__ninecolors_define_one:nnn {yellow4} {rgb:Hsb} {60,0.67,0.39} + \__ninecolors_define_one:nnn {yellow5} {rgb:Hsb} {60,0.67,0.47} + \__ninecolors_define_one:nnn {yellow6} {rgb:Hsb} {60,0.67,0.56} + \__ninecolors_define_one:nnn {yellow7} {rgb:Hsb} {60,0.67,0.66} + \__ninecolors_define_one:nnn {yellow8} {rgb:Hsb} {60,0.59,0.77} + \__ninecolors_define_one:nnn {yellow9} {rgb:Hsb} {60,0.27,0.88} + \__ninecolors_define_one:nnn {olive1} {rgb:Hsb} {90,0.67,0.16} + \__ninecolors_define_one:nnn {olive2} {rgb:Hsb} {90,0.67,0.25} + \__ninecolors_define_one:nnn {olive3} {rgb:Hsb} {90,0.67,0.33} + \__ninecolors_define_one:nnn {olive4} {rgb:Hsb} {90,0.67,0.42} + \__ninecolors_define_one:nnn {olive5} {rgb:Hsb} {90,0.67,0.51} + \__ninecolors_define_one:nnn {olive6} {rgb:Hsb} {90,0.67,0.60} + \__ninecolors_define_one:nnn {olive7} {rgb:Hsb} {90,0.67,0.71} + \__ninecolors_define_one:nnn {olive8} {rgb:Hsb} {90,0.48,0.81} + \__ninecolors_define_one:nnn {olive9} {rgb:Hsb} {90,0.22,0.90} + \__ninecolors_define_one:nnn {green1} {rgb:Hsb} {120,0.67,0.16} + \__ninecolors_define_one:nnn {green2} {rgb:Hsb} {120,0.67,0.26} + \__ninecolors_define_one:nnn {green3} {rgb:Hsb} {120,0.67,0.35} + \__ninecolors_define_one:nnn {green4} {rgb:Hsb} {120,0.67,0.44} + \__ninecolors_define_one:nnn {green5} {rgb:Hsb} {120,0.67,0.53} + \__ninecolors_define_one:nnn {green6} {rgb:Hsb} {120,0.67,0.63} + \__ninecolors_define_one:nnn {green7} {rgb:Hsb} {120,0.67,0.74} + \__ninecolors_define_one:nnn {green8} {rgb:Hsb} {120,0.42,0.83} + \__ninecolors_define_one:nnn {green9} {rgb:Hsb} {120,0.19,0.91} + \__ninecolors_define_one:nnn {teal1} {rgb:Hsb} {150,0.67,0.16} + \__ninecolors_define_one:nnn {teal2} {rgb:Hsb} {150,0.67,0.26} + \__ninecolors_define_one:nnn {teal3} {rgb:Hsb} {150,0.67,0.34} + \__ninecolors_define_one:nnn {teal4} {rgb:Hsb} {150,0.67,0.43} + \__ninecolors_define_one:nnn {teal5} {rgb:Hsb} {150,0.67,0.52} + \__ninecolors_define_one:nnn {teal6} {rgb:Hsb} {150,0.67,0.62} + \__ninecolors_define_one:nnn {teal7} {rgb:Hsb} {150,0.67,0.73} + \__ninecolors_define_one:nnn {teal8} {rgb:Hsb} {150,0.44,0.82} + \__ninecolors_define_one:nnn {teal9} {rgb:Hsb} {150,0.20,0.91} + \__ninecolors_define_one:nnn {cyan1} {rgb:Hsb} {180,0.67,0.16} + \__ninecolors_define_one:nnn {cyan2} {rgb:Hsb} {180,0.67,0.25} + \__ninecolors_define_one:nnn {cyan3} {rgb:Hsb} {180,0.67,0.33} + \__ninecolors_define_one:nnn {cyan4} {rgb:Hsb} {180,0.67,0.42} + \__ninecolors_define_one:nnn {cyan5} {rgb:Hsb} {180,0.67,0.51} + \__ninecolors_define_one:nnn {cyan6} {rgb:Hsb} {180,0.67,0.60} + \__ninecolors_define_one:nnn {cyan7} {rgb:Hsb} {180,0.67,0.71} + \__ninecolors_define_one:nnn {cyan8} {rgb:Hsb} {180,0.47,0.81} + \__ninecolors_define_one:nnn {cyan9} {rgb:Hsb} {180,0.21,0.90} + \__ninecolors_define_one:nnn {azure1} {rgb:Hsb} {210,0.67,0.22} + \__ninecolors_define_one:nnn {azure2} {rgb:Hsb} {210,0.67,0.35} + \__ninecolors_define_one:nnn {azure3} {rgb:Hsb} {210,0.67,0.47} + \__ninecolors_define_one:nnn {azure4} {rgb:Hsb} {210,0.67,0.59} + \__ninecolors_define_one:nnn {azure5} {rgb:Hsb} {210,0.67,0.71} + \__ninecolors_define_one:nnn {azure6} {rgb:Hsb} {210,0.56,0.78} + \__ninecolors_define_one:nnn {azure7} {rgb:Hsb} {210,0.41,0.83} + \__ninecolors_define_one:nnn {azure8} {rgb:Hsb} {210,0.27,0.88} + \__ninecolors_define_one:nnn {azure9} {rgb:Hsb} {210,0.13,0.94} + \__ninecolors_define_one:nnn {blue1} {rgb:Hsb} {240,0.67,0.34} + \__ninecolors_define_one:nnn {blue2} {rgb:Hsb} {240,0.67,0.53} + \__ninecolors_define_one:nnn {blue3} {rgb:Hsb} {240,0.67,0.70} + \__ninecolors_define_one:nnn {blue4} {rgb:Hsb} {240,0.58,0.77} + \__ninecolors_define_one:nnn {blue5} {rgb:Hsb} {240,0.48,0.81} + \__ninecolors_define_one:nnn {blue6} {rgb:Hsb} {240,0.39,0.84} + \__ninecolors_define_one:nnn {blue7} {rgb:Hsb} {240,0.29,0.87} + \__ninecolors_define_one:nnn {blue8} {rgb:Hsb} {240,0.19,0.91} + \__ninecolors_define_one:nnn {blue9} {rgb:Hsb} {240,0.10,0.95} + \__ninecolors_define_one:nnn {violet1} {rgb:Hsb} {270,0.67,0.29} + \__ninecolors_define_one:nnn {violet2} {rgb:Hsb} {270,0.67,0.45} + \__ninecolors_define_one:nnn {violet3} {rgb:Hsb} {270,0.67,0.60} + \__ninecolors_define_one:nnn {violet4} {rgb:Hsb} {270,0.67,0.75} + \__ninecolors_define_one:nnn {violet5} {rgb:Hsb} {270,0.54,0.79} + \__ninecolors_define_one:nnn {violet6} {rgb:Hsb} {270,0.43,0.82} + \__ninecolors_define_one:nnn {violet7} {rgb:Hsb} {270,0.32,0.86} + \__ninecolors_define_one:nnn {violet8} {rgb:Hsb} {270,0.21,0.90} + \__ninecolors_define_one:nnn {violet9} {rgb:Hsb} {270,0.11,0.95} + \__ninecolors_define_one:nnn {magenta1} {rgb:Hsb} {300,0.67,0.23} + \__ninecolors_define_one:nnn {magenta2} {rgb:Hsb} {300,0.67,0.37} + \__ninecolors_define_one:nnn {magenta3} {rgb:Hsb} {300,0.67,0.49} + \__ninecolors_define_one:nnn {magenta4} {rgb:Hsb} {300,0.67,0.61} + \__ninecolors_define_one:nnn {magenta5} {rgb:Hsb} {300,0.67,0.74} + \__ninecolors_define_one:nnn {magenta6} {rgb:Hsb} {300,0.51,0.80} + \__ninecolors_define_one:nnn {magenta7} {rgb:Hsb} {300,0.37,0.84} + \__ninecolors_define_one:nnn {magenta8} {rgb:Hsb} {300,0.24,0.89} + \__ninecolors_define_one:nnn {magenta9} {rgb:Hsb} {300,0.12,0.94} + \__ninecolors_define_one:nnn {purple1} {rgb:Hsb} {330,0.67,0.25} + \__ninecolors_define_one:nnn {purple2} {rgb:Hsb} {330,0.67,0.39} + \__ninecolors_define_one:nnn {purple3} {rgb:Hsb} {330,0.67,0.52} + \__ninecolors_define_one:nnn {purple4} {rgb:Hsb} {330,0.67,0.65} + \__ninecolors_define_one:nnn {purple5} {rgb:Hsb} {330,0.63,0.76} + \__ninecolors_define_one:nnn {purple6} {rgb:Hsb} {330,0.48,0.81} + \__ninecolors_define_one:nnn {purple7} {rgb:Hsb} {330,0.35,0.85} + \__ninecolors_define_one:nnn {purple8} {rgb:Hsb} {330,0.23,0.90} + \__ninecolors_define_one:nnn {purple9} {rgb:Hsb} {330,0.11,0.95} + } + +\cs_new_protected_nopar:Npn \__ninecolors_define_colors_medium: + { + \__ninecolors_define_one:nnn {red1} {rgb:Hsb} {0,0.79,0.28} + \__ninecolors_define_one:nnn {red2} {rgb:Hsb} {0,0.79,0.44} + \__ninecolors_define_one:nnn {red3} {rgb:Hsb} {0,0.79,0.58} + \__ninecolors_define_one:nnn {red4} {rgb:Hsb} {0,0.79,0.72} + \__ninecolors_define_one:nnn {red5} {rgb:Hsb} {0,0.72,0.84} + \__ninecolors_define_one:nnn {red6} {rgb:Hsb} {0,0.54,0.87} + \__ninecolors_define_one:nnn {red7} {rgb:Hsb} {0,0.40,0.90} + \__ninecolors_define_one:nnn {red8} {rgb:Hsb} {0,0.26,0.93} + \__ninecolors_define_one:nnn {red9} {rgb:Hsb} {0,0.13,0.97} + \__ninecolors_define_one:nnn {brown1} {rgb:Hsb} {30,0.79,0.21} + \__ninecolors_define_one:nnn {brown2} {rgb:Hsb} {30,0.79,0.33} + \__ninecolors_define_one:nnn {brown3} {rgb:Hsb} {30,0.79,0.43} + \__ninecolors_define_one:nnn {brown4} {rgb:Hsb} {30,0.79,0.54} + \__ninecolors_define_one:nnn {brown5} {rgb:Hsb} {30,0.79,0.66} + \__ninecolors_define_one:nnn {brown6} {rgb:Hsb} {30,0.79,0.78} + \__ninecolors_define_one:nnn {brown7} {rgb:Hsb} {30,0.63,0.86} + \__ninecolors_define_one:nnn {brown8} {rgb:Hsb} {30,0.41,0.90} + \__ninecolors_define_one:nnn {brown9} {rgb:Hsb} {30,0.20,0.95} + \__ninecolors_define_one:nnn {yellow1} {rgb:Hsb} {60,0.79,0.15} + \__ninecolors_define_one:nnn {yellow2} {rgb:Hsb} {60,0.79,0.23} + \__ninecolors_define_one:nnn {yellow3} {rgb:Hsb} {60,0.79,0.31} + \__ninecolors_define_one:nnn {yellow4} {rgb:Hsb} {60,0.79,0.39} + \__ninecolors_define_one:nnn {yellow5} {rgb:Hsb} {60,0.79,0.48} + \__ninecolors_define_one:nnn {yellow6} {rgb:Hsb} {60,0.79,0.57} + \__ninecolors_define_one:nnn {yellow7} {rgb:Hsb} {60,0.79,0.66} + \__ninecolors_define_one:nnn {yellow8} {rgb:Hsb} {60,0.79,0.77} + \__ninecolors_define_one:nnn {yellow9} {rgb:Hsb} {60,0.46,0.89} + \__ninecolors_define_one:nnn {olive1} {rgb:Hsb} {90,0.79,0.16} + \__ninecolors_define_one:nnn {olive2} {rgb:Hsb} {90,0.79,0.25} + \__ninecolors_define_one:nnn {olive3} {rgb:Hsb} {90,0.79,0.34} + \__ninecolors_define_one:nnn {olive4} {rgb:Hsb} {90,0.79,0.42} + \__ninecolors_define_one:nnn {olive5} {rgb:Hsb} {90,0.79,0.51} + \__ninecolors_define_one:nnn {olive6} {rgb:Hsb} {90,0.79,0.61} + \__ninecolors_define_one:nnn {olive7} {rgb:Hsb} {90,0.79,0.72} + \__ninecolors_define_one:nnn {olive8} {rgb:Hsb} {90,0.76,0.83} + \__ninecolors_define_one:nnn {olive9} {rgb:Hsb} {90,0.34,0.92} + \__ninecolors_define_one:nnn {green1} {rgb:Hsb} {120,0.79,0.17} + \__ninecolors_define_one:nnn {green2} {rgb:Hsb} {120,0.79,0.26} + \__ninecolors_define_one:nnn {green3} {rgb:Hsb} {120,0.79,0.35} + \__ninecolors_define_one:nnn {green4} {rgb:Hsb} {120,0.79,0.44} + \__ninecolors_define_one:nnn {green5} {rgb:Hsb} {120,0.79,0.53} + \__ninecolors_define_one:nnn {green6} {rgb:Hsb} {120,0.79,0.63} + \__ninecolors_define_one:nnn {green7} {rgb:Hsb} {120,0.79,0.74} + \__ninecolors_define_one:nnn {green8} {rgb:Hsb} {120,0.64,0.85} + \__ninecolors_define_one:nnn {green9} {rgb:Hsb} {120,0.28,0.93} + \__ninecolors_define_one:nnn {teal1} {rgb:Hsb} {150,0.79,0.16} + \__ninecolors_define_one:nnn {teal2} {rgb:Hsb} {150,0.79,0.26} + \__ninecolors_define_one:nnn {teal3} {rgb:Hsb} {150,0.79,0.35} + \__ninecolors_define_one:nnn {teal4} {rgb:Hsb} {150,0.79,0.43} + \__ninecolors_define_one:nnn {teal5} {rgb:Hsb} {150,0.79,0.53} + \__ninecolors_define_one:nnn {teal6} {rgb:Hsb} {150,0.79,0.62} + \__ninecolors_define_one:nnn {teal7} {rgb:Hsb} {150,0.79,0.73} + \__ninecolors_define_one:nnn {teal8} {rgb:Hsb} {150,0.68,0.85} + \__ninecolors_define_one:nnn {teal9} {rgb:Hsb} {150,0.30,0.93} + \__ninecolors_define_one:nnn {cyan1} {rgb:Hsb} {180,0.79,0.16} + \__ninecolors_define_one:nnn {cyan2} {rgb:Hsb} {180,0.79,0.25} + \__ninecolors_define_one:nnn {cyan3} {rgb:Hsb} {180,0.79,0.34} + \__ninecolors_define_one:nnn {cyan4} {rgb:Hsb} {180,0.79,0.42} + \__ninecolors_define_one:nnn {cyan5} {rgb:Hsb} {180,0.79,0.51} + \__ninecolors_define_one:nnn {cyan6} {rgb:Hsb} {180,0.79,0.61} + \__ninecolors_define_one:nnn {cyan7} {rgb:Hsb} {180,0.79,0.71} + \__ninecolors_define_one:nnn {cyan8} {rgb:Hsb} {180,0.77,0.83} + \__ninecolors_define_one:nnn {cyan9} {rgb:Hsb} {180,0.32,0.92} + \__ninecolors_define_one:nnn {azure1} {rgb:Hsb} {210,0.79,0.24} + \__ninecolors_define_one:nnn {azure2} {rgb:Hsb} {210,0.79,0.38} + \__ninecolors_define_one:nnn {azure3} {rgb:Hsb} {210,0.79,0.51} + \__ninecolors_define_one:nnn {azure4} {rgb:Hsb} {210,0.79,0.64} + \__ninecolors_define_one:nnn {azure5} {rgb:Hsb} {210,0.79,0.77} + \__ninecolors_define_one:nnn {azure6} {rgb:Hsb} {210,0.67,0.85} + \__ninecolors_define_one:nnn {azure7} {rgb:Hsb} {210,0.50,0.88} + \__ninecolors_define_one:nnn {azure8} {rgb:Hsb} {210,0.33,0.92} + \__ninecolors_define_one:nnn {azure9} {rgb:Hsb} {210,0.17,0.96} + \__ninecolors_define_one:nnn {blue1} {rgb:Hsb} {240,0.79,0.41} + \__ninecolors_define_one:nnn {blue2} {rgb:Hsb} {240,0.79,0.64} + \__ninecolors_define_one:nnn {blue3} {rgb:Hsb} {240,0.77,0.83} + \__ninecolors_define_one:nnn {blue4} {rgb:Hsb} {240,0.65,0.85} + \__ninecolors_define_one:nnn {blue5} {rgb:Hsb} {240,0.54,0.87} + \__ninecolors_define_one:nnn {blue6} {rgb:Hsb} {240,0.43,0.90} + \__ninecolors_define_one:nnn {blue7} {rgb:Hsb} {240,0.33,0.92} + \__ninecolors_define_one:nnn {blue8} {rgb:Hsb} {240,0.22,0.94} + \__ninecolors_define_one:nnn {blue9} {rgb:Hsb} {240,0.11,0.97} + \__ninecolors_define_one:nnn {violet1} {rgb:Hsb} {270,0.79,0.33} + \__ninecolors_define_one:nnn {violet2} {rgb:Hsb} {270,0.79,0.52} + \__ninecolors_define_one:nnn {violet3} {rgb:Hsb} {270,0.79,0.69} + \__ninecolors_define_one:nnn {violet4} {rgb:Hsb} {270,0.76,0.83} + \__ninecolors_define_one:nnn {violet5} {rgb:Hsb} {270,0.62,0.86} + \__ninecolors_define_one:nnn {violet6} {rgb:Hsb} {270,0.49,0.88} + \__ninecolors_define_one:nnn {violet7} {rgb:Hsb} {270,0.37,0.91} + \__ninecolors_define_one:nnn {violet8} {rgb:Hsb} {270,0.25,0.94} + \__ninecolors_define_one:nnn {violet9} {rgb:Hsb} {270,0.13,0.97} + \__ninecolors_define_one:nnn {magenta1} {rgb:Hsb} {300,0.79,0.25} + \__ninecolors_define_one:nnn {magenta2} {rgb:Hsb} {300,0.79,0.39} + \__ninecolors_define_one:nnn {magenta3} {rgb:Hsb} {300,0.79,0.52} + \__ninecolors_define_one:nnn {magenta4} {rgb:Hsb} {300,0.79,0.65} + \__ninecolors_define_one:nnn {magenta5} {rgb:Hsb} {300,0.79,0.78} + \__ninecolors_define_one:nnn {magenta6} {rgb:Hsb} {300,0.62,0.86} + \__ninecolors_define_one:nnn {magenta7} {rgb:Hsb} {300,0.44,0.89} + \__ninecolors_define_one:nnn {magenta8} {rgb:Hsb} {300,0.29,0.93} + \__ninecolors_define_one:nnn {magenta9} {rgb:Hsb} {300,0.14,0.96} + \__ninecolors_define_one:nnn {purple1} {rgb:Hsb} {330,0.79,0.27} + \__ninecolors_define_one:nnn {purple2} {rgb:Hsb} {330,0.79,0.42} + \__ninecolors_define_one:nnn {purple3} {rgb:Hsb} {330,0.79,0.56} + \__ninecolors_define_one:nnn {purple4} {rgb:Hsb} {330,0.79,0.70} + \__ninecolors_define_one:nnn {purple5} {rgb:Hsb} {330,0.76,0.83} + \__ninecolors_define_one:nnn {purple6} {rgb:Hsb} {330,0.57,0.87} + \__ninecolors_define_one:nnn {purple7} {rgb:Hsb} {330,0.42,0.90} + \__ninecolors_define_one:nnn {purple8} {rgb:Hsb} {330,0.27,0.93} + \__ninecolors_define_one:nnn {purple9} {rgb:Hsb} {330,0.14,0.96} } -\@namedef{ninecolors@define@mono}{% - \definecolor{gray1}{gray}{0.14} - \definecolor{gray2}{gray}{0.23} - \definecolor{gray3}{gray}{0.30} - \definecolor{gray4}{gray}{0.38} - \definecolor{gray5}{gray}{0.46} - \definecolor{gray6}{gray}{0.55} - \definecolor{gray7}{gray}{0.64} - \definecolor{gray8}{gray}{0.75} - \definecolor{gray9}{gray}{0.87} -} +\cs_new_protected_nopar:Npn \__ninecolors_define_colors_high: + { + \__ninecolors_define_one:nnn {red1} {rgb:Hsb} {0,0.89,0.30} + \__ninecolors_define_one:nnn {red2} {rgb:Hsb} {0,0.89,0.46} + \__ninecolors_define_one:nnn {red3} {rgb:Hsb} {0,0.89,0.61} + \__ninecolors_define_one:nnn {red4} {rgb:Hsb} {0,0.89,0.76} + \__ninecolors_define_one:nnn {red5} {rgb:Hsb} {0,0.87,0.90} + \__ninecolors_define_one:nnn {red6} {rgb:Hsb} {0,0.62,0.93} + \__ninecolors_define_one:nnn {red7} {rgb:Hsb} {0,0.45,0.95} + \__ninecolors_define_one:nnn {red8} {rgb:Hsb} {0,0.30,0.96} + \__ninecolors_define_one:nnn {red9} {rgb:Hsb} {0,0.15,0.98} + \__ninecolors_define_one:nnn {brown1} {rgb:Hsb} {30,0.89,0.22} + \__ninecolors_define_one:nnn {brown2} {rgb:Hsb} {30,0.89,0.34} + \__ninecolors_define_one:nnn {brown3} {rgb:Hsb} {30,0.89,0.46} + \__ninecolors_define_one:nnn {brown4} {rgb:Hsb} {30,0.89,0.57} + \__ninecolors_define_one:nnn {brown5} {rgb:Hsb} {30,0.89,0.69} + \__ninecolors_define_one:nnn {brown6} {rgb:Hsb} {30,0.89,0.82} + \__ninecolors_define_one:nnn {brown7} {rgb:Hsb} {30,0.77,0.91} + \__ninecolors_define_one:nnn {brown8} {rgb:Hsb} {30,0.51,0.94} + \__ninecolors_define_one:nnn {brown9} {rgb:Hsb} {30,0.25,0.97} + \__ninecolors_define_one:nnn {yellow1} {rgb:Hsb} {60,0.89,0.15} + \__ninecolors_define_one:nnn {yellow2} {rgb:Hsb} {60,0.89,0.23} + \__ninecolors_define_one:nnn {yellow3} {rgb:Hsb} {60,0.89,0.31} + \__ninecolors_define_one:nnn {yellow4} {rgb:Hsb} {60,0.89,0.39} + \__ninecolors_define_one:nnn {yellow5} {rgb:Hsb} {60,0.89,0.48} + \__ninecolors_define_one:nnn {yellow6} {rgb:Hsb} {60,0.89,0.57} + \__ninecolors_define_one:nnn {yellow7} {rgb:Hsb} {60,0.89,0.66} + \__ninecolors_define_one:nnn {yellow8} {rgb:Hsb} {60,0.89,0.77} + \__ninecolors_define_one:nnn {yellow9} {rgb:Hsb} {60,0.89,0.90} + \__ninecolors_define_one:nnn {olive1} {rgb:Hsb} {90,0.89,0.16} + \__ninecolors_define_one:nnn {olive2} {rgb:Hsb} {90,0.89,0.26} + \__ninecolors_define_one:nnn {olive3} {rgb:Hsb} {90,0.89,0.34} + \__ninecolors_define_one:nnn {olive4} {rgb:Hsb} {90,0.89,0.43} + \__ninecolors_define_one:nnn {olive5} {rgb:Hsb} {90,0.89,0.52} + \__ninecolors_define_one:nnn {olive6} {rgb:Hsb} {90,0.89,0.61} + \__ninecolors_define_one:nnn {olive7} {rgb:Hsb} {90,0.89,0.72} + \__ninecolors_define_one:nnn {olive8} {rgb:Hsb} {90,0.89,0.84} + \__ninecolors_define_one:nnn {olive9} {rgb:Hsb} {90,0.52,0.94} + \__ninecolors_define_one:nnn {green1} {rgb:Hsb} {120,0.89,0.17} + \__ninecolors_define_one:nnn {green2} {rgb:Hsb} {120,0.89,0.27} + \__ninecolors_define_one:nnn {green3} {rgb:Hsb} {120,0.89,0.35} + \__ninecolors_define_one:nnn {green4} {rgb:Hsb} {120,0.89,0.44} + \__ninecolors_define_one:nnn {green5} {rgb:Hsb} {120,0.89,0.54} + \__ninecolors_define_one:nnn {green6} {rgb:Hsb} {120,0.89,0.64} + \__ninecolors_define_one:nnn {green7} {rgb:Hsb} {120,0.89,0.75} + \__ninecolors_define_one:nnn {green8} {rgb:Hsb} {120,0.89,0.87} + \__ninecolors_define_one:nnn {green9} {rgb:Hsb} {120,0.39,0.95} + \__ninecolors_define_one:nnn {teal1} {rgb:Hsb} {150,0.89,0.17} + \__ninecolors_define_one:nnn {teal2} {rgb:Hsb} {150,0.89,0.26} + \__ninecolors_define_one:nnn {teal3} {rgb:Hsb} {150,0.89,0.35} + \__ninecolors_define_one:nnn {teal4} {rgb:Hsb} {150,0.89,0.44} + \__ninecolors_define_one:nnn {teal5} {rgb:Hsb} {150,0.89,0.53} + \__ninecolors_define_one:nnn {teal6} {rgb:Hsb} {150,0.89,0.63} + \__ninecolors_define_one:nnn {teal7} {rgb:Hsb} {150,0.89,0.74} + \__ninecolors_define_one:nnn {teal8} {rgb:Hsb} {150,0.89,0.86} + \__ninecolors_define_one:nnn {teal9} {rgb:Hsb} {150,0.43,0.95} + \__ninecolors_define_one:nnn {cyan1} {rgb:Hsb} {180,0.89,0.16} + \__ninecolors_define_one:nnn {cyan2} {rgb:Hsb} {180,0.89,0.25} + \__ninecolors_define_one:nnn {cyan3} {rgb:Hsb} {180,0.89,0.34} + \__ninecolors_define_one:nnn {cyan4} {rgb:Hsb} {180,0.89,0.42} + \__ninecolors_define_one:nnn {cyan5} {rgb:Hsb} {180,0.89,0.51} + \__ninecolors_define_one:nnn {cyan6} {rgb:Hsb} {180,0.89,0.61} + \__ninecolors_define_one:nnn {cyan7} {rgb:Hsb} {180,0.89,0.71} + \__ninecolors_define_one:nnn {cyan8} {rgb:Hsb} {180,0.89,0.83} + \__ninecolors_define_one:nnn {cyan9} {rgb:Hsb} {180,0.50,0.94} + \__ninecolors_define_one:nnn {azure1} {rgb:Hsb} {210,0.89,0.26} + \__ninecolors_define_one:nnn {azure2} {rgb:Hsb} {210,0.89,0.41} + \__ninecolors_define_one:nnn {azure3} {rgb:Hsb} {210,0.89,0.55} + \__ninecolors_define_one:nnn {azure4} {rgb:Hsb} {210,0.89,0.69} + \__ninecolors_define_one:nnn {azure5} {rgb:Hsb} {210,0.89,0.83} + \__ninecolors_define_one:nnn {azure6} {rgb:Hsb} {210,0.77,0.91} + \__ninecolors_define_one:nnn {azure7} {rgb:Hsb} {210,0.58,0.93} + \__ninecolors_define_one:nnn {azure8} {rgb:Hsb} {210,0.39,0.95} + \__ninecolors_define_one:nnn {azure9} {rgb:Hsb} {210,0.20,0.98} + \__ninecolors_define_one:nnn {blue1} {rgb:Hsb} {240,0.89,0.48} + \__ninecolors_define_one:nnn {blue2} {rgb:Hsb} {240,0.89,0.73} + \__ninecolors_define_one:nnn {blue3} {rgb:Hsb} {240,0.84,0.90} + \__ninecolors_define_one:nnn {blue4} {rgb:Hsb} {240,0.70,0.92} + \__ninecolors_define_one:nnn {blue5} {rgb:Hsb} {240,0.58,0.93} + \__ninecolors_define_one:nnn {blue6} {rgb:Hsb} {240,0.47,0.94} + \__ninecolors_define_one:nnn {blue7} {rgb:Hsb} {240,0.36,0.96} + \__ninecolors_define_one:nnn {blue8} {rgb:Hsb} {240,0.25,0.97} + \__ninecolors_define_one:nnn {blue9} {rgb:Hsb} {240,0.13,0.98} + \__ninecolors_define_one:nnn {violet1} {rgb:Hsb} {270,0.89,0.37} + \__ninecolors_define_one:nnn {violet2} {rgb:Hsb} {270,0.89,0.57} + \__ninecolors_define_one:nnn {violet3} {rgb:Hsb} {270,0.89,0.75} + \__ninecolors_define_one:nnn {violet4} {rgb:Hsb} {270,0.85,0.90} + \__ninecolors_define_one:nnn {violet5} {rgb:Hsb} {270,0.68,0.92} + \__ninecolors_define_one:nnn {violet6} {rgb:Hsb} {270,0.54,0.94} + \__ninecolors_define_one:nnn {violet7} {rgb:Hsb} {270,0.41,0.95} + \__ninecolors_define_one:nnn {violet8} {rgb:Hsb} {270,0.28,0.97} + \__ninecolors_define_one:nnn {violet9} {rgb:Hsb} {270,0.14,0.98} + \__ninecolors_define_one:nnn {magenta1} {rgb:Hsb} {300,0.89,0.26} + \__ninecolors_define_one:nnn {magenta2} {rgb:Hsb} {300,0.89,0.41} + \__ninecolors_define_one:nnn {magenta3} {rgb:Hsb} {300,0.89,0.54} + \__ninecolors_define_one:nnn {magenta4} {rgb:Hsb} {300,0.89,0.67} + \__ninecolors_define_one:nnn {magenta5} {rgb:Hsb} {300,0.89,0.80} + \__ninecolors_define_one:nnn {magenta6} {rgb:Hsb} {300,0.76,0.91} + \__ninecolors_define_one:nnn {magenta7} {rgb:Hsb} {300,0.52,0.94} + \__ninecolors_define_one:nnn {magenta8} {rgb:Hsb} {300,0.33,0.96} + \__ninecolors_define_one:nnn {magenta9} {rgb:Hsb} {300,0.17,0.98} + \__ninecolors_define_one:nnn {purple1} {rgb:Hsb} {330,0.89,0.29} + \__ninecolors_define_one:nnn {purple2} {rgb:Hsb} {330,0.89,0.45} + \__ninecolors_define_one:nnn {purple3} {rgb:Hsb} {330,0.89,0.59} + \__ninecolors_define_one:nnn {purple4} {rgb:Hsb} {330,0.89,0.73} + \__ninecolors_define_one:nnn {purple5} {rgb:Hsb} {330,0.89,0.88} + \__ninecolors_define_one:nnn {purple6} {rgb:Hsb} {330,0.66,0.92} + \__ninecolors_define_one:nnn {purple7} {rgb:Hsb} {330,0.47,0.94} + \__ninecolors_define_one:nnn {purple8} {rgb:Hsb} {330,0.31,0.96} + \__ninecolors_define_one:nnn {purple9} {rgb:Hsb} {330,0.16,0.98} + } -\@namedef{ninecolors@define@color@low}{% - \definecolor{red1}{rgb:Hsb}{0,0.67,0.26} - \definecolor{red2}{rgb:Hsb}{0,0.67,0.41} - \definecolor{red3}{rgb:Hsb}{0,0.67,0.54} - \definecolor{red4}{rgb:Hsb}{0,0.67,0.67} - \definecolor{red5}{rgb:Hsb}{0,0.60,0.77} - \definecolor{red6}{rgb:Hsb}{0,0.46,0.81} - \definecolor{red7}{rgb:Hsb}{0,0.34,0.86} - \definecolor{red8}{rgb:Hsb}{0,0.22,0.90} - \definecolor{red9}{rgb:Hsb}{0,0.11,0.95} - \definecolor{brown1}{rgb:Hsb}{30,0.67,0.19} - \definecolor{brown2}{rgb:Hsb}{30,0.67,0.31} - \definecolor{brown3}{rgb:Hsb}{30,0.67,0.41} - \definecolor{brown4}{rgb:Hsb}{30,0.67,0.51} - \definecolor{brown5}{rgb:Hsb}{30,0.67,0.62} - \definecolor{brown6}{rgb:Hsb}{30,0.67,0.74} - \definecolor{brown7}{rgb:Hsb}{30,0.49,0.80} - \definecolor{brown8}{rgb:Hsb}{30,0.32,0.86} - \definecolor{brown9}{rgb:Hsb}{30,0.15,0.93} - \definecolor{yellow1}{rgb:Hsb}{60,0.67,0.15} - \definecolor{yellow2}{rgb:Hsb}{60,0.67,0.23} - \definecolor{yellow3}{rgb:Hsb}{60,0.67,0.31} - \definecolor{yellow4}{rgb:Hsb}{60,0.67,0.39} - \definecolor{yellow5}{rgb:Hsb}{60,0.67,0.47} - \definecolor{yellow6}{rgb:Hsb}{60,0.67,0.56} - \definecolor{yellow7}{rgb:Hsb}{60,0.67,0.66} - \definecolor{yellow8}{rgb:Hsb}{60,0.59,0.77} - \definecolor{yellow9}{rgb:Hsb}{60,0.27,0.88} - \definecolor{olive1}{rgb:Hsb}{90,0.67,0.16} - \definecolor{olive2}{rgb:Hsb}{90,0.67,0.25} - \definecolor{olive3}{rgb:Hsb}{90,0.67,0.33} - \definecolor{olive4}{rgb:Hsb}{90,0.67,0.42} - \definecolor{olive5}{rgb:Hsb}{90,0.67,0.51} - \definecolor{olive6}{rgb:Hsb}{90,0.67,0.60} - \definecolor{olive7}{rgb:Hsb}{90,0.67,0.71} - \definecolor{olive8}{rgb:Hsb}{90,0.48,0.81} - \definecolor{olive9}{rgb:Hsb}{90,0.22,0.90} - \definecolor{green1}{rgb:Hsb}{120,0.67,0.16} - \definecolor{green2}{rgb:Hsb}{120,0.67,0.26} - \definecolor{green3}{rgb:Hsb}{120,0.67,0.35} - \definecolor{green4}{rgb:Hsb}{120,0.67,0.44} - \definecolor{green5}{rgb:Hsb}{120,0.67,0.53} - \definecolor{green6}{rgb:Hsb}{120,0.67,0.63} - \definecolor{green7}{rgb:Hsb}{120,0.67,0.74} - \definecolor{green8}{rgb:Hsb}{120,0.42,0.83} - \definecolor{green9}{rgb:Hsb}{120,0.19,0.91} - \definecolor{teal1}{rgb:Hsb}{150,0.67,0.16} - \definecolor{teal2}{rgb:Hsb}{150,0.67,0.26} - \definecolor{teal3}{rgb:Hsb}{150,0.67,0.34} - \definecolor{teal4}{rgb:Hsb}{150,0.67,0.43} - \definecolor{teal5}{rgb:Hsb}{150,0.67,0.52} - \definecolor{teal6}{rgb:Hsb}{150,0.67,0.62} - \definecolor{teal7}{rgb:Hsb}{150,0.67,0.73} - \definecolor{teal8}{rgb:Hsb}{150,0.44,0.82} - \definecolor{teal9}{rgb:Hsb}{150,0.20,0.91} - \definecolor{cyan1}{rgb:Hsb}{180,0.67,0.16} - \definecolor{cyan2}{rgb:Hsb}{180,0.67,0.25} - \definecolor{cyan3}{rgb:Hsb}{180,0.67,0.33} - \definecolor{cyan4}{rgb:Hsb}{180,0.67,0.42} - \definecolor{cyan5}{rgb:Hsb}{180,0.67,0.51} - \definecolor{cyan6}{rgb:Hsb}{180,0.67,0.60} - \definecolor{cyan7}{rgb:Hsb}{180,0.67,0.71} - \definecolor{cyan8}{rgb:Hsb}{180,0.47,0.81} - \definecolor{cyan9}{rgb:Hsb}{180,0.21,0.90} - \definecolor{azure1}{rgb:Hsb}{210,0.67,0.22} - \definecolor{azure2}{rgb:Hsb}{210,0.67,0.35} - \definecolor{azure3}{rgb:Hsb}{210,0.67,0.47} - \definecolor{azure4}{rgb:Hsb}{210,0.67,0.59} - \definecolor{azure5}{rgb:Hsb}{210,0.67,0.71} - \definecolor{azure6}{rgb:Hsb}{210,0.56,0.78} - \definecolor{azure7}{rgb:Hsb}{210,0.41,0.83} - \definecolor{azure8}{rgb:Hsb}{210,0.27,0.88} - \definecolor{azure9}{rgb:Hsb}{210,0.13,0.94} - \definecolor{blue1}{rgb:Hsb}{240,0.67,0.34} - \definecolor{blue2}{rgb:Hsb}{240,0.67,0.53} - \definecolor{blue3}{rgb:Hsb}{240,0.67,0.70} - \definecolor{blue4}{rgb:Hsb}{240,0.58,0.77} - \definecolor{blue5}{rgb:Hsb}{240,0.48,0.81} - \definecolor{blue6}{rgb:Hsb}{240,0.39,0.84} - \definecolor{blue7}{rgb:Hsb}{240,0.29,0.87} - \definecolor{blue8}{rgb:Hsb}{240,0.19,0.91} - \definecolor{blue9}{rgb:Hsb}{240,0.10,0.95} - \definecolor{violet1}{rgb:Hsb}{270,0.67,0.29} - \definecolor{violet2}{rgb:Hsb}{270,0.67,0.45} - \definecolor{violet3}{rgb:Hsb}{270,0.67,0.60} - \definecolor{violet4}{rgb:Hsb}{270,0.67,0.75} - \definecolor{violet5}{rgb:Hsb}{270,0.54,0.79} - \definecolor{violet6}{rgb:Hsb}{270,0.43,0.82} - \definecolor{violet7}{rgb:Hsb}{270,0.32,0.86} - \definecolor{violet8}{rgb:Hsb}{270,0.21,0.90} - \definecolor{violet9}{rgb:Hsb}{270,0.11,0.95} - \definecolor{magenta1}{rgb:Hsb}{300,0.67,0.23} - \definecolor{magenta2}{rgb:Hsb}{300,0.67,0.37} - \definecolor{magenta3}{rgb:Hsb}{300,0.67,0.49} - \definecolor{magenta4}{rgb:Hsb}{300,0.67,0.61} - \definecolor{magenta5}{rgb:Hsb}{300,0.67,0.74} - \definecolor{magenta6}{rgb:Hsb}{300,0.51,0.80} - \definecolor{magenta7}{rgb:Hsb}{300,0.37,0.84} - \definecolor{magenta8}{rgb:Hsb}{300,0.24,0.89} - \definecolor{magenta9}{rgb:Hsb}{300,0.12,0.94} - \definecolor{purple1}{rgb:Hsb}{330,0.67,0.25} - \definecolor{purple2}{rgb:Hsb}{330,0.67,0.39} - \definecolor{purple3}{rgb:Hsb}{330,0.67,0.52} - \definecolor{purple4}{rgb:Hsb}{330,0.67,0.65} - \definecolor{purple5}{rgb:Hsb}{330,0.63,0.76} - \definecolor{purple6}{rgb:Hsb}{330,0.48,0.81} - \definecolor{purple7}{rgb:Hsb}{330,0.35,0.85} - \definecolor{purple8}{rgb:Hsb}{330,0.23,0.90} - \definecolor{purple9}{rgb:Hsb}{330,0.11,0.95} -} +\cs_new_protected_nopar:Npn \__ninecolors_define_colors:n #1 + { + \cs_set_eq:NN \__ninecolors_define_one:nnn \definecolor + \use:c { __ninecolors_define_colors_ #1 : } + \bool_if:NT \l__ninecolors_define_latex_three_bool + { + \cs_set_eq:NN \__ninecolors_define_one:nnn \color_set:nnn + \use:c { __ninecolors_define_colors_ #1 : } + } + } -\@namedef{ninecolors@define@color@medium}{% - \definecolor{red1}{rgb:Hsb}{0,0.79,0.28} - \definecolor{red2}{rgb:Hsb}{0,0.79,0.44} - \definecolor{red3}{rgb:Hsb}{0,0.79,0.58} - \definecolor{red4}{rgb:Hsb}{0,0.79,0.72} - \definecolor{red5}{rgb:Hsb}{0,0.72,0.84} - \definecolor{red6}{rgb:Hsb}{0,0.54,0.87} - \definecolor{red7}{rgb:Hsb}{0,0.40,0.90} - \definecolor{red8}{rgb:Hsb}{0,0.26,0.93} - \definecolor{red9}{rgb:Hsb}{0,0.13,0.97} - \definecolor{brown1}{rgb:Hsb}{30,0.79,0.21} - \definecolor{brown2}{rgb:Hsb}{30,0.79,0.33} - \definecolor{brown3}{rgb:Hsb}{30,0.79,0.43} - \definecolor{brown4}{rgb:Hsb}{30,0.79,0.54} - \definecolor{brown5}{rgb:Hsb}{30,0.79,0.66} - \definecolor{brown6}{rgb:Hsb}{30,0.79,0.78} - \definecolor{brown7}{rgb:Hsb}{30,0.63,0.86} - \definecolor{brown8}{rgb:Hsb}{30,0.41,0.90} - \definecolor{brown9}{rgb:Hsb}{30,0.20,0.95} - \definecolor{yellow1}{rgb:Hsb}{60,0.79,0.15} - \definecolor{yellow2}{rgb:Hsb}{60,0.79,0.23} - \definecolor{yellow3}{rgb:Hsb}{60,0.79,0.31} - \definecolor{yellow4}{rgb:Hsb}{60,0.79,0.39} - \definecolor{yellow5}{rgb:Hsb}{60,0.79,0.48} - \definecolor{yellow6}{rgb:Hsb}{60,0.79,0.57} - \definecolor{yellow7}{rgb:Hsb}{60,0.79,0.66} - \definecolor{yellow8}{rgb:Hsb}{60,0.79,0.77} - \definecolor{yellow9}{rgb:Hsb}{60,0.46,0.89} - \definecolor{olive1}{rgb:Hsb}{90,0.79,0.16} - \definecolor{olive2}{rgb:Hsb}{90,0.79,0.25} - \definecolor{olive3}{rgb:Hsb}{90,0.79,0.34} - \definecolor{olive4}{rgb:Hsb}{90,0.79,0.42} - \definecolor{olive5}{rgb:Hsb}{90,0.79,0.51} - \definecolor{olive6}{rgb:Hsb}{90,0.79,0.61} - \definecolor{olive7}{rgb:Hsb}{90,0.79,0.72} - \definecolor{olive8}{rgb:Hsb}{90,0.76,0.83} - \definecolor{olive9}{rgb:Hsb}{90,0.34,0.92} - \definecolor{green1}{rgb:Hsb}{120,0.79,0.17} - \definecolor{green2}{rgb:Hsb}{120,0.79,0.26} - \definecolor{green3}{rgb:Hsb}{120,0.79,0.35} - \definecolor{green4}{rgb:Hsb}{120,0.79,0.44} - \definecolor{green5}{rgb:Hsb}{120,0.79,0.53} - \definecolor{green6}{rgb:Hsb}{120,0.79,0.63} - \definecolor{green7}{rgb:Hsb}{120,0.79,0.74} - \definecolor{green8}{rgb:Hsb}{120,0.64,0.85} - \definecolor{green9}{rgb:Hsb}{120,0.28,0.93} - \definecolor{teal1}{rgb:Hsb}{150,0.79,0.16} - \definecolor{teal2}{rgb:Hsb}{150,0.79,0.26} - \definecolor{teal3}{rgb:Hsb}{150,0.79,0.35} - \definecolor{teal4}{rgb:Hsb}{150,0.79,0.43} - \definecolor{teal5}{rgb:Hsb}{150,0.79,0.53} - \definecolor{teal6}{rgb:Hsb}{150,0.79,0.62} - \definecolor{teal7}{rgb:Hsb}{150,0.79,0.73} - \definecolor{teal8}{rgb:Hsb}{150,0.68,0.85} - \definecolor{teal9}{rgb:Hsb}{150,0.30,0.93} - \definecolor{cyan1}{rgb:Hsb}{180,0.79,0.16} - \definecolor{cyan2}{rgb:Hsb}{180,0.79,0.25} - \definecolor{cyan3}{rgb:Hsb}{180,0.79,0.34} - \definecolor{cyan4}{rgb:Hsb}{180,0.79,0.42} - \definecolor{cyan5}{rgb:Hsb}{180,0.79,0.51} - \definecolor{cyan6}{rgb:Hsb}{180,0.79,0.61} - \definecolor{cyan7}{rgb:Hsb}{180,0.79,0.71} - \definecolor{cyan8}{rgb:Hsb}{180,0.77,0.83} - \definecolor{cyan9}{rgb:Hsb}{180,0.32,0.92} - \definecolor{azure1}{rgb:Hsb}{210,0.79,0.24} - \definecolor{azure2}{rgb:Hsb}{210,0.79,0.38} - \definecolor{azure3}{rgb:Hsb}{210,0.79,0.51} - \definecolor{azure4}{rgb:Hsb}{210,0.79,0.64} - \definecolor{azure5}{rgb:Hsb}{210,0.79,0.77} - \definecolor{azure6}{rgb:Hsb}{210,0.67,0.85} - \definecolor{azure7}{rgb:Hsb}{210,0.50,0.88} - \definecolor{azure8}{rgb:Hsb}{210,0.33,0.92} - \definecolor{azure9}{rgb:Hsb}{210,0.17,0.96} - \definecolor{blue1}{rgb:Hsb}{240,0.79,0.41} - \definecolor{blue2}{rgb:Hsb}{240,0.79,0.64} - \definecolor{blue3}{rgb:Hsb}{240,0.77,0.83} - \definecolor{blue4}{rgb:Hsb}{240,0.65,0.85} - \definecolor{blue5}{rgb:Hsb}{240,0.54,0.87} - \definecolor{blue6}{rgb:Hsb}{240,0.43,0.90} - \definecolor{blue7}{rgb:Hsb}{240,0.33,0.92} - \definecolor{blue8}{rgb:Hsb}{240,0.22,0.94} - \definecolor{blue9}{rgb:Hsb}{240,0.11,0.97} - \definecolor{violet1}{rgb:Hsb}{270,0.79,0.33} - \definecolor{violet2}{rgb:Hsb}{270,0.79,0.52} - \definecolor{violet3}{rgb:Hsb}{270,0.79,0.69} - \definecolor{violet4}{rgb:Hsb}{270,0.76,0.83} - \definecolor{violet5}{rgb:Hsb}{270,0.62,0.86} - \definecolor{violet6}{rgb:Hsb}{270,0.49,0.88} - \definecolor{violet7}{rgb:Hsb}{270,0.37,0.91} - \definecolor{violet8}{rgb:Hsb}{270,0.25,0.94} - \definecolor{violet9}{rgb:Hsb}{270,0.13,0.97} - \definecolor{magenta1}{rgb:Hsb}{300,0.79,0.25} - \definecolor{magenta2}{rgb:Hsb}{300,0.79,0.39} - \definecolor{magenta3}{rgb:Hsb}{300,0.79,0.52} - \definecolor{magenta4}{rgb:Hsb}{300,0.79,0.65} - \definecolor{magenta5}{rgb:Hsb}{300,0.79,0.78} - \definecolor{magenta6}{rgb:Hsb}{300,0.62,0.86} - \definecolor{magenta7}{rgb:Hsb}{300,0.44,0.89} - \definecolor{magenta8}{rgb:Hsb}{300,0.29,0.93} - \definecolor{magenta9}{rgb:Hsb}{300,0.14,0.96} - \definecolor{purple1}{rgb:Hsb}{330,0.79,0.27} - \definecolor{purple2}{rgb:Hsb}{330,0.79,0.42} - \definecolor{purple3}{rgb:Hsb}{330,0.79,0.56} - \definecolor{purple4}{rgb:Hsb}{330,0.79,0.70} - \definecolor{purple5}{rgb:Hsb}{330,0.76,0.83} - \definecolor{purple6}{rgb:Hsb}{330,0.57,0.87} - \definecolor{purple7}{rgb:Hsb}{330,0.42,0.90} - \definecolor{purple8}{rgb:Hsb}{330,0.27,0.93} - \definecolor{purple9}{rgb:Hsb}{330,0.14,0.96} -} +\__ninecolors_define_colors:n { mono } +\__ninecolors_define_colors:n { medium } -\@namedef{ninecolors@define@color@high}{% - \definecolor{red1}{rgb:Hsb}{0,0.89,0.30} - \definecolor{red2}{rgb:Hsb}{0,0.89,0.46} - \definecolor{red3}{rgb:Hsb}{0,0.89,0.61} - \definecolor{red4}{rgb:Hsb}{0,0.89,0.76} - \definecolor{red5}{rgb:Hsb}{0,0.87,0.90} - \definecolor{red6}{rgb:Hsb}{0,0.62,0.93} - \definecolor{red7}{rgb:Hsb}{0,0.45,0.95} - \definecolor{red8}{rgb:Hsb}{0,0.30,0.96} - \definecolor{red9}{rgb:Hsb}{0,0.15,0.98} - \definecolor{brown1}{rgb:Hsb}{30,0.89,0.22} - \definecolor{brown2}{rgb:Hsb}{30,0.89,0.34} - \definecolor{brown3}{rgb:Hsb}{30,0.89,0.46} - \definecolor{brown4}{rgb:Hsb}{30,0.89,0.57} - \definecolor{brown5}{rgb:Hsb}{30,0.89,0.69} - \definecolor{brown6}{rgb:Hsb}{30,0.89,0.82} - \definecolor{brown7}{rgb:Hsb}{30,0.77,0.91} - \definecolor{brown8}{rgb:Hsb}{30,0.51,0.94} - \definecolor{brown9}{rgb:Hsb}{30,0.25,0.97} - \definecolor{yellow1}{rgb:Hsb}{60,0.89,0.15} - \definecolor{yellow2}{rgb:Hsb}{60,0.89,0.23} - \definecolor{yellow3}{rgb:Hsb}{60,0.89,0.31} - \definecolor{yellow4}{rgb:Hsb}{60,0.89,0.39} - \definecolor{yellow5}{rgb:Hsb}{60,0.89,0.48} - \definecolor{yellow6}{rgb:Hsb}{60,0.89,0.57} - \definecolor{yellow7}{rgb:Hsb}{60,0.89,0.66} - \definecolor{yellow8}{rgb:Hsb}{60,0.89,0.77} - \definecolor{yellow9}{rgb:Hsb}{60,0.89,0.90} - \definecolor{olive1}{rgb:Hsb}{90,0.89,0.16} - \definecolor{olive2}{rgb:Hsb}{90,0.89,0.26} - \definecolor{olive3}{rgb:Hsb}{90,0.89,0.34} - \definecolor{olive4}{rgb:Hsb}{90,0.89,0.43} - \definecolor{olive5}{rgb:Hsb}{90,0.89,0.52} - \definecolor{olive6}{rgb:Hsb}{90,0.89,0.61} - \definecolor{olive7}{rgb:Hsb}{90,0.89,0.72} - \definecolor{olive8}{rgb:Hsb}{90,0.89,0.84} - \definecolor{olive9}{rgb:Hsb}{90,0.52,0.94} - \definecolor{green1}{rgb:Hsb}{120,0.89,0.17} - \definecolor{green2}{rgb:Hsb}{120,0.89,0.27} - \definecolor{green3}{rgb:Hsb}{120,0.89,0.35} - \definecolor{green4}{rgb:Hsb}{120,0.89,0.44} - \definecolor{green5}{rgb:Hsb}{120,0.89,0.54} - \definecolor{green6}{rgb:Hsb}{120,0.89,0.64} - \definecolor{green7}{rgb:Hsb}{120,0.89,0.75} - \definecolor{green8}{rgb:Hsb}{120,0.89,0.87} - \definecolor{green9}{rgb:Hsb}{120,0.39,0.95} - \definecolor{teal1}{rgb:Hsb}{150,0.89,0.17} - \definecolor{teal2}{rgb:Hsb}{150,0.89,0.26} - \definecolor{teal3}{rgb:Hsb}{150,0.89,0.35} - \definecolor{teal4}{rgb:Hsb}{150,0.89,0.44} - \definecolor{teal5}{rgb:Hsb}{150,0.89,0.53} - \definecolor{teal6}{rgb:Hsb}{150,0.89,0.63} - \definecolor{teal7}{rgb:Hsb}{150,0.89,0.74} - \definecolor{teal8}{rgb:Hsb}{150,0.89,0.86} - \definecolor{teal9}{rgb:Hsb}{150,0.43,0.95} - \definecolor{cyan1}{rgb:Hsb}{180,0.89,0.16} - \definecolor{cyan2}{rgb:Hsb}{180,0.89,0.25} - \definecolor{cyan3}{rgb:Hsb}{180,0.89,0.34} - \definecolor{cyan4}{rgb:Hsb}{180,0.89,0.42} - \definecolor{cyan5}{rgb:Hsb}{180,0.89,0.51} - \definecolor{cyan6}{rgb:Hsb}{180,0.89,0.61} - \definecolor{cyan7}{rgb:Hsb}{180,0.89,0.71} - \definecolor{cyan8}{rgb:Hsb}{180,0.89,0.83} - \definecolor{cyan9}{rgb:Hsb}{180,0.50,0.94} - \definecolor{azure1}{rgb:Hsb}{210,0.89,0.26} - \definecolor{azure2}{rgb:Hsb}{210,0.89,0.41} - \definecolor{azure3}{rgb:Hsb}{210,0.89,0.55} - \definecolor{azure4}{rgb:Hsb}{210,0.89,0.69} - \definecolor{azure5}{rgb:Hsb}{210,0.89,0.83} - \definecolor{azure6}{rgb:Hsb}{210,0.77,0.91} - \definecolor{azure7}{rgb:Hsb}{210,0.58,0.93} - \definecolor{azure8}{rgb:Hsb}{210,0.39,0.95} - \definecolor{azure9}{rgb:Hsb}{210,0.20,0.98} - \definecolor{blue1}{rgb:Hsb}{240,0.89,0.48} - \definecolor{blue2}{rgb:Hsb}{240,0.89,0.73} - \definecolor{blue3}{rgb:Hsb}{240,0.84,0.90} - \definecolor{blue4}{rgb:Hsb}{240,0.70,0.92} - \definecolor{blue5}{rgb:Hsb}{240,0.58,0.93} - \definecolor{blue6}{rgb:Hsb}{240,0.47,0.94} - \definecolor{blue7}{rgb:Hsb}{240,0.36,0.96} - \definecolor{blue8}{rgb:Hsb}{240,0.25,0.97} - \definecolor{blue9}{rgb:Hsb}{240,0.13,0.98} - \definecolor{violet1}{rgb:Hsb}{270,0.89,0.37} - \definecolor{violet2}{rgb:Hsb}{270,0.89,0.57} - \definecolor{violet3}{rgb:Hsb}{270,0.89,0.75} - \definecolor{violet4}{rgb:Hsb}{270,0.85,0.90} - \definecolor{violet5}{rgb:Hsb}{270,0.68,0.92} - \definecolor{violet6}{rgb:Hsb}{270,0.54,0.94} - \definecolor{violet7}{rgb:Hsb}{270,0.41,0.95} - \definecolor{violet8}{rgb:Hsb}{270,0.28,0.97} - \definecolor{violet9}{rgb:Hsb}{270,0.14,0.98} - \definecolor{magenta1}{rgb:Hsb}{300,0.89,0.26} - \definecolor{magenta2}{rgb:Hsb}{300,0.89,0.41} - \definecolor{magenta3}{rgb:Hsb}{300,0.89,0.54} - \definecolor{magenta4}{rgb:Hsb}{300,0.89,0.67} - \definecolor{magenta5}{rgb:Hsb}{300,0.89,0.80} - \definecolor{magenta6}{rgb:Hsb}{300,0.76,0.91} - \definecolor{magenta7}{rgb:Hsb}{300,0.52,0.94} - \definecolor{magenta8}{rgb:Hsb}{300,0.33,0.96} - \definecolor{magenta9}{rgb:Hsb}{300,0.17,0.98} - \definecolor{purple1}{rgb:Hsb}{330,0.89,0.29} - \definecolor{purple2}{rgb:Hsb}{330,0.89,0.45} - \definecolor{purple3}{rgb:Hsb}{330,0.89,0.59} - \definecolor{purple4}{rgb:Hsb}{330,0.89,0.73} - \definecolor{purple5}{rgb:Hsb}{330,0.89,0.88} - \definecolor{purple6}{rgb:Hsb}{330,0.66,0.92} - \definecolor{purple7}{rgb:Hsb}{330,0.47,0.94} - \definecolor{purple8}{rgb:Hsb}{330,0.31,0.96} - \definecolor{purple9}{rgb:Hsb}{330,0.16,0.98} -} +\tl_new:N \l__ninecolors_sat_tl -\@nameuse{ninecolors@define@mono} -\@nameuse{ninecolors@define@color@medium} +\keys_define:nn {ninecolors} + { + saturation .choice:, + saturation .value_required:n = true, + saturation .choices:nn = { low, medium, high } + { \tl_set_eq:NN \l__ninecolors_sat_tl \l_keys_choice_tl }, + saturation .initial:n = medium, + } -\ExplSyntaxOff +\NewDocumentCommand \NineColors {m} + { + \keys_set:nn {ninecolors} {#1} + \exp_args:NV \__ninecolors_define_colors:n \l__ninecolors_sat_tl + } diff --git a/macros/latex/contrib/ninecolors/ninecolors.tex b/macros/latex/contrib/ninecolors/ninecolors.tex index 675cb08beb..65e1aec6f8 100644 --- a/macros/latex/contrib/ninecolors/ninecolors.tex +++ b/macros/latex/contrib/ninecolors/ninecolors.tex @@ -2,72 +2,48 @@ \documentclass{article} \usepackage[a4paper,margin=1.5cm]{geometry} +\newcommand*{\myversion}{2022D} +\newcommand*{\mydate}{Version \myversion\ (\the\year-\mylpad\month-\mylpad\day)} +\newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi} + \usepackage{ninecolors} \usepackage{arev} \usepackage{pgffor} +\usepackage{l3draw} \usepackage{hyperref} \hypersetup{ colorlinks=true, urlcolor=blue3, } -\newcommand*{\myversion}{2021C} -\newcommand*{\mydate}{Version \myversion\ (\the\year-\mylpad\month-\mylpad\day)} -\newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi} - -\begin{document} - -\title{\textcolor{blue3}{Ninecolors: select colors with proper WCAG color contrast}% - \footnote{\url{https://github.com/lvjr/ninecolors}}} -\author{Jianrui Lyu (tolvjr@163.com)} -\date{\mydate} -\maketitle - -\textcolor{red4}{Ninecolors} package carefully selects and defines 9 colors for 13 hues each. -All colors with the same suffix number have equal luminance level. -Also color black is of level 0, and color white is of level 10. - -\bigskip +\setlength{\parindent}{0pt} +%\setlength{\parskip}{4pt plus 1pt minus 1pt} -\newcommand{\NineTestBack}{% +\newcommand\NineTestBack{% \foreach \l in {1,...,9} { \noindent \foreach \n in {gray,red,brown,yellow,olive,green,teal,cyan,azure,blue,violet,magenta,purple} {% \xdef\mycolor{\ifnum \l < 5 white\else black\fi}% - \colorbox{\n\l}{\color{\mycolor}\texttt\strut\n\l}% + \colorbox{\n\l}{\color{\mycolor}\strut\n\l}% } \par }} -\NineTestBack - -\bigskip -\newcommand{\NineTestFore}{% +\newcommand\NineTestFore{% \foreach \l in {1,...,9} { \noindent \foreach \n in {gray,red,brown,yellow,olive,green,teal,cyan,azure,blue,violet,magenta,purple} {% \xdef\mycolor{\ifnum \l < 5 gray9\else black\fi}% - \colorbox{\mycolor}{\color{\n\l}\texttt\strut\n\l}% + \colorbox{\mycolor}{\color{\n\l}\strut\n\l}% } \par }} -\NineTestFore - -\bigskip -\hrule -\bigskip - -By simply choosing two colors in the above list, which differ in level by at least 5, -as foreground and background colors, you will get proper -\href{https://www.w3.org/WAI/WCAG21/Understanding/contrast-minimum.html}{WCAG Color Contrast}. - -\bigskip -\newcommand{\NineTestContrast}{% +\newcommand\NineTestContrast{% \colorbox{blue9}{% \strut\color{green3}The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. } @@ -83,22 +59,107 @@ as foreground and background colors, you will get proper \colorbox{brown3}{% \strut\color{violet9}The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. }} -\NineTestContrast + +\newcommand\NineTestSaturation[1]{{% + \NineColors{saturation=#1} + \noindent\centering + \colorbox{white}{\makebox[4em]{\strut #1}}% + \foreach \n in {red,brown,yellow,olive,green,teal,cyan,azure,blue,violet,magenta,purple} + {% + \colorbox{\n5}{\makebox[3em]{\strut\rule[-2ex]{0pt}{5.5ex}TEST}}% + } + \par +}} + +\newcommand\NineTestAllSaturations{% + \NineTestSaturation{high}% + \NineTestSaturation{medium}% + \NineTestSaturation{low}% +} + +\ExplSyntaxOn + +\cs_generate_variant:Nn \color_fill:n { x } +\cs_generate_variant:Nn \color_stroke:n { x } + +\newcommand\NineTestDraw{ + \foreach \l [evaluate=\l~as~\m~using~int(10-\l)] in {1,...,9} + { + \noindent + \foreach \n in {gray,red,brown,yellow,olive,green,teal, + cyan,azure,blue,violet,magenta,purple} + { + \draw_begin: + \draw_scope_begin: + \color_stroke:x { \n\m } + \color_fill:x { \n\l } + \draw_path_circle:nn { 0, 0 } { 10pt } + \draw_path_use_clear:n { stroke, fill } + \draw_scope_end: + \draw_end: + \qquad + } + \par + \vspace*{0.5ex} + } +} + +\ExplSyntaxOff + +\begin{document} + +\title{\textcolor{blue3}{Ninecolors: Select Colors with Proper WCAG Color Contrast}% + \footnote{\url{https://github.com/lvjr/ninecolors}}} +\author{Jianrui Lyu (tolvjr@163.com) \\ Nan Geng (nangeng@nwafu.edu.cn)} +\date{\mydate} +\maketitle + +\section{LaTeX2 Colors with Medium Saturation} + +\textcolor{red4}{Ninecolors} package carefully selects and defines 9 colors for 13 hues each. +All colors with the same suffix number have equal luminance level. +Also color black is of level 0, and color white is of level 10. + +\bigskip + +\NineTestBack + +\medskip + +\NineTestFore + +\bigskip + +By simply choosing two colors in the above list, which differ in level by at least 5, +as foreground and background colors, you will get proper +\href{https://www.w3.org/WAI/WCAG21/Understanding/contrast-minimum.html}{WCAG Color Contrast}. \bigskip -\hrule + +\NineTestContrast + \bigskip If you need to select more contrasting foreground and background colors, which may have other hues, you could visit \href{https://lvjr.bitbucket.io/contrast.html}{WCAG Color Contrast Tool} -page which is designed by the author. +page which is designed by the first author. -\newpage\vspace*{31mm} -\NineColors{saturation=low} +\newpage + +\section{LaTeX2 Colors with Low Saturation} You can change the saturation of colors by {\color{red3}\verb!\NineColors!} command. By default {\color{red3}\verb!saturation=medium!}. -Colors in this page have been changed by {\color{red3}\verb!\NineColors{saturation=low}!}. + +\bigskip + +\NineTestAllSaturations + +\bigskip + +\NineColors{saturation=low} +Colors in the remaining part of the page have been changed by +{\color{red3}\verb!\NineColors{saturation=low}!}. \bigskip @@ -110,12 +171,10 @@ Also color black is of level 0, and color white is of level 10. \NineTestBack -\bigskip +\medskip \NineTestFore -\bigskip -\hrule \bigskip By simply choosing two colors in the above list, which differ in level by at least 5, @@ -126,20 +185,28 @@ as foreground and background colors, you will get proper \NineTestContrast -\bigskip -\hrule \bigskip If you need to select more contrasting foreground and background colors, which may have other hues, you could visit \href{https://lvjr.bitbucket.io/contrast.html}{WCAG Color Contrast Tool} -page which is designed by the author. +page which is designed by the first author. -\newpage\vspace*{31mm} -\NineColors{saturation=high} +\newpage + +\section{LaTeX2 Colors with High Saturation} You can change the saturation of colors by {\color{red3}\verb!\NineColors!} command. By default {\color{red3}\verb!saturation=medium!}. -Colors in this page have been changed by {\color{red3}\verb!\NineColors{saturation=high}!}. + +\bigskip + +\NineTestAllSaturations + +\bigskip + +\NineColors{saturation=high} +Colors in the remaining part of the page have been changed by +{\color{red3}\verb!\NineColors{saturation=high}!}. \bigskip @@ -151,12 +218,10 @@ Also color black is of level 0, and color white is of level 10. \NineTestBack -\bigskip +\medskip \NineTestFore -\bigskip -\hrule \bigskip By simply choosing two colors in the above list, which differ in level by at least 5, @@ -167,12 +232,33 @@ as foreground and background colors, you will get proper \NineTestContrast -\bigskip -\hrule \bigskip If you need to select more contrasting foreground and background colors, which may have other hues, you could visit \href{https://lvjr.bitbucket.io/contrast.html}{WCAG Color Contrast Tool} -page which is designed by the author. +page which is designed by the first author. + +\newpage + +\section{LaTeX3 Colors for Fun} + +\NineColors{saturation=medium} + +If you are using a LaTeX3 release not older than 2021-07-12, +\textcolor{red4}{Ninecolors} package will define LaTeX3 colors of the same names for you. + +\bigskip + +For example, you can change the color of drawing operations by +{\color{red3}\verb!\color_fill:n {⟨color expression⟩}!} command +for fills, +{\color{red3}\verb!\color_stroke:n {⟨color expression⟩}!} command +for strokes. +%between {\color{red3}\verb!\ExplSyntaxOn!} and +%{\color{red3}\verb!\ExplSyntaxOff!}. + +\bigskip + +\NineTestDraw \end{document} diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md index 7587c42b97..41c7e9d010 100644 --- a/macros/latex/required/babel/base/README.md +++ b/macros/latex/required/babel/base/README.md @@ -1,4 +1,6 @@ -## Babel 3.70 +## Babel 3.71 + +2022-02-13 This package manages culturally-determined typographical (and other) rules, and hyphenation patterns for a wide range of languages. Many @@ -8,9 +10,9 @@ is a set of ini files for about 250 languages. The latest stable version is available on . -Changes in version 3.70 are described in: +Changes in version 3.71 are described in: -https://latex3.github.io/babel/news/whats-new-in-babel-3.70.html +https://latex3.github.io/babel/news/whats-new-in-babel-3.71.html Apart from the manual, you can find information on some aspects of babel at: @@ -46,11 +48,13 @@ respective authors. ### Summary of Latest changes ``` -3.70 2022-01-26 - * Finnish: transform 'prehyphen.nobreak'. - * Better fixes for amsmath, as well as for the default - 'equation' and 'eqnarray' (but still not perfect). - * Fix an error with bidi=basic and some fonts for graphics. +3.71 2022-02-13 + * IAST transliteration for Sanskrit (by Maximilian Mehner). + * Fixes: + - Bad interraction between bidi option and mathtools (#166). + - 'provide+=' didn’t work with 'hebrew' as a secondary + language. + - Wrong equation direction in 'cases' and 'array' (#167). ``` ### Previous changes diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx index a9b4ad69f9..d5706cdaf1 100644 --- a/macros/latex/required/babel/base/babel.dtx +++ b/macros/latex/required/babel/base/babel.dtx @@ -32,7 +32,7 @@ % % \iffalse %<*filedriver> -\ProvidesFile{babel.dtx}[2022/01/26 v3.70 The Babel package] +\ProvidesFile{babel.dtx}[2022/02/13 v3.71 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -547,6 +547,7 @@ _\usepackage[vietnamese,danish]{babel}_ \end{note} \subsection{Mostly monolingual documents} +\label{mostlymono} \New{3.39} Very often, multilingual documents consist of a main language with small pieces of text in another languages (words, idioms, @@ -1291,6 +1292,11 @@ can take the following values: \New{3.16} Selects which layout elements are adapted in bidi documents. See sec.~\ref{bidi}. +\Describe{provide=}{\texttt{*}} +\New{3.49} An alternative to |\babelprovide| for languages passed as +options. See section~\ref{inifiles}, which describes also the variants +|provide+=| and |provide*=|. + \subsection{The \texttt{base} option} With this package option \babel{} just loads some basic macros (those @@ -1327,12 +1333,12 @@ be the same as the option name as set in |\usepackage|!). \end{verbatim} \end{example} -% \begin{note} -% With a recent version of \LaTeX, an alternative method to execute -% some code just after an |ldf| file is loaded is with |\AddToHook| and -% the hook |file/after/.ldf|. \Babel{} does not predeclare -% it, and you have to do it yourself with |\NewHook| or |\ProvideHook|. -% \end{note} +\begin{note} + With a recent version of \LaTeX, an alternative method to execute + some code just after an |ldf| file is loaded is with |\AddToHook| and + the hook |file/.ldf/after|. \Babel{} does not predeclare + it, and you have to do it yourself with |\ActivateGenericHook|. +\end{note} \begin{warning} Currently this option is not compatible with languages loaded on the @@ -1344,8 +1350,8 @@ be the same as the option name as set in |\usepackage|!). An alternative approach to define a language (or, more precisely, a \textit{locale}) is by means of an \texttt{ini} file. Currently -\babel{} provides about 200 of these files containing the basic data -required for a locale. +\babel{} provides about 250 of these files containing the basic data +required for a locale, plus basic templates for 500 about locales. |ini| files are not meant only for \babel, and they has been devised as a resource for other packages. To easy interoperability between \TeX{} @@ -1435,11 +1441,12 @@ Or also: \begin{description} \itemsep=-\parskip \item[Arabic] Monolingual documents mostly work in \luatex, but it must - be fine tuned, particularly graphical elements like |picture|. In \xetex{} - \babel{} resorts to the \textsf{bidi} package, which seems to work. + be fine tuned, particularly math and graphical elements like + |picture|. In \xetex{} \babel{} resorts to the \textsf{bidi} package, + which seems to work. \item[Hebrew] Niqqud marks seem to work in both engines, but depending on the font cantillation marks might be misplaced (\xetex{} or - \luatex{} with Harfbuzz seems better, but still problematic). + \luatex{} with Harfbuzz seems better). \item[Devanagari] In \luatex{} and the the default renderer many fonts work, but some others do not, the main issue being the ‘ra’. You may need to set explicitly the script to either |deva| or |dev2|, eg: @@ -1451,8 +1458,8 @@ need to set explicitly the script to either |deva| or |dev2|, eg: also work with \xetex{}, although unlike with \luatex{} fine tuning the font behavior is not always possible. \item[Southeast scripts] Thai works in both \luatex{} and \xetex{}, but - line breaking differs (rules can be modified in \luatex; they are - hard-coded in \xetex). Lao seems to work, too, but there are no + line breaking differs (rules are hard-coded in \xetex, but they can + be modified in \luatex). Lao seems to work, too, but there are no patterns for the latter in \luatex{}. Khemer clusters are rendered wrongly with the default renderer. The comment about Indic scripts and \textsf{lualatex} also applies here. Some quick patterns can @@ -1479,7 +1486,7 @@ need to set explicitly the script to either |deva| or |dev2|, eg: \item[Latin, Greek, Cyrillic] Combining chars with the default \luatex{} font renderer might be wrong; on then other hand, with the Harfbuzz renderer diacritics are stacked correctly, but many - hyphenations points are discarded (this bug seems related to kerning, + hyphenations points are discarded (this bug is related to kerning, so it depends on the font). With \xetex{} both combining characters and hyphenation work as expected (not quite, but in most cases it works; the problem here are font clusters). @@ -2129,6 +2136,7 @@ zulu \textbf{Modifying and adding values to |ini| files} +\nobreak \New{3.39} There is a way to modify the values of |ini| files when they get loaded with |\babelprovide| and |import|. To set, say, |digits.native| in the |numbers| section, use something like @@ -2573,6 +2581,9 @@ Remerber there is an alternative syntax for the latter: \begin{verbatim} \usepackage[italian, polytonicgreek, provide=*]{babel} \end{verbatim} +Finally, also remember you might not need to load |italian| at all if +there are only a few word in this language (see~\ref{mostlymono}). + \end{example} \Describe{script=}{\meta{script-name}} @@ -2630,7 +2641,10 @@ CJK. \Describe{intrapenalty=}{\meta{penalty}} Sets the interword penalty for the writing system of this language. Currently used only in Southeast Asian scrips, like Thai. Ignored if 0 -(which is the default value). +(which is the default value). + +\Describe{transforms=}{\meta{transform-list}} +See section~\ref{transforms}. \Describe{justification=}{\texttt{kashida} $\string|$ \texttt{elongated} $\string|$ \texttt{unhyphenated}} @@ -2676,10 +2690,10 @@ well dates do not rely on |\arabic|.) For example: \begin{verbatim} -\babelprovide[import]{telugu} % Telugu better with XeTeX +\babelprovide[import]{telugu} % Or also, if you want: % \babelprovide[import, maparabic]{telugu} -\babelfont{rm}{Gautami} +\babelfont{rm}{Gautami} % With luatex, better with Harfbuzz \begin{document} _\telugudigits{1234}_ _\telugucounter{section}_ @@ -2827,7 +2841,7 @@ with the following command. {\marg{year}\m{month}\m{day}}} By default the calendar is the Gregorian, but an |ini| file may define -strings for other calendars (currently |ar|, |ar-|*, |he|, |fa|, |hi|.) +strings for other calendars (currently |ar|, |ar-|*, |he|, |fa|, |hi|). In the latter case, the three arguments are the year, the month, and the day in those in the corresponding calendar. They are \textit{not} the Gregorian data to be converted (which means, say, 13 is a valid @@ -2853,7 +2867,7 @@ current language. If more than one language is used, it might be necessary to know which language is active at a specific time. This can be checked by a call -to |\iflanguage|, but note here ``language'' is used in the \TeX +to |\iflanguage|, but note here ``language'' is used in the \TeX{} sense, as a set of hyphenation patterns, and \textit{not} as its \textsf{babel} name. This macro takes three arguments. The first argument is the name of a language; the second and third arguments are @@ -2940,7 +2954,9 @@ identifier, which can be retrieved with |\localeid|. typically the LGC group, South East Asian, like Thai, and CJK, but support depends on the engine: \textsf{pdftex} only deals with the former, \xetex{} also with the second one (although in a limited way), -while \luatex{} provides basic rules for the latter, too. +while \luatex{} provides basic rules for the latter, too. With \luatex{} +there are also tools for non-standard hyphenation rules, explained in +the next section. \Describe{\babelhyphen}{% \colorbox{thegrey}{\ttfamily\hskip-.2em*\hskip-.2em}\marg{type}} @@ -3087,6 +3103,7 @@ of the previous char in \luatex, and the font size set by the last |\selectfont| in \xetex). \subsection{Transforms} +\label{transforms} Transforms (only \luatex) provide a way to process the text on the typesetting level in several language-dependent ways, like non-standard @@ -3193,6 +3210,9 @@ Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Tamil, Telugu.} \trans{Latin}{letters.uv}{Replaces \textit{v}, \textit{U} with \textit{u}, \textit{V}.} +\trans{Sanskrit}{transliteration.iast}{The IAST system to +romanize Devanagari.\footnote{Thanks to Maximilian Mehner}} + \trans{Serbian}{transliteration.gajica}{(Note |serbian| with |ini| files refers to the Cyrillic script, which is here the target.) The standard system devised by Ljudevit Gaj.} @@ -3280,7 +3300,7 @@ This feature is activated with the first |\babelposthyphenation| or \babelprovide[hyphenrules=+]{russian-latin} % Create locale \babelprehyphenation{russian-latin}{([sz])h} % Create rule { - string = {1|sz|šž}, + string = _{1|sz|šž}_, remove } \end{verbatim} @@ -3449,15 +3469,16 @@ differ in the way `weak' numeric characters are ordered (eg, Arabic \begin{warning} The current code for \textbf{text} in \luatex{} should be considered - essentially stable, but, of course, it is not bug-free and there - can be improvements in the future, because setting bidi text has - many subtleties (see for example ). - A basic stable version for other engines must wait. This applies to + essentially stable, but, of course, it is not bug-free and there can + be improvements in the future, because setting bidi text has many + subtleties (see for example ). A + basic stable version for other engines must wait. This applies to text; there is a basic support for \textbf{graphical} elements, including the |picture| environment (with \textsf{pict2e}) and \textsf{pfg/tikz}. Also, indexes and the like are under study, as - well as math (there is progress in the latter, too, but for - example |cases| may fail). + well as math (there are progresses in the latter, including + \textsf{amsmath} and \textsf{mathtools} too, but for example + |gathered| may fail). An effort is being made to avoid incompatibilities in the future (this one of the reason currently bidi must be explicitly requested @@ -4156,7 +4177,7 @@ for a small example (|xe-bidi|). See the code section for |\foreignlanguage*| (a new starred version of |\foreignlanguage|). -For old an deprecated functions, see the wiki. +For old an deprecated functions, see the \babel{} site. \medskip \textbf{Options for locales loaded on the fly} @@ -4173,7 +4194,8 @@ extended numerals in Greek). \New{3.48} There is some work in progress for \babel{} to deal with labels, both with the relation to captions (chapters, part), and how counters are used to define them. It is still somewhat tentative -because it is far from trivial -- see the wiki for further details. +because it is far from trivial -- see the \babel{} site for further +details. \section{Loading languages with \file{language.dat}} @@ -4925,50 +4947,6 @@ is true with these two environment selectors. Its natural place of use is in hooks or in |\extras|\m{language}. -\section{Changes} - -\subsection{Changes in \babel\ version 3.9} - -Most of the changes in version 3.9 were related to bugs, either to fix -them (there were lots), or to provide some alternatives. Even new -features like |\babelhyphen| are intended to solve a certain problem -(in this case, the lacking of a uniform syntax and behavior for -shorthands across languages). These changes, as well as the subsequent -ones ($\ge$3.10), are described in this manual in the corresponding -place. A selective list of the changes in 3.9 follows: -\begin{itemize} -\item |\select@language| did not set |\languagename|. This meant the - language in force when auxiliary files were loaded was the one used - in, for example, shorthands -- if the language was |german|, a - |\select@language{spanish}| had no effect. - -\item |\foreignlanguage| and |otherlanguage*| messed up - |\extras|. Scripts, encodings and many other things were - not switched correctly. - -\item The |:ENC| mechanism for hyphenation patterns used the encoding - of the \textit{previous} language, not that of the language being - selected. - -\item |'| (with |activeacute|) had the original value when writing to an - auxiliary file, and things like an infinite loop can happen. It - worked incorrectly with |^| (if activated) and also if deactivated. - -\item Active chars where not reset at the end of language options, and - that lead to incompatibilities between languages. - -\item |\textormath| raised an error with a conditional. - -\item |\aliasshorthand| didn't work (or only in a few and very specific - cases). - -\item |\l@english| was defined incorrectly (using |\let| instead of - |\chardef|). - -\item |ldf| files not bundled with babel were not recognized when - called as global options. -\end{itemize} - \DocInput{babel.dtx} \section{Acknowledgements} @@ -5122,8 +5100,8 @@ help from Bernd Raichle, for which I am grateful. % \section{Tools} % % \begin{macrocode} -%<> -%<> +%<> +%<> % \end{macrocode} % % \textbf{Do not use the following macros in \texttt{ldf} files. They @@ -12172,39 +12150,38 @@ help from Bernd Raichle, for which I am grateful. % the language exists. With class options, check if the option is a % language by checking if the correspondin file exists. % -% % \begin{macrocode} \bbl@foreach\bbl@language@opts{% \def\bbl@tempa{#1}% \ifx\bbl@tempa\bbl@opt@main\else - \bbl@ifunset{ds@#1}% - {\ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) - \DeclareOption{#1}{\bbl@load@language{#1}}% - \else % + * (other = ini) - \DeclareOption{#1}{% - \bbl@ldfinit - \babelprovide[import]{#1}% - \bbl@afterldf{}}% - \fi}% - {}% + \ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) + \bbl@ifunset{ds@#1}% + {\DeclareOption{#1}{\bbl@load@language{#1}}}% + {}% + \else % + * (other = ini) + \DeclareOption{#1}{% + \bbl@ldfinit + \babelprovide[import]{#1}% + \bbl@afterldf{}}% + \fi \fi} \bbl@foreach\@classoptionslist{% \def\bbl@tempa{#1}% \ifx\bbl@tempa\bbl@opt@main\else - \bbl@ifunset{ds@#1}% - {\ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) - \IfFileExists{#1.ldf}% - {\DeclareOption{#1}{\bbl@load@language{#1}}}% - {}% - \else % + * (other = ini) - \IfFileExists{babel-#1.tex}% - {\DeclareOption{#1}{% - \bbl@ldfinit - \babelprovide[import]{#1}% - \bbl@afterldf{}}}% - {}% - \fi}% - {}% + \ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) + \bbl@ifunset{ds@#1}% + {\IfFileExists{#1.ldf}% + {\DeclareOption{#1}{\bbl@load@language{#1}}}% + {}}% + {}% + \else % + * (other = ini) + \IfFileExists{babel-#1.tex}% + {\DeclareOption{#1}{% + \bbl@ldfinit + \babelprovide[import]{#1}% + \bbl@afterldf{}}}% + {}% + \fi \fi} % \end{macrocode} % @@ -13484,6 +13461,30 @@ help from Bernd Raichle, for which I am grateful. end lang.patterns(lg, pats) end + function Babel.hlist_has_bidi(head) + local has_bidi = false + for item in node.traverse(head) do + if item.id == node.id'glyph' then + local itemchar = item.char + local chardata = Babel.characters[itemchar] + local dir = chardata and chardata.d or nil + if not dir then + for nn, et in ipairs(Babel.ranges) do + if itemchar < et[1] then + break + elseif itemchar <= et[2] then + dir = et[3] + break + end + end + end + if dir and (dir == 'al' or dir == 'r') then + has_bidi = true + end + end + end + return has_bidi + end } \endgroup \ifx\newattribute\@undefined\else @@ -14462,9 +14463,11 @@ end #2 TRT\relax \fi \fi} +\def\bbl@thedir{0} \def\bbl@textdir#1{% \bbl@setluadir{text}\textdir{#1}% \chardef\bbl@thetextdir#1\relax + \edef\bbl@thedir{\the\numexpr\bbl@thepardir*3+#1}% \setattribute\bbl@attr@dir{\numexpr\bbl@thepardir*3+#1}} \def\bbl@pardir#1{% \bbl@setluadir{par}\pardir{#1}% @@ -14474,6 +14477,7 @@ end \def\bbl@dirparastext{\pardir\the\textdir\relax}% %%%% % \ifnum\bbl@bidimode>\z@ + \def\bbl@insidemath{0}% \def\bbl@mathboxdir{% \ifcase\bbl@thetextdir\relax \everyhbox{\bbl@mathboxdir@aux L}% @@ -14482,15 +14486,35 @@ end \fi} \def\bbl@mathboxdir@aux#1{% \@ifnextchar\egroup{}{\textdir T#1T\relax}} + \def\bbl@everymath{\def\bbl@insidemath{1}} + \def\bbl@everydisplay{% + \bbl@mathboxdir + \def\bbl@everymath{\bbl@mathboxdir}% + \def\bbl@insidemath{2}} \frozen@everymath\expandafter{% - \expandafter\bbl@mathboxdir\the\frozen@everymath} + \expandafter\bbl@everymath\the\frozen@everymath} \frozen@everydisplay\expandafter{% - \expandafter\bbl@mathboxdir\the\frozen@everydisplay} + \expandafter\bbl@everydisplay\the\frozen@everydisplay} + \AtBeginDocument{ + \directlua{ + function Babel.math_box_dir(head) + if not (token.get_macro('bbl@insidemath') == '0') then + if Babel.hlist_has_bidi(head) then + local d = node.new(node.id'dir') + d.dir = '+TRT' + node.insert_before(head, node.has_glyph(head), d) + for item in node.traverse(head) do + node.set_attribute(item, + Babel.attr_dir, token.get_macro('bbl@thedir')) + end + end + end + return head + end + luatexbase.add_to_callback("hpack_filter", Babel.math_box_dir, + "Babel.math_box_dir", 0) + }}% \fi -\def\bbl@truellap{%s - \ifcase\bbl@attr@dir\expandafter\llap\else\expandafter\rlap\fi} -\def\bbl@truerlap{% - \ifcase\bbl@attr@dir\expandafter\rlap\else\expandafter\llap\fi} % \end{macrocode} % % \subsection{Layout} @@ -14518,8 +14542,12 @@ end % % \begin{macrocode} \bbl@trace{Redefinitions for bidi layout} +\def\BabelNoAMSMath{\let\bbl@noamsmath\relax} \ifnum\bbl@bidimode>\z@ \let\bbl@eqnodir\relax +% \ifx\matheqdirmode\@undefined\else +% \matheqdirmode\@ne +% \fi \AtBeginDocument{% \ifx\maketag@@@\@undefined % Normal equation, eqnarray \AddToHook{env/eqnarray/begin}{% @@ -14538,71 +14566,81 @@ end \bbl@xin@{,leqno,}{,\@classoptionslist,}% \ifin@ \def\@eqnnum{% - \setbox\z@\hbox{\normalfont\normalcolor(\theequation)}% - \hbox to0.01pt{\hss\hbox to\displaywidth{\box\z@\hss}}}% + \setbox\z@\hbox{\normalfont\normalcolor(\theequation)}% + \hbox to0.01pt{\hss\hbox to\displaywidth{\box\z@\hss}}}% \fi \else % amstex - \bbl@sreplace\intertext@{\normalbaselines}% - {\normalbaselines - \ifx\bbl@eqnodir\relax\else\bbl@pardir\@ne\bbl@textdir\@ne\fi} - \def\bbl@ams@tagbox#1#2{#1{\bbl@eqnodir#2}}% #1=\hbox|ams@lap - \def\bbl@ams@eqtagbox#1{% - \setbox\z@\hbox{\bbl@eqnodir#1}% - \hbox to\wd\z@{% - \ifx\bbl@ams@lap\hbox - \hss\hbox to\displaywidth{\box\z@\hss}% - \else - \hbox to\displaywidth{\hss\box\z@}\hss - \fi}} - \def\bbl@ams@preset#1{% - \ifnum\bbl@thetextdir>\z@ - \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% - \chardef\bbl@thetextdir\z@ - \bbl@sreplace\textdef@{\hbox}{\bbl@ams@tagbox\hbox}% - \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@tagbox#1}% - \fi} - \@ifpackagewith{amsmath}{leqno}% - {\let\bbl@ams@lap\hbox}% = leqno - {\let\bbl@ams@lap\llap}% = default - % Not required?: split, alignat - \AddToHook{env/cases/begin}{\bbl@ams@preset\bbl@ams@lap}% - \AddToHook{env/multline/begin}{\bbl@ams@preset\hbox}% - \AddToHook{env/gather/begin}{\bbl@ams@preset\bbl@ams@lap}% - \AddToHook{env/gather*/begin}{\bbl@ams@preset\bbl@ams@lap}% - \AddToHook{env/align/begin}{\bbl@ams@preset\bbl@ams@lap}% - \AddToHook{env/align*/begin}{\bbl@ams@preset\bbl@ams@lap}% - % Hackish, for proper alignment-don’t ask me why it works! :-) - \bbl@exp{% - \\\AddToHook{env/align*/end}{\\\\\tag*{}\}}% - \AddToHook{env/flalign/begin}{\bbl@ams@preset\hbox}% - \AddToHook{env/split/before}{% - \def\bbl@tempa{equation}% - \ifx\@currenvir\bbl@tempa - \def\bbl@ams@eqtagbox#1{% - \setbox\z@\hbox{\bbl@eqnodir#1}% - \hbox to\wd\z@{\box\z@}}% - \fi} - \AddToHook{env/equation/begin}{% - \bbl@add\ignorespacesafterend{\hrule\@height\z@}% - \ifnum\bbl@thetextdir>\z@ - \ifx\bbl@ams@lap\llap\hrule\@height\z@\fi - \def\bbl@eqnodir{\bbl@textdir\@ne}% - \bbl@textdir\z@ - \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% - \fi}% - \AddToHook{env/equation*/begin}{% - \bbl@add\ignorespacesafterend{\hrule\@height\z@}% - \ifnum\bbl@thetextdir>\z@ - \def\bbl@eqnodir{\bbl@textdir\@ne}% - \bbl@textdir\z@ - \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% - \fi}% + \ifx\bbl@noamsmath\@undefined + \edef\bbl@tempa{% + \catcode58=\the\catcode58\relax + \catcode95=\the\catcode95\relax}% + \catcode58=11 + \catcode95=11 + \bbl@sreplace\intertext@{\normalbaselines}% + {\normalbaselines + \ifx\bbl@eqnodir\relax\else\bbl@pardir\@ne\bbl@eqnodir\fi}% + \bbl@tempa + \def\bbl@ams@tagbox#1#2{#1{\bbl@eqnodir#2}}% #1=\hbox|ams@lap + \def\bbl@ams@eqtagbox#1{% + \setbox\z@\hbox{\bbl@eqnodir#1}% + \hbox to 0.01pt{% + \ifx\bbl@ams@lap\hbox + \hbox to\displaywidth{\hss\box\z@}\hss + \else + \hss\hbox to\displaywidth{\box\z@\hss}% + \fi}} + \def\bbl@ams@preset#1{% + \ifnum\bbl@thetextdir>\z@ + \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% + \chardef\bbl@thetextdir\z@ + \bbl@sreplace\textdef@{\hbox}{\bbl@ams@tagbox\hbox}% + \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@tagbox#1}% + \fi} + \@ifpackagewith{amsmath}{leqno}% + {\let\bbl@ams@lap\hbox}% = leqno + {\let\bbl@ams@lap\llap}% = default + % + \AddToHook{env/cases/begin}{\bbl@ams@preset\bbl@ams@lap}% + \AddToHook{env/multline/begin}{\bbl@ams@preset\hbox}% + \AddToHook{env/gather/begin}{\bbl@ams@preset\bbl@ams@lap}% + \AddToHook{env/gather*/begin}{\bbl@ams@preset\bbl@ams@lap}% + \AddToHook{env/align/begin}{\bbl@ams@preset\bbl@ams@lap}% + \AddToHook{env/align*/begin}{\bbl@ams@preset\bbl@ams@lap}% + % Hackish, for proper alignment-don’t ask me why it works! :-) + \bbl@exp{% + \\\AddToHook{env/align*/end}{\\\\\tag*{}\}}% + \AddToHook{env/flalign/begin}{\bbl@ams@preset\hbox}% + \AddToHook{env/split/before}{% + \ifnum\bbl@thetextdir>\z@ + \def\bbl@tempa{equation}% + \ifx\@currenvir\bbl@tempa + \def\bbl@ams@eqtagbox#1{% + \ifx\bbl@ams@lap\hbox + \hbox to0.01pt{\hss\bbl@eqnodir#1}% leqno + \else + \hbox to0.01pt{\bbl@eqnodir#1\hss}% eqno + \fi} + \fi + \fi} + \AddToHook{env/equation/begin}{% + \ifnum\bbl@thetextdir>\z@ + \ifx\bbl@ams@lap\llap\hrule\@height\z@\fi + \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% + \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% + \fi}% + \AddToHook{env/equation*/begin}{% + \ifnum\bbl@thetextdir>\z@ + \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% + \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% + \fi}% + \fi \fi} \fi \ifx\bbl@opt@layout\@nnil\endinput\fi % if no layout \ifnum\bbl@bidimode>\z@ \def\bbl@nextfake#1{% non-local changes, use always inside a group! \bbl@exp{% + \def\\\bbl@insidemath{0}% \mathdir\the\bodydir #1% Once entered in math, set boxes to restore values \% @@ -14665,28 +14703,11 @@ end \directlua{ Babel.get_picture_dir = true Babel.picture_has_bidi = 0 + % function Babel.picture_dir (head) if not Babel.get_picture_dir then return head end - for item in node.traverse(head) do - if item.id == node.id'glyph' then - local itemchar = item.char - % TODO. Copypaste pattern from Babel.bidi (-r) - local chardata = Babel.characters[itemchar] - local dir = chardata and chardata.d or nil - if not dir then - for nn, et in ipairs(Babel.ranges) do - if itemchar < et[1] then - break - elseif itemchar <= et[2] then - dir = et[3] - break - end - end - end - if dir and (dir == 'al' or dir == 'r') then - Babel.picture_has_bidi = 1 - end - end + if Babel.hlist_has_bidi(head) then + Babel.picture_has_bidi = 1 end return head end diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins index cc5a9a0189..5bbdbce0f5 100644 --- a/macros/latex/required/babel/base/babel.ins +++ b/macros/latex/required/babel/base/babel.ins @@ -26,7 +26,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% -\def\filedate{2022/01/26} +\def\filedate{2022/02/13} \def\batchfile{babel.ins} \input docstrip.tex diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf index 58449b95d4..f909b4d5c7 100644 Binary files a/macros/latex/required/babel/base/babel.pdf and b/macros/latex/required/babel/base/babel.pdf differ diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx index c96b67d1bc..2da4345004 100644 --- a/macros/latex/required/babel/base/bbcompat.dtx +++ b/macros/latex/required/babel/base/bbcompat.dtx @@ -30,7 +30,7 @@ % % \iffalse %<*dtx> -\ProvidesFile{bbcompat.dtx}[2022/01/26 v3.70] +\ProvidesFile{bbcompat.dtx}[2022/02/13 v3.71] % % %% File 'bbcompat.dtx' diff --git a/macros/luatex/latex/pyluatex/pyluatex.lua b/macros/luatex/latex/pyluatex/pyluatex.lua index f95ab989c0..f9d8ff68a6 100644 --- a/macros/luatex/latex/pyluatex/pyluatex.lua +++ b/macros/luatex/latex/pyluatex/pyluatex.lua @@ -33,7 +33,6 @@ pyluatex = pyluatex or { -- status.filename: path to pyluatex.sty local folder = file.pathpart(file.collapsepath(status.filename, true)) -local script = file.join(folder, "pyluatex-interpreter.py") local tcp = nil local env_end = nil @@ -53,6 +52,7 @@ local function err_cmd(message) end function pyluatex.start(executable) + local script = file.join(folder, "pyluatex-interpreter.py") local is_windows = package.config:sub(1,1) ~= "/" local cmd if is_windows then @@ -61,15 +61,25 @@ function pyluatex.start(executable) cmd = executable .. " \"" .. script .. "\" &" end local f = io.popen(cmd, "r") - local port = f:read("*l"):gsub("\r", ""):gsub("\n", "") + local port = f:read("*l") f:close() - if port then - tcp = socket.tcp() - tcp:connect("127.0.0.1", port) - else - tex.sprint(err_cmd("Python backend (executable: " .. executable .. - ") could not be started")) + function err(message) + tex.sprint(err_cmd("Python backend could not be started (" .. message .. ")")) + end + + if port == nil then + err("executable: " .. executable) + return + end + port = trim(port) + if port:match("^%d+$") == nil then + err("invalid TCP port: " .. port) + return + end + tcp = socket.tcp() + if tcp:connect("127.0.0.1", port) == nil then + err("TCP connection failed") end end diff --git a/macros/luatex/latex/pyluatex/pyluatex.pdf b/macros/luatex/latex/pyluatex/pyluatex.pdf index 23699dd22b..173c053483 100644 Binary files a/macros/luatex/latex/pyluatex/pyluatex.pdf and b/macros/luatex/latex/pyluatex/pyluatex.pdf differ diff --git a/macros/luatex/latex/pyluatex/pyluatex.sty b/macros/luatex/latex/pyluatex/pyluatex.sty index cf67916d19..6c247993a9 100644 --- a/macros/luatex/latex/pyluatex/pyluatex.sty +++ b/macros/luatex/latex/pyluatex/pyluatex.sty @@ -9,7 +9,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pyluatex}[2022/02/04 v0.4.1 Execute Python code on the fly] +\ProvidesPackage{pyluatex}[2022/02/13 v0.4.2 Execute Python code on the fly] \RequirePackage{expl3} \ExplSyntaxOn diff --git a/macros/luatex/latex/pyluatex/pyluatex.tex b/macros/luatex/latex/pyluatex/pyluatex.tex index 594d1c0e90..7446313863 100644 --- a/macros/luatex/latex/pyluatex/pyluatex.tex +++ b/macros/luatex/latex/pyluatex/pyluatex.tex @@ -15,7 +15,7 @@ \usepackage{url} \title{The \emph{pyluatex} package} \author{Tobias Enderle\\\url{https://github.com/tndrle/PyLuaTeX}} -\date{v0.4.1 (2022/02/04)} +\date{v0.4.2 (2022/02/13)} \begin{document} \maketitle \raggedright @@ -143,7 +143,7 @@ For an example, see the Typesetting Code section. Specifies when the Python process is shut down. (default: \inlcode|veryveryend|)\\[0.5ex] \textit{Options:} \inlcode|veryveryend|, \inlcode|veryenddocument|, \inlcode|off|\\[0.5ex] PyLuaTeX uses the hooks of the package \textit{atveryend} to shut down the Python interpreter when the compilation is done. With the option \inlcode|veryveryend|, Python is shut down in the \inlcode|\AtVeryVeryEnd| hook. With the option \inlcode|veryenddocument|, Python is shut down in the \inlcode|\AtVeryEndDocument| hook. With the option \inlcode|off|, Python is not shut down explicitly. However, the Python process will shut down when the LuaTeX process finishes even if \inlcode|off| is selected. Using \inlcode|off| on Windows might lead to problems with SyncTeX, though.\\[0.5ex] - \textit{Example:} \inlcode|\usepackage[veryenddocument]{pyluatex}| + \textit{Example:} \inlcode|\usepackage[shutdown=veryenddocument]{pyluatex}| \end{itemize} Package options (except for \inlcode|executable| and \inlcode|shutdown|) can be changed in the document with the \inlcode|\pyoption| command, e.g. \inlcode|\pyoption{verbose}{true}| or \inlcode|\pyoption{ignoreerrors}{false}|. diff --git a/macros/xetex/latex/bidi-atbegshi/README b/macros/xetex/latex/bidi-atbegshi/README index cda7c69bf7..c9d6ed754e 100644 --- a/macros/xetex/latex/bidi-atbegshi/README +++ b/macros/xetex/latex/bidi-atbegshi/README @@ -1,27 +1,24 @@ _____________________ The bidi-atbegshi package -v0.1 +v0.2 Bidi-aware shipout macros -The package adds few commands to `atbegshi' package +The package adds few commands to `atbegshi-ltx' package for proper placement of in the left and right corners of the output page, in both LTR and RTL modes. -The package only works with `xelatex' format and should be -loaded before `bidi' package. - For more information, please see the documentation. -Current version release date: 2014/09/11 +Current version release date: 2022/02/14 ___________________ Vafa Khalighi -tex.ctan@gmail.com +tex-persian@vafa.ac -Copyright © 2014 +Copyright © 2014--2022 It may be distributed and/or modified under the LaTeX Project Public License, version 1.3c or higher (your choice). The latest version of this license is at: http://www.latex-project.org/lppl.txt diff --git a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf index 5e68bec300..fbb353f73c 100644 Binary files a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf and b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.pdf differ diff --git a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex index 9d9276048c..43635b19ea 100644 --- a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex +++ b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi-doc.tex @@ -2,9 +2,9 @@ \usepackage{holtxdoc} \begin{document} \title{The \xpackage{bidi-atbegshi} Package} -\author{Vafa Khalighi\\\xemail{tex.ctan@gmail.com}} +\author{Vafa Khalighi\\\xemail{tex-persian@vafa.ac}} \maketitle -The \xpackage{bidi-atbegshi} adds bidi support to package \xpackage{atbegshi}; it modifies the \cs{AtBeginShipoutUpperLeft}, and \cs{AtBeginShipoutUpperLeftForeground} so that they properly both in LTR and RTL modes. In addition, it also defines the following commands: +The \xpackage{bidi-atbegshi} adds bidi support to package \xpackage{atbegshi-ltx}; it defines the following commands: \begin{declcs}{AtBeginShipoutUpperRight} \M{background material} \end{declcs} @@ -52,8 +52,4 @@ Similar to the \cs{AtBeginShipoutUpperRight} command but \end{declcs} See \cs{AtBeginShipoutLowerRight}. The difference is that the material is put in the foreground. - - \begin{declcs}{LengthToUnit} \M{length with units} - \end{declcs} - For instance, \cs{LengthToUnit}\texttt{\{12pt\}} converts 12pt to 12 (stripping the unit). \end{document} \ No newline at end of file diff --git a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty index 77b4fdd6d6..21f389d0e2 100644 --- a/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty +++ b/macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty @@ -2,7 +2,7 @@ %% This is file `bidi-atbegshi.sty'. %% %% ___________________________________________ -%% Copyright © 2014 Vafa Khalighi +%% Copyright © 2014--2022 Vafa Khalighi %% %% It may be distributed and/or modified under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of @@ -13,122 +13,82 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bidi-atbegshi}[2014/09/11 v0.1 bidi-aware shipout macros] -\RequirePackage{atbegshi} -\newcommand*\LengthToUnit[1]{#1\@gobble} -\newcommand*{\AtBegShi@bidi@horigin@left}{% - \if@RTL% - \dimexpr-\textwidth-\AtBegShi@horigin\relax - \else% - -\AtBegShi@horigin% - \fi% +\ProvidesPackage{bidi-atbegshi}[2022/02/14 v0.2 bidi-aware shipout macros] +\RequirePackage{atbegshi-ltx} +\ExplSyntaxOn +\cs_new:Npn \__shipout_picture_overlay_lower_left:n #1 { + \__shipout_init_page_origins: + \kern -\c__shipout_horigin_tl \scan_stop: + \vbox_to_zero:n { + \kern \__dim_eval:w \paperheight - \c__shipout_vorigin_tl \scan_stop: + \unitlength 1pt \scan_stop: + \hbox_set_to_wd:Nnn \l__shipout_tmp_box \c_zero_dim + { \ignorespaces #1 \hss } + \box_set_ht:Nn \l__shipout_tmp_box \c_zero_dim + \box_set_dp:Nn \l__shipout_tmp_box \c_zero_dim + \box_use:N \l__shipout_tmp_box + \tex_vss:D + } } -\newcommand*{\AtBegShi@bidi@horigin@right}{% - \if@RTL% - \dimexpr\paperwidth-\textwidth-\AtBegShi@horigin\relax - \else% - \dimexpr\paperwidth-\AtBegShi@horigin\relax - \fi% +\cs_new:Npn \__shipout_picture_overlay_upper_right:n #1 { + \__shipout_init_page_origins: + \kern \__dim_eval:w \c__shipout_horigin_tl + \oddsidemargin + \evensidemargin + \textwidth \scan_stop: + \vbox_to_zero:n { + \kern -\c__shipout_vorigin_tl \scan_stop: + \unitlength 1pt \scan_stop: + \hbox_set_to_wd:Nnn \l__shipout_tmp_box \c_zero_dim + { \ignorespaces #1 \hss } + \box_set_ht:Nn \l__shipout_tmp_box \c_zero_dim + \box_set_dp:Nn \l__shipout_tmp_box \c_zero_dim + \box_use:N \l__shipout_tmp_box + \tex_vss:D + } } -\newcommand*{\AtBegShi@bidi@vorigin@bottom}[1]{% - \dimexpr\paperheight-\AtBegShi@vorigin\relax +\cs_new:Npn \__shipout_picture_overlay_lower_right:n #1 { + \__shipout_init_page_origins: + \kern \__dim_eval:w \c__shipout_horigin_tl + \oddsidemargin + \evensidemargin + \textwidth \scan_stop: + \vbox_to_zero:n { + \kern \__dim_eval:w \paperheight - \c__shipout_vorigin_tl \scan_stop: + \unitlength 1pt \scan_stop: + \hbox_set_to_wd:Nnn \l__shipout_tmp_box \c_zero_dim + { \ignorespaces #1 \hss } + \box_set_ht:Nn \l__shipout_tmp_box \c_zero_dim + \box_set_dp:Nn \l__shipout_tmp_box \c_zero_dim + \box_use:N \l__shipout_tmp_box + \tex_vss:D + } } -\renewcommand*{\AtBeginShipoutUpperLeft}[1]{% - \AtBeginShipoutAddToBox{% - \kern\AtBegShi@bidi@horigin@left\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_background_picture_lower_left:n #1 { + \__shipout_add_background_box:n { \__shipout_picture_overlay_lower_left:n {#1} } } -\renewcommand*{\AtBeginShipoutUpperLeftForeground}[1]{% - \AtBeginShipoutAddToBoxForeground{% - \kern\AtBegShi@bidi@horigin@left\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_foreground_picture_lower_left:n #1 { + \__shipout_add_foreground_box:n { \__shipout_picture_overlay_lower_left:n {#1} } } -\newcommand*{\AtBeginShipoutUpperRight}[1]{% - \AtBeginShipoutAddToBox{% - \kern\AtBegShi@bidi@horigin@right\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_background_picture_upper_right:n #1 { + \__shipout_add_background_box:n { \__shipout_picture_overlay_upper_right:n {#1} } } -\newcommand*{\AtBeginShipoutUpperRightForeground}[1]{% - \AtBeginShipoutAddToBoxForeground{% - \kern\AtBegShi@bidi@horigin@right\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_foreground_picture_upper_right:n #1 { + \__shipout_add_foreground_box:n { \__shipout_picture_overlay_upper_right:n {#1} } } -\newcommand*{\AtBeginShipoutLowerLeft}[1]{% - \AtBeginShipoutAddToBox{% - \kern\AtBegShi@bidi@horigin@left\relax - \vbox to 0pt{% - \kern\AtBegShi@bidi@vorigin@bottom\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_background_picture_lower_right:n #1 { + \__shipout_add_background_box:n { \__shipout_picture_overlay_lower_right:n {#1} } } -\newcommand*{\AtBeginShipoutLowerLeftForeground}[1]{% - \AtBeginShipoutAddToBoxForeground{% - \kern\AtBegShi@bidi@horigin@left\relax - \vbox to 0pt{% - \kern\AtBegShi@bidi@vorigin@bottom\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% -} -\newcommand*{\AtBeginShipoutLowerRight}[1]{% - \AtBeginShipoutAddToBox{% - \kern\AtBegShi@bidi@horigin@right\relax - \vbox to 0pt{% - \kern\AtBegShi@bidi@vorigin@bottom\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% -} -\newcommand*{\AtBeginShipoutLowerRightForeground}[1]{% - \AtBeginShipoutAddToBoxForeground{% - \kern\AtBegShi@bidi@horigin@right\relax - \vbox to 0pt{% - \kern\AtBegShi@bidi@vorigin@bottom\relax - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% +\cs_new:Npn \__shipout_add_foreground_picture_lower_right:n #1 { + \__shipout_add_foreground_box:n { \__shipout_picture_overlay_lower_right:n {#1} } } +\cs_set_eq:NN \AtBeginShipoutLowerLeft + \__shipout_add_background_picture_lower_left:n +\cs_set_eq:NN \AtBeginShipoutLowerLeftForeground + \__shipout_add_foreground_picture_lower_left:n +\cs_set_eq:NN \AtBeginShipoutUpperRight + \__shipout_add_background_picture_upper_right:n +\cs_set_eq:NN \AtBeginShipoutUpperRightForeground + \__shipout_add_foreground_picture_upper_right:n +\cs_set_eq:NN \AtBeginShipoutLowerRight + \__shipout_add_background_picture_lower_right:n +\cs_set_eq:NN \AtBeginShipoutLowerRightForeground + \__shipout_add_foreground_picture_lower_right:n +\ExplSyntaxOff \endinput %% %% End of file `bidi-atbegshi.sty'. \ No newline at end of file diff --git a/macros/xetex/latex/bidi-atbegshi/test-LTR.pdf b/macros/xetex/latex/bidi-atbegshi/test-LTR.pdf index 90db634619..697ab72b0d 100644 Binary files a/macros/xetex/latex/bidi-atbegshi/test-LTR.pdf and b/macros/xetex/latex/bidi-atbegshi/test-LTR.pdf differ diff --git a/macros/xetex/latex/bidi-atbegshi/test-LTR.tex b/macros/xetex/latex/bidi-atbegshi/test-LTR.tex index e64e601587..04c773f6e5 100644 --- a/macros/xetex/latex/bidi-atbegshi/test-LTR.tex +++ b/macros/xetex/latex/bidi-atbegshi/test-LTR.tex @@ -8,16 +8,16 @@ \setbox3\hbox{\Huge\textbf{Lower Right}} \AtBeginShipout{% \AtBeginShipoutUpperLeft{% -\put(0,\LengthToUnit{-\ht0}){\usebox0} +\put(0,-\ht0){\usebox0} } \AtBeginShipoutUpperRight{% -\put(\LengthToUnit{-\wd1},\LengthToUnit{-\ht1}){\usebox1} +\put(-\wd1,-\ht1){\usebox1} } \AtBeginShipoutLowerLeft{% -\put(0,\LengthToUnit{\dp2}){\usebox2} +\put(0,\dp2){\usebox2} } \AtBeginShipoutLowerRight{% -\put(\LengthToUnit{-\wd3},\LengthToUnit{\dp3}){\usebox3} +\put(-\wd3,\dp3){\usebox3} } } \begin{document} diff --git a/macros/xetex/latex/bidi-atbegshi/test-RTL.pdf b/macros/xetex/latex/bidi-atbegshi/test-RTL.pdf index 90f2ac5d18..b9212f9704 100644 Binary files a/macros/xetex/latex/bidi-atbegshi/test-RTL.pdf and b/macros/xetex/latex/bidi-atbegshi/test-RTL.pdf differ diff --git a/macros/xetex/latex/bidi-atbegshi/test-RTL.tex b/macros/xetex/latex/bidi-atbegshi/test-RTL.tex index a4d416176b..5ce8c975b9 100644 --- a/macros/xetex/latex/bidi-atbegshi/test-RTL.tex +++ b/macros/xetex/latex/bidi-atbegshi/test-RTL.tex @@ -1,25 +1,26 @@ \documentclass{article} -\usepackage{lipsum} \usepackage{bidi-atbegshi} -\usepackage[RTLdocument]{bidi} -\setbox0\hbox{\Huge\textbf{Upper Left}} -\setbox1\hbox{\Huge\textbf{Upper Right}} -\setbox2\hbox{\Huge\textbf{Lower Left}} -\setbox3\hbox{\Huge\textbf{Lower Right}} +\usepackage{ptext} +\usepackage{xepersian} +\settextfont{IRXLotus} +\setbox0\hboxR{\Huge\textbf{چپ بالا}} +\setbox1\hboxR{\Huge\textbf{راست بالا}} +\setbox2\hboxR{\Huge\textbf{چپ پایین}} +\setbox3\hboxR{\Huge\textbf{راست پایین}} \AtBeginShipout{% \AtBeginShipoutUpperRight{% -\put(0,\LengthToUnit{-\ht1}){\usebox1} +\put(-\wd1,-\ht1){\usebox1} }% \AtBeginShipoutUpperLeft{% -\put(\LengthToUnit{-\wd0},\LengthToUnit{-\ht0}){\usebox0} +\put(0,-\ht0){\usebox0} }% \AtBeginShipoutLowerRight{% -\put(0,\LengthToUnit{\dp3}){\usebox3} +\put(-\wd3,\dp3){\usebox3} }% \AtBeginShipoutLowerLeft{% -\put(\LengthToUnit{-\wd2},\LengthToUnit{\dp2}){\usebox2} +\put(0,\dp2){\usebox2} }% } \begin{document} -\lipsum +\ptext \end{document} \ No newline at end of file diff --git a/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf b/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf index 6aa0cb81cd..1a4717adaf 100644 Binary files a/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf and b/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.pdf differ diff --git a/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex b/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex index 5b4953b2f5..9f28a62934 100644 --- a/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex +++ b/macros/xetex/latex/bidi-atbegshi/test-foreground-LTR.tex @@ -8,16 +8,16 @@ \setbox3\hbox{\Huge\textbf{Lower Right}} \AtBeginShipout{% \AtBeginShipoutUpperLeftForeground{% -\put(0,\LengthToUnit{-\ht0}){\usebox0} +\put(0,-\ht0){\usebox0} } \AtBeginShipoutUpperRightForeground{% -\put(\LengthToUnit{-\wd1},\LengthToUnit{-\ht1}){\usebox1} +\put(-\wd1,-\ht1){\usebox1} } \AtBeginShipoutLowerLeftForeground{% -\put(0,\LengthToUnit{\dp2}){\usebox2} +\put(0,\dp2){\usebox2} } \AtBeginShipoutLowerRightForeground{% -\put(\LengthToUnit{-\wd3},\LengthToUnit{\dp3}){\usebox3} +\put(-\wd3,\dp3){\usebox3} } } \begin{document} diff --git a/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf b/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf index 59ac82e420..8b7d0b596a 100644 Binary files a/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf and b/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.pdf differ diff --git a/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex b/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex index 4a8d9d3597..985a7eb4c6 100644 --- a/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex +++ b/macros/xetex/latex/bidi-atbegshi/test-foreground-RTL.tex @@ -1,25 +1,26 @@ \documentclass{article} -\usepackage{lipsum} \usepackage{bidi-atbegshi} -\usepackage[RTLdocument]{bidi} -\setbox0\hbox{\Huge\textbf{Upper Left}} -\setbox1\hbox{\Huge\textbf{Upper Right}} -\setbox2\hbox{\Huge\textbf{Lower Left}} -\setbox3\hbox{\Huge\textbf{Lower Right}} +\usepackage{ptext} +\usepackage{xepersian} +\settextfont{IRXLotus} +\setbox0\hboxR{\Huge\textbf{چپ بالا}} +\setbox1\hboxR{\Huge\textbf{راست بالا}} +\setbox2\hboxR{\Huge\textbf{چپ پایین}} +\setbox3\hboxR{\Huge\textbf{راست پایین}} \AtBeginShipout{% \AtBeginShipoutUpperRightForeground{% -\put(0,\LengthToUnit{-\ht1}){\usebox1} +\put(-\wd1,-\ht1){\box1} }% \AtBeginShipoutUpperLeftForeground{% -\put(\LengthToUnit{-\wd0},\LengthToUnit{-\ht0}){\usebox0} +\put(0,-\ht0){\usebox0} }% \AtBeginShipoutLowerRightForeground{% -\put(0,\LengthToUnit{\dp3}){\usebox3} +\put(-\wd3,\dp3){\usebox3} }% \AtBeginShipoutLowerLeftForeground{% -\put(\LengthToUnit{-\wd2},\LengthToUnit{\dp2}){\usebox2} +\put(0,\dp2){\usebox2} }% } \begin{document} -\lipsum +\ptext \end{document} \ No newline at end of file diff --git a/macros/xetex/latex/bidi/README b/macros/xetex/latex/bidi/README index 38cfe408c6..bbb079dd7a 100644 --- a/macros/xetex/latex/bidi/README +++ b/macros/xetex/latex/bidi/README @@ -1,6 +1,6 @@ ___________________ The bidi package -v36.5 +v36.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -25,7 +25,7 @@ The announcements for the new releases of the package will also appear in the Discussions space under the Announcements category. -Current version release date: 2022/02/04 +Current version release date: 2022/02/13 ___________________________________________ Vafa Khalighi diff --git a/macros/xetex/latex/bidi/bidi-doc-intro.ltx b/macros/xetex/latex/bidi/bidi-doc-intro.ltx index 3f62d203da..d17d1863bd 100644 --- a/macros/xetex/latex/bidi/bidi-doc-intro.ltx +++ b/macros/xetex/latex/bidi/bidi-doc-intro.ltx @@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run * Copyright (c) 2007--2022 Vafa Khalighi * Copyright (c) 2018--2020 bidi-tex GitHub Organization * -* v36.5, 2022/02/04 +* v36.6, 2022/02/13 * * License: LaTeX Project Public License, version * 1.3c or higher (your choice) diff --git a/macros/xetex/latex/bidi/bidi-doc-title.ltx b/macros/xetex/latex/bidi/bidi-doc-title.ltx index 33f5ed8838..338ea2196d 100644 --- a/macros/xetex/latex/bidi/bidi-doc-title.ltx +++ b/macros/xetex/latex/bidi/bidi-doc-title.ltx @@ -3,7 +3,7 @@ \begin{document} \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ \LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -\large User documentation for \textcolor{blue!65!black}{version 36.5}} +\large User documentation for \textcolor{blue!65!black}{version 36.6}} \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}\\ \url{tex-persian@vafa.ac}} \setcounter{page}{0} @@ -14,7 +14,7 @@ \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} \Large -User documentation for \textcolor{blue!65!black}{version 36.5}} +User documentation for \textcolor{blue!65!black}{version 36.6}} \vskip 0pt plus 3fill \textit{\large to my Master, \textbf{Ferdowsi The Great}} diff --git a/macros/xetex/latex/bidi/bidi-doc.ltx b/macros/xetex/latex/bidi/bidi-doc.ltx index b6dbf1ac38..cf129fa119 100644 --- a/macros/xetex/latex/bidi/bidi-doc.ltx +++ b/macros/xetex/latex/bidi/bidi-doc.ltx @@ -1,7 +1,7 @@ \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={User documentation for version 36.5 of the bidi + pdftitle={User documentation for version 36.6 of the bidi package}% } \begin{document} diff --git a/macros/xetex/latex/bidi/bidi-doc.pdf b/macros/xetex/latex/bidi/bidi-doc.pdf index 4cdcfc9a99..2bb9819a39 100644 Binary files a/macros/xetex/latex/bidi/bidi-doc.pdf and b/macros/xetex/latex/bidi/bidi-doc.pdf differ diff --git a/macros/xetex/latex/bidi/bidi.dtx b/macros/xetex/latex/bidi/bidi.dtx index 65bc0833cf..5e13b4e12b 100644 --- a/macros/xetex/latex/bidi/bidi.dtx +++ b/macros/xetex/latex/bidi/bidi.dtx @@ -5,7 +5,7 @@ %<*readme> ___________________ The bidi package -v36.5 +v36.6 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -30,7 +30,7 @@ The announcements for the new releases of the package will also appear in the Discussions space under the Announcements category. -Current version release date: 2022/02/04 +Current version release date: 2022/02/13 ___________________________________________ Vafa Khalighi @@ -234,7 +234,7 @@ by Vafa Khalighi. \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 36.5 of the bidi + pdftitle={Source documentation for version 36.6 of the bidi package}% } \EnableCrossrefs @@ -253,7 +253,7 @@ by Vafa Khalighi. % \GetFileInfo{\jobname.dtx} % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -%\large Source documentation for \textcolor{blue!65!black}{version 36.5}} +%\large Source documentation for \textcolor{blue!65!black}{version 36.6}} % \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}\\ % \url{tex-persian@vafa.ac}} %\setcounter{page}{0} @@ -264,7 +264,7 @@ by Vafa Khalighi. %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} % %\Large -%Source documentation for \textcolor{blue!65!black}{version 36.5}} +%Source documentation for \textcolor{blue!65!black}{version 36.6}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -313,7 +313,7 @@ by Vafa Khalighi. %\iffalse %<*table> %\fi -%% \CheckSum{50477} +%% \CheckSum{50439} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -1933,8 +1933,8 @@ by Vafa Khalighi. % \section{File \texttt{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2022/02/04} -\def\bidi@version{36.5} +\def\bididate{2022/02/13} +\def\bidi@version{36.6} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -2024,7 +2024,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \newcommand*{\@bidi@pdfcustomproperties}{% This is the bidi package, Version \bidi@version, - Released February 27, 2022. + Released February 13, 2022. } \@RTLmainfalse \AtBeginDocument{% @@ -2267,9 +2267,9 @@ Bidirectional typesetting in plain TeX and LaTeX] %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2022/02/04} +\def\bididate{2022/02/13} \catcode`@=11 -\def\bidi@version{36.5} +\def\bidi@version{36.6} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -2373,7 +2373,7 @@ Bidirectional typesetting in plain TeX and LaTeX] } \def\@bidi@pdfcustomproperties{% This is the bidi package, Version \bidi@version, - Released February 27, 2022. + Released February 13, 2022. } \def\bidi@pdfm@mark{% \special{pdf:% @@ -22079,7 +22079,7 @@ to\rtside{\box\bslice\hfil}} %\fi % \section{File \texttt{latex-xetex-bidi.def}} % \begin{macrocode} -\ProvidesFile{latex-xetex-bidi.def}[2022/02/01 v1.3.8 bidi adaptations for `latex.ltx' for XeTeX engine] +\ProvidesFile{latex-xetex-bidi.def}[2022/02/13 v1.3.9 bidi adaptations for `latex.ltx' for XeTeX engine] \newcommand{\TeXXeTOn}{\TeXXeTstate\@ne} \newcommand{\TeXXeTOff}{\TeXXeTstate\z@} \TeXXeTOn @@ -22772,28 +22772,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi} \hskip\dimen\@curtabmar\box\@curline\hfil\if@RTL\endR\fi}% \fi} -\ExplSyntaxOn -\cs_undefine:N \__shipout_picture_overlay:n -\cs_new:Npn \__shipout_picture_overlay:n #1 { - \__shipout_init_page_origins: - \if@RTL - \kern \__dim_eval:w \textwidth-\c__shipout_horigin_tl \scan_stop: - \else - \kern -\c__shipout_horigin_tl \scan_stop: - \fi - \vbox_to_zero:n { - \kern -\c__shipout_vorigin_tl \scan_stop: - \unitlength 1pt \scan_stop: - \hbox_set_to_wd:Nnn \l__shipout_tmp_box \c_zero_dim - { \ignorespaces #1 \hss } - \box_set_ht:Nn \l__shipout_tmp_box \c_zero_dim - \box_set_dp:Nn \l__shipout_tmp_box \c_zero_dim - \box_use:N \l__shipout_tmp_box - \tex_vss:D - } -} -\ExplSyntaxOff - \newcommand*{\bidi@font@@outputpage}{} \def\@outputpage{% diff --git a/macros/xetex/latex/bidi/bidi.pdf b/macros/xetex/latex/bidi/bidi.pdf index 308ea1c86c..b027ae8cee 100644 Binary files a/macros/xetex/latex/bidi/bidi.pdf and b/macros/xetex/latex/bidi/bidi.pdf differ diff --git a/systems/mac/mactex/ExtrasFolder.pdf b/systems/mac/mactex/ExtrasFolder.pdf index 242af3b96b..7979f494db 100644 Binary files a/systems/mac/mactex/ExtrasFolder.pdf and b/systems/mac/mactex/ExtrasFolder.pdf differ diff --git a/systems/mac/mactex/Licenses.txt b/systems/mac/mactex/Licenses.txt index 09a6a49540..af4c1ddb9c 100644 --- a/systems/mac/mactex/Licenses.txt +++ b/systems/mac/mactex/Licenses.txt @@ -1,6 +1,6 @@ $Id: Licenses.txt,v 1.14 2007/02/28 14:23:19 herbs Exp $ -Brief summary of the licensing of the various applications included as of 2022/01/18 +Brief summary of the licensing of the various applications included as of 2022/02/12 Aquamacs Emacs (Intel) - 3.5 - gpl - http://aquamacs.org/ Aquatkbibtex - 1.3 - gpl - http://aquatkbibtex.sourceforge.net/ @@ -16,6 +16,6 @@ SimpleTeX4ht - 3.3 - gpl - http://www.simpletex4ht.fre Skim (10.10+) - 1.6.8 - bsd - http://skim-app.sourceforge.net/ Symbols Widget - 1.4.3 - gpl - http://vocaro.com/trevor/software/widgets/ TeX FoG (10.4+) - 1.3.2 - gpl - http://homepage.mac.com/marco_coisson/TeXFoG/ -TeX Live Utility (10.9+) - 1.52 - bsd - https://github.com/amaxwell/tlutility/releases +TeX Live Utility (10.9+) - 1.53 - bsd - https://github.com/amaxwell/tlutility/releases TexMaker (10.13+) - 5.1.2 - gpl - http://www.xm1math.net/texmaker/ TeXShop (10.12+) - 4.68 - gpl - http://www.uoregon.edu/~koch/texshop/texshop.html diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm index 9bade5c9bb..1230c46c5e 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 61960 2022-02-09 21:43:08Z karl $ +# $Id: TLUtils.pm 61996 2022-02-12 22:45:16Z karl $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2022 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -8,7 +8,7 @@ use strict; use warnings; package TeXLive::TLUtils; -my $svnrev = '$Revision: 61960 $'; +my $svnrev = '$Revision: 61996 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -4080,7 +4080,7 @@ END_NO_SSL # sub query_ctan_mirror_curl { my $max_trial = 3; - my $warg = (win32() ? "-w %{url_effective} " : "-w '%{url_effective}' "); + my $warg = (win32() ? '-w "%{url_effective}" ' : "-w '%{url_effective}' "); for (my $i = 1; $i <= $max_trial; $i++) { # -L -> follow redirects # -s -> silent diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 19e07f294e..d060e0a98d 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -37,7 +37,6 @@ $mirrors = { 'Iran' => { 'http://ctan.yazd.ac.ir/' => 1, 'https://ctan.asis.ai/' => 1, - 'https://ctan.um.ac.ir/' => 1, 'https://mirror.bardia.tech/ctan/' => 1, }, 'Japan' => { @@ -48,7 +47,6 @@ $mirrors = { }, 'Korea' => { 'http://ftp.ktug.org/tex-archive/' => 1, - 'https://ftp.harukasan.org/CTAN/' => 1, 'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1, 'https://mirror.kakao.com/CTAN/' => 1, 'https://mirror.navercorp.com/CTAN/' => 1, @@ -116,7 +114,6 @@ $mirrors = { 'https://mirror.clientvps.com/CTAN/' => 1, 'https://mirror.dogado.de/tex-archive/' => 1, 'https://mirror.informatik.hs-fulda.de/tex-archive/' => 1, - 'https://mirror.physik.tu-berlin.de/pub/CTAN/' => 1, 'https://packages.oth-regensburg.de/ctan/' => 1, }, 'Greece' => { @@ -180,6 +177,7 @@ $mirrors = { 'https://ctan.mirror.globo.tech/' => 1, 'https://ctan.mirror.rafal.ca/' => 1, 'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1, + 'https://mirror.its.dal.ca/ctan/' => 1, 'https://muug.ca/mirror/ctan/' => 1, }, 'Costa Rica' => { diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index caf6eabac6..7857497eaf 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,7 +26,7 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2021 -depend revision/61983 +depend revision/61996 name 00texlive.image category TLCore @@ -4529,7 +4529,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 61977 +revision 61985 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 @@ -44425,27 +44425,27 @@ catalogue-version 0.2 name bxghost category Package -revision 53606 +revision 61989 shortdesc Ghost insertion for proper xkanjiskip relocated 1 longdesc The package provides two commands to help authors for documents longdesc in Japanese to insert proper xkanjiskips. It supports LuaTeX, longdesc XeTeX, pTeX, upTeX, and ApTeX (pTeX-ng). -containersize 1648 -containerchecksum 72b5a376d5a927297fc466936ae55ed4fe4fe8705aa8f31fcaa4f4b558496b19952b55ff8b02318f5d5cc8c6cfe31c6310cbd22900084d353a93f348291e0c6e -doccontainersize 1792 -doccontainerchecksum 718c59d1c05689fbb4641ead9437b2ddde19f848b6f7c9fd5f4c91b10abe9fc6413c531c2f5af3f9e70e30578341116e5b4731a8f873f75fd4ee0803f3597a3b +containersize 1972 +containerchecksum 0b887dac7fb97c7faeabaf1863c0dd9b086b0f8d6e91e399c6a19a1d7950d1940a117a0176104256d8ea18ae822c6bf111140eca3ec9173e458a94233af4537a +doccontainersize 1828 +doccontainerchecksum a6b06eb89e575e917d7bfed36b4080170d98001b70f257a94bdcf5fdd20779562a07a357469da56b85d5d1618e5bd9e6406d1f6679ec6025579f49e19c670558 docfiles size=2 RELOC/doc/latex/bxghost/LICENSE RELOC/doc/latex/bxghost/README.md details="Readme" -runfiles size=1 +runfiles size=2 RELOC/tex/latex/bxghost/bxghost.sty catalogue-contact-bugs https://github.com/wtsnjp/BXghost/issues catalogue-contact-repository https://github.com/wtsnjp/BXghost catalogue-ctan /language/japanese/BX/bxghost catalogue-license mit catalogue-topics japanese macro-supp -catalogue-version 0.3.0 +catalogue-version 0.4.0 name bxjaholiday category Package @@ -56619,7 +56619,7 @@ catalogue-version 1.3.1 name circuit-macros category Package -revision 60690 +revision 61987 shortdesc M4 macros for electric circuit diagrams relocated 1 longdesc A set of m4 macros for drawing high-quality electric circuits @@ -56638,10 +56638,10 @@ longdesc for Unix and PC machines.) Alternative output macros can create longdesc TeX output to be read by pstricks, TikZ commands for use by the longdesc pgf bundle, or SVG. containersize 1496 -containerchecksum 1487a935b764969c641e308aec9dc82c0b68df03f427dd2b9871b1035728303e7f16cabcd6f48d5a1c9289ef4541038b8a73cad66f77a7cafb8ba5b125afb406 -doccontainersize 2943952 -doccontainerchecksum 1f7d2dcbff417fbdb3a0f3208339236bbdc2066c1fa94520ee006f0f326faaaa3bb5f037a70a3c7eaa04e7a07319c58c8346613da8d0170bb36abd2aedc6e3f2 -docfiles size=1908 +containerchecksum 77dc6e34bd1e09231b1f6ccfebebdf0197dd633023feba1d9498db089204c9b703f268915e4f76eccf24fffaf15fdb2b8962f498f174085eb76563b04a30f3ce +doccontainersize 2327636 +doccontainerchecksum 2c13ea2e449b19670e4faf81baec04e54d06ced867a578ff6e875dba6f8cfdc363a29787903590be8c834ceaa50512a77e696e3d6721aba88a2151b70966785d +docfiles size=1332 RELOC/doc/latex/circuit-macros/CHANGES RELOC/doc/latex/circuit-macros/Copying RELOC/doc/latex/circuit-macros/INSTALL @@ -56663,7 +56663,6 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/doc/Buffer.m4 RELOC/doc/latex/circuit-macros/doc/CapacitorsMan.m4 RELOC/doc/latex/circuit-macros/doc/Circuit_macros.bib - RELOC/doc/latex/circuit-macros/doc/Circuit_macros.html RELOC/doc/latex/circuit-macros/doc/Circuit_macros.pdf details="Package manual" RELOC/doc/latex/circuit-macros/doc/Circuit_macros.tex RELOC/doc/latex/circuit-macros/doc/Composite.m4 @@ -56722,6 +56721,8 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/doc/Relay.tex RELOC/doc/latex/circuit-macros/doc/RelayMan.m4 RELOC/doc/latex/circuit-macros/doc/ResistorsMan.m4 + RELOC/doc/latex/circuit-macros/doc/SLDs.tex + RELOC/doc/latex/circuit-macros/doc/SLDsMan.m4 RELOC/doc/latex/circuit-macros/doc/Series.m4 RELOC/doc/latex/circuit-macros/doc/ShiftR.tex RELOC/doc/latex/circuit-macros/doc/ShiftRMan.m4 @@ -56777,7 +56778,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/AmpTable.m4 RELOC/doc/latex/circuit-macros/examples/Antennas.m4 RELOC/doc/latex/circuit-macros/examples/AntiqueClock.m4 - RELOC/doc/latex/circuit-macros/examples/Arrester.m4 + RELOC/doc/latex/circuit-macros/examples/Arresters.m4 RELOC/doc/latex/circuit-macros/examples/ArrowFn.m4 RELOC/doc/latex/circuit-macros/examples/Attention.m4 RELOC/doc/latex/circuit-macros/examples/Audio.m4 @@ -56797,6 +56798,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/Chuck.m4 RELOC/doc/latex/circuit-macros/examples/Conn.m4 RELOC/doc/latex/circuit-macros/examples/Connectors.m4 + RELOC/doc/latex/circuit-macros/examples/Consumption.m4 RELOC/doc/latex/circuit-macros/examples/Contact.m4 RELOC/doc/latex/circuit-macros/examples/Contacts.m4 RELOC/doc/latex/circuit-macros/examples/Counting.m4 @@ -56810,9 +56812,11 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/Dini.m4 RELOC/doc/latex/circuit-macros/examples/Diodes.m4 RELOC/doc/latex/circuit-macros/examples/Drive.m4 + RELOC/doc/latex/circuit-macros/examples/EEP.m4 RELOC/doc/latex/circuit-macros/examples/Emarrows.m4 RELOC/doc/latex/circuit-macros/examples/Escher.m4 RELOC/doc/latex/circuit-macros/examples/Euro.m4 + RELOC/doc/latex/circuit-macros/examples/Eye.m4 RELOC/doc/latex/circuit-macros/examples/Floor.m4 RELOC/doc/latex/circuit-macros/examples/Flow.m4 RELOC/doc/latex/circuit-macros/examples/FlowchartDefs.m4 @@ -56871,6 +56875,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/Sierpinski.m4 RELOC/doc/latex/circuit-macros/examples/Sixpole.m4 RELOC/doc/latex/circuit-macros/examples/Sources.m4 + RELOC/doc/latex/circuit-macros/examples/Stator.m4 RELOC/doc/latex/circuit-macros/examples/Switches.m4 RELOC/doc/latex/circuit-macros/examples/TTLnand.m4 RELOC/doc/latex/circuit-macros/examples/Tgate.m4 @@ -56963,7 +56968,6 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/svg/ByteSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/CanLogicSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/CapacitorsSVG.m4 - RELOC/doc/latex/circuit-macros/examples/svg/CctTableSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/ChipsSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/ConnSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/ConnectorsSVG.m4 @@ -56981,6 +56985,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/svg/EEPSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/EmarrowsSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/EscherSVG.m4 + RELOC/doc/latex/circuit-macros/examples/svg/EyeSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/FlowSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/FontsSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/FourbarSVG.m4 @@ -57018,7 +57023,6 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/svg/RelaySVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/ResistorsSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/RotboxSVG.m4 - RELOC/doc/latex/circuit-macros/examples/svg/SLD.m4 RELOC/doc/latex/circuit-macros/examples/svg/SQUIDSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/SVGconfig.m4 RELOC/doc/latex/circuit-macros/examples/svg/SchottkySVG.m4 @@ -57075,7 +57079,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/svg/roseSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/sfgSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/shapesSVG.m4 - RELOC/doc/latex/circuit-macros/examples/svg/sldtestsSVG.m4 + RELOC/doc/latex/circuit-macros/examples/svg/slddiagsSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/thyristorSVG.m4 RELOC/doc/latex/circuit-macros/examples/svg/tstSVG.htmx RELOC/doc/latex/circuit-macros/examples/svg/ujtSVG.m4 @@ -57097,6 +57101,7 @@ docfiles size=1908 RELOC/doc/latex/circuit-macros/examples/xfig/xfiglib.m4 RELOC/doc/latex/circuit-macros/gpic.m4 RELOC/doc/latex/circuit-macros/lib3D.m4 + RELOC/doc/latex/circuit-macros/libSLD.m4 RELOC/doc/latex/circuit-macros/libcct.m4 RELOC/doc/latex/circuit-macros/libgen.m4 RELOC/doc/latex/circuit-macros/liblog.m4 @@ -57117,7 +57122,7 @@ catalogue-contact-repository https://gitlab.com/aplevich/circuit_macros catalogue-ctan /graphics/circuit_macros catalogue-license lppl1.3c catalogue-topics diagram-circ electronic -catalogue-version 9.7 +catalogue-version 9.8 name circuitikz category Package @@ -100177,7 +100182,7 @@ catalogue-topics notes editorial name easybook category Package -revision 61980 +revision 61990 shortdesc Typeset Chinese theses or books relocated 1 longdesc Easybook is a pure academic template created based on the @@ -100188,16 +100193,16 @@ longdesc providing multiple commands and interfaces allows users to longdesc easily customize the thesis template. Its basic macro package longdesc easybase can also be used with CTeX and standard document longdesc classes. -containersize 16580 -containerchecksum 2fe62bad0342b895e9679a6b85a01082b44365c4335825e977394032d40e54244c4c6890270c8818b99cbee6390bc23bb195b56db4de79cb7a63afc5d2524377 -doccontainersize 597968 -doccontainerchecksum f2e820c499a30fffae4a2f6f9310f268271aa740dd45d43adfb4ef59f9f6a5df4983181a7f0b0fa74975601b4006f310afd60aa1b21e9e6f77635efebabf619e +containersize 16532 +containerchecksum 441ab75a146be176aca31d24ec9e0cdbaa40bcc3ea2565ddab43587c9dd1ec3b2e72de01ad02c537e2a5d3e24fff335069d8131dccb9d6175f9cf37ffbcbc9e2 +doccontainersize 597408 +doccontainerchecksum 21b4a014e76bceecbf5c283b52f72471a7f8c98415ebf630b3832e3fd5168b47ab81187262bada0249e7d7651610c391caae164e036ecbbf70075417acfd49a4 docfiles size=162 RELOC/doc/latex/easybook/README.md details="Readme" RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh" RELOC/doc/latex/easybook/easybook.tex -srccontainersize 16496 -srccontainerchecksum 12394f9a14d257e7fa5e5344c364d018bdbf045df947c817ed80e36dddbcdfce9d99151d10c9f8b50788322a8cfec9472c4320f8786d02752346a425af3e7d63 +srccontainersize 16412 +srccontainerchecksum e9bd5c2b48ecafdcf55e1c035ec39719097a5a3304c1c889d138878fc10009ed114c406bce21a3a5cde62eb63aece5d98451927c1c162c24948be713e0be4bfe srcfiles size=20 RELOC/source/latex/easybook/easybook.dtx RELOC/source/latex/easybook/easybook.ins @@ -100210,7 +100215,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook catalogue-ctan /macros/latex/contrib/easybook catalogue-license lppl1.3c catalogue-topics book-pub class chinese expl3 -catalogue-version 1.623 +catalogue-version 1.624 name easyfig category Package @@ -159796,7 +159801,7 @@ catalogue-topics diagram name knowledge category Package -revision 61583 +revision 61991 shortdesc Displaying, hyperlinking, and indexing notions in a document relocated 1 longdesc The package offers a systematic way to handle @@ -159804,18 +159809,18 @@ longdesc notions/concepts/terms throughout a document. It helps building longdesc an index. In combination with hyperref it makes it easy to have longdesc every reference of a concept linked to its introduction. It longdesc also offers simple notations. -containersize 22636 -containerchecksum fad2f89ad35c36e934f3b26c27e7d3ed0bc18d6fd7ccee79a461274283acb6209ab615c9ff394fc8e00e1eff9931834346018fd0d78a61d15c8a744012a95b88 -doccontainersize 812476 -doccontainerchecksum 9fb7e643d9e43431b618b5acba33588ee648e16774b04eb9f97bb457ebbfb1b5bfa20c88e86313deb7029cd31f16204d490bb61ddea178b99ebd466cad868f12 +containersize 22776 +containerchecksum dac315840aaabc1efb96d52d96e1ee789f61c65964c0343fc35d340694a3f13f7cf9e0ab101bbead9f3d25ef9e3ea2723916864abdd192a89c319a0370b566a5 +doccontainersize 812816 +doccontainerchecksum 0f95f35d60513fb181efa2d5d9579efa000838647b167521b364305774be164731c4c09ba4fa739ed3749cd5c43b19b59cd417f8237bbca2f930bc4b22ba0c68 docfiles size=238 RELOC/doc/latex/knowledge/README.md details="Readme" RELOC/doc/latex/knowledge/knowledge-example.tex RELOC/doc/latex/knowledge/knowledge.pdf details="Package documentation" RELOC/doc/latex/knowledge/knowledge.tex RELOC/doc/latex/knowledge/makefile -srccontainersize 42284 -srccontainerchecksum 231f340d9ed86877626ed5b957eba76870998bb4c37abedf7e9d4c1ba4b3e906fb32e89b6bb67b4d28354d3668e9128359cff3f9c289569a27f2eb593afce175 +srccontainersize 42572 +srccontainerchecksum 5843dfc2fec15d5cd0a57eeb5aec12bfefa2914bdb8f4ebe2522e6576fcbea73f5663b437ff2654f8ddd7d6f8ef92ecc8aa96c59bf7d76ac58029fee85e1bb8d srcfiles size=57 RELOC/source/latex/knowledge/knowledge-code.dtx RELOC/source/latex/knowledge/knowledge-configuration.dtx @@ -159826,7 +159831,7 @@ runfiles size=35 catalogue-ctan /macros/latex/contrib/knowledge catalogue-license lppl1.2 catalogue-topics index label-ref expl3 -catalogue-version 1.27 +catalogue-version 1.28 name knuth-errata category Package @@ -273278,20 +273283,19 @@ catalogue-topics notes editorial name snotez category Package -revision 61968 +revision 61992 shortdesc Typeset notes, in the margin relocated 1 longdesc The package provides a macro \sidenote, that places a note in longdesc the margin of the document, with its baseline aligned with the longdesc baseline in the body of the document. These sidenotes are longdesc numbered (both in the text, and on the notes themselves). The -longdesc package loads the package etoolbox, pgfopts, marginnote and -longdesc perpage. -containersize 3184 -containerchecksum 8f8497a37b4f9385b8e18bc7f110cd1a3f7ce451616ff57afa4ad1e5e3716be01faba37c265e2a82f32078804cdadac32ee4012f4b3651a1f65e025770898fbb -doccontainersize 460432 -doccontainerchecksum a6b4d82bfe4a639c1ff103719a6db3bcf4a8887cb983a41d180118d57aecaa7fcde7757eea33b25193b8711442e81c239e8cace8f686d39fac91a616d065902b -docfiles size=118 +longdesc package loads the package etoolbox, pgfopts and marginnote. +containersize 3216 +containerchecksum 8e827171eb8ae6281d0be97bddd251db57349f935ac6309eace72396be37c33e8bd79d792701f56a5e338eccfae452411de520bdab5f5747e6fb741e5215c1bd +doccontainersize 481648 +doccontainerchecksum 230cd4f3f8922fe520c7b476f8f7b31e3965029e72e58828107e5f7c761b87a64f5c5df9faadb610277d45ff95052878c070e690932759850da34fd82fb028d0 +docfiles size=123 RELOC/doc/latex/snotez/README details="Readme" RELOC/doc/latex/snotez/snotez-manual.pdf details="Package documentation" RELOC/doc/latex/snotez/snotez-manual.tex @@ -273303,7 +273307,7 @@ catalogue-contact-repository https://github.com/cgnieder/snotez/ catalogue-ctan /macros/latex/contrib/snotez catalogue-license lppl1.3c catalogue-topics marginal -catalogue-version 0.6 +catalogue-version 0.7 name songbook category Package @@ -277117,7 +277121,7 @@ catalogue-version 2.4 name spbmark category Package -revision 61946 +revision 61993 shortdesc Customize superscripts and subscripts relocated 1 longdesc This package provides three commands \super, \sub and \supersub @@ -277125,9 +277129,9 @@ longdesc to improve the layout of superscripts and subscripts which can longdesc be adjusted with respect to relative position and format, and longdesc can be used in text and math mode. containersize 3160 -containerchecksum 4abef6896a794471eec94be25bc769925bea70713cab5e2897074e70122465b3750c76134ee1d6be63bbb3a49ae257691467c5307bfd3c66d16bf98092c5d366 -doccontainersize 77860 -doccontainerchecksum 68451c43c5d882b5c1546fc5f79a6508c383995f8b7de111dad33ec0c5ecd1f5725bba2d8309f292c926950e510d898c76ab99e701b221f970a5eb8e64f97a71 +containerchecksum cd49de1c1b5882d86f0c1bb306a3c3aaeb5473bc137c38c7bd237d1fe9bf083962424bfb138fc344bd0e416f54f1cad6fa9b395aab375bcbc6323a7909fa291a +doccontainersize 77688 +doccontainerchecksum 80344b5f0f0a76c5c1192725685c2e8e30e341a3545477c7d9bcc4a7f251baf6a8a9fee534974a68fbc79b2e74963ce24e2ec1e3d6fb5fab70b2c803d4bbcf59 docfiles size=23 RELOC/doc/latex/spbmark/README.md details="Readme" RELOC/doc/latex/spbmark/spbmark.pdf details="Package documentation" @@ -277138,7 +277142,7 @@ catalogue-contact-repository https://github.com/texl3/spbmark catalogue-ctan /macros/latex/contrib/spbmark catalogue-license cc-by-4 catalogue-topics subsup-pos expl3 -catalogue-version 1.35 +catalogue-version 1.36 name spectral category Package @@ -299104,7 +299108,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 61977 +revision 61985 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. @@ -299112,10 +299116,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 108376 -containerchecksum 60b04574159ba47f1e27b8bfb70af16d67d37512fba11639d676ab9f8d7deb95c8b3078a3af1afe421a90c711ada2b2d191c3b898e408621915c9e02c2f84460 -doccontainersize 403352 -doccontainerchecksum c22a95d01bc6d6ec4e35f4a7ff60149ace439aba38db2361d3c83c3aea30d6d13fe73201c8dacb2c8407656deaa4586b1db6ae9b625611d24c57ebb8aa0da53b +containersize 108364 +containerchecksum 264ec3dc510d6362a82f131eea8ef0e36b0693831c43576cc99a9759910a2e49468a83725a0847e8534060337f86b88cf51dfe1ac896ad457dc517a96ca10d7a +doccontainersize 403280 +doccontainerchecksum 5d1aa74cd97e55da2fbbb68b74efdab4c3392f741b21020e8272f4f1cbdeb468c8faf2ff17580c5c1f8ab211f9da2449dfbc5341307d91c738263bb504040c92 docfiles size=502 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 @@ -338920,17 +338924,17 @@ catalogue-version 0.16 name xsim category Package -revision 57619 +revision 61988 shortdesc eXercise Sheets IMproved relocated 1 longdesc This package helps in creating exercises and the corresponding longdesc solutions. It is the official successor of the exsheets package longdesc and fixes/improves various long-standing issues. -containersize 32212 -containerchecksum 37325711b273ad2f2b5fb762f91ec4a0373c92d6b0f418a68d0560c1d83c8d9c673b7cfbe93bab446f61209ae2d49b298aefd6da43b0be9732be5cd996125910 -doccontainersize 2998504 -doccontainerchecksum 2b0c825844d220efe5d4bf77ae53e0a155a5b8603630b361b45b4267083b15b3d7149d1d4fab1191064b3edc650195eb4497e0370c06ff39a93d673adafcb9f6 -docfiles size=927 +containersize 32648 +containerchecksum daaf1cc1ac8c34c4a63de3a16baabbcb661177172892bf4bf85e588cd150e8736b5b3ef382656c4ca5e3486f93889bfe00a9895988284a3fde84caf222e9744c +doccontainersize 3026636 +doccontainerchecksum a020e1c60dd909ad48607b315e63d2225a9a884f2939f1cba2a783e9336b86dc002e1fd771469daae9a4c16d80b4c9263f04a545b270ad666749d5d4536d3e7c +docfiles size=933 RELOC/doc/latex/xsim/HISTORY RELOC/doc/latex/xsim/README details="Readme" RELOC/doc/latex/xsim/examples/xsim.blanks.pdf @@ -338995,7 +338999,6 @@ docfiles size=927 RELOC/doc/latex/xsim/examples/xsim.texsx-369803.tex RELOC/doc/latex/xsim/examples/xsim.texsx-370642.pdf RELOC/doc/latex/xsim/examples/xsim.texsx-370642.tex - RELOC/doc/latex/xsim/examples/xsim.texsx-391530-exercises.tex RELOC/doc/latex/xsim/examples/xsim.texsx-391530.pdf RELOC/doc/latex/xsim/examples/xsim.texsx-391530.tex RELOC/doc/latex/xsim/examples/xsim.texsx-395273.pdf @@ -339020,7 +339023,7 @@ docfiles size=927 RELOC/doc/latex/xsim/examples/xsim.various.tex RELOC/doc/latex/xsim/xsim-manual.pdf details="Package documentation" RELOC/doc/latex/xsim/xsim-manual.tex -runfiles size=55 +runfiles size=57 RELOC/tex/latex/xsim/xsim-manual.cls RELOC/tex/latex/xsim/xsim.sty RELOC/tex/latex/xsim/xsim.style.layouts.code.tex @@ -339030,7 +339033,7 @@ catalogue-contact-repository https://github.com/cgnieder/xsim/ catalogue-ctan /macros/latex/contrib/xsim catalogue-license lppl1.3c catalogue-topics exercise exam expl3 -catalogue-version 0.20c +catalogue-version 0.21 name xskak category Package @@ -346285,7 +346288,7 @@ catalogue-version 0.2.4 name zref-clever category Package -revision 61937 +revision 61994 shortdesc Clever LaTeX cross-references based on zref relocated 1 longdesc This package provides a user interface for making LaTeX @@ -346297,11 +346300,11 @@ longdesc multiple labels can be automatically sorted and compressed into longdesc ranges when due. The reference format is highly and easily longdesc customizable, both globally and locally. The package is based longdesc on zref's extensible referencing system. -containersize 22964 -containerchecksum a9dd62aeddef48fc3ee261dc4af0ee0a9e1ec0614a5a1ff72b0f4acbd7fa0aecdd169c25918eb84661e5972293856cc7ec737f67dc8c77bef724101ee21d6c9e -doccontainersize 1514828 -doccontainerchecksum 9354de636ea4ac9af5fa3decf8d5eb15aaab84e2cb60a206c684b19529182e61479b380cd2dc7ef8d30ce0d84bd69a500fba3acab5877abf869e8739616f73a7 -docfiles size=419 +containersize 23100 +containerchecksum 13df97fe0eb3fedaf2cf4e0c6315a3950833c8498336cca9b402007039c06f1da1b11c7344455bd39154c9a9fee309e589740c20312430d0e6296072bbd7a4da +doccontainersize 1519464 +doccontainerchecksum 0f93b690ae200e340b55c736ea93a213c710f68f4ac662cdfe27e0743a399184d85b235028a4af6cd655ee880b255d00993b9ae0d6bd53034d2144cae3337715 +docfiles size=421 RELOC/doc/latex/zref-clever/CHANGELOG.md RELOC/doc/latex/zref-clever/DEPENDS.txt RELOC/doc/latex/zref-clever/MANIFEST.md @@ -346310,9 +346313,9 @@ docfiles size=419 RELOC/doc/latex/zref-clever/zref-clever-code.tex RELOC/doc/latex/zref-clever/zref-clever.pdf details="User manual" RELOC/doc/latex/zref-clever/zref-clever.tex -srccontainersize 49888 -srccontainerchecksum d0cf28ef4c2163ae2db961b6c8a095d9493871ed53fb92ded7395edae94f2ee6973c5a3293c8f635ba11dfca22e711d4139e03f6a93a90f2f55aaa1aa5caacd6 -srcfiles size=83 +srccontainersize 50504 +srccontainerchecksum 3b64811689d5c3d32e31c2fc2ecd31fd9c66bfa343f8af33791fff9ce34ba5655eb175028d0a6341236c2b6db244c273c9aee737b90411adb2c332bf2d903f88 +srcfiles size=84 RELOC/source/latex/zref-clever/zref-clever.dtx RELOC/source/latex/zref-clever/zref-clever.ins runfiles size=66 @@ -346323,16 +346326,15 @@ runfiles size=66 RELOC/tex/latex/zref-clever/zref-clever-portuguese.lang RELOC/tex/latex/zref-clever/zref-clever-spanish.lang RELOC/tex/latex/zref-clever/zref-clever.sty -catalogue-contact-bugs https://github.com/gusbrs/zref-clever/issues catalogue-contact-repository https://github.com/gusbrs/zref-clever catalogue-ctan /macros/latex/contrib/zref-clever catalogue-license lppl1.3c catalogue-topics label-ref expl3 -catalogue-version 0.2.1-alpha +catalogue-version 0.2.2-alpha name zref-vario category Package -revision 61951 +revision 61995 shortdesc Extended LaTeX page cross-references with varioref and zref-clever relocated 1 longdesc This package offers a compatibility layer for varioref to be @@ -346342,10 +346344,10 @@ longdesc does some (scoped) setup for varioref, then calls the original longdesc one. depend tools depend zref-clever -containersize 4016 -containerchecksum a34a5bcbee34e22f8116ee6cf02d7ca8bb75773b8da395c0c4161cabbc275eaa7cc586624e8c037379a7bdbae32774ee2aae5c0df6a2688d9ad4977853634547 -doccontainersize 699556 -doccontainerchecksum 7963bc8f16c751649fe05741745744c31fad9b9a02791cf5b14c7b85b124ec10af741899a266ebb522771f5a99c9c5331acd3e532c3881039f6ae26bd5168602 +containersize 4040 +containerchecksum 26a10ab2d9fdf28654658f8b2d376c2d49fe90f7478089ee858d6ddb6350bcdfcfabbfa96c4981d11aceb958dd7893f125575d93ac34ebbebf3519dfc1d5dc22 +doccontainersize 700632 +doccontainerchecksum d5d839f8d850a59f8d37a0acdbb6c3236bbba97efb015e5170d4df52ce3a07937dea55886358aea64a3b315dcccd693c47ef6f8ebba6465e9dc5083e395225c8 docfiles size=184 RELOC/doc/latex/zref-vario/CHANGELOG.md RELOC/doc/latex/zref-vario/DEPENDS.txt @@ -346355,19 +346357,18 @@ docfiles size=184 RELOC/doc/latex/zref-vario/zref-vario-code.tex RELOC/doc/latex/zref-vario/zref-vario.pdf details="User manual" RELOC/doc/latex/zref-vario/zref-vario.tex -srccontainersize 6388 -srccontainerchecksum 18b1bc05b646ca81ae10491bdb7ec24fb0bb2be90332d9b94c425de13e654d2107dd7473d2de38b0b24c5b54ea839ca3a3a4fe8d71bc60f871c0b36de0ee341b +srccontainersize 6424 +srccontainerchecksum 854bb3583b9e8a961dbd2aac05ca0b7121d44e79b1454cf35c1de327587e859a6269a97684b238c89b7ed12b0bca7f87fe9dd2595ffb6183e091884aa80bcd2b srcfiles size=9 RELOC/source/latex/zref-vario/zref-vario.dtx RELOC/source/latex/zref-vario/zref-vario.ins runfiles size=6 RELOC/tex/latex/zref-vario/zref-vario.sty -catalogue-contact-bugs https://github.com/gusbrs/zref-vario/issues catalogue-contact-repository https://github.com/gusbrs/zref-vario catalogue-ctan /macros/latex/contrib/zref-vario catalogue-license lppl1.3c catalogue-topics label-ref expl3 -catalogue-version 0.1.2-alpha +catalogue-version 0.1.3-alpha name zwgetfdate category Package diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index edd2e273d4..8df48c959d 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -96ed9ffcc5e041c03953b7482f6b9fd0 texlive.tlpdb +bb0fa79b2fac75377fd7f39329727a98 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 858c5cb345..a97aec4dde 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -790c516ee3486d599ee628ced7622d0cef10edf8966c9bc1cac1d3d6a8cee0d3a1f0dfef22dfc334daf99ca465b14569e80f2a53041ff4feb63ee7c91f18f8c6 texlive.tlpdb +a1cfac30901b7517946cbff4b97ac75397293dd54ca6e65f871249e494cc8b973d61953da692e3d6f857b9c34b306d139efa62a0d64344765c12fe473721da37 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 19b030c77a..f71d146c3e 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNATURE----- -iQEcBAEBCgAGBQJiBwTkAAoJEEzhh34ZQ4xwEf4H/3eu+UgKstR9AvE/NLRsPeOS -iMFuCwo8jFucfwFaWwQN7IEju0oPnVzSSa9SdxjADOT9/Q+70l/qA6lKdbqdsF0i -GipVWzIseuMGh9+IBActt29g+YaiZIEYKY0CZQe8XH4Y6uQwrN9rNenxoF8Pm2Ut -MwTFWBmIu42s8lz5uMQkjud1Tq5STWA2+CfrYK3z9rsYnUgeKP4PqeB+skArvGGW -I8ixVJILa4DlKn+yoPIBh6AJO473BdKfys76G4mMpDmDqJgXOvVHDXOK9DtQFBd+ -025jTiChfyhl/Vkz8mNw175sOBqEah8YPktwqybb4GXJ9B+AgkHRWD8i5PaC9Q4= -=Kb5i +iQEcBAEBCgAGBQJiCFaXAAoJEEzhh34ZQ4xwEL0IAIjTXmlnigDFmgG7o5rOTXTO +Vr/nDrm6gaAYdM+RSI5Jc28KaSrosttIuL+fogcWqhc6/trQ6WImHDeGDTLKwQbW +KcfvHrvpDkJL+FPjV0IlkOjwwzdJi2jKAXrMYoX5DZcX6tSw1xu21a5rKb7gZGMb +/aYL/99HCcwVFaYmrpqvM7bgWmUefTcCzkzbKW77yjQMct1ZNAUwGxCavHACA5ld +JYkE7wespp8Mp5PAaotPsElA2vCs+RZ0gHPWY665G/JfJxZYy4+1MxDduToSKgTA +Hic7MjQ+fGSHc7ZA8sr3RyloJmJ6S6M/MuISyUgEwHpbUlSYXGFC83niQSHD3e8= +=wCP6 -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz index 305c6465e7..4880e57b1a 100644 Binary files a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz and b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz differ diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini index 599ecde431..8268864477 100644 --- a/systems/win32/miktex/tm/packages/next/pr.ini +++ b/systems/win32/miktex/tm/packages/next/pr.ini @@ -1,13 +1,13 @@ [repository] -date=1644700626 +date=1644787015 lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9 -lstdigest=16b89c20a5af2fc5599d8b80bb9c7d34 +lstdigest=efea71f3ca78ec9621babeffb66d304b numpkg=5349 relstate=next -version=8078 +version=8079 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows. ;;;;-----BEGIN MIKTEX SIGNATURE----- -;;;; signature/miktex: RwT/y5DRJSSXiJi6Edc8SwhK0cVroH019+BaPC7tuHHKWKd8VpQJgzJx1mjrwNQQz3kEJrbef6QcbliHIkK1hTOc5B4CYNhqOfUk78GyTV1V/8R3XKNaKMD/OwEQzIKNkpl27kvXEFh/pBYLJCS6lUQDvq3+Vb2z4eOWyrNvoiwEDREh1e91WjAa9ErTdsUuQja7LeI9PsjZwpAn2XwVCVjPQ+FV2luToA4J+FvoExPOgfFEHsJT3Vzfc/eUr6ew6vprKdnlNY1KVCBgWmaqYPLMKujl3nONtqBFaFLmXWm73A3hi2OEe4ptPQ4tUH9iVZJeIfsvcl8R9wQtt2RVoA== +;;;; signature/miktex: L0+4FghybmPCrOxcyq2gviPBn0vXaABxBcG+F1KCqTdgLAdcOCm53aSM+m7zTNvtbsAVvAH0+GvudGMUeKyLl26vA7Ip/BbBW4pQM6QlsgPImT8QpdbbmCEGFZ0XWg5hd2KBPfcfJi3uR8jkUujXYMTqUJL6c+3zvuu2CbY7leQxqUfNP5HgqNp6Ew/YWd3MTm9qTu9iFFlLHtmbZHiPvFPj+kuazgeSgk7gm90ReKouUaN5ZNsOiKDzFFggH/2AI3pWDKsRnRolIZebksuDddzmGEyNViphw6l52tpaFEEA4HGzmwYZk7s594knHoswh9Qx/+9chAA4tIZK6E9yRw== ;;;;-----END MIKTEX SIGNATURE----- diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index 5c1c7e37b2..500e2695c1 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -1,13 +1,13 @@ [repository] -date=1644700311 +date=1644786702 lastupd=erewhon-math erewhon-math__doc erewhon-math__source hamnosys hamnosys__doc hamnosys__source luafindfont luafindfont__doc luafindfont__source spbmark spbmark__doc spbmark__source tikz-karnaugh tikz-karnaugh__doc tikz-karnaugh__source tkz-euclide tkz-euclide__doc tkz-euclide__source tkz-fct tkz-fct__doc -lstdigest=06157e45c554826f1253771530221179 +lstdigest=6cbf117fcffa81c7508cae73fe0f8011 numpkg=5349 relstate=stable -version=8078 +version=8079 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows. ;;;;-----BEGIN MIKTEX SIGNATURE----- -;;;; signature/miktex: M5+tSPpqGmkJd/1P66jH3vtxCZEh/NGfTx/dPzU6d48CDwKQIlDqvSTFUcLxNlm7A95QiCX5Uqpdg8p35vNWf8tdaq3cQ2fpTvcwoSxVVLT3sbw+r+mlAKKmNwMMY3dN4kc1Q3T3JYyZQPK5xzTMTGgRs99hboN4bc0HeRiiIrIjk3iUVcKsD7KFSxKQ8e8c4CclxlBfKVzr3nSO1YViZEoCCxNZtuW5tbym6oSPxz/7eM4MmY+qTeQ19epfQR2DrTZiRdlKgYIRIau31GDEh1+9XypnVDjROoOSvSe8B0GXZM+qo/5xY9JE5+jxFR9xyAagNAtB3I3hyMMvy/Liew== +;;;; signature/miktex: vnx7JLPJ8DVtOl+CJR2h2UpKmyXvB6gn6YXOeO+4iecjBfOtL29lGMZDNJp6nGODuaWRY7jsDs7zsJqF+a3dl0UumG9lse5VCMVt4XSUhfpvZHolMYAcApcb1AZT51NJNJmInPzctxmmuyeA19NMqvD1VuXkmFF/GBbjnufTHiYS2wwijUbmUooUxTMfpelzLjxcLWKYxeec4thLM+9zkyi52Ne6uYmMyDuU0+CIcLi527zzvrY3qFqf1VCxDBCHBTtH07gxwkS8XQuWrreDY9lPJj8CSXvkzm49pFALnDwjRJTUDQrsQRrFs1836zkbKYV0O5uz+ZXzLQSTwO2tKQ== ;;;;-----END MIKTEX SIGNATURE----- diff --git a/timestamp b/timestamp index 6322c86efb..f04b40e6c3 100644 --- a/timestamp +++ b/timestamp @@ -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: -2022-02-13-02-02 +2022-02-14-02-02 -- cgit v1.2.3